Author: marrink
Date: Thu Apr 24 13:13:13 2008
New Revision: 651383
URL: http://svn.apache.org/viewvc?rev=651383&view=rev
Log:
OPEN - issue WICKET-1152: MetaDataRoleAuthorizationStrategy.unauthorize()
doesn't work
https://issues.apache.org/jira/browse/WICKET-1152
Need to decide if we are going to support this usecase. Fixed a nullpointer too
Added:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
(with props)
Modified:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java?rev=651383&r1=651382&r2=651383&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
Thu Apr 24 13:13:13 2008
@@ -130,7 +130,7 @@
// If we removed the last authorized role, we authorize the
empty role
// so that removing authorization can't suddenly open something
up to
// everyone.
- if (roles.size() == 0)
+ if (roles != null && roles.size() == 0)
{
roles.add(MetaDataRoleAuthorizationStrategy.NO_ROLE);
}
Modified:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java?rev=651383&r1=651382&r2=651383&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
Thu Apr 24 13:13:13 2008
@@ -134,7 +134,7 @@
// If we removed the last authorized role, we authorize the
empty role
// so that removing authorization can't suddenly open something
up to
// everyone.
- if (roles.size() == 0)
+ if (roles != null && roles.size() == 0)
{
roles.add(MetaDataRoleAuthorizationStrategy.NO_ROLE);
}
Modified:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java?rev=651383&r1=651382&r2=651383&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
Thu Apr 24 13:13:13 2008
@@ -65,4 +65,45 @@
permissions.authorizeAll(mambo);
assertEquals(null, permissions.rolesFor(mambo));
}
+
+ /**
+ * Test adding roles.
+ *
+ * @throws Exception
+ */
+ public void testRemove1() throws Exception
+ {
+ ActionPermissions permissions = new ActionPermissions();
+ Action mambo = new Action("mambo");
+ assertEquals(null, permissions.rolesFor(mambo));
+ permissions.unauthorize(mambo, new Roles("maurice"));
+ assertEquals(null, permissions.rolesFor(mambo));
+ }
+
+ /**
+ * Test for issue <a
href="http://issues.apache.org/jira/browse/WICKET-1152";>WICKET-1152</a>.
+ * Temporarily disabled until we can decide what to do with it.
+ */
+// public void testRemove2()
+// {
+// WicketTester tester = new WicketTester();
+// tester.setupRequestAndResponse();
+// Label label = new Label("label", "text");
+// Action mambo = new Action("mambo");
+// MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
+// new IRoleCheckingStrategy()
+// {
+//
+// public boolean hasAnyRole(Roles roles)
+// {
+// return false;
+// }
+// });
+// label.setMetaData(MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS,
+// new ActionPermissions());
+// MetaDataRoleAuthorizationStrategy.unauthorize(label, mambo, "johan");
+// assertFalse(strategy.isActionAuthorized(label, mambo));
+// tester.processRequestCycle();
+// tester.destroy();
+// }
}
Added:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java?rev=651383&view=auto
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
(added)
+++
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
Thu Apr 24 13:13:13 2008
@@ -0,0 +1,107 @@
+/*
+ * 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.authorization.strategies.role.metadata;
+
+import junit.framework.TestCase;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.authorization.strategies.role.Roles;
+
+/**
+ * Test case for
+ * [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.metadata.InstantiationPermissions}.
+ *
+ * @author Eelco Hillenius
+ */
+public class InstantiationPermissionsTest extends TestCase
+{
+ /**
+ * Construct.
+ */
+ public InstantiationPermissionsTest()
+ {
+ super();
+ }
+
+ /**
+ * Construct.
+ *
+ * @param arg0
+ */
+ public InstantiationPermissionsTest(String arg0)
+ {
+ super(arg0);
+ }
+
+ /**
+ * Test adding roles.
+ *
+ * @throws Exception
+ */
+ public void testAdd1() throws Exception
+ {
+ InstantiationPermissions permissions = new
InstantiationPermissions();
+ permissions.authorize(Page.class, new Roles("jonathan"));
+ permissions.authorize(Page.class, new Roles("johan"));
+ permissions.authorize(Page.class, new Roles("maurice"));
+ permissions.authorize(Page.class, new Roles("eelco"));
+ assertEquals(4,
permissions.getRolesForComponentClass().get(Page.class).size());
+ permissions.unauthorize(Page.class, new Roles("maurice"));
+ assertEquals(3,
permissions.getRolesForComponentClass().get(Page.class).size());
+ permissions.authorizeAll(Page.class);
+ assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
+ }
+
+ /**
+ * Test adding roles.
+ *
+ * @throws Exception
+ */
+ public void testRemove1() throws Exception
+ {
+ InstantiationPermissions permissions = new
InstantiationPermissions();
+ assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
+ permissions.unauthorize(Page.class, new Roles("eelco"));
+ assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
+ }
+
+ /**
+ * Test for issue <a
href="http://issues.apache.org/jira/browse/WICKET-1152";>WICKET-1152</a>.
+ * Temporarily disabled until we can decide what to do with it.
+ */
+// public void testRemove2()
+// {
+// WicketTester tester = new WicketTester();
+// tester.setupRequestAndResponse();
+// MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
+// new IRoleCheckingStrategy()
+// {
+//
+// public boolean hasAnyRole(Roles roles)
+// {
+// return false;
+// }
+// });
+// tester.getApplication().setMetaData(
+// MetaDataRoleAuthorizationStrategy.INSTANTIATION_PERMISSIONS,
+// new InstantiationPermissions());
+// MetaDataRoleAuthorizationStrategy.unauthorize(Page.class, "martijn");
+// assertFalse(strategy.isInstantiationAuthorized(Page.class));
+// tester.processRequestCycle();
+// tester.destroy();
+// }
+}
Propchange:
wicket/branches/wicket-1.3.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
