This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 84d350dac Merge pull request #861 from
apache/feature/WW-5388-upload-servlet6
add 775febbdf Upgrade maven to 3.9.6 and wrapper to 3.2.0
add 1e56b7ce6 Merge pull request #853 from
sepe81/feature/upgrade-maven-to-3.9.6
add cde86457a Bump actions/upload-artifact from 4.1.0 to 4.2.0
add ec18f0eef Merge pull request #855 from
apache/dependabot/github_actions/actions/upload-artifact-4.2.0
add cf74a4450 Fixes excluding Plexus container in OWASP scan
add 65c0427ea Merge pull request #858 from apache/fix/plexus-exclusion
add 9f4b67a9a Drops JDK11 build and fixes duplicated steps
add 2de30e72a Merge pull request #859 from apache/fix/sped-up-build
add e7a13b963 Small spelling and MD fixes (IntelliJ assisted)
add 644bd1f8c Mention just the maintenance branches for supported versions
add 7843cd5e1 Merge pull request #854 from
sepe81/feature/update-security-policy
add 2513fcb29 Stops running sonar.yml on forks
add 5057aeac8 Merge pull request #862 from apache/lukaszlenart-patch-1
add eca0666f0 WW-5352 Introduce StrutsParameter annotation
add ad576f0fd WW-5352 Introduce ThreadAllowlist bean
add 4255da3ee WW-5352 First draft implementation
add bf3f407b5 WW-5352 Ensure allowlist is cleared if in unexpected state
add 4c5f2b026 WW-5352 Add full unit test coverage
add e9154b922 Merge branch 'master' into WW-5352-parameter-annotation-3
add 5d7930123 WW-5352 Fix missing curved bracket
add 4c60f39c7 WW-5352 Enable annotations for showcase
add b2c754226 WW-5352 Dispatcher should up thread allowlist
add a57c2882e WW-5352 Reinstate manual allowlist for generic types
add 0a71e2c3b WW-5352 Implement auto-allowlisting for Iterator component
add 770d31110 WW-5352 Mild optimisation
add 6df80041e WW-5352 Auto allowlist parameterized types!
add f106b2098 WW-5352 Map-like type support
add bf7737fa0 WW-5352 Add unit test coverage for generics
add 56d8361b4 WW-5352 Implement transition mode
add 49b9c0c78 WW-5352 Ensure superclasses and interfaces allowlisted
add 728d695ce WW-5352 Add debug logging for parameter rejections
add b50616942 WW-5352 Acceptance test coverage
add 71d77df3f WW-5352 Normalise parameter name
add bd783a0e1 Merge pull request #832 from
apache/WW-5352-parameter-annotation-3
add a358db585 WW-5360 Introduces additional countStr & indexStr to allow
to ignore conversion
add b83607295 Merge pull request #852 from apache/fix/WW-5360-iterator
add 372aad2c6 Bump actions/upload-artifact from 4.2.0 to 4.3.0
add eb469779f Merge pull request #864 from
apache/dependabot/github_actions/actions/upload-artifact-4.3.0
add 11d84a26c Merge remote-tracking branch 'origin/master' into
merge-master-to-7xx-2024-02-01
add 9a30a9f95 Merge pull request #866 from
apache/merge-master-to-7xx-2024-02-01
No new revisions were added by this update.
Summary of changes:
.github/workflows/scorecards-analysis.yaml | 2 +-
.github/workflows/sonar.yml | 1 +
Jenkinsfile | 10 +-
SECURITY.md | 12 +-
.../org/apache/struts2/showcase/UITagExample.java | 24 +-
.../showcase/action/ParamsAnnotationAction.java | 133 ++++++++
.../struts2/showcase/action/SkillAction.java | 2 +
.../struts2/showcase/async/ChatRoomAction.java | 3 +
.../struts2/showcase/conversion/AddressAction.java | 4 +-
.../showcase/conversion/OperationsEnumAction.java | 2 +
.../struts2/showcase/conversion/PersonAction.java | 2 +
.../showcase/filedownload/FileDownloadAction.java | 2 +
.../showcase/fileupload/FileUploadAction.java | 2 +
.../org/apache/struts2/showcase/model/MyDto.java | 23 +-
.../validation/FieldValidatorsExampleAction.java | 11 +
.../struts2/showcase/wait/LongProcessAction.java | 2 +
.../main/resources/struts-params-annotation.xml | 10 +-
apps/showcase/src/main/resources/struts.xml | 14 +-
.../includedPage.jsp => paramsannotation.vm} | 8 +-
.../struts2/showcase/StrutsParametersTest.java | 239 ++++++++++++++
.../xwork2/config/impl/DefaultConfiguration.java | 2 +
.../xwork2/ognl/SecurityMemberAccess.java | 10 +-
.../security/DefaultAcceptedPatternsChecker.java | 18 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../struts2/components/IteratorComponent.java | 13 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 8 +
.../parameter/ParametersInterceptor.java | 204 +++++++++++-
.../interceptor/parameter/StrutsParameter.java | 96 +++---
.../apache/struts2/ognl/ThreadAllowlist.java} | 48 ++-
.../struts2/views/jsp/ComponentTagSupport.java | 10 +-
.../apache/struts2/views/jsp/IteratorStatus.java | 20 +-
core/src/main/resources/struts-beans.xml | 1 +
.../xwork2/ognl/SecurityMemberAccessTest.java | 6 +-
.../java/com/opensymphony/xwork2/test/User.java | 6 +
.../test/java/org/apache/struts2/TestAction.java | 9 +
.../struts2/components/IteratorComponentTest.java | 208 +++++++++++-
.../parameter/StrutsParameterAnnotationTest.java | 348 +++++++++++++++++++++
.../apache/struts2/views/jsp/IteratorTagTest.java | 211 ++++++-------
src/etc/project-suppression.xml | 21 +-
39 files changed, 1464 insertions(+), 284 deletions(-)
create mode 100644
apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java
copy
core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
=> apps/showcase/src/main/java/org/apache/struts2/showcase/model/MyDto.java
(67%)
copy plugins/xslt/src/main/resources/struts-plugin.xml =>
apps/showcase/src/main/resources/struts-params-annotation.xml (78%)
copy
apps/showcase/src/main/webapp/WEB-INF/{tags/non-ui/actionTag/includedPage.jsp
=> paramsannotation.vm} (93%)
create mode 100644
apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java
copy
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/ExceptionMapping.java
=>
core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java
(57%)
copy core/src/main/java/{com/opensymphony/xwork2/mock/MockContainer.java =>
org/apache/struts2/ognl/ThreadAllowlist.java} (50%)
create mode 100644
core/src/test/java/org/apache/struts2/interceptor/parameter/StrutsParameterAnnotationTest.java
