Rename writeVerboseInformation to writeVerbose

This commit is contained in:
Sander Declerck 2025-10-27 17:14:45 +01:00
parent c5e25f4813
commit ddc8218a2d
No known key found for this signature in database
4 changed files with 10 additions and 12 deletions

View file

@ -57,7 +57,7 @@ function writeExitWithoutInstallingMaliciousPackages() {
writeOrBuffer(() => console.error(message));
}
function writeVerboseInformation(message, ...optionalParams) {
function writeVerbose(message, ...optionalParams) {
if (!isVerboseMode()) return;
writeOrBuffer(() => console.log(message, ...optionalParams));
@ -127,8 +127,8 @@ function writeBufferedLogsAndStopBuffering() {
}
export const ui = {
writeVerbose,
writeInformation,
writeVerboseInformation,
writeWarning,
writeError,
writeExitWithoutInstallingMaliciousPackages,

View file

@ -4,11 +4,11 @@ import { HttpsProxyAgent } from "https-proxy-agent";
import { ui } from "../environment/userInteraction.js";
export function mitmConnect(req, clientSocket, isAllowed) {
ui.writeVerboseInformation(`Safe-chain: Set up MITM tunnel for ${req.url}`);
ui.writeVerbose(`Safe-chain: Set up MITM tunnel for ${req.url}`);
const { hostname } = new URL(`http://${req.url}`);
clientSocket.on("error", (err) => {
ui.writeVerboseInformation(
ui.writeVerbose(
`Safe-chain: Client socket error for ${req.url}: ${err.message}`
);
// NO-OP
@ -33,9 +33,7 @@ function createHttpsServer(hostname, isAllowed) {
const targetUrl = `https://${hostname}${pathAndQuery}`;
if (!(await isAllowed(targetUrl))) {
ui.writeVerboseInformation(
`Safe-chain: Blocking request to ${targetUrl}`
);
ui.writeVerbose(`Safe-chain: Blocking request to ${targetUrl}`);
res.writeHead(403, "Forbidden - blocked by safe-chain");
res.end("Blocked by safe-chain");
return;
@ -66,7 +64,7 @@ function forwardRequest(req, hostname, res) {
const proxyReq = createProxyRequest(hostname, req, res);
proxyReq.on("error", (err) => {
ui.writeVerboseInformation(
ui.writeVerbose(
`Safe-chain: Error occurred while proxying request: ${err.message}`
);
res.writeHead(502);
@ -78,7 +76,7 @@ function forwardRequest(req, hostname, res) {
});
req.on("end", () => {
ui.writeVerboseInformation(
ui.writeVerbose(
`Safe-chain: Finished proxying request to ${req.url} for ${hostname}`
);
proxyReq.end();

View file

@ -109,7 +109,7 @@ function handleConnect(req, clientSocket, head) {
mitmConnect(req, clientSocket, isAllowedUrl);
} else {
// For other hosts, just tunnel the request to the destination tcp socket
ui.writeVerboseInformation(`Safe-chain: Tunneling request to ${req.url}`);
ui.writeVerbose(`Safe-chain: Tunneling request to ${req.url}`);
tunnelRequest(req, clientSocket, head);
}
}

View file

@ -20,12 +20,12 @@ export async function auditChanges(changes) {
);
if (malwarePackage) {
ui.writeVerboseInformation(
ui.writeVerbose(
`Safe-chain: Package ${change.name}@${change.version} is marked as malware: ${malwarePackage.status}`
);
disallowedChanges.push({ ...change, reason: malwarePackage.status });
} else {
ui.writeVerboseInformation(
ui.writeVerbose(
`Safe-chain: Package ${change.name}@${change.version} is clean`
);
allowedChanges.push(change);