Author: mgrigorov
Date: Mon Jun 27 15:25:28 2011
New Revision: 1140206
URL: http://svn.apache.org/viewvc?rev=1140206&view=rev
Log:
WICKET-3836 regression on strategy to integrate cas authentication
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=1140206&r1=1140205&r2=1140206&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
Mon Jun 27 15:25:28 2011
@@ -52,7 +52,7 @@ public class RestartResponseAtInterceptP
public RestartResponseAtInterceptPageException(Page interceptPage)
{
super(new RenderPageRequestHandler(new
PageProvider(interceptPage),
- RedirectPolicy.ALWAYS_REDIRECT));
+ RedirectPolicy.AUTO_REDIRECT));
InterceptData.set();
}
@@ -76,7 +76,7 @@ public class RestartResponseAtInterceptP
PageParameters parameters)
{
super(new RenderPageRequestHandler(new
PageProvider(interceptPageClass, parameters),
- RedirectPolicy.ALWAYS_REDIRECT));
+ RedirectPolicy.AUTO_REDIRECT));
InterceptData.set();
}
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java?rev=1140206&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
(added)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
Mon Jun 27 15:25:28 2011
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket;
+
+import
org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy;
+import org.apache.wicket.markup.html.pages.RedirectPage;
+import org.apache.wicket.mock.MockApplication;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.junit.Test;
+
+/**
+ * Tests for {@link RestartResponseAtInterceptPageException}
+ */
+public class RestartResponseAtInterceptPageExceptionTest extends WicketTestCase
+{
+ @Override
+ protected WebApplication newApplication()
+ {
+ return new MockApplication()
+ {
+
+ @Override
+ protected void init()
+ {
+ super.init();
+
+ getSecuritySettings().setAuthorizationStrategy(
+ new AbstractPageAuthorizationStrategy()
+ {
+ @Override
+ protected <T extends Page>
boolean isPageAuthorized(Class<T> pageClass)
+ {
+ if (pageClass !=
RedirectPage.class)
+ {
+ RedirectPage
intercept = new RedirectPage("http://example.com/path";);
+ throw new
RestartResponseAtInterceptPageException(intercept);
+ }
+ return true;
+ }
+ });
+ }
+ };
+ }
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-3836
+ */
+ @Test
+ public void redirectToBufferForNonVersionedPage()
+ {
+ tester.startPage(tester.getApplication().getHomePage());
+
+ tester.assertRenderedPage(RedirectPage.class);
+ }
+
+}
