Made an oopsie with conf file

README.md

@@ -1,2 +1,63 @@
 # PyWebServer
 
+# PyWebServer is undergoing major security updates!
+# Please use commit [7ac160f625](https://git.novacow.ch/Nova/PyWebServer/src/commit/7ac160f6259e637c2337a672e56f105f4cdd2d2a) as the source for now!!
+
+## GitHub
+The upstream of this project is on my own [Gitea instance](https://git.novacow.ch/Nova/PyWebServer/).  
+Because of that I'll mostly reply to issues and PRs there, you can submit issues and PRs on GitHub, but it might take longer before I read it.
+
+## Installing
+Installing and running PyWebServer is very simple.  
+Assuming you're running Linux:
+```bash
+git clone https://git.novacow.ch/Nova/PyWebServer.git
+cd ./PyWebServer/
+```
+Windows users, make sure you have installed Git, from there:
+```powershell
+git clone https://git.novacow.ch/Nova/PyWebServer.git
+Set-Location .\PyWebServer\
+```
+From here, you should check from what directory you want to store the content in.  
+In this example, we'll use `./html/` (or `.\html\` for Windows users) from the perspective of the PyWebServer root dir.  
+To create this directory, do this:
+```bash
+mkdir ./html/
+```
+(This applies to both Windows and Linux)  
+Then, open `pywebsrv.conf` in your favorite text editor and change the `directory` key to the full path to the `./html/` you just created.  
+After that, put your files in and run this:
+Linux:
+```bash
+python3 /path/to/pywebsrv.py
+```
+Windows:
+```powershell
+# If you have installed Python via the Microsoft Store:
+python3 \path\to\pywebsrv.py
+# Via the python.org website:
+py \path\to\pywebsrv.py
+```
+
+## SSL Support
+Currently PyWebServer warns about AutoCertGen not being installed. AutoCertGen currently is very unstable at the moment, and therefore is not available for download.  
+PyWebServer supports SSL/TLS for authentication via HTTPS. In the config file, you should enable the HTTPS port. After that you need to create the certificate.  
+Currently PyWebServer looks for the `cert.pem` and the `key.pem` files in the root directory of the installation.  
+PyWebServer comes with a test certificate, this certificate is self-signed, but doesn't have a matching issuer and subject. This is to prevent people from using it in production, even if they have disabled warnings of self-signed certificates.  
+
+## HTTP support
+Currently PyWebServer only supports HTTP/1.1, this is very unlikely to change, as most of the modern web today still uses HTTP/1.1.  
+For methods PyWebServer only supports `GET`, this is being reworked though, check issue [#3](https://git.novacow.ch/Nova/PyWebServer/issues/3) for progress.
+
+## Files support
+Unlike other small web servers, PyWebServer has full support for binary files being sent and received (once that logic is put in) over HTTP.
+
+## Support
+PyWebServer will follow a standard support scheme.
+### 1.x
+For every 1.x version there will be support until 2 newer versions come out.
+So that means that 1.0 will still be supported when 1.1 comes out, but no longer be supported when 1.2 comes out.
+### 2.x
+I am planning on releasing a 2.x version with will have a lot more advanced features, like nginx's server block emulation amongst other things.
+When 2.0 will come out, the last version of 1.x will be supported for a while longer, but no new features will be added.

cert.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIUbZA2WZ1Q7ZGmYttO+f6w5tFXZLMwDQYJKoZIhvcNAQEL
-BQAwazELMAkGA1UEBhMCTk8xETAPBgNVBAgMCE5vcmRsYW5kMQ4wDAYDVQQHDAVC
-b2TDuDEXMBUGA1UECgwOTm92YSdzIHRlc3QgQ0ExIDAeBgNVBAMMF05vdmEncyB0
-ZXN0aW5nIENBIENlcnQuMB4XDTI1MDMwNDIyMjMwNFoXDTI2MDMwNDIyMjMwNFow
-bDELMAkGA1UEBhMCWloxDzANBgNVBAgMBkdsb2JhbDEPMA0GA1UEBwwGR2xvYmFs
-MSAwHgYDVQQKDBdOb3ZhJ3MgdGVzdCBjZXJ0aWZpY2F0ZTEZMBcGA1UEAwwQTm92
-YSdzIHRlc3QgY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANmh
-gdz5oi+Z1ci0oA1q4NeSeU7b58TkRPvz7g2th4x1OjOhyEA2qG2sOKpjwZ9FB7Ce
-TPenZ3M3ISq5MQxGJdHB5tzP86d4fbnRldqS3hs+XW+OYvVWcIonHr8OQXsx1qFP
-2yJGIVRMDcxarFg4ZnIk/M5LsgogrYnhOVhg9mi58tLKp+Q+D10RwDPppi0/e5Ud
-XM4qrkysY0rA1DwiAgj5MSWwnDCTeUbZDA+znBV5b521VS2XkoVhy49A3lCO2YHc
-zAdoyLwAUl84lDN5oQPlqkMN2kEDJw2UDxpCFmzdVvMX30uuQY+vpYI0suwrDBye
-0VxkAwX5qI454SLydE8CAwEAAaMYMBYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0G
-CSqGSIb3DQEBCwUAA4IBAQCIRzTVzeRxWFmBg2wo1W9QXdVorAALw+xcceypHdrA
-GYTW7WYLmxXHTSy414p0KFdQ9/CgUpXE0LxwD1gLmWlKEheqlh2T9FPBUK/axZvG
-00o/YtAaSDHtiC+OcEzPfTFxEpdOoMMBoCpyLBt+0CgfV1BJFRK9Hw7ZOaVQ2eLC
-nxBypEKf3hv0gtGaKnm+vFYDm4Az3+CojtzJiR07WUsPn5HvbOgH6k7jmKuFiR2w
-FpPrErVbbLMCZB7+uxfaJyQaEc9DmUf+LDFLbVkM7gk1o249WLjRR5d8MatkwEPN
-auYdVlrb/CpxTbNzzipFCX+hnFojuFjXp266woplKleW
------END CERTIFICATE-----

certgen.py

@@ -0,0 +1,61 @@
+from cryptography import x509
+from cryptography.x509.oid import NameOID
+from cryptography.hazmat.primitives import hashes, serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
+import datetime
+
+
+class AutoCertGen:
+    def __init__(self):
+        pass
+
+    def gen_cert(self):
+        # Generate private key
+        private_key = rsa.generate_private_key(
+            public_exponent=65537,
+            key_size=2048,
+        )
+
+        # Define subject and issuer (self-signed)
+        subject = issuer = x509.Name(
+            [
+                x509.NameAttribute(NameOID.COUNTRY_NAME, "ZZ"),
+                x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "Some province"),
+                x509.NameAttribute(NameOID.LOCALITY_NAME, "Some place"),
+                x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Some org"),
+                x509.NameAttribute(NameOID.COMMON_NAME, "localhost"),
+            ]
+        )
+
+        # Create certificate
+        certificate = (
+            x509.CertificateBuilder()
+            .subject_name(subject)
+            .issuer_name(issuer)
+            .public_key(private_key.public_key())
+            .serial_number(x509.random_serial_number())
+            .not_valid_before(datetime.datetime.utcnow())
+            .not_valid_after(
+                datetime.datetime.utcnow() + datetime.timedelta(days=365)
+            )  # 1 year validity
+            .add_extension(
+                x509.SubjectAlternativeName([x509.DNSName("localhost")]), critical=False
+            )
+            .sign(private_key, hashes.SHA256())
+        )
+
+        # Save private key
+        with open("key.pem", "wb") as f:
+            f.write(
+                private_key.private_bytes(
+                    encoding=serialization.Encoding.PEM,
+                    format=serialization.PrivateFormat.TraditionalOpenSSL,
+                    encryption_algorithm=serialization.NoEncryption(),
+                )
+            )
+
+        # 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!")

key.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA2aGB3PmiL5nVyLSgDWrg15J5TtvnxORE+/PuDa2HjHU6M6HI
-QDaobaw4qmPBn0UHsJ5M96dnczchKrkxDEYl0cHm3M/zp3h9udGV2pLeGz5db45i
-9VZwiicevw5BezHWoU/bIkYhVEwNzFqsWDhmciT8zkuyCiCtieE5WGD2aLny0sqn
-5D4PXRHAM+mmLT97lR1cziquTKxjSsDUPCICCPkxJbCcMJN5RtkMD7OcFXlvnbVV
-LZeShWHLj0DeUI7ZgdzMB2jIvABSXziUM3mhA+WqQw3aQQMnDZQPGkIWbN1W8xff
-S65Bj6+lgjSy7CsMHJ7RXGQDBfmojjnhIvJ0TwIDAQABAoIBAACkfu8pl4Z/dEei
-7OQNQDuytYP7lzwYFnIN/tJwhDlwcSsM27wAzU+Blis+nyg6unKVjRGgH2iSLZlk
-MZZhMKRlZ6qYPJZufySIz2H1VA2NihYVvAoQZsWppugWgS/9bi5Mv49i2J9YmCPV
-0rNx+y90F4D+bTilbw28qgAuTRvzCzTYqcOLnBvjfHfhh1gzOADB4zHGjEb4qwWd
-GCPGs85tzfT2Bez6GTCvzNEf8kmGO8EwynZk20SPkswcMIQhES1S6wC3zOi0C9+Y
-B4dVnfgtukvsgG+AAtBo8rx6iVIKlGMU3xex9+aZPiJ8O8A/zOJU34IpdDMf7Oha
-bK44pgUCgYEA9mK6tmSgN6Sqji9r7hWSse+tX6faeIeFSDIo33pre2jNyM1qTBHY
-VZ54CoGa02PLRclqci0TsRaN5Gh+wLVzLW2NDLMEZFXIELF4vGexGnOWLYrxp4hm
-uk8rQskoa7/pE7gyjgbYjXqn+wM2ifyc/XXFwTbjbFrj7zPkEdhNmV0CgYEA4h+I
-MLn+4PvABojLekU8EHVLAjnWbKYie/a0ELYDz+DZiGgtU21q4HgaOI8SSRA/UvFW
-l1i75NmKALT/d89Bok0THmfWAIIPzbsboRJe8f8uce9ICwdmbYKHCJwmgDyhq4ic
-UoDzWAuUQa144tcC91Mop5VYa5Ee8TYswIuybZsCgYEA0oQw/D6mFmT/xVUHZvnP
-yXD8Ncr5hBpm6vTQr4Gt7Ffz3CqHNE/bA+zOrEtouk1+FTavWLbjKGAZBJu0EXv3
-2UzNQ5iBnCkfNAQvIOuICw3Pt0IMkBSfkXirgfjWLJpgz5SGvYtj5B51AKgSJXxN
-ttK2EQyQ7LgMIQm5SPYD95ECgYEAlJykpWGYYcUTLzg4guN91lNAOPZKNp35i/9X
-2KPHXZgpX70YDPycgWpt0T42hk5nT9vNTSrEUmOmj1BllhhgyopdRl54B11zhYKz
-Zejs/Z74p2jbsGPsrYxbswztQNqYZmQiWRbm17bEeWXJTUyCZooA7iL5Objm3SD9
-yI4HdoECgYEAzNAa7QJy/bgjuaP8fNx+vfsgMWQ9WT12IXnoiJN4I6mKBrSoJGJ2
-EeM41K1lRglI70WDHFPVn7AQvLiFgfWRoI0ucT65VUzYHT+m2g4p7wwb4wPLkhoj
-nMLthqEoO+CMIrdGSUVmOwlQ4SnKn9G9a2R4yAEJzkItsYDWD+/hzTc=
------END RSA PRIVATE KEY-----

pywebsrv.conf

@@ -1,17 +1,31 @@
 # Using NSCL 1.3
+# Port defenition. What ports to use.
+# port is the HTTP port, port-https is the HTTPS port
 port:8080
-directory:/home/nova/Documents/html
-host:localhost
-# DANGER: NEVER EVER TURN THIS ON IN PROD!!!!!!!!!!!!
-allow-all:1
-# DANGER!!
 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
+# Ignores the host parameter (except for localhost) and allows everything.
+# DANGER! For obvious reasons this isn't recommended.
+allow-all:0
+# Enables HTTP support. (Only enables/disables the HTTP port.)
 http:1
+# Enables HTTPS support. (Only enables/disables the HTTPS port.)
 https:1
-allow-localhost:0
-# for use in libraries
-# disable-autocertgen:0
+# 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)
+# This function is deprecated, allows a connection with no Host header.
+# You should NEVER have to enable this! It can pose a risk to security!
 # allow-nohost:0
-# In libraries you can disable everything you don't need.

pywebsrv.py

@@ -1,4 +1,17 @@
 """
+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
+
 This is PyWebServer, an ultra minimalist webserver, meant to still have
 a lot standard webserver features. A comprehensive list is below:
 Features:
@@ -28,7 +41,7 @@ import signal
 import sys
 
 try:
-    from autocertgen import AutoCertGen
+    from certgen import AutoCertGen
 except ImportError:
     print(
         "WARN: You need the AutoCertGen plugin! Please install it from\n"
@@ -45,8 +58,8 @@ class FileHandler:
     )
 
     def __init__(self, base_dir=None):
-        self.base_dir = base_dir or os.path.join(os.getcwd(), "html")
         self.config_path = os.path.join(os.getcwd(), self.CONFIG_FILE)
+        self.base_dir = self.read_config("directory")
 
     def check_first_run(self):
         if not os.path.isfile(self.config_path):
@@ -58,6 +71,9 @@ class FileHandler:
         with open(self.config_path, "w") as f:
             f.write(self.DEFAULT_CONFIG.format(cwd=os.getcwd()))
 
+    def didnt_confirm(self):
+        os.remove(self.config_path)
+
     def read_file(self, file_path):
         if "../" in file_path:
             return 403
@@ -95,6 +111,7 @@ class FileHandler:
             "https",
             "port-https",
             "allow-all",
+            "allow-nohost",
             "allow-localhost",
             "disable-autocertgen",
         ]
@@ -121,11 +138,16 @@ class FileHandler:
                         or option == "allow-all"
                         or option == "allow-localhost"
                         or option == "disable-autocertgen"
+                        or option == "allow-nohost"
                     ):
-                        print(
-                            f"option: {option}, val: {value}, ret: {bool(int(value))}"
-                        )
                         return bool(int(value))
+                    if option == "directory":
+                        if value == "<Enter directory here>":
+                            print(
+                                "FATAL: You haven't set up PyWebServer! Please edit pywebsrv.conf!"
+                            )
+                            exit(1)
+                        return value
                     return value
         return None
 
@@ -134,10 +156,7 @@ class FileHandler:
         Generate some self-signed certificates using AutoCertGen
         """
         autocert = AutoCertGen()
-        pk = autocert.generate_private_key()
-        sub, iss = autocert.generate_issuer_and_subject()
-        cert = autocert.build_cert(pk, iss, sub)
-        autocert.write_cert(pk, cert)
+        autocert.gen_cert()
 
 
 class RequestParser:
@@ -151,11 +170,11 @@ class RequestParser:
         """Parses the HTTP request line."""
         try:
             method, path, version = line.split(" ")
-            if path.endswith("/"):
-                path += "index.html"
-            return method, path, version
         except ValueError:
             return None, None, None
+        if path.endswith("/"):
+            path += "index.html"
+        return method, path, version
 
     def is_method_allowed(self, method):
         """
@@ -165,9 +184,11 @@ class RequestParser:
         Should (for now) only be GET as I haven't implemented the logic for PUT
         """
         allowed_methods = ["GET"]
-        if os.path.isfile(self.allowed_methods_file):
-            with open(self.allowed_methods_file, "r") as f:
-                allowed_methods = [line.strip() for line in f]
+        # While the logic for PUT, DELETE, etc. is not added, we shouldn't
+        # allow for it to attempt it.
+        # if os.path.isfile(self.allowed_methods_file):
+        #     with open(self.allowed_methods_file, "r") as f:
+        #         allowed_methods = [line.strip() for line in f]
         return method in allowed_methods
 
     def host_parser(self, host):
@@ -240,6 +261,22 @@ class WebServer:
                 self.https_socket, server_side=True
             )
 
+        self.http_404_html = (
+            "<html><head><title>HTTP 404 - PyWebServer</title></head>"
+            "<body><center><h1>HTTP 404 - Not Found!</h1><p>Running PyWebServer/1.1+u2</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.1+u2</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.1+u2</p>"
+            "</center></body></html>"
+        )
+
         self.running = True
 
     def start(self, http, https):
@@ -291,12 +328,12 @@ class WebServer:
 
     def handle_connection(self, conn, addr):
         try:
-            data = conn.recv(512)  # why? well internet and tutiorials
+            data = conn.recv(512)
             request = data.decode(errors="ignore")
             response = self.handle_request(request, addr)
 
             if isinstance(response, str):
-                response = response.encode()  # if we send text this shouldn't explode
+                response = response.encode()
 
             conn.sendall(response)
         except Exception as e:
@@ -334,23 +371,24 @@ class WebServer:
         if not all([method, path, version]) or not self.parser.is_method_allowed(
             method
         ):
-            return self.build_response(405, "Method Not Allowed")
+            return self.build_response(405, self.http_405_html)
 
         file_content = self.file_handler.read_file(path)
 
         if file_content == 403:
             print("WARN: Directory traversal attack prevented.")  # look ma, security!!
-            return self.build_response(403, "Forbidden")
+            return self.build_response(403, self.http_403_html)
         if file_content == 404:
-            return self.build_response(404, "Not Found")
+            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",
-            )  # The user did no fucky-wucky, but the server fucking exploded.
+            )  # When there was an issue with reading we throw this.
 
-        # (try to) detect binary files (eg, mp3) and serve them correctly
+        # A really crude implementation of binary files. Later in 2.0 I'll actually
+        # make this useful.
         if path.endswith((".mp3", ".png", ".jpg", ".jpeg", ".gif")):
             return self.build_binary_response(200, file_content, path)
 
@@ -381,15 +419,21 @@ class WebServer:
 
         headers = (
             f"HTTP/1.1 {status_code} {status_message}\r\n"
-            f"Server: PyWebServer/1.0\r\n"
+            f"Server: PyWebServer/1.1+u2\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 bcuz im lazy
+            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):
+        """
+        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",
             304: "Not Modified",  # TODO KEKL
@@ -406,7 +450,7 @@ class WebServer:
 
         headers = (
             f"HTTP/1.1 {status_code} {status_message}\r\n"
-            f"Server: PyWebServer/1.0\r\n"
+            f"Server: PyWebServer/1.1+u2\r\n"
             f"Content-Length: {len(body)}\r\n"
             f"Connection: close\r\n\r\n"
         ).encode()
@@ -414,8 +458,7 @@ class WebServer:
         return headers + body
 
     def shutdown(self, signum, frame):
-        print(f"\nRecieved signal {signum}")
-        print("\nShutting down server...")
+        print("\nRecieved signal to exit!\nShutting down server...")
         self.running = False
         self.http_socket.close()
         self.https_socket.close()
@@ -425,6 +468,7 @@ class WebServer:
 def main():
     file_handler = FileHandler()
     file_handler.check_first_run()
+    file_handler.base_dir = file_handler.read_config("directory")
     http_port = file_handler.read_config("port") or 8080
     https_port = file_handler.read_config("port-https") or 8443
     http_enabled = file_handler.read_config("http") or True