amethyst 0018

Build 0001, first Amethyst version that starts!
First testing version of what will become 2.0
2026-01-30 08:41:30 +01:00 · 2025-08-20 23:51:31 +02:00 · 2025-08-20 15:39:14 +02:00 · 2025-08-20 13:58:58 +02:00 · 2025-07-22 16:35:39 +02:00 · 2025-07-08 15:02:50 +02:00
5 changed files with 347 additions and 164 deletions
--- a/README.md
+++ b/README.md
@@ -1,60 +1,9 @@
-# PyWebServer
+# Amethyst Web Server

-## GitHub
-The upstream of this project is on my own [Gitea instance](https://git.novacow.ch/Nova/PyWebServer/).  
-Because of that I'll mostly reply to issues and PRs there, you can submit issues and PRs on GitHub, but it might take longer before I read it.
+## A word of warning!
+Currently Amethyst is in very early alpha stage, a lot of things will be broken, names won't be correct,
+promised features missing, but I'm very much working on it live!  
+Every save I do increments the build number by 1, I won't publish all of them, but most of them will be published.  
+Once a milestone is hit (e.g. a new feature fully implemented), I'll publish a release!

-## Installing
-Installing and running PyWebServer is very simple.  
-Assuming you're running Linux:
-```bash
-git clone https://git.novacow.ch/Nova/PyWebServer.git
-cd ./PyWebServer/
-```
-Windows users, make sure you have installed Git, from there:
-```powershell
-git clone https://git.novacow.ch/Nova/PyWebServer.git
-Set-Location .\PyWebServer\
-```
-From here, you should check from what directory you want to store the content in.  
-In this example, we'll use `./html/` (or `.\html\` for Windows users) from the perspective of the PyWebServer root dir.  
-To create this directory, do this:
-```bash
-mkdir ./html/
-```
-(This applies to both Windows and Linux)  
-Then, open `pywebsrv.conf` in your favorite text editor and change the `directory` key to the full path to the `./html/` you just created.  
-After that, put your files in and run this:
-Linux:
-```bash
-python3 /path/to/pywebsrv.py
-```
-Windows:
-```powershell
-# If you have installed Python via the Microsoft Store:
-python3 \path\to\pywebsrv.py
-# Via the python.org website:
-py \path\to\pywebsrv.py
-```
-
-## SSL Support
-Currently PyWebServer warns about AutoCertGen not being installed. AutoCertGen currently is very unstable at the moment, and therefore is not available for download.  
-PyWebServer supports SSL/TLS for authentication via HTTPS. In the config file, you should enable the HTTPS port. After that you need to create the certificate.  
-Currently PyWebServer looks for the `cert.pem` and the `key.pem` files in the root directory of the installation.  
-PyWebServer comes with a test certificate, this certificate is self-signed, but doesn't have a matching issuer and subject. This is to prevent people from using it in production, even if they have disabled warnings of self-signed certificates.  
-
-## HTTP support
-Currently PyWebServer only supports HTTP/1.1, this is very unlikely to change, as most of the modern web today still uses HTTP/1.1.  
-For methods PyWebServer only supports `GET`, this is being reworked though, check issue [#3](https://git.novacow.ch/Nova/PyWebServer/issues/3) for progress.
-
-## Files support
-Unlike other small web servers, PyWebServer has full support for binary files being sent and received (once that logic is put in) over HTTP.
-
-## Support
-PyWebServer will follow a standard support scheme.
-### 1.x
-For every 1.x version there will be support until 2 newer versions come out.
-So that means that 1.0 will still be supported when 1.1 comes out, but no longer be supported when 1.2 comes out.
-### 2.x
-I am planning on releasing a 2.x version with will have a lot more advanced features, like nginx's server block emulation amongst other things.
-When 2.0 will come out, the last version of 1.x will be supported for a while longer, but no new features will be added.
+## Currently W.I.P. Check back later!
--- a/html/index.html
+++ b/html/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Test page</title>
+    <link rel="stylesheet" href="/style.css">
+</head>
+<body>
+    <center>
+    <h1>Web portal</h1>
+    <h1><a href="/d.mp4">d.mp4</a></h1>
+    <h1><a href="/webjammies/index.ini">index.ini</a></h1>
+    <h1><a href="/webjammies/rabado.mp3">rabado.mp3</a></h1>
+    <h1><a href="/webjammies/invaders.mp3">invaders.mp3</a></h1>
+    <h1><a href="/webjammies/momentum.mp3">momentum.mp3</a></h1>
+    <h1><a href="/webjammies/bacterial-love.mp3">bacterial-love.mp3</a></h1>
+    <h1><a href="/webjammies/old-money-bitch.mp3">old-money-bitch.mp3</a></h1>
+    <h1><a href="/webjammies/ravestate909.mp3">ravestate909.mp3</a></h1>
+    <h1><a href="/webjammies/leash.mp3">leash.mp3</a></h1>
+    </center>
+</body>
+</html>
--- a/new_conf.conf
+++ b/new_conf.conf
@@ -0,0 +1,36 @@
+# WARNING: This is an alpha spec of NSCL 2.0!!
+
+host 192.168.1.196 {
+    location /secrets {
+        root:/var/www/html/hidden
+        whitelist-ua:"Mozilla/5.0 (X11; Linux x86_64) Gecko/20100101 Firefox/149.0 Furfox/1.0"
+        whitelist-ip:123.45.67.89
+    }
+    directory:/home/nova/Downloads/test/html
+    allowed-methods:GET
+    block-ip:match-ip("192.168",2)
+    block-ua:match("Discordbot",0),match("Google",0)
+}
+
+host cdn.example.com {
+    directory:/home/nova/Downloads/test/cdn
+    allowed-methods:GET,PUT
+    block-ip:10.1.100.2
+    block-ua:match("Discordbot",0)
+}
+
+host modem.example.com {
+    proxy:192.168.2.254
+    key-file:/home/nova/Downloads/test/proxykey.pem
+    cert-file:/home/nova/Downloads/test/proxycert.pem
+}
+
+globals {
+    http:1
+    https:1
+    port:8080
+    https-port:8443
+    allow-localhost:1
+    global-key:/home/nova/Downloads/test/key.pem
+    global-cert:/home/nova/Downloads/test/cert.pem
+}
--- a/pywebsrv.conf
+++ b/pywebsrv.conf
@@ -4,14 +4,11 @@
 port:8080
 port-https:8443
 # Here you choose what directory PyWebServer looks in for files.
-directory:<Enter directory here>
+directory:/home/nova/PyWebServer/html
 # Host defenition, what hosts you can connect via.
 # You can use FQDNs, IP-addresses and localhost,
 # Support for multiple hosts is coming.
-host:localhost
-# Ignores the host parameter (except for localhost) and allows everything.
-# DANGER! For obvious reasons this isn't recommended.
-allow-all:0
+host:localhost,10.185.213.118
 # Enables HTTP support. (Only enables/disables the HTTP port.)
 http:1
 # Enables HTTPS support. (Only enables/disables the HTTPS port.)
@@ -24,8 +21,13 @@ allow-localhost:1
 disable-autocertgen:0
 # If you wish to block IP-addresses, this function is coming though.
 # block-ip:0.0.0.0,1.1.1.1,2.2.2.2
-# If you wish to block User-Agents, this function is coming though.
-# block-ua:(NULL)
-# This function is deprecated, allows a connection with no Host header.
-# You should NEVER have to enable this! It can pose a risk to security!
-# allow-nohost:0
+# If you wish to block User-Agents.
+block-ua:match(Discordbot),match(google)
+
+# TEST: experimental non-defined keys go here:
+# keyfile key
+key-file:/home/nova/PyWebServer/key.pem
+# certfile keys
+cert-file:/home/nova/PyWebServer/cert.pem
+# allowed-methods, csv's
+allowed-methods:GET
--- a/pywebsrv.py
+++ b/pywebsrv.py
@@ -12,6 +12,8 @@ License:
    Contact:
        E-mail: nova@novacow.ch

+NOTE: Once 2.0 is released, PyWebServer will become the Amethyst Web Server
+
 This is PyWebServer, an ultra minimalist webserver, meant to still have
 a lot standard webserver features. A comprehensive list is below:
 Features:
@@ -31,6 +33,8 @@ Simple to understand and mod codebase.
 All GNU GPL-3-or-above license. (Do with it what you want.)
 Library aswell as a standalone script:
    You can easily get access to other parts of the script if you need it.
+
+TODO: actually put normal comments in
 """

 import os
@@ -38,44 +42,48 @@ import mimetypes
 import threading
 import ssl
 import socket
+import re
 import signal
 import sys

 try:
    from certgen import AutoCertGen
 except ImportError:
-    print(
-        "WARN: You need the AutoCertGen plugin! Please install it from\n"
-        "https://git.novacow.ch/Nova/AutoCertGen/"
-    )
+    # just do nothing, it's not working anyway.
+    # print(
+    #     "WARN: You need the AutoCertGen plugin! Please install it from\n"
+    #     "https://git.novacow.ch/Nova/AutoCertGen/"
+    # )
+    pass
+
+AMETHYST_BUILD_NUMBER = "0018"
+AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/"


 class FileHandler:
    CONFIG_FILE = "pywebsrv.conf"
-    DEFAULT_CONFIG = (
-        "port:8080\nport-https:8443\nhttp:1"
-        "\nhttps:0\ndirectory:{cwd}\nhost:localhost"
-        "allow-all:1\nallow-localhost:1"
-    )
+    new_conf = "new_conf.conf"

    def __init__(self, base_dir=None):
        self.config_path = os.path.join(os.getcwd(), self.CONFIG_FILE)
+        self.new_conf = os.path.join(os.getcwd(), self.new_conf)
        self.base_dir = self.read_config("directory")
+        self.cached_conf = None
+        if not os.path.exists(self.config_path):
+            print(
+                "The pywebsrv.conf file needs to be in the same directory "
+                "as pywebsrv.py! Get the default config file from:\n"
+                "https://git.novacow.ch/Nova/PyWebServer/raw/branch/main/pywebsrv.conf"
+            )
+            exit(1)

-    def check_first_run(self):
-        if not os.path.isfile(self.config_path):
-            self.on_first_run()
-            return True
-        return False
-
-    def on_first_run(self):
-        with open(self.config_path, "w") as f:
-            f.write(self.DEFAULT_CONFIG.format(cwd=os.getcwd()))
-
-    def read_file(self, file_path):
-        if "../" in file_path:
+    def read_file(self, file_path, directory=None):
+        if "../" in file_path or "%" in file_path:
            return 403, None

+        if directory is not None:
+            full_path = os.path.join(directory, file_path.lstrip("/"))
+        else:
            full_path = os.path.join(self.base_dir, file_path.lstrip("/"))
        if not os.path.isfile(full_path):
            return 404, None
@@ -88,8 +96,8 @@ class FileHandler:
            print(f"Error reading file {full_path}: {e}")
            return 500, None

-    def write_file(self, file_path, data):
-        if "../" in file_path:
+    def write_file(self, file_path, data, directory=None):
+        if "../" in file_path or "%" in file_path:
            return 403
        full_path = os.path.join(self.base_dir, file_path.lstrip("/"))
        with open(full_path, "a") as f:
@@ -109,10 +117,11 @@ class FileHandler:
            "http",
            "https",
            "port-https",
-            "allow-all",
-            "allow-nohost",
            "allow-localhost",
            "disable-autocertgen",
+            "key-file",
+            "cert-file",
+            "block-ua"
        ]
        if option not in valid_options:
            return None
@@ -127,45 +136,100 @@ class FileHandler:
                key = key.lower()
                if key == option:
                    if option == "host":
-                        seperated_values = value.split(",", 0)
+                        seperated_values = value.split(",", -1)
                        return [value.lower() for value in seperated_values]
+                    if option == "block-ua":
+                        seperated_values = value.split(",", -1)
+                        host_to_match = []
+                        literal_blocks = []
+                        for val in seperated_values:
+                            if val.startswith("match(") and val.endswith(")"):
+                                idx = val.index("(")
+                                idx2 = val.index(")")
+                                ua_to_match = val[idx+1:idx2]
+                                host_to_match.append(ua_to_match)
+                            else:
+                                literal_blocks.append(val)
+                        return host_to_match, literal_blocks
                    if option == "port" or option == "port-https":
                        return int(value)
                    if (
                        option == "http"
                        or option == "https"
-                        or option == "allow-all"
                        or option == "allow-localhost"
                        or option == "disable-autocertgen"
-                        or option == "allow-nohost"
                    ):
                        return bool(int(value))
                    if option == "directory":
                        if value == "<Enter directory here>":
-                            print(
-                                "FATAL: You haven't set up PyWebServer! Please edit pywebsrv.conf!"
-                            )
-                            exit(1)
+                            return os.path.join(os.getcwd(), "html")
                        if value.endswith("/"):
                            value = value.rstrip("/")
                        return value
                    return value
        return None

+    def read_new_config(self, option, host=None):
+        """
+        Reads the configuration file and returns a dict
+        """
+        if self.cached_conf is None:
+            with open(self.new_conf, "r", encoding="utf-8") as fh:
+                text = fh.read()
+
+            blocks = re.findall(
+                r'^(host\s+(\S+)|globals)\s*\{([^}]*)\}', text, re.MULTILINE
+            )
+            parsed = {}
+            host_list = []
+            print(f"Blocks: {blocks}")
+            for tag, hostname, body in blocks:
+                section = hostname if hostname else "globals"
+                if hostname:
+                    host_list.append(hostname)
+                kv = {}
+                for line in body.splitlines():
+                    line = line.strip()
+                    if not line or ":" not in line or line.startswith("#"):
+                        continue
+
+                    key, rest = line.split(":", 1)
+                    key = key.strip()
+                    rest = rest.strip()
+
+                    if "," in rest:
+                        kv[key] = [item.strip() for item in rest.split(",")]
+                    else:
+                        kv[key] = rest
+            parsed[section] = kv
+            parsed["globals"]["hosts"] = host_list
+            self.cached_conf = parsed
+        else:
+            parsed = self.cached_conf
+        if option == "host":
+            try:
+                return host_list
+            except Exception:
+                return parsed["globals"]["hosts"]
+        section = parsed.get(host or "globals", {})
+        return section.get(option)
+
    def autocert(self):
        """
        Generate some self-signed certificates using AutoCertGen
+        TODO: doesn't work, need to fix. probably add `./` to $PATH
        """
+        if not os.getcwd() in sys.path:
+            sys.path.append(f"{os.getcwd()}")
        autocert = AutoCertGen()
        autocert.gen_cert()


 class RequestParser:
    def __init__(self):
-        self.allowed_methods_file = "allowedmethods.conf"
        self.file_handler = FileHandler()
-        self.hosts = self.file_handler.read_config("host")
-        self.all_allowed = self.file_handler.read_config("allow-all")
+        self.hosts = self.file_handler.read_new_config("host")
+        print(f"Hosts: {self.hosts}")

    def parse_request_line(self, line):
        """Parses the HTTP request line."""
@@ -177,6 +241,17 @@ class RequestParser:
            path += "index.html"
        return method, path, version

+    def ua_blocker(self, ua, host=None):
+        """Parses and matches UA to block"""
+        del host
+        match, literal = self.file_handler.read_config("block-ua")
+        if ua in literal:
+            return False
+        for _ua in match:
+            if _ua.lower() in ua.lower():
+                return False
+        return True
+
    def is_method_allowed(self, method):
        """
        Checks if the HTTP method is allowed.
@@ -187,9 +262,8 @@ class RequestParser:
        allowed_methods = ["GET"]
        # While the logic for PUT, DELETE, etc. is not added, we shouldn't
        # allow for it to attempt it.
-        # if os.path.isfile(self.allowed_methods_file):
-        #     with open(self.allowed_methods_file, "r") as f:
-        #         allowed_methods = [line.strip() for line in f]
+        # Prepatched for new update.
+        # allowed_methods = self.file_handler.read_config("allowed-methods")
        return method in allowed_methods

    def host_parser(self, host):
@@ -197,27 +271,34 @@ class RequestParser:
        Parses the host and makes sure it's allowed in
        Mfw im in an ugly code writing contest and my opponent is nova while writing a side project
        """
-        host = str(host)
+        host = f"{host}"
+        print(f"hosts: {self.hosts}, host: {host}, split: {host.rsplit(":", 1)[0]}")
        if ":" in host:
-            host = host.split(":", 1)[0]
+            host = host.rsplit(":", 1)[0]
        host = host.lstrip()
        host = host.rstrip()
        if (
-            host == "localhost" or host == "127.0.0.1"
-        ) and self.file_handler.read_config("allow-localhost"):
+            host == "localhost" or host == "127.0.0.1" or host == "[::1]"
+        ) and self.file_handler.read_new_config("allow-localhost"):
            return True
-        if host not in self.hosts and self.all_allowed is False:
+        if host not in self.hosts:
            return False
-        elif host not in self.hosts and self.all_allowed is True:
+        else:
            return True

+#
+# class ProxyServer:
+#     def __init__(
+#         self,
+#     ):
+

 class WebServer:
    def __init__(
        self, http_port=8080, https_port=8443, cert_file="cert.pem", key_file="key.pem"
    ):
-        self.http_port = http_port
-        self.https_port = https_port
+        self.http_port = int(http_port)
+        self.https_port = int(https_port)
        self.cert_file = cert_file
        self.key_file = key_file
        self.file_handler = FileHandler()
@@ -228,6 +309,7 @@ class WebServer:
        if not os.path.exists(self.cert_file) or not os.path.exists(self.key_file):
            if not os.path.exists(self.cert_file) and not os.path.exists(self.key_file):
                pass
+            # maybe warn users we purge their key/cert files? xdd
            elif not os.path.exists(self.cert_file):
                os.remove(self.key_file)
            elif not os.path.exists(self.key_file):
@@ -243,21 +325,26 @@ class WebServer:
                else:
                    self.skip_ssl = True

-        # TODO: change this to something like oh no you fucked up, go fix idiot
        self.no_host_req_response = (
-            "Connecting via this host is disallowed\r\n"
-            "You may also be using a very old browser!\r\n"
-            "Ask the owner of this website to set allow-all to 1!"
+            "This host cannot be reached without sending a `Host` header."
        )

-        # ipv6 when????/??//?????//?
-        self.http_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.http_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.http_socket.bind(("0.0.0.0", self.http_port))
+        # TODO: enable experimental ipv6 support in config

-        self.https_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.https_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.https_socket.bind(("0.0.0.0", self.https_port))
+        # ipv6 when????/??//?????//?
+        # self.http_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        # self.http_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        # self.http_socket.bind(("0.0.0.0", self.http_port))
+        #
+        # self.https_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        # self.https_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        # self.https_socket.bind(("0.0.0.0", self.https_port))
+
+        self.http_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        self.http_socket.bind(("::", self.http_port))
+
+        self.https_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        self.https_socket.bind(("::", self.https_port))

        if self.skip_ssl is False:
            # https gets the ssl treatment!! yaaaay :3
@@ -271,17 +358,17 @@ class WebServer:

        self.http_404_html = (
            "<html><head><title>HTTP 404 - PyWebServer</title></head>"
-            "<body><center><h1>HTTP 404 - Not Found!</h1><p>Running PyWebServer/1.2</p>"
+            f"<body><center><h1>HTTP 404 - Not Found!</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
            "</center></body></html>"
        )
        self.http_403_html = (
            "<html><head><title>HTTP 403 - PyWebServer</title></head>"
-            "<body><center><h1>HTTP 403 - Forbidden</h1><p>Running PyWebServer/1.2</p>"
+            f"<body><center><h1>HTTP 403 - Forbidden</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
            "</center></body></html>"
        )
        self.http_405_html = (
            "<html><head><title>HTTP 405 - PyWebServer</title></head>"
-            "<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running PyWebServer/1.2</p>"
+            f"<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
            "</center></body></html>"
        )

@@ -293,18 +380,23 @@ class WebServer:

        http_thread = threading.Thread(target=self.start_http, daemon=True)
        https_thread = threading.Thread(target=self.start_https, daemon=True)
+        # ipv6http_thread = threading.Thread(target=self.start_http_ipv6, daemon=True)
+        # ipv6https_thread = threading.Thread(target=self.start_https_ipv6, daemon=True)

        if https is True:
+            if self.skip_ssl is True:
+                print("WARN: You have enabled HTTPS without SSL!!")
+                yn = input("Is this intended behaviour? [y/N] ")
            https_thread.start()
+            # ipv6https_thread.start()
        if http is True:
+            # ipv6http_thread.start()
            http_thread.start()

-        # print(
-        #     f"Server running:\n - HTTP on port {self.http_port}\n - HTTPS on port {self.https_port}"
-        # )
-
        http_thread.join()
        https_thread.join()
+        # ipv6http_thread.join()
+        # ipv6https_thread.join()

    def start_http(self):
        self.http_socket.listen(5)
@@ -312,20 +404,44 @@ class WebServer:
        while self.running:
            try:
                conn, addr = self.http_socket.accept()
-                print(f"HTTP connection received from {addr}")
                self.handle_connection(conn, addr)
            except Exception as e:
                print(f"HTTP error: {e}")
            except OSError:
                break

+    def start_http_ipv6(self):
+        self.ipv6http_socket.listen(5)
+        print(f"IPv6 HTTP server listening on port {self.http_port}...")
+        while self.running:
+            try:
+                conn, addr = self.ipv6http_socket.accept()
+                self.handle_connection(conn, addr)
+            except Exception as e:
+                print(f"HTTP error: {e}")
+            except OSError:
+                break
+
+    def start_https_ipv6(self):
+        self.ipv6https_socket.listen(5)
+        print(f"IPv6 HTTPS server listening on port {self.https_port}...")
+        while self.running:
+            try:
+                conn, addr = self.ipv6https_socket.accept()
+                self.handle_connection(conn, addr)
+            except Exception as e:
+                print(
+                    f"HTTPS error: {e}"
+                )  # be ready for ssl errors if you use a self-sign!!
+            except OSError:
+                break
+
    def start_https(self):
        self.https_socket.listen(5)
        print(f"HTTPS server listening on port {self.https_port}...")
        while self.running:
            try:
                conn, addr = self.https_socket.accept()
-                print(f"HTTPS connection received from {addr}")
                self.handle_connection(conn, addr)
            except Exception as e:
                print(
@@ -338,6 +454,11 @@ class WebServer:
        try:
            data = conn.recv(512)
            request = data.decode(errors="ignore")
+            if not data:
+                response = self.build_response(400, "Bad Request")  # user did fucky-wucky
+            elif len(data) > 8192:
+                response = self.build_response(413, "Request too long")
+            else:
                response = self.handle_request(request, addr)

            if isinstance(response, str):
@@ -350,11 +471,7 @@ class WebServer:
            conn.close()

    def handle_request(self, data, addr):
-        if not data:
-            return self.build_response(400, "Bad Request")  # user did fucky-wucky
-        if len(data) > 8192:
-            return self.build_response(413, "Request too long")
-
+        print(f"data: {data}")
        request_line = data.splitlines()[0]

        # Extract host from headers, never works though
@@ -368,28 +485,44 @@ class WebServer:
                    )
                break
        else:
-            if (
-                self.file_handler.read_config("allow-nohost") is True
-            ):  # no host is stupid
-                pass
            return self.build_response(
-                403, self.no_host_req_response.encode()
-            )  # the default (i hope to god)
+                400, self.no_host_req_response.encode()
+            )
+
+        for line in data.splitlines():
+            if "User-Agent" in line:
+                ua = line.split(":", 1)[1].strip()
+                allowed = self.parser.ua_blocker(ua)
+                if not allowed:
+                    return self.build_response(
+                        403, "This UA has been blocked by the owner of this site."
+                    )
+                break
+        else:
+            return self.build_response(
+                400, "You cannot connect without a User-Agent."
+            )

        method, path, version = self.parser.parse_request_line(request_line)

+        if not all([method, path, version]):
+            return self.build_response(400, "Bad Request")
+
        # Figure out a better way to reload config
        if path == "/?pywebsrv_reload_conf=1":
            print("Got reload command! Reloading configuration...")
-            self.file_handler.base_dir = self.file_handler.read_config("directory")
-            return self.build_response(204, "")
+            self.file_handler = FileHandler()
+            self.parser = RequestParser()
+            return self.build_response(302, "")

-        if not all([method, path, version]) or not self.parser.is_method_allowed(
+        if not self.parser.is_method_allowed(
            method
        ):
            return self.build_response(405, self.http_405_html)

-        file_content, mimetype = self.file_handler.read_file(path)
+        directory = self.file_handler.read_new_config("directory", host)
+
+        file_content, mimetype = self.file_handler.read_file(path, directory)

        if file_content == 403:
            print("WARN: Directory traversal attack prevented.")  # look ma, security!!
@@ -406,35 +539,38 @@ class WebServer:
        # A really crude implementation of binary files. Later in 2.0 I'll actually
        # make this useful.
        mimetype = mimetype[0]
+        if mimetype is None:
+            # We have to assume it's binary.
+            return self.build_binary_response(200, file_content, "application/octet-stream")
        if "text/" not in mimetype:
-            return self.build_binary_response(200, file_content, path, mimetype)
+            return self.build_binary_response(200, file_content, mimetype)

        return self.build_response(200, file_content)

    @staticmethod
-    def build_binary_response(status_code, binary_data, filename, content_type):
+    def build_binary_response(status_code, binary_data, content_type):
        """Handles binary files like MP3s."""
        messages = {
            200: "OK",
            403: "Forbidden",
            404: "Not Found",
            405: "Method Not Allowed",
-            500: "Internal Server Error",
+            500: "Internal Server Error"
        }
        status_message = messages.get(status_code)
        headers = (
            f"HTTP/1.1 {status_code} {status_message}\r\n"
-            f"Server: PyWebServer/1.2\r\n"
+            f"Server: PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
            f"Content-Type: {content_type}\r\n"
            f"Content-Length: {len(binary_data)}\r\n"
            f"Connection: close\r\n\r\n"
            # Connection close is done because it is way easier to implement.
            # It's not like this program will see production use anyway.
+            # Tbh when i'll implement HTTP2
        )
        return headers.encode() + binary_data

-    @staticmethod
-    def build_response(status_code, body):
+    def build_response(self, status_code, body):
        """
        For textfiles we'll not have to guess MIME-types, though the other function
        build_binary_response will be merged in here anyway.
@@ -442,6 +578,7 @@ class WebServer:
        messages = {
            200: "OK",
            204: "No Content",
+            302: "Found",
            304: "Not Modified",  # TODO KEKL
            400: "Bad Request",
            403: "Forbidden",
@@ -449,16 +586,42 @@ class WebServer:
            405: "Method Not Allowed",
            413: "Payload Too Large",
            500: "Internal Server Error",
-            635: "Go Away",
+            635: "Go Away"
        }
        status_message = messages.get(status_code)

        if isinstance(body, str):
            body = body.encode()

+        # TODO: dont encode yet, and i encode. awesome comments here.
+        # Don't encode yet, if 302 status code we have to include location.
        headers = (
            f"HTTP/1.1 {status_code} {status_message}\r\n"
-            f"Server: PyWebServer/1.2\r\n"
+            f"Server: PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
+            f"Content-Length: {len(body)}\r\n"
+            f"Connection: close\r\n\r\n"
+        ).encode()
+
+        if status_code == 302:
+            # 302 currently only happens when the reload is triggered.
+            # Why not 307, Moved Permanently? Because browsers will cache the
+            # response and not send the reload command.
+            host = self.file_handler.read_config("host")[0]
+            port = self.file_handler.read_config("port-https") or self.file_handler.read_config("port")
+            if port != 80 and port != 443:
+                if port == 8443:
+                    host = f"https://{host}:{port}/"
+                else:
+                    host = f"http://{host}:{port}/"
+            else:
+                if port == 443:
+                    host = f"https://{host}/"
+                else:
+                    host = f"http://{host}/"
+            headers = (
+                f"HTTP/1.1 {status_code} {status_message}\r\n"
+                f"Location: {host}\r\n"
+                f"Server: PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
                f"Content-Length: {len(body)}\r\n"
                f"Connection: close\r\n\r\n"
            ).encode()
@@ -474,13 +637,25 @@ class WebServer:


 def main():
+    print(
+        "WARNING!!\n"
+        f"This is Amethyst alpha build {AMETHYST_BUILD_NUMBER}\n"
+        "Since this is an alpha version of Amethyst, most features aren't working!\n"
+        "These builds are also very verbose and will spit out a lot on the terminal. "
+        "As you can imagine, this is for debugging purposes.\n"
+        "THERE IS ABSOLUTELY NO SUPPORT FOR THESE VERSIONS!\n"
+        "DO NOT USE THEM IN PRODUCTION SETTINGS!\n"
+        f"Please report any bugs on {AMETHYST_REPO}\n"
+    )
+    input("Press <Enter> to continue. ")
    file_handler = FileHandler()
-    file_handler.check_first_run()
    file_handler.base_dir = file_handler.read_config("directory")
-    http_port = file_handler.read_config("port") or 8080
-    https_port = file_handler.read_config("port-https") or 8443
-    http_enabled = file_handler.read_config("http") or True
-    https_enabled = file_handler.read_config("https") or False
+    http_port = file_handler.read_new_config("port") or 8080
+    https_port = file_handler.read_new_config("port-https") or 8443
+    http_enabled = bool(file_handler.read_new_config("http")) or True
+    print(http_enabled)
+    https_enabled = bool(file_handler.read_new_config("https")) or False
+    print(https_enabled)
    server = WebServer(http_port=http_port, https_port=https_port)
    server.start(http_enabled, https_enabled)
Author	SHA1	Message	Date
Nova	36c8c95efe	amethyst 0018	2026-01-30 08:41:30 +01:00
Nova	f5dafb689e	Build 0001, first Amethyst version that starts!	2025-08-20 23:51:31 +02:00
Nova	4eada65040	First testing version of what will become 2.0 Partial new config functionality.	2025-08-20 15:39:14 +02:00
Nova	4d4a44fd06	v1.4, first parts of 2.0 are merged in	2025-08-20 13:58:58 +02:00
Nova	a36141edd0	release for 1.3.0 minor update, got ua blocking working and match statements in config	2025-07-22 16:35:39 +02:00
Stan	0b57578cc4	Updated README to reflect project updates	2025-07-08 15:02:50 +02:00
Stan	d6fdc5c63d	v1.2.1: small bugfixes and welcome page.	2025-07-08 14:37:27 +02:00