UniqueSoft/WGDashboard
2
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard synced 2025-02-26 05:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/donaldzou/WGDashboard

Browse Source
This commit is contained in:
Donald Cheng Hong Zou 2021-12-29 15:30:52 -05:00
commit 993dcaf235
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dashboard.py
View File

@ -439,8 +439,6 @@ def gen_private_key():
with open('public_key.txt', encoding='utf-8') as file_object: with open('public_key.txt', encoding='utf-8') as file_object:
public_key = file_object.readline().strip() public_key = file_object.readline().strip()
data = {"private_key": private_key, "public_key": public_key, "preshared_key": preshare_key} data = {"private_key": private_key, "public_key": public_key, "preshared_key": preshare_key}
private.close()
public.close()
return data return data
@ -896,7 +894,7 @@ def add_peer(config_name):
public_key = data['public_key'] public_key = data['public_key']
allowed_ips = data['allowed_ips'] allowed_ips = data['allowed_ips']
endpoint_allowed_ip = data['endpoint_allowed_ip'] endpoint_allowed_ip = data['endpoint_allowed_ip']
DNS = data['DNS'] dns_addresses = data['DNS']
enable_preshared_key = data["enable_preshared_key"] enable_preshared_key = data["enable_preshared_key"]
keys = get_conf_peer_key(config_name) keys = get_conf_peer_key(config_name)
if len(public_key) == 0 or len(dns_addresses) == 0 or len(allowed_ips) == 0 or len(endpoint_allowed_ip) == 0: if len(public_key) == 0 or len(dns_addresses) == 0 or len(allowed_ips) == 0 or len(endpoint_allowed_ip) == 0:
@ -1312,7 +1310,7 @@ Dashboard Tools Related
# Get all IP for ping # Get all IP for ping
@app.route('/get_ping_ip', methods=['POST']) @app.route('/get_ping_ip', methods=['POST'])
def get_ping_ip(): def get_ping_ip():
config_name = request.form['config'] config = request.form['config']
sem.acquire(timeout=1) sem.acquire(timeout=1)
db = TinyDB(os.path.join(db_path, config_name + ".json")) db = TinyDB(os.path.join(db_path, config_name + ".json"))
html = "" html = ""