Skip to content

Fix SSL configuration selection for multiple outbound connections with different certificates #35132

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

Open
una-tapa wants to merge 1 commit into
base: integration
Choose a base branch
from
Open

Fix SSL configuration selection for multiple outbound connections with different certificates #35132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 11 additions & 15 deletions dev/com.ibm.ws.ssl/src/com/ibm/ws/ssl/config/OutboundSSLSelections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017, 2022 IBM Corporation and others.
* Copyright (c) 2017, 2026 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -94,48 +94,44 @@ public synchronized void loadOutboundConnectionInfo(String sslCfgAlias, Map<Stri
String key = null;
String host = (String) outboundEntry.get("host");

// Use a local variable to avoid modifying the original sslCfgAlias
String currentSslCfgAlias = sslCfgAlias;
String certAlias = (String) outboundEntry.get("clientCertificate");
if (certAlias != null) {
sslCfgAlias = sslCfgAlias + ":" + certAlias;
currentSslCfgAlias = currentSslCfgAlias + ":" + certAlias;
}

Integer port = (Integer) outboundEntry.get("port");
if (port != null) {
key = host + "," + port.toString();
if (dynamicHostPortSelections.containsKey(key)) {
if (!dynamicHostPortSelections.get(key).equals(sslCfgAlias)) {
if (!dynamicHostPortSelections.get(key).equals(currentSslCfgAlias)) {
if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
Tr.debug(tc, "loadOutboundConnectionInfo", "Existing " + key + " : " + dynamicHostPortSelections.get(key) + ", trying to add " + sslCfgAlias);
Tr.debug(tc, "loadOutboundConnectionInfo", "Existing " + key + " : " + dynamicHostPortSelections.get(key) + ", trying to add " + currentSslCfgAlias);
}
issueConflictWarning(host, port.toString(), dynamicHostPortSelections.get(key));
}
} else {
if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
Tr.debug(tc, "loadOutboundConnectionInfo", "Adding " + key + " to the host port list, sslCfgAlias " + sslCfgAlias);
Tr.debug(tc, "loadOutboundConnectionInfo", "Adding " + key + " to the host and port list");
}
dynamicHostPortSelections.put(key, sslCfgAlias);
dynamicHostPortSelections.put(key, currentSslCfgAlias);
}
} else {
// special check for host "*" and port "*"
if (host.equals("*")) {
if (!warningIssued && isDefaultOutboundRefSet(sslCfgAlias))
continue;
}

key = host + ",*";
if (dynamicHostSelections.containsKey(key)) {
if (!dynamicHostSelections.get(key).equals(sslCfgAlias))
if (!dynamicHostSelections.get(key).equals(currentSslCfgAlias))
issueConflictWarning(host, "*", dynamicHostSelections.get(key));
} else {
if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
Tr.debug(tc, "loadOutboundConnectionInfo", "Adding " + key + " to the host list");
}
dynamicHostSelections.put(key, sslCfgAlias);
dynamicHostSelections.put(key, currentSslCfgAlias);
}
}

newConnectionInfo.add(key);
dynamicSelections.put(key, sslCfgAlias);
dynamicSelections.put(key, currentSslCfgAlias);
}
}

Expand Down
Loading