You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/10/22 21:44:53 UTC
svn commit: r1026462 - in /wicket/trunk:
wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/
wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/
wicket-examples/src/main/jav...
Author: mgrigorov
Date: Fri Oct 22 19:44:52 2010
New Revision: 1026462
URL: http://svn.apache.org/viewvc?rev=1026462&view=rev
Log:
Revert the change to IAuthorizationStrategy#isActionAuthorized() to use Component instead of IRequestableComponent
"reason being auth strategy often accesses metadata on component to figure out allowed roles"
suggested-by: igor and jeremy
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java Fri Oct 22 19:44:52 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.authorization.strategies.role.annotations;
+import org.apache.wicket.Component;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.strategies.role.AbstractRoleAuthorizationStrategy;
import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
@@ -78,7 +79,7 @@ public class AnnotationsRoleAuthorizatio
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final IRequestableComponent component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
// Get component's class
final Class<?> componentClass = component.getClass();
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java Fri Oct 22 19:44:52 2010
@@ -254,7 +254,7 @@ public class MetaDataRoleAuthorizationSt
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final IRequestableComponent component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
if (component == null)
{
@@ -332,11 +332,10 @@ public class MetaDataRoleAuthorizationSt
* the action
* @return the roles for the action as defined with the given component
*/
- private static Roles rolesAuthorizedToPerformAction(final IRequestableComponent component,
+ private static Roles rolesAuthorizedToPerformAction(final Component component,
final Action action)
{
- // XXX WICKET-NG this cast doesn't look nice
- final ActionPermissions permissions = ((Component)component).getMetaData(ACTION_PERMISSIONS);
+ final ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
if (permissions != null)
{
return permissions.rolesFor(action);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java Fri Oct 22 19:44:52 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.authentication1;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
@@ -69,7 +70,7 @@ public final class SignInApplication ext
// Register the authorization strategy
getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy()
{
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
// authorize everything
return true;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java Fri Oct 22 19:44:52 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.authentication2;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
@@ -71,7 +72,7 @@ public final class SignIn2Application ex
// Register the authorization strategy
getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy()
{
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
// authorize everything
return true;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java Fri Oct 22 19:44:52 2010
@@ -50,7 +50,7 @@ public interface IAuthorizationStrategy
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(IRequestableComponent c, Action action)
+ public boolean isActionAuthorized(Component c, Action action)
{
return true;
}
@@ -91,5 +91,5 @@ public interface IAuthorizationStrategy
* @see Component#ENABLE
* @see Component#RENDER
*/
- boolean isActionAuthorized(IRequestableComponent component, Action action);
+ boolean isActionAuthorized(Component component, Action action);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java Fri Oct 22 19:44:52 2010
@@ -19,6 +19,7 @@ package org.apache.wicket.authorization.
import java.util.ArrayList;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.request.component.IRequestableComponent;
@@ -72,7 +73,7 @@ public class CompoundAuthorizationStrate
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public final boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public final boolean isActionAuthorized(Component component, Action action)
{
int size = strategies.size();
for (int i = 0; i < size; i++)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java Fri Oct 22 19:44:52 2010
@@ -19,6 +19,7 @@ package org.apache.wicket.authorization.
import java.util.HashMap;
import java.util.Map;
+import org.apache.wicket.Component;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.request.component.IRequestableComponent;
@@ -60,7 +61,7 @@ public class ActionAuthorizationStrategy
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
IActionAuthorizer authorizer = actionAuthorizerForAction.get(action);
if (authorizer != null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java Fri Oct 22 19:44:52 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.authorization.strategies.action;
+import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.authorization.Action;
-import org.apache.wicket.request.component.IRequestableComponent;
/**
* A way to provide authorization for a specific component action.
@@ -42,5 +42,5 @@ public interface IActionAuthorizer exten
* The component to authorize this action on
* @return True if this action is authorized
*/
- boolean authorizeAction(IRequestableComponent component);
+ boolean authorizeAction(Component component);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java Fri Oct 22 19:44:52 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.authorization.strategies.page;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
@@ -35,7 +36,7 @@ public abstract class AbstractPageAuthor
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final IRequestableComponent component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
return true;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java Fri Oct 22 19:44:52 2010
@@ -109,7 +109,7 @@ public class AuthorizationTest extends W
* org.apache.wicket.authorization.Action)
*/
@Override
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
if (action == Component.RENDER && component instanceof Label)
{
@@ -162,7 +162,7 @@ public class AuthorizationTest extends W
* org.apache.wicket.authorization.Action)
*/
@Override
- public boolean isActionAuthorized(IRequestableComponent c, Action action)
+ public boolean isActionAuthorized(Component c, Action action)
{
if (action == Component.ENABLE && c instanceof TextField &&
c.getId().equals("stringInput"))
@@ -205,7 +205,7 @@ public class AuthorizationTest extends W
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(IRequestableComponent c, Action action)
+ public boolean isActionAuthorized(Component c, Action action)
{
return true;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java Fri Oct 22 19:44:52 2010
@@ -45,7 +45,7 @@ public class AjaxBehaviorEnabledTest ext
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
if (action == Component.ENABLE && component.getId().endsWith("disabled"))
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java Fri Oct 22 19:44:52 2010
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.fo
import junit.framework.TestCase;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
@@ -223,7 +224,7 @@ public class InterceptTest extends TestC
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=1026462&r1=1026461&r2=1026462&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Fri Oct 22 19:44:52 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.redirect.intercept;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.WicketTestCase;
@@ -50,7 +51,7 @@ public class InterceptTest extends Wicke
private boolean block = true;
- public boolean isActionAuthorized(IRequestableComponent component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}