You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/06/07 16:47:16 UTC
[2/2] wicket git commit: Fixed Java 6 issues with CSRF listener
Fixed Java 6 issues with CSRF listener
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/52046069
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/52046069
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/52046069
Branch: refs/heads/wicket-6.x
Commit: 5204606922cbda08503ac4f44ed6746c7c633098
Parents: 7108467
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Sun Jun 7 16:46:20 2015 +0200
Committer: Martijn Dashorst <ma...@gmail.com>
Committed: Sun Jun 7 16:46:20 2015 +0200
----------------------------------------------------------------------
.../wicket/protocol/http/CsrfPreventionRequestCycleListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/52046069/wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java
index 21d5569..be26d4c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.java
@@ -177,7 +177,7 @@ public class CsrfPreventionRequestCycleListener extends AbstractRequestCycleList
* A white list of accepted origins (host names/domain names) presented as
* <domainname>.<TLD>. The domain part can contain subdomains.
*/
- private Collection<String> acceptedOrigins = new ArrayList<>();
+ private Collection<String> acceptedOrigins = new ArrayList<String>();
/**
* Sets the action when no Origin header is present in the request. Default {@code ALLOW}.
@@ -732,7 +732,7 @@ public class CsrfPreventionRequestCycleListener extends AbstractRequestCycleList
onAborted(request, origin, page);
log.info(
"Possible CSRF attack, request URL: {}, Origin: {}, action: aborted with error {} {}",
- request.getRequestURL(), origin, errorCode, errorMessage);
+ new Object[] { request.getRequestURL(), origin, errorCode, errorMessage });
throw new AbortWithHttpErrorCodeException(errorCode, errorMessage);
}