Merge pull request aluzzardi#4 from dongweiming/master

Support for specifying a non-standard SSH port
jackerxff · Aug 30, 2013 · 7457402 · 7457402
2 parents 5f3427f + 6ad06c0
commit 7457402
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/bin/wssh b/bin/wssh
@@ -40,6 +40,11 @@ if __name__ == '__main__':
             const='',
             help='Provide a passphrase for encrypted private key files.')
 
+    parser.add_argument('--ssh-port', '-s',
+            type=int,
+            default=22,
+            help='Ssh to server host"s port')
+
     parser.add_argument('destination',
         help='[user@]hostname')
 
@@ -81,6 +86,7 @@ if __name__ == '__main__':
 
     params = {
         'password': password,
+        'port': str(args.ssh_port),
         'private_key': key,
         'key_passphrase': key_passphrase
     }

diff --git a/bin/wsshd b/bin/wsshd
@@ -38,6 +38,7 @@ def connect(hostname, username):
             hostname=hostname,
             username=username,
             password=request.args.get('password'),
+            port=int(request.args.get('port')),
             private_key=request.args.get('private_key'),
             key_passphrase=request.args.get('key_passphrase'),
             allow_agent=app.config.get('WSSH_ALLOW_SSH_AGENT', False))

diff --git a/wssh/static/wssh.js b/wssh/static/wssh.js
@@ -49,9 +49,11 @@ WSSHClient.prototype._generateEndpoint = function(options) {
         '/wssh/' + encodeURIComponent(options.hostname) + '/' +
         encodeURIComponent(options.username);
     if (options.authentication_method == 'password') {
-        endpoint += '?password=' + encodeURIComponent(options.password);
+        endpoint += '?password=' + encodeURIComponent(options.password) +
+        '&port=' + encodeURIComponent(options.port);
     } else if (options.authentication_method == 'private_key') {
-        endpoint += '?private_key=' + encodeURIComponent(options.private_key);
+        endpoint += '?private_key=' + encodeURIComponent(options.private_key) +
+        '&port=' + encodeURIComponent(options.port);
         if (options.key_passphrase !== undefined)
             endpoint += '&key_passphrase=' + encodeURIComponent(
                 options.key_passphrase);
@@ -94,4 +96,4 @@ WSSHClient.prototype.connect = function(options) {
 
 WSSHClient.prototype.send = function(data) {
     this._connection.send(JSON.stringify({'data': data}));
-};
+};
diff --git a/wssh/templates/index.html b/wssh/templates/index.html
@@ -38,6 +38,11 @@
                                     id="hostname"
                                     class="input-large"
                                     placeholder="localhost" />
+                                <span class="add-on">port</span><input
+                                    type="text"
+                                    id="portnumber"
+                                    class="input-small"
+                                    value=22 />
                             </div>
                         </div>
                     </div>
@@ -190,17 +195,24 @@
 
                     var username = $('input:text#username');
                     var hostname = $('input:text#hostname');
+                    var portnumber = $('input:text#portnumber');
 
                     var authentication = $(
                         'input[name=authentication_method]:checked',
                         '#connect').val();
-
                     var options = {
                         username: username.val(),
                         hostname: hostname.val(),
                         authentication_method: authentication
                     };
 
+                    var port = parseInt(portnumber.val())
+                    if (port > 0 && port < 65535) {
+                        $.extend(options, {port: port});
+                    } else {
+                        $.extend(options, {port: 22});
+                    }
+
                     if (authentication == 'password') {
                         var password = $('input:password#password');
                         if (!validate([username, hostname, password]))