kamp/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2024-11-22 07:10:09 +01:00
Code

Merge pull request #389 from donaldzou/v4.0.3-fix

Browse Source 
Merge new changes to v4.1
This commit is contained in:
Donald Zou 2024-09-14 16:23:17 +08:00 committed by GitHub
commit d74a76dee3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,7 +1,3 @@
> [!WARNING]
> For users who installed the Docker solution under `./docker`, please view this important message: https://github.com/donaldzou/WGDashboard/issues/333
<hr>
<p align="center"> <p align="center">
<img alt="WGDashboard" src="./src/static/img/logo.png" width="128"> <img alt="WGDashboard" src="./src/static/img/logo.png" width="128">
</p> </p>

3
src/dashboard.py
View File

@ -33,6 +33,7 @@ import threading
from flask.json.provider import DefaultJSONProvider from flask.json.provider import DefaultJSONProvider
DASHBOARD_VERSION = 'v4.1' DASHBOARD_VERSION = 'v4.1'
CONFIGURATION_PATH = os.getenv('CONFIGURATION_PATH', '.') CONFIGURATION_PATH = os.getenv('CONFIGURATION_PATH', '.')
DB_PATH = os.path.join(CONFIGURATION_PATH, 'db') DB_PATH = os.path.join(CONFIGURATION_PATH, 'db')
@ -1111,7 +1112,7 @@ class DashboardConfig:
"peer_global_DNS": "1.1.1.1", "peer_global_DNS": "1.1.1.1",
"peer_endpoint_allowed_ip": "0.0.0.0/0", "peer_endpoint_allowed_ip": "0.0.0.0/0",
"peer_display_mode": "grid", "peer_display_mode": "grid",
"remote_endpoint": ifcfg.default_interface()['inet'], "remote_endpoint": ifcfg.default_interface()['inet'] if ifcfg.default_interface() else '',
"peer_MTU": "1420", "peer_MTU": "1420",
"peer_keep_alive": "21" "peer_keep_alive": "21"
}, },

2
src/static/app/dist/assets/index.css vendored
View File

File diff suppressed because one or more lines are too long

8
src/static/app/dist/assets/index.js vendored
View File

File diff suppressed because one or more lines are too long

20
src/static/app/src/components/configurationComponents/newPeersComponents/privatePublicKeyInput.vue
View File

@ -30,12 +30,24 @@ export default {
this.data.private_key = this.keypair.privateKey; this.data.private_key = this.keypair.privateKey;
this.data.public_key = this.keypair.publicKey; this.data.public_key = this.keypair.publicKey;
}, },
testKey(key){
const reg = /^[A-Za-z0-9+/]{43}=?=?$/;
return reg.test(key)
},
checkMatching(){ checkMatching(){
try{ try{
if (window.wireguard.generatePublicKey(this.keypair.privateKey) if(this.keypair.privateKey){
!== this.keypair.publicKey){ if(this.testKey(this.keypair.privateKey)){
this.error = true; this.keypair.publicKey = window.wireguard.generatePublicKey(this.keypair.privateKey)
this.dashboardStore.newMessage("WGDashboard", "Private Key and Public Key does not match.", "danger"); if (window.wireguard.generatePublicKey(this.keypair.privateKey)
!== this.keypair.publicKey){
this.error = true;
this.dashboardStore.newMessage("WGDashboard", "Private Key and Public Key does not match.", "danger");
}else{
this.data.private_key = this.keypair.privateKey
this.data.public_key = this.keypair.publicKey
}
}
} }
}catch (e){ }catch (e){
this.error = true; this.error = true;