Author: dimuthul
Date: Thu Dec 13 00:28:09 2007
New Revision: 11063
Log:
Doing the proposed changes.
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserManagerConstants.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLAccessControlAdmin.java
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/acl/realm/AuthorizingRealmTest.java
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserManagerConstants.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserManagerConstants.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserManagerConstants.java
Thu Dec 13 00:28:09 2007
@@ -4,11 +4,13 @@
public static final String USER_RESOURCE = "user";
public static final String ROLE_RESOURCE = "role";
- public static final String PERMISSION_RESOURCE = "permission";
+ public static final String USER_PERMISSION_RESOURCE = "user_permission";
+ public static final String ROLE_PERMISSION_RESOURCE = "role_permission";
public static final String ADD = "add";
public static final String EDIT = "edit";
public static final String DELETE = "delete";
public static final String READ = "read";
+ public static final String AUTHORIZE = "authorize";
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLAccessControlAdmin.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLAccessControlAdmin.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLAccessControlAdmin.java
Thu Dec 13 00:28:09 2007
@@ -15,8 +15,7 @@
private AccessControlAdmin admin = null;
private String adminUserName = null;
-
- private String adminResource = UserManagerConstants.PERMISSION_RESOURCE;
+
public ACLAccessControlAdmin(Authorizer athzr, AccessControlAdmin admin,
String user) {
@@ -28,11 +27,11 @@
public void authorizeUser(String userName, String resourceId, String
action)
throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.ADD)) {
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.ADD });
+ UserManagerConstants.AUTHORIZE, UserManagerConstants.ADD
});
}
admin.authorizeUser(userName, resourceId, action);
@@ -43,11 +42,11 @@
*/
public void denyUser(String userName, String resourceId, String action)
throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.ADD)) {
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.ADD });
+ UserManagerConstants.AUTHORIZE, UserManagerConstants.ADD
});
}
admin.denyUser(userName, resourceId, action);
}
@@ -57,11 +56,11 @@
*/
public void authorizeRole(String roleName, String resourceId, String
action)
throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.ADD)) {
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.ADD });
+ UserManagerConstants.AUTHORIZE, UserManagerConstants.ADD
});
}
admin.authorizeRole(roleName, resourceId, action);
}
@@ -71,11 +70,11 @@
*/
public void denyRole(String roleName, String resourceId, String action)
throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.ADD)) {
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.ADD });
+ UserManagerConstants.AUTHORIZE, UserManagerConstants.ADD
});
}
admin.denyRole(roleName, resourceId, action);
}
@@ -85,11 +84,11 @@
*/
public void clearUserAuthorization(String userName, String resourceId,
String action) throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.DELETE)) {
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.DELETE });
+ UserManagerConstants.AUTHORIZE,
UserManagerConstants.DELETE });
}
admin.clearUserAuthorization(userName, resourceId, action);
}
@@ -99,11 +98,11 @@
*/
public void clearRoleAuthorization(String roleName, String resourceId,
String action) throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.DELETE)) {
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.DELETE });
+ UserManagerConstants.AUTHORIZE,
UserManagerConstants.DELETE });
}
admin.clearRoleAuthorization(roleName, resourceId, action);
}
@@ -113,11 +112,11 @@
*/
public void clearResourceAuthorizations(String resourceId)
throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
+ if (!authorizer.isUserAuthorized(adminUserName, resourceId,
UserManagerConstants.DELETE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.DELETE });
+ UserManagerConstants.AUTHORIZE,
UserManagerConstants.DELETE });
}
admin.clearResourceAuthorizations(resourceId);
}
@@ -127,11 +126,11 @@
*/
public void copyAuthorizations(String fromResourceId, String toResourceId)
throws UserManagerException {
- if (!authorizer.isUserAuthorized(adminUserName, adminResource,
- UserManagerConstants.ADD)) {
+ if (!authorizer.isUserAuthorized(adminUserName, toResourceId,
+ UserManagerConstants.AUTHORIZE)) {
throw new UnauthorizedException("unAuthorized", new String[] {
- adminResource, UserManagerConstants.ADD });
+ UserManagerConstants.AUTHORIZE, UserManagerConstants.ADD
});
}
admin.copyAuthorizations(fromResourceId, toResourceId);
}
Modified:
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/acl/realm/AuthorizingRealmTest.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/acl/realm/AuthorizingRealmTest.java
(original)
+++
trunk/commons/usermanager/modules/core/src/test/java/org/wso2/usermanager/acl/realm/AuthorizingRealmTest.java
Thu Dec 13 00:28:09 2007
@@ -58,12 +58,12 @@
UserManagerConstants.ADD);
acladmin.authorizeRole("admin",
- UserManagerConstants.PERMISSION_RESOURCE,
- UserManagerConstants.ADD);
- acladmin.authorizeRole("admin",
- UserManagerConstants.PERMISSION_RESOURCE,
- UserManagerConstants.READ);
+ "server room",
+ UserManagerConstants.AUTHORIZE);
+ acladmin.authorizeUser("muthulee",
+ "picture",
+ UserManagerConstants.AUTHORIZE);
// now create the realm
realm = new AuthorizingRealm();
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
