Redact secrets in bunfig.toml and npmrc logs (#14919)

This commit is contained in:
Dylan Conway
2024-10-31 18:44:24 -07:00
committed by GitHub
parent 6933208790
commit 62881ee36b
39 changed files with 952 additions and 612 deletions

View File

@@ -178,13 +178,14 @@ pub const SavedSourceMap = struct {
try fail.toData(path).writeFormat(
Output.errorWriter(),
logger.Kind.warn,
false,
true,
);
} else {
try fail.toData(path).writeFormat(
Output.errorWriter(),
logger.Kind.warn,
false,
false,
);
}
@@ -1513,11 +1514,7 @@ pub const VirtualMachine = struct {
this.global.handleRejectedPromises();
if (this.log.msgs.items.len > 0) {
if (Output.enable_ansi_colors) {
this.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), true) catch {};
} else {
this.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), false) catch {};
}
this.log.print(Output.errorWriter()) catch {};
Output.prettyErrorln("\n", .{});
Output.flush();
}
@@ -3538,7 +3535,7 @@ pub const VirtualMachine = struct {
"<r><b>{d} |<r> {}" ++ fmt,
allow_ansi_color,
),
.{ display_line, bun.fmt.fmtJavaScript(clamped, allow_ansi_color) },
.{ display_line, bun.fmt.fmtJavaScript(clamped, .{ .enable_colors = allow_ansi_color }) },
);
} else {
try writer.print(
@@ -3546,7 +3543,7 @@ pub const VirtualMachine = struct {
"<r><b>{d} |<r> {}\n",
allow_ansi_color,
),
.{ display_line, bun.fmt.fmtJavaScript(clamped, allow_ansi_color) },
.{ display_line, bun.fmt.fmtJavaScript(clamped, .{ .enable_colors = allow_ansi_color }) },
);
}
}
@@ -3583,7 +3580,7 @@ pub const VirtualMachine = struct {
"<r><b>- |<r> {}" ++ fmt,
allow_ansi_color,
),
.{bun.fmt.fmtJavaScript(text, allow_ansi_color)},
.{bun.fmt.fmtJavaScript(text, .{ .enable_colors = allow_ansi_color })},
);
} else {
try writer.print(
@@ -3591,7 +3588,7 @@ pub const VirtualMachine = struct {
"<r><d>- |<r> {}\n",
allow_ansi_color,
),
.{bun.fmt.fmtJavaScript(text, allow_ansi_color)},
.{bun.fmt.fmtJavaScript(text, .{ .enable_colors = allow_ansi_color })},
);
}
@@ -3616,7 +3613,7 @@ pub const VirtualMachine = struct {
"<r><b>{d} |<r> {}" ++ fmt,
allow_ansi_color,
),
.{ display_line, bun.fmt.fmtJavaScript(clamped, allow_ansi_color) },
.{ display_line, bun.fmt.fmtJavaScript(clamped, .{ .enable_colors = allow_ansi_color }) },
);
} else {
try writer.print(
@@ -3624,7 +3621,7 @@ pub const VirtualMachine = struct {
"<r><b>{d} |<r> {}\n",
allow_ansi_color,
),
.{ display_line, bun.fmt.fmtJavaScript(clamped, allow_ansi_color) },
.{ display_line, bun.fmt.fmtJavaScript(clamped, .{ .enable_colors = allow_ansi_color }) },
);
if (clamped.len < max_line_length_with_divot or top.position.column.zeroBased() > max_line_length_with_divot) {