fix(audit): ScadaBridge C2 review — over-redact scrubs all sensitive free-text fields + outer-catch never-leak test + marker alignment
I1 (security): OverRedact() in ScadaBridgeAuditRedactor now suppresses ErrorDetail, ErrorMessage, and Extra (in addition to RequestSummary/ResponseSummary) to the over-redacted marker in BOTH code paths (Deserialize+with path and the fallback new-AuditDetails path). SafeDefaultAuditRedactor catch block aligned to match. M3 (test): OuterCatch_OptionsThrows_NeverLeaks_AllSensitiveFieldsOverRedacted forces the outer try/catch → OverRedact path via a ThrowingMonitor that throws from CurrentValue (the first statement in the try block). Asserts (a) Apply does not throw, and (b) all five sensitive free-text fields are suppressed to the over-redacted marker with PayloadTruncated=true. M1 (consistency): SafeDefaultAuditRedactor now uses AuditRedactionPrimitives constants (RedactedMarker for line-format header values, OverRedactedEventMarker for the catch block), eliminating the divergent [REDACTED]/[redacted by ...] strings. AuditRedactionPrimitives gains OverRedactedEventMarker = RedactorErrorMarker. SafeDefaultAuditRedactorTests updated from [REDACTED] → <redacted>. M2 (comment): Added one-line note in TruncateField explaining why the char-count (result.Length != value.Length) truncation check is sufficient given TruncateUtf8 only ever shortens.
This commit is contained in:
@@ -42,6 +42,15 @@ internal static class AuditRedactionPrimitives
|
||||
/// <summary>Over-redaction marker emitted when a redactor stage itself faults.</summary>
|
||||
public const string RedactorErrorMarker = "<redacted: redactor error>";
|
||||
|
||||
/// <summary>
|
||||
/// Marker used by the outer never-throws safety net when the entire redaction
|
||||
/// pipeline fails catastrophically — all potentially-sensitive string fields are
|
||||
/// set to this value so no raw payload leaks on an unexpected fault.
|
||||
/// Deliberately equal to <see cref="RedactorErrorMarker"/>: both represent a
|
||||
/// defensive scrub-everything fallback.
|
||||
/// </summary>
|
||||
public const string OverRedactedEventMarker = RedactorErrorMarker;
|
||||
|
||||
/// <summary>
|
||||
/// JSON serializer options used to re-emit redacted summaries. The
|
||||
/// UnsafeRelaxedJsonEscaping encoder is required so the redaction marker
|
||||
@@ -276,6 +285,8 @@ internal static class AuditRedactionPrimitives
|
||||
return null;
|
||||
}
|
||||
var result = TruncateUtf8(value, cap);
|
||||
// Char-count comparison is sufficient: TruncateUtf8 only ever shortens the
|
||||
// string, so result.Length < value.Length iff bytes were removed.
|
||||
if (result.Length != value.Length)
|
||||
{
|
||||
truncated = true;
|
||||
|
||||
Reference in New Issue
Block a user