Browse Source

fix: git custom ssh port not handled

NGPixel 5 years ago
parent
commit
2213ba2c81

+ 1 - 1
server/modules/storage/git/definition.yml

@@ -97,7 +97,7 @@ props:
     type: Number
     title: SSH Port
     default: 22
-    hint: Optional - SSH Authentication Only - Allows overriding ssh default port.
+    hint: Optional - SSH Authentication Only - Allows overriding ssh default port (22).
     order: 60
 actions:
   - handler: syncUntracked

+ 1 - 1
server/modules/storage/git/storage.js

@@ -77,7 +77,7 @@ module.exports = {
             throw err
           }
         }
-        if (!this.config.sshPort || !_.isSafeInteger(this.config.sshPort) || this.config.sshPort <= 0) {
+        if (!this.config.sshPort || (_.isString(this.config.sshPort) && _.isEmpty(this.config.sshPort.length)) || (_.isSafeInteger(this.config.sshPort) && this.config.sshPort <= 0)) {
           this.config.sshPort = 22
         }
         await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no -p ${this.config.sshPort}`)