Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SNOW-1803598: Add hard coded AWS secret key mask #364

Closed
wants to merge 1 commit into from
Closed

SNOW-1803598: Add hard coded AWS secret key mask #364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 50 additions & 2 deletions src/main/java/org/jenkinsci/plugins/workflow/log/FileLogStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,62 @@ private final class IndexOutputStream extends OutputStream {
@Override public void write(@NonNull byte[] b) throws IOException {
synchronized (FileLogStorage.this) {
checkId(id);
bos.write(b);
maskedWrite(b, 0, b.length);
}
}

@Override public void write(@NonNull byte[] b, int off, int len) throws IOException {
synchronized (FileLogStorage.this) {
checkId(id);
bos.write(b, off, len);
maskedWrite(b, off, len);
}
}

/*
* Mask the sensitive data in the log
*/
private void maskedWrite(@NonNull byte[] b, int off, int len) throws IOException {
String in = new String(b, off, len);

String regexPattern = "(?<![A-Za-z0-9\\+=])[A-Za-z0-9\\+=]{40}(?![A-Za-z0-9\\+=])";
String replacementString = "****************************************";

// Jenkins adds special code in the output to handle console notes.
// Console notes are markuplanguage that the Jenkins console UI interprets
// to add links, colors, etc.
// Console notes are a sequence of chars that starts with PREAMBLE_STR
// and ends with POSTAMBLE_STR.
// The logic below is to apply masking logic to the buffer portions
// before and after the console note (if any) and skip masking the console
// note itself.
int preamble_idx = in.indexOf(hudson.console.ConsoleNote.PREAMBLE_STR);
int postamble_length = hudson.console.ConsoleNote.POSTAMBLE_STR.length();

if (preamble_idx == -1) {
String outString = in.replaceAll(regexPattern, replacementString);
bos.write(outString.getBytes());
return;
}

int postamble_idx = in.indexOf(hudson.console.ConsoleNote.POSTAMBLE_STR);

int leftStringLen = preamble_idx;
int consoleNoteLen = postamble_idx + postamble_length - preamble_idx;
int rightStringLen = len - consoleNoteLen - leftStringLen;

if (leftStringLen > 0) {
String left = new String(b, off, leftStringLen);
String outString = left.replaceAll(regexPattern, replacementString);
bos.write(outString.getBytes());
}

String consoleNote = new String(b, off + preamble_idx, consoleNoteLen);
System.out.println("consoleNote:" + consoleNote);

if (rightStringLen > 0) {
String right = new String(b, off + postamble_idx + postamble_length, rightStringLen);
String outString = right.replaceAll(regexPattern, replacementString);
bos.write(outString.getBytes());
}
}

Expand Down