Now that the FIPS 140 security provider is simply a test dependency we don't need the thirdPartyAudit exceptions, but plugin-cli and transport-netty4 do need jarHell disabled as they use the non fips BouncyCastle security provider as a test dependency too.
This commit is contained in:
parent
dc143d59c8
commit
8c0b49cd32
|
@ -42,12 +42,6 @@ test {
|
|||
systemProperty 'tests.security.manager', 'false'
|
||||
}
|
||||
|
||||
thirdPartyAudit.onlyIf {
|
||||
// FIPS JVM includes manny classes from bouncycastle which count as jar hell for the third party audit,
|
||||
// rather than provide a long list of exclusions, disable the check on FIPS.
|
||||
BuildParams.inFipsJvm == false
|
||||
}
|
||||
|
||||
/*
|
||||
* these two classes intentionally use the following JDK internal APIs in order to offer the necessary
|
||||
* functionality
|
||||
|
|
|
@ -196,11 +196,3 @@ thirdPartyAudit {
|
|||
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator'
|
||||
)
|
||||
}
|
||||
|
||||
if (BuildParams.inFipsJvm == false) {
|
||||
// BouncyCastleFIPS provides this class, so the exclusion is invalid when running CI in
|
||||
// a FIPS JVM with BouncyCastleFIPS Provider
|
||||
thirdPartyAudit.ignoreMissingClasses(
|
||||
'org.bouncycastle.asn1.x500.X500Name'
|
||||
)
|
||||
}
|
||||
|
|
|
@ -88,7 +88,7 @@ thirdPartyAudit {
|
|||
ignoreMissingClasses()
|
||||
}
|
||||
|
||||
thirdPartyAudit.onlyIf {
|
||||
jarHell.onlyIf {
|
||||
// FIPS JVM includes many classes from bouncycastle which count as jar hell for the third party audit,
|
||||
// rather than provide a long list of exclusions, disable the check on FIPS.
|
||||
BuildParams.inFipsJvm == false
|
||||
|
|
|
@ -157,11 +157,3 @@ thirdPartyAudit {
|
|||
)
|
||||
}
|
||||
|
||||
if (BuildParams.inFipsJvm == false) {
|
||||
// BouncyCastleFIPS provides this class, so the exclusion is invalid when running CI in
|
||||
// a FIPS JVM with BouncyCastleFIPS Provider
|
||||
thirdPartyAudit.ignoreMissingClasses(
|
||||
'org.bouncycastle.asn1.x500.X500Name'
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -26,14 +26,11 @@ forbiddenPatterns {
|
|||
|
||||
if (BuildParams.inFipsJvm) {
|
||||
test.enabled = false
|
||||
jarHell.enabled = false
|
||||
testingConventions.enabled = false
|
||||
// Forbiden APIs non-portable checks fail because bouncy castle classes being used from the FIPS JDK since those are
|
||||
// not part of the Java specification - all of this is as designed, so we have to relax this check for FIPS.
|
||||
tasks.withType(CheckForbiddenApis) {
|
||||
bundledSignatures -= "jdk-non-portable"
|
||||
}
|
||||
// FIPS JVM includes many classes from bouncycastle which count as jar hell for the third party audit,
|
||||
// rather than provide a long list of exclusions, disable the check on FIPS.
|
||||
thirdPartyAudit.enabled = false
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue