Author: mgrigorov
Date: Thu Jun 30 10:02:18 2011
New Revision: 1141466
URL: http://svn.apache.org/viewvc?rev=1141466&view=rev
Log:
WICKET-3849 Restore the support of ISecuritySettings#enforceMount in 1.5
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/settings/
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?rev=1141466&r1=1141465&r2=1141466&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
Thu Jun 30 10:02:18 2011
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.request.mapper;
+import org.apache.wicket.Application;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
@@ -90,6 +91,14 @@ public class BookmarkableMapper extends
@Override
protected UrlInfo parseRequest(Request request)
{
+ if (Application.exists())
+ {
+ if
(Application.get().getSecuritySettings().getEnforceMounts())
+ {
+ return null;
+ }
+ }
+
Url url = request.getUrl();
if (url.getSegments().size() >= 3 &&
urlStartsWith(url, getContext().getNamespace(),
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java?rev=1141466&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
(added)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
Thu Jun 30 10:02:18 2011
@@ -0,0 +1,80 @@
+/*
+ * 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.settings;
+
+import junit.framework.Assert;
+
+import org.apache.wicket.MockPageWithLink;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.markup.IMarkupFragment;
+import org.apache.wicket.markup.Markup;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.junit.Test;
+
+/**
+ * Tests for {@link ISecuritySettings}
+ */
+public class ISecuritySettingsTest extends WicketTestCase
+{
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-3849
+ */
+ @Test
+ public void enforceMounts()
+ {
+ MockPageWithLink pageWithLink = new MockPageWithLink();
+ pageWithLink.add(new Link<Void>(MockPageWithLink.LINK_ID)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick()
+ {
+ throw new
RedirectToUrlException("/wicket/bookmarkable/" +
+ UnknownPage.class.getName());
+ }
+ });
+
+ tester.startPage(pageWithLink);
+ tester.assertRenderedPage(MockPageWithLink.class);
+ tester.clickLink(MockPageWithLink.LINK_ID);
+ tester.assertRenderedPage(UnknownPage.class);
+
+
tester.getApplication().getSecuritySettings().setEnforceMounts(true);
+ tester.startPage(pageWithLink);
+ tester.assertRenderedPage(MockPageWithLink.class);
+ tester.clickLink(MockPageWithLink.LINK_ID);
+ Assert.assertNull(tester.getLastRenderedPage());
+ }
+
+ /**
+ * Dummy page for testing BookmarkableMapper
+ */
+ public static class UnknownPage extends WebPage
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IMarkupFragment getMarkup()
+ {
+ return Markup.of("<html><body></body></html>");
+ }
+ }
+}
