-
Notifications
You must be signed in to change notification settings - Fork 244
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
In FIPS environment password must be at least 14 characters (#558)
Enforce minimum password length or 14 characters when running in a FIPS environment --------- Signed-off-by: Olivier Lamy <olamy@apache.org> Co-authored-by: James Nord <jtnord@users.noreply.github.com>
- Loading branch information
Showing
9 changed files
with
131 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
.../java/com/cloudbees/plugins/credentials/impl/UsernamePasswordCredentialsImplFIPSTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package com.cloudbees.plugins.credentials.impl; | ||
|
|
||
| import com.cloudbees.plugins.credentials.CredentialsMatchers; | ||
| import com.cloudbees.plugins.credentials.CredentialsProvider; | ||
| import com.cloudbees.plugins.credentials.CredentialsScope; | ||
| import com.cloudbees.plugins.credentials.CredentialsStore; | ||
| import com.cloudbees.plugins.credentials.domains.Domain; | ||
| import hudson.ExtensionList; | ||
| import hudson.model.Descriptor; | ||
| import hudson.security.ACL; | ||
| import hudson.util.FormValidation; | ||
| import jenkins.model.Jenkins; | ||
| import org.apache.commons.text.StringEscapeUtils; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
| import org.jvnet.hudson.test.RealJenkinsRule; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.containsString; | ||
| import static org.hamcrest.Matchers.emptyString; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.hamcrest.Matchers.not; | ||
| import static org.hamcrest.Matchers.notNullValue; | ||
| import static org.hamcrest.Matchers.nullValue; | ||
| import static org.junit.Assert.assertThrows; | ||
|
|
||
| public class UsernamePasswordCredentialsImplFIPSTest { | ||
|
|
||
| @Rule public RealJenkinsRule rule = new RealJenkinsRule().javaOptions("-Djenkins.security.FIPS140.COMPLIANCE=true", "-Xmx512M") | ||
| .withDebugPort(8000).withDebugServer(true).withDebugSuspend(true); | ||
|
|
||
| @Test | ||
| public void nonCompliantLaunchExceptionTest() throws Throwable { | ||
| rule.then(r -> { | ||
| new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "all-good-beer", "Best captain and player in the world", | ||
| "Pat Cummins", "theaustraliancricketteamisthebest"); | ||
| assertThrows(Descriptor.FormException.class, () -> new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "bad-foo", "someone", | ||
| "Virat", "tooshort")); | ||
| assertThrows(Descriptor.FormException.class, () -> new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "bad-bar", "duck", | ||
| "Rohit", "")); | ||
| assertThrows(Descriptor.FormException.class, () -> new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "bad-foo", "not too bad", | ||
| "Gill", null)); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void invalidIsNotSavedInFIPSModeTest() throws Throwable { | ||
| rule.then(r -> | ||
| { | ||
| UsernamePasswordCredentialsImpl entry = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "all-good", "Best captain and player in the world", | ||
| "Pat Cummins", "theaustraliancricketteamisthebest"); | ||
| CredentialsStore store = CredentialsProvider.lookupStores(Jenkins.get()).iterator().next(); | ||
| store.addCredentials(Domain.global(), entry); | ||
| store.save(); | ||
| // Valid password is saved | ||
| UsernamePasswordCredentialsImpl cred = CredentialsMatchers.firstOrNull( | ||
| CredentialsProvider.lookupCredentialsInItem(UsernamePasswordCredentialsImpl.class, null, ACL.SYSTEM2), | ||
| CredentialsMatchers.withId("all-good")); | ||
| assertThat(cred, notNullValue()); | ||
| assertThrows(Descriptor.FormException.class, () -> store.addCredentials(Domain.global(), new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "all-good", "someone", | ||
| "foo", "tooshort"))); | ||
| store.save(); | ||
| // Invalid password size threw an exception, so it wasn't saved | ||
| cred = CredentialsMatchers.firstOrNull( | ||
| CredentialsProvider.lookupCredentialsInItem(UsernamePasswordCredentialsImpl.class, null, ACL.SYSTEM2), | ||
| CredentialsMatchers.withId("all-good")); | ||
| assertThat(cred, notNullValue()); | ||
| assertThat(cred.getPassword().getPlainText(), is("theaustraliancricketteamisthebest")); | ||
| }); | ||
| } | ||
|
|
||
| private static void checkInvalidKeyIsNotSavedInFIPSMode(JenkinsRule r) throws IOException { | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void formValidationTest() throws Throwable { | ||
| rule.then(r -> { | ||
| UsernamePasswordCredentialsImpl.DescriptorImpl descriptor = ExtensionList.lookupSingleton(UsernamePasswordCredentialsImpl.DescriptorImpl.class); | ||
| FormValidation result = descriptor.doCheckPassword("theaustraliancricketteamisthebest"); | ||
| assertThat(result.getMessage(), nullValue()); | ||
| result = descriptor.doCheckPassword("foo"); | ||
| assertThat(result.getMessage(), not(emptyString())); | ||
| assertThat(result.getMessage(), containsString(StringEscapeUtils.escapeHtml4(Messages.passwordTooShortFIPS()))); | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters