Skip to content

Prepare for new release #998

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.

Sign up for GitHub

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

Merged
rsenden merged 4 commits into from
May 11, 2026
Merged

Prepare for new release #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d172ce6
chore: Merge PR #985
rsenden Apr 24, 2026
8400aff
chore: `fcli aviator ssc audit`: Add suppression exclusions in tag ma…
kireetivar May 8, 2026
786e345
chore: Use platform trust store (#997)
Copilot May 8, 2026
0d0d7a5
chore: FoD `fcli fod issue update` improvements (#990)
kadraman May 8, 2026
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
170 changes: 170 additions & 0 deletions ...e/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIStaticInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,26 @@
*/
package com.fortify.cli.app.runner.util;

import java.net.Socket;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Objects;

import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509ExtendedTrustManager;
import javax.net.ssl.X509TrustManager;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
Expand All @@ -25,6 +41,7 @@
import com.fortify.cli.common.http.ssl.truststore.helper.TrustStoreConfigDescriptor;
import com.fortify.cli.common.http.ssl.truststore.helper.TrustStoreConfigHelper;
import com.fortify.cli.common.i18n.helper.LanguageHelper;
import com.fortify.cli.common.util.EnvHelper;
import com.fortify.cli.fod.action.helper.FoDActionProductContextProvider;
import com.fortify.cli.ssc.action.helper.SSCActionProductContextProvider;
import com.fortify.cli.tool._common.helper.ToolUninstaller;
Expand Down Expand Up @@ -77,6 +94,83 @@ private void initializeTrustStore() {
trustStorePasswordPropertyKey);
}
log.debug("INFO: Trust store file: " + System.getProperty(trustStorePropertyKey, "NONE"));

// Merge OS platform trust store (e.g. Windows Certificate Store / macOS Keychain)
// with the configured trust store so enterprise CAs are trusted automatically.
initializePlatformTrustStore(descriptor);
}

private void initializePlatformTrustStore(TrustStoreConfigDescriptor descriptor) {
if (isOsTrustStoreDisabled(descriptor)) {
log.debug("OS trust store merge disabled");
return;
}
KeyStore platformKeyStore = loadPlatformKeyStore();
if (platformKeyStore == null) {
return; // No OS trust store available on this platform or in this runtime
}

List<X509TrustManager> managers = new ArrayList<>();
addTrustManagerFromKeyStore(managers, null); // null = use javax.net.ssl.trustStore system props
int managerCountBeforePlatformStore = managers.size();
addTrustManagerFromKeyStore(managers, platformKeyStore);

if (managers.size() == managerCountBeforePlatformStore) {
return; // Nothing new to add; skip installing a composite context
}

try {
SSLContext ctx = SSLContext.getInstance("TLS");
ctx.init(null, new TrustManager[]{new CompositeX509TrustManager(managers)}, null);
SSLContext.setDefault(ctx);
log.info("Composite SSL context installed: configured trust store + OS trust store");
} catch (GeneralSecurityException e) {
log.warn("Could not install composite SSL context with OS trust store: " + e.getMessage());
}
}

private boolean isOsTrustStoreDisabled(TrustStoreConfigDescriptor descriptor) {
if (EnvHelper.asBoolean(EnvHelper.env("FCLI_DISABLE_OS_TRUSTSTORE"))) {
return true;
}
return descriptor != null && Boolean.FALSE.equals(descriptor.getUseOsTrustStore());
}

private void addTrustManagerFromKeyStore(List<X509TrustManager> managers, KeyStore keyStore) {
try {
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(keyStore); // null = uses javax.net.ssl.trustStore system props
for (TrustManager tm : tmf.getTrustManagers()) {
if (tm instanceof X509TrustManager x509tm) {
managers.add(x509tm);
}
}
} catch (GeneralSecurityException e) {
log.debug("Could not load trust manager from key store: " + e.getMessage());
}
}

private KeyStore loadPlatformKeyStore() {
String os = System.getProperty("os.name", "").toLowerCase(Locale.ROOT);
String type;
if (os.contains("win")) {
type = "Windows-ROOT";
} else if (os.contains("mac")) {
type = "KeychainStore";
} else {
return null; // Linux has no standard Java-accessible OS trust store
}
try {
KeyStore ks = KeyStore.getInstance(type);
ks.load(null, null);
log.debug("Loaded OS trust store: " + type);
return ks;
} catch (Exception | LinkageError e) {
// Provider may be unavailable in GraalVM native images built on a different OS
log.warn("OS trust store unavailable ({}): {}", type, e.getMessage());
log.debug("OS trust store load failure details", e);
return null;
}
}

private void initializeTrustStoreFromEnv(String trustStorePropertyKey, String trustStoreTypePropertyKey,
Expand Down Expand Up @@ -123,4 +217,80 @@ private void initializeTrustStoreFromConfig(TrustStoreConfigDescriptor descripto
private void initializeLocale() {
Locale.setDefault(LanguageHelper.getConfiguredLanguageDescriptor().getLocale());
}

private static final class CompositeX509TrustManager extends X509ExtendedTrustManager {
private final List<X509TrustManager> delegates;

CompositeX509TrustManager(List<X509TrustManager> delegates) {
this.delegates = List.copyOf(delegates);
}

@Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
tryEach(tm -> tm.checkClientTrusted(chain, authType));
}

@Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
tryEach(tm -> tm.checkServerTrusted(chain, authType));
}

@Override
public void checkClientTrusted(X509Certificate[] chain, String authType, Socket socket) throws CertificateException {
tryEach(tm -> {
if (tm instanceof X509ExtendedTrustManager ext) { ext.checkClientTrusted(chain, authType, socket); }
else { tm.checkClientTrusted(chain, authType); }
});
}

@Override
public void checkClientTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException {
tryEach(tm -> {
if (tm instanceof X509ExtendedTrustManager ext) { ext.checkClientTrusted(chain, authType, engine); }
else { tm.checkClientTrusted(chain, authType); }
});
}

@Override
public void checkServerTrusted(X509Certificate[] chain, String authType, Socket socket) throws CertificateException {
tryEach(tm -> {
if (tm instanceof X509ExtendedTrustManager ext) { ext.checkServerTrusted(chain, authType, socket); }
else { tm.checkServerTrusted(chain, authType); }
});
}

@Override
public void checkServerTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException {
tryEach(tm -> {
if (tm instanceof X509ExtendedTrustManager ext) { ext.checkServerTrusted(chain, authType, engine); }
else { tm.checkServerTrusted(chain, authType); }
});
}

@Override
public X509Certificate[] getAcceptedIssuers() {
return delegates.stream()
.map(X509TrustManager::getAcceptedIssuers)
.filter(Objects::nonNull)
.flatMap(Arrays::stream)
.toArray(X509Certificate[]::new);
}

private void tryEach(TrustCheckFactory check) throws CertificateException {
CertificateException last = null;
for (X509TrustManager tm : delegates) {
try { check.check(tm); return; }
catch (CertificateException e) { last = e; }
}
if (last != null) {
throw last;
}
throw new CertificateException("No trust manager accepted the certificate chain");
}

@FunctionalInterface
private interface TrustCheckFactory {
void check(X509TrustManager tm) throws CertificateException;
}
}
}
19 changes: 18 additions & 1 deletion .../fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/grpc/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,14 +510,31 @@
"name":"com.fortify.cli.aviator.config.TagMappingConfig",
"allDeclaredFields":true,
"queryAllPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setMapping","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Mapping"] }, {"name":"setTag_id","parameterTypes":["java.lang.String"] }]
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setMapping","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Mapping"] }, {"name":"setSuppression_exclusions","parameterTypes":["java.util.List"] }, {"name":"setTag_id","parameterTypes":["java.lang.String"] }]
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$Mapping",
"allDeclaredFields":true,
"queryAllPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setTier_1","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Tier"] }, {"name":"setTier_2","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Tier"] }]
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$SuppressionExclusion",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allPublicFields": true,
"allDeclaredFields":true,
"queryAllPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setCategories","parameterTypes":["java.util.List"] }]
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$SuppressionExclusionBeanInfo"
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$SuppressionExclusionCustomizer"
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$MappingBeanInfo"
},
Expand Down
29 changes: 29 additions & 0 deletions ...-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/ssl/jni-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"name": "sun.security.mscapi.SunMSCAPI",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredFields": true,
"allPublicFields": true
},
{
"name": "sun.security.mscapi.CKeyStore",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredFields": true,
"allPublicFields": true
},
{
"name": "sun.security.mscapi.CKeyStore$ROOT",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredFields": true,
"allPublicFields": true
}
]
29 changes: 29 additions & 0 deletions ...e/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/ssl/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"name": "sun.security.mscapi.SunMSCAPI",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredFields": true,
"allPublicFields": true
},
{
"name": "sun.security.mscapi.CKeyStore",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredFields": true,
"allPublicFields": true
},
{
"name": "sun.security.mscapi.CKeyStore$ROOT",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredFields": true,
"allPublicFields": true
}
]
19 changes: 18 additions & 1 deletion .../fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/yaml/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,31 @@
"name":"com.fortify.cli.aviator.config.TagMappingConfig",
"allDeclaredFields":true,
"queryAllPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setMapping","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Mapping"] }, {"name":"setTag_id","parameterTypes":["java.lang.String"] }]
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setMapping","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Mapping"] }, {"name":"setSuppression_exclusions","parameterTypes":["java.util.List"] }, {"name":"setTag_id","parameterTypes":["java.lang.String"] }]
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$Mapping",
"allDeclaredFields":true,
"queryAllPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setTier_1","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Tier"] }, {"name":"setTier_2","parameterTypes":["com.fortify.cli.aviator.config.TagMappingConfig$Tier"] }]
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$SuppressionExclusion",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allPublicMethods": true,
"allPublicFields": true,
"allDeclaredFields":true,
"queryAllPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setCategories","parameterTypes":["java.util.List"] }]
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$SuppressionExclusionBeanInfo"
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$SuppressionExclusionCustomizer"
},
{
"name":"com.fortify.cli.aviator.config.TagMappingConfig$MappingBeanInfo"
},
Expand Down
Loading
Loading