pywebexec 1.7.12__py3-none-any.whl → 1.7.14__py3-none-any.whl

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/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/static/css/style.css

@@ -309,6 +309,7 @@ span {
     background-repeat: no-repeat;
     background-position: center;
     background-size: 14px 14px;
+    padding: 10px;
 }
 .font-size-button:hover {
     background-color: #666;

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/version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.12'
-__version_tuple__ = version_tuple = (1, 7, 12)
+__version__ = version = '1.7.14'
+__version_tuple__ = version_tuple = (1, 7, 14)

{pywebexec-1.7.12.dist-info → pywebexec-1.7.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.7.12
+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.12.dist-info → pywebexec-1.7.14.dist-info}/RECORD

@@ -1,8 +1,9 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=MmpHK2SscvIPj1gmV9AcJXYfeaL-at5BDgLhKIxzZBc,33604
-pywebexec/version.py,sha256=dSwjHj4iLBCyQl7aZEEt5q3jGDuArBY7LwcMyXcjaUg,413
+pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
+pywebexec/pywebexec.py,sha256=o4-zyoUILOimEjn0RkmX3vTcpFJ_oCUq1yq5aHa9nrE,32704
+pywebexec/version.py,sha256=qWV_ucaLScojfl3C6npvxkuXlgzgmPvX0_JCE50CR64,513
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=6Q89tdXTzuGaMJJ26gp-YD2L0eIsFb7C83IYOoMJb8g,7915
+pywebexec/static/css/style.css,sha256=fU-_eAk6Xy0L_GbH9rJBkeCFe5M2RYQA99cvRZ3pW9w,7934
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
 pywebexec/static/images/aborted.svg,sha256=2nuvSwGBIZGWtlM1DrBO3qiSq1reDbcZDAj9rJXBnjY,380
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -20,7 +21,7 @@ pywebexec/static/images/popup.svg,sha256=0Bl9A_v5cBsMPn6FnOlVWlAQKgd2zqiWQbhjcL9
 pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65EiuwtvK4A,607
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
-pywebexec/static/js/commands.js,sha256=1g771zk-EV1H7vKGWZSrTK_avWF6pBgdIy860hodxiw,8332
+pywebexec/static/js/commands.js,sha256=TmfcauQlfIeAeC8pwQvKspc4PA_VYLbPTnVCDVBZ87I,8420
 pywebexec/static/js/popup.js,sha256=_2GzUizJ-sdZFWG7SZwbYJTPbu4EvVq7D5Q_UE8nepA,9452
 pywebexec/static/js/script.js,sha256=bmaR9TJhZMEK_Niz0TCp8CJdnLKh4ayaxLvqgjxdoRs,18482
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
@@ -35,9 +36,9 @@ pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCf
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=KSdQYBdzWKP6v0ETZsMO_729aosGBAzJxAss8T5jCto,2953
 pywebexec/templates/popup.html,sha256=f5m4u8WKpkevL2mQamGqo4_y-rSuLOXGuNsezuUbniY,1508
-pywebexec-1.7.12.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.7.12.dist-info/METADATA,sha256=9LbZYl-e-jOLwTE48iI17WHMvnd1ukT7zMcL2Z8QLSE,8149
-pywebexec-1.7.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.7.12.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.7.12.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.7.12.dist-info/RECORD,,
+pywebexec-1.7.14.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.7.14.dist-info/METADATA,sha256=VYj9gaYFnR34kXY13RrCxba48Do5zT-b_fEhsu5um4I,8147
+pywebexec-1.7.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.7.14.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.7.14.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.7.14.dist-info/RECORD,,