You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/01/21 10:01:07 UTC
[wicket] branch csp updated (f6779fe -> 491e1d3)
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a change to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git.
discard f6779fe WICKET-6725: add option to disable core stylesheet
discard 6692f7c WICKET-6727: Improved API
discard 48db3d6 WICKET-6727: improved documentation
discard 9487b04 WICKET-6727: fixed CSP in several examples
discard ea1e129 WICKET-6727: Updated documentation, fixed websocket, fixed examples
discard 18a1e6b WICKET-6727: ContentSecurityPolicyEnforcer must not protect non-webresponses
discard 96bf6bd WICKET-6727: Remove old CspNonceHeaderResponse and update example
discard 3bfce9f WICKET-6727: enable CSP in WebApplication and provide default profiles
discard 6e3ec0b Merge remote-tracking branch 'origin/csp-configurable' into csp
discard bd84cb7 Merge remote-tracking branch 'origin/master' into csp
discard 4447ba2 WICKET-6724: replace empty inline JS in href by # and event.preventDefault
discard 9dddf2e WICKET-6727: do not extend WicketTester but WicketTestCase
discard 51455ae WICKET-6727: do not extend WicketTester but WicketTestCase
discard 000cf9d WICKET-6730: Minor code-style improvements
discard a1c9bd7 WICKET-6727: more refactoring of the CSP API
discard 56e0331 Merge remote-tracking branch 'origin/master' into csp
discard 06eced1 WICKET-6727: more refactoring of the CSP API
discard ab9c46a Merge remote-tracking branch 'origin/csp' into csp
discard 57b97b5 WICKET-6730: central SecureRandom setting
discard 7deb7bd Merge branch 'csp-display-none' into csp
discard 1c35ca8 Merge branch 'csp-configurable' into csp
discard 7f09385 WICKET-6725: render CSS via application wide IHeaderContributor
discard ed5c301 WICKET-6727: fix license headers
discard 4a0bab6 WICKET-6727: refactoring of CSP API
discard 1125c3d WICKET-6727: first code drop for configurable CSP
discard 7a6962b WICKET-6725: Updated tests to reflect new markup
discard 7f8b129 WICKET-6725: replace display:none by wicket--hidden css class
discard f84aa13 Updated tests to reflect new markup
discard e326901 Updated tests to reflect new markup
discard 6043b09 WICKET-6729: Add a new API for managing IHeaderResponseDecorators
discard b8f1c96 WICKET-6727: refactoring of CSP API
discard dda3aa1 WICKET-6725: render CSS via application wide IHeaderContributor
discard bd7f7ed WICKET-6725: renamed wicket-base.css to wicket-core.css
discard 01f0450 WICKET-6727: first code drop for configurable CSP
discard 6d91a6a WICKET-6725: replace display:none by wicket--hidden css class
discard 53549fb WICKET-6723: Keep servlet at 3.1.0 for now
omit 02c12e6 WICKET-6723: move to Jakarta APIs
add 0a5cdf1 WICKET-6727: first code drop for configurable CSP
add 3bed1e9 WICKET-6727: refactoring of CSP API
add 3afb562 WICKET-6727: fix license headers
add d1a59a8 WICKET-6727: more refactoring of the CSP API
add 6392eda WICKET-6727: do not extend WicketTester but WicketTestCase
add 8dd6557 WICKET-6727: enable CSP in WebApplication and provide default profiles
add cfc4615 WICKET-6727: Remove old CspNonceHeaderResponse and update example
add 1e509dd WICKET-6727: ContentSecurityPolicyEnforcer must not protect non-webresponses
add 3d8c018 WICKET-6727: Updated documentation, fixed websocket, fixed examples
add a83a01b WICKET-6727: fixed CSP in several examples
add dd868da WICKET-6727: improved documentation
add 1e618f3 WICKET-6727: Improved API
add 5b61c26 WICKET-6725: replace display:none by wicket--hidden css class
add 93a3cf6 WICKET-6725: render CSS via IHeaderContributor and update tests
new 491e1d3 Merge branch 'csp-display-none' into csp
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 (f6779fe)
\
N -- N -- N refs/heads/csp (491e1d3)
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:
.../src/main/java/org/apache/wicket/Page.java | 5 +-
.../wicket/ParentResourceEscapePathTest.java | 2 +-
.../wicket/TestDetachPageExpectedResult.html | 2 +-
.../wicket/ajax/AjaxBehaviorEnabled_expected.html | 2 +-
.../ajax/AjaxHeaderContributionPage2_expected.html | 4 +-
.../ajax/AjaxHeaderContributionPage_expected.html | 4 +-
.../apache/wicket/ajax/AjaxRequestHandlerTest.java | 4 -
.../wicket/ajax/DomReadyOrderPage_expected.html | 2 +-
.../ajax/form/AjaxFormSubmitTestPage_expected.html | 2 +-
.../OnChangeAjaxBehaviorTestPage_expected.html | 2 +-
.../html/ajaxLink/AjaxLinkPageExpectedResult.html | 2 +-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../componentMap/SimpleTestPageExpectedResult.html | 2 +-
.../wicket/markup/DoctypeExpectedResult_1.html | 42 ++---
.../wicket/markup/DoctypeExpectedResult_2.html | 40 ++---
.../markup/head/PriorityDepthsPage_expected.html | 18 +-
.../markup/head/filter/DeferredPageExpected.html | 6 +-
...MarkupInheritanceResolverTestPage_expected.html | 34 ++--
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../html/basic/SimplePageExpectedResult_14.html | 2 +-
.../html/basic/SimplePageExpectedResult_16.html | 18 +-
.../border/HideableBorderPage_ExpectedResult.html | 2 +-
.../internal/EnclosurePageExpectedResult_10.html | 16 +-
.../internal/EnclosurePageExpectedResult_11.html | 24 +--
.../internal/EnclosurePageExpectedResult_12.html | 12 +-
.../internal/EnclosurePageExpectedResult_13.html | 12 +-
.../internal/EnclosurePageExpectedResult_4-1.html | 18 +-
.../internal/EnclosurePageExpectedResult_4.html | 10 +-
.../internal/EnclosurePageExpectedResult_5-1.html | 28 +--
.../internal/EnclosurePageExpectedResult_5.html | 20 +--
.../internal/EnclosurePageExpectedResult_8.html | 10 +-
.../ClientSideImageMapPageExpectedResult_1.html | 20 +--
.../link/ExternalLinkPageExpectedResult_1.html | 16 +-
.../link/ExternalLinkPageExpectedResult_2.html | 16 +-
.../markup/html/link/HrefExpectedResult_1-1.html | 2 +-
.../markup/html/link/HrefExpectedResult_1.html | 4 +-
.../markup/html/link/HrefExpectedResult_3.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_1.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_2.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_3.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_4.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_5.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_6.html | 2 +-
...NavigatorWithLabelProviderExpectedResult_7.html | 2 +-
...edTableNavigatorWithMarginExpectedResult_5.html | 4 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../html/panel/PanelPageExpectedResult_4.html | 42 ++---
...lWithAttributeModifierPageExpectedResult_1.html | 2 +-
.../outputTransformer/PageExpectedResult_1.html | 2 +-
.../outputTransformer/PageExpectedResult_2.html | 2 +-
.../outputTransformer/PageExpectedResult_3.html | 38 ++--
.../filter/HeaderSectionPageExpectedResult_20.html | 42 ++---
.../OpenCloseTagExpanderPageExpectedResult_1.html | 26 +--
.../SimplePage1_ExpectedResult.html_2 | 76 ++++----
.../SimplePage2_ExpectedResult.html_2 | 192 ++++++++++-----------
.../SimpleContainerPageExpectedResult_1.html | 20 +--
.../resolver/SimplePageExpectedResult_1.html | 36 ++--
.../resolver/SimplePageExpectedResult_3.html | 12 +-
.../resolver/SimplePageExpectedResult_5.html | 16 +-
.../resolver/SimplePageExpectedResult_6.html | 26 +--
.../resolver/border/HomePageExpectedResult.html | 50 +++---
.../wicket/page/XmlPartialPageUpdateTest.java | 14 +-
.../ResourceAggregatorTest1Page_results.html | 2 +-
.../ResourceAggregatorTest2Page_results.html | 2 +-
.../loader/PackageTestPageExpectedResult_1.html | 42 ++---
.../table/filter/FilterFormTestPage_expected.html | 5 +-
67 files changed, 535 insertions(+), 543 deletions(-)
[wicket] 01/01: Merge branch 'csp-display-none' into csp
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 491e1d3c65be7c8f4f87bdff10e374c0f3510677
Merge: 1e618f3 93a3cf6
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Tue Jan 21 11:00:40 2020 +0100
Merge branch 'csp-display-none' into csp
.../src/main/java/org/apache/wicket/Component.java | 4 +-
.../src/main/java/org/apache/wicket/Page.java | 2 +-
.../wicket/css/WicketCoreCSSResourceReference.java | 36 ++++++++++++++
.../java/org/apache/wicket/css/wicket-core.css | 19 ++++++++
.../org/apache/wicket/mock/MockApplication.java | 2 +
.../wicket/protocol/http/WebApplication.java | 9 ++++
.../apache/wicket/settings/ResourceSettings.java | 56 +++++++++++++++++++++-
.../org/apache/wicket/PlaceholderTagIdTest.java | 2 +-
.../markup/IEConditionalCommentsPage-expected.html | 23 +++++++++
.../org/apache/wicket/markup/MarkupParserTest.java | 4 +-
.../markup/html/basic/HomePageRedirectTest.java | 4 +-
.../markup/html/basic/RedirectPage-expected1.html | 5 ++
.../markup/html/basic/RedirectPage-expected2.html | 5 ++
.../markup/html/internal/AjaxEnclosureTest.java | 2 +-
...eEnclosureDifferentNamespaceExpectedResult.html | 3 +-
.../InlineEnclosurePageExpectedResult_1.html | 5 +-
.../InlineEnclosurePageExpectedResult_2.html | 3 +-
.../InlineEnclosurePanelPageExpectedResult.html | 3 +-
.../markup/html/internal/InlineEnclosureTest.java | 2 +
...reWithWicketMessagePage_invisible_expected.html | 5 +-
...sureWithWicketMessagePage_visible_expected.html | 3 +-
.../markup/html/internal/TogglePageTest.java | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 4 +-
.../wicket/queueing/ComponentQueueingTest.java | 2 +-
.../ajax/markup/html/AjaxIndicatorAppender.java | 2 +-
25 files changed, 184 insertions(+), 23 deletions(-)
diff --cc wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index 1d72fff,95dfd3b..aab068b6
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@@ -763,13 -759,15 +764,21 @@@ public abstract class WebApplication ex
setAjaxRequestTargetProvider(AjaxRequestHandler::new);
getAjaxRequestTargetListeners().add(new AjaxEnclosureListener());
+
+ getHeaderContributorListeners().add(head -> {
+ Optional<CssResourceReference> wicketCoreCSS = getResourceSettings().getWicketCoreCSS();
+ if (wicketCoreCSS.isPresent())
+ {
+ head.render(CssHeaderItem.forReference(wicketCoreCSS.get()));
+ }
+ });
+ cspEnforcer = newCspEnforcer();
+ getRequestCycleListeners().add(getCsp());
+ getHeaderResponseDecorators()
+ .add(response -> new CspNonceHeaderResponseDecorator(response, getCsp()));
+ getCsp().blocking().unsafeInline();
+
// Configure the app.
configure();
}