Browse Source

DOCKER-27 disable FIPS mode

tags/9.2.0.49834
Trabelsi Tobias 2 years ago
parent
commit
959f7f05fc

+ 4
- 0
server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java View File

@@ -45,6 +45,10 @@ public class CeJvmOptions extends JvmOptions<CeJvmOptions> {
res.put("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED", "");
res.put("--add-opens=java.management/sun.management=ALL-UNNAMED", "");
res.put("--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED", "");

// disable FIPS mode for the JVM so SonarQube can use certain algorithms
res.put("-Dcom.redhat.fips=", "false");
return res;
}
}

+ 2
- 0
server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java View File

@@ -126,6 +126,8 @@ public class EsJvmOptions extends JvmOptions<EsJvmOptions> {
* parsing will break in an incompatible way for some date patterns and locales.
*/
res.put("-Djava.locale.providers=", "COMPAT");
// disable FIPS mode for the JVM so SonarQube can use certain algorithms
res.put("-Dcom.redhat.fips=", "false");
}

public void writeToJvmOptionFile(File file) {

+ 3
- 0
server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java View File

@@ -49,6 +49,9 @@ public class WebJvmOptions extends JvmOptions<WebJvmOptions> {
res.put("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED", "");
res.put("--add-opens=java.management/sun.management=ALL-UNNAMED", "");
res.put("--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED", "");
// disable FIPS mode for the JVM so SonarQube can use certain algorithms
res.put("-Dcom.redhat.fips=", "false");

return res;
}

+ 2
- 1
server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java View File

@@ -51,6 +51,7 @@ public class CeJvmOptionsTest {
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",
"-Dcom.redhat.fips=false");
}
}

+ 2
- 0
server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java View File

@@ -68,6 +68,7 @@ public class EsJvmOptionsTest {
"-Dlog4j.shutdownHookEnabled=false",
"-Dlog4j2.disable.jmx=true",
"-Djava.locale.providers=COMPAT",
"-Dcom.redhat.fips=false",
"-Des.enforce.bootstrap.checks=true");
}

@@ -149,6 +150,7 @@ public class EsJvmOptionsTest {
"-Dlog4j.shutdownHookEnabled=false\n" +
"-Dlog4j2.disable.jmx=true\n" +
"-Djava.locale.providers=COMPAT\n" +
"-Dcom.redhat.fips=false\n" +
"-Des.enforce.bootstrap.checks=true\n" +
"-foo\n" +
"-bar");

+ 2
- 1
server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java View File

@@ -54,7 +54,8 @@ public class WebJvmOptionsTest {
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",
"-Dcom.redhat.fips=false");
}

}

Loading…
Cancel
Save