lare/autopeering
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add waitress as production WSGI server

Browse source
This commit is contained in:
lare 2022-11-19 18:12:01 +01:00
parent 85135dd449
commit 7d5937f3fb
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
web/backend/config.sample.json
View file

@ -1,16 +1,18 @@
{ {
"nodes": { "nodes": {
"<nodename>": { "<nodename>": {
"pub-endpoint": "<clearnet-fqdn/ip-address>", //optional, recommended "pub-endpoint": "<clearnet-fqdn/ip-address>", //optional, recommended, default: None/null
"api-con": "http://<node-(internal)-ip/hostname>:<port>/", // required "api-con": "http://<node-(internal)-ip/hostname>:<port>/", // required
"comment": "/* from here: data to be displayed on the webinterface */", "#comment": "/* from here: data to be displayed on the webinterface */",
"country": "...", // Countrycode: 2 capital letters "country": "...", // Countrycode: 2 capital letters
"city": "...", "city": "...",
"wg-key": "...=", // pubkey of node; required "wg-key": "...=", // pubkey of node; required
"internal-v4": "172.2x.xxx.xxx", //at least one ipv{4,6} addr required "internal-v4": "172.2x.xxx.xxx", //at least one ipv{4,6} addr required
"internal-v6": "fdxx:...", "internal-v6": "fdxx:...",
"internal-v4ll": "169.254.xxx.xxx", "internal-v4ll": "169.254.xxx.xxx",
"internal-v6ll": "fe80::..." "internal-v6ll": "fe80::...",
"note": "...", //optional, special precausions, like only supporting a specific amount of peers/ipv{4,6} in clearnet, etc
"capacity": 100 //optional, default: -1 (infinite); estimated capacity of that node (i.e. OPENVZ(7) only has userspace WG (which consumes memory for every interface created))
} }
}, },
"MNT": "YOUR-MNT", // your MNT tag "MNT": "YOUR-MNT", // your MNT tag
@ -18,6 +20,7 @@
"port": 8042, "port": 8042,
"domain": "example.org", // domain to use for kioubit verification service "domain": "example.org", // domain to use for kioubit verification service
"base-dir": "/", //optional:directury for which it is reachable (if behind some sort of reverse proxy) default "/" "base-dir": "/", //optional:directury for which it is reachable (if behind some sort of reverse proxy) default "/"
"production": true, //optional, default true;
"debug-mode": false, // optional; whethet to enable debugging; default false "debug-mode": false, // optional; whethet to enable debugging; default false
"flask-secret-key": "<secret-please-replace>", // secret key for session cookies "flask-secret-key": "<secret-please-replace>", // secret key for session cookies
"flask-template-dir": "../frontend/" // optional; default "../frontend" "flask-template-dir": "../frontend/" // optional; default "../frontend"

14
web/backend/main.py
View file

@ -21,6 +21,9 @@ class Config (dict):
#self.__getitem__ = self._config.__getitem__ #self.__getitem__ = self._config.__getitem__
super().__init__(self) super().__init__(self)
def __contains__(self, o):
return self._config.__contains__(o)
def __delitem__(self, v): def __delitem__(self, v):
raise NotImplementedError() raise NotImplementedError()
super().__delitem__(self,v) super().__delitem__(self,v)
@ -96,12 +99,12 @@ def login():
asn = asn[2:] if asn[:1].lower() == "as" else asn asn = asn[2:] if asn[:1].lower() == "as" else asn
if "allowed4" in request.form: if "allowed4" in request.form:
allowed4 = request.form["allowed4"] allowed4 = request.form["allowed4"]
allowed4 = allowed_v4.split(",") if "," in allowed_v4 else allowed_v4 allowed4 = allowed4.split(",") if "," in allowed4 else allowed4
else: else:
allowed4 = None allowed4 = None
if "allowed6" in request.form: if "allowed6" in request.form:
allowed6 = request.form["allowed6"] allowed6 = request.form["allowed6"]
allowed6 = allowed_v6.split(",") if "," in allowed_v6 else allowed_v6 allowed6 = allowed6.split(",") if "," in allowed6 else allowed6
else: else:
allowed6 = None allowed6 = None
session["user-data"] = {'asn':asn,'allowed4': allowed4, 'allowed6': allowed6,'mnt':mnt, 'authtype': "debug"} session["user-data"] = {'asn':asn,'allowed4': allowed4, 'allowed6': allowed6,'mnt':mnt, 'authtype': "debug"}
@ -152,7 +155,12 @@ def main():
app.static_folder= config["flask-template-dir"]+"/static/" app.static_folder= config["flask-template-dir"]+"/static/"
app.template_folder=config["flask-template-dir"] app.template_folder=config["flask-template-dir"]
app.secret_key = config["flask-secret-key"] app.secret_key = config["flask-secret-key"]
app.run(host=config["listen"], port=config["port"], debug=config["debug-mode"], threaded=True) if "production" in config and config["production"] == False:
app.run(host=config["listen"], port=config["port"], debug=config["debug-mode"], threaded=True)
else:
from waitress import serve
serve(app, host=config["listen"], port=config["port"])
if __name__ == "__main__": if __name__ == "__main__":

2
web/frontend/base.html
View file

@ -8,7 +8,7 @@
<link rel="stylesheet" href="{{config['base-dir']}}static/style.css"> <link rel="stylesheet" href="{{config['base-dir']}}static/style.css">
</head> </head>
<body> <body>
<header class="flex flex-row"><div></div><a href="{{config['base-dir']}}">{{config["MNT"]}} Autopeering</a>{% if "login" in session %}<a href="{{config['base-dir']}}logout">logout</a>{% else %} <a href="{{config['base-dir']}}login?return=/peer">login</a>{%endif%}</header> <header class="flex flex-row"><div></div><a href="{{config['base-dir']}}">{{config["MNT"]}} Autopeering</a>{% if "login" in session %}<a href="{{config['base-dir']}}logout">logout</a>{% else %} <a href="{{config['base-dir']}}login?return=/peerings">login</a>{%endif%}</header>
<div class="content flex"> <div class="content flex">
{% block content %} {% block content %}
{% endblock %} {% endblock %}

1
web/requirements.txt
View file

@ -1,2 +1,3 @@
Flask Flask
waitress
pyopenssl pyopenssl