Nova/PyWebServer
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

holy fuck shit finally works!!!

Browse Source 
alpha build 0039
This commit is contained in:
Nova
2026-03-02 21:38:28 +01:00
parent 36c8c95efe
commit 04ec2ebec1
3 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
html/index.html
View File

@@ -2,20 +2,13 @@
<html> <html>
<head> <head>
<title>Test page</title> <title>Test page</title>
<link rel="stylesheet" href="/style.css">
</head> </head>
<body> <body>
<center> <center>
<h1>Web portal</h1> <h1>Hello from Amethyst!</h1>
<h1><a href="/d.mp4">d.mp4</a></h1> <h2>This page confirms Amethyst can read files from your PC and serve them to your browser!</h2>
<h1><a href="/webjammies/index.ini">index.ini</a></h1> <p>If you see this page and you're not the server owner, tell them they misconfigured something!</p>
<h1><a href="/webjammies/rabado.mp3">rabado.mp3</a></h1> <p>This server runs Amethyst Alpha Build 0039</p>
<h1><a href="/webjammies/invaders.mp3">invaders.mp3</a></h1>
<h1><a href="/webjammies/momentum.mp3">momentum.mp3</a></h1>
<h1><a href="/webjammies/bacterial-love.mp3">bacterial-love.mp3</a></h1>
<h1><a href="/webjammies/old-money-bitch.mp3">old-money-bitch.mp3</a></h1>
<h1><a href="/webjammies/ravestate909.mp3">ravestate909.mp3</a></h1>
<h1><a href="/webjammies/leash.mp3">leash.mp3</a></h1>
</center> </center>
</body> </body>
</html> </html>

29
new_conf.conf
View File

@@ -1,28 +1,23 @@
# WARNING: This is an alpha spec of NSCL 2.0!! # WARNING: This is an alpha spec of NSCL 2.0!!
host 192.168.1.196 { host 192.168.2.196 {
location /secrets {
root:/var/www/html/hidden
whitelist-ua:"Mozilla/5.0 (X11; Linux x86_64) Gecko/20100101 Firefox/149.0 Furfox/1.0"
whitelist-ip:123.45.67.89
}
directory:/home/nova/Downloads/test/html directory:/home/nova/Downloads/test/html
allowed-methods:GET allowed-methods:GET
block-ip:match-ip("192.168",2) block-ua:match("Discordbot"),match("Google")
block-ua:match("Discordbot",0),match("Google",0)
} }
host cdn.example.com { host localhost {
directory:/home/nova/Downloads/test/cdn directory:/home/nova/PyWebServer/html2
allowed-methods:GET,PUT allowed-methods:GET,PUT
block-ip:10.1.100.2 block-ip:10.1.100.2
block-ua:match("Discordbot",0) block-ua:match("Discordbot")
} }
host modem.example.com { host 192.168.1.213 {
proxy:192.168.2.254 directory:/home/nova/PyWebServer/html
key-file:/home/nova/Downloads/test/proxykey.pem allowed-methods:GET,PUT
cert-file:/home/nova/Downloads/test/proxycert.pem block-ip:10.1.100.2
block-ua:match("Discordbot")
} }
globals { globals {
@@ -31,6 +26,6 @@ globals {
port:8080 port:8080
https-port:8443 https-port:8443
allow-localhost:1 allow-localhost:1
global-key:/home/nova/Downloads/test/key.pem key:/home/nova/PyWebServer/ssl/key.pem
global-cert:/home/nova/Downloads/test/cert.pem cert:/home/nova/PyWebServer/ssl/cert.pem
} }

162
pywebsrv.py
View File

@@ -56,19 +56,74 @@ except ImportError:
# ) # )
pass pass
AMETHYST_BUILD_NUMBER = "0018" AMETHYST_BUILD_NUMBER = "0039"
AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/" 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: class FileHandler:
CONFIG_FILE = "pywebsrv.conf" CONFIG_FILE = "pywebsrv.conf"
new_conf = "new_conf.conf" new_conf = "new_conf.conf"
def __init__(self, base_dir=None): def __init__(self, base_dir=None):
# this is a fucking clusterfuck.
self.config_path = os.path.join(os.getcwd(), self.CONFIG_FILE) self.config_path = os.path.join(os.getcwd(), self.CONFIG_FILE)
self.new_conf = os.path.join(os.getcwd(), self.new_conf) self.new_conf = os.path.join(os.getcwd(), self.new_conf)
self.base_dir = self.read_config("directory") self.base_dir = self.read_config("directory")
self.cached_conf = None with open(self.new_conf, "r") as f:
self.cfg = ConfigParser(f.read())
if not os.path.exists(self.config_path): if not os.path.exists(self.config_path):
print( print(
"The pywebsrv.conf file needs to be in the same directory " "The pywebsrv.conf file needs to be in the same directory "
@@ -76,6 +131,7 @@ class FileHandler:
"https://git.novacow.ch/Nova/PyWebServer/raw/branch/main/pywebsrv.conf" "https://git.novacow.ch/Nova/PyWebServer/raw/branch/main/pywebsrv.conf"
) )
exit(1) exit(1)
# TODO: fix this please!!
def read_file(self, file_path, directory=None): def read_file(self, file_path, directory=None):
if "../" in file_path or "%" in file_path: if "../" in file_path or "%" in file_path:
@@ -121,7 +177,7 @@ class FileHandler:
"disable-autocertgen", "disable-autocertgen",
"key-file", "key-file",
"cert-file", "cert-file",
"block-ua" "block-ua",
] ]
if option not in valid_options: if option not in valid_options:
return None return None
@@ -146,7 +202,7 @@ class FileHandler:
if val.startswith("match(") and val.endswith(")"): if val.startswith("match(") and val.endswith(")"):
idx = val.index("(") idx = val.index("(")
idx2 = val.index(")") idx2 = val.index(")")
ua_to_match = val[idx+1:idx2] ua_to_match = val[idx + 1 : idx2]
host_to_match.append(ua_to_match) host_to_match.append(ua_to_match)
else: else:
literal_blocks.append(val) literal_blocks.append(val)
@@ -169,50 +225,11 @@ class FileHandler:
return value return value
return None return None
def read_new_config(self, option, host=None): def read_new_config(self, key, host_name=None):
""" print(
Reads the configuration file and returns a dict f"\n\n\nQuery!\nkey: {key}\nhost_name: {host_name}\nret: {self.cfg.query_config(key, host_name)}"
""" )
if self.cached_conf is None: return self.cfg.query_config(key, host_name)
with open(self.new_conf, "r", encoding="utf-8") as fh:
text = fh.read()
blocks = re.findall(
r'^(host\s+(\S+)|globals)\s*\{([^}]*)\}', text, re.MULTILINE
)
parsed = {}
host_list = []
print(f"Blocks: {blocks}")
for tag, hostname, body in blocks:
section = hostname if hostname else "globals"
if hostname:
host_list.append(hostname)
kv = {}
for line in body.splitlines():
line = line.strip()
if not line or ":" not in line or line.startswith("#"):
continue
key, rest = line.split(":", 1)
key = key.strip()
rest = rest.strip()
if "," in rest:
kv[key] = [item.strip() for item in rest.split(",")]
else:
kv[key] = rest
parsed[section] = kv
parsed["globals"]["hosts"] = host_list
self.cached_conf = parsed
else:
parsed = self.cached_conf
if option == "host":
try:
return host_list
except Exception:
return parsed["globals"]["hosts"]
section = parsed.get(host or "globals", {})
return section.get(option)
def autocert(self): def autocert(self):
""" """
@@ -228,7 +245,7 @@ class FileHandler:
class RequestParser: class RequestParser:
def __init__(self): def __init__(self):
self.file_handler = FileHandler() self.file_handler = FileHandler()
self.hosts = self.file_handler.read_new_config("host") self.hosts = self.file_handler.read_new_config("hosts")
print(f"Hosts: {self.hosts}") print(f"Hosts: {self.hosts}")
def parse_request_line(self, line): def parse_request_line(self, line):
@@ -272,7 +289,7 @@ class RequestParser:
Mfw im in an ugly code writing contest and my opponent is nova while writing a side project Mfw im in an ugly code writing contest and my opponent is nova while writing a side project
""" """
host = f"{host}" host = f"{host}"
print(f"hosts: {self.hosts}, host: {host}, split: {host.rsplit(":", 1)[0]}") print(f"hosts: {self.hosts}, host: {host}, split: {host.rsplit(':', 1)[0]}")
if ":" in host: if ":" in host:
host = host.rsplit(":", 1)[0] host = host.rsplit(":", 1)[0]
host = host.lstrip() host = host.lstrip()
@@ -281,11 +298,14 @@ class RequestParser:
host == "localhost" or host == "127.0.0.1" or host == "[::1]" host == "localhost" or host == "127.0.0.1" or host == "[::1]"
) and self.file_handler.read_new_config("allow-localhost"): ) and self.file_handler.read_new_config("allow-localhost"):
return True return True
if self.hosts is None:
return True
if host not in self.hosts: if host not in self.hosts:
return False return False
else: else:
return True return True
# #
# class ProxyServer: # class ProxyServer:
# def __init__( # def __init__(
@@ -299,10 +319,10 @@ class WebServer:
): ):
self.http_port = int(http_port) self.http_port = int(http_port)
self.https_port = int(https_port) self.https_port = int(https_port)
self.cert_file = cert_file
self.key_file = key_file
self.file_handler = FileHandler() self.file_handler = FileHandler()
self.parser = RequestParser() 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 self.skip_ssl = False
# me when no certificate and key file # me when no certificate and key file
@@ -387,6 +407,8 @@ class WebServer:
if self.skip_ssl is True: if self.skip_ssl is True:
print("WARN: You have enabled HTTPS without SSL!!") print("WARN: You have enabled HTTPS without SSL!!")
yn = input("Is this intended behaviour? [y/N] ") yn = input("Is this intended behaviour? [y/N] ")
if yn.lower() == "n":
exit(1)
https_thread.start() https_thread.start()
# ipv6https_thread.start() # ipv6https_thread.start()
if http is True: if http is True:
@@ -455,7 +477,9 @@ class WebServer:
data = conn.recv(512) data = conn.recv(512)
request = data.decode(errors="ignore") request = data.decode(errors="ignore")
if not data: if not data:
response = self.build_response(400, "Bad Request") # user did fucky-wucky response = self.build_response(
400, "Bad Request"
) # user did fucky-wucky
elif len(data) > 8192: elif len(data) > 8192:
response = self.build_response(413, "Request too long") response = self.build_response(413, "Request too long")
else: else:
@@ -485,9 +509,7 @@ class WebServer:
) )
break break
else: 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(): for line in data.splitlines():
if "User-Agent" in line: if "User-Agent" in line:
@@ -499,9 +521,7 @@ class WebServer:
) )
break break
else: else:
return self.build_response( return self.build_response(400, "You cannot connect without a User-Agent.")
400, "You cannot connect without a User-Agent."
)
method, path, version = self.parser.parse_request_line(request_line) method, path, version = self.parser.parse_request_line(request_line)
@@ -515,12 +535,16 @@ class WebServer:
self.parser = RequestParser() self.parser = RequestParser()
return self.build_response(302, "") return self.build_response(302, "")
if not self.parser.is_method_allowed( if not self.parser.is_method_allowed(method):
method
):
return self.build_response(405, self.http_405_html) return self.build_response(405, self.http_405_html)
directory = self.file_handler.read_new_config("directory", host) if ":" in host:
host2 = host.rsplit(":", 1)[0]
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) file_content, mimetype = self.file_handler.read_file(path, directory)
@@ -541,7 +565,9 @@ class WebServer:
mimetype = mimetype[0] mimetype = mimetype[0]
if mimetype is None: if mimetype is None:
# We have to assume it's binary. # We have to assume it's binary.
return self.build_binary_response(200, file_content, "application/octet-stream") return self.build_binary_response(
200, file_content, "application/octet-stream"
)
if "text/" not in mimetype: if "text/" not in mimetype:
return self.build_binary_response(200, file_content, mimetype) return self.build_binary_response(200, file_content, mimetype)
@@ -555,7 +581,7 @@ class WebServer:
403: "Forbidden", 403: "Forbidden",
404: "Not Found", 404: "Not Found",
405: "Method Not Allowed", 405: "Method Not Allowed",
500: "Internal Server Error" 500: "Internal Server Error",
} }
status_message = messages.get(status_code) status_message = messages.get(status_code)
headers = ( headers = (
@@ -586,7 +612,7 @@ class WebServer:
405: "Method Not Allowed", 405: "Method Not Allowed",
413: "Payload Too Large", 413: "Payload Too Large",
500: "Internal Server Error", 500: "Internal Server Error",
635: "Go Away" 635: "Go Away",
} }
status_message = messages.get(status_code) status_message = messages.get(status_code)
@@ -607,7 +633,9 @@ class WebServer:
# Why not 307, Moved Permanently? Because browsers will cache the # Why not 307, Moved Permanently? Because browsers will cache the
# response and not send the reload command. # response and not send the reload command.
host = self.file_handler.read_config("host")[0] 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 != 80 and port != 443:
if port == 8443: if port == 8443:
host = f"https://{host}:{port}/" host = f"https://{host}:{port}/"