Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e0e375d60 | ||
|
|
dd489e65aa |
No files matched your search
@@ -1342,3 +1342,28 @@ method.
|
|||||||
Consequences: A change to one family of paths touches one module and the routing in `handler`.
|
Consequences: A change to one family of paths touches one module and the routing in `handler`.
|
||||||
State shared between requests, such as the open shells, lives in the module that owns it; other
|
State shared between requests, such as the open shells, lives in the module that owns it; other
|
||||||
modules change it and never rebind it.
|
modules change it and never rebind it.
|
||||||
|
|
||||||
|
## ADR-48: Exceptions are handled; no traceback reaches the logs
|
||||||
|
|
||||||
|
Status: Accepted
|
||||||
|
|
||||||
|
Context: The services log to the journal, which administrators read through the Logs page and
|
||||||
|
`journalctl`. Python prints a traceback for an exception nothing handles: `socketserver` for a
|
||||||
|
failed request, `threading` for a failed thread and the interpreter for the process. A client
|
||||||
|
that closes its connection before the answer is written, as a page does when it is left or
|
||||||
|
reloaded, raises `BrokenPipeError` or `ConnectionResetError` in the handler. A traceback is many
|
||||||
|
lines of internals for one event and hides the lines around it.
|
||||||
|
|
||||||
|
Decision: The code handles the exceptions it can expect where they occur, and answers or logs
|
||||||
|
them with their reason in one line. An exception left unhandled is a defect to be fixed. As the
|
||||||
|
last line of defence, every server replaces the default reports:
|
||||||
|
|
||||||
|
- `vpnrouter_serve.serve`, which the web service and the metrics service run, sets the servers'
|
||||||
|
`handle_error`, `threading.excepthook` and `sys.excepthook`.
|
||||||
|
- The bootstrap server sets its server's `handle_error` and `sys.excepthook`.
|
||||||
|
|
||||||
|
A `ConnectionError` of a client that went away is not logged; any other exception is logged in
|
||||||
|
one line with its type and message.
|
||||||
|
|
||||||
|
Consequences: The logs hold one line per failure, without its stack. A failure that reaches the
|
||||||
|
last line of defence is found by its message and fixed where it occurs, with its own handling.
|
||||||
@@ -1,3 +1,25 @@
|
|||||||
|
vpn-router (0.37.3-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
fix: an answer whose client went away ends quietly, and a shell whose client left before it opened is stopped.
|
||||||
|
|
||||||
|
* The web service, the metrics service and the bootstrap server stop
|
||||||
|
writing an answer when its client closes the connection, and a site
|
||||||
|
file whose download is left no longer gets a second answer.
|
||||||
|
* A shell whose client closed the connection before it opened is
|
||||||
|
stopped and its end is logged, instead of running on.
|
||||||
|
|
||||||
|
-- Slawomir Koszewski <slawek@koszewscy.waw.pl> Fri, 30 Oct 2026 02:03:26 +0100
|
||||||
|
|
||||||
|
vpn-router (0.37.2-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
fix: the web service, the metrics service and the bootstrap server log a failure in one line instead of a traceback, and nothing when a client goes away.
|
||||||
|
|
||||||
|
* A request whose client closed the connection is no longer logged.
|
||||||
|
* Any other failure of a request, a thread or the service is logged in
|
||||||
|
one line with the exception's type and message.
|
||||||
|
|
||||||
|
-- Slawomir Koszewski <slawek@koszewscy.waw.pl> Fri, 30 Oct 2026 01:59:19 +0100
|
||||||
|
|
||||||
vpn-router (0.37.1-1) unstable; urgency=medium
|
vpn-router (0.37.1-1) unstable; urgency=medium
|
||||||
|
|
||||||
fix: /config answers the OpenID Provider's state and issuer.
|
fix: /config answers the OpenID Provider's state and issuer.
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ the logs.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import sys
|
||||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||||
|
|
||||||
PORT = 17081
|
PORT = 17081
|
||||||
@@ -42,14 +43,28 @@ def report():
|
|||||||
class Handler(BaseHTTPRequestHandler):
|
class Handler(BaseHTTPRequestHandler):
|
||||||
def do_GET(self):
|
def do_GET(self):
|
||||||
body = report().encode()
|
body = report().encode()
|
||||||
self.send_response(200)
|
try:
|
||||||
self.send_header('Content-Type', 'text/plain; charset=utf-8')
|
self.send_response(200)
|
||||||
self.send_header('Content-Length', str(len(body)))
|
self.send_header('Content-Type', 'text/plain; charset=utf-8')
|
||||||
self.send_header('Cache-Control', 'no-store')
|
self.send_header('Content-Length', str(len(body)))
|
||||||
self.send_header('Refresh', '10')
|
self.send_header('Cache-Control', 'no-store')
|
||||||
self.end_headers()
|
self.send_header('Refresh', '10')
|
||||||
self.wfile.write(body)
|
self.end_headers()
|
||||||
|
self.wfile.write(body)
|
||||||
|
except ConnectionError:
|
||||||
|
# The client went away before the answer was written.
|
||||||
|
self.close_connection = True
|
||||||
|
|
||||||
|
|
||||||
|
def failed(request, client_address):
|
||||||
|
"""Log a failed request in one line, and nothing when the client went away."""
|
||||||
|
failure = sys.exc_info()[1]
|
||||||
|
if not isinstance(failure, ConnectionError):
|
||||||
|
print(f'a request from {client_address[0]} failed: {type(failure).__name__}: {failure}', file=sys.stderr, flush=True)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
ThreadingHTTPServer(('', PORT), Handler).serve_forever()
|
sys.excepthook = lambda kind, value, _: print(f'failed: {kind.__name__}: {value}', file=sys.stderr, flush=True)
|
||||||
|
server = ThreadingHTTPServer(('', PORT), Handler)
|
||||||
|
server.handle_error = failed
|
||||||
|
server.serve_forever()
|
||||||
@@ -405,15 +405,19 @@ class Handler(BaseHTTPRequestHandler):
|
|||||||
registry = CollectorRegistry()
|
registry = CollectorRegistry()
|
||||||
registry.register(Sample(current))
|
registry.register(Sample(current))
|
||||||
body, kind, code = generate_latest(registry), CONTENT_TYPE_LATEST, 200
|
body, kind, code = generate_latest(registry), CONTENT_TYPE_LATEST, 200
|
||||||
self.send_response(code)
|
try:
|
||||||
self.send_header('Content-Type', kind)
|
self.send_response(code)
|
||||||
self.send_header('Content-Length', str(len(body)))
|
self.send_header('Content-Type', kind)
|
||||||
self.send_header('Cache-Control', 'no-store')
|
self.send_header('Content-Length', str(len(body)))
|
||||||
for name, value in extra:
|
self.send_header('Cache-Control', 'no-store')
|
||||||
self.send_header(name, value)
|
for name, value in extra:
|
||||||
self.end_headers()
|
self.send_header(name, value)
|
||||||
if send_body:
|
self.end_headers()
|
||||||
self.wfile.write(body)
|
if send_body:
|
||||||
|
self.wfile.write(body)
|
||||||
|
except ConnectionError:
|
||||||
|
# The client went away before the answer was written.
|
||||||
|
self.close_connection = True
|
||||||
|
|
||||||
def do_GET(self):
|
def do_GET(self):
|
||||||
self.answer(True)
|
self.answer(True)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ Only the Python standard library is used, so the bootstrap server, which must ru
|
|||||||
is broken, can use it.
|
is broken, can use it.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import sys
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
from http.server import ThreadingHTTPServer
|
from http.server import ThreadingHTTPServer
|
||||||
@@ -14,9 +15,21 @@ def serve(wanted, handler, log, interval):
|
|||||||
|
|
||||||
wanted answers ([(address, port), ...], '') or ([], the reason not to listen). A server whose
|
wanted answers ([(address, port), ...], '') or ([], the reason not to listen). A server whose
|
||||||
place is no longer wanted is stopped, and a new one listens at each new place; a place that
|
place is no longer wanted is stopped, and a new one listens at each new place; a place that
|
||||||
cannot be bound is tried again the next round. Every new message is logged with log. Does
|
cannot be bound is tried again the next round. Every new message is logged with log. A request
|
||||||
not return.
|
whose client went away is not logged; any other exception a request, a thread or the process
|
||||||
|
does not handle is logged with log in one line, without a traceback. Does not return.
|
||||||
"""
|
"""
|
||||||
|
def failed(request, client_address):
|
||||||
|
failure = sys.exc_info()[1]
|
||||||
|
if not isinstance(failure, ConnectionError):
|
||||||
|
log(f'a request from {client_address[0]} failed: {type(failure).__name__}: {failure}')
|
||||||
|
|
||||||
|
def thread_failed(hook):
|
||||||
|
if not issubclass(hook.exc_type, (SystemExit, ConnectionError)):
|
||||||
|
log(f'{hook.thread.name if hook.thread else "a thread"} failed: {hook.exc_type.__name__}: {hook.exc_value}')
|
||||||
|
|
||||||
|
threading.excepthook = thread_failed
|
||||||
|
sys.excepthook = lambda kind, value, _: log(f'failed: {kind.__name__}: {value}')
|
||||||
servers, reported = {}, None
|
servers, reported = {}, None
|
||||||
while True:
|
while True:
|
||||||
targets, reason = wanted()
|
targets, reason = wanted()
|
||||||
@@ -34,6 +47,7 @@ def serve(wanted, handler, log, interval):
|
|||||||
except OSError as exc:
|
except OSError as exc:
|
||||||
messages.append(f'cannot listen on {target[0]}:{target[1]}: {exc}')
|
messages.append(f'cannot listen on {target[0]}:{target[1]}: {exc}')
|
||||||
continue
|
continue
|
||||||
|
server.handle_error = failed
|
||||||
thread = threading.Thread(target=server.serve_forever, name=f'server {target[0]}', daemon=True)
|
thread = threading.Thread(target=server.serve_forever, name=f'server {target[0]}', daemon=True)
|
||||||
thread.start()
|
thread.start()
|
||||||
servers[target] = (server, thread)
|
servers[target] = (server, thread)
|
||||||
|
|||||||
@@ -188,15 +188,19 @@ class Handler(BaseHTTPRequestHandler):
|
|||||||
code = 200
|
code = 200
|
||||||
else:
|
else:
|
||||||
body, kind, code = b'Not found\n', 'text/plain; charset=utf-8', 404
|
body, kind, code = b'Not found\n', 'text/plain; charset=utf-8', 404
|
||||||
self.send_response(code)
|
try:
|
||||||
self.send_header('Content-Type', kind)
|
self.send_response(code)
|
||||||
self.send_header('Content-Length', str(len(body)))
|
self.send_header('Content-Type', kind)
|
||||||
self.send_header('Cache-Control', 'no-store')
|
self.send_header('Content-Length', str(len(body)))
|
||||||
for name, value in extra:
|
self.send_header('Cache-Control', 'no-store')
|
||||||
self.send_header(name, value)
|
for name, value in extra:
|
||||||
self.end_headers()
|
self.send_header(name, value)
|
||||||
if send_body:
|
self.end_headers()
|
||||||
self.wfile.write(body)
|
if send_body:
|
||||||
|
self.wfile.write(body)
|
||||||
|
except ConnectionError:
|
||||||
|
# The client went away before the answer was written.
|
||||||
|
self.close_connection = True
|
||||||
|
|
||||||
def raw_body(self):
|
def raw_body(self):
|
||||||
"""The request body's bytes, b'' without one or over BODY_LIMIT."""
|
"""The request body's bytes, b'' without one or over BODY_LIMIT."""
|
||||||
|
|||||||
@@ -367,11 +367,14 @@ def shell(handler, name):
|
|||||||
def refuse(code, message):
|
def refuse(code, message):
|
||||||
log(f'shell of {name} from {handler.client()} refused: {message}')
|
log(f'shell of {name} from {handler.client()} refused: {message}')
|
||||||
body = json.dumps({'error': message}).encode() + b'\n'
|
body = json.dumps({'error': message}).encode() + b'\n'
|
||||||
handler.send_response(code)
|
try:
|
||||||
handler.send_header('Content-Type', 'application/json')
|
handler.send_response(code)
|
||||||
handler.send_header('Content-Length', str(len(body)))
|
handler.send_header('Content-Type', 'application/json')
|
||||||
handler.end_headers()
|
handler.send_header('Content-Length', str(len(body)))
|
||||||
handler.wfile.write(body)
|
handler.end_headers()
|
||||||
|
handler.wfile.write(body)
|
||||||
|
except ConnectionError:
|
||||||
|
handler.close_connection = True
|
||||||
|
|
||||||
key = handler.headers.get('Sec-WebSocket-Key', '').strip()
|
key = handler.headers.get('Sec-WebSocket-Key', '').strip()
|
||||||
if handler.headers.get('Upgrade', '').lower() != 'websocket' or 'upgrade' not in handler.headers.get('Connection', '').lower() \
|
if handler.headers.get('Upgrade', '').lower() != 'websocket' or 'upgrade' not in handler.headers.get('Connection', '').lower() \
|
||||||
@@ -408,12 +411,21 @@ def shell(handler, name):
|
|||||||
finally:
|
finally:
|
||||||
os.close(terminal)
|
os.close(terminal)
|
||||||
accept = base64.b64encode(hashlib.sha1((key + WEBSOCKET_GUID).encode()).digest()).decode()
|
accept = base64.b64encode(hashlib.sha1((key + WEBSOCKET_GUID).encode()).digest()).decode()
|
||||||
handler.send_response(101, 'Switching Protocols')
|
|
||||||
handler.send_header('Upgrade', 'websocket')
|
|
||||||
handler.send_header('Connection', 'Upgrade')
|
|
||||||
handler.send_header('Sec-WebSocket-Accept', accept)
|
|
||||||
handler.end_headers()
|
|
||||||
handler.close_connection = True
|
handler.close_connection = True
|
||||||
|
try:
|
||||||
|
handler.send_response(101, 'Switching Protocols')
|
||||||
|
handler.send_header('Upgrade', 'websocket')
|
||||||
|
handler.send_header('Connection', 'Upgrade')
|
||||||
|
handler.send_header('Sec-WebSocket-Accept', accept)
|
||||||
|
handler.end_headers()
|
||||||
|
except ConnectionError:
|
||||||
|
# The client went away before the shell opened; the shell started for it is stopped.
|
||||||
|
run('systemctl', 'stop', unit)
|
||||||
|
os.close(master)
|
||||||
|
process.kill()
|
||||||
|
process.wait()
|
||||||
|
log(f'shell of {name} from {handler.client()} ended before it opened: the client closed the connection')
|
||||||
|
return
|
||||||
client, started, idle = handler.client(), time.monotonic(), options['shell_idle_minutes'] * 60
|
client, started, idle = handler.client(), time.monotonic(), options['shell_idle_minutes'] * 60
|
||||||
log(f'shell of {name} from {client} opened as {account.pw_name} in {unit}')
|
log(f'shell of {name} from {client} opened as {account.pw_name} in {unit}')
|
||||||
|
|
||||||
|
|||||||
@@ -112,15 +112,19 @@ def site_files(handler, name, relative, query, payload, send_body):
|
|||||||
return 404, {'error': f'{relative} does not exist'}
|
return 404, {'error': f'{relative} does not exist'}
|
||||||
with open(target, 'rb') as handle:
|
with open(target, 'rb') as handle:
|
||||||
size = os.fstat(handle.fileno()).st_size
|
size = os.fstat(handle.fileno()).st_size
|
||||||
handler.send_response(200)
|
try:
|
||||||
handler.send_header('Content-Type', mimetypes.guess_type(target.name)[0] or 'application/octet-stream')
|
handler.send_response(200)
|
||||||
handler.send_header('Content-Length', str(size))
|
handler.send_header('Content-Type', mimetypes.guess_type(target.name)[0] or 'application/octet-stream')
|
||||||
handler.send_header('Content-Disposition',
|
handler.send_header('Content-Length', str(size))
|
||||||
f"attachment; filename*=UTF-8''{urllib.parse.quote(target.name)}")
|
handler.send_header('Content-Disposition',
|
||||||
handler.send_header('Cache-Control', 'no-store')
|
f"attachment; filename*=UTF-8''{urllib.parse.quote(target.name)}")
|
||||||
handler.end_headers()
|
handler.send_header('Cache-Control', 'no-store')
|
||||||
if send_body:
|
handler.end_headers()
|
||||||
shutil.copyfileobj(handle, handler.wfile, vpnrouter_sites.CHUNK)
|
if send_body:
|
||||||
|
shutil.copyfileobj(handle, handler.wfile, vpnrouter_sites.CHUNK)
|
||||||
|
except ConnectionError:
|
||||||
|
# The client went away before the file was sent.
|
||||||
|
handler.close_connection = True
|
||||||
return None
|
return None
|
||||||
if handler.command == 'PUT':
|
if handler.command == 'PUT':
|
||||||
length = handler.headers.get('Content-Length')
|
length = handler.headers.get('Content-Length')
|
||||||
|
|||||||
Reference in new issue
Block a user