From e6e38675b936698e47029a4a15fc37160d6efd40 Mon Sep 17 00:00:00 2001
From: lare <lare@lare.cc>
Date: Sun, 5 Feb 2023 21:10:32 +0100
Subject: [PATCH] [Web] fix ipv4,6 not being able to be set if only one range
 is in allowed

+ add hints for form for the ip addresses
---
 web/backend/main.py             | 17 ++++++++++++++---
 web/frontend/peerings-edit.html |  8 ++++----
 web/frontend/peerings-new.html  | 12 ++++++------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/web/backend/main.py b/web/backend/main.py
index 3fc4fea..3734bee 100644
--- a/web/backend/main.py
+++ b/web/backend/main.py
@@ -163,9 +163,14 @@ def check_peering_data(form):
                     raise ValueError()
                 is_in_allowed = False
                 if session["user-data"]["allowed4"]:
-                    for allowed4 in session["user-data"]["allowed4"]:
+                    if not isinstance(session["user-data"]["allowed4"],tuple):
+                        allowed4 = session["user-data"]["allowed4"]
                         if ipv4 in ip_network(allowed4):
                             is_in_allowed = True
+                    else:
+                        for allowed4 in session["user-data"]["allowed4"]:
+                            if ipv4 in ip_network(allowed4):
+                                is_in_allowed = True
                 if not is_in_allowed:
                     return False, "supplied ipv4 addr not in allowed ip range"
             else:
@@ -180,12 +185,18 @@ def check_peering_data(form):
                 raise ValueError()
             is_in_allowed = False
             if session["user-data"]["allowed6"]:
-                for allowed6 in session["user-data"]["allowed6"]:
+                if not isinstance(session["user-data"]["allowed6"],tuple):
+                    allowed6 = session["user-data"]["allowed6"]
                     if ipv6 in ip_network(allowed6):
                         is_in_allowed = True
+                else:
+                    for allowed6 in session["user-data"]["allowed6"]:
+                        if ipv6 in ip_network(allowed6):
+                            is_in_allowed = True
             if not is_in_allowed:
                 return False, "supplied ipv6 addr not in allowed ip range"
-    except ValueError:
+    except ValueError as e:
+        print(e)
         return False, "invalid ip address(es) supplied"
 
     # check bgp options
diff --git a/web/frontend/peerings-edit.html b/web/frontend/peerings-edit.html
index 3f983df..9d98782 100644
--- a/web/frontend/peerings-edit.html
+++ b/web/frontend/peerings-edit.html
@@ -205,22 +205,22 @@
         <tr>
             <td><label for="peer-endpoint">your Endpoint</label></td>
             <td><input type="checkbox" name="peer-endpoint-enabled" id="peer-endpoint-enabled" {% if selected_peering %}{% if selected_peering["endpoint"] %} checked {% endif %}{%endif%}></td>
-            <td><input type="text" name="peer-endpoint" id="peer-endpoint" onchange="return update_from_endpoint()" {% if selected_peering %}{% if selected_peering["endpoint"] %}value="{{selected_peering['endpoint']}}"{% endif %}{%endif%}></td>
+            <td><input type="text" name="peer-endpoint" id="peer-endpoint" onchange="return update_from_endpoint()" placeholder="node.example.org:1234" {% if selected_peering %}{% if selected_peering["endpoint"] %}value="{{selected_peering['endpoint']}}"{% endif %}{%endif%}></td>
         </tr>
         <tr>
             <td><label for="peer-v6ll">your ipv6 LinkLocal</label></td>
-            <td><input type="checkbox" name="peer-v6ll-enabled" id="peer-v6ll-enabled" onchange="return update_from_v6ll()"{% if selected_peering %}{% if selected_peering["ipv6ll"] %} checked {% endif %}{%endif%}></td>
+            <td><input type="checkbox" name="peer-v6ll-enabled" id="peer-v6ll-enabled" onchange="return update_from_v6ll()" placeholder="fe80::xxxx (recommended/preferred)" title="default when using extended next hop" {% if selected_peering %}{% if selected_peering["ipv6ll"] %} checked {% endif %}{%endif%}></td>
             <td><input type="text" name="peer-v6ll" id="peer-v6ll" onchange="return update_from_v6ll()"{% if selected_peering %}{% if selected_peering["ipv6ll"] %}value="{{selected_peering['ipv6ll']}}" {% endif %}{%endif%}></td>
         </tr>
         <tr>
             <td><label for="peer-v4">your ipv4</label></td>
             <td><input type="checkbox" name="peer-v4-enabled" id="peer-v4-enabled" onchange="return update_from_v4()" {% if selected_peering %}{% if selected_peering["ipv4"] %} checked {% endif %}{%endif%}></td>
-            <td><input type="text" name="peer-v4" id="peer-v4" onchange="return update_from_v4()" {% if selected_peering %}{% if selected_peering["ipv4"] %}value="{{selected_peering['ipv4']}}" {% endif %}{%endif%}></td>
+            <td><input type="text" name="peer-v4" id="peer-v4" onchange="return update_from_v4()" placeholder="172.2x.yyy.zzz" title="only required when not using extended next hop or not MultiProtocol" {% if selected_peering %}{% if selected_peering["ipv4"] %}value="{{selected_peering['ipv4']}}" {% endif %}{%endif%}></td>
         </tr>
         <tr>
             <td><label for="peer-v6">your ipv6</label></td>
             <td><input type="checkbox" name="peer-v6-enabled" id="peer-v6-enabled" onchange="return update_from_v6()"{% if selected_peering %}{% if selected_peering["ipv6"] %} checked {% endif %}{%endif%}></td>
-            <td><input type="text" name="peer-v6" id="peer-v6" onchange="return update_from_v6()" {% if selected_peering %}{% if selected_peering["ipv6"] %}value="{{selected_peering['ipv6']}}" {% endif %}{%endif%}></td>
+            <td><input type="text" name="peer-v6" id="peer-v6" onchange="return update_from_v6()" placeholder="fdxx:yyyy:zzzz:..." title="only required when ipv6 LinkLocal and/or MultiProtocol BGP are not supported" {% if selected_peering %}{% if selected_peering["ipv6"] %}value="{{selected_peering['ipv6']}}" {% endif %}{%endif%}></td>
         </tr>
         <tr>
             <td><h4>BGP</h4></td>
diff --git a/web/frontend/peerings-new.html b/web/frontend/peerings-new.html
index cc24627..9d2e638 100644
--- a/web/frontend/peerings-new.html
+++ b/web/frontend/peerings-new.html
@@ -202,22 +202,22 @@
         <tr>
             <td><label for="peer-endpoint">your Endpoint</label></td>
             <td><input type="checkbox" name="peer-endpoint-enabled" id="peer-endpoint-enabled" checked></td>
-            <td><input type="text" name="peer-endpoint" id="peer-endpoint" onchange="return update_from_endpoint()"></td>
+            <td><input type="text" name="peer-endpoint" id="peer-endpoint" onchange="return update_from_endpoint()" placeholder="node.example.org:1234"></td>
         </tr>
         <tr>
             <td><label for="peer-v6ll">your ipv6 LinkLocal</label></td>
             <td><input type="checkbox" name="peer-v6ll-enabled" id="peer-v6ll-enabled" onchange="return update_from_v6ll()" checked></td>
-            <td><input type="text" name="peer-v6ll" id="peer-v6ll" onchange="return update_from_v6ll()"></td>
+            <td><input type="text" name="peer-v6ll" id="peer-v6ll" onchange="return update_from_v6ll()" placeholder="fe80::xxxx (recommended/preferred)" title="default when using extended next hop"></td>
         </tr>
         <tr>
             <td><label for="peer-v4">your ipv4</label></td>
-            <td><input type="checkbox" name="peer-v4-enabled" id="peer-v4-enabled"onchange="return update_from_v4()"></td>
-            <td><input type="text" name="peer-v4" id="peer-v4"onchange="return update_from_v4()"></td>
+            <td><input type="checkbox" name="peer-v4-enabled" id="peer-v4-enabled" onchange="return update_from_v4()"></td>
+            <td><input type="text" name="peer-v4" id="peer-v4" onchange="return update_from_v4()" placeholder="172.2x.yyy.zzz" title="only required when not using extended next hop or not MultiProtocol"></td>
         </tr>
         <tr>
             <td><label for="peer-v6">your ipv6</label></td>
-            <td><input type="checkbox" name="peer-v6-enabled" id="peer-v6-enabled"onchange="return update_from_v6()"></td>
-            <td><input type="text" name="peer-v6" id="peer-v6"onchange="return update_from_v6()"></td>
+            <td><input type="checkbox" name="peer-v6-enabled" id="peer-v6-enabled" onchange="return update_from_v6()"></td>
+            <td><input type="text" name="peer-v6" id="peer-v6" onchange="return update_from_v6()" placeholder="fdxx:yyyy:zzzz:..." title="only required when ipv6 LinkLocal and/or MultiProtocol BGP are not supported"></td>
         </tr>
         <tr>
             <td><h4>BGP</h4></td>