-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
[JENKINS-73506] Reject fetch requests that use credentials with HTTP in FIPS mode #1615
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ddf0e2b
Launching exception on remote fetch
PereBueno 2f9287f
reject wrong setup for mbp scan and reject saving data
olamy 365b702
Merge pull request #1 from olamy/JENKINS-73506-patch-1
PereBueno 029970d
Update src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java
PereBueno bfddfb1
Update src/main/resources/jenkins/plugins/git/Messages.properties
PereBueno fcab922
updating test
PereBueno File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
58 changes: 58 additions & 0 deletions
58
src/test/java/jenkins/plugins/git/FIPSModeSCMSourceTest.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,58 @@ | ||
package jenkins.plugins.git; | ||
|
||
import hudson.model.TaskListener; | ||
import hudson.plugins.git.GitException; | ||
import hudson.util.StreamTaskListener; | ||
import jenkins.security.FIPS140; | ||
import org.junit.ClassRule; | ||
import org.junit.Rule; | ||
import org.junit.Test; | ||
import org.jvnet.hudson.test.FlagRule; | ||
import org.jvnet.hudson.test.JenkinsRule; | ||
import org.jvnet.hudson.test.LoggerRule; | ||
|
||
import java.io.IOException; | ||
import java.util.logging.Level; | ||
|
||
import static org.hamcrest.CoreMatchers.containsString; | ||
import static org.hamcrest.CoreMatchers.is; | ||
import static org.hamcrest.CoreMatchers.nullValue; | ||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.junit.Assert.assertThrows; | ||
|
||
public class FIPSModeSCMSourceTest { | ||
|
||
@ClassRule | ||
public static final FlagRule<String> FIPS_FLAG = | ||
FlagRule.systemProperty(FIPS140.class.getName() + ".COMPLIANCE", "true"); | ||
|
||
@Rule | ||
public JenkinsRule rule = new JenkinsRule(); | ||
|
||
@Rule | ||
public LoggerRule logger = new LoggerRule(); | ||
|
||
@Test | ||
@SuppressWarnings("deprecation") | ||
public void remotesAreNotFetchedTest() throws IOException, InterruptedException { | ||
GitSCMSource source = new GitSCMSource("http://insecure-repo"); | ||
// Credentials are null, so we should have no FIPS error | ||
logger.record(AbstractGitSCMSource.class, Level.SEVERE); | ||
logger.capture(10); | ||
TaskListener listener = StreamTaskListener.fromStderr(); | ||
assertThrows("expected exception as repo doesn't exist", GitException.class, () ->source.fetch(listener)); | ||
assertThat("We should no see the error in the logs", logger.getMessages().size(), is(0)); | ||
|
||
// Using creds we should be getting an exception | ||
Throwable exception = assertThrows("We're not saving creds", IllegalArgumentException.class, () -> source.setCredentialsId("cred-id")); | ||
assertThat(exception.getMessage(), containsString("FIPS requires a secure channel")); | ||
assertThat("credentials are not saved", source.getCredentialsId(), nullValue()); | ||
|
||
// Using old constructor (restricted since 3.4.0) to simulate credentials are being set with unsecure connection | ||
// This would be equivalent to a user manually adding credentials to config.xml | ||
GitSCMSource anotherSource = new GitSCMSource("fake", "http://insecure", "credentialsId", "", "", true); | ||
exception = assertThrows("fetch was interrupted so no credential was leaked", IllegalArgumentException.class, () -> anotherSource.fetch(listener)); | ||
assertThat("We should have a severe log indicating the error", logger.getMessages().size(), is(1)); | ||
assertThat("Exception indicates problem", exception.getMessage(), containsString("FIPS requires a secure channel")); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Restricted(NoExternalUse.class)
?