Hosterra/domain-forward
Hosterra/domain-forward
1
1
Fork 0
Code Issues Pull requests Releases 1 Activity

fix challengeCallbacks

Browse source
This commit is contained in:
Wildan M 2021-09-21 06:29:58 +07:00
commit e6b3ef7d52
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/certnode/lib/client.js
View file

@ -40,7 +40,7 @@ class Client {
/** @type {import('crypto').KeyObject} */ /** @type {import('crypto').KeyObject} */
this.accountPublicKey = null this.accountPublicKey = null
this.directoryUrl = directoryUrl this.directoryUrl = directoryUrl
this.challengeCallbacks = {} this.challengeCallbacks = null
this.hasDirectory = false this.hasDirectory = false
this.myAccountUrl = '' this.myAccountUrl = ''
this.newAccountUrl = '' this.newAccountUrl = ''
@ -236,7 +236,7 @@ class Client {
const clientKey = common.exportPrivateKey(privateKey) const clientKey = common.exportPrivateKey(privateKey)
let { let {
csr csr
// @ts-ignore // @ts-ignore
} = await createCsr({ } = await createCsr({
clientKey, clientKey,
commonName: domain, commonName: domain,
@ -438,13 +438,14 @@ class Client {
reject(new Error('Timed out waiting for server request')) reject(new Error('Timed out waiting for server request'))
}, 10e3); }, 10e3);
let hasResolved = false; let hasResolved = false;
this.challengeCallbacks[domain] = function () { this.challengeCallbacks = () => {
if (!hasResolved) if (!hasResolved)
setTimeout(resolve, 100); setTimeout(resolve, 100);
else else
return challenge.token + '.' + this.thumbprint; return challenge.token + '.' + this.thumbprint;
hasResolved = true; hasResolved = true;
clearTimeout(time); clearTimeout(time);
this.challengeCallbacks = null;
return challenge.token + '.' + this.thumbprint; return challenge.token + '.' + this.thumbprint;
} }
}); });

4
src/client.js
View file

@ -35,12 +35,12 @@ const acme_prefix = '/.well-known/acme-challenge/';
const listener = async function (/** @type {import('http').IncomingMessage} */ req, /** @type {import('http').ServerResponse} */ res) { const listener = async function (/** @type {import('http').IncomingMessage} */ req, /** @type {import('http').ServerResponse} */ res) {
try { try {
if (req.url.startsWith(acme_prefix)) { if (req.url.startsWith(acme_prefix)) {
if (client.challengeCallbacks[req.headers.host]) { if (client.challengeCallbacks) {
res.writeHead(200, { res.writeHead(200, {
// This is important :) // This is important :)
'content-type': 'application/octet-stream' 'content-type': 'application/octet-stream'
}); });
res.write(client.challengeCallbacks[req.headers.host]()); res.write(client.challengeCallbacks());
} else { } else {
res.writeHead(404) res.writeHead(404)
} }