liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed SSH authentication + uploads folder check

Browse Source
This commit is contained in:
NGPixel
2017-02-11 16:21:50 -05:00
parent c6853a0315
commit 3b5c0a9b74
5 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/git.js
View File

@@ -89,19 +89,32 @@ module.exports = {
// Initialize remote
let urlObj = URL.parse(appconfig.git.url)
urlObj.auth = appconfig.git.auth.username + ((appconfig.git.auth.type !== 'ssh') ? ':' + appconfig.git.auth.password : '')
if (appconfig.git.auth.type !== 'ssh') {
urlObj.auth = appconfig.git.auth.username + ':' + appconfig.git.auth.password
}
self._url = URL.format(urlObj)
let gitConfigs = [
() => { return self._git.exec('config', ['--local', 'user.name', self._signature.name]) },
() => { return self._git.exec('config', ['--local', 'user.email', self._signature.email]) },
() => { return self._git.exec('config', ['--local', '--bool', 'http.sslVerify', _.toString(appconfig.git.auth.sslVerify)]) }
]
if (appconfig.git.auth.type === 'ssh') {
gitConfigs.push(() => {
return self._git.exec('config', ['--local', 'core.sshCommand', 'ssh -i "' + appconfig.git.auth.privateKey + '" -o StrictHostKeyChecking=no'])
})
}
return self._git.exec('remote', 'show').then((cProc) => {
let out = cProc.stdout.toString()
if (_.includes(out, 'origin')) {
return true
} else {
return Promise.join(
self._git.exec('config', ['--local', 'user.name', self._signature.name]),
self._git.exec('config', ['--local', 'user.email', self._signature.email])
).then(() => {
return Promise.each(gitConfigs, fn => { return fn() }).then(() => {
return self._git.exec('remote', ['add', 'origin', self._url])
}).catch(err => {
winston.error(err)
})
}
})

2
libs/local.js
View File

@@ -114,7 +114,7 @@ module.exports = {
fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.paths.repo, './uploads'))
if (os.type() !== 'Windows_NT') {
fs.chmodSync(path.resolve(ROOTPATH, appconfig.paths.repo, './upload'), '644')
fs.chmodSync(path.resolve(ROOTPATH, appconfig.paths.repo, './uploads'), '644')
}
} catch (err) {
winston.error(err)