This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 6062609e36fb1495c93bd8b4989f96ebcc1d20b8
Author: Sven Meier <svenme...@apache.org>
AuthorDate: Mon Mar 16 13:06:41 2020 +0100
WICKET-6747 removed handler parameter
was used by CSPDirectiveSrcValue.NONCE only and available via
requestCycle anyway
---
.../java/org/apache/wicket/csp/CSPDirectiveSandboxValue.java | 4 +---
.../main/java/org/apache/wicket/csp/CSPDirectiveSrcValue.java | 9 +++------
.../main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java | 2 +-
.../org/apache/wicket/csp/CSPNonceHeaderResponseDecorator.java | 3 +--
.../src/main/java/org/apache/wicket/csp/CSPRenderable.java | 6 +-----
.../org/apache/wicket/csp/ContentSecurityPolicySettings.java | 4 +++-
.../src/main/java/org/apache/wicket/csp/FixedCSPValue.java | 4 +---
.../src/main/java/org/apache/wicket/csp/RelativeURICSPValue.java | 4 +---
.../wicket/markup/head/filter/FilteringHeaderResponseTest.java | 3 +--
9 files changed, 13 insertions(+), 26 deletions(-)
diff --git
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSandboxValue.java
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSandboxValue.java
index f8c48e9..c864f29 100644
---
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSandboxValue.java
+++
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSandboxValue.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.csp;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
/**
@@ -43,8 +42,7 @@ public enum CSPDirectiveSandboxValue implements CSPRenderable
}
@Override
- public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle,
- IRequestHandler currentHandler)
+ public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle)
{
return value;
}
diff --git
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSrcValue.java
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSrcValue.java
index f6be6d3..f239800 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSrcValue.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/CSPDirectiveSrcValue.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.csp;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
/**
@@ -33,10 +32,9 @@ public enum CSPDirectiveSrcValue implements CSPRenderable
NONCE("'nonce-%1$s'")
{
@Override
- public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle,
- IRequestHandler currentHandler)
+ public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle)
{
- return String.format(getValue(),
settings.getNonce(cycle, currentHandler));
+ return String.format(getValue(),
settings.getNonce(cycle));
}
};
@@ -48,8 +46,7 @@ public enum CSPDirectiveSrcValue implements CSPRenderable
}
@Override
- public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle,
- IRequestHandler currentHandler)
+ public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle)
{
return value;
}
diff --git
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
index 7616344..bbecfc3 100644
---
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
+++
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
@@ -331,7 +331,7 @@ public class CSPHeaderConfiguration
.map(e -> e.getKey().getValue() + " "
+ e.getValue()
.stream()
- .map(r -> r.render(settings, cycle,
currentHandler))
+ .map(r -> r.render(settings, cycle))
.collect(Collectors.joining(" ")))
.collect(Collectors.joining("; "));
}
diff --git
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPNonceHeaderResponseDecorator.java
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPNonceHeaderResponseDecorator.java
index faa9d30..f94b7f7 100644
---
a/wicket-core/src/main/java/org/apache/wicket/csp/CSPNonceHeaderResponseDecorator.java
+++
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPNonceHeaderResponseDecorator.java
@@ -51,8 +51,7 @@ public class CSPNonceHeaderResponseDecorator extends
DecoratingHeaderResponse
if (checkitem instanceof AbstractCspHeaderItem)
{
- ((AbstractCspHeaderItem)
checkitem).setNonce(settings.getNonce(RequestCycle.get(),
-
RequestCycle.get().getActiveRequestHandler()));
+ ((AbstractCspHeaderItem)
checkitem).setNonce(settings.getNonce(RequestCycle.get()));
}
}
diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/CSPRenderable.java
b/wicket-core/src/main/java/org/apache/wicket/csp/CSPRenderable.java
index 8610cc0..a252c2c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/CSPRenderable.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/CSPRenderable.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.csp;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
/**
@@ -37,12 +36,9 @@ public interface CSPRenderable
* The {@link ContentSecurityPolicySettings} that renders
this value.
* @param cycle
* The current {@link RequestCycle}.
- * @param currentHandler
- * The handler that is currently being evaluated or executed.
* @return The rendered value.
*/
- String render(ContentSecurityPolicySettings settings, RequestCycle
cycle,
- IRequestHandler currentHandler);
+ String render(ContentSecurityPolicySettings settings, RequestCycle
cycle);
/**
* Checks if the {@code CSPRenderable} represents a valid value for a
{@code -src} directive. By
diff --git
a/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
b/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
index 39744da..edf6dc5 100644
---
a/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
+++
b/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
@@ -127,8 +127,10 @@ public class ContentSecurityPolicySettings
return
configs.values().stream().anyMatch(CSPHeaderConfiguration::isNonceEnabled);
}
- public String getNonce(RequestCycle cycle, IRequestHandler handler)
+ public String getNonce(RequestCycle cycle)
{
+ IRequestHandler handler = cycle.getActiveRequestHandler();
+
Page currentPage = IPageRequestHandler.getPage(handler);
String nonce = cycle.getMetaData(NONCE_KEY);
diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/FixedCSPValue.java
b/wicket-core/src/main/java/org/apache/wicket/csp/FixedCSPValue.java
index 4056f16..4fdc14f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/FixedCSPValue.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/FixedCSPValue.java
@@ -19,7 +19,6 @@ package org.apache.wicket.csp;
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
@@ -48,8 +47,7 @@ public class FixedCSPValue implements CSPRenderable
}
@Override
- public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle,
- IRequestHandler currentHandler)
+ public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle)
{
return value;
}
diff --git
a/wicket-core/src/main/java/org/apache/wicket/csp/RelativeURICSPValue.java
b/wicket-core/src/main/java/org/apache/wicket/csp/RelativeURICSPValue.java
index 81ad2a3..60aa006 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/RelativeURICSPValue.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/RelativeURICSPValue.java
@@ -19,7 +19,6 @@ package org.apache.wicket.csp;
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Args;
@@ -45,8 +44,7 @@ public class RelativeURICSPValue implements CSPRenderable
}
@Override
- public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle,
- IRequestHandler currentHandler)
+ public String render(ContentSecurityPolicySettings settings,
RequestCycle cycle)
{
return
cycle.getUrlRenderer().renderContextRelativeUrl(relativeUri);
}
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
index ab1276a..8adfa94 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
@@ -25,7 +25,6 @@ import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.head.internal.HeaderResponse;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.StringResponse;
@@ -50,7 +49,7 @@ class FilteringHeaderResponseTest extends WicketTestCase
return new ContentSecurityPolicySettings(this)
{
@Override
- public String getNonce(RequestCycle
cycle, IRequestHandler currentHandler)
+ public String getNonce(RequestCycle
cycle)
{
return "NONCE";
}
