(struts-examples) 01/01: Adjusts config to be compatible with Struts 7 stronger security
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/permission
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 90b7e6f8de37f59c2869b8f88d4afc9325db10b8
Author: Lukasz Lenart
AuthorDate: Thu Mar 6 11:02:13 2025 +0100
Adjusts config to be compatible with Struts 7 stronger security
---
.../org/apache/struts/edit/action/EditAction.java | 85 ++
control-tags/src/main/resources/struts.xml | 1 +
2 files changed, 41 insertions(+), 45 deletions(-)
diff --git
a/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
b/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
index 1e527b7..ef6f46c 100755
--- a/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
+++ b/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -5,6 +5,7 @@ import org.apache.struts.edit.model.State;
import org.apache.struts.edit.service.EditService;
import org.apache.struts.edit.service.EditServiceInMemory;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -18,61 +19,55 @@ import java.util.List;
*/
public class EditAction extends ActionSupport {
- private static final long serialVersionUID = 1L;
+private EditService editService = new EditServiceInMemory();
- private EditService editService = new EditServiceInMemory();
+private Person personBean;
+private String[] sports = {"football", "baseball", "basketball"};
+private String[] genders = {"male", "female", "not sure"};
+private List states;
+private String[] carModelsAvailable = {"Ford", "Chrysler", "Toyota",
"Nissan"};
- private Person personBean;
- private String [] sports = {"football", "baseball", "basketball" };
- private String [] genders = {"male", "female", "not sure" };
- private List states ;
- private String [] carModelsAvailable =
{"Ford","Chrysler","Toyota","Nissan"};
+public String save() throws Exception {
+editService.savePerson(getPersonBean());
- public String save() throws Exception {
- editService.savePerson( getPersonBean() );
+return SUCCESS;
+}
- return SUCCESS;
- }
+public String input() throws Exception {
+setPersonBean(editService.getPerson());
- public String input() throws Exception {
- setPersonBean( editService.getPerson() );
+return INPUT;
+}
- return INPUT;
- }
+@StrutsParameter(depth = 2)
+public Person getPersonBean() {
+return personBean;
+}
- public Person getPersonBean() {
- return personBean;
- }
+public void setPersonBean(Person person) {
+personBean = person;
+}
- public void setPersonBean(Person person) {
- personBean = person;
- }
+public List getSports() {
+return Arrays.asList(sports);
+}
- public List getSports() {
- return Arrays.asList(sports);
- }
+public List getGenders() {
+return Arrays.asList(genders);
+}
- public List getGenders() {
- return Arrays.asList(genders);
- }
+public List getStates() {
+states = new ArrayList<>();
+states.add(new State("AZ", "Arizona"));
+states.add(new State("CA", "California"));
+states.add(new State("FL", "Florida"));
+states.add(new State("KS", "Kansas"));
+states.add(new State("NY", "New York"));
+return states;
+}
-
- public List getStates() {
-
- states = new ArrayList<>();
- states.add( new State("AZ", "Arizona") );
- states.add( new State("CA", "California") );
- states.add( new State("FL", "Florida") );
- states.add( new State("KS", "Kansas") );
- states.add( new State("NY", "New York") );
-
- return states;
- }
-
-
-
- public String [] getCarModelsAvailable() {
- return carModelsAvailable;
- }
+public String[] getCarModelsAvailable() {
+return carModelsAvailable;
+}
}
diff --git a/control-tags/src/main/resources/struts.xml
b/control-tags/src/main/resources/struts.xml
index 750b70f..3473cb6 100755
--- a/control-tags/src/main/resources/struts.xml
+++ b/control-tags/src/main/resources/struts.xml
@@ -6,6 +6,7 @@
+
(struts-examples) 01/01: Adjusts config to be compatible with Struts 7 stronger security
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/permission
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 572c5202bfa0563c63ce346c67f92cbdf54ebd84
Author: Lukasz Lenart
AuthorDate: Thu Mar 6 11:02:13 2025 +0100
Adjusts config to be compatible with Struts 7 stronger security
---
.../org/apache/struts/edit/action/EditAction.java | 90 +++---
.../java/org/apache/struts/edit/model/Person.java | 134 ++---
.../java/org/apache/struts/edit/model/State.java | 58 -
.../apache/struts/edit/service/EditService.java| 4 +-
.../struts/edit/service/EditServiceInMemory.java | 67 +--
control-tags/src/main/resources/struts.xml | 1 +
6 files changed, 166 insertions(+), 188 deletions(-)
diff --git
a/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
b/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
index 1e527b7..c3235a0 100755
--- a/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
+++ b/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -5,74 +5,66 @@ import org.apache.struts.edit.model.State;
import org.apache.struts.edit.service.EditService;
import org.apache.struts.edit.service.EditServiceInMemory;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * Acts as a controller to handle actions
- * related to editing a Person.
- * @author bruce phillips
- *
+ * Acts as a controller to handle actions related to editing a Person.
*/
public class EditAction extends ActionSupport {
- private static final long serialVersionUID = 1L;
+private EditService editService = new EditServiceInMemory();
- private EditService editService = new EditServiceInMemory();
+private Person personBean;
+private String[] sports = {"football", "baseball", "basketball"};
+private String[] genders = {"male", "female", "not sure"};
+private List states;
+private String[] carModelsAvailable = {"Ford", "Chrysler", "Toyota",
"Nissan"};
- private Person personBean;
- private String [] sports = {"football", "baseball", "basketball" };
- private String [] genders = {"male", "female", "not sure" };
- private List states ;
- private String [] carModelsAvailable =
{"Ford","Chrysler","Toyota","Nissan"};
+public String save() throws Exception {
+editService.savePerson(getPersonBean());
- public String save() throws Exception {
- editService.savePerson( getPersonBean() );
+return SUCCESS;
+}
- return SUCCESS;
- }
+public String input() throws Exception {
+setPersonBean(editService.getPerson());
- public String input() throws Exception {
- setPersonBean( editService.getPerson() );
+return INPUT;
+}
- return INPUT;
- }
+@StrutsParameter(depth = 2)
+public Person getPersonBean() {
+return personBean;
+}
- public Person getPersonBean() {
- return personBean;
- }
+public void setPersonBean(Person person) {
+personBean = person;
+}
- public void setPersonBean(Person person) {
- personBean = person;
- }
+public List getSports() {
+return Arrays.asList(sports);
+}
- public List getSports() {
- return Arrays.asList(sports);
- }
+public List getGenders() {
+return Arrays.asList(genders);
+}
- public List getGenders() {
- return Arrays.asList(genders);
- }
+public List getStates() {
+states = new ArrayList<>();
+states.add(new State("AZ", "Arizona"));
+states.add(new State("CA", "California"));
+states.add(new State("FL", "Florida"));
+states.add(new State("KS", "Kansas"));
+states.add(new State("NY", "New York"));
+return states;
+}
-
- public List getStates() {
-
- states = new ArrayList<>();
- states.add( new State("AZ", "Arizona") );
- states.add( new State("CA", "California") );
- states.add( new State("FL", "Florida") );
- states.add( new State("KS", "Kansas") );
- states.add( new State("NY", "New York") );
-
- return states;
- }
-
-
-
- public String [] getCarModelsAvailable() {
- return carModelsAvailable;
- }
+public String[] getCarModelsAvailable() {
+return carModelsAvailable;
+}
}
diff --git
a/control-tags/src/main/java/org/apache/struts/edit/model/Person.java
b/control-tags/src/main/java/org/apache/struts/edit/model/Person.java
index ec80aaf..3bc12e7 100755
(struts-examples) branch fix/permission updated (90b7e6f -> 572c520)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/permission in repository https://gitbox.apache.org/repos/asf/struts-examples.git discard 90b7e6f Adjusts config to be compatible with Struts 7 stronger security new 572c520 Adjusts config to be compatible with Struts 7 stronger security This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (90b7e6f) \ N -- N -- N refs/heads/fix/permission (572c520) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/struts/edit/action/EditAction.java | 5 +- .../java/org/apache/struts/edit/model/Person.java | 134 ++--- .../java/org/apache/struts/edit/model/State.java | 58 - .../apache/struts/edit/service/EditService.java| 4 +- .../struts/edit/service/EditServiceInMemory.java | 67 +-- 5 files changed, 125 insertions(+), 143 deletions(-)
(struts-examples) branch main updated: Adjusts config to be compatible with Struts 7 stronger security (#426)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 57c91cd Adjusts config to be compatible with Struts 7 stronger
security (#426)
57c91cd is described below
commit 57c91cd157083296df7f4fb05a3d0e32f2885273
Author: Lukasz Lenart
AuthorDate: Thu Mar 6 11:04:34 2025 +0100
Adjusts config to be compatible with Struts 7 stronger security (#426)
---
.../org/apache/struts/edit/action/EditAction.java | 90 +++---
.../java/org/apache/struts/edit/model/Person.java | 134 ++---
.../java/org/apache/struts/edit/model/State.java | 58 -
.../apache/struts/edit/service/EditService.java| 4 +-
.../struts/edit/service/EditServiceInMemory.java | 67 +--
control-tags/src/main/resources/struts.xml | 1 +
6 files changed, 166 insertions(+), 188 deletions(-)
diff --git
a/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
b/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
index 1e527b7..c3235a0 100755
--- a/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
+++ b/control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -5,74 +5,66 @@ import org.apache.struts.edit.model.State;
import org.apache.struts.edit.service.EditService;
import org.apache.struts.edit.service.EditServiceInMemory;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * Acts as a controller to handle actions
- * related to editing a Person.
- * @author bruce phillips
- *
+ * Acts as a controller to handle actions related to editing a Person.
*/
public class EditAction extends ActionSupport {
- private static final long serialVersionUID = 1L;
+private EditService editService = new EditServiceInMemory();
- private EditService editService = new EditServiceInMemory();
+private Person personBean;
+private String[] sports = {"football", "baseball", "basketball"};
+private String[] genders = {"male", "female", "not sure"};
+private List states;
+private String[] carModelsAvailable = {"Ford", "Chrysler", "Toyota",
"Nissan"};
- private Person personBean;
- private String [] sports = {"football", "baseball", "basketball" };
- private String [] genders = {"male", "female", "not sure" };
- private List states ;
- private String [] carModelsAvailable =
{"Ford","Chrysler","Toyota","Nissan"};
+public String save() throws Exception {
+editService.savePerson(getPersonBean());
- public String save() throws Exception {
- editService.savePerson( getPersonBean() );
+return SUCCESS;
+}
- return SUCCESS;
- }
+public String input() throws Exception {
+setPersonBean(editService.getPerson());
- public String input() throws Exception {
- setPersonBean( editService.getPerson() );
+return INPUT;
+}
- return INPUT;
- }
+@StrutsParameter(depth = 2)
+public Person getPersonBean() {
+return personBean;
+}
- public Person getPersonBean() {
- return personBean;
- }
+public void setPersonBean(Person person) {
+personBean = person;
+}
- public void setPersonBean(Person person) {
- personBean = person;
- }
+public List getSports() {
+return Arrays.asList(sports);
+}
- public List getSports() {
- return Arrays.asList(sports);
- }
+public List getGenders() {
+return Arrays.asList(genders);
+}
- public List getGenders() {
- return Arrays.asList(genders);
- }
+public List getStates() {
+states = new ArrayList<>();
+states.add(new State("AZ", "Arizona"));
+states.add(new State("CA", "California"));
+states.add(new State("FL", "Florida"));
+states.add(new State("KS", "Kansas"));
+states.add(new State("NY", "New York"));
+return states;
+}
-
- public List getStates() {
-
- states = new ArrayList<>();
- states.add( new State("AZ", "Arizona") );
- states.add( new State("CA", "California") );
- states.add( new State("FL", "Florida") );
- states.add( new State("KS", "Kansas") );
- states.add( new State("NY", "New York") );
-
- return states;
- }
-
-
-
- public String [] getCarModelsAvailable() {
- return carModelsAvailable;
- }
+public String[] getCarModelsAvailable() {
+return carModelsAvailable;
+}
(struts-examples) branch fix/permission deleted (was 572c520)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/permission in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 572c520 Adjusts config to be compatible with Struts 7 stronger security The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-examples) branch fix/permission created (now 90b7e6f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/permission in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 90b7e6f Adjusts config to be compatible with Struts 7 stronger security This branch includes the following new commits: new 90b7e6f Adjusts config to be compatible with Struts 7 stronger security The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) branch WW-5534-model-driven-struts-param updated (59e6baade -> 87e75ac15)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5534-model-driven-struts-param in repository https://gitbox.apache.org/repos/asf/struts.git omit 59e6baade WW-5534 Proper fix ModelDriven parameter injection and allowlisting add 87e75ac15 WW-5534 Proper fix ModelDriven parameter injection and allowlisting This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (59e6baade) \ N -- N -- N refs/heads/WW-5534-model-driven-struts-param (87e75ac15) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/struts2/interceptor/ModelDrivenInterceptorTest.java | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-)
(struts) branch WW-5534-model-driven-struts-param created (now 59e6baade)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5534-model-driven-struts-param in repository https://gitbox.apache.org/repos/asf/struts.git at 59e6baade WW-5534 Proper fix ModelDriven parameter injection and allowlisting This branch includes the following new commits: new 59e6baade WW-5534 Proper fix ModelDriven parameter injection and allowlisting The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) 01/01: WW-5534 Proper fix ModelDriven parameter injection and allowlisting
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5534-model-driven-struts-param
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 59e6baade0ec6ded5e0f42d7633b041578df20cf
Author: Kusal Kithul-Godage
AuthorDate: Thu Mar 6 23:50:44 2025 +1100
WW-5534 Proper fix ModelDriven parameter injection and allowlisting
---
.../apache/struts2/showcase/ModelDrivenTest.java | 63 ++
.../main/java/org/apache/struts2/ModelDriven.java | 3 --
.../java/org/apache/struts2/components/Debug.java | 13 ++---
.../struts2/components/IteratorComponent.java | 6 +--
.../interceptor/ExceptionMappingInterceptor.java | 6 +--
.../interceptor/ModelDrivenInterceptor.java| 15 --
.../debugging/DebuggingInterceptor.java| 7 +--
.../parameter/ParametersInterceptor.java | 19 +++
.../org/apache/struts2/ognl/ThreadAllowlist.java | 11
.../parameter/StrutsParameterAnnotationTest.java | 10 ++--
10 files changed, 111 insertions(+), 42 deletions(-)
diff --git
a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ModelDrivenTest.java
b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ModelDrivenTest.java
new file mode 100644
index 0..b3656fc7c
--- /dev/null
+++
b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ModelDrivenTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlSubmitInput;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ModelDrivenTest {
+
+private WebClient webClient;
+
+@Before
+public void setUp() throws Exception {
+webClient = new WebClient();
+}
+
+@After
+public void tearDown() throws Exception {
+webClient.close();
+}
+
+@Test
+public void submit() throws Exception {
+HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() +
"/modelDriven/modelDriven.action");
+HtmlForm form = page.getForms().get(0);
+
+form.getInputByName("name").setValue("Johannes");
+form.getInputByName("age").setValue("21");
+form.getInputByName("bustedBefore").setChecked(true);
+form.getTextAreaByName("description").setText("Deals bugs");
+
+HtmlSubmitInput button = form.getInputByValue("Submit");
+page = button.click();
+
+
assertThat(page.getElementById("name").asNormalizedText()).isEqualTo("Johannes");
+
assertThat(page.getElementById("age").asNormalizedText()).isEqualTo("21");
+
assertThat(page.getElementById("bustedBefore").asNormalizedText()).isEqualTo("true");
+
assertThat(page.getElementById("description").asNormalizedText()).isEqualTo("Deals
bugs");
+}
+}
diff --git a/core/src/main/java/org/apache/struts2/ModelDriven.java
b/core/src/main/java/org/apache/struts2/ModelDriven.java
index 993a6f5eb..dd21eb2f7 100644
--- a/core/src/main/java/org/apache/struts2/ModelDriven.java
+++ b/core/src/main/java/org/apache/struts2/ModelDriven.java
@@ -18,8 +18,6 @@
*/
package org.apache.struts2;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
/**
* ModelDriven Actions provide a model object to be pushed onto the ValueStack
* in addition to the Action itself, allowing a FormBean type approach like
Struts.
@@ -36,7 +34,6 @@ public interface ModelDriven {
*
* @return the model
*/
-@StrutsParameter(depth = Integer.MAX_VALUE)
T getModel();
}
diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java
b/core/src/main/java/org/apache/struts2/components/Debug.java
index 702f9e32b..65c210fa0 100644
--- a/core/src/main/java/org/apache/struts2/components/Debug.java
+++ b/core/src/main/java/org/apache/struts2/components/Debug.java
@@ -18,18 +18,17 @@
*/
package org.apache.struts2.components;
-import org.apache.commons.lang3.ClassUtils;
+import org.apache.struts2.StrutsException;
(struts) branch WW-5534-model-driven-struts-param updated (87e75ac15 -> 96f838df1)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5534-model-driven-struts-param in repository https://gitbox.apache.org/repos/asf/struts.git discard 87e75ac15 WW-5534 Proper fix ModelDriven parameter injection and allowlisting add 96f838df1 WW-5534 Proper fix ModelDriven parameter injection and allowlisting This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (87e75ac15) \ N -- N -- N refs/heads/WW-5534-model-driven-struts-param (96f838df1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java | 1 - 1 file changed, 1 deletion(-)
(struts) branch main updated (7ae52ccfc -> d47143c68)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
from 7ae52ccfc Bump org.eclipse.transformer:transformer-maven-plugin (#1216)
add 96f838df1 WW-5534 Proper fix ModelDriven parameter injection and
allowlisting
new d47143c68 Merge pull request #1243 from
apache/WW-5534-model-driven-struts-param
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{ConventionTest.java => ModelDrivenTest.java} | 49 ++
.../main/java/org/apache/struts2/ModelDriven.java | 3 --
.../java/org/apache/struts2/components/Debug.java | 13 +++---
.../struts2/components/IteratorComponent.java | 6 +--
.../interceptor/ExceptionMappingInterceptor.java | 6 +--
.../interceptor/ModelDrivenInterceptor.java| 15 +--
.../debugging/DebuggingInterceptor.java| 7 +---
.../parameter/ParametersInterceptor.java | 19 -
.../org/apache/struts2/ognl/ThreadAllowlist.java | 11 +
.../interceptor/ModelDrivenInterceptorTest.java| 9 +++-
.../parameter/StrutsParameterAnnotationTest.java | 10 ++---
11 files changed, 68 insertions(+), 80 deletions(-)
copy
apps/showcase/src/test/java/it/org/apache/struts2/showcase/{ConventionTest.java
=> ModelDrivenTest.java} (50%)
(struts) 01/01: Merge pull request #1243 from apache/WW-5534-model-driven-struts-param
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git commit d47143c689c1a483c755597fc6e9d1769c50aad5 Merge: 7ae52ccfc 96f838df1 Author: Kusal Kithul-Godage AuthorDate: Fri Mar 7 01:14:15 2025 +1100 Merge pull request #1243 from apache/WW-5534-model-driven-struts-param .../apache/struts2/showcase/ModelDrivenTest.java | 63 ++ .../main/java/org/apache/struts2/ModelDriven.java | 3 -- .../java/org/apache/struts2/components/Debug.java | 13 ++--- .../struts2/components/IteratorComponent.java | 6 +-- .../interceptor/ExceptionMappingInterceptor.java | 6 +-- .../interceptor/ModelDrivenInterceptor.java| 15 -- .../debugging/DebuggingInterceptor.java| 7 +-- .../parameter/ParametersInterceptor.java | 19 +++ .../org/apache/struts2/ognl/ThreadAllowlist.java | 11 .../interceptor/ModelDrivenInterceptorTest.java| 9 +++- .../parameter/StrutsParameterAnnotationTest.java | 10 ++-- 11 files changed, 119 insertions(+), 43 deletions(-)
(struts) branch WW-5534-model-driven-struts-param deleted (was 96f838df1)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5534-model-driven-struts-param in repository https://gitbox.apache.org/repos/asf/struts.git was 96f838df1 WW-5534 Proper fix ModelDriven parameter injection and allowlisting The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
