Merge branch '2.0' of https://git.novacow.ch/Nova/PyWebServer into 2.0

Actually working properly!

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog from 0.2.0 to 0.3.0
+
+## Major changes
+
+* Improved multithreading engine to be actually multithreaded
+
+* Gave the Python extension a beter name
+
+* Getting ready for feature-freeze.
+
+## Minor changes
+
+* Fixed bugs pertaining to proxy
+
+* Attempted fix at hanging socket by introducing a default 2 second timeout.
+
+## Configuration changes
+
+* Added a new `threading` key to define if threading should be enabled.
+
+

PES.md

@@ -0,0 +1,43 @@
+# PES
+
+This is a quick reference document on how to implement PES.
+
+## Example script:
+
+The default script is the following:
+
+```python
+import sys
+import os
+
+if not os.getcwd() in sys.path:
+    sys.path.append(os.getcwd())
+import amethyst
+
+
+class PES:
+    def __init__(self):
+        # DO NOT USE THIS FUNCTION FOR PROGRAM, ONLY ON_REQUEST PLEASE!!
+        # WARNING: ONLY CHANGE THE THREAD_SAFETY VARIABLE! DO NOT ADD OR REMOVE ANYTHING!
+        # THEY WILL COMPROMISE ANY THREAD-SAFETY SECURITY MECHANISMS AMETHYST HAS IN PLACE!
+        # YOU HAVE BEEN WARNED!
+        self.build_response = amethyst.WebServer.build_binary_response
+        self.fh = amethyst.FileHandler("..")
+        self.rq = amethyst.RequestParser()
+        self.THREAD_SAFETY: bool = True
+
+    def on_request(self, req):
+        return self.build_response(200, b"Heyhey! This is the default PES script!", "text/html")
+```
+
+## Threading and Thread-safety.
+
+When you execute PES scripts, they have a high chance of not being thread-safe because they edit the page you visit. It means you cannot guarantee the data you want is actually the data getting sent over the wire. This issue can be fixed in multiple ways:
+
+1. Disabling threading, then only one script can run at once, but this costs a lot of performance
+
+2. Enforcing thread-safety on all scripts, this will mean every script can be trusted, but makes development difficult (especially for people with no coding experience)
+
+3. Implementing mechanisms that will try to patch up holes if threading is enabled and a thread-unsafe script is loaded.
+
+Amethyst uses fix 3. It only allows one script to run at a time (if both threading is enabled and a thread-unsafe script is loaded), but if you specify only one host to use PES, all other hosts still enjoy the benefits of a multithreaded server! This makes sure that if user 1 and user 2 both request something and PES is involved, user 1 receives part of the data they want and part of the data user 2 wants and vice versa. This security mechanism only works if you respect them. Amethyst will throw a warning if you have a situation you have an unsafe script and run threaded, this warning isn't critical, as the script will still execute with security mechanisms, but the warning in the script is clear. Amethyst can't help if you make it explicitly unsafe yourself.

README.md

@@ -1,9 +1,117 @@
 # Amethyst Web Server
 
 ## 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.  
+Every save I do increments the build number by 1, I won't publish all of them, but some of them will be published.  
 Once a milestone is hit (e.g. a new feature fully implemented), I'll publish a release!
 
-## Currently W.I.P. Check back later!
+## Approaching 1.0.0!
+
+I have feature-freezed the project! Any further release is just cleaning up the codebase and getting some snazzy new default webpage or something idk yet xdd.
+
+## Currently working features:
+
+* New configuration!
+* Fixed **A LOT** of unreported bugs from the old code.
+* More resilliency against errors.
+* Improved security.
+* Proxy almost working!
+* Multithreading!
+* Python Execution Script!
+
+## Project status:
+
+Amethyst will stay in beta for a while, I want all features to work, but I will make pre-release versions that are mostly stable.  
+They can be found as the `amethyst-prerel-0.a.b` releases. I won't guarantee 100% stability, but waay more than just some random build.  
+
+## Install instructions:
+
+Install Python, execute `amethyst.py` and change the provided config.
+
+## Minimum requirements:
+
+Python 3.10+  
+And whatever PC that happens to run that.  
+I recommend Python 3.12 or above though, with a PC running:
+
+* Windows 8.1+
+* macOS 10.15+
+* Linux 4.19+
+* FreeBSD 13.2R+
+* Some other somewhat recent OS.
+
+## The webserver itself:
+
+The Amethyst webserver is meant to be easy to use and configure. Its configuration takes inspiration from nginx and Caddyfile.  
+The language the configuration is made in is AmethystConf.
+The default config is as follows:
+
+```amethystconf
+host * {
+    directory:./html
+    pesmode:0
+    index:index.html
+}
+
+globals {
+    http:1
+    https:1
+    port:8080
+    https-port:8443
+    key:./key.pem
+    cert:./cert.pem
+    max-length:8192
+    threading:1
+}
+```
+
+It uses a key-value syntax, and uses a `:` as its seperator. A few key directives:  
+`host`, followed by a hostname signifies a host that will be available. Similar to nginx's `server_name` directive.  
+`globals` signifies all values that are of global importance, like the key and certificate file.  
+`directory` signifies the directory to look in for files on that specific host.  
+`index`, while not in the default config, signifies what path should be returned if the client only asks for `/` (or any subpaths without files).  
+`pesmode` signifies if the PES mode must be enabled, allowing the server to run custom Python code to manipulate the request or file further.  
+`block-ua` signifies if a specific (or loosely matched) User-Agent must be blocked from accessing the site.  
+`proxy` signifies if a the server needs to get the response from a different (remote) server but still needs to be available at this host.  
+`max-length` signifies the maximum length a request may have.  
+`threading` signifies if the threading engine should be enabled. This will lend more performance, but should be disabled if you use scripts that are not thread-safe.  
+AmethystConf has only 4 datatypes: `String`, `Boolean`, `Function` and `None`. A quick rundown:  
+`String` is the everything datatype. Everything is assumed to be a `String` unless it falls under the other categories.  
+`Boolean` is the datatype used to enable/disable features. A `Boolean` can have one of two possible values: `1` or `0`.  
+`Function` is the datatype used in `match()`, it signifies that the parser has to do some work on this string before it can use it.  
+`None` is the datatype assigned to any key without a value.  
+
+## PES (Python Extension Script)
+
+The PES (Python Extension Script) is one of Amethysts main selling points. It's a new type of a dynamic page. A PES file is pretty much a 
+Python script with some conventions. Currently it is in very alpha form. It will be heavily improved upon to make sure even people with no 
+Python knowledge can work with it. Here's how it works:  
+If PES mode is enabled, the request is sent to the `pes.py` script, more specifically, the `on_request(req)` function of the `PES()` class.  
+From there, the decoded request is given to you to play with. All of Amethysts request and file processing tools are available, and soon 
+a function will be added to hand the request back to Amethyst, if it is deemed not suitable for PES mode.  
+Once you're done manipulating the request, all you have to do is call `return self.build_response(http_status_code, resp_body, mimetype)` and Amethyst will handle the rest.  
+A few examples of what can be achieved with PES mode without writing any other language than Python, HTML and CSS:
+
+* Showing a random image from the `/pics` folder upon requesting `/randompic` from the server
+* Dynamically updating the time on a website
+* Create a complex calculator
+* Upload files to the server
+* Lock down webpages with a login prompt.
+* And much, much more.  
+
+While it might not be able to create truly dynamic pages (since PES runs server-side, not client-side), it is dynamically static, basically, it's a dynamic page until it's rendered
+in browser, where it's static, as PES cannot change anything there.  
+**WARNING!**
+PES is an advanced feature! You can absolutely compromise the security of your webserver by having a misconfigured PES file. While Amethyst still has a few protection measures built-in
+that activate before any request reaches the PES, but some are bypassed unless manually invoked in the PES. Because of that, here's a general user advisory:
+
+* Use `self.fh.read_file(file_path, host=None)` instead of `open(file_path)` because of file inclusion or directory traversal concerns.
+* Use `self.fh.write_file(file_path, host=None)` instead of `open(file_path)` because of file inclusion or directory traversal concerns.
+* **NEVER** allow the PES to run shell code!
+* **NEVER** allow the PES to run **ANYTHING** uploaded via the internet!
+* Try running as much of the code locally, getting data from the internet can not only take long, it can also pose a security risk.  
+
+The PES will **NOT** warn you if you have security issues, it's a very hands-off approach. The PES will happily run `sudo rm -rf / --no-preserve-root` if given the command and
+setup for shell execution and not tell you until everything is gone. Prevent those scenarios by limiting what PES does as much as possible!

amethyst.conf

@@ -0,0 +1,18 @@
+# WARNING: This is an alpha spec of NSCL 2.0!!
+
+host * {
+    directory:./html
+    pesmode:0
+    index:index.html
+}
+
+globals {
+    http:1
+    https:1
+    port:8080
+    https-port:8443
+    key:./key.pem
+    cert:./cert.pem
+    max-length:8192
+    threading:1
+}

amethyst.py

@@ -0,0 +1,843 @@
+"""
+License:
+     PyWebServer
+     Copyright (C) 2025 Nova
+
+     This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+    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:
+HTTP and HTTPS support.
+Automatically generate certificates using AutoCertGen plugin.
+Blocking per host.
+Easy port configuration.
+Easy to understand documentation and configuration.
+Very small size, compared to something like Apache and NGINX.
+No compromise(-ish) security:
+    Directory traversal attack prevention.
+    No fuss HTTPS setup.
+    Per-host blocking.
+    Ability for per-IP blocking.
+    Ability for per-UA blocking.
+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
+
+TODO: INPROG: add typing to all code, new code will feature it by default.
+"""
+# Stable imports go here
+import sys
+import threading
+import os
+import mimetypes
+import threading
+import ssl
+import socket
+import signal
+import select
+# Experimental imports go here
+
+try:
+    if not os.getcwd() in sys.path:
+        sys.path.append(f"{os.getcwd()}")
+    from .certgen import AutoCertGen
+except ImportError:
+    # 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 = "0.99.0-0134-ff"
+AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/"
+
+
+class ConfigParser:
+    def __init__(self, text):
+        self.data: dict = {"hosts": {}, "globals": {}}
+        self._parse(text)
+
+    def _parse(self, text):
+        lines: list = [
+            line.strip()
+            for line in text.splitlines()
+            if line.strip() and not line.strip().startswith("#")
+        ]
+
+        current_block: tuple | None = None
+        current_name: str | None = None
+
+        for line in lines:
+            if line.startswith("host ") and line.endswith("{"):
+                current_name = line.split()[1]
+                self.data["hosts"][current_name] = {}
+                current_block = ("host", current_name)
+                continue
+
+            if line == "globals {":
+                current_block = ("globals", None)
+                continue
+
+            if line == "}":
+                current_block = None
+                current_name = None
+                continue
+
+            if ":" in line and current_block:
+                key, value = line.split(":", 1)
+                key: str = key.strip()
+                value: str = value.strip()
+
+                if "," in value:
+                    value = [v.strip() for v in value.split(",")]
+
+                if current_block[0] == "host":
+                    self.data["hosts"][current_name][key] = value
+                else:
+                    self.data["globals"][key] = value
+
+    def query_config(self, key, host=None):
+        if host:
+            value = self.data["hosts"].get(host, {}).get(key)
+        elif key == "hosts":
+            value = list(self.data["hosts"].keys())
+        else:
+            value = self.data["globals"].get(key)
+        if value == "0" or value == "1":
+            value = int(value)
+        return value
+
+
+class FileHandler:
+    def __init__(self, base_dir=None):
+        # this is a fucking clusterfuck.
+        self.config_file = "amethyst.conf"
+        self.config_path = os.path.join(os.getcwd(), self.config_file)
+        with open(self.config_path, "r") as f:
+            self.cfg = ConfigParser(f.read())
+        self.base_dir = self.read_config("directory")
+        if not os.path.exists(self.config_path):
+            # uuh???
+            print(
+                "The amethyst.conf file needs to be in the same directory "
+                "as amethyst.py! Get the default config file from:\n"
+                "https://git.novacow.ch/Nova/PyWebServer/raw/branch/2.0/amethyst.conf"
+            )
+            exit(1)
+        # TODO: fix this please!!
+
+    def read_file(self, file_path, directory=None):
+        if "../" in file_path or "%" in file_path:
+            return 403, None
+        if file_path == "pes.py":
+            return 404, 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
+
+        try:
+            mimetype = mimetypes.guess_type(full_path)
+            with open(full_path, "rb") as f:
+                return f.read(), mimetype
+        except Exception as e:
+            print(f"Error reading file {full_path}: {e}")
+            return 500, None
+
+    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, "wb") as f:
+            f.write(data)
+        return 0
+
+    def read_config(self, key, host_name=None):
+        return self.cfg.query_config(key, host_name)
+
+    def autocert(self):
+        """
+        Generate some self-signed certificates using AutoCertGen
+        TODO: doesn't work, need to fix. probably add `./` to $PATH
+        """
+        autocert = AutoCertGen()
+        autocert.gen_cert()
+
+
+class RequestParser:
+    def __init__(self):
+        self.file_handler = FileHandler()
+        self.hosts = self.file_handler.read_config("hosts")
+
+    def extract_header(self, header: str, request: bytes | str):
+        if isinstance(request, bytes):
+            request = request.decode("iso-8859-1", "ignore")
+        lines = request.splitlines()
+        for line in lines:
+            if line.startswith(header):
+                value = line.split(":")[1][1:]
+                return value
+        return None
+
+    def parse_request_line(self, line, host, no_mod=False):
+        """Parses the HTTP request line."""
+        try:
+            method, path, version = line.split(" ")
+        except ValueError:
+            return None, None, None
+        if (path.endswith("/") or ("." not in path)) and (not no_mod):
+            if not path.endswith("/"):
+                path += "/"
+            index = self.file_handler.read_config("index", host) or "index.html"
+            path += f"{index}"
+        return method, path, version
+
+    def parse_match_blocks(self, to_parse: str | list):
+        if isinstance(to_parse, str):
+            to_parse = [to_parse]
+        match = []
+        literal = []
+        for block in to_parse:
+            if block.startswith('match("'):
+                adx = block[7:-2]
+                match.append(adx)
+            else:
+                literal.append(block)
+        return match, literal
+
+    def ua_is_allowed(self, ua, host=None):
+        """Parses and matches UA to block"""
+        # return True
+        _list = self.file_handler.read_config("block-ua", host)
+        if _list is None:
+            return True
+        match, literal = self.parse_match_blocks(_list)
+        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, host=None):
+        """
+        Checks if the HTTP method is allowed.
+        Reads allowed methods from a configuration file.
+        Falls back to allowing only 'GET' if the file does not exist.
+        Should (for now) only be GET as I haven't implemented the logic for PUT
+        """
+        allowed_methods = self.file_handler.read_config("allowed-methods", host)
+        if allowed_methods is None:
+            allowed_methods = ["GET"]
+        return method in allowed_methods
+
+    def host_parser(self, host):
+        """
+        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 = f"{host}"
+        if ":" in host:
+            host = host.rsplit(":", 1)[0]
+        host = host.lstrip()
+        host = host.rstrip()
+        if self.hosts is None:
+            return True
+        if host not in self.hosts:
+            if "*" in self.hosts:
+                return "catchall"
+            return False
+        else:
+            return True
+
+
+class ProxyServer:
+    def __init__(self, fh):
+        self.file_handler: FileHandler = fh
+        self.rq: RequestParser = RequestParser()
+
+    @staticmethod
+    def recv_all(sock):
+        chunks = []
+        while True:
+            try:
+                data = sock.recv(4096)
+                if not data:
+                    break
+                chunks.append(data)
+            except socket.timeout:
+                break
+        return b"".join(chunks)
+
+    def try_connection(
+        self, host: str, port: int, data: bytes, chost: str, force_tls: bool = None
+    ):
+        nhost = self.file_handler.read_config("proxy", chost)
+        # nhost will include http or https.
+        if nhost.startswith("https"):
+            nhost = nhost[6:-1]
+            do_tls = True
+        elif nhost.startswith("http"):
+            nhost = nhost[5:-1]
+            do_tls = False
+        else:
+            raise SyntaxError(
+                "Syntax error in config! Key: `proxy` Reason: `Expected http([...]) or https([...]), not "
+                f"{nhost[:6]}[...]{nhost[-1:]}!`"
+            )
+        if force_tls is True:
+            do_tls = True
+        if ":" in nhost:
+            nport = int(nhost.split(":")[1])
+            nhost = nhost.split(":")[0]
+        else:
+            nport = port
+        data = self.reset_host(nhost, nport, data)
+        try:
+            return self.tcp_send(nhost, nport, data, do_tls)
+        except Exception as e:
+            raise Exception(f"Server replied unexpected. Reply from Python subsystem: {e}")
+
+    @staticmethod
+    def reset_host(host: str, port: int, data: bytes):
+        header_end = data.find(b"\r\n\r\n")
+
+        if header_end == -1:
+            return data
+
+        header_bytes = data[:header_end]
+        body = data[header_end + 4:]
+
+        headers = header_bytes.decode("iso-8859-1")
+
+        lines = headers.split("\r\n")
+        new_lines = []
+
+        for line in lines:
+            lower = line.lower()
+
+            if lower.startswith("host:"):
+                if port not in [80, 443]:
+                    line = f"Host: {host}:{port}"
+                else:
+                    line = f"Host: {host}"
+
+            elif lower.startswith("connection:"):
+                line = "Connection: close"
+
+            new_lines.append(line)
+
+        rebuilt_headers = "\r\n".join(new_lines).encode("iso-8859-1")
+
+        return rebuilt_headers + b"\r\n\r\n" + body
+
+    @staticmethod
+    def create_tls_context():
+        ctx = ssl.create_default_context()
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
+        return ctx
+
+    def tcp_send(self, host, port, data: bytes, do_tls: booll):
+        try:
+            with socket.create_connection((host, port), timeout=10) as raw_sock:
+                raw_sock.settimeout(10)
+                if do_tls:
+                    ctx = self.create_tls_context()
+                    server_hostname = host
+                    with ctx.wrap_socket(
+                        raw_sock, server_hostname=server_hostname
+                    ) as ssock:
+                        ssock.sendall(data)
+                        resp = self.recv_all(ssock)
+                        if self.rq.extract_header("Transfer-Encoding", resp) == "chunked":
+                            ssock.sendall(b"TRANSER-ENCODING IS NOT SUPPORTED")
+                            ssock.close()
+                            resp = (
+                                "HTTP/1.1 502 Gateway Error\r\nConnection: close\r\nContent-Length: 270\r\n"
+                                f"Server: Amethyst/build-{AMETHYST_BUILD_NUMBER}\r\n\r\n"
+                                "Gateway Error.\nThe upstream server tried to use a a transfer mode not "
+                                "yet supported\nExact error:\nE_DATA_STREAMING_NOT_SUPPORTED\n"
+                                "The unsupported mode:\nTransfer-Encoding: chunked.\n"
+                                "There is no fix. The problem lies with the proxy, and is not a fault of the upstream server."
+                            )
+                        return resp
+                else:
+                    raw_sock.sendall(data)
+                    resp = self.recv_all(raw_sock)
+                    if self.rq.extract_header("Transfer-Encoding", resp) is not None:
+                        raw_sock.sendall(b"TRANSER-ENCODING IS NOT SUPPORTED")
+                        raw_sock.close()
+                        resp = (
+                            "HTTP/1.1 502 Gateway Error\r\nConnection: close\r\nContent-Length: 270\r\n"
+                            f"Server: Amethyst/build-{AMETHYST_BUILD_NUMBER}\r\n\r\n"
+                            "Gateway Error.\nThe upstream server tried to use a a transfer mode not "
+                            "yet supported\nExact error:\nE_DATA_STREAMING_NOT_SUPPORTED\n"
+                            "The unsupported mode:\nTransfer-Encoding: chunked.\n"
+                            "There is no fix. The problem lies with the proxy, and is not a fault of the upstream server."
+                        )
+                    return resp
+        except Exception:
+            raise
+
+
+class WebServer:
+    def __init__(
+        self, http_port=8080, https_port=8443, cert_file="cert.pem", key_file="key.pem"
+    ):
+        self.http_port = int(http_port)
+        self.https_port = int(https_port)
+        self.file_handler = FileHandler()
+        self.parser = RequestParser()
+        self.cert_file = self.file_handler.read_config("cert") or cert_file
+        self.key_file = self.file_handler.read_config("key") or key_file
+        self.max_length = int(self.file_handler.read_config("max-length")) or 8192
+        self.skip_ssl = False
+        self.threading = bool(self.file_handler.read_config("threading"))
+        self.tlock = threading.Lock()
+
+        # me when no certificate and key file
+        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):
+                os.remove(self.cert_file)
+            print("WARN: No HTTPS certificate was found!")
+            if self.file_handler.read_config("disable-autocertgen") is True:
+                print("WARN: AutoCertGen is disabled, ignoring...")
+                self.skip_ssl = True
+            else:
+                choice = input("Do you wish to generate an HTTPS certificate? [y/N] ")
+                if choice.lower() == "y":
+                    self.file_handler.autocert()
+                else:
+                    self.skip_ssl = True
+
+        self.no_host_req_response = (
+            "This host cannot be reached without sending a `Host` header."
+        )
+
+        self.http_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        self.http_socket.bind(("::", self.http_port))
+
+        self.https_socket_raw = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        self.https_socket_raw.bind(("::", self.https_port))
+
+        self.proxy_handler = ProxyServer(self.file_handler)
+
+        if self.skip_ssl is False:
+            # https gets the ssl treatment!! yaaaay :3
+            self.ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+            self.ssl_context.load_cert_chain(
+                certfile=self.cert_file, keyfile=self.key_file
+            )
+            self.https_socket = self.ssl_context.wrap_socket(
+                self.https_socket_raw, server_side=True
+            )
+
+        self.http_404_html = (
+            "<html><head><title>HTTP 404 - Amethyst</title></head>"
+            f"<body><center><h1>HTTP 404 - Not Found!</h1><p>Running Amethyst/build-{AMETHYST_BUILD_NUMBER}</p>"
+            "</center></body></html>"
+        )
+        self.http_403_html = (
+            "<html><head><title>HTTP 403 - Amethyst</title></head>"
+            f"<body><center><h1>HTTP 403 - Forbidden</h1><p>Running Amethyst/build-{AMETHYST_BUILD_NUMBER}</p>"
+            "</center></body></html>"
+        )
+        self.http_405_html = (
+            "<html><head><title>HTTP 405 - Amethyst</title></head>"
+            f"<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running Amethyst/build-{AMETHYST_BUILD_NUMBER}</p>"
+            "</center></body></html>"
+        )
+
+        self.running = True
+
+    def start(self, http, https):
+        signal.signal(signal.SIGINT, self.shutdown)
+        signal.signal(signal.SIGTERM, self.shutdown)
+
+        http_thread = threading.Thread(target=self.start_http, daemon=True)
+        https_thread = threading.Thread(target=self.start_https, 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] ")
+                if yn.lower() == "n":
+                    exit(1)
+            https_thread.start()
+        else:
+            self.https_socket.close()
+        if http is True:
+            http_thread.start()
+        else:
+            self.http_socket.close()
+
+        http_thread.join()
+        https_thread.join()
+
+    def start_http(self):
+        self.http_socket.listen(5)
+        print(f"HTTP server listening on port {self.http_port}...")
+        while self.running:
+            try:
+                ready, _, _ = select.select(
+                    [self.http_socket],
+                    [],
+                    [],
+                    1.0
+                )
+                if not ready:
+                    continue
+                conn, addr = self.http_socket.accept()
+                conn.settimeout(2)
+                if self.threading:
+                    threading.Thread(
+                        target=self.handle_connection,
+                        args=(conn, addr),
+                        daemon=True
+                    ).start()
+                else:
+                    self.handle_connection(conn, addr)
+            except socket.timeout:
+                continue
+            except OSError as e:
+                if not self.running:
+                    break
+                continue
+            except Exception as e:
+                print(f"HTTP error: {e}")
+
+    def start_https(self):
+        self.https_socket.listen(5)
+        print(f"HTTPS server listening on port {self.https_port}...")
+        while self.running:
+            try:
+                ready, _, _ = select.select(
+                    [self.https_socket],
+                    [],
+                    [],
+                    1.0
+                )
+                if not ready:
+                    continue
+                conn, addr = self.https_socket.accept()
+                conn.settimeout(2)
+                if self.threading:
+                    threading.Thread(
+                        target=self.handle_connection,
+                        args=(conn, addr),
+                        daemon=True
+                    ).start()
+                else:
+                    self.handle_connection(conn, addr)
+            except socket.timeout:
+                continue
+            except OSError as e:
+                if not self.running:
+                    break
+                continue
+            except Exception as e:
+                print(f"HTTPS error: {e}")
+
+    def handle_connection(self, conn, addr):
+        try:
+            data = b""
+            # Read headers
+            while b"\r\n\r\n" not in data:
+                chunk = conn.recv(4096)
+                if not chunk:
+                    break
+                data += chunk
+
+            headers, _, rest = data.partition(b"\r\n\r\n")
+
+            # Parse Content-Length
+            content_length = 0
+            for line in headers.split(b"\r\n"):
+                if line.lower().startswith(b"content-length:"):
+                    content_length = int(line.split(b":")[1].strip())
+
+            # Read body
+            body = rest
+            while len(body) < content_length:
+                chunk = conn.recv(4096)
+                if not chunk:
+                    print("\n\nsocket closed\n\n")
+                    break
+                body += chunk
+
+            data += body
+            request = data.decode("iso-8859-1", errors="ignore")
+            if not data:
+                response = self.build_response(
+                    400, "Bad Request"
+                )  # user did fucky-wucky
+            elif len(data) > self.max_length:
+                response = self.build_response(413, "Request too long")
+            else:
+                response = self.handle_request(request, addr)
+
+            if isinstance(response, str):
+                response = response.encode()
+
+            conn.sendall(response)
+        except Exception as e:
+            print(f"Error handling connection: {e}")
+            response = self.build_response(
+                500,
+                "Amethyst is currently unable to serve your request. Below is debug info.\r\n"
+                f"Error: {e}; Version: amethyst-b{AMETHYST_BUILD_NUMBER}\r\n"
+                "You cannot do anything at this time, the server owner has made a misconfiguration or there is a bug in the program",
+            )
+            conn.sendall(response)
+        finally:
+            conn.close()
+
+    def handle_request(self, data, addr):
+        request_line = data.splitlines()[0]
+
+        for line in data.splitlines():
+            if "Host" in line:
+                host = line.split(":", 1)[1].strip()
+                allowed = self.parser.host_parser(host)
+                if allowed == "catchall":
+                    host = "*"
+                    allowed = True
+                if not allowed:
+                    return self.build_response(
+                        403, "Connecting via this host is disallowed."
+                    )
+                break
+        else:
+            return self.build_response(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_is_allowed(ua, host)
+                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.")
+
+        if ":" in host:
+            host = host.rsplit(":", 1)[0]
+        else:
+            host = host
+
+        method, path, version = self.parser.parse_request_line(request_line, host)
+
+        if not all([method, path, version]):
+            return self.build_response(400, "Bad Request")
+
+        if self.file_handler.read_config("proxy", host) is not None:
+            orig_host = host
+            value = self.file_handler.read_config("proxy", host)
+            if ":" in value:
+                host = value.split(":")[0]
+                port = int(value.split(":")[1][:-1])
+            else:
+                host = value
+                port = 443
+            return self.proxy_handler.try_connection(
+                host,
+                port,
+                data.encode("iso-8859-1"),
+                orig_host,
+            )
+
+        # Figure out a better way to reload config
+        if path == "/?pywebsrv_reload_conf=1":
+            print("Got reload command! Reloading configuration...")
+            self.file_handler = FileHandler()
+            self.parser = RequestParser()
+            return self.build_response(302, "", host=host)
+
+        if not self.parser.is_method_allowed(method):
+            return self.build_response(405, self.http_405_html)
+
+        directory = (
+            self.file_handler.read_config("directory", host)
+            or self.file_handler.base_dir
+        )
+
+        if bool(self.file_handler.read_config("pesmode", host)) is True:
+            if not os.path.join(os.getcwd(), directory) in sys.path:
+                sys.path.append(f"{os.path.join(os.getcwd(), directory)}")
+            import pes
+            try:
+                pesclass = pes.PES()
+                threadcompat = pesclass.THREAD_SAFETY
+                if not threadcompat and self.threading is True:
+                    print(
+                        "PES is not thread-safe yet threading is enabled!\n"
+                        "Amethyst CANNOT guarantee data intergity!\n"
+                        "It is HIGHLY recommended you make your script thread-safe!\n"
+                    )
+                    with self.tlock:
+                        return pesclass.on_request(data)
+                return pesclass.on_request(data)
+            except Exception as e:
+                return self.build_response(
+                    500,
+                    "Amethyst is currently unable to serve your request. Below is debug info.\r\n"
+                    f"Error: {e}; Version: amethyst-b{AMETHYST_BUILD_NUMBER}\r\n"
+                    "You cannot do anything at this time, the server owner has made a misconfiguration in their Python Extension Script",
+                )
+
+        if bool(self.file_handler.read_config("621mode", host)) is True:
+            return self.build_response(621, "")
+
+        file_content, mimetype = self.file_handler.read_file(path, directory)
+
+        if file_content == 403:
+            return self.build_response(403, self.http_403_html)
+        if file_content == 404:
+            return self.build_response(404, self.http_404_html)
+        if file_content == 500:
+            return self.build_response(
+                500,
+                "Amethyst has encountered a fatal error and cannot serve "
+                "your request. Contact the owner with this error: FATAL_FILE_RO_ACCESS",
+            )  # When there was an issue with reading we throw this.
+
+        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, mimetype)
+
+        return self.build_response(200, file_content)
+
+    @staticmethod
+    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",
+        }
+        status_message = messages.get(status_code)
+        headers = (
+            f"HTTP/1.1 {status_code} {status_message}\r\n"
+            f"Server: Amethyst/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.
+        )
+        return headers.encode() + binary_data
+
+    @staticmethod
+    def build_response(status_code, body, host=None):
+        """
+        For textfiles we'll not have to guess MIME-types, though the other function
+        build_binary_response will be merged in here anyway.
+        """
+        messages = {
+            200: "OK",
+            204: "No Content",
+            302: "Found",
+            400: "Bad Request",
+            403: "Forbidden",
+            404: "Not Found",
+            405: "Method Not Allowed",
+            413: "Payload Too Large",
+            500: "Internal Server Error",
+            621: "fuck off! :3",
+        }
+        status_message = messages.get(status_code)
+
+        if isinstance(body, str):
+            body = body.encode()
+
+        headers = (
+            f"HTTP/1.1 {status_code} {status_message}\r\n"
+            f"Server: 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:
+            headers = (
+                f"HTTP/1.1 {status_code} {status_message}\r\n"
+                f"Location: {host}\r\n"
+                f"Server: 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 == 621:
+            headers = (
+                "HTTP/1.1 302 UwU Nya!\r\n"
+                "Server: Amethyst/build-0621\r\n"
+                "Content-Length: 0\r\n"
+                "Connection: close\r\n"
+                "Note: congrats, you found a funny. i guess.\r\n"
+                "Host: https://e621.net/posts/\r\n\r\n"
+            ).encode("iso-8859-1")
+            body = "".encode("iso-8859-1")
+        return headers + body
+
+    def shutdown(self, signum, frame):
+        print("\nRecieved signal to exit!\nShutting down server...")
+        self.running = False
+        self.http_socket.close()
+        self.https_socket.close()
+
+
+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.base_dir = file_handler.read_config("directory")
+    http_port = file_handler.read_config("port")
+    https_port = file_handler.read_config("https-port")
+    http_enabled = bool(file_handler.read_config("http"))
+    https_enabled = bool(file_handler.read_config("https"))
+    server = WebServer(http_port=http_port, https_port=https_port)
+    server.start(http_enabled, https_enabled)
+
+
+if __name__ == "__main__":
+    main()

certgen.py

@@ -6,28 +6,50 @@ import datetime
 
 
 class AutoCertGen:
-    def __init__(self):
+    def __init__(self, name="website", org="organization", locale="place", province="province", country="ZZ", dns="localhost"):
-        pass
+        self.name = name
+        self.org = org
+        self.locale = locale
+        self.province = province
+        self.country = country
+        self.dns = dns
 
-    def gen_cert(self):
+    def generate_self_signed_cert(self, different_issuer=False):
-        # Generate private key
         private_key = rsa.generate_private_key(
             public_exponent=65537,
             key_size=2048,
         )
 
-        # Define subject and issuer (self-signed)
+        if different_issuer is True:
+            subject = x509.Name(
+                [
+                    x509.NameAttribute(NameOID.COUNTRY_NAME, self.country),
+                    x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, self.province),
+                    x509.NameAttribute(NameOID.LOCALITY_NAME, self.locale),
+                    x509.NameAttribute(NameOID.ORGANIZATION_NAME, self.org),
+                    x509.NameAttribute(NameOID.COMMON_NAME, self.name),
+                ]
+            )
+            issuer = x509.Name(
+                [
+                    x509.NameAttribute(NameOID.COUNTRY_NAME, "RU"),
+                    x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "Красноярск Область"),
+                    x509.NameAttribute(NameOID.LOCALITY_NAME, "Красноярск"),
+                    x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Amethyst Group"),
+                    x509.NameAttribute(NameOID.COMMON_NAME, "Amethyst Untrusted Signing Certificate"),
+                ]
+            )
+        else:
             subject = issuer = x509.Name(
                 [
-                x509.NameAttribute(NameOID.COUNTRY_NAME, "ZZ"),
+                    x509.NameAttribute(NameOID.COUNTRY_NAME, self.country),
-                x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "Some province"),
+                    x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, self.province),
-                x509.NameAttribute(NameOID.LOCALITY_NAME, "Some place"),
+                    x509.NameAttribute(NameOID.LOCALITY_NAME, self.locale),
-                x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Some org"),
+                    x509.NameAttribute(NameOID.ORGANIZATION_NAME, self.org),
-                x509.NameAttribute(NameOID.COMMON_NAME, "localhost"),
+                    x509.NameAttribute(NameOID.COMMON_NAME, self.name),
                 ]
             )
 
-        # Create certificate
         certificate = (
             x509.CertificateBuilder()
             .subject_name(subject)
@@ -39,12 +61,11 @@ class AutoCertGen:
                 datetime.datetime.utcnow() + datetime.timedelta(days=365)
             )  # 1 year validity
             .add_extension(
-                x509.SubjectAlternativeName([x509.DNSName("localhost")]), critical=False
+                x509.SubjectAlternativeName([x509.DNSName(self.dns)]), critical=False
             )
             .sign(private_key, hashes.SHA256())
         )
 
-        # Save private key
         with open("key.pem", "wb") as f:
             f.write(
                 private_key.private_bytes(
@@ -54,8 +75,5 @@ class AutoCertGen:
                 )
             )
 
-        # Save certificate
         with open("cert.pem", "wb") as f:
             f.write(certificate.public_bytes(serialization.Encoding.PEM))
-
-        print("Self-signed certificate and private key generated for HTTPS server!")

html/index.html

@@ -4,10 +4,11 @@
     <title>Test page</title>
 </head>
 <body>
-    <h1>Hey there!</h1>
+    <center>
-    <h2>You're seeing this page because you haven't set up PyWebServer yet!</h2>
+    <h1>Hello from Amethyst!</h1>
-    <h2>This page confirms that PyWebServer can read and serve files from your PC.</h2>
+    <h2>This page confirms Amethyst can read files from your PC or server and serve them to your browser!</h2>
-    <h2>To make this go away, please edit the file `pywebsrv.conf` and edit the `directory` key to your directory of choice!</h2>
+    <p>This is a test page, if you aren't the server owner, they might not have finished setting up their site, be patient. If this doesn't go away after a while, tell them they've made an oopsie</p>
-    <p>Here you can simulate a 404 error: <a href="/uuh">Click me for a 404 error!</a></p>
+    <p>This server runs Amethyst build 0.3.0-0114-mt-tryout1</p>
+    </center>
 </body>
 </html>

html/pes.py

@@ -0,0 +1,29 @@
+"""
+This is the Amethyst API mode Python interface whatevers.
+Docs will follow.
+"""
+
+# Below go imports.
+import sys
+import os
+
+if not os.getcwd() in sys.path:
+    sys.path.append(os.getcwd())
+import amethyst
+
+
+class PES:
+    """
+    class
+    """
+
+    def __init__(self):
+        # DO NOT USE THIS CLASS FOR PROGRAM, ONLY ON_REQUEST PLEASE!!
+        # Below go definitions to get things working.
+        self.build_response = amethyst.WebServer.build_binary_response
+        self.fh = amethyst.FileHandler("..")
+        self.rq = amethyst.RequestParser()
+        self.THREAD_SAFETY: bool = True
+
+    def on_request(self, req):
+        return self.build_response(200, b"Heyhey! This is the default PES script!", "text/html")

new_conf.conf

@@ -1,30 +0,0 @@
-# WARNING: This is an alpha spec of NSCL 2.0!!
-
-host example.com {
-    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
-    global-key:/home/nova/Downloads/test/key.pem
-    global-cert:/home/nova/Downloads/test/cert.pem
-}

pywebsrv.conf

@@ -1,33 +0,0 @@
-# Using NSCL 1.3
-# Port defenition. What ports to use.
-# port is the HTTP port, port-https is the HTTPS port
-port:8080
-port-https:8443
-# Here you choose what directory PyWebServer looks in for files.
-directory:<Enter directory here>
-# Host defenition, what hosts you can connect via.
-# You can use FQDNs, IP-addresses and localhost,
-# Support for multiple hosts is coming.
-host:localhost
-# Enables HTTP support. (Only enables/disables the HTTP port.)
-http:1
-# Enables HTTPS support. (Only enables/disables the HTTPS port.)
-https:1
-# Allows the use of localhost to connect.
-# The default is on, this is seperate of the host defenition.
-allow-localhost:1
-# If you're using the webserver in a library form,
-# you can disable the AutoCertGen and never trigger it.
-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)
-
-# 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

pywebsrv.py

@@ -1,617 +0,0 @@
-"""
-License:
-     PyWebServer
-     Copyright (C) 2025 Nova
-
-     This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-    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:
-HTTP and HTTPS support.
-Automatically generate certificates using AutoCertGen plugin.
-Blocking per host.
-Easy port configuration.
-Easy to understand documentation and configuration.
-Very small size, compared to something like Apache and NGINX.
-No compromise(-ish) security:
-    Directory traversal attack prevention.
-    No fuss HTTPS setup.
-    Per-host blocking.
-    Ability for per-IP blocking.
-    Ability for per-UA blocking.
-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
-import mimetypes
-import threading
-import ssl
-import socket
-import re
-import signal
-import sys
-
-try:
-    from certgen import AutoCertGen
-except ImportError:
-    # 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 = "0001"
-AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/"
-
-class FileHandler:
-    CONFIG_FILE = "pywebsrv.conf"
-    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 read_file(self, file_path):
-        if "../" in file_path:
-            return 403, None
-
-        full_path = os.path.join(self.base_dir, file_path.lstrip("/"))
-        if not os.path.isfile(full_path):
-            return 404, None
-
-        try:
-            mimetype = mimetypes.guess_type(full_path)
-            with open(full_path, "rb") as f:
-                return f.read(), mimetype
-        except Exception as e:
-            print(f"Error reading file {full_path}: {e}")
-            return 500, None
-
-    def write_file(self, file_path, data):
-        if "../" in file_path:
-            return 403
-        full_path = os.path.join(self.base_dir, file_path.lstrip("/"))
-        with open(full_path, "a") as f:
-            f.write(data)
-        return 0
-
-    def read_config(self, option):
-        """
-        clean code, whats that????
-        TODO: docs
-        """
-        option = option.lower()
-        valid_options = [
-            "port",
-            "directory",
-            "host",
-            "http",
-            "https",
-            "port-https",
-            "allow-localhost",
-            "disable-autocertgen",
-            "key-file",
-            "cert-file",
-            "block-ua"
-        ]
-        if option not in valid_options:
-            return None
-        with open(self.config_path, "r") as f:
-            for line in f:
-                if line.startswith("#"):
-                    continue
-                try:
-                    key, value = line.strip().split(":", 1)
-                except ValueError:
-                    return None
-                key = key.lower()
-                if key == option:
-                    if option == "host":
-                        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-localhost"
-                        or option == "disable-autocertgen"
-                    ):
-                        return bool(int(value))
-                    if option == "directory":
-                        if value == "<Enter directory here>":
-                            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()
-
-                    # Split comma-separated values (e.g. GET,PUT)
-                    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
-        """
-        autocert = AutoCertGen()
-        autocert.gen_cert()
-
-
-class RequestParser:
-    def __init__(self):
-        self.file_handler = FileHandler()
-        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."""
-        try:
-            method, path, version = line.split(" ")
-        except ValueError:
-            return None, None, None
-        if path.endswith("/"):
-            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.
-        Reads allowed methods from a configuration file.
-        Falls back to allowing only 'GET' if the file does not exist.
-        Should (for now) only be GET as I haven't implemented the logic for PUT
-        """
-        allowed_methods = ["GET"]
-        # While the logic for PUT, DELETE, etc. is not added, we shouldn't
-        # allow for it to attempt it.
-        # Prepatched for new update.
-        # allowed_methods = self.file_handler.read_config("allowed-methods")
-        return method in allowed_methods
-
-    def host_parser(self, host):
-        """
-        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 = f"{host}"
-        print(f"hosts: {self.hosts}, host: {host}")
-        if ":" in host:
-            host = host.split(":", 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"):
-            return True
-        if host not in self.hosts:
-            return False
-        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 = int(http_port)
-        self.https_port = int(https_port)
-        self.cert_file = cert_file
-        self.key_file = key_file
-        self.file_handler = FileHandler()
-        self.parser = RequestParser()
-        self.skip_ssl = False
-
-        # me when no certificate and key file
-        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):
-                os.remove(self.cert_file)
-            print("WARN: No HTTPS certificate was found!")
-            if self.file_handler.read_config("disable-autocertgen") is True:
-                print("WARN: AutoCertGen is disabled, ignoring...")
-                self.skip_ssl = True
-            else:
-                choice = input("Do you wish to generate an HTTPS certificate? [y/N] ")
-                if choice.lower() == "y":
-                    self.file_handler.autocert()
-                else:
-                    self.skip_ssl = True
-
-        self.no_host_req_response = (
-            "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))
-
-        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))
-
-        if self.skip_ssl is False:
-            # https gets the ssl treatment!! yaaaay :3
-            self.ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-            self.ssl_context.load_cert_chain(
-                certfile=self.cert_file, keyfile=self.key_file
-            )
-            self.https_socket = self.ssl_context.wrap_socket(
-                self.https_socket, server_side=True
-            )
-
-        self.http_404_html = (
-            "<html><head><title>HTTP 404 - PyWebServer</title></head>"
-            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>"
-            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>"
-            f"<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
-            "</center></body></html>"
-        )
-
-        self.running = True
-
-    def start(self, http, https):
-        signal.signal(signal.SIGINT, self.shutdown)
-        signal.signal(signal.SIGTERM, self.shutdown)
-
-        http_thread = threading.Thread(target=self.start_http, daemon=True)
-        https_thread = threading.Thread(target=self.start_https, 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()
-        if http is True:
-            http_thread.start()
-
-        http_thread.join()
-        https_thread.join()
-
-    def start_http(self):
-        self.http_socket.listen(5)
-        print(f"HTTP server listening on port {self.http_port}...")
-        while self.running:
-            try:
-                conn, addr = self.http_socket.accept()
-                self.handle_connection(conn, addr)
-            except Exception as e:
-                print(f"HTTP error: {e}")
-            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()
-                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 handle_connection(self, conn, addr):
-        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):
-                response = response.encode()
-
-            conn.sendall(response)
-        except Exception as e:
-            print(f"Error handling connection: {e}")
-        finally:
-            conn.close()
-
-    def handle_request(self, data, addr):
-        print(f"data: {data}")
-        request_line = data.splitlines()[0]
-
-        # Extract host from headers, never works though
-        for line in data.splitlines():
-            if "Host" in line:
-                host = line.split(":", 1)[1].strip()
-                allowed = self.parser.host_parser(host)
-                if not allowed:
-                    return self.build_response(
-                        403, "Connecting via this host is disallowed."
-                    )
-                break
-        else:
-            return self.build_response(
-                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 = FileHandler()
-            self.parser = RequestParser()
-            return self.build_response(302, "")
-
-        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)
-
-        if file_content == 403:
-            print("WARN: Directory traversal attack prevented.")  # look ma, security!!
-            return self.build_response(403, self.http_403_html)
-        if file_content == 404:
-            return self.build_response(404, self.http_404_html)
-        if file_content == 500:
-            return self.build_response(
-                500,
-                "PyWebServer has encountered a fatal error and cannot serve "
-                "your request. Contact the owner with this error: FATAL_FILE_RO_ACCESS",
-            )  # When there was an issue with reading we throw this.
-
-        # 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, mimetype)
-
-        return self.build_response(200, file_content)
-
-    @staticmethod
-    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"
-        }
-        status_message = messages.get(status_code)
-        headers = (
-            f"HTTP/1.1 {status_code} {status_message}\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
-
-    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.
-        """
-        messages = {
-            200: "OK",
-            204: "No Content",
-            302: "Found",
-            304: "Not Modified",  # TODO KEKL
-            400: "Bad Request",
-            403: "Forbidden",
-            404: "Not Found",
-            405: "Method Not Allowed",
-            413: "Payload Too Large",
-            500: "Internal Server Error",
-            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/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()
-
-        return headers + body
-
-    def shutdown(self, signum, frame):
-        print("\nRecieved signal to exit!\nShutting down server...")
-        self.running = False
-        self.http_socket.close()
-        self.https_socket.close()
-        sys.exit(0)
-
-
-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.base_dir = file_handler.read_config("directory")
-    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)
-
-
-if __name__ == "__main__":
-    main()