gluon-remote-node

commit 7ddfc1ebfc2f51548a75e38c199ae52947e5bc1a
parent 43059c2b374398047b5a7476c152b6e790285d74
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed, 22 Jun 2016 18:48:32 +0200

Remove ssh-key regex because it validated pub keys but private keys are used

Diffstat:
M
gluon_web_remote-MOL.js
 | 
20
++++----------------
M
gluon_web_remote-MOW.js
 | 
19
++++---------------
M
gluon_web_remote-changeContact.js
 | 
27
++++++++-------------------
M
gluon_web_remote-changeGeo.js
 | 
37
+++++++++++++------------------------
M
gluon_web_remote-changeName.js
 | 
20
++++----------------

5 files changed, 33 insertions(+), 90 deletions(-)
diff --git a/gluon_web_remote-MOL.js b/gluon_web_remote-MOL.js
@@ -4,8 +4,6 @@ var chalk_lib = require('chalk');
 var chalk = new chalk_lib.constructor({enabled: true});
 var hostname_val = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
 var ipv6_val = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
-var key_val = /^ssh-[a-zA-Z]{3} AAAA[0-9A-Za-z+/]+[=]{0,3} ([^@]+@[^@]+)$/gm
-
 
 program
   .parse(process.argv);
@@ -24,26 +22,16 @@ if (args.length === 3) {
   var switchPosition = args[3]
   if (switchPosition === "on") {
     if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-      if (key_val.test(key)) {
-        backend.activateMOL(ip, key)
-        console.log(chalk.green("Mesh on Lan activated successfully!"));
-      }else {
-        console.error(chalk.bold.red('Please set correct SSH Key'));
-        process.exit(1);
-      }
+      backend.activateMOL(ip, key)
+      console.log(chalk.green("Mesh on Lan activated successfully!"));
     }else {
       console.error(chalk.bold.red('Please set correct IPv6 or Hostname'));
       process.exit(1);
     }
   }else if (switchPosition === "off") {
     if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-      if (key_val.test(key)) {
-        backend.deactivateMOL(ip, key)
-        console.log(chalk.green("Mesh on Lan deactivated successfully!"));
-      }else {
-        console.error(chalk.bold.red('Please set correct SSH Key'));
-        process.exit(1);
-      }
+      backend.deactivateMOL(ip, key)
+      console.log(chalk.green("Mesh on Lan deactivated successfully!"));
     }else {
       console.error(chalk.bold.red('Please set correct IPv6 or Hostname'));
       process.exit(1);
diff --git a/gluon_web_remote-MOW.js b/gluon_web_remote-MOW.js
@@ -4,7 +4,6 @@ var chalk_lib = require('chalk');
 var chalk = new chalk_lib.constructor({enabled: true});
 var hostname_val = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
 var ipv6_val = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
-var key_val = /^ssh-[a-zA-Z]{3} AAAA[0-9A-Za-z+/]+[=]{0,3} ([^@]+@[^@]+)$/gm
 
 program
   .parse(process.argv);
@@ -23,26 +22,16 @@ if (args.length === 3) {
   var switchPosition = args[3]
   if (switchPosition === "on") {
     if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-      if (key_val.test(key)) {
-        backend.activateMOW(ip, key)
-        console.log(chalk.green("Mesh on Wan activated successfully!"));
-      }else {
-        console.error(chalk.bold.red('Please set correct SSH Key'));
-        process.exit(1);
-      }
+      backend.activateMOW(ip, key)
+      console.log(chalk.green("Mesh on Wan activated successfully!"));
     }else {
       console.error(chalk.bold.red('Please set correct IPv6 or Hostname'));
       process.exit(1);
     }
   }else if (switchPosition === "off") {
     if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-      if (key_val.test(key)) {
-        backend.deactivateMOW(ip, key)
-        console.log(chalk.green("Mesh on Wan deactivated successfully!"));
-      }else {
-        console.error(chalk.bold.red('Please set correct SSH Key'));
-        process.exit(1);
-      }
+      backend.deactivateMOW(ip, key)
+      console.log(chalk.green("Mesh on Wan deactivated successfully!"));
     }else {
       console.error(chalk.bold.red('Please set correct IPv6 or Hostname'));
       process.exit(1);
diff --git a/gluon_web_remote-changeContact.js b/gluon_web_remote-changeContact.js
@@ -4,7 +4,6 @@ var chalk_lib = require('chalk');
 var chalk = new chalk_lib.constructor({enabled: true});
 var hostname_val = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
 var ipv6_val = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
-var key_val = /^ssh-[a-zA-Z]{3} AAAA[0-9A-Za-z+/]+[=]{0,3} ([^@]+@[^@]+)$/gm
 var email_val = /^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/
 
 program
@@ -24,16 +23,11 @@ if (args.length === 4) {
   var name = args[3]
   var email = args[4]
   if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-    if (key_val.test(key)) {
-      if (email_val.test(email)) {
-        backend.changeContact(ip, key, name, email, "")
-        console.log(chalk.green("Contact changed successfully!"));
-      }else {
-        console.error(chalk.bold.red('Please set correct Email'));
-        process.exit(1);
-      }
+    if (email_val.test(email)) {
+      backend.changeContact(ip, key, name, email, "")
+      console.log(chalk.green("Contact changed successfully!"));
     }else {
-      console.error(chalk.bold.red('Please set correct SSH Key'));
+      console.error(chalk.bold.red('Please set correct Email'));
       process.exit(1);
     }
    }else {
@@ -48,16 +42,11 @@ if (args.length === 5) {
   var name = args[4]
   var email = args[5]
   if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-    if (key_val.test(key)) {
-      if (email_val.test(email)) {
-        backend.changeContact(ip, key, name, email, token)
-        console.log(chalk.green("Contact changed successfully!"));
-      }else {
-        console.error(chalk.bold.red('Please set correct Email'));
-        process.exit(1);
-      }
+    if (email_val.test(email)) {
+      backend.changeContact(ip, key, name, email, token)
+      console.log(chalk.green("Contact changed successfully!"));
     }else {
-      console.error(chalk.bold.red('Please set correct SSH Key'));
+      console.error(chalk.bold.red('Please set correct Email'));
       process.exit(1);
     }
    }else {
diff --git a/gluon_web_remote-changeGeo.js b/gluon_web_remote-changeGeo.js
@@ -5,7 +5,6 @@ var ipv6 = require('ip-address').Address6;
 var chalk = new chalk_lib.constructor({enabled: true});
 var hostname_val = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
 var ipv6_val = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
-var key_val = /^ssh-[a-zA-Z]{3} AAAA[0-9A-Za-z+/]+[=]{0,3} ([^@]+@[^@]+)$/gm
 var lat_long_val = /^(\-?\d+(\.\d+)?).\s*(\-?\d+(\.\d+)?)$/
 
 
@@ -27,22 +26,17 @@ if (args.length === 5) {
   var long = args[4]
   var alt = args[5]
   var ipv6_val = new ipv6(ip);
-  if (ipv6_val.isValid()) {
-    if (key_val.test(key) || hostname_val.test(ip)) {
-      if (lat_long_val.test(lat)) {
-        if (lat_long_val.test(long)) {
-          backend.changeGeo(ip, key, lat, long, alt, "")
-          console.log(chalk.green("Geolocation changed successfully!"));
-        }else {
-          console.error(chalk.bold.red('Please set correct Latitude (See http://stackoverflow.com/a/18690202/4929236)'));
-          process.exit(1);
-        }
+  if (ipv6_val.isValid() || hostname_val.test(ip)) {
+    if (lat_long_val.test(lat)) {
+      if (lat_long_val.test(long)) {
+        backend.changeGeo(ip, key, lat, long, alt, "")
+        console.log(chalk.green("Geolocation changed successfully!"));
       }else {
-        console.error(chalk.bold.red('Please set correct Email'));
+        console.error(chalk.bold.red('Please set correct Latitude (See http://stackoverflow.com/a/18690202/4929236)'));
         process.exit(1);
       }
     }else {
-      console.error(chalk.bold.red('Please set correct SSH Key'));
+      console.error(chalk.bold.red('Please set correct Email'));
       process.exit(1);
     }
   }else {
@@ -60,21 +54,16 @@ if (args.length === 7) {
   var alt = args[6]
   var ipv6_val = new ipv6(ip);
   if (ipv6_val.isValid() || hostname_val.test(ip)) {
-    if (key_val.test(key)) {
-      if (lat_long_val.test(lat)) {
-        if (lat_long_val.test(long)) {
-          backend.changeGeo(ip, key, lat, long, alt, token, ccode)
-          console.log(chalk.green("Geolocation changed successfully!"));
-        }else {
-          console.error(chalk.bold.red('Please set correct Longitude (See http://stackoverflow.com/a/18690202/4929236)'));
-          process.exit(1);
-        }
+    if (lat_long_val.test(lat)) {
+      if (lat_long_val.test(long)) {
+        backend.changeGeo(ip, key, lat, long, alt, token, ccode)
+        console.log(chalk.green("Geolocation changed successfully!"));
       }else {
-        console.error(chalk.bold.red('Please set correct Latitude (See http://stackoverflow.com/a/18690202/4929236)'));
+        console.error(chalk.bold.red('Please set correct Longitude (See http://stackoverflow.com/a/18690202/4929236)'));
         process.exit(1);
       }
     }else {
-      console.error(chalk.bold.red('Please set correct SSH Key'));
+      console.error(chalk.bold.red('Please set correct Latitude (See http://stackoverflow.com/a/18690202/4929236)'));
       process.exit(1);
     }
   }else {
diff --git a/gluon_web_remote-changeName.js b/gluon_web_remote-changeName.js
@@ -4,8 +4,6 @@ var chalk_lib = require('chalk');
 var chalk = new chalk_lib.constructor({enabled: true});
 var hostname_val = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
 var ipv6_val = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
-var key_val = /^ssh-[a-zA-Z]{3} AAAA[0-9A-Za-z+/]+[=]{0,3} ([^@]+@[^@]+)$/gm
-
 
 program
   .parse(process.argv);
@@ -23,13 +21,8 @@ if (args.length === 3) {
  var key = args[2]
  var newname = args[3]
  if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-   if (key_val.test(key)) {
-     backend.changeName(ip, key, newname, "")
-     console.log(chalk.green("Hostname changed successfully!"));
-   }else {
-     console.error(chalk.bold.red('Please set correct SSH Key'));
-     process.exit(1);
-   }
+   backend.changeName(ip, key, newname, "")
+   console.log(chalk.green("Hostname changed successfully!"));
  }else {
    console.error(chalk.bold.red('Please set correct IPv6 or Hostname'));
    process.exit(1);
@@ -41,13 +34,8 @@ if (args.length === 4) {
   var token = args[3]
   var newname = args[4]
   if (ipv6_val.test(ip) || hostname_val.test(ip)) {
-    if (key_val.test(key)) {
-      backend.changeName(ip, key, newname, token)
-      console.log(chalk.green("Hostname changed successfully!"));
-    }else {
-      console.error(chalk.bold.red('Please set correct SSH Key'));
-      process.exit(1);
-    }
+    backend.changeName(ip, key, newname, token)
+    console.log(chalk.green("Hostname changed successfully!"));
   }else {
     console.error(chalk.bold.red('Please set correct IPv6 or Hostname'));
     process.exit(1);