From 07df83a0cc8b972a262b5a89e9f7e20a4de22338 Mon Sep 17 00:00:00 2001
From: lare <lare@lare.cc>
Date: Sun, 15 Jan 2023 19:31:26 +0100
Subject: [PATCH] fix port not showing up in peering/{edit,new}

---
 web/backend/main.py             | 2 +-
 web/frontend/peerings-edit.html | 2 +-
 web/frontend/peerings-new.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/backend/main.py b/web/backend/main.py
index 48b5af1..24539b0 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)
diff --git a/web/frontend/peerings-edit.html b/web/frontend/peerings-edit.html
index 94a15ea..cea721d 100644
--- a/web/frontend/peerings-edit.html
+++ b/web/frontend/peerings-edit.html
@@ -253,7 +253,7 @@ Table = off
 
 [Peer]
 PublicKey = <span id="exmple-config-node-pubkey">{% if selected_node %}{{config["nodes"][selected_node]["wg-key"]}}{% else %} ... {% endif %}</span>
-Endpoint = <span id="exmple-config-node-endpoint">{% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}</span>:<span id="example-config-node-port">{% if selected_node %}{% if session["user-data"]["asn"].startswith("AS424242") %}5{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %}</span>
+Endpoint = <span id="exmple-config-node-endpoint">{% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}</span>:<span id="example-config-node-port">{% if selected_node %}{% if session["user-data"]["asn"].startswith("424242") %}2{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %}</span>
 AllowedIPs = <span id="example-config-node-v6ll">{% if selected_node %}{{config["nodes"][selected_node]["internal-v6ll"]}} {% else %} ... {% endif %}</span>,172.20.0.0/14,172.31.0.0/16,10.0.0.0/8,fd00::/8
     </pre>
     
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 = <span id="exmple-config-node-pubkey">{% if selected_node %}{{config["nodes"][selected_node]["wg-key"]}}{% else %} ... {% endif %}</span>
-Endpoint = <span id="exmple-config-node-endpoint">{% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}</span>:<span id="example-config-node-port">{% if selected_node %}{% if session["user-data"]["asn"].startswith("AS424242") %}5{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %}</span>
+Endpoint = <span id="exmple-config-node-endpoint">{% if selected_node %}{{config["nodes"][selected_node]["endpoint"]}}{% else %} ... {% endif %}</span>:<span id="example-config-node-port">{% if selected_node %}{% if session["user-data"]["asn"].startswith("424242") %}2{{session["user-data"]["asn"][-4:]}}{% else %} ... {% endif %}{% else %} ... {% endif %}</span>
 AllowedIPs = <span id="example-config-node-v6ll">{% if selected_node %}{{config["nodes"][selected_node]["internal-v6ll"]}} {% else %} ... {% endif %}</span>,172.20.0.0/14,172.31.0.0/16,10.0.0.0/8,fd00::/8
     </pre>