Merge e35f942964 into 891990b2f1

Ready for v4.0.3

src/dashboard.py

@@ -33,7 +33,7 @@ import threading
 
 from flask.json.provider import DefaultJSONProvider
 
-DASHBOARD_VERSION = 'v4.0.2'
+DASHBOARD_VERSION = 'v4.0.3'
 CONFIGURATION_PATH = os.getenv('CONFIGURATION_PATH', '.')
 DB_PATH = os.path.join(CONFIGURATION_PATH, 'db')
 if not os.path.isdir(DB_PATH):
@@ -1297,7 +1297,9 @@ def _regexMatch(regex, text):
 
 def _getConfigurationList():
     # configurations = {}
-    for i in os.listdir(WG_CONF_PATH):
+    items = os.listdir(WG_CONF_PATH)
+    items.sort()
+    for i in items:
         if _regexMatch("^(.{1,}).(conf)$", i):
             i = i.replace('.conf', '')
             try:

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

@@ -30,12 +30,24 @@ export default {
 			this.data.private_key = this.keypair.privateKey;
 			this.data.public_key = this.keypair.publicKey;
 		},
+		testKey(key){
+			const reg = /^[A-Za-z0-9+/]{43}=?=?$/;
+			return reg.test(key)
+		},
 		checkMatching(){
 			try{
-				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");
+				if(this.keypair.privateKey){
+					if(this.testKey(this.keypair.privateKey)){
+						this.keypair.publicKey = window.wireguard.generatePublicKey(this.keypair.privateKey)
+						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){
 				this.error = true;