From 33955eb962c4a726559cf8856821fc3eab0c3ede Mon Sep 17 00:00:00 2001 From: Jon Bartels Date: Thu, 14 Aug 2025 17:54:54 -0400 Subject: [PATCH] Issue #156 - Change SSL help text to a Constant, remove NextGen branding and ads from the message Signed-off-by: Jon Bartels --- client/src/com/mirth/connect/client/ui/UIConstants.java | 9 +++++++++ .../com/mirth/connect/connectors/http/HttpSender.java | 2 +- .../mirth/connect/connectors/http/SSLWarningPanel.java | 4 +++- .../com/mirth/connect/connectors/ws/SSLWarningPanel.java | 4 +++- .../mirth/connect/connectors/ws/WebServiceSender.java | 4 ++-- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/client/src/com/mirth/connect/client/ui/UIConstants.java b/client/src/com/mirth/connect/client/ui/UIConstants.java index 0d39c0963c..230635c41a 100644 --- a/client/src/com/mirth/connect/client/ui/UIConstants.java +++ b/client/src/com/mirth/connect/client/ui/UIConstants.java @@ -129,4 +129,13 @@ public class UIConstants { // User preferences public static final String USER_PREF_KEY_BACKGROUND_COLOR = "backgroundColor"; + + // SSL Warning Text + // This text is used in the SSL Warning Panel for HTTP and WS connectors. + public static final String SSL_WARNING_TEXT = "\n" + + "Important Notice: This connection uses the java system trust store, which limits available TLS security options. \n" + + "Client certificate selection is not available in the UI when using the system store, preventing mutual TLS (mTLS) configuration through this interface.\n" + + "\n" + + ""; } + diff --git a/client/src/com/mirth/connect/connectors/http/HttpSender.java b/client/src/com/mirth/connect/connectors/http/HttpSender.java index 40e04c2169..ad3aa8472f 100644 --- a/client/src/com/mirth/connect/connectors/http/HttpSender.java +++ b/client/src/com/mirth/connect/connectors/http/HttpSender.java @@ -691,7 +691,7 @@ public ConnectorTypeDecoration getConnectorTypeDecoration() { } if (usingHttps) { - return new ConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", ICON_LOCK_X, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED); + return new ConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", UIConstants.ICON_INFORMATION, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED); } else { return new ConnectorTypeDecoration(Mode.DESTINATION); } diff --git a/client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java b/client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java index 6f52416705..7e19c9d923 100644 --- a/client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java +++ b/client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java @@ -25,6 +25,8 @@ import com.mirth.connect.client.ui.BareBonesBrowserLaunch; import com.mirth.connect.client.ui.UIConstants; +import static com.mirth.connect.client.ui.UIConstants.SSL_WARNING_TEXT; + public class SSLWarningPanel extends JPanel implements HyperlinkListener { public SSLWarningPanel() { @@ -42,7 +44,7 @@ public SSLWarningPanel() { editorPane.setBackground(getBackground()); editorPane.setEditable(false); editorPane.addHyperlinkListener(this); - editorPane.setText("Important Notice: The default system certificate store will be used for this connection. As a result, certain security options are not available and mutual authentication (two-way authentication) is not supported.

The SSL Manager extension for NextGen Connect provides advanced security and certificate management enhancements, including the ability to import certificates for use by source or destination connectors, as well as the ability to configure hostname verification and client authentication settings. For more information please contact NextGen Healthcare sales."); + editorPane.setText(SSL_WARNING_TEXT); add(editorPane, "grow"); } diff --git a/client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java b/client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java index dbd1c51331..637db36e54 100644 --- a/client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java +++ b/client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java @@ -25,6 +25,8 @@ import com.mirth.connect.client.ui.BareBonesBrowserLaunch; import com.mirth.connect.client.ui.UIConstants; +import static com.mirth.connect.client.ui.UIConstants.SSL_WARNING_TEXT; + public class SSLWarningPanel extends JPanel implements HyperlinkListener { public SSLWarningPanel() { @@ -42,7 +44,7 @@ public SSLWarningPanel() { editorPane.setBackground(getBackground()); editorPane.setEditable(false); editorPane.addHyperlinkListener(this); - editorPane.setText("Important Notice: The default system certificate store will be used for this connection. As a result, certain security options are not available and mutual authentication (two-way authentication) is not supported.

The SSL Manager extension for NextGen Connect provides advanced security and certificate management enhancements, including the ability to import certificates for use by source or destination connectors, as well as the ability to configure hostname verification and client authentication settings. For more information please contact NextGen Healthcare sales."); + editorPane.setText(SSL_WARNING_TEXT); add(editorPane, "grow"); } diff --git a/client/src/com/mirth/connect/connectors/ws/WebServiceSender.java b/client/src/com/mirth/connect/connectors/ws/WebServiceSender.java index cf6d5f278e..d543868e6b 100644 --- a/client/src/com/mirth/connect/connectors/ws/WebServiceSender.java +++ b/client/src/com/mirth/connect/connectors/ws/WebServiceSender.java @@ -80,10 +80,10 @@ import com.mirth.connect.model.Connector.Mode; import com.mirth.connect.model.converters.ObjectXMLSerializer; import com.mirth.connect.util.ConnectionTestResponse; +import com.mirth.connect.client.ui.UIConstants; public class WebServiceSender extends ConnectorSettingsPanel { - protected static final ImageIcon ICON_LOCK_X = new ImageIcon(Frame.class.getResource("images/lock_x.png")); protected static final Color COLOR_SSL_NOT_CONFIGURED = new Color(0xFFF099); protected static final String SSL_TOOL_TIP = "The default system certificate store will be used for this connection.
As a result, certain security options are not available and mutual
authentication (two-way authentication) is not supported."; @@ -319,7 +319,7 @@ public void resetInvalidProperties() { @Override public ConnectorTypeDecoration getConnectorTypeDecoration() { if (isUsingHttps(wsdlUrlField.getText()) || isUsingHttps(String.valueOf(locationURIComboBox.getSelectedItem()))) { - return new ConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", ICON_LOCK_X, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED); + return new ConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", UIConstants.ICON_INFORMATION, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED); } else { return new ConnectorTypeDecoration(Mode.DESTINATION); }