Skip to content

Commit 6f681db

Browse files
authored
Merge pull request #386 from donaldzou/v4.0.3-fix
Update privatePublicKeyInput.vue
2 parents d35bd6e + b3edff9 commit 6f681db

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/static/app/src/components/configurationComponents/newPeersComponents/privatePublicKeyInput.vue

+16-4
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,24 @@ export default {
3030
this.data.private_key = this.keypair.privateKey;
3131
this.data.public_key = this.keypair.publicKey;
3232
},
33+
testKey(key){
34+
const reg = /^[A-Za-z0-9+/]{43}=?=?$/;
35+
return reg.test(key)
36+
},
3337
checkMatching(){
3438
try{
35-
if (window.wireguard.generatePublicKey(this.keypair.privateKey)
36-
!== this.keypair.publicKey){
37-
this.error = true;
38-
this.dashboardStore.newMessage("WGDashboard", "Private Key and Public Key does not match.", "danger");
39+
if(this.keypair.privateKey){
40+
if(this.testKey(this.keypair.privateKey)){
41+
this.keypair.publicKey = window.wireguard.generatePublicKey(this.keypair.privateKey)
42+
if (window.wireguard.generatePublicKey(this.keypair.privateKey)
43+
!== this.keypair.publicKey){
44+
this.error = true;
45+
this.dashboardStore.newMessage("WGDashboard", "Private Key and Public Key does not match.", "danger");
46+
}else{
47+
this.data.private_key = this.keypair.privateKey
48+
this.data.public_key = this.keypair.publicKey
49+
}
50+
}
3951
}
4052
}catch (e){
4153
this.error = true;

0 commit comments

Comments
 (0)