[struts] branch master updated (faa1867d6 -> c5130477b)

2023-01-26 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


from faa1867d6 Merge pull request #653 from apache/WW-5274-pell
 add 05d7196e6 WW-5276 Cleans up also wrapper request to avoid resource 
leak and potential DoS attack
 add c5130477b Merge pull request #654 from apache/WW-5276-cleanup

No new revisions were added by this update.

Summary of changes:
 .../filter/StrutsPrepareAndExecuteFilter.java  | 59 ++
 1 file changed, 38 insertions(+), 21 deletions(-)



[struts] branch master updated (c5130477b -> 2a85d0fbc)

2023-01-26 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


from c5130477b Merge pull request #654 from apache/WW-5276-cleanup
 add 3b2c6057e WW-4404 Implements HttpInterceptor
 add 2a85d0fbc Merge pull request #655 from apache/http-interceptor

No new revisions were added by this update.

Summary of changes:
 .../opensymphony/xwork2/util/AnnotationUtils.java  |  27 ++-
 .../interceptor/httpmethod/AllowedHttpMethod.java  |  20 +-
 .../struts2/interceptor/httpmethod/HttpDelete.java |  20 +-
 .../struts2/interceptor/httpmethod/HttpGet.java|  20 +-
 .../interceptor/httpmethod/HttpGetOrPost.java  |  20 +-
 .../interceptor/httpmethod/HttpMethod.java}|  27 ++-
 .../interceptor/httpmethod/HttpMethodAware.java}   |  33 +--
 .../httpmethod/HttpMethodInterceptor.java  | 156 ++
 .../struts2/interceptor/httpmethod/HttpPost.java   |  20 +-
 .../struts2/interceptor/httpmethod/HttpPut.java|  20 +-
 core/src/main/resources/struts-default.xml |   4 +
 .../org/apache/struts2/HttpMethodsTestAction.java  |  82 
 .../httpmethod/HttpMethodInterceptorTest.java  | 234 +
 .../interceptor/httpmethod/HttpMethodTest.java}|  37 +++-
 14 files changed, 622 insertions(+), 98 deletions(-)
 copy 
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
 => 
core/src/main/java/org/apache/struts2/interceptor/httpmethod/AllowedHttpMethod.java
 (78%)
 copy 
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
 => 
core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpDelete.java 
(76%)
 copy 
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
 => core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpGet.java 
(78%)
 copy 
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
 => 
core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpGetOrPost.java 
(77%)
 copy 
core/src/main/java/{com/opensymphony/xwork2/conversion/annotations/ConversionRule.java
 => org/apache/struts2/interceptor/httpmethod/HttpMethod.java} (68%)
 copy 
core/src/main/java/{com/opensymphony/xwork2/validator/ValidationException.java 
=> org/apache/struts2/interceptor/httpmethod/HttpMethodAware.java} (50%)
 create mode 100644 
core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java
 copy 
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
 => core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpPost.java 
(78%)
 copy 
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
 => core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpPut.java 
(77%)
 create mode 100644 
core/src/test/java/org/apache/struts2/HttpMethodsTestAction.java
 create mode 100644 
core/src/test/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptorTest.java
 copy core/src/test/java/{com/opensymphony/xwork2/ActionChainResultTest.java => 
org/apache/struts2/interceptor/httpmethod/HttpMethodTest.java} (55%)