mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2024-09-20 15:26:24 +08:00
Compare commits
2 commits
3c50e4768a
...
e0d6f35cea
| Author | SHA1 | Date | |
|---|---|---|---|
|
e0d6f35cea | ||
|
|
9312e168cb |
152
src/dashboard.py
152
src/dashboard.py
|
|
@ -592,79 +592,80 @@ class WireguardConfiguration:
|
||||||
def __getPeers(self):
|
def __getPeers(self):
|
||||||
|
|
||||||
mt = os.path.getmtime(os.path.join(WG_CONF_PATH, f'{self.Name}.conf'))
|
mt = os.path.getmtime(os.path.join(WG_CONF_PATH, f'{self.Name}.conf'))
|
||||||
# if self.__configFileModifiedTime is None or self.__configFileModifiedTime != mt:
|
if self.__configFileModifiedTime is None or self.__configFileModifiedTime != mt:
|
||||||
self.Peers = []
|
print(f"[WGDashboard] WireGuard configuration file modified. Reading {self.Name}.conf now")
|
||||||
with open(os.path.join(WG_CONF_PATH, f'{self.Name}.conf'), 'r') as configFile:
|
self.Peers = []
|
||||||
p = []
|
with open(os.path.join(WG_CONF_PATH, f'{self.Name}.conf'), 'r') as configFile:
|
||||||
pCounter = -1
|
p = []
|
||||||
content = configFile.read().split('\n')
|
pCounter = -1
|
||||||
try:
|
content = configFile.read().split('\n')
|
||||||
peerStarts = content.index("[Peer]")
|
try:
|
||||||
content = content[peerStarts:]
|
peerStarts = content.index("[Peer]")
|
||||||
for i in content:
|
content = content[peerStarts:]
|
||||||
if not regex_match("#(.*)", i) and not regex_match(";(.*)", i):
|
for i in content:
|
||||||
if i == "[Peer]":
|
if not regex_match("#(.*)", i) and not regex_match(";(.*)", i):
|
||||||
pCounter += 1
|
if i == "[Peer]":
|
||||||
p.append({})
|
pCounter += 1
|
||||||
p[pCounter]["name"] = ""
|
p.append({})
|
||||||
else:
|
p[pCounter]["name"] = ""
|
||||||
if len(i) > 0:
|
else:
|
||||||
split = re.split(r'\s*=\s*', i, 1)
|
if len(i) > 0:
|
||||||
if len(split) == 2:
|
split = re.split(r'\s*=\s*', i, 1)
|
||||||
p[pCounter][split[0]] = split[1]
|
if len(split) == 2:
|
||||||
|
p[pCounter][split[0]] = split[1]
|
||||||
|
|
||||||
if regex_match("#Name# = (.*)", i):
|
if regex_match("#Name# = (.*)", i):
|
||||||
split = re.split(r'\s*=\s*', i, 1)
|
split = re.split(r'\s*=\s*', i, 1)
|
||||||
print(split)
|
print(split)
|
||||||
if len(split) == 2:
|
if len(split) == 2:
|
||||||
p[pCounter]["name"] = split[1]
|
p[pCounter]["name"] = split[1]
|
||||||
|
|
||||||
for i in p:
|
for i in p:
|
||||||
if "PublicKey" in i.keys():
|
if "PublicKey" in i.keys():
|
||||||
checkIfExist = sqlSelect("SELECT * FROM '%s' WHERE id = ?" % self.Name,
|
checkIfExist = sqlSelect("SELECT * FROM '%s' WHERE id = ?" % self.Name,
|
||||||
((i['PublicKey']),)).fetchone()
|
((i['PublicKey']),)).fetchone()
|
||||||
if checkIfExist is None:
|
if checkIfExist is None:
|
||||||
newPeer = {
|
newPeer = {
|
||||||
"id": i['PublicKey'],
|
"id": i['PublicKey'],
|
||||||
"private_key": "",
|
"private_key": "",
|
||||||
"DNS": DashboardConfig.GetConfig("Peers", "peer_global_DNS")[1],
|
"DNS": DashboardConfig.GetConfig("Peers", "peer_global_DNS")[1],
|
||||||
"endpoint_allowed_ip": DashboardConfig.GetConfig("Peers", "peer_endpoint_allowed_ip")[
|
"endpoint_allowed_ip": DashboardConfig.GetConfig("Peers", "peer_endpoint_allowed_ip")[
|
||||||
1],
|
1],
|
||||||
"name": i.get("name"),
|
"name": i.get("name"),
|
||||||
"total_receive": 0,
|
"total_receive": 0,
|
||||||
"total_sent": 0,
|
"total_sent": 0,
|
||||||
"total_data": 0,
|
"total_data": 0,
|
||||||
"endpoint": "N/A",
|
"endpoint": "N/A",
|
||||||
"status": "stopped",
|
"status": "stopped",
|
||||||
"latest_handshake": "N/A",
|
"latest_handshake": "N/A",
|
||||||
"allowed_ip": i.get("AllowedIPs", "N/A"),
|
"allowed_ip": i.get("AllowedIPs", "N/A"),
|
||||||
"cumu_receive": 0,
|
"cumu_receive": 0,
|
||||||
"cumu_sent": 0,
|
"cumu_sent": 0,
|
||||||
"cumu_data": 0,
|
"cumu_data": 0,
|
||||||
"traffic": [],
|
"traffic": [],
|
||||||
"mtu": DashboardConfig.GetConfig("Peers", "peer_mtu")[1],
|
"mtu": DashboardConfig.GetConfig("Peers", "peer_mtu")[1],
|
||||||
"keepalive": DashboardConfig.GetConfig("Peers", "peer_keep_alive")[1],
|
"keepalive": DashboardConfig.GetConfig("Peers", "peer_keep_alive")[1],
|
||||||
"remote_endpoint": DashboardConfig.GetConfig("Peers", "remote_endpoint")[1],
|
"remote_endpoint": DashboardConfig.GetConfig("Peers", "remote_endpoint")[1],
|
||||||
"preshared_key": i["PresharedKey"] if "PresharedKey" in i.keys() else ""
|
"preshared_key": i["PresharedKey"] if "PresharedKey" in i.keys() else ""
|
||||||
}
|
}
|
||||||
sqlUpdate(
|
sqlUpdate(
|
||||||
"""
|
"""
|
||||||
INSERT INTO '%s'
|
INSERT INTO '%s'
|
||||||
VALUES (:id, :private_key, :DNS, :endpoint_allowed_ip, :name, :total_receive, :total_sent,
|
VALUES (:id, :private_key, :DNS, :endpoint_allowed_ip, :name, :total_receive, :total_sent,
|
||||||
:total_data, :endpoint, :status, :latest_handshake, :allowed_ip, :cumu_receive, :cumu_sent,
|
:total_data, :endpoint, :status, :latest_handshake, :allowed_ip, :cumu_receive, :cumu_sent,
|
||||||
:cumu_data, :mtu, :keepalive, :remote_endpoint, :preshared_key);
|
:cumu_data, :mtu, :keepalive, :remote_endpoint, :preshared_key);
|
||||||
""" % self.Name
|
""" % self.Name
|
||||||
, newPeer)
|
, newPeer)
|
||||||
# sqldb.commit()
|
# sqldb.commit()
|
||||||
self.Peers.append(Peer(newPeer, self))
|
self.Peers.append(Peer(newPeer, self))
|
||||||
else:
|
else:
|
||||||
sqlUpdate("UPDATE '%s' SET allowed_ip = ? WHERE id = ?" % self.Name,
|
sqlUpdate("UPDATE '%s' SET allowed_ip = ? WHERE id = ?" % self.Name,
|
||||||
(i.get("AllowedIPs", "N/A"), i['PublicKey'],))
|
(i.get("AllowedIPs", "N/A"), i['PublicKey'],))
|
||||||
# sqldb.commit()
|
# sqldb.commit()
|
||||||
self.Peers.append(Peer(checkIfExist, self))
|
self.Peers.append(Peer(checkIfExist, self))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"[WGDashboard] {self.Name} Error: {str(e)}")
|
print(f"[WGDashboard] {self.Name} Error: {str(e)}")
|
||||||
self.__configFileModifiedTime = mt
|
self.__configFileModifiedTime = mt
|
||||||
|
|
||||||
def addPeers(self, peers: list):
|
def addPeers(self, peers: list):
|
||||||
for p in peers:
|
for p in peers:
|
||||||
|
|
@ -1074,7 +1075,7 @@ def regex_match(regex, text):
|
||||||
|
|
||||||
def iPv46RegexCheck(ip):
|
def iPv46RegexCheck(ip):
|
||||||
return re.match(
|
return re.match(
|
||||||
'((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))',
|
r'((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))',
|
||||||
ip)
|
ip)
|
||||||
|
|
||||||
class DashboardAPIKey:
|
class DashboardAPIKey:
|
||||||
|
|
@ -1368,7 +1369,10 @@ def _getWireguardConfigurationAvailableIP(configName: str) -> tuple[bool, list[s
|
||||||
add = p.allowed_ip.split(',')
|
add = p.allowed_ip.split(',')
|
||||||
for i in add:
|
for i in add:
|
||||||
a, c = i.split('/')
|
a, c = i.split('/')
|
||||||
existedAddress.append(ipaddress.ip_address(a.replace(" ", "")))
|
try:
|
||||||
|
existedAddress.append(ipaddress.ip_address(a.replace(" ", "")))
|
||||||
|
except ValueError as e:
|
||||||
|
print("[WGDashboard] Error: " + str(e))
|
||||||
|
|
||||||
for p in configuration.getRestrictedPeersList():
|
for p in configuration.getRestrictedPeersList():
|
||||||
if len(p.allowed_ip) > 0:
|
if len(p.allowed_ip) > 0:
|
||||||
|
|
@ -2127,8 +2131,6 @@ def API_Welcome_Finish():
|
||||||
"repeatNewPassword": data["repeatNewPassword"],
|
"repeatNewPassword": data["repeatNewPassword"],
|
||||||
"currentPassword": "admin"
|
"currentPassword": "admin"
|
||||||
})
|
})
|
||||||
# updateEnableTotp, updateEnableTotpErr = DashboardConfig.SetConfig("Account", "enable_totp", data["enable_totp"])
|
|
||||||
|
|
||||||
if not updateUsername or not updatePassword:
|
if not updateUsername or not updatePassword:
|
||||||
return ResponseObject(False, f"{updateUsernameErr},{updatePasswordErr}".strip(","))
|
return ResponseObject(False, f"{updateUsernameErr},{updatePasswordErr}".strip(","))
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue