diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/app.py | 41 | ||||
| -rwxr-xr-x | src/server.py | 9 |
2 files changed, 43 insertions, 7 deletions
@@ -40,11 +40,10 @@ # no more. import abc -import cgi from collections import namedtuple from concurrent.futures import ThreadPoolExecutor from enum import Enum -import http.server +from http import HTTPStatus import json import os import pwd @@ -52,6 +51,8 @@ import shlex import socket import subprocess from subprocess import DEVNULL, PIPE, STDOUT +import traceback +import urllib.parse def split_by(xs, sep): @@ -66,7 +67,7 @@ def split_by(xs, sep): class Response: - DEFAULT_STATUS = http.server.HTTPStatus.OK + DEFAULT_STATUS = HTTPStatus.OK @staticmethod def body_from_json(body): @@ -89,6 +90,7 @@ class Response: self.write_body_as_cgi_script() def write_headers_as_cgi_script(self): + print(f'{self.status.value} {self.status.phrase}') for name, val in self.headers(): print(f'{name}: {val}') print() @@ -508,6 +510,17 @@ def systemd_users(): return show_users(list_users()) +def cgi_one_value(params, name, default=None): + values = params.get(name, []) + if not values: + if default is None: + raise ValueError(f'must have at least one value: {name}') + return default + if len(values) > 1: + raise ValueError(f'multiple values are not supported: {name}') + return values[0] + + class Request(Enum): STATUS = 'status' TOP = 'top' @@ -523,22 +536,38 @@ class Request(Enum): raise ValueError('HTTP path must start with a forward slash /') return Request(path[1:]) + @staticmethod + def from_query_string(qs): + params = urllib.parse.parse_qs(qs, strict_parsing=True) + request = cgi_one_value(params, 'what') + request = Request(request) + request.disable_power = int(cgi_one_value(params, 'disable_power', '0')) + return request + def process(self): if self is Request.STATUS: return Status().complete() if self is Request.TOP: return Top().complete() + + if self in [Request.REBOOT, Request.POWEROFF] and self.disable_power: + return Response(None, HTTPStatus.FORBIDDEN) if self is Request.REBOOT: return Reboot().complete() if self is Request.POWEROFF: return Poweroff().complete() + raise NotImplementedError(f'unknown request: {self}') def process_cgi_request(): - params = cgi.FieldStorage() - what = params['what'].value - Request(what).process().write_as_cgi_script() + try: + request = Request.from_query_string(os.environ['QUERY_STRING']) + request.process().write_as_cgi_script() + except: + status = HTTPStatus.INTERNAL_SERVER_ERROR + response = Response(traceback.format_exc(), status) + response.write_as_cgi_script() def main(): diff --git a/src/server.py b/src/server.py index 75723bd..a0fa7c4 100755 --- a/src/server.py +++ b/src/server.py @@ -9,6 +9,7 @@ # custom URLs. See that file for the reasons behind this. import argparse +from http import HTTPStatus import http.server import os import sys @@ -29,16 +30,19 @@ def default_html_dir(): class RequestHandler(http.server.SimpleHTTPRequestHandler): + ARGS = None + def do_GET(self): try: request = Request.from_http_path(self.path) + request.disable_power = RequestHandler.ARGS.disable_power except ValueError: return super().do_GET() try: response = request.process() response.write_to_request_handler(self) except: - status = http.server.HTTPStatus.INTERNAL_SERVER_ERROR + status = HTTPStatus.INTERNAL_SERVER_ERROR response = Response(traceback.format_exc(), status) response.write_to_request_handler(self) return @@ -59,6 +63,8 @@ def parse_args(args=None): parser.add_argument('-p', '--port', metavar='PORT', type=int, default=DEFAULT_PORT, help='set port number') + parser.add_argument('-n', '--disable-power', action='store_true', + help='disable reboot/poweroff requests') parser.add_argument('-d', '--dir', metavar='DIR', default=default_html_dir(), help='HTML directory path') @@ -67,6 +73,7 @@ def parse_args(args=None): def main(args=None): args = parse_args(args) + RequestHandler.ARGS = args # It's a failsafe; the script is not allowed to serve a random current # working directory. |