kamp/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2024-07-04 16:30:15 +02:00
Code

Merge pull request #51 from donaldzou/v2.2.1

Browse Source 
V2.2.1
This commit is contained in:
Donald Zou 2021-08-16 15:29:49 -04:00 committed by GitHub
commit c32ccfc9ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dashboard.py
View File

@ -18,7 +18,7 @@ from tinydb import TinyDB, Query
from icmplib import ping, multiping, traceroute, resolve, Host, Hop from icmplib import ping, multiping, traceroute, resolve, Host, Hop
# Dashboard Version # Dashboard Version
dashboard_version = 'v2.2' dashboard_version = 'v2.2.1'
# Dashboard Config Name # Dashboard Config Name
dashboard_conf = 'wg-dashboard.ini' dashboard_conf = 'wg-dashboard.ini'
# Default Wireguard IP # Default Wireguard IP
@ -107,7 +107,7 @@ def read_conf_file(config_name):
conf_peers = file[peers_start:] conf_peers = file[peers_start:]
peer = -1 peer = -1
for i in conf_peers: for i in conf_peers:
if not is_match("^#(.*)", i): if not is_match("#(.*)", i):
if i == "[Peer]": if i == "[Peer]":
peer += 1 peer += 1
conf_peer_data["Peers"].append({}) conf_peer_data["Peers"].append({})
@ -388,7 +388,8 @@ def cleanIpWithRange(ip):
def checkIpWithRange(ip): def checkIpWithRange(ip):
return is_match("((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|\/)){4}(0|8|16|24|32)(,|$)", ip) return is_match("((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|\/)){4}(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|"+
"18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)(,|$)", ip)
def checkAllowedIPs(ip): def checkAllowedIPs(ip):
@ -769,7 +770,6 @@ def add_peer(config_name):
return "Allowed IP already taken by another peer." return "Allowed IP already taken by another peer."
if not checkIp(DNS): if not checkIp(DNS):
return "DNS formate is incorrect. Example: 1.1.1.1" return "DNS formate is incorrect. Example: 1.1.1.1"
if not checkAllowedIPs(endpoint_allowed_ip): if not checkAllowedIPs(endpoint_allowed_ip):
return "Endpoint Allowed IPs format is incorrect." return "Endpoint Allowed IPs format is incorrect."
else: else:
@ -829,6 +829,9 @@ def save_peer_setting(config_name):
peers = Query() peers = Query()
if len(db.search(peers.id == id)) == 1: if len(db.search(peers.id == id)) == 1:
check_ip = checkAllowedIP(id, allowed_ip, config_name) check_ip = checkAllowedIP(id, allowed_ip, config_name)
if not checkIpWithRange(endpoint_allowed_ip):
return jsonify({"status": "failed", "msg": "Endpoint Allowed IPs format is incorrect."})
if private_key != "": if private_key != "":
check_key = checkKeyMatch(private_key, id, config_name) check_key = checkKeyMatch(private_key, id, config_name)
if check_key['status'] == "failed": if check_key['status'] == "failed":

4
src/static/js/configuration.js
View File

@ -96,6 +96,8 @@ $("#save_peer").click(function(){
}else{ }else{
$("#add_peer_alert").html("Please fill in all required box."); $("#add_peer_alert").html("Please fill in all required box.");
$("#add_peer_alert").removeClass("d-none"); $("#add_peer_alert").removeClass("d-none");
$(this).removeAttr("disabled")
$(this).html("Save")
} }
}) })
var qrcodeModal = new bootstrap.Modal(document.getElementById('qrcode_modal'), { var qrcodeModal = new bootstrap.Modal(document.getElementById('qrcode_modal'), {
@ -249,6 +251,8 @@ $("#save_peer_setting").click(function (){
}else{ }else{
$("#setting_peer_alert").html("Please fill in all required box."); $("#setting_peer_alert").html("Please fill in all required box.");
$("#setting_peer_alert").removeClass("d-none"); $("#setting_peer_alert").removeClass("d-none");
$("#save_peer_setting").removeAttr("disabled")
$("#save_peer_setting").html("Save")
} }