Skip to content

Commit 7b71b56

Browse files
lprimaklprimak
committed
Merge branch 'main' into jandex-deploy
2 parents 6ca54a4 + e88ed09 commit 7b71b56

File tree

53 files changed

+944
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+944
-135
lines changed

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Payara Community Forum
4-
url: http://www.payara.org/forum
3+
- name: Payara Forum
4+
url: https://forum.payara.fish/
55
about: Please ask and answer questions about the Payara Platform here.
66
- name: Security Issues
77
url: https://mailxto.com/smwknx

‎appserver/admin/gf_template/src/main/resources/config/domain.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@
222222
<jvm-options>[17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
223223
<jvm-options>[17|]--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
224224
<jvm-options>[21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvm-options>
225+
<jvm-options>[24|]--sun-misc-unsafe-memory-access=allow</jvm-options>
226+
<jvm-options>[24|]--enable-native-access=ALL-UNNAMED</jvm-options>
225227
<jvm-options>-Xmx512m</jvm-options>
226228
<jvm-options>-XX:NewRatio=2</jvm-options>
227229
<jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>
@@ -461,6 +463,8 @@
461463
<jvm-options>[17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
462464
<jvm-options>[17|]--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
463465
<jvm-options>[21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvm-options>
466+
<jvm-options>[24|]--sun-misc-unsafe-memory-access=allow</jvm-options>
467+
<jvm-options>[24|]--enable-native-access=ALL-UNNAMED</jvm-options>
464468
<jvm-options>-Xmx512m</jvm-options>
465469
<jvm-options>-XX:NewRatio=2</jvm-options>
466470
<jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>

‎appserver/admin/gf_template_web/src/main/resources/config/domain.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@
217217
<jvm-options>[17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
218218
<jvm-options>[17|]--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
219219
<jvm-options>[21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvm-options>
220+
<jvm-options>[24|]--sun-misc-unsafe-memory-access=allow</jvm-options>
221+
<jvm-options>[24|]--enable-native-access=ALL-UNNAMED</jvm-options>
220222
<jvm-options>-Xmx512m</jvm-options>
221223
<jvm-options>-XX:NewRatio=2</jvm-options>
222224
<jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>
@@ -451,6 +453,8 @@
451453
<jvm-options>[17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
452454
<jvm-options>[17|]--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
453455
<jvm-options>[21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvm-options>
456+
<jvm-options>[24|]--sun-misc-unsafe-memory-access=allow</jvm-options>
457+
<jvm-options>[24|]--enable-native-access=ALL-UNNAMED</jvm-options>
454458
<jvm-options>-Xmx512m</jvm-options>
455459
<jvm-options>-XX:NewRatio=2</jvm-options>
456460
<jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>

‎appserver/admingui/cluster-l10n/src/main/resources/org/glassfish/cluster/admingui/Strings_de.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ dg.SelectedInstances=Selected Instances
107107
clusterNew.DG=Deployment Group
108108
clusterNew.DGHelp=Choose a deployment group for the instance
109109
clusters.PageTitle=Clusters (Deprecated)
110-
clusters.PageTitleHelp=Create and manage Payara Server clusters. A cluster is a named collection of Payara Server instances that provides high availability through scalability, load balancing, and failure protection.<br/>Clusters are deprecated in Payara 5 and we recommend you migrate to Deployment Groups
110+
clusters.PageTitleHelp=Create and manage Payara Server clusters. A cluster is a named collection of Payara Server instances that provides high availability through scalability, load balancing, and failure protection.<br/>Clusters are deprecated since Payara 5 and we recommend you migrate to Deployment Groups
111111
clusters.TableTitle=Deprecated Clusters
112112
clusters.instanceCol=Instances
113113
cluster.error.start-cluster=When trying to start the following clusters:

‎appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dg.SelectedInstances=Selected Instances
104104
clusterNew.DG=Deployment Group
105105
clusterNew.DGHelp=Choose a deployment group for the instance
106106
clusters.PageTitle=Clusters (Deprecated)
107-
clusters.PageTitleHelp=Create and manage Payara Server clusters. A cluster is a named collection of Payara Server instances that provides high availability through scalability, load balancing, and failure protection.<br/>Clusters are deprecated in Payara 5 and we recommend you migrate to Deployment Groups
107+
clusters.PageTitleHelp=Create and manage Payara Server clusters. A cluster is a named collection of Payara Server instances that provides high availability through scalability, load balancing, and failure protection.<br/>Clusters are deprecated since Payara 5 and we recommend you migrate to Deployment Groups
108108
clusters.TableTitle=Deprecated Clusters
109109
clusters.instanceCol=Instances
110110
cluster.error.start-cluster=When trying to start the following clusters:

‎appserver/admingui/common/src/main/java/org/glassfish/admingui/common/security/AdminConsoleAuthModule.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class AdminConsoleAuthModule implements ServerAuthModule {
9999

100100
private static final String SAVED_SUBJECT = "Saved_Subject";
101101
private static final String USER_NAME = "userName";
102-
private static final String ORIG_REQUEST_PATH = "origRequestPath";
102+
private static final String ORIG_REQUEST_PATH = "__origRequestPath";
103103
private static final String RESPONSE_TYPE = "application/json";
104104

105105
/**
@@ -369,6 +369,9 @@ private AuthStatus redirectBack(HttpSession session, HttpServletRequest request,
369369
try {
370370
// Redirect...
371371
String origRequest = (String) session.getAttribute(ORIG_REQUEST_PATH);
372+
//clear session attribute for security reason
373+
session.removeAttribute(ORIG_REQUEST_PATH);
374+
372375
// Explicitly test for favicon.ico, as Firefox seems to ask for this on
373376
// every page
374377
if (origRequest == null || "/favicon.ico".equals(origRequest)) {

‎appserver/admingui/web/src/main/resources/configuration/virtualServerAttrs.inc‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
holder.
4040
4141
-->
42+
<!-- Portions Copyright 2025 Payara Foundation and/or its affiliates -->
4243

4344
<!-- web/configuration/virtualServerAttrs.inc -->
4445
#include "/common/applications/applicationHandlers.inc"
@@ -69,6 +70,17 @@
6970
<sun:checkbox label="$resource{i18n.common.Enabled}" selected="#{pageSession.valueMap['ssoCookieHttpOnly']}" selectedValue="true" />
7071
</sun:property>
7172

73+
<sun:property id="sessionCookieHttpOnly" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.vs.sessionCookieHttpOnly}" helpText="$resource{i18n_web.vs.sessionCookieHttpOnlyHelp}">
74+
<sun:checkbox label="$resource{i18n.common.Enabled}" selected="#{pageSession.valueMap['sessionCookieHttpOnly']}" selectedValue="true" />
75+
</sun:property>
76+
77+
# <sun:property id="sessionCookieSecure" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.vs.sessionCookieSecure}" helpText="$resource{i18n_web.vs.sessionCookieSecureHelp}">
78+
# <sun:checkbox label="$resource{i18n.common.Enabled}" selected="#{pageSession.valueMap['sessionCookieSecure']}" selectedValue="true" />
79+
# </sun:property>
80+
<sun:property id="sessionCookieSecure" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.vs.sessionCookieSecure}" helpText="$resource{i18n_web.vs.sessionCookieSecureHelp}">
81+
<sun:dropDown id="cookieSecure" selected="#{pageSession.valueMap['sessionCookieSecure']}" labels={"$resource{i18n_web.vs.sessionCookieSecure.dynamic}","$resource{i18n_web.vs.alwaysEnable}","$resource{i18n_web.vs.alwaysDisable}"} values={"dynamic","true","false"} />
82+
</sun:property>
83+
7284
<sun:property id="nwProps" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.vs.NetworkListeners}" helpText="$resource{i18n_web.vs.NetworkListenersHelp}">
7385
<sun:listbox id="nw" immediate="#{true}" multiple="#{true}" rows="$int{4}"
7486
labels="$pageSession{availableNetworkListeners}"

‎appserver/admingui/web/src/main/resources/configuration/virtualServerButtons.inc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
holder.
4040
4141
-->
42+
<!-- Portions Copyright 2025 Payara Foundation and/or its affiliates -->
4243

4344
<!-- configuration/virtualServerButtons.inc -->
4445
#include "/common/shared/commonHandlers.inc"
@@ -83,7 +84,7 @@
8384
convertToFalse="#{pageSession.convertToFalseList}"
8485
onlyUseAttrs="#{pageSession.onlyUseAttrs}"
8586
);
86-
setPageSessionAttribute(key="onlyUseAttrs" value={"ssoEnabled", "ssoCookieHttpOnly", "accessLoggingEnabled", "docroot", "accessLog"})
87+
setPageSessionAttribute(key="onlyUseAttrs" value={"ssoEnabled", "ssoCookieHttpOnly", "sessionCookieHttpOnly", "sessionCookieSecure", "accessLoggingEnabled", "docroot", "accessLog"})
8788
gf.createEntity(endpoint="#{pageSession.selfUrl}/#{pageSession.valueMap['id']}"
8889
attrs="#{pageSession.valueMap}"
8990
onlyUseAttrs="#{pageSession.onlyUseAttrs}"

‎appserver/admingui/web/src/main/resources/configuration/virtualServerEdit.jsf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
holder.
4040

4141
-->
42+
<!-- Portions Copyright 2025 Payara Foundation and/or its affiliates -->
4243

4344
<!-- configuration/virtualServerEdit.jsf -->
4445

@@ -65,7 +66,8 @@
6566
gf.getEntityAttrs(endpoint="#{pageSession.selfUrl}.json", valueMap="#{pageSession.valueMap}");
6667
gf.restRequest(endpoint="#{pageSession.selfUrl}/property.json" method="GET" result="#{requestScope.propTable}");
6768
setPageSessionAttribute(key="tableList" value="#{requestScope.propTable.data.extraProperties.properties}");
68-
setPageSessionAttribute(key="convertToFalseList" value={"ssoCookieHttpOnly"});
69+
setPageSessionAttribute(key="convertToFalseList" value={"ssoCookieHttpOnly", "sessionCookieHttpOnly"});
70+
setPageSessionAttribute(key="sessionCookieSecure" value="dynamic");
6971
//set the following for including buttons.inc
7072
setPageSessionAttribute(key="edit" value="#{true}" );
7173
setPageSessionAttribute(key="showDefaultButton" value="#{true}" );

‎appserver/admingui/web/src/main/resources/configuration/virtualServerNew.jsf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
holder.
4040

4141
-->
42+
<!-- Portions Copyright 2025 Payara Foundation and/or its affiliates -->
4243

4344
<!-- configuration/virtualServerNew.jsf" -->
4445

@@ -63,7 +64,8 @@
6364
mapPut(map="#{pageSession.valueMap}" key="ssoEnabled" value="inherit");
6465
mapPut(map="#{pageSession.valueMap}" key="accessLoggingEnabled" value="inherit");
6566
mapPut(map="#{pageSession.valueMap}" key="accessLog" value="");
66-
setPageSessionAttribute(key="convertToFalseList" value={"ssoCookieHttpOnly"});
67+
setPageSessionAttribute(key="convertToFalseList" value={"ssoCookieHttpOnly", "sessionCookieHttpOnly"});
68+
setPageSessionAttribute(key="sessionCookieSecure" value="dynamic");
6769
setPageSessionAttribute(key="edit" value="#{false}" );
6870
setPageSessionAttribute(key="showDefaultButton" value="#{true}" );
6971
setPageSessionAttribute(key="showCancelButton" value="#{true}" );

0 commit comments

Comments
 (0)