Add TLS checkbox in AdminGUI

Signed-off-by: kaido207 <kaido.hiroki@fujitsu.com>
eclipse-ee4j · Dec 7, 2023 · 4431010 · 4431010
1 parent 8cf7ae4
commit 4431010
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 19 deletions.
diff --git a/appserver/admingui/common/src/main/resources/shared/sslAttrs.inc b/appserver/admingui/common/src/main/resources/shared/sslAttrs.inc
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation
     Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -40,18 +41,26 @@
         getClientId(component="$this{component}" clientId=>$page{sheetId});
      />
 
-     <sun:property id="SSL3Prop"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.ssl3Label}" >
+     <sun:property id="SSL3Prop"  visible="#{false}" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.ssl3Label}" >
         <sun:checkbox id="SSL3"  selected="#{pageSession.valueMap['ssl3Enabled']}" selectedValue="true" />
      </sun:property>
-     <!--
-     <sun:property id="SSL2Prop"  rendered="#{ssl2}"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.ssl2Label}" >
-        <sun:checkbox id="SSL2" label="$resource{i18n.desc.Enabled}" selected="#{pageSession.valueMap['ssl2Enabled']}" selectedValue="true" />
-     </sun:property>
-     -->
+
      <sun:property id="TLSProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.tlsLabel}" >
         <sun:checkbox id="TLS"  selected="#{pageSession.valueMap['tlsEnabled']}" selectedValue="true"/>
      </sun:property>
 
+     <sun:property id="TLS11Prop"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.tls11Label}" >
+        <sun:checkbox id="TLS11"  selected="#{pageSession.valueMap['tls11Enabled']}" selectedValue="true"/>
+     </sun:property>
+
+     <sun:property id="TLS12Prop"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.tls12Label}" >
+        <sun:checkbox id="TLS12"  selected="#{pageSession.valueMap['tls12Enabled']}" selectedValue="true"/>
+     </sun:property>
+
+     <sun:property id="TLS13Prop"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.tls13Label}" >
+        <sun:checkbox id="TLS13"  selected="#{pageSession.valueMap['tls13Enabled']}" selectedValue="true"/>
+     </sun:property>
+
      <sun:property id="ClientAuthProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.ssl.clientAuthLabel}" helpText="$resource{i18n.ssl.clientAuthHelp}" >
         <sun:checkbox id="ClientAuth"  selected="#{pageSession.valueMap['clientAuthEnabled']}" selectedValue="true" />
      </sun:property>

diff --git a/appserver/admingui/common/src/main/resources/shared/sslPrepare.inc b/appserver/admingui/common/src/main/resources/shared/sslPrepare.inc
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation
     Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -47,7 +48,7 @@ if (! #{requestScope.exist}){
 }
 
 //set the following for including buttons.inc
-setPageSessionAttribute(key="convertToFalseList" value={"ssl3Enabled" "tlsEnabled" "clientAuthEnabled" })
+setPageSessionAttribute(key="convertToFalseList" value={"ssl3Enabled" "tlsEnabled" "tls11Enabled" "tls12Enabled" "tls13Enabled" "clientAuthEnabled" })
 setPageSessionAttribute(key="skipAttrsList", value={"sslInactivityTimeout"});
 setPageSessionAttribute(key="showDefaultButton" value="#{false}" )
 setPageSessionAttribute(key="hasPropertySheet" value="#{true}" )

diff --git a/appserver/admingui/common/src/main/resources/shared/sslValidationsJS.inc b/appserver/admingui/common/src/main/resources/shared/sslValidationsJS.inc
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation
     Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -29,11 +30,11 @@
         var bitField = document.getElementById('#{cipherId}:OtherCiphersProp:otherAddRemove').selectedValues.value; \
         var eccField = document.getElementById('#{cipherId}:EccCiphersProp:eccAddRemove').selectedValues.value; \
         var ssl3Prop = document.getElementById('#{sheetId}:SSL3Prop:SSL3').checked; \
-        if(document.getElementById('#{sheetId}:SSL2Prop:SSL2')) { \
-           var ssl2Prop = document.getElementById('#{sheetId}:SSL2Prop:SSL2').checked; \
-        } \
         var tlsProp = document.getElementById('#{sheetId}:TLSProp:TLS').checked; \
-        if (ssl3Prop || tlsProp || ssl2Prop) {   \
+        var tls11Prop = document.getElementById('#{sheetId}:TLS11Prop:TLS11').checked; \
+        var tls12Prop = document.getElementById('#{sheetId}:TLS12Prop:TLS12').checked; \
+        var tls13Prop = document.getElementById('#{sheetId}:TLS13Prop:TLS13').checked; \
+        if (ssl3Prop || tlsProp || tls11Prop || tls12Prop || tls13Prop) {   \
             var result = checkForValue(getTextElement('#{sheetId}:CertNicknameProp:CertNickname'));  \
             if(result != true){ \
                 return showAlert('$resource{i18n.msg.JS.ssl.errSslTlsCert}'); \

diff --git a/appserver/admingui/core/src/main/resources/org/glassfish/admingui/core/Strings.properties b/appserver/admingui/core/src/main/resources/org/glassfish/admingui/core/Strings.properties
@@ -1080,8 +1080,10 @@ ssl.clientAuthHelp=Requires the client to authenticate itself to the server.
 ssl.certNicknameLabel=Certificate NickName:
 ssl.certNicknameHelp=Takes a single value, identifies the server's keypair and certificate.
 ssl.ssl3TlsSettingsLabel=SSL3/TLS
-ssl.ssl3Label=SSL3:
-ssl.tlsLabel=TLS:
+ssl.tlsLabel=TLS1.0:
+ssl.tls11Label=TLS1.1:
+ssl.tls12Label=TLS1.2:
+ssl.tls13Label=TLS1.3:
 ssl.ciphersLabel=Cipher Suites:
 ssl.ciphersHelp=If no cipher suite is added, ALL cipher suites are chosen.
 ssl.commonCiphersLabel=Common Cipher Suites:

diff --git a/appserver/admingui/web/src/main/help/en/help/ref-protocolssledit.html b/appserver/admingui/web/src/main/help/en/help/ref-protocolssledit.html
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation
     Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -28,13 +29,21 @@ <h4><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></
 <dd>
 <p>The name of the configuration to which the settings on this page apply. This field is read only.</p>
 </dd>
-<dt>SSL3</dt>
+<dt>TLS1.0</dt>
 <dd>
-<p>If this checkbox is selected, the SSL3 protocol is enabled for the protocol. This option is enabled by default.</p>
+<p>If this checkbox is selected, the TLS1.0 protocol is enabled for the protocol. This option is enabled by default.</p>
 </dd>
-<dt>TLS</dt>
+<dt>TLS1.1</dt>
 <dd>
-<p>If this checkbox is selected, the TLS protocol is enabled for the protocol. This option is enabled by default.</p>
+<p>If this checkbox is selected, the TLS1.1 protocol is enabled for the protocol. This option is enabled by default.</p>
+</dd>
+<dt>TLS1.2</dt>
+<dd>
+<p>If this checkbox is selected, the TLS1.2 protocol is enabled for the protocol. This option is enabled by default.</p>
+</dd>
+<dt>TLS1.3</dt>
+<dd>
+<p>If this checkbox is selected, the TLS1.3 protocol is enabled for the protocol. This option is enabled by default.</p>
 </dd>
 <dt>Client Authentication</dt>
 <dd>

diff --git a/appserver/admingui/web/src/main/help/en/help/task-protocolssledit.html b/appserver/admingui/web/src/main/help/en/help/task-protocolssledit.html
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation
     Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -42,11 +43,19 @@ <h5>Before You Begin</h5>
 <p>The SSL page opens.</p>
 </li>
 <li>
-<p>Select the SSL3 Enabled checkbox to enable SSL3.</p>
+<p>Select the TLS1.0 Enabled checkbox to enable Transport Layer Security 1.0(TLS1.0).</p>
 <p>This option is enabled by default.</p>
 </li>
 <li>
-<p>Select the TLS Enabled checkbox to enable Transport Layer Security (TLS).</p>
+<p>Select the TLS1.1 Enabled checkbox to enable Transport Layer Security 1.1(TLS1.1).</p>
+<p>This option is enabled by default.</p>
+</li>
+<li>
+<p>Select the TLS1.2 Enabled checkbox to enable Transport Layer Security 1.2(TLS1.2).</p>
+<p>This option is enabled by default.</p>
+</li>
+<li>
+<p>Select the TLS1.3 Enabled checkbox to enable Transport Layer Security 1.3(TLS1.3).</p>
 <p>This option is enabled by default.</p>
 </li>
 <li>