tcjlj/nginx-proxy-manager-zh
1
0
Fork 0
mirror of https://github.com/xiaoxinpro/nginx-proxy-manager-zh.git synced 2025-01-23 05:18:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #666 from MarceloLagos/master

Browse Source 
Check key for RSA header otherwise use EC, and output fix.
This commit is contained in:
jc21 2020-10-19 08:45:28 +10:00 committed by GitHub
commit ffd2430160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/internal/certificate.js
View File

@ -608,12 +608,12 @@ const internalCertificate = {
checkPrivateKey: (private_key) => { checkPrivateKey: (private_key) => {
return tempWrite(private_key, '/tmp') return tempWrite(private_key, '/tmp')
.then((filepath) => { .then((filepath) => {
return utils.exec('openssl rsa -in ' + filepath + ' -check -noout') let key_type = private_key.includes('-----BEGIN RSA') ? 'rsa' : 'ec';
return utils.exec('openssl ' + key_type + ' -in ' + filepath + ' -check -noout 2>&1 ')
.then((result) => { .then((result) => {
if (!result.toLowerCase().includes('key ok')) { if (!result.toLowerCase().includes('key ok') && !result.toLowerCase().includes('key valid') ) {
throw new error.ValidationError(result); throw new error.ValidationError('Result Validation Error: ' + result);
} }
fs.unlinkSync(filepath); fs.unlinkSync(filepath);
return true; return true;
}).catch((err) => { }).catch((err) => {