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

Vite build

Browse Source
This commit is contained in:
Donald Zou
2025-08-16 16:54:31 +08:00
parent f777ac5f75
commit 24940886f6
48 changed files with 73 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/Peer.py
View File

@@ -137,7 +137,10 @@ class Peer:
"PrivateKey": self.private_key,
"Address": self.allowed_ip,
"MTU": self.mtu,
"DNS": self.DNS
"DNS": (
self.configuration.configurationInfo.OverridePeerSettings.DNS
if self.configuration.configurationInfo.OverridePeerSettings.DNS else self.DNS
)
}
peerSection = {
"PublicKey": self.configuration.PublicKey,
@@ -156,31 +159,6 @@ class Peer:
for (key, val) in combine[s]:
if val is not None and ((type(val) is str and len(val) > 0) or (type(val) is int and val > 0)):
peerConfiguration += f"{key} = {val}\n"
# for (key, val) in interfaceSection.items():
# if val is not None and ((type(val) is str and len(val) > 0) or type(val) is int):
# peerConfiguration += f"{key} = {val}\n"
# peerConfiguration = "\n[Peer]\n"
# peerConfiguration = f'''[Interface]
# PrivateKey = {self.private_key}
# Address = {self.allowed_ip}
# MTU = {str(self.mtu)}
# '''
# if len(self.DNS) > 0:
# peerConfiguration += f"DNS = {self.DNS}\n"
#
# peerConfiguration += f'''
# [Peer]
# PublicKey = {self.configuration.PublicKey}
# AllowedIPs = {self.endpoint_allowed_ip}
# Endpoint = {self.configuration.DashboardConfig.GetConfig("Peers", "remote_endpoint")[1]}:{self.configuration.ListenPort}
# PersistentKeepalive = {str(self.keepalive)}
# '''
# if len(self.preshared_key) > 0:
# peerConfiguration += f"PresharedKey = {self.preshared_key}\n"
return {
"fileName": finalFilename,
"file": peerConfiguration

9
src/modules/WireguardConfiguration.py
View File

@@ -1116,9 +1116,12 @@ class WireguardConfiguration:
self.configurationInfo.Description = value
elif key == "OverridePeerSettings":
for (key, val) in value.items():
status, msg = self.__validateOverridePeerSettings(key, jinja2.Template(val).render(configuration=self.toJson()))
if not status:
return False, msg, key
try:
status, msg = self.__validateOverridePeerSettings(key, jinja2.Template(val).render(configuration=self.toJson()))
if not status:
return False, msg, key
except Exception as e:
return False, str(e), None
self.configurationInfo.OverridePeerSettings = (
self.configurationInfo.OverridePeerSettings.model_validate(value))
else: