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

Compare commits

base: lare:067803081d7a1d91f7993b45956bf47cd529f48f
Branches Tags
lare:master
lare:v1.0
...
compare: lare:8a502442095383114c82df841587278eac88ea65
Branches Tags
lare:master
lare:v1.0

2 commits
067803081d ... 8a50244209

Author SHA1 Message Date
lare
8a50244209 [backend] change default values in Peeringmanager.exists() 
the large if clause there would return false if the requested peering doesn't have bgp_mp and bgp_enh
 2024-09-01 14:25:08 +02:00
lare
e8673e77c7 [web] allow admin to view/create/edit peerings of others 
also: fix typo in peering database + provide migration
 2024-09-01 01:44:18 +02:00
4 changed files with 76 additions and 46 deletions
Show stats Expand all files Collapse all files

57
web/backend/main.py
View file

@ -1,14 +1,19 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
# flask
from flask import Flask, Response, redirect, render_template, request, session, abort from flask import Flask, Response, redirect, render_template, request, session, abort
import werkzeug.exceptions as werkzeug_exceptions import werkzeug.exceptions as werkzeug_exceptions
# other utils
import json import json
import os import os
import base64 import base64
# potential errors on base64 decode: binascii.Error
import binascii
import logging import logging
import random import random
from functools import wraps from functools import wraps
from ipaddress import ip_address, ip_network, IPv4Network, IPv6Network from ipaddress import ip_address, ip_network, IPv4Network, IPv6Network
# self written modules
import kioubit_verify import kioubit_verify
from peering_manager import PeeringManager from peering_manager import PeeringManager
@ -49,21 +54,21 @@ class Config (dict):
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
raise SyntaxError(f"no valid JSON found in '{cf.name}'") raise SyntaxError(f"no valid JSON found in '{cf.name}'")
if not "flask-template-dir" in self._config: if "flask-template-dir" not in self._config:
self._config["flask-template-dir"] = "../frontend" self._config["flask-template-dir"] = "../frontend"
if not "debug-mode" in self._config: if "debug-mode" not in self._config:
self._config["debug-mode"] = False self._config["debug-mode"] = False
if not "base-dir" in self._config: if "base-dir" not in self._config:
self._config["base-dir"] = "/" self._config["base-dir"] = "/"
if not "peerings-data" in self._config: if "peerings-data" not in self._config:
self._config["peering-data"] = "./peerings" self._config["peering-data"] = "./peerings"
if not "nodes" in self._config: if "nodes" not in self._config:
self,_config = {} self,_config = {}
for node in self._config["nodes"]: for node in self._config["nodes"]:
if not "capacity" in self._config["nodes"][node]: if "capacity" not in self._config["nodes"][node]:
self._config["nodes"][node]["capacity"] = -1 self._config["nodes"][node]["capacity"] = -1
logging.info(self._config) logging.info(self._config)
@ -81,7 +86,8 @@ def check_peering_data(form):
# check if all required (and enabled) options are specified # check if all required (and enabled) options are specified
try: try:
new_peering["peer-asn"] = session["user-data"]["asn"] # force "peer-asn" to be the same as in the login data except if login is admin (admin get the peer-asn field enabled in the form)
new_peering["peer-asn"] = session["user-data"]["asn"] if "peer-asn" not in request.form or session["login"] != config["MNT"] else form["peer-asn"]
new_peering["peer-wgkey"] = form["peer-wgkey"] new_peering["peer-wgkey"] = form["peer-wgkey"]
if "peer-endpoint-enabled" in form and form["peer-endpoint-enabled"] == "on": if "peer-endpoint-enabled" in form and form["peer-endpoint-enabled"] == "on":
new_peering["peer-endpoint"] = form["peer-endpoint"] new_peering["peer-endpoint"] = form["peer-endpoint"]
@ -125,7 +131,7 @@ def check_peering_data(form):
wg_key_invalid = True wg_key_invalid = True
try: try:
base64.b64decode(new_peering["peer-wgkey"]) base64.b64decode(new_peering["peer-wgkey"])
except: except binascii.Error:
wg_key_invalid = True wg_key_invalid = True
if wg_key_invalid: if wg_key_invalid:
return False, "invalid wireguard Key" return False, "invalid wireguard Key"
@ -134,7 +140,7 @@ def check_peering_data(form):
if new_peering["peer-endpoint"]: if new_peering["peer-endpoint"]:
if not new_peering["peer-endpoint"].split(":")[-1].isnumeric(): if not new_peering["peer-endpoint"].split(":")[-1].isnumeric():
return False, "no port number in endpoint" return False, "no port number in endpoint"
elif len(new_peering["peer-endpoint"].split(":")) < 2 and not "." in new_peering["peer-endpoint"]: elif len(new_peering["peer-endpoint"].split(":")) < 2 and "." not in new_peering["peer-endpoint"]:
return False, "endpoint doesn't look like a ip address or fqdn" return False, "endpoint doesn't look like a ip address or fqdn"
# check if at least one ip is specified/enabled # check if at least one ip is specified/enabled
@ -148,13 +154,13 @@ def check_peering_data(form):
try: try:
if new_peering["peer-v6ll"]: if new_peering["peer-v6ll"]:
ipv6ll = ip_address(new_peering["peer-v6ll"]) ipv6ll = ip_address(new_peering["peer-v6ll"])
if not ipv6ll.version == 6: if ipv6ll.version != 6:
raise ValueError() raise ValueError()
if not ipv6ll.is_link_local: if not ipv6ll.is_link_local:
raise ValueError() raise ValueError()
if new_peering["peer-v4"]: if new_peering["peer-v4"]:
ipv4 = ip_address(new_peering["peer-v4"]) ipv4 = ip_address(new_peering["peer-v4"])
if not ipv4.version == 4: if ipv4.version != 4:
raise ValueError() raise ValueError()
if ipv4.is_link_local: if ipv4.is_link_local:
pass pass
@ -177,7 +183,7 @@ def check_peering_data(form):
raise ValueError() raise ValueError()
if new_peering["peer-v6"]: if new_peering["peer-v6"]:
ipv6 = ip_address(new_peering["peer-v6"]) ipv6 = ip_address(new_peering["peer-v6"])
if not ipv6.version == 6: if ipv6.version != 6:
raise ValueError() raise ValueError()
if not ipv6.is_private: if not ipv6.is_private:
raise ValueError() raise ValueError()
@ -201,9 +207,9 @@ def check_peering_data(form):
# check bgp options # check bgp options
try: try:
if new_peering["bgp-mp"] == False and new_peering["bgp-enh"] == True: if new_peering["bgp-mp"] is False and new_peering["bgp-enh"] is True:
return False, "extended next hop requires multiprotocol bgp" return False, "extended next hop requires multiprotocol bgp"
if new_peering["bgp-mp"] == False: if new_peering["bgp-mp"] is False:
if not (new_peering["peer-v4"] and (new_peering["peer-v6"] or new_peering["peer-v6ll"])): if not (new_peering["peer-v4"] and (new_peering["peer-v6"] or new_peering["peer-v6ll"])):
return False, "ipv4 and ipv6 addresses required when not having MP-BGP" return False, "ipv4 and ipv6 addresses required when not having MP-BGP"
except ValueError: except ValueError:
@ -215,7 +221,7 @@ def auth_required():
def wrapper(f): def wrapper(f):
@wraps(f) @wraps(f)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
if not "login" in session: if "login" not in session:
request_url = f"{config['base-dir']}{request.full_path}".replace("//", "/") request_url = f"{config['base-dir']}{request.full_path}".replace("//", "/")
return redirect(f"{config['base-dir']}login?return={request_url}") return redirect(f"{config['base-dir']}login?return={request_url}")
else: else:
@ -293,7 +299,7 @@ def login():
allowed6 = None allowed6 = None
session["user-data"] = {'asn': asn, 'allowed4': allowed4, session["user-data"] = {'asn': asn, 'allowed4': allowed4,
'allowed6': allowed6, 'mnt': mnt, 'authtype': "debug"} 'allowed6': allowed6, 'mnt': mnt, 'authtype': "debug"}
session["login"] = mnt if not "login" in session else session["login"] session["login"] = mnt if "login" not in session else session["login"]
return redirect(session["return_url"]) return redirect(session["return_url"])
except ValueError: except ValueError:
msg = "at least one of the values provided is wrong/invalid" msg = "at least one of the values provided is wrong/invalid"
@ -314,12 +320,14 @@ def peerings_delete():
return render_template("peerings-delete.html", session=session, config=config, request_args=request.args) return render_template("peerings-delete.html", session=session, config=config, request_args=request.args)
return f"{request.method} /peerings/delete?{str(request.args)}{str(request.form)}" return f"{request.method} /peerings/delete?{str(request.args)}{str(request.form)}"
elif request.method in ["POST", "DELETE"]: elif request.method in ["POST", "DELETE"]:
if not request.form["confirm"] == "on": if request.form["confirm"] != "on":
return render_template("peerings-delete.html", session=session, config=config, request_args=request.args, msg="you have to confirm the deletion first") return render_template("peerings-delete.html", session=session, config=config, request_args=request.args, msg="you have to confirm the deletion first")
if not peerings.exists(request.args["asn"], request.args["node"], mnt=session["user-data"]["mnt"]): # mnt=None, if admin
if not peerings.exists(request.args["asn"], request.args["node"], mnt=session["user-data"]["mnt"] if session["login"] != config["MNT"] else None):
return render_template("peerings-delete.html", session=session, config=config, request_args=request.args, msg="the peering you requested to delete doesn't exist (anymore) or you are not authorized to delete it") return render_template("peerings-delete.html", session=session, config=config, request_args=request.args, msg="the peering you requested to delete doesn't exist (anymore) or you are not authorized to delete it")
print(str(request)) print(str(request))
if not peerings.delete_peering(request.args["asn"], request.args["node"], mnt=session["user-data"]["mnt"]): # mnt=None, if admin
if not peerings.delete_peering(request.args["asn"], request.args["node"], mnt=session["user-data"]["mnt"] if session["login"] != config["MNT"] else None):
return render_template("peerings-delete.html", session=session, config=config, request_args=request.args, msg="deletion of the peering requested failed, maybe you are not authorized or that peering doesn't exist") return render_template("peerings-delete.html", session=session, config=config, request_args=request.args, msg="deletion of the peering requested failed, maybe you are not authorized or that peering doesn't exist")
session["msg"] = {"msg": "peer-del", session["msg"] = {"msg": "peer-del",
"node": request.args["node"], "asn": request.args["asn"]} "node": request.args["node"], "asn": request.args["asn"]}
@ -332,7 +340,7 @@ def peerings_delete():
def peerings_edit(): def peerings_edit():
print(session) print(session)
if request.method == "GET": if request.method == "GET":
if not "node" in request.args or not request.args["node"]: if "node" not in request.args or not request.args["node"]:
return render_template("peerings-edit.html", session=session, config=config, peerings=peerings, msg="no peering selected, please click one of the buttons above") return render_template("peerings-edit.html", session=session, config=config, peerings=peerings, msg="no peering selected, please click one of the buttons above")
mnt_peerings = peerings.get_peerings_by_mnt(session["user-data"]["mnt"]) mnt_peerings = peerings.get_peerings_by_mnt(session["user-data"]["mnt"])
# print(mnt_peerings) # print(mnt_peerings)
@ -350,7 +358,7 @@ def peerings_edit():
elif request.method == "POST": elif request.method == "POST":
print(request.args) print(request.args)
print(request.form) print(request.form)
if not "node" in request.args or not request.args["node"]: if "node" not in request.args or not request.args["node"]:
return render_template("peerings-edit.html", session=session, config=config, peerings=peerings, msg="no peering selected, please click one of the buttons above") return render_template("peerings-edit.html", session=session, config=config, peerings=peerings, msg="no peering selected, please click one of the buttons above")
peering_valid, peering_or_msg = check_peering_data(request.form) peering_valid, peering_or_msg = check_peering_data(request.form)
@ -384,7 +392,7 @@ def peerings_new():
elif request.method == "POST": elif request.method == "POST":
print(request.args) print(request.args)
print(request.form) print(request.form)
if not "node" in request.args or not request.args["node"]: if "node" not in request.args or not request.args["node"]:
return render_template("peerings-new.html", session=session, config=config, peerings=peerings, msg="no node specified, please click one of the buttons above") return render_template("peerings-new.html", session=session, config=config, peerings=peerings, msg="no node specified, please click one of the buttons above")
peering_valid, peering_or_msg = check_peering_data(request.form) peering_valid, peering_or_msg = check_peering_data(request.form)
@ -416,6 +424,11 @@ def peerings_view():
# shouldn't get here # shouldn't get here
abort(405) abort(405)
@app.route("/hidden", methods=["GET", "POST", "DELETE"])
@auth_required()
def hidden_page():
...
@app.route("/") @app.route("/")
def index(): def index():

61
web/backend/peering_manager.py
View file

@ -51,15 +51,22 @@ class PeeringManager:
def __load_peerings(self): def __load_peerings(self):
if not os.path.exists(self.__peering_file): if not os.path.exists(self.__peering_file):
with open(self.__peering_file, "x") as p: with open(self.__peering_file, "x") as p:
json.dump({"mnter": {}, "asn": {}}, p) json.dump({"mntner": {}, "asn": {}}, p)
try: try:
with open(self.__peering_file, "r") as p: with open(self.__peering_file, "r") as p:
self.peerings = json.load(p) self.peerings = json.load(p)
except json.decoder.JSONDecodeError: # migration due to typo in "mnter" key:
with open(self.__peering_file, "w") as p: if "mnter" in self.peerings:
json.dump({"mnter": {}, "asn": {}}, p) print("WARN: migrating peering data (Typo mnter)")
with open(self.__peering_file, "r") as p: self.peerings = {"mntner": self.peerings["mnter"], "asn": self.peerings["asn"]}
self.peerings = json.load(p) except json.decoder.JSONDecodeError as e:
print("CRITICAL: potentially corrupted peering database, aborting:")
print(e.args)
exit(1)
# with open(self.__peering_file, "w") as p:
# json.dump({"mntner": {}, "asn": {}}, p)
# with open(self.__peering_file, "r") as p:
# self.peerings = json.load(p)
# self.peerings = {} # self.peerings = {}
# missing_peerings = False # missing_peerings = False
@ -97,23 +104,23 @@ class PeeringManager:
__new = {} __new = {}
for asn in self.peerings["asn"]: for asn in self.peerings["asn"]:
for peering in self.peerings["asn"][asn]: for peering in self.peerings["asn"][asn]:
if not peering["node"] in __new: if peering["node"] not in __new:
__new[peering["node"]] = 0 __new[peering["node"]] = 0
__new[peering["node"]] += 1 __new[peering["node"]] += 1
self._amounts = __new self._amounts = __new
def amount_by_node(self, node_name: str): def amount_by_node(self, node_name: str):
if self._amounts == None: if self._amounts is None:
self._update_amounts() self._update_amounts()
try: try:
return self._amounts[node_name] return self._amounts[node_name]
except KeyError: except KeyError:
return 0 return 0
def exists(self, asn, node, mnt=None, wg_key=None, endpoint=None, ipv6ll=None, ipv4=None, ipv6=None, bgp_mp=True, bgp_enh=True): def exists(self, asn, node, mnt=None, wg_key=None, endpoint=None, ipv6ll=None, ipv4=None, ipv6=None, bgp_mp=None, bgp_enh=None):
"""checks if a peerings with specific data already exists""" """checks if a peerings with specific data already exists"""
# check if mnt is specified, already exists in the database and if that mnt has the specified ASn -> if not: return False # check if mnt is specified, already exists in the database and if that mnt has the specified ASn -> if not: return False
if mnt and not (mnt in self.peerings["mnter"] and asn in self.peerings["mnter"][mnt]): if mnt and not (mnt in self.peerings["mntner"] and asn in self.peerings["mntner"][mnt]):
return False return False
selected_peerings = self.peerings["asn"][asn] selected_peerings = self.peerings["asn"][asn]
# check if the ASn even has peerings # check if the ASn even has peerings
@ -131,12 +138,22 @@ class PeeringManager:
# print(self.peerings) # print(self.peerings)
try: try:
out = [] out = []
for asn in self.peerings["mnter"][mnt]: # if admin is logged in: return all
try: if mnt == self.__config["MNT"]:
for peering in self.peerings["asn"][asn]: for mntner in self.peerings["mntner"]:
out.append(peering) for asn in self.peerings["mntner"][mntner]:
except KeyError as e: try:
pass for peering in self.peerings["asn"][asn]:
out.append(peering)
except KeyError:
pass
else:
for asn in self.peerings["mntner"][mnt]:
try:
for peering in self.peerings["asn"][asn]:
out.append(peering)
except KeyError:
pass
return out return out
except KeyError: except KeyError:
return {} return {}
@ -144,14 +161,14 @@ class PeeringManager:
def add_peering(self, asn, node, mnt, wg_key, endpoint=None, ipv6ll=None, ipv4=None, ipv6=None, bgp_mp=True, bgp_enh=True): def add_peering(self, asn, node, mnt, wg_key, endpoint=None, ipv6ll=None, ipv4=None, ipv6=None, bgp_mp=True, bgp_enh=True):
# check if this MNT already has a/this asn # check if this MNT already has a/this asn
try: try:
if not asn in self.peerings["mnter"][mnt]: if asn not in self.peerings["mntner"][mnt]:
# ... and add it if it hasn't # ... and add it if it hasn't
self.peerings[mnt].append(asn) self.peerings[mnt].append(asn)
except KeyError: except KeyError:
# ... and cerate it if it doesn't have any yet # ... and cerate it if it doesn't have any yet
self.peerings["mnter"][mnt] = [asn] self.peerings["mntner"][mnt] = [asn]
try: try:
if not asn in self.peerings["asn"]: if asn not in self.peerings["asn"]:
self.peerings["asn"][asn] = [] self.peerings["asn"][asn] = []
except KeyError: except KeyError:
self.peerings["asn"][asn] = [] self.peerings["asn"][asn] = []
@ -175,15 +192,15 @@ class PeeringManager:
def update_peering(self, asn, node, mnt, wg_key, endpoint=None, ipv6ll=None, ipv4=None, ipv6=None, bgp_mp=True, bgp_enh=True): def update_peering(self, asn, node, mnt, wg_key, endpoint=None, ipv6ll=None, ipv4=None, ipv6=None, bgp_mp=True, bgp_enh=True):
# check if this MNT already has a/this asn # check if this MNT already has a/this asn
try: try:
if not asn in self.peerings["mnter"][mnt]: if asn not in self.peerings["mntner"][mnt]:
# ... and add it if it hasn't # ... and add it if it hasn't
self.peerings[mnt].append(asn) self.peerings[mnt].append(asn)
except KeyError: except KeyError:
# ... and create it if it doesn't have any yet # ... and create it if it doesn't have any yet
self.peerings["mnter"][mnt] = [asn] self.peerings["mntner"][mnt] = [asn]
try: try:
# there are no peerings for this asn -> can't edit nothing... # there are no peerings for this asn -> can't edit nothing...
if not asn in self.peerings["asn"]: if asn not in self.peerings["asn"]:
return False, 404 return False, 404
except KeyError: except KeyError:
# this should only happen if "asn" not in self.peerings # this should only happen if "asn" not in self.peerings

2
web/frontend/peerings-edit.html
View file

@ -190,7 +190,7 @@
<tr> <tr>
<td><label for="peer-asn">Your ASN</label></td> <td><label for="peer-asn">Your ASN</label></td>
<td></td> <td></td>
<td><input type="text" name="peer-asn" id="peer-asn" disabled="disabled" value="{{session['user-data']['asn']}}"></td> <td><input type="text" name="peer-asn" id="peer-asn" {% if session["login"] != config["MNT"] %}disabled="disabled"{%endif%%} value="{{session['user-data']['asn']}}"></td>
</tr> </tr>
<tr> <tr>
<td><h4>Wireguard</h4></td> <td><h4>Wireguard</h4></td>

2
web/frontend/peerings-new.html
View file

@ -187,7 +187,7 @@
<tr> <tr>
<td><label for="peer-asn">Your ASN</label></td> <td><label for="peer-asn">Your ASN</label></td>
<td></td> <td></td>
<td><input type="text" name="peer-asn" id="peer-asn" disabled="disabled" value="{{session['user-data']['asn']}}"></td> <td><input type="text" name="peer-asn" id="peer-asn" {% if session["login"] != config["MNT"] %}disabled="disabled"{%endif%%} value="{{session['user-data']['asn']}}"></td>
</tr> </tr>
<tr> <tr>
<td><h4>Wireguard</h4></td> <td><h4>Wireguard</h4></td>