github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'acme_sync' into v2 

# Conflicts:
#	packages/core/acme-client/.gitignore
#	packages/core/acme-client/package.json
#	packages/core/acme-client/src/auto.js
#	packages/core/acme-client/src/crypto/forge.js
#	packages/core/acme-client/types/index.d.ts
pull/9/head^2
xiaojunnuo 2023-01-29 15:35:26 +08:00
parent a269d8374e f64ea78c44
commit f08f765529
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/acme-client/src/auto.js
View File

@ -169,9 +169,6 @@ module.exports = async function(client, userOpts) {
await challengeFunc(authz); await challengeFunc(authz);
}); });
log('[auto] Waiting for challenge valid status');
// await Promise.all(challengePromises);
log('开始challenge'); log('开始challenge');
let promise = Promise.resolve(); let promise = Promise.resolve();
function runPromisesSerially(tasks) { function runPromisesSerially(tasks) {
@ -183,6 +180,11 @@ module.exports = async function(client, userOpts) {
await runPromisesSerially(challengePromises); await runPromisesSerially(challengePromises);
log('challenge结束'); log('challenge结束');
// log('[auto] Waiting for challenge valid status');
// await Promise.all(challengePromises);
/** /**
* Finalize order and download certificate * Finalize order and download certificate
*/ */

18
packages/core/acme-client/src/crypto/forge.js
View File

@ -74,7 +74,8 @@ function parseDomains(obj) {
if (rootAltNames && rootAltNames.altNames && rootAltNames.altNames.length) { if (rootAltNames && rootAltNames.altNames && rootAltNames.altNames.length) {
altNamesDict = rootAltNames.altNames; altNamesDict = rootAltNames.altNames;
} else if (rootExtensions && rootExtensions.extensions && rootExtensions.extensions.length) { }
else if (rootExtensions && rootExtensions.extensions && rootExtensions.extensions.length) {
const extAltNames = rootExtensions.extensions.find((e) => 'altNames' in e); const extAltNames = rootExtensions.extensions.find((e) => 'altNames' in e);
if (extAltNames && extAltNames.altNames && extAltNames.altNames.length) { if (extAltNames && extAltNames.altNames && extAltNames.altNames.length) {
@ -116,20 +117,10 @@ function parseDomains(obj) {
async function createPrivateKey(size = 2048) { async function createPrivateKey(size = 2048) {
const keyPair = await generateKeyPair({ bits: size }); const keyPair = await generateKeyPair({ bits: size });
// const privateKey = forge.pki.privateKeyToPem(keyPair.privateKey); const pemKey = forge.pki.privateKeyToPem(keyPair.privateKey);
// convert a Forge private key to an ASN.1 RSAPrivateKey
var rsaPrivateKey = forge.pki.privateKeyToAsn1(keyPair.privateKey);
// wrap an RSAPrivateKey ASN.1 object in a PKCS#8 ASN.1 PrivateKeyInfo
var privateKeyInfo = forge.pki.wrapRsaPrivateKey(rsaPrivateKey);
// convert a PKCS#8 ASN.1 PrivateKeyInfo to PEM
var pemKey = forge.pki.privateKeyInfoToPem(privateKeyInfo);
return Buffer.from(pemKey); return Buffer.from(pemKey);
} }
exports.createPrivateKey = createPrivateKey; exports.createPrivateKey = createPrivateKey;
@ -403,7 +394,8 @@ function formatCsrAltNames(altNames) {
exports.createCsr = async function(data, key = null) { exports.createCsr = async function(data, key = null) {
if (!key) { if (!key) {
key = await createPrivateKey(data.keySize); key = await createPrivateKey(data.keySize);
} else if (!Buffer.isBuffer(key)) { }
else if (!Buffer.isBuffer(key)) {
key = Buffer.from(key); key = Buffer.from(key);
} }