diff --git a/lib/controller.js b/lib/controller.js index c4f6f402..85184f0f 100644 --- a/lib/controller.js +++ b/lib/controller.js @@ -689,7 +689,7 @@ controller.connectToNetwork = function(opts) { 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 === 'wep') { // WEP passphrases can be 10, 26, or 58 hexadecimal digits long. // Match for hexadecimal characters: @@ -702,7 +702,7 @@ controller.connectToNetwork = function(opts) { return reject('Invalid passphrase: WEP keys must be 10, 26, or 58 digits long for 64-, 128-, and 256-bit WEP.'); } } - + if (security === 'psk' || security === 'psk2') { // WPA/WPA2-PSK passphrases can be 8-63 ASCII characters, or 64 hexadecimal digits. // Match ASCII codes for all 127 printable ASCII characters: diff --git a/test/unit/controller.js b/test/unit/controller.js index 59b1db45..bfa27c4a 100644 --- a/test/unit/controller.js +++ b/test/unit/controller.js @@ -1071,98 +1071,98 @@ exports['controller.closeTesselConnections'] = { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: 'nothexdigits', - security: 'wep' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: 'nothexdigits', + security: 'wep' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, invalidAccessPointWEPPasswordLength: function(test) { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: '0123456789ABCDEF', - security: 'wep' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: '0123456789ABCDEF', + security: 'wep' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, invalidAccessPointPSKPasswordCharacters: function(test) { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: 'Password™', - security: 'psk' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: 'Password™', + security: 'psk' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, invalidAccessPointPSKASCIIPasswordTooShort: function(test) { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: 'short', - security: 'psk' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: 'short', + security: 'psk' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, invalidAccessPointPSKASCIIPasswordTooLong: function(test) { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: 'this is a very long passphrase. in fact, it is over 63 characters, which makes it invalid.', - security: 'psk' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: 'this is a very long passphrase. in fact, it is over 63 characters, which makes it invalid.', + security: 'psk' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, invalidAccessPointPSKHexPasswordTooShort: function(test) { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: 'DEAD', - security: 'psk' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: 'DEAD', + security: 'psk' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, invalidAccessPointPSKHexPasswordTooLong: function(test) { test.expect(1); controller.createAccessPoint({ - ssid: 'test', - password: 'DEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEAD', - security: 'psk' - }) - .catch(error => { - test.ok(error); - test.done(); - }); + ssid: 'test', + password: 'DEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEADDEAD', + security: 'psk' + }) + .catch(error => { + test.ok(error); + test.done(); + }); }, };