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

add check if no peering is selected in peering-edit

Browse source
This commit is contained in:
lare 2022-12-26 14:52:48 +01:00
parent 600631be53
commit a0254de86c
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nodes/requirements.txt Normal file
View file

@ -0,0 +1,3 @@
flask
flask_restful
waitress

4
web/backend/main.py
View file

@ -320,6 +320,8 @@ 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"]:
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["login"]) mnt_peerings = peerings.get_peerings_by_mnt(session["login"])
# print(mnt_peerings) # print(mnt_peerings)
if "node" in request.args and request.args["node"] in config["nodes"]: if "node" in request.args and request.args["node"] in config["nodes"]:
@ -336,7 +338,7 @@ def peerings_edit():
print(request.args) print(request.args)
print(request.form) print(request.form)
if not "node" in request.args or not request.args["node"]: if not "node" in request.args or not request.args["node"]:
return render_template("peerings-edit.html", session=session, config=config, peerings=peerings, msg="no node specified, 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)
print(peering_valid) print(peering_valid)

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

@ -200,27 +200,27 @@
<tr> <tr>
<td><label for="peer-wgkey">your Wireguard Publickey</label></td> <td><label for="peer-wgkey">your Wireguard Publickey</label></td>
<td></td> <td></td>
<td><input type="text" name="peer-wgkey" id="peer-wgkey" maxlength="44" minlength="44" required value="{{selected_peering['wg_key']}}"></td> <td><input type="text" name="peer-wgkey" id="peer-wgkey" maxlength="44" minlength="44" required {% if selected_peering %}value="{{selected_peering['wg_key']}}"{%endif%}></td>
</tr> </tr>
<tr> <tr>
<td><label for="peer-endpoint">your Endpoint</label></td> <td><label for="peer-endpoint">your Endpoint</label></td>
<td><input type="checkbox" name="peer-endpoint-enabled" id="peer-endpoint-enabled" {% if selected_peering["endpoint"] %} checked {% endif %}></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["endpoint"] %}value="{{selected_peering['endpoint']}}" {% 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>
</tr> </tr>
<tr> <tr>
<td><label for="peer-v6ll">your ipv6 LinkLocal</label></td> <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["ipv6ll"] %} checked {% endif %}></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="text" name="peer-v6ll" id="peer-v6ll" onchange="return update_from_v6ll()"{% if selected_peering["ipv6ll"] %}value="{{selected_peering['ipv6ll']}}" {% 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>
<tr> <tr>
<td><label for="peer-v4">your ipv4</label></td> <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["ipv4"] %} checked {% endif %}></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["ipv4"] %}value="{{selected_peering['ipv4']}}" {% 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>
</tr> </tr>
<tr> <tr>
<td><label for="peer-v6">your ipv6</label></td> <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["ipv6"] %} checked {% endif %}></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["ipv6"] %}value="{{selected_peering['ipv6']}}" {% 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>
</tr> </tr>
<tr> <tr>
<td><h4>BGP</h4></td> <td><h4>BGP</h4></td>
@ -229,12 +229,12 @@
</tr> </tr>
<tr> <tr>
<td><label for="bgp-multi-protocol">MultiProtocol</label></td> <td><label for="bgp-multi-protocol">MultiProtocol</label></td>
<td><input type="checkbox" name="bgp-multi-protocol" id="bgp-multi-protocol" onchange="return update_from_mpbgp()" {% if selected_peering["bgp_mp"] == True %} checked {% endif %}></td> <td><input type="checkbox" name="bgp-multi-protocol" id="bgp-multi-protocol" onchange="return update_from_mpbgp()" {% if selected_peering %}{% if selected_peering["bgp_mp"] == True %} checked {% endif %}{%endif%}></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td><label for="bgp-extended-next-hop">extended next hop</label></td> <td><label for="bgp-extended-next-hop">extended next hop</label></td>
<td><input type="checkbox" name="bgp-extended-next-hop" id="bgp-extended-next-hop" onchange="return update_from_enh()" {% if selected_peering["bgp_enh"] == True%} checked {% endif %}></td> <td><input type="checkbox" name="bgp-extended-next-hop" id="bgp-extended-next-hop" onchange="return update_from_enh()" {% if selected_peering %}{% if selected_peering["bgp_enh"] == True%} checked {% endif %}{%endif%}></td>
<td></td> <td></td>
</tr> </tr>
</table> </table>