1910 Commits

Author SHA1 Message Date
Lukasz Lenart e7b20da491 WW-4992 Adds a note since which version this plugin is deprecated 2021-12-12 12:38:43 +01:00
Yasser Zamani b2bfdc5c88 fix double evaluations... (#483)
* fix double evaluations...

* fix UIBean and its subclasses double evaluations
* fix Param tag used with Bean tag double evaluations
(to be continued)

Reference:
https://securitylab.github.com/research/apache-struts-double-evaluation/

* fix AliasInterceptor

* fix StreamResult

* fix JasperReportsResult

* add singleton not excluded and accepted pattern checker for non interceptors

* add missing escapedIds
2021-11-24 22:39:01 +03:30
Yuliang Fan a368cb6328 fixed flakiness in JacksonXmlHandlerTest.java (#500)
* fixed flakiness in JacksonXmlHandlerTest.java

* update whitespace/compilation error/indentation

* fixing typos

* move toString() after flush()
2021-11-02 08:08:58 +01:00
Lukasz Lenart 30e549fe57 [WW-5143] [WW-5142] Upgrades OVal to ver. 3.2.1 and upgrades XStream to ver 1.4.18 (#499)
* WW-5143 WW-5142 Upgrades OVal to ver. 3.2.1 and upgrades XStream to ver 1.4.18

* WW-5143 Improves test
2021-10-04 12:12:24 +03:30
Stefaan Dutry f1ca6d0e2a [WW-5064] Move XWork Spring support into struts2-spring-plugin 2021-09-24 11:40:16 +02:00
Lukasz Lenart 58503d422e WW-5134 Upgrades JasperReports to version 6.17.0 2021-06-19 09:12:38 +02:00
Lukasz Lenart f43a8b73bd WW-5113 Drops deprecated struts.xworkTextProvider 2021-01-23 17:47:24 +01:00
Lukasz Lenart 57db5c337c Merge pull request #462 from apache/WW-5021-static-content-path
[WW-5021] Introduces a new constant to allow define a path to static content
2021-01-11 07:33:06 +01:00
Lukasz Lenart f5ad43a51c Merge pull request #465 from apache/WW-5099-upgrade-jfreechart
[WW-5099] Upgrades JFreeChart to version 1.5.1
2021-01-10 11:52:19 +01:00
Lukasz Lenart 1775e0e6cf WW-5000 Extracts string literals as constants 2021-01-03 10:56:46 +01:00
Lukasz Lenart 22ee49151b WW-5099 Upgrades JFreeChart to version 1.5.1 2021-01-03 10:15:09 +01:00
Lukasz Lenart ef72783f50 WW-5021 Introduces a new constant to allow define a path to static content 2021-01-02 17:52:29 +01:00
Lukasz Lenart fbdcd2c4a7 WW-5063 Adds tests to cover new functionality 2020-12-24 16:39:29 +01:00
Lukasz Lenart f2540192bf WW-5063 Adds null check for ActionInvocation 2020-12-24 15:45:46 +01:00
Lukasz Lenart 7840fa1333 Merge pull request #453 from apache/WW-3877-removes-alt-syntax
[WW-3877] Drops altSyntax option
2020-12-10 16:35:06 +01:00
yilinwang fb49bc4705 classMethods 2020-12-07 04:02:14 -06:00
yilinwang 40d529c439 sort getMethods 2020-12-07 02:44:51 -06:00
Lukasz Lenart eec9eb3c0c WW-3877 Drops altSyntax option 2020-12-06 09:59:01 +01:00
Lukasz Lenart b4bc5dcf75 WW-5078 Removes support for <xwork> DTDs 2020-11-29 15:51:18 +01:00
Lukasz Lenart 5186d348d5 Merge pull request #447 from apache/WW-5095-cherry-pick
[WW-5095] Cherry picks changes from 2-5-x branch
2020-11-20 07:45:55 +01:00
Lucas Cabral 0339ff4550 Fix meaningless close 2020-11-17 19:04:53 -03:00
Lukasz Lenart 8bbe1949e1 Avoids recursion in tags 2020-11-13 19:31:41 +01:00
Lukasz Lenart a6cd7a0c25 WW-5095 Sets ActionMapping when preparing a test nv 2020-11-13 18:51:32 +01:00
Lukasz Lenart f2a3c3955a Merge pull request #434 from salcho/post-ww-5083
Refactoring Nonce Propagation in Struts Tags for CSP
2020-09-21 10:03:23 +02:00
Ecenaz Ozmen 62424ef30c Refactoring script and link elements for CSP nonce propagation 2020-08-31 11:39:57 +03:00
Aleksandr Mashchenko 6210afa747 Merge pull request #430 from salcho/post-ww-5083
WW-5084: Add Content Security Policy support to Struts
2020-08-30 23:37:16 +03:00
JCgH4164838Gh792C124B5 cb3ca4b311 Initial attempt to fix OSGi Plugin issues discovered during examination of
WW-5075.
- Draws on PR#427 and utilizes similar code, but updated for JDK8.
- Updated OSGi plugin dependencies to OSGi R7.
- Indication is that the OSGi Plugin has been failing since Struts 2.3.4.
- Applied fix to ResourceFinder to restore 2.3.x logic that was broken in
  2.5.x.
- Implemented changes to restore OSGi Plugin functionality for 2.6.x.
- Applied changes to the OSGi Admin Bundle to function under 2.6.x.
- Applied changes to the OSGi Demo Bundle to function under 2.6.x.
- Updated the OSGi Admin Bundle JS libraries and related CSS to newer
  versions.
- Added new unit tests for the OSGi plugin.
- The OSGi plugin will only function properly with exploded/expanded WAR
  files.
- BundlePackageLoader changes suggested by L. Lenart (from PR#427).
- FelixOsgiHost changes to better handle Felix bundle cache location
  processing (Windows and Linux).
- FelixOsgIHost test modified to not fail if felix-cache directory
  cannot be created (warn only) to avoid failing the whole build.
- FelixOsgIHost test modified to not fail if felix-cache directory
  bundle load issues arise (warn only) to avoid failing the whole build.
2020-08-21 16:04:19 -04:00
gchatz22 4d8bec5d0a Cspinterceptor (#2)
Support for CSP in Struts 2:

- Implements a CSP Interceptor that adds a nonce-based, strict-dynamic policy to HTTP responses.
- Implements custom JSP and FTL <script> tags that add nonces to script blocks automatically. This makes these tags compatible with CSP with minimal refactoring.
- Implements an extensible action that can be used to collect CSP reports out of the box. This behaviour is extensible, so developers can customise the processing of CSP reports. 

Co-authored-by: Ecenaz Jen Ozmen <eo2419@columbia.edu>
Co-authored-by: Giannis Chatziveroglou <giannisc@google.com>
Co-authored-by: Sal <salchoman@gmail.com>
2020-07-28 15:52:50 +02:00
JCgH4164838Gh792C124B5 d29c2f6161 Minor post WW-5030 Cleanup:
- Correction/fix for test within testMockPortletSession(), following
recent changes.
- Fix TestMockMultipartFile.isEmpty() bug in both original logic and recent
changes.
2020-05-16 14:24:55 -04:00
Lukasz Lenart 91d4ab553e Fixes lastAccessedTime not modified once session was invalidated 2020-05-16 08:54:29 +02:00
Lukasz Lenart 0129d30abf Merge pull request #397 from apache/action-context-boost
[WW-4789] [WW-3788] ActionContext refactoring
2020-05-04 07:06:32 +02:00
JCgH4164838Gh792C124B5 a6711251a6 Proposed WW-5074 Fix:
- Exclude ASM 3.3.1 from inclusion as a dependency for commons-digester3
  (also mark commons-digester3 as optional dependency since it is only
  listed to allow the exclusion).
- Provide explicit test dependency of ASM 3.3.1 for portlet-plugin
  (otherwise its jmock tests are unable to execute).
2020-05-03 12:58:37 -04:00
Lukasz Lenart b96509f077 Merge branch 'master' into action-context-boost 2020-05-03 12:08:29 +02:00
Lukasz Lenart 12539edf5a Merge pull request #406 from apache/WW-5070-root-action-model
[WW-5070] Adds more sophisticated logic to search for the Root
2020-05-03 12:01:29 +02:00
Lukasz Lenart 158b1d4fde Merge pull request #229 from sdutry/WW-4796
WW-4796 Rename springconstants to have a uniform naming pattern
2020-05-01 07:10:29 +02:00
Lukasz Lenart 0cf39a97f0 WW-4789 WW-3788 Cleans up code & JavaDocs formatting 2020-04-28 08:19:20 +02:00
Lukasz Lenart 1e1443871b WW-4043 Adds additional function to provide encoding 2020-04-28 07:49:36 +02:00
Lukasz Lenart d826efb9d0 WW-5070 Re-phrases JavaDoc for setRoot() method 2020-04-27 08:20:39 +02:00
Lukasz Lenart 48435c4209 WW-5070 Uses else if to avoid double operation on stack 2020-04-27 08:19:29 +02:00
Lukasz Lenart 333f781207 WW-5070 Generates a new serialVersionUID 2020-04-27 08:17:35 +02:00
Lukasz Lenart 592c942c76 WW-4043 Moves TestUtils into junit-plugin 2020-04-26 09:31:18 +02:00
Lukasz Lenart 19c71ff153 WW-5070 Adds more sophisticated logic to search for the Root 2020-04-25 09:24:36 +02:00
Lukasz Lenart f071c9d0ed Reverse merges master 2020-04-21 20:42:15 +02:00
Lukasz Lenart 2f27e45ef4 WW-4789 WW-3788 Marks LOCALE as deprecated on behalf using helper methods 2020-04-21 20:27:11 +02:00
JCgH4164838Gh792C124B5 9d0a6a80ad Proposed WW-5068 change.
------
Proposed list of library version updates:
---
    cdi-api 1.0-SP4 -> 1.2
    weld-core 1.0.1-SP4 -> 2.2.16.SP1
    weld-se 1.0.1-Final -> weld-se-core 2.2.16.SP1
    htmlunit 2.27.0 and 2.37.0 -> 2.39.0
    slf4j-api 1.7.29 -> 1.7.30
    slf4j-simple 1.7.29 -> 1.7.30
    log4j2 2.12.1 - > 2.13.1
    jackson 2.10.1 -> 2.10.3
    ognl 3.2.12 -> 3.2.14
    asm 7.2 -> 7.3.1
    spring 4.3.25.RELEASE -> 4.3.26.RELEASE
    fluido-skin 1.8 -> 1.9
    freemarker 2.3.28 -> 2.3.30
    org.apache.felix.main 4.6.1 -> 6.0.3
    velocity 2.1 -> 2.2
    junit 4.12 -> 4.13
    easymock 3.5.1 -> 4.2
    javax.el 3.0.1-b10 -> 3.0.1-b11
    jstl 1.1.2 -> 1.2
    tomcat-jasper 8.5.37 -> 8.5.53
    tomcat-api 8.5.37 -> 8.5.53
    tomcat-juli 8.5.37 -> 8.5.53
    commons-lang3 3.9 -> 3.10
    assertj-core 2.9.1 -> 3.15.0
    mockito-core 2.23.0 -> 3.3.3   (required exclusion for objenesis)
    testng 5.14.10 -> 7.1.0
    juneau-marshall 7.2.2 -> 8.1.3
    validation-api 1.1.0.Final -> 2.0.1.Final
    hibernate-validator 5.4.3.Final -> 6.1.2.Final
    jaxb-impl 2.3.1 -> 2.3.2
---
Proposed list of Maven plugin version updates:
---
    maven-project-info-reports-plugin 2.7 -> 3.0.0
    updateimpact-maven-plugin 1.0.10 -> 1.0.12
    maven-surefire-plugin 2.22.2 -> 3.0.0-M4
    jacoco-maven-plugin 0.8.4 - > 0.8.5
    maven-war-plugin 3.2.2 -> 3.2.3
    maven-bundle-plugin 3.5.0 -> 4.2.1
    maven-dependency-plugin 3.1.1 -> 3.1.2
    dependency-check-maven 5.2.4 -> 5.3.2
    maven-enforcer-plugin 3.0.0-M2 -> 3.0.0-M3
    maven-failsafe-plugin 2.22.2 -> 3.0.0-M4
    maven-site-plugin 3.8.2 -> 3.9.0
    doxia-core 1.9 -> 1.9.1
    doxia-module-markdown 1.9 -> 1.9.1
---
2020-04-18 18:40:21 -04:00
Lukasz Lenart adcc67d9dc WW-4789 WW-3788 Marks VALUE_STACK, APPLICATION and SESSION as deprecated on behalf using helper methods 2020-04-13 17:24:16 +02:00
Lukasz Lenart c253b7f480 WW-4789 WW-3788 Marks CONTAINER as deprecated on behalf using helper methods 2020-04-10 19:39:10 +02:00
Lukasz Lenart 8e6815e115 WW-4789 WW-3788 Stops using get() 2020-04-08 08:22:00 +02:00
Lukasz Lenart 273776e13b WW-4789 WW-3788 Introduces helper methods to allow build fluent API 2020-04-07 07:59:11 +02:00
Lukasz Lenart dfda16d743 WW-4789 WW-3788 Introduces helper methods to allow build fluent API 2020-04-05 17:48:59 +02:00