pywebexec 1.7.13__tar.gz → 1.7.14__tar.gz

{pywebexec-1.7.13/pywebexec.egg-info → pywebexec-1.7.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.7.13
+Version: 1.7.14
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -205,4 +205,4 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /executables                |                    | array of str        |
 | GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
-| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -N -s http://srv/command_output_raw/command_id|
+| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -Ns http://srv/command_output_raw/command_id|

{pywebexec-1.7.13 → pywebexec-1.7.14}/README.md

@@ -142,4 +142,4 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /executables                |                    | array of str        |
 | GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
-| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -N -s http://srv/command_output_raw/command_id|
+| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -Ns http://srv/command_output_raw/command_id|

pywebexec-1.7.14/pywebexec/host_ip.py

@@ -0,0 +1,47 @@
+from socket import gethostname, gethostbyname_ex, gethostbyaddr, inet_aton, inet_ntoa
+
+def resolve_hostname(host):
+    """try get fqdn from DNS/hosts"""
+    try:
+        hostinfo = gethostbyname_ex(host)
+        for ip in hostinfo[2]:
+            if not ip.startswith('127.') or host in ('localhost', 'localhost.localdomain'):
+                return (hostinfo[0].rstrip('.'), ip)
+        return (host, host)
+    except OSError:
+        return (host, host)
+
+
+def resolve_ip(ip):
+    """try resolve hostname by reverse dns query on ip addr"""
+    ip = inet_ntoa(inet_aton(ip))
+    try:
+        ipinfo = gethostbyaddr(ip)
+        return (ipinfo[0].rstrip('.'), ipinfo[2][0])
+    except OSError:
+        return (ip, ip)
+
+
+def is_ip(host):
+    """determine if host is valid ip"""
+    try:
+        inet_aton(host)
+        return True
+    except OSError:
+        return False
+
+
+def resolve(host_or_ip):
+    """resolve hostname from ip / hostname"""
+    if is_ip(host_or_ip):
+        return resolve_ip(host_or_ip)
+    return resolve_hostname(host_or_ip)
+
+
+def get_host_ip(host_or_ip='0.0.0.0'):
+    if host_or_ip == '0.0.0.0':
+        return resolve(gethostname())
+    return resolve(host_or_ip)
+
+if __name__ == '__main__':
+    print(get_host_ip())

{pywebexec-1.7.13 → pywebexec-1.7.14}/pywebexec/pywebexec.py

@@ -13,7 +13,7 @@ import time
 import shlex
 from gunicorn.app.base import Application
 import ipaddress
-from socket import socket, gethostname, gethostbyname_ex, gethostbyaddr, inet_aton, inet_ntoa, AF_INET, SOCK_STREAM
+from socket import socket, AF_INET, SOCK_STREAM
 import ssl
 import re
 import pwd
@@ -26,6 +26,7 @@ import struct
 import subprocess
 import logging
 import pyte
+from host_ip import get_host_ip
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
@@ -69,39 +70,6 @@ def generate_random_password(length=12):
     return ''.join(random.choice(characters) for i in range(length))
 
 
-def resolve_hostname(host):
-    """try get fqdn from DNS/hosts"""
-    try:
-        hostinfo = gethostbyname_ex(host)
-        return (hostinfo[0].rstrip('.'), hostinfo[2][0])
-    except OSError:
-        return (host, host)
-
-
-def resolve_ip(ip):
-    """try resolve hostname by reverse dns query on ip addr"""
-    ip = inet_ntoa(inet_aton(ip))
-    try:
-        ipinfo = gethostbyaddr(ip)
-        return (ipinfo[0].rstrip('.'), ipinfo[2][0])
-    except OSError:
-        return (ip, ip)
-
-
-def is_ip(host):
-    """determine if host is valid ip"""
-    try:
-        inet_aton(host)
-        return True
-    except OSError:
-        return False
-
-
-def resolve(host_or_ip):
-    """resolve hostname from ip / hostname"""
-    if is_ip(host_or_ip):
-        return resolve_ip(host_or_ip)
-    return resolve_hostname(host_or_ip)
 
 
 def generate_selfsigned_cert(hostname, ip_addresses=None, key=None):
@@ -397,7 +365,7 @@ def parseargs():
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
         sys.exit(start_term())
 
-    (hostname, ip) = resolve(gethostname()) if args.listen == '0.0.0.0' else resolve(args.listen)
+    (hostname, ip) = get_host_ip(args.listen)
 
     if args.tokenurl:
         token = os.environ.get("PYWEBEXEC_TOKEN", token_urlsafe())

{pywebexec-1.7.13 → pywebexec-1.7.14}/pywebexec/static/js/commands.js

@@ -171,7 +171,11 @@ commandInput.addEventListener('click', () => {
 });
 
 commandInput.addEventListener('blur', (event) => {
-    if (event.relatedTarget === showCommandListButton || event.relatedTarget === commandListDiv || event.relatedTarget.classList.includes('command-item')) {
+    if (
+        event.relatedTarget === showCommandListButton ||
+        event.relatedTarget === commandListDiv ||
+        (event.relatedTarget && event.relatedTarget.classList && event.relatedTarget.classList.contains('command-item'))
+    ) {
         event.preventDefault();
         return;
     }

{pywebexec-1.7.13 → pywebexec-1.7.14}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.13'
-__version_tuple__ = version_tuple = (1, 7, 13)
+__version__ = version = '1.7.14'
+__version_tuple__ = version_tuple = (1, 7, 14)

{pywebexec-1.7.13 → pywebexec-1.7.14/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.7.13
+Version: 1.7.14
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -205,4 +205,4 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /executables                |                    | array of str        |
 | GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
-| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -N -s http://srv/command_output_raw/command_id|
+| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -Ns http://srv/command_output_raw/command_id|

{pywebexec-1.7.13 → pywebexec-1.7.14}/pywebexec.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pyproject.toml
 setup.cfg
 .github/workflows/python-publish.yml
 pywebexec/__init__.py
+pywebexec/host_ip.py
 pywebexec/pywebexec.py
 pywebexec/version.py
 pywebexec.egg-info/PKG-INFO