smartass

something pog
holy fuck shit finally works!!!
2026-03-03 22:27:56 +01:00 · 2026-03-03 22:26:19 +01:00 · 2026-03-02 21:38:28 +01:00 · 2026-01-30 08:41:30 +01:00 · 2025-08-20 23:51:31 +02:00 · 2025-08-20 15:39:14 +02:00
5 changed files with 313 additions and 133 deletions
--- a/README.md
+++ b/README.md
@@ -1,51 +1,32 @@
-# PyWebServer
+# Amethyst Web Server
-## GitHub
+## A word of warning!
-The upstream of this project is on my own [Gitea instance](https://git.novacow.ch/Nova/PyWebServer/).  
+Currently Amethyst is in very early alpha stage, a lot of things will be broken, names won't be correct,
-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.
+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
+## Currently working features:
-Installing and running PyWebServer is very simple.  
+* New configuration is ~75% done, most features work.
-Assuming you're running Linux:
+* Fixed **A LOT** of unreported bugs from the old code.
-```bash
+* More resilliency against errors.
-git clone https://git.novacow.ch/Nova/PyWebServer.git
+* Improved security.
 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\
 ```
 Then, open `pywebsrv.conf` in your favorite text editor and change the `directory` key to the full path where your files are stored.  
 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
+## Project status:
-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.  
+Amethyst will stay in beta for a while, I want all features to work, put I will make pre-release versions that are mostly stable.  
-Currently PyWebServer looks for the `cert.pem` and the `key.pem` files in the root directory of the installation.  
+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.  
-## HTTP support
+## Install instructions:
-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.  
+Install Python, and change the provided config.
 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
+## Minimum requirements:
-Unlike other small web servers, PyWebServer has full support for binary files being sent and received (once that logic is put in) over HTTP(S).
+Python 3.8+  
 And whatever PC that happens to run that.  
 I recommend Python 3.10 or above though, with a PC running:
 * Windows 8.1+
 * macOS 10.15+
 * Linux 4.19+
 * FreeBSD 13.2R+
 * Some other somewhat recent OS.
-## Support
+## Currently W.I.P. Check back later!
 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.
--- a/html/index.html
+++ b/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 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>If you see this page and you're not the server owner, tell them they misconfigured something!</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 Alpha Build 0039</p>
    </center>
 </body>
 </html>
--- a/new_conf.conf
+++ b/new_conf.conf
@@ -0,0 +1,31 @@
 # WARNING: This is an alpha spec of NSCL 2.0!!
 host 192.168.2.196 {
    directory:/home/nova/Downloads/test/html
    allowed-methods:GET
    block-ua:match("Discordbot"),match("Google")
 }
 host localhost {
    directory:/home/nova/PyWebServer/html2
    allowed-methods:GET,PUT
    block-ip:10.1.100.2
    block-ua:match("Discordbot")
 }
 host 192.168.1.213 {
    directory:/home/nova/PyWebServer/html
    allowed-methods:GET,PUT
    block-ip:10.1.100.2
    block-ua:match("Discordbot")
 }
 globals {
    http:1
    https:1
    port:8080
    https-port:8443
    allow-localhost:1
    key:/home/nova/PyWebServer/ssl/key.pem
    cert:/home/nova/PyWebServer/ssl/cert.pem
 }
--- a/pywebsrv.conf
+++ b/pywebsrv.conf
@@ -4,11 +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
+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.)
@@ -21,8 +21,8 @@ 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.
+# If you wish to block User-Agents.
-# block-ua:(NULL)
+block-ua:match(Discordbot),match(google)
 # TEST: experimental non-defined keys go here:
 # keyfile key
--- 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:
@@ -33,6 +35,8 @@ 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.
 """
 import os
@@ -40,45 +44,106 @@ import mimetypes
 import threading
 import ssl
 import socket
 # import re
 import signal
 import sys
 try:
    from certgen import AutoCertGen
 except ImportError:
-    print(
+    # just do nothing, it's not working anyway.
-        "WARN: You need the AutoCertGen plugin! Please install it from\n"
+    # print(
-        "https://git.novacow.ch/Nova/AutoCertGen/"
+    #     "WARN: You need the AutoCertGen plugin! Please install it from\n"
-    )
+    #     "https://git.novacow.ch/Nova/AutoCertGen/"
    # )
    pass
 AMETHYST_BUILD_NUMBER = "0046"
 AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/"
 class ConfigParser:
    def __init__(self, text):
        self.data = {"hosts": {}, "globals": {}}
        self._parse(text)
    def _parse(self, text):
        lines = [
            line.strip()
            for line in text.splitlines()
            if line.strip() and not line.strip().startswith("#")
        ]
        current_block = None
        current_name = 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 = key.strip()
                value = 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:
            return self.data["hosts"].get(host, {}).get(key)
        if key == "hosts":
            print(f"\n\n\nHosts!\nHosts: {self.data['hosts']}\n\n\n")
            return list(self.data["hosts"].keys())
        return self.data["globals"].get(key)
 class FileHandler:
    CONFIG_FILE = "pywebsrv.conf"
-    DEFAULT_CONFIG = (
+    new_conf = "new_conf.conf"
        "port:8080\nport-https:8443\nhttp:1"
        "\nhttps:0\ndirectory:{cwd}\nhost:localhost"
        "\nallow-localhost:1"
    )
    def __init__(self, base_dir=None):
        # this is a fucking clusterfuck.
        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")
        with open(self.new_conf, "r") as f:
            self.cfg = ConfigParser(f.read())
        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)
        # TODO: fix this please!!
-    def check_first_run(self):
+    def read_file(self, file_path, directory=None):
-        if not os.path.isfile(self.config_path):
+        if "../" in file_path or "%" in file_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:
            return 403, None
-        full_path = os.path.join(self.base_dir, file_path.lstrip("/"))
+        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
@@ -90,8 +155,8 @@ class FileHandler:
            print(f"Error reading file {full_path}: {e}")
            return 500, None
-    def write_file(self, file_path, data):
+    def write_file(self, file_path, data, directory=None):
-        if "../" in file_path:
+        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:
@@ -114,7 +179,8 @@ class FileHandler:
            "allow-localhost",
            "disable-autocertgen",
            "key-file",
-            "cert-file"
+            "cert-file",
            "block-ua",
        ]
        if option not in valid_options:
            return None
@@ -131,6 +197,19 @@ class FileHandler:
                    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 (
@@ -149,10 +228,19 @@ class FileHandler:
                    return value
        return None
    def read_new_config(self, key, host_name=None):
        print(
            f"\n\n\nQuery!\nkey: {key}\nhost_name: {host_name}\nret: {self.cfg.query_config(key, host_name)}"
        )
        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
        """
        if not os.getcwd() in sys.path:
            sys.path.append(f"{os.getcwd()}")
        autocert = AutoCertGen()
        autocert.gen_cert()
@@ -160,18 +248,34 @@ class FileHandler:
 class RequestParser:
    def __init__(self):
        self.file_handler = FileHandler()
-        self.hosts = self.file_handler.read_config("host")
+        self.hosts = self.file_handler.read_new_config("hosts")
        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
+            return "DELETE", "/this/is/a/bogus/request", "HTTP/1.0"
-        if path.endswith("/"):
+        if path.endswith("/") and "." not in path:
            path += "index.html"
        return method, path, version
    def ua_is_allowed(self, ua, host=None):
        """Parses and matches UA to block"""
        return True
        # del host
        # _list = self.file_handler.read_config("block-ua")
        # if _list is None:
        #     return True
        # match, literal = self.file_handler.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):
        """
        Checks if the HTTP method is allowed.
@@ -192,13 +296,16 @@ class RequestParser:
        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}, 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"
+            host == "localhost" or host == "127.0.0.1" or host == "[::1]"
-        ) and self.file_handler.read_config("allow-localhost"):
+        ) and self.file_handler.read_new_config("allow-localhost"):
            return True
        if self.hosts is None:
            return True
        if host not in self.hosts:
            return False
@@ -206,16 +313,23 @@ class RequestParser:
            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.http_port = int(http_port)
-        self.https_port = https_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.cert_file = self.file_handler.read_new_config("cert") or cert_file
        self.key_file = self.file_handler.read_new_config("key") or key_file
        self.skip_ssl = False
        # me when no certificate and key file
@@ -242,14 +356,22 @@ class WebServer:
            "This host cannot be reached without sending a `Host` header."
        )
-        # ipv6 when????/??//?????//?
+        # TODO: enable experimental ipv6 support in config
        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)
+        # ipv6 when????/??//?????//?
-        self.https_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        # self.http_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.https_socket.bind(("0.0.0.0", self.https_port))
+        # 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
@@ -263,17 +385,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.1</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.1</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.1</p>"
+            f"<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
            "</center></body></html>"
        )
@@ -290,6 +412,8 @@ class WebServer:
            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()
        if http is True:
            http_thread.start()
@@ -303,7 +427,6 @@ 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}")
@@ -316,7 +439,6 @@ class WebServer:
        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(
@@ -329,7 +451,14 @@ class WebServer:
        try:
            data = conn.recv(512)
            request = data.decode(errors="ignore")
-            response = self.handle_request(request, addr)
+            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()
@@ -337,16 +466,18 @@ class WebServer:
            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):
-        print(f"len data: {len(data)}")
+        print(f"data: {data}")
        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")
        request_line = data.splitlines()[0]
        # Extract host from headers, never works though
@@ -360,27 +491,46 @@ class WebServer:
                    )
                break
        else:
-            return self.build_response(
+            return self.build_response(400, self.no_host_req_response.encode())
-                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)
                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)
        # 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(302, "")
        if not all([method, path, version]):
            return self.build_response(400, "Bad Request")
-        if not self.parser.is_method_allowed(
+        # Figure out a better way to reload config
-            method
+        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 ":" in host:
            host2 = host.rsplit(":", 1)[0]
        else:
            host2 = host
        directory = (
            self.file_handler.read_new_config("directory", host2)
            or self.file_handler.base_dir
        )
        file_content, mimetype = self.file_handler.read_file(path, directory)
        if file_content == 403:
            print("WARN: Directory traversal attack prevented.")  # look ma, security!!
@@ -390,13 +540,16 @@ class WebServer:
        if file_content == 500:
            return self.build_response(
                500,
-                "PyWebServer has encountered a fatal error and cannot serve "
+                "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.
        # 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)
@@ -415,7 +568,7 @@ class WebServer:
        status_message = messages.get(status_code)
        headers = (
            f"HTTP/1.1 {status_code} {status_message}\r\n"
-            f"Server: PyWebServer/1.2.1\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"
@@ -451,7 +604,7 @@ class WebServer:
        # 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.1\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()
@@ -461,7 +614,9 @@ class WebServer:
            # 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")
+            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}/"
@@ -475,7 +630,7 @@ class WebServer:
            headers = (
                f"HTTP/1.1 {status_code} {status_message}\r\n"
                f"Location: {host}\r\n"
-                f"Server: PyWebServer/1.2.1\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()
@@ -491,13 +646,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
+    http_port = file_handler.read_new_config("port") or 8080
-    https_port = file_handler.read_config("port-https") or 8443
+    https_port = file_handler.read_new_config("port-https") or 8443
-    http_enabled = file_handler.read_config("http") or True
+    http_enabled = bool(file_handler.read_new_config("http")) or True
-    https_enabled = file_handler.read_config("https") or False
+    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	127612d408	smartass	2026-03-03 22:27:56 +01:00
Nova	3ff7a33695	something pog	2026-03-03 22:26:19 +01:00
Nova	04ec2ebec1	holy fuck shit finally works!!! alpha build 0039	2026-03-02 21:38:28 +01:00
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