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

chore: correct per review comment

Browse Source
This commit is contained in:
DaanSelen
2026-04-02 11:34:18 +02:00
parent 96acc10153
commit 65c2e69ac6
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/Peer.py
View File

@@ -84,19 +84,19 @@ class Peer:
if allowed_ip in used_allowed_ips: if allowed_ip in used_allowed_ips:
return False, "Allowed IP already taken by another peer" return False, "Allowed IP already taken by another peer"
if not ValidateDNSAddress(dns_addresses): if not ValidateDNSAddress(dns_addresses):
return False, f"DNS IP-Address or FQDN is incorrect" return False, f"DNS IP-Address or FQDN is incorrect"
if isinstance(mtu, str): if isinstance(mtu, str):
mtu = 0 mtu = 0
if isinstance(keepalive, str): if isinstance(keepalive, str):
keepalive = 0 keepalive = 0
if mtu not in range(0, 1461): if mtu not in range(0, 1461):
return False, "MTU format is not correct" return False, "MTU format is not correct"
if keepalive < 0: if keepalive < 0:
return False, "Persistent Keepalive format is not correct" return False, "Persistent Keepalive format is not correct"
@@ -117,7 +117,7 @@ class Peer:
newAllowedIPs = allowed_ip.replace(" ", "") newAllowedIPs = allowed_ip.replace(" ", "")
if not CheckAddress(newAllowedIPs): if not CheckAddress(newAllowedIPs):
return False, "Allowed IPs entry format is incorrect" return False, "Allowed IPs entry format is incorrect"
command = [self.configuration.Protocol, "set", self.configuration.Name, "peer", self.id, "allowed-ips", newAllowedIPs, "preshared-key", uid if psk_exist else "/dev/null"] command = [self.configuration.Protocol, "set", self.configuration.Name, "peer", self.id, "allowed-ips", newAllowedIPs, "preshared-key", uid if psk_exist else "/dev/null"]
updateAllowedIp = subprocess.check_output(command, stderr=subprocess.STDOUT) updateAllowedIp = subprocess.check_output(command, stderr=subprocess.STDOUT)
@@ -168,14 +168,14 @@ class Peer:
filename = re.sub(r'[.,/?<>\\:*|"]', '', filename).rstrip(". ") # remove special characters filename = re.sub(r'[.,/?<>\\:*|"]', '', filename).rstrip(". ") # remove special characters
reserved_pattern = r"^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\..*)?$" # match com1-9, lpt1-9, con, nul, prn, aux, nul reserved_pattern = r"^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\..*)?$" # match com1-9, lpt1-9, con, nul, prn, aux, nul
if re.match(reserved_pattern, filename, re.IGNORECASE): if re.match(reserved_pattern, filename, re.IGNORECASE):
filename = f"file_{filename}" # prepend "file_" if it matches filename = f"file_{filename}" # prepend "file_" if it matches
for i in filename: for i in filename:
if re.match("^[a-zA-Z0-9_=+.-]$", i): if re.match("^[a-zA-Z0-9_=+.-]$", i):
final["fileName"] += i final["fileName"] += i
interfaceSection = { interfaceSection = {
"PrivateKey": self.private_key, "PrivateKey": self.private_key,
"Address": self.allowed_ip, "Address": self.allowed_ip,
@@ -188,7 +188,7 @@ class Peer:
if self.configuration.configurationInfo.OverridePeerSettings.DNS else self.DNS if self.configuration.configurationInfo.OverridePeerSettings.DNS else self.DNS
) )
} }
if self.configuration.Protocol == "awg": if self.configuration.Protocol == "awg":
interfaceSection.update({ interfaceSection.update({
"Jc": self.configuration.Jc, "Jc": self.configuration.Jc,
@@ -208,7 +208,7 @@ class Peer:
"I4": self.configuration.I4, "I4": self.configuration.I4,
"I5": self.configuration.I5 "I5": self.configuration.I5
}) })
peerSection = { peerSection = {
"PublicKey": self.configuration.PublicKey, "PublicKey": self.configuration.PublicKey,
"AllowedIPs": ( "AllowedIPs": (
@@ -232,7 +232,7 @@ class Peer:
for (key, val) in combine[s]: 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)): if val is not None and ((type(val) is str and len(val) > 0) or (type(val) is int and val > 0)):
final["file"] += f"{key} = {val}\n" final["file"] += f"{key} = {val}\n"
final["file"] = jinja2.Template(final["file"]).render(configuration=self.configuration) final["file"] = jinja2.Template(final["file"]).render(configuration=self.configuration)