Mirrors/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2025-10-03 07:46:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleaned some code files

Browse Source
This commit is contained in:
Donald Zou
2025-09-15 21:48:00 +08:00
parent 1a26f757a8
commit 3673813e6a
3 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/dashboard.py
View File

@@ -791,12 +791,8 @@ def API_addPeers(configName):
break
if len(keyPairs) == 0 or (bulkAdd and len(keyPairs) != bulkAddAmount):
return ResponseObject(False, "Generating key pairs by bulk failed")
status, result = config.addPeers(keyPairs)
# DashboardWebHooks.RunWebHook('peer_created', {
# "configuration": config.Name,
# "peers": list(map(lambda p : p['id'], keyPairs))
# })
return ResponseObject(status=status, message=result['message'], data=result['peers'])
status, addedPeers, message = config.addPeers(keyPairs)
return ResponseObject(status=status, message=message, data=addedPeers)
else:
if config.searchPeer(public_key)[0] is True:
@@ -816,14 +812,6 @@ def API_addPeers(configName):
# Check if provided pubkey match provided private key
if public_key != genPub:
return ResponseObject(False, "Provided Public Key does not match provided Private Key")
# if len(public_key) == 0 and len(private_key) == 0:
# private_key = GenerateWireguardPrivateKey()[1]
# public_key = GenerateWireguardPublicKey(private_key)[1]
# elif len(public_key) == 0 and len(private_key) > 0:
# public_key = GenerateWireguardPublicKey(private_key)[1]
if len(allowed_ips) == 0:
if ipStatus:
for subnet in availableIps.keys():
@@ -846,7 +834,7 @@ def API_addPeers(configName):
if not found:
return ResponseObject(False, f"This IP is not available: {i}")
status, result = config.addPeers([
status, addedPeers, message = config.addPeers([
{
"name": name,
"id": public_key,
@@ -860,14 +848,11 @@ def API_addPeers(configName):
"advanced_security": "off"
}]
)
# DashboardWebHooks.RunWebHook('peer_created', {
# "configuration": config.Name,
# "peers": [{"id": public_key}]
# })
return ResponseObject(status=status, message=result['message'], data=result['peers'])
return ResponseObject(status=status, message=message, data=addedPeers)
except Exception as e:
app.logger.error("Add peers failed", data, exc_info=e)
return ResponseObject(False, "Add peers failed. Please see data for specific issue")
app.logger.error("Add peers failed", e)
return ResponseObject(False,
f"Add peers failed. Reason: {message}")
return ResponseObject(False, "Configuration does not exist")

8
src/modules/AmneziaWireguardConfiguration.py
View File

@@ -248,7 +248,7 @@ class AmneziaWireguardConfiguration(WireguardConfiguration):
for i in existingPeers:
self.Peers.append(AmneziaWGPeer(i, self))
def addPeers(self, peers: list) -> tuple[bool, dict]:
def addPeers(self, peers: list) -> tuple[bool, list, str]:
result = {
"message": None,
"peers": []
@@ -305,10 +305,10 @@ class AmneziaWireguardConfiguration(WireguardConfiguration):
"configuration": self.Name,
"peers": list(map(lambda k : k['id'], peers))
})
return True, result
except Exception as e:
result['message'] = str(e)
return False, result
current_app.logger.error("Add peers error", e)
return False, [], str(e)
return True, result['peers'], ""
def getRestrictedPeers(self):
self.RestrictedPeers = []

13
src/modules/WireguardConfiguration.py
View File

@@ -512,11 +512,8 @@ class WireguardConfiguration:
"time": datetime.now()
})
)
def addPeers(self, peers: list) -> tuple[bool, dict]:
def addPeers(self, peers: list) -> tuple[bool, list, str]:
result = {
"message": None,
"peers": []
@@ -571,10 +568,10 @@ class WireguardConfiguration:
"configuration": self.Name,
"peers": list(map(lambda k : k['id'], peers))
})
return True, result
except Exception as e:
result['message'] = str(e)
return False, result
current_app.logger.error("Add peers error", e)
return False, [], str(e)
return True, result['peers'], ""
def searchPeer(self, publicKey):
for i in self.Peers: