diff --git a/web/backend/main.py b/web/backend/main.py index 48b5af1..3fc4fea 100644 --- a/web/backend/main.py +++ b/web/backend/main.py @@ -205,7 +205,7 @@ def auth_required(): @wraps(f) def decorated(*args, **kwargs): if not "login" in session: - request_url = f"{config['base-dir']}{request.url}".replace("//", "/") + request_url = f"{config['base-dir']}{request.full_path}".replace("//", "/") return redirect(f"{config['base-dir']}login?return={request_url}") else: return f(*args, **kwargs) @@ -332,8 +332,9 @@ def peerings_edit(): selected_peering = p print(p) break - return render_template("peerings-edit.html", session=session, config=config, mnt_peerings=mnt_peerings, selected_peering=selected_peering) + return render_template("peerings-edit.html", session=session, config=config, mnt_peerings=mnt_peerings, selected_peering=selected_peering, selected_node=selected_peering["node"]) else: + print(request.args) return render_template("peerings-edit.html", session=session, config=config, mnt_peerings=mnt_peerings, selected_peering=None) elif request.method == "POST": print(request.args) diff --git a/web/frontend/peerings-edit.html b/web/frontend/peerings-edit.html index 94a15ea..3f983df 100644 --- a/web/frontend/peerings-edit.html +++ b/web/frontend/peerings-edit.html @@ -253,7 +253,7 @@ Table = off [Peer] PublicKey = {% if selected_node %}{{config["nodes"][selected_node]["wg-key"]}}{% else %} ... {% endif %} -Endpoint = {% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}:{% if selected_node %}{% if session["user-data"]["asn"].startswith("AS424242") %}5{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %} +Endpoint = {% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}:{% if session["user-data"]["asn"].startswith("424242") %}2{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %} AllowedIPs = {% if selected_node %}{{config["nodes"][selected_node]["internal-v6ll"]}} {% else %} ... {% endif %},172.20.0.0/14,172.31.0.0/16,10.0.0.0/8,fd00::/8 diff --git a/web/frontend/peerings-new.html b/web/frontend/peerings-new.html index 8b9d057..cc24627 100644 --- a/web/frontend/peerings-new.html +++ b/web/frontend/peerings-new.html @@ -250,7 +250,7 @@ Table = off [Peer] PublicKey = {% if selected_node %}{{config["nodes"][selected_node]["wg-key"]}}{% else %} ... {% endif %} -Endpoint = {% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}:{% if selected_node %}{% if session["user-data"]["asn"].startswith("AS424242") %}5{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %} +Endpoint = {% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}:{% if selected_node %}{% if session["user-data"]["asn"].startswith("424242") %}2{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %} AllowedIPs = {% if selected_node %}{{config["nodes"][selected_node]["internal-v6ll"]}} {% else %} ... {% endif %},172.20.0.0/14,172.31.0.0/16,10.0.0.0/8,fd00::/8