Merge pull request #6954 from Pandrex247/Main-Sync-16-09-2024

Main Sync 16/09/2024
payara · Sep 27, 2024 · c8141b5 · c8141b5
2 parents 586b22a + 782e2a9
commit c8141b5
Show file tree

Hide file tree

Showing 40 changed files with 221 additions and 111 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -198,10 +198,10 @@ pipeline {
 //                         sh "rm -rf /tmp/cargo*"
 //
 //                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-//                         sh """mvn -B -V -ff -e clean install --strict-checksums -Dsurefire.useFile=false \
-//                         -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
-//                         -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \
-//                         -Ppayara-server-remote -DtrimStackTrace=false"""
+//                         sh  """mvn -B -V -ff -e clean verify --strict-checksums -Dsurefire.useFile=false \
+//                          -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
+//                          -Djavax.xml.accessExternalSchema=all \
+//                          -Ppayara-server-remote -DtrimStackTrace=false"""
 //                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 //                     }
 //                     post {

diff --git a/...er/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/...er/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright 2018-2022 Payara Foundation and/or affiliates
+// Portions Copyright 2018-2024 Payara Foundation and/or affiliates
 
 /*
  * UtilHandlers.java
@@ -1164,4 +1164,16 @@ public static String escapePropertyValue(String str){
     }
 
     private static final String PATH_SEPARATOR = "${path.separator}";
+
+    @Handler(id = "gf.sanitiseProperty",
+            input = {
+                    @HandlerInput(name = "systemProperty", type = String.class, required = true)
+            },
+            output = {
+                    @HandlerOutput(name = "result", type = String.class)
+            }
+    )
+    public static void sanitiseProperty(HandlerContext handlerCtx) {
+        handlerCtx.setOutputValue("result", escapePropertyValue(((String)handlerCtx.getInputValue("systemProperty"))));
+    }
 }
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2017-2021] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2017-2024] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.admingui.common.util;
 
@@ -190,12 +190,12 @@ public static Map<String, Object> restRequest(String endpoint, Map<String, Objec
         Logger logger = GuiUtil.getLogger();
         if (logger.isLoggable(Level.FINEST)) {
             Map<String, Object> maskedAttr = maskOffPassword(attrs);
-            logger.log(Level.FINEST,
-                       GuiUtil.getCommonMessage("LOG_REST_REQUEST_INFO",
-                                                new Object[]{
-                        endpoint,
-                        (useData && "post".equals(method)) ? data : attrs, method
-                    }));
+            logger.log(Level.FINEST, GuiUtil.getCommonMessage("LOG_REST_REQUEST_INFO",
+                new Object[]{
+                    endpoint,
+                    (useData && "post".equals(method)) ? data : maskedAttr, method
+                })
+            );
         }
 
         // Execute the request...

diff --git a/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf b/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf
@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2020] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2020-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <!initPage
@@ -59,8 +59,8 @@
             setPageSessionAttribute(key="selfUrl", value="#{pageSession.parentUrl}/system-properties");
             gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/system-property/#{pageSession.propName}", 
             method="get", result="#{requestScope.result}");
-            setPageSessionAttribute(key="defaultValue", value="#{requestScope.result.data.extraProperties.entity.value}");
-
+            gf.sanitiseProperty(systemProperty="#{requestScope.result.data.extraProperties.entity.value}", result="#{currentVal}");
+            setPageSessionAttribute(key="defaultValue", value="#{currentVal}");
             // Get instance to cluster mapping
             createMap(result="#{requestScope.instanceMapping}");
             gf.restRequest(endpoint="#{sessionScope.REST_URL}/clusters/cluster", method="get", result="#{requestScope.clusterResult}");

diff --git a/appserver/admingui/common/src/main/resources/configuration/systemProperties.jsf b/appserver/admingui/common/src/main/resources/configuration/systemProperties.jsf
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <sun:table id="sysPropsTable" style="padding: 10pt" title="$resource{i18n.common.AdditionalProperties}"
@@ -62,7 +63,8 @@
         foreach(var="prop", list="#{pageSession.sysProps}") {
             createMap(result="#{row}");
             mapPut(map="#{row}", key="name", value="#{prop.name}");
-            mapPut(map="#{row}", key="currentValue", value="#{!empty prop.value ? prop.value : prop.defaultValue}");
+            gf.sanitiseProperty(systemProperty="#{!empty prop.value ? prop.value : prop.defaultValue}", result="#{currentVal}");
+            mapPut(map="#{row}", key="currentValue", value="#{currentVal}");
             mapPut(map="#{row}", key="overrideValue", value="#{!empty prop.value ? prop.value : ''}");
             listAdd(list="#{pageSession.tableList}", value="#{row}");
         }

diff --git a/appserver/admingui/corba/src/main/resources/iiopServerPageNode.jsf b/appserver/admingui/corba/src/main/resources/iiopServerPageNode.jsf
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <!-- iiopServerPageNode.jsf -->
@@ -59,6 +60,8 @@
             listAdd(value="#{pageSession.iiopListenerAttrs.data.extraProperties.entity['port']}" list="#{pageSession.iiopPortsList}");
         }
         gf.resolveTokens(tokens="#{pageSession.iiopPortsList}" endPoint="#{sessionScope.REST_URL}/servers/server/#{pageSession.instanceName}" resolvedTokens="#{pageSession.iiopResolvedPortsList}");
-        convertListToCommaString(list="#{pageSession.iiopResolvedPortsList}" commaString="#{pageSession.iiopPorts}");
+        convertListToCommaString(list="#{pageSession.iiopResolvedPortsList}" commaString="#{iiopPorts}");
+        gf.sanitiseProperty(systemProperty="#{iiopPorts}", result="#{pageSession.iiopPorts}");
+
     />
 </sun:property> 
diff --git a/...-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java b/...-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
@@ -1,4 +1,4 @@
-/* 
+/*
  *     Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  * 
  *     The contents of this file are subject to the terms of either the GNU
@@ -164,13 +164,14 @@ public static void sendAsadminCommandToSelectedInstances(HandlerContext handlerC
             command = splitCommand[0];
 
             // Convert the parameters into a space-separated string
-            String parameters = "";
+            String parameters;
+            StringBuilder paramBuilder = new StringBuilder();
             for (int i = 1; i < splitCommand.length; i++) {
-                parameters += splitCommand[i] + " ";
+                paramBuilder.append(splitCommand[i]).append(" ");
             }
 
             // Remove any trailing spaces
-            parameters = parameters.trim();
+            parameters = paramBuilder.toString().trim();
 
             // Get the parameters from each row, and send the asadmin command
             for (Map row : selectedRows) {

diff --git a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <sun:tabSet id="listenerTabs" immediate="$boolean{true}" selected="#{sessionScope.httpListenerTabs}">
     <sun:tab id="generalTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.networkListener.listenerTab}" toolTip="$resource{i18n_web.grizzly.networkListener.listenerTab} Tab" >
@@ -47,7 +48,10 @@
         gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" rendered="#{pageSession.protocolMap['securityEnabled']}">
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedProtocolName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="httpListenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerSSL.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");

diff --git a/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc b/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <!-- grizzly/listenerTabs.inc -->
 
@@ -49,7 +50,10 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab and empty pageSession.protocolMap['securityEnabled'] ? true : pageSession.protocolMap['securityEnabled']}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="listenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/listenerSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");

diff --git a/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc b/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <!-- grizzly/protocolTabs.jsf -->
 
@@ -49,7 +50,10 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab and empty pageSession.protocolMap['securityEnabled'] ? true : pageSession.protocolMap['securityEnabled']}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="protocolTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");

diff --git a/appserver/admingui/web/src/main/resources/serverPageNode.jsf b/appserver/admingui/web/src/main/resources/serverPageNode.jsf
@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2018] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <!-- serverPageNode.jsf -->
@@ -60,6 +60,7 @@
             listAdd(value="#{pageSession.tmpPort}" list="#{pageSession.httpPortsList}");
         }
         gf.resolveTokens(tokens="#{pageSession.httpPortsList}" endPoint="#{sessionScope.REST_URL}/servers/server/#{pageSession.instanceName}" resolvedTokens="#{pageSession.httpResolvedPortsList}");
-        convertListToCommaString(list="#{pageSession.httpResolvedPortsList}" commaString="#{pageSession.httpPorts}");
+        convertListToCommaString(list="#{pageSession.httpResolvedPortsList}" commaString="#{portList}");
+        gf.sanitiseProperty(systemProperty="#{portList}", result="#{pageSession.httpPorts}");
     />
 </sun:property> 
diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml
@@ -57,7 +57,7 @@
         <docker.noCache>true</docker.noCache>
 
         <docker.java.repository>azul/zulu-openjdk</docker.java.repository>
-        <docker.jdk21.tag>21.0.3-jdk</docker.jdk21.tag>
+        <docker.jdk21.tag>21.0.4-jdk</docker.jdk21.tag>
 
         <!-- List of platform architectures which we wish to build Docker images for -
                 shouldn't have anything not provided as an option by ${docker.java.repository}.
@@ -87,7 +87,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.44.0</version>
+                    <version>0.45.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <verbose>true</verbose>

diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.19.7</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
             <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -85,7 +85,7 @@
         <nimbus-jose-jwt.version>9.40</nimbus-jose-jwt.version>
         <accessors-smart.version>2.5.1</accessors-smart.version>
         <json-smart.version>2.5.1</json-smart.version>
-        <reactor-core.version>3.6.8</reactor-core.version>
+        <reactor-core.version>3.6.9</reactor-core.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <jcip-annotations.version>1.0-1</jcip-annotations.version>
 

diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.2.5</version>
+        <version>3.5.0</version>
         <configuration>
           <useSystemClassLoader>false</useSystemClassLoader>
           <forkCount>0</forkCount>
@@ -186,7 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>integration-test</id>

diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml
@@ -307,7 +307,7 @@
             <dependency>
                 <groupId>org.jboss.shrinkwrap.resolver</groupId>
                 <artifactId>shrinkwrap-resolver-bom</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -347,7 +347,7 @@
             <dependency>
                 <groupId>io.smallrye.config</groupId>
                 <artifactId>smallrye-config-repackaged</artifactId>
-                <version>3.9.0</version>
+                <version>3.9.1</version>
                 <classifier>jakartaee9</classifier>
                 <scope>test</scope>
                 <exclusions>

diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml
@@ -47,7 +47,7 @@
     </parent>
     <groupId>io.smallrye.config</groupId>
     <artifactId>smallrye-config-repackaged</artifactId>
-    <version>3.9.0</version>
+    <version>3.9.1</version>
     <name>Payara Samples - Payara - smallrye-config repackaged as a module</name>
 
     <build>
@@ -140,19 +140,19 @@
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-annotation</artifactId>
-            <version>2.5.0</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-expression</artifactId>
-            <version>2.5.0</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-function</artifactId>
-            <version>1.8.0</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml
@@ -41,7 +41,7 @@
     </parent>
 
     <properties>
-      <playwright.version>1.45.0</playwright.version>
+      <playwright.version>1.46.0</playwright.version>
     </properties>
 
 
@@ -80,7 +80,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.4.1</version>
                         <executions>
                           <execution>
                             <id>install-playwright-dependencies</id>

diff --git a/appserver/tests/payara-samples/samples/concurrency/pom.xml b/appserver/tests/payara-samples/samples/concurrency/pom.xml
@@ -58,10 +58,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <arquillian-bom.version>1.9.1.Final</arquillian-bom.version>
-        <junit-jupiter.version>5.10.3</junit-jupiter.version>
+        <junit-jupiter.version>5.11.0</junit-jupiter.version>
         <arquillian-payara.version>3.0.alpha4</arquillian-payara.version>
         <jakarta-concurrent.version>3.0.3</jakarta-concurrent.version>
-        <shrinkwrap.version>3.3.0</shrinkwrap.version>
+        <shrinkwrap.version>3.3.1</shrinkwrap.version>
     </properties>
 
     <dependencyManagement>
@@ -138,7 +138,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.5.0</version>
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>