fix(controller): better comments, feedback

tessel · Aug 18, 2016 · 7f17a63 · 7f17a63
1 parent dee6432
commit 7f17a63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bin/tessel-2.js b/bin/tessel-2.js
@@ -495,7 +495,7 @@ makeCommand('ap')
     abbr: 'n',
     help: 'Name of the network.'
   })
-  .option('pass', {
+  .option('password', {
     abbr: 'p',
     help: 'Password to access network.'
   })

diff --git a/lib/controller.js b/lib/controller.js
@@ -686,8 +686,12 @@ controller.connectToNetwork = function(opts) {
         return reject('Invalid credentials: must set a password with the -p or --password option.');
       }
 
-      if (security && securityOptions.indexOf(security) < 0) {
-        return reject(`"${security}" is not a valid security option. Please choose on of the following: ${securityOptions.join(', ')}`);
+      if (security) {
+        if (securityOptions.indexOf(security) < 0) {
+          return reject(`"${security}" is not a valid security option. Please choose on of the following: ${securityOptions.join(', ')}`);
+        } else if (security.match(/wpa2?/)) {
+          return reject(`"${security}" security is not yet implemented. Please see this issue for more details -> https://github.com/tessel/t2-cli/issues/803`);
+        }
       }
 
       if (security === 'wep') {
@@ -733,7 +737,7 @@ controller.setWiFiState = function(opts) {
 controller.createAccessPoint = function(opts) {
   opts.authorized = true;
   var ssid = opts.ssid;
-  var password = opts.pass;
+  var password = opts.password;
   var security = opts.security;
   var securityOptions = ['none', 'wep', 'psk', 'psk2'];
 
@@ -752,6 +756,7 @@ controller.createAccessPoint = function(opts) {
 
       if (security === 'wep') {
         // WEP passphrases can be 10, 26, or 58 hexadecimal digits long.
+        // Reference -> http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=654749&isnumber=14251&punumber=5258&k2dockey=654749@ieeestds&query=%28802.11+1997%29%3Cin%3Emetadata&pos=0
         // Match for hexadecimal characters:
         if (isNaN(`0x${password}`)) {
           return reject('Invalid passphrase: WEP keys must consist of hexadecimal digits, i.e. 0 through 9 and "a" through "f".');
@@ -765,6 +770,7 @@ controller.createAccessPoint = function(opts) {
 
       if (security === 'psk' || security === 'psk2') {
         // WPA/WPA2-PSK passphrases can be 8-63 ASCII characters, or 64 hexadecimal digits.
+        // Reference -> http://standards.ieee.org/getieee802/download/802.11i-2004.pdf
         // Match ASCII codes for all 127 printable ASCII characters:
         const asciiRegex = /^[\x00-\x7F]{8,63}$/;
         // Match exactly 64 hexadecimal digits: