This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 87e7b2b Merge pull request #433 from
JCgH4164838Gh792C124B5/WW-5075_S2_6_OSGiPluginUpdate
new 4d8bec5 Cspinterceptor (#2)
new 418ca2c Use default execute method on CspReportAction
new 0af4d6f Remove report URI from default CSP interceptor configuration.
By default, CSP will be in reporting mode with no report directive.
new 2ce753a Add unit test for CSP report action. Ensure only reports with
correct method, content length and content type are processed and response code
is always 204.
new bf80254 Add missing license to test file.
new 6210afa Merge pull request #430 from salcho/post-ww-5083
The 5958 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/struts2/action/CspReportAction.java | 93 +++++++++++
.../DefaultCspReportAction.java} | 18 +--
.../java/org/apache/struts2/components/Link.java | 175 ++++++++++++++++++++
.../java/org/apache/struts2/components/Script.java | 178 +++++++++++++++++++++
.../struts2/interceptor/csp/CspInterceptor.java | 78 +++++++++
.../struts2/interceptor/csp/CspSettings.java | 50 ++++++
.../interceptor/csp/DefaultCspSettings.java | 108 +++++++++++++
.../org/apache/struts2/views/jsp/ui/LinkTag.java | 100 ++++++++++++
.../jsp/ui/{SubmitTag.java => ScriptTag.java} | 85 +++++-----
core/src/main/resources/struts-default.xml | 4 +
.../template/simple/{textarea.ftl => link.ftl} | 62 ++++---
.../control-close.ftl => simple/script-close.ftl} | 1 +
.../template/simple/{textarea.ftl => script.ftl} | 60 ++++---
.../control-close.ftl => xhtml/link.ftl} | 1 +
.../control-close.ftl => xhtml/script.ftl} | 1 +
...oxlist-attributes.html => link-attributes.html} | 124 +++++++-------
core/src/site/resources/tags/link-description.html | 1 +
...list-attributes.html => script-attributes.html} | 136 +++++++++-------
.../site/resources/tags/script-description.html | 1 +
.../apache/struts2/action/CspReportActionTest.java | 130 +++++++++++++++
.../struts2/interceptor/CspInterceptorTest.java | 177 ++++++++++++++++++++
.../apache/struts2/views/jsp/ui/LinkTagTest.java | 74 +++++++++
.../apache/struts2/views/jsp/ui/ScriptTagTest.java | 73 +++++++++
.../simple/{FileHandler.java => LinkHandler.java} | 31 ++--
.../{AnchorHandler.java => ScriptHandler.java} | 38 +++--
.../struts2/views/java/simple/SimpleTheme.java | 3 +
.../apache/struts2/views/java/simple/LinkTest.java | 86 ++++++++++
.../struts2/views/java/simple/ScriptTest.java | 86 ++++++++++
28 files changed, 1729 insertions(+), 245 deletions(-)
create mode 100644
core/src/main/java/org/apache/struts2/action/CspReportAction.java
copy core/src/main/java/org/apache/struts2/{interceptor/NoOpInterceptor.java
=> action/DefaultCspReportAction.java} (64%)
create mode 100644 core/src/main/java/org/apache/struts2/components/Link.java
create mode 100644 core/src/main/java/org/apache/struts2/components/Script.java
create mode 100644
core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java
create mode 100644
core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java
create mode 100644
core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java
create mode 100644
core/src/main/java/org/apache/struts2/views/jsp/ui/LinkTag.java
copy core/src/main/java/org/apache/struts2/views/jsp/ui/{SubmitTag.java =>
ScriptTag.java} (50%)
copy core/src/main/resources/template/simple/{textarea.ftl => link.ftl} (50%)
copy core/src/main/resources/template/{css_xhtml/control-close.ftl =>
simple/script-close.ftl} (98%)
copy core/src/main/resources/template/simple/{textarea.ftl => script.ftl} (53%)
copy core/src/main/resources/template/{css_xhtml/control-close.ftl =>
xhtml/link.ftl} (93%)
copy core/src/main/resources/template/{css_xhtml/control-close.ftl =>
xhtml/script.ftl} (93%)
copy core/src/site/resources/tags/{checkboxlist-attributes.html =>
link-attributes.html} (93%)
create mode 100644 core/src/site/resources/tags/link-description.html
copy core/src/site/resources/tags/{checkboxlist-attributes.html =>
script-attributes.html} (91%)
create mode 100644 core/src/site/resources/tags/script-description.html
create mode 100644
core/src/test/java/org/apache/struts2/action/CspReportActionTest.java
create mode 100644
core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java
create mode 100644
core/src/test/java/org/apache/struts2/views/jsp/ui/LinkTagTest.java
create mode 100644
core/src/test/java/org/apache/struts2/views/jsp/ui/ScriptTagTest.java
copy
plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/{FileHandler.java
=> LinkHandler.java} (58%)
copy
plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/{AnchorHandler.java
=> ScriptHandler.java} (59%)
create mode 100644
plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/LinkTest.java
create mode 100644
plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/ScriptTest.java
