Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@typescript-eslint/no-explicit-any": "off",
"no-param-reassign": "off",

"max-len": ["error", { "code": 80, "ignoreComments": true }],
"max-len": ["error", { "code": 120, "ignoreComments": true }],

// 不要求对 import 进行排序
"import/order": "off",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-and-test-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@master
with:
node-version: '12.x'
node-version: '22.x'
- name: Install Dependencies
run: yarn
- name: Commit Linter
Expand Down
61 changes: 51 additions & 10 deletions lib/core/runtime/capture/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,52 @@ import logger from "../../logger/index";

type requestProtocol = "http:" | "https:";

const SENSITIVE_HEADERS = new Set([
"authorization",
"proxy-authorization",
"x-api-key",
"cookie",
"set-cookie"
]);

/**
* Mask sensitive header values in a header string.
* e.g. "cookie: abc123" => "cookie: ***"
*/
const maskSensitiveHeaders = (headerStr: string): string => {
if (!headerStr) return headerStr;

return headerStr.replace(
/^([^:]+):\s*(.+)$/gm,
(match, key: string) => {
if (SENSITIVE_HEADERS.has(key.trim().toLowerCase())) {
return `${key}: ***`;
}

return match;
}
);
};

/**
* Create a sanitized copy of requestLog for safe logging.
*/
const sanitizeRequestLog = (
log: Partial<RequestLog>
): Partial<RequestLog> => {
const sanitized = { ...log };

if (sanitized.requestHeader) {
sanitized.requestHeader = maskSensitiveHeaders(sanitized.requestHeader);
}

if (sanitized.responseHeader) {
sanitized.responseHeader = maskSensitiveHeaders(sanitized.responseHeader);
}

return sanitized;
};

/**
* Convert a URL instance to a http.request options
* https://github.com/nodejs/node/blob/afa9a7206c26a29a2af226696c145c924a6d3754/lib/internal/url.js#L1270
Expand Down Expand Up @@ -133,13 +179,9 @@ export const hack = <T extends typeof http.request>(
address || "null"}. Cost ${timestamps.dnsTime}ms`);

if (err) {
if (logger.getCleanLog()) {
logger.error(`${logPre} Request:
${JSON.stringify(requestLog)}`);
}
logger.error(`${logPre} Lookup ${host} -> ${address || "null"}, error ${err.stack}`);

logger.error(`${logPre} Lookup ${host} -> ${
address || "null"}, error ${err.stack}`);
logger.error(`${logPre} Request: ${JSON.stringify(sanitizeRequestLog(requestLog))}`);
}
});
}
Expand All @@ -164,11 +206,10 @@ export const hack = <T extends typeof http.request>(
});

request.once("error", (error: Error) => {
if (logger.getCleanLog()) {
logger.error(`${logPre} Request: ${JSON.stringify(requestLog)}`);
}

logger.error(`${logPre} Request error. Stack: ${error.stack}`);

logger.error(`${logPre} Request: ${JSON.stringify(sanitizeRequestLog(requestLog))}`);

finishRequest();
clearDomain();
});
Expand Down
Loading