From 849277bc49c7d7f997cdd906ef15ca56494e3be5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 28 Aug 2022 14:52:12 +0100 Subject: [PATCH] Extra debug --- daemon.py | 6 ++++-- webapp_login.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/daemon.py b/daemon.py index dd3b62cbc..6e6da289d 100644 --- a/daemon.py +++ b/daemon.py @@ -2063,7 +2063,7 @@ class PubServer(BaseHTTPRequestHandler): base_dir: str, http_prefix: str, domain: str, domain_full: str, port: int, onion_domain: str, i2p_domain: str, - ua_str: str) -> None: + ua_str: str, debug: bool) -> None: """POST to login screen, containing credentials """ # ensure that there is a minimum delay between failed login @@ -2258,6 +2258,8 @@ class PubServer(BaseHTTPRequestHandler): return else: print('WARN: No login credentials presented to /login') + if debug: + print(login_params) self._401('No login credentials were posted') self.server.postreq_busy = False self._200() @@ -20066,7 +20068,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.port, self.server.onion_domain, self.server.i2p_domain, - ua_str) + ua_str, self.server.debug) self.server.postreq_busy = False return diff --git a/webapp_login.py b/webapp_login.py index 4dd22a6a4..c55ab06bc 100644 --- a/webapp_login.py +++ b/webapp_login.py @@ -21,20 +21,20 @@ from webapp_utils import text_mode_browser from theme import get_text_mode_logo -def html_get_login_credentials(loginParams: str, +def html_get_login_credentials(login_params: str, last_login_time: int, domain: str) -> (str, str, bool): """Receives login credentials via HTTPServer POST """ - if not loginParams.startswith('username='): + if not login_params.startswith('username='): return None, None, None # minimum time between login attempts curr_time = int(time.time()) if curr_time < last_login_time + 10: return None, None, None - if '&' not in loginParams: + if '&' not in login_params: return None, None, None - login_args = loginParams.split('&') + login_args = login_params.split('&') nickname = None password = None register = False