From 68db52955e5b3ed60873d82eed7730de173c8d8d Mon Sep 17 00:00:00 2001 From: ramesh bommakanti Date: Tue, 11 Feb 2025 21:46:43 +0530 Subject: [PATCH] added providers for sonarqube --- build.gradle | 5 +++-- server/sonar-server-common/build.gradle | 1 + .../src/main/java/org/sonar/server/app/WebServer.java | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7a3ff20eaea3..8bc01f134bcf 100644 --- a/build.gradle +++ b/build.gradle @@ -420,8 +420,9 @@ subprojects { dependency 'org.apache.sshd:sshd-core:2.13.2' dependency 'org.assertj:assertj-core:3.26.3' dependency 'org.assertj:assertj-guava:3.26.3' - dependency 'org.bouncycastle:bc-fips:2.0.0' - dependency 'org.bouncycastle:bcpkix-fips:2.0.7' + dependency 'org.bouncycastle:bc-fips:2.0.0' + dependency 'org.bouncycastle:bcpkix-fips:2.0.7' + dependency 'org.bouncycastle:bctls-fips:2.0.19' dependency('org.codehaus.sonar:sonar-channel:4.2') { exclude 'org.slf4j:slf4j-api' } diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle index 094c72f1d7ef..78b4bb66c1e1 100644 --- a/server/sonar-server-common/build.gradle +++ b/server/sonar-server-common/build.gradle @@ -18,6 +18,7 @@ dependencies { api 'org.apache.commons:commons-email' api 'org.apache.commons:commons-lang3' api 'org.bouncycastle:bc-fips' + api 'org.bouncycastle:bctls-fips' api 'org.elasticsearch.client:elasticsearch-rest-high-level-client' api 'org.slf4j:slf4j-api' api 'org.sonarsource.api.plugin:sonar-plugin-api' diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/app/WebServer.java b/server/sonar-webserver/src/main/java/org/sonar/server/app/WebServer.java index 1c1164dc799a..90100503b501 100644 --- a/server/sonar-webserver/src/main/java/org/sonar/server/app/WebServer.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/app/WebServer.java @@ -21,6 +21,10 @@ import com.google.common.collect.ImmutableMap; import java.io.File; +import java.security.Security; + +import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider; +import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider; import org.slf4j.LoggerFactory; import org.sonar.process.MinimumViableSystem; import org.sonar.process.Monitored; @@ -95,6 +99,8 @@ public void awaitStop() { * Can't be started as is. Needs to be bootstrapped by sonar-application */ public static void main(String[] args) { + Security.addProvider(new BouncyCastleFipsProvider()); + Security.addProvider(new BouncyCastleJsseProvider("fips:BCFIPS")); ProcessEntryPoint entryPoint = ProcessEntryPoint.createForArguments(args); Props props = entryPoint.getProps(); new WebServerProcessLogging().configure(props);