From bb2714ff241f9db4a71d805b23a1b0f9f2f6413a Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 15 Oct 2025 23:03:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=AF=81=E4=B9=A6=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=B7=E4=B9=B1=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/acme-client/src/api.js | 1 - packages/core/acme-client/src/auto.js | 4 +++- packages/core/acme-client/src/axios.js | 2 +- packages/core/acme-client/src/client.js | 20 +++++++++++-------- packages/core/acme-client/src/http.js | 15 +++++++------- packages/core/acme-client/types/index.d.ts | 1 + .../src/plugin/cert-plugin/acme.ts | 7 ++++--- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/packages/core/acme-client/src/api.js b/packages/core/acme-client/src/api.js index f3035de6..b7e27037 100644 --- a/packages/core/acme-client/src/api.js +++ b/packages/core/acme-client/src/api.js @@ -28,7 +28,6 @@ class AcmeApi { } } } - console.log(locationUrl, mapping); return locationUrl; } diff --git a/packages/core/acme-client/src/auto.js b/packages/core/acme-client/src/auto.js index c18ec266..e87e288a 100644 --- a/packages/core/acme-client/src/auto.js +++ b/packages/core/acme-client/src/auto.js @@ -2,7 +2,6 @@ * ACME auto helper */ import { readCsrDomains } from "./crypto/index.js"; -import { log } from "./logger.js"; import { wait } from "./wait.js"; import { CancelError } from "./error.js"; @@ -45,6 +44,9 @@ export default async (client, userOpts) => { accountPayload.externalAccountBinding = opts.externalAccountBinding; } + const log = (...args)=>{ + return client.logger.info(...args); + } /** * Register account */ diff --git a/packages/core/acme-client/src/axios.js b/packages/core/acme-client/src/axios.js index a562bffc..48ce623c 100644 --- a/packages/core/acme-client/src/axios.js +++ b/packages/core/acme-client/src/axios.js @@ -3,9 +3,9 @@ */ import axios from 'axios'; import { parseRetryAfterHeader } from './util.js'; -import { log } from './logger.js'; const { AxiosError } = axios; import {getGlobalAgents, HttpError} from '@certd/basic' +import { log } from './logger.js'; /** * Defaults */ diff --git a/packages/core/acme-client/src/client.js b/packages/core/acme-client/src/client.js index 806723b1..27026103 100644 --- a/packages/core/acme-client/src/client.js +++ b/packages/core/acme-client/src/client.js @@ -5,7 +5,6 @@ */ import { createHash } from 'crypto'; import { getPemBodyAsB64u } from './crypto/index.js'; -import { log } from './logger.js'; import HttpClient from './http.js'; import AcmeApi from './api.js'; import verify from './verify.js'; @@ -104,8 +103,13 @@ class AcmeClient { max: this.opts.backoffMax, }; - this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping); + this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping, opts.logger); this.api = new AcmeApi(this.http, this.opts.accountUrl); + this.logger = opts.logger; + } + + log(...args) { + this.logger.info(...args); } /** @@ -177,7 +181,7 @@ class AcmeClient { this.getAccountUrl(); /* Account URL exists */ - log('Account URL exists, returning updateAccount()'); + this.log('Account URL exists, returning updateAccount()'); return this.updateAccount(data); } catch (e) { @@ -185,7 +189,7 @@ class AcmeClient { /* HTTP 200: Account exists */ if (resp.status === 200) { - log('Account already exists (HTTP 200), returning updateAccount()'); + this.log('Account already exists (HTTP 200), returning updateAccount()'); return this.updateAccount(data); } @@ -214,7 +218,7 @@ class AcmeClient { this.api.getAccountUrl(); } catch (e) { - log('No account URL found, returning createAccount()'); + this.log('No account URL found, returning createAccount()'); return this.createAccount(data); } @@ -502,7 +506,7 @@ class AcmeClient { await verify[challenge.type](authz, challenge, keyAuthorization); }; - log('Waiting for ACME challenge verification（等待ACME检查验证）'); + this.log('Waiting for ACME challenge verification（等待ACME检查验证）'); return util.retry(verifyFn, this.backoffOpts); } @@ -570,7 +574,7 @@ class AcmeClient { const resp = await this.api.apiRequest(item.url, null, [200]); /* Verify status */ - log(`[${d}] Item has status（检查状态）: ${resp.data.status}`); + this.log(`[${d}] Item has status（检查状态）: ${resp.data.status}`); if (invalidStates.includes(resp.data.status)) { abort(); @@ -586,7 +590,7 @@ class AcmeClient { throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`); }; - log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, this.backoffOpts); + this.log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, this.backoffOpts); return util.retry(verifyFn, this.backoffOpts); } diff --git a/packages/core/acme-client/src/http.js b/packages/core/acme-client/src/http.js index 85bd6482..f641634c 100644 --- a/packages/core/acme-client/src/http.js +++ b/packages/core/acme-client/src/http.js @@ -19,7 +19,7 @@ import { getJwk } from './crypto/index.js'; */ class HttpClient { - constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {}) { + constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {},logger) { this.directoryUrl = directoryUrl; this.accountKey = accountKey; this.externalAccountBinding = externalAccountBinding; @@ -31,6 +31,7 @@ class HttpClient { this.directoryMaxAge = 86400; this.directoryTimestamp = 0; this.urlMapping = urlMapping; + this.log = logger? logger.info.bind(logger) : log; } /** @@ -48,7 +49,7 @@ class HttpClient { for (const key in this.urlMapping.mappings) { if (url.includes(key)) { const newUrl = url.replace(key, this.urlMapping.mappings[key]); - log(`use reverse proxy: ${newUrl}`); + this.log(`use reverse proxy: ${newUrl}`); url = newUrl; } } @@ -65,10 +66,10 @@ class HttpClient { opts.headers['Content-Type'] = 'application/jose+json'; /* Request */ - log(`HTTP request: ${method} ${url}`); + this.log(`HTTP request: ${method} ${url}`); const resp = await axios.request(opts); - log(`RESP ${resp.status} ${method} ${url}`); + this.log(`RESP ${resp.status} ${method} ${url}`); return resp; } @@ -85,7 +86,7 @@ class HttpClient { const age = (now - this.directoryTimestamp); if (!this.directoryCache || (age > this.directoryMaxAge)) { - log(`Refreshing ACME directory, age: ${age}`); + this.log(`Refreshing ACME directory, age: ${age}`); const resp = await this.request(this.directoryUrl, 'get'); if (resp.status >= 400) { @@ -187,7 +188,7 @@ class HttpClient { /* Nonce */ if (nonce) { - log(`Using nonce: ${nonce}`); + this.log(`Using nonce: ${nonce}`); header.nonce = nonce; } @@ -314,7 +315,7 @@ class HttpClient { nonce = resp.headers['replay-nonce'] || null; attempts += 1; - log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`); + this.log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`); return this.signedRequest(url, payload, { kid, nonce, includeExternalAccountBinding }, attempts); } diff --git a/packages/core/acme-client/types/index.d.ts b/packages/core/acme-client/types/index.d.ts index dfae2d20..5c81057a 100644 --- a/packages/core/acme-client/types/index.d.ts +++ b/packages/core/acme-client/types/index.d.ts @@ -49,6 +49,7 @@ export interface ClientOptions { backoffMax?: number; urlMapping?: UrlMapping; signal?: AbortSignal; + logger?:any } export interface ClientExternalAccountBindingOptions { diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts index 5bb20751..74ba8173 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts @@ -82,9 +82,9 @@ export class AcmeService { this.sslProvider = options.sslProvider || "letsencrypt"; this.eab = options.eab; this.skipLocalVerify = options.skipLocalVerify ?? false; - acme.setLogger((message: any, ...args: any[]) => { - this.logger.info(message, ...args); - }); + // acme.setLogger((message: any, ...args: any[]) => { + // this.logger.info(message, ...args); + // }); } async getAccountConfig(email: string, urlMapping: UrlMapping): Promise { @@ -155,6 +155,7 @@ export class AcmeService { backoffMax: 10000, urlMapping, signal: this.options.signal, + logger: this.logger, }); if (conf.accountUrl == null) {