Skip to content

Commit bffc349

Browse files
jonbartelstonygermano
jonbartels
and
tonygermano
committed
Remove SSLWarningPanel and NextGen ad
A similar message was present in both a tooltip on hover and a popup panel on left-click. This commit removes the SSLWarningPanel and relies on the tooltip for messaging. The message has been changed to indicate a compatible TLS plugin was not detected without including a sales pitch. Additionally it now says that TLS security options and mTLS are not configurable through the interface rather than saying they are not supported. The icon for when the message is present has been changed from a lock with a red X to an information blue circle with an "i" to indicate this is not an error or security issue. Issue: #156 Co-authored-by: Tony Germano <tony@germano.name> Signed-off-by: Jon Bartels <jon.bartels@teladochealth.com> Signed-off-by: Tony Germano <tony@germano.name>
1 parent ec57fb0 commit bffc349

4 files changed

Lines changed: 10 additions & 140 deletions

File tree

‎client/src/com/mirth/connect/connectors/http/HttpSender.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
importjavax.swing.BorderFactory;
3333
importjavax.swing.ButtonGroup;
34-
importjavax.swing.ImageIcon;
3534
importjavax.swing.JButton;
3635
importjavax.swing.JLabel;
3736
importjavax.swing.JScrollPane;
@@ -74,9 +73,11 @@
7473

7574
publicclassHttpSenderextendsConnectorSettingsPanel {
7675

77-
privatestaticfinalImageIconICON_LOCK_X = newImageIcon(Frame.class.getResource("images/lock_x.png"));
7876
privatestaticfinalColorCOLOR_SSL_NOT_CONFIGURED = newColor(0xFFF099);
79-
privatestaticfinalStringSSL_TOOL_TIP = "<html>The default system certificate store will be used for this connection.<br/>As a result, certain security options are not available and mutual<br/>authentication (two-way authentication) is not supported.</html>";
77+
privatestaticfinalStringSSL_TOOL_TIP = """
78+
<html>Compatible TLS plugin not detected. The java system trust store will be<br/>
79+
used for this connection. TLS security options and mutual<br/>
80+
authentication (mTLS) are not configurable through this interface.</html>""";
8081

8182
privatefinalintNAME_COLUMN = 0;
8283
privatefinalintVALUE_COLUMN = 1;
@@ -85,7 +86,6 @@ public class HttpSender extends ConnectorSettingsPanel {
8586
privateintpropertiesLastIndex = -1;
8687
privateintheaderLastIndex = -1;
8788
privateFrameparent;
88-
privateSSLWarningPanelsslWarningPanel;
8989

9090
publicHttpSender() {
9191
this.parent = PlatformUI.MIRTH_FRAME;
@@ -114,8 +114,6 @@ public void keyReleased(KeyEvent evt) {
114114
}
115115
});
116116

117-
sslWarningPanel = newSSLWarningPanel();
118-
119117
contentTypeField.getDocument().addDocumentListener(newDocumentListener() {
120118
@Override
121119
publicvoidinsertUpdate(DocumentEvente) {
@@ -691,7 +689,7 @@ public ConnectorTypeDecoration getConnectorTypeDecoration() {
691689
}
692690

693691
if (usingHttps) {
694-
returnnewConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", ICON_LOCK_X, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED);
692+
returnnewConnectorTypeDecoration(Mode.DESTINATION, "(TLS Not Configured)", UIConstants.ICON_INFORMATION, SSL_TOOL_TIP, null, COLOR_SSL_NOT_CONFIGURED);
695693
} else {
696694
returnnewConnectorTypeDecoration(Mode.DESTINATION);
697695
}

‎client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎client/src/com/mirth/connect/connectors/ws/WebServiceSender.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
importjavax.swing.BorderFactory;
3838
importjavax.swing.ButtonGroup;
3939
importjavax.swing.DefaultComboBoxModel;
40-
importjavax.swing.ImageIcon;
4140
importjavax.swing.JButton;
4241
importjavax.swing.JComponent;
4342
importjavax.swing.JLabel;
@@ -83,9 +82,11 @@
8382

8483
publicclassWebServiceSenderextendsConnectorSettingsPanel {
8584

86-
protectedstaticfinalImageIconICON_LOCK_X = newImageIcon(Frame.class.getResource("images/lock_x.png"));
8785
protectedstaticfinalColorCOLOR_SSL_NOT_CONFIGURED = newColor(0xFFF099);
88-
protectedstaticfinalStringSSL_TOOL_TIP = "<html>The default system certificate store will be used for this connection.<br/>As a result, certain security options are not available and mutual<br/>authentication (two-way authentication) is not supported.</html>";
86+
protectedstaticfinalStringSSL_TOOL_TIP = """
87+
<html>Compatible TLS plugin not detected. The java system trust store will be<br/>
88+
used for this connection. TLS security options and mutual<br/>
89+
authentication (mTLS) are not configurable through this interface.</html>""";
8990

9091
privatefinalintID_COLUMN_NUMBER = 0;
9192
privatefinalintCONTENT_COLUMN_NUMBER = 1;
@@ -319,7 +320,7 @@ public void resetInvalidProperties() {
319320
@Override
320321
publicConnectorTypeDecorationgetConnectorTypeDecoration() {
321322
if (isUsingHttps(wsdlUrlField.getText()) || isUsingHttps(String.valueOf(locationURIComboBox.getSelectedItem()))) {
322-
returnnewConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", ICON_LOCK_X, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED);
323+
returnnewConnectorTypeDecoration(Mode.DESTINATION, "(TLS Not Configured)", UIConstants.ICON_INFORMATION, SSL_TOOL_TIP, null, COLOR_SSL_NOT_CONFIGURED);
323324
} else {
324325
returnnewConnectorTypeDecoration(Mode.DESTINATION);
325326
}
@@ -963,8 +964,6 @@ public void actionPerformed(ActionEvent evt) {
963964
}
964965
});
965966

966-
sslWarningPanel = newSSLWarningPanel();
967-
968967
useAttachmentsTableRadio = newMirthRadioButton("Use Table");
969968
useAttachmentsTableRadio.setBackground(getBackground());
970969
useAttachmentsTableRadio.addActionListener(newActionListener() {
@@ -1505,5 +1504,4 @@ private void headersDeleteButtonActionPerformed(ActionEvent evt) {
15051504
protectedMirthTextFieldattachmentsVariableField;
15061505
protectedMirthRadioButtonuseAttachmentsTableRadio;
15071506
protectedMirthRadioButtonuseAttachmentsVariableRadio;
1508-
protectedSSLWarningPanelsslWarningPanel;
15091507
}

0 commit comments

Comments
 (0)