fix: git ssh port incorrect default value

This commit is contained in:
NGPixel 2020-04-19 15:48:20 -04:00 committed by Nicolas Giard
parent 7cd5721ca1
commit 6a00a5dbce
2 changed files with 12 additions and 2 deletions

View File

@ -44,7 +44,7 @@
hide-details hide-details
color='primary' color='primary'
) )
v-col(cols='8') v-col(:cols='gitAuthMode === `ssh` ? 6 : 8')
v-text-field( v-text-field(
outlined outlined
label='Repository URL' label='Repository URL'
@ -52,6 +52,14 @@
hide-details hide-details
v-model='gitRepoUrl' v-model='gitRepoUrl'
) )
v-col(v-if='gitAuthMode === `ssh`', cols='2')
v-text-field(
label='Port'
placeholder='e.g. 22'
v-model='gitRepoPort'
outlined
hide-details
)
v-col(cols='4') v-col(cols='4')
v-text-field( v-text-field(
label='Branch' label='Branch'
@ -296,6 +304,7 @@ export default {
], ],
gitVerifySSL: true, gitVerifySSL: true,
gitRepoUrl: '', gitRepoUrl: '',
gitRepoPort: 22,
gitRepoBranch: 'master', gitRepoBranch: 'master',
gitPrivKey: '', gitPrivKey: '',
gitUsername: '', gitUsername: '',
@ -387,6 +396,7 @@ export default {
{ key: 'authType', value: { value: this.gitAuthMode } }, { key: 'authType', value: { value: this.gitAuthMode } },
{ key: 'repoUrl', value: { value: this.gitRepoUrl } }, { key: 'repoUrl', value: { value: this.gitRepoUrl } },
{ key: 'branch', value: { value: this.gitRepoBranch } }, { key: 'branch', value: { value: this.gitRepoBranch } },
{ key: 'sshPort', value: { value: this.gitRepoPort } },
{ key: 'sshPrivateKeyMode', value: { value: 'contents' } }, { key: 'sshPrivateKeyMode', value: { value: 'contents' } },
{ key: 'sshPrivateKeyPath', value: { value: '' } }, { key: 'sshPrivateKeyPath', value: { value: '' } },
{ key: 'sshPrivateKeyContent', value: { value: this.gitPrivKey } }, { key: 'sshPrivateKeyContent', value: { value: this.gitPrivKey } },

View File

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