Fixes #21716: IIOP Listener SSL page is not displaying new button (#22123)

Author: srinivaskrishnan

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java

@@ -193,6 +193,37 @@ public static void createEntity(HandlerContext handlerCtx) {
         handlerCtx.setOutputValue("result", endpoint);
     }
 
+    /**
+     *
+     * REST-based version of createProxy
+     * @param handlerCtx
+     */
+    @Handler(id = "gf.createEntityResponseOutput",
+            input = {
+                    @HandlerInput(name = "endpoint", type = String.class, required = true),
+                    @HandlerInput(name = "attrs", type = Map.class, required = true),
+                    @HandlerInput(name = "skipAttrs", type = List.class),
+                    @HandlerInput(name = "onlyUseAttrs", type = List.class),
+                    @HandlerInput(name = "convertToFalse", type = List.class),
+                    @HandlerInput(name = "throwException", type = boolean.class, defaultValue = "true")},
+            output = {
+                    @HandlerOutput(name = "result", type = Map.class)
+            })
+    public static void createEntityResponseOutput(HandlerContext handlerCtx) {
+        Map<String, Object> attrs = (Map) handlerCtx.getInputValue("attrs");
+        if (attrs == null) {
+            attrs = new HashMap<String, Object>();
+        }
+        String endpoint = (String) handlerCtx.getInputValue("endpoint");
+
+        RestResponse response  = sendCreateRequest(endpoint, attrs, (List) handlerCtx.getInputValue("skipAttrs"),
+                (List) handlerCtx.getInputValue("onlyUseAttrs"), (List) handlerCtx.getInputValue("convertToFalse"));
+
+        boolean throwException = (Boolean) handlerCtx.getInputValue("throwException");
+        parseResponse(response, handlerCtx, endpoint, attrs, false, throwException);
+        handlerCtx.setOutputValue("result", response.getResponse());
+    }
+
     /**
      *        <p> This handler can be used to execute a generic REST request.  It
      *            will return a Java data structure based on the response of the

appserver/admingui/corba/src/main/resources/sslEdit.jsf

@@ -65,7 +65,9 @@
         setPageSessionAttribute(key="createSslUrl", value="#{pageSession.parentUrl}/create-ssl");
         createMap(result="#{pageSession.createMap}");
         mapPut(map="#{pageSession.createMap}" key="target" value="#{pageSession.configName}");
-#include "/common/shared/sslPrepare.inc"
+<!-- This is a workaround for issue 21716 and can be reverted once REST issue 22134 is fixed -->
+<!-- #include "/common/shared/sslPrepare.inc" -->
+#include "sslPrepare-copy.inc"
       />
   </event>
 

appserver/admingui/corba/src/main/resources/sslPrepare-copy.inc

@@ -0,0 +1,81 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://oss.oracle.com/licenses/CDDL+GPL-1.1
+    or LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+-->
+
+<!-- sslPrepare-copy.inc  -->
+
+setPageSessionAttribute(key="edit" value="#{true}" )
+gf.getEntityAttrs(endpoint="#{pageSession.selfUrl}.json" valueMap="#{pageSession.valueMap}");
+gf.createEntityResponseOutput(endpoint="#{pageSession.selfUrl}" attrs="#{pageSession.valueMap}" throwException="false" result="#{pageSession.resultMap}");
+if ("#{pageSession.resultMap.data.exit_code}=FAILURE") {
+    setPageSessionAttribute(key="edit" value="#{false}" )
+}
+if (#{pageSession.edit}){
+    gf.getEntityAttrs(endpoint="#{pageSession.selfUrl}.json" valueMap="#{pageSession.valueMap}");
+    convertToDifferentCiphersGroup(ciphers="#{pageSession.valueMap['ssl3TlsCiphers']}"
+        CommonCiphersList="#{pageSession.selectedCommon}"
+        EphemeralCiphersList="#{pageSession.selectedEphemeral}"
+        OtherCiphersList="#{pageSession.selectedOther}"
+        EccCiphersList="#{pageSession.selectedEcc}")
+
+}
+if (! #{pageSession.edit}){
+    <!-- this <ssl> does not exists, we cannot find a way to get the default value, so hard coded here for now.
+         TODO: REST need to provide an endpoint to get the default value.
+      -->
+    createMap(result="#{pageSession.valueMap}");
+    mapPut(map="#{pageSession.valueMap}" key="ssl3Enabled" value="true");
+    mapPut(map="#{pageSession.valueMap}" key="tlsEnabled" value="true");
+    mapPut(map="#{pageSession.valueMap}" key="trustMaxCertLength" value="5");
+
+    convertToDifferentCiphersGroup(ciphers="#{pageSession.valueMap['ssl3TlsCiphers']}"
+        CommonCiphersList="#{pageSession.selectedCommon}"
+        EphemeralCiphersList="#{pageSession.selectedEphemeral}"
+        OtherCiphersList="#{pageSession.selectedOther}"
+        EccCiphersList="#{pageSession.selectedEcc}")
+}
+
+//set the following for including buttons.inc
+setPageSessionAttribute(key="convertToFalseList" value={"ssl3Enabled" "tlsEnabled" "clientAuthEnabled" })
+setPageSessionAttribute(key="skipAttrsList", value={"sslInactivityTimeout"});
+setPageSessionAttribute(key="showDefaultButton" value="#{false}" )
+setPageSessionAttribute(key="hasPropertySheet" value="#{true}" )
+setPageSessionAttribute(key="hasPropertyTable" value="#{false}" )

appserver/admingui/devtests/src/test/java/org/glassfish/admingui/devtests/IiopListenerTest.java

@@ -109,4 +109,41 @@ public void testORB() {
         //assertEquals("1024", getFieldValue("form1:propertySheet:propertySectionTextField:TotalConnsProp:TotalConns"));
         //assertEquals("1024", getFieldValue("form1:propertySheet:propertySectionTextField:MaxMsgSizeProp:MaxMsgSize"));
     }
+
+    @Test
+    public void testSSLIiopListener() {
+        final String iiopName = "testIiopListener" + generateRandomString();
+        final String networkAddress = "0.0.0.0";
+        final String listenerPort = Integer.toString(generateRandomNumber(32768));;
+        final String certName = "s1as";
+
+        clickAndWait("treeForm:tree:configurations:server-config:orb:iiopListeners:iiopListeners_link", TRIGGER_IIOP_LISTENERS);
+        clickAndWait("propertyForm:configs:topActionsGroup1:newButton", TRIGGER_NEW_IIOP_LISTENER);
+        setFieldValue("propertyForm:propertySheet:generalSettingsSetion:IiopNameTextProp:IiopNameText", iiopName);
+        setFieldValue("propertyForm:propertySheet:generalSettingsSetion:NetwkAddrProp:NetwkAddr", networkAddress);
+        setFieldValue("propertyForm:propertySheet:generalSettingsSetion:ListenerPortProp:ListenerPort", listenerPort);
+
+        int count = addTableRow("propertyForm:basicTable", "propertyForm:basicTable:topActionsGroup1:addSharedTableButton");
+        setFieldValue("propertyForm:basicTable:rowGroup1:0:col2:col1St", "a");
+        setFieldValue("propertyForm:basicTable:rowGroup1:0:col3:col1St", "b");
+        setFieldValue("propertyForm:basicTable:rowGroup1:0:col4:col1St", "c");
+        clickAndWait("propertyForm:propertyContentPage:topButtons:newButton", TRIGGER_IIOP_LISTENERS);
+        assertTrue(isTextPresent(iiopName));
+
+        clickAndWait(getLinkIdByLinkText("propertyForm:configs", iiopName), TRIGGER_EDIT_IIOP_LISTENER);
+        assertEquals(networkAddress, getFieldValue("propertyForm:propertySheet:generalSettingsSetion:NetwkAddrProp:NetwkAddr"));
+        assertEquals(listenerPort, getFieldValue("propertyForm:propertySheet:generalSettingsSetion:ListenerPortProp:ListenerPort"));
+
+        assertTableRowCount("propertyForm:basicTable", count);
+
+        // access the SSL Page
+        clickAndWait("propertyForm:iiopTab:sslEdit", TRIGGER_EDIT_IIOP_SSL);
+        setFieldValue("propertyForm:propertySheet:propertySheetSection:CertNicknameProp:CertNickname", certName);
+        clickAndWait("propertyForm:propertyContentPage:topButtons:newButton", TRIGGER_NEW_VALUES_SAVED);
+        assertEquals(certName, getFieldValue("propertyForm:propertySheet:propertySheetSection:CertNicknameProp:CertNickname"));
+
+        clickAndWait("propertyForm:propertyContentPage:topButtons:cancelButton", TRIGGER_IIOP_LISTENERS);
+
+        deleteRow("propertyForm:configs:topActionsGroup1:button1", "propertyForm:configs", iiopName);
+    }
 }