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

Update code for #446

Browse Source
This commit is contained in:
Donald Zou 2025-01-16 18:36:06 +08:00
parent ba6d6b8851
commit a7317af413
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dashboard.py
View File

@ -1660,12 +1660,17 @@ class Peer:
if len(filename) == 0: if len(filename) == 0:
filename = "UntitledPeer" filename = "UntitledPeer"
filename = "".join(filename.split(' ')) filename = "".join(filename.split(' '))
filename = f"{filename}_{self.configuration.Name}" filename = f"{filename}"
illegal_filename = [".", ",", "/", "?", "<", ">", "\\", ":", "*", '|' '\"', "com1", "com2", "com3", illegal_filename = [".", ",", "/", "?", "<", ">", "\\", ":", "*", '|' '\"', "com1", "com2", "com3",
"com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4", "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4",
"lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "con", "nul", "prn"] "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "con", "nul", "prn"]
for i in illegal_filename: for i in illegal_filename:
filename = filename.replace(i, "") filename = filename.replace(i, "")
finalFilename = ""
for i in filename:
if re.match("^[a-zA-Z0-9_=+.-]{1,15}$", i):
finalFilename += i
peerConfiguration = f'''[Interface] peerConfiguration = f'''[Interface]
PrivateKey = {self.private_key} PrivateKey = {self.private_key}
@ -1685,7 +1690,7 @@ PersistentKeepalive = {str(self.keepalive)}
if len(self.preshared_key) > 0: if len(self.preshared_key) > 0:
peerConfiguration += f"PresharedKey = {self.preshared_key}\n" peerConfiguration += f"PresharedKey = {self.preshared_key}\n"
return { return {
"fileName": filename, "fileName": finalFilename,
"file": peerConfiguration "file": peerConfiguration
} }
@ -2724,7 +2729,7 @@ def API_downloadAllPeers(configName):
untitledPeer = 0 untitledPeer = 0
for i in configuration.Peers: for i in configuration.Peers:
file = i.downloadPeer() file = i.downloadPeer()
if file["fileName"] == "UntitledPeer_" + configName: if file["fileName"] == "UntitledPeer":
file["fileName"] = str(untitledPeer) + "_" + file["fileName"] file["fileName"] = str(untitledPeer) + "_" + file["fileName"]
untitledPeer += 1 untitledPeer += 1
peerData.append(file) peerData.append(file)

4
src/static/app/src/components/configurationComponents/peerSearch.vue
View File

@ -75,7 +75,9 @@ export default {
}, },
downloadAllPeer(){ downloadAllPeer(){
fetchGet(`/api/downloadAllPeers/${this.configuration.Name}`, {}, (res) => { fetchGet(`/api/downloadAllPeers/${this.configuration.Name}`, {}, (res) => {
console.log(res); res.data.forEach(x => {
x.fileName = x.fileName + '.conf'
})
window.wireguard.generateZipFiles(res, this.configuration.Name) window.wireguard.generateZipFiles(res, this.configuration.Name)
}) })
} }

2
src/static/app/src/components/configurationList.vue
View File

@ -98,7 +98,7 @@ export default {
<div class="mt-md-5 mt-3"> <div class="mt-md-5 mt-3">
<div class="container-fluid"> <div class="container-fluid">
<SystemStatus></SystemStatus> <SystemStatus></SystemStatus>
<div class="d-flex mb-4 configurationListTitle align-items-md-center gap-3 flex-column flex-md-row"> <div class="d-flex mb-4 configurationListTitle align-items-md-center gap-2 flex-column flex-md-row">
<h2 class="text-body d-flex mb-0"> <h2 class="text-body d-flex mb-0">
<LocaleText t="WireGuard Configurations"></LocaleText> <LocaleText t="WireGuard Configurations"></LocaleText>
</h2> </h2>