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.

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

[JEP-237] Do not support shortening of HMAC code on FIPS mode #8612

Merged
merged 5 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions core/src/main/java/jenkins/security/HMACConfidentialKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ public boolean checkMac(String message, String mac) {
}

private byte[] chop(byte[] mac) {
//don't shorten the mac code on FIPS mode
//if length supplied is less than original mac code length on FIPS, throw exception
if (FIPS140.useCompliantAlgorithms() && length < mac.length) {
throw new IllegalArgumentException("Supplied length can't be less than " + mac.length + " on FIPS mode");
}
if (mac.length <= length) return mac; // already too short

byte[] b = new byte[length];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package jenkins.security;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.matchesPattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -38,4 +40,11 @@ public void loadingExistingKey() {
}
}

@Test
public void testTruncatedMacOnNonFips() {
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 16);
String str = key1.mac("Hello World");

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about make a var as "Hello World"?

String pattern = "[0-9A-Fa-f]{32}";
assertThat(str, matchesPattern(pattern));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package hudson.security;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.matchesPattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

import jenkins.security.HMACConfidentialKey;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.rules.TestRule;
import org.jvnet.hudson.test.FlagRule;

public class HMACConfidentialKeyFIPSTest {
@ClassRule
// do not use the FIPS140 class here as that initializes the field before we set the property!
public static TestRule flagRule = FlagRule.systemProperty("jenkins.security.FIPS140.COMPLIANCE", "true");

@Test
public void testTruncatedMacOnFips() {
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 16);
IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> key1.mac("Hello World"));
assertEquals("Supplied length can't be less than 32 on FIPS mode", iae.getMessage());
}

@Test
public void testCompleteMacOnFips() {
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 32);
String str = key1.mac("Hello World");
String pattern = "[0-9A-Fa-f]{64}";
assertThat(str, matchesPattern(pattern));
}
}
Loading