Skip to content

[JENKINS-75914] Do not mask empty secrets #378

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

Merged
jtnord merged 1 commit into from
Jul 22, 2025
Merged

[JENKINS-75914] Do not mask empty secrets #378

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions src/main/java/org/jenkinsci/plugins/credentialsbinding/impl/BindingStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ private static final class Handler implements FailureHandler {
@NonNull
@Override
public Throwable handle(@NonNull StepContext ctx, @NonNull Throwable t) {
if (Secret.toString(secretPattern).isEmpty()) {
return t;
}
return MaskedException.of(t, Pattern.compile(secretPattern.getPlainText()));
}
}
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/jenkinsci/plugins/credentialsbinding/impl/BindingStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,23 @@ public void usernameUnmaskedInStepArguments() throws Throwable {
});
}

@Issue("JENKINS-75914")
@Test public void emptyOrBlankCredsOnExceptions() throws Throwable {
rr.then(r -> {
CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), new StringCredentialsImpl(CredentialsScope.GLOBAL, "creds", "sample", Secret.fromString("")));
var p = r.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition(
"""
withCredentials([string(credentialsId: 'creds', variable: 'SECRET')]) {
error(/random String/)
}
""", true));
var b = r.buildAndAssertStatus(Result.FAILURE, p);
r.assertLogNotContains("****", b);
r.assertLogContains("random String", b);
});
}

private void assertErrorActionsDoNotContainString(WorkflowRun b, String needle) {
var errorActionStackTraces = new DepthFirstScanner().allNodes(b.getExecution()).stream()
.map(n -> n.getPersistentAction(ErrorAction.class))
Expand Down