[jboss-svn-commits] JBL Code SVN: r21516 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/jboss/seam/security/permission and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 13 10:17:53 EDT 2008
Author: jervisliu
Date: 2008-08-13 10:17:53 -0400 (Wed, 13 Aug 2008)
New Revision: 21516
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermission.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionStore.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java
Log:
Apply patch jira-1727 on behalf of Chester Wu. Replace package uuid with package name.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermission.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermission.java 2008-08-13 13:51:59 UTC (rev 21515)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermission.java 2008-08-13 14:17:53 UTC (rev 21516)
@@ -1,13 +1,13 @@
package org.drools.guvnor.server.security;
public class RoleBasedPermission {
- private String packageUUID;
+ private String packageName;
private String categoryPath;
private String userName;
private String role;
- public RoleBasedPermission(String userName, String role, String packageUUID, String categoryPath) {
- this.packageUUID = packageUUID;
+ public RoleBasedPermission(String userName, String role, String packageName, String categoryPath) {
+ this.packageName = packageName;
this.categoryPath = categoryPath;
this.userName = userName;
this.role = role;
@@ -29,12 +29,12 @@
this.userName = userName;
}
- public String getPackageUUID() {
- return packageUUID;
+ public String getPackageName() {
+ return packageName;
}
- public void setPackageUUID(String packageUUID) {
- this.packageUUID = packageUUID;
+ public void setPackageName(String packageName) {
+ this.packageName = packageName;
}
public String getCategoryPath() {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionStore.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionStore.java 2008-08-13 13:51:59 UTC (rev 21515)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionStore.java 2008-08-13 14:17:53 UTC (rev 21516)
@@ -33,10 +33,10 @@
List<String> permissionsPerRole = perms.get(roleType);
for (String permissionPerRole : permissionsPerRole) {
if (permissionPerRole.startsWith("package=")) {
- String packageUuid = permissionPerRole.substring("package="
+ String packageName = permissionPerRole.substring("package="
.length());
permissions.add(new RoleBasedPermission(userName, roleType,
- packageUuid, null));
+ packageName, null));
} else if (permissionPerRole.startsWith("category=")) {
String categoryPath = permissionPerRole
.substring("category=".length());
@@ -60,18 +60,18 @@
.retrieveUserPermissions(userName);
Object permissionsPerRole = perms.get(rbp.getRole());
if (permissionsPerRole != null) {
- if (rbp.getPackageUUID() != null) {
+ if (rbp.getPackageName() != null) {
((List<String>) permissionsPerRole).add("package="
- + rbp.getPackageUUID());
+ + rbp.getPackageName());
} else if (rbp.getCategoryPath() != null) {
((List<String>) permissionsPerRole).add("category="
- + rbp.getPackageUUID());
+ + rbp.getPackageName());
}
} else {
List<String> perm = new ArrayList<String>();
- if (rbp.getPackageUUID() != null) {
- perm.add("package=" + rbp.getPackageUUID());
+ if (rbp.getPackageName() != null) {
+ perm.add("package=" + rbp.getPackageName());
} else if (rbp.getCategoryPath() != null) {
perm.add("category=" + rbp.getCategoryPath());
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java 2008-08-13 13:51:59 UTC (rev 21515)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java 2008-08-13 14:17:53 UTC (rev 21516)
@@ -124,22 +124,19 @@
return isPermitted;
} else {
- String targetUUDI = "";
+ String targetName = "";
if (requestedObject instanceof PackageUUIDType) {
- targetUUDI = ((PackageUUIDType) requestedObject).getUUID();
-
- } else if (requestedObject instanceof PackageNameType) {
+ String targetUUID = ((PackageUUIDType) requestedObject).getUUID();
try {
ServiceImplementation si = (ServiceImplementation) Component
.getInstance("org.drools.guvnor.client.rpc.RepositoryService");
- PackageItem source = si.repository
- .loadPackage(((PackageNameType) requestedObject)
- .getPackageName());
- targetUUDI = source.getUUID();
+ targetName = si.repository.loadPackageByUUID(targetUUID).getName();
} catch (RulesRepositoryException e) {
return false;
}
+ } else if (requestedObject instanceof PackageNameType) {
+ targetName = ((PackageNameType) requestedObject).getPackageName();
}
//package based permission check only applies to admin|package.admin|package.dev|package.readonly role.
@@ -147,7 +144,7 @@
for (RoleBasedPermission pbp : permissions) {
if (RoleTypes.ANALYST.equals(pbp.getRole())) {
return true;
- } else if (targetUUDI.equalsIgnoreCase(pbp.getPackageUUID())
+ } else if (targetName.equalsIgnoreCase(pbp.getPackageName())
&& isPermittedPackage(requestedRole, pbp.getRole())) {
return true;
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2008-08-13 13:51:59 UTC (rev 21515)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2008-08-13 14:17:53 UTC (rev 21516)
@@ -95,8 +95,8 @@
public void testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonly() throws Exception {
try {
ServiceImplementation impl = getService();
- String package1Uuid = impl.createPackage(
- "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack1", "desc");
+ String package1Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack1";
+ String package1Uuid = impl.createPackage(package1Name, "desc");
impl.createCategory("",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat1",
"this is a cat");
@@ -131,7 +131,7 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_READONLY,
- package1Uuid, null));
+ package1Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -149,7 +149,7 @@
}
// Access an asset that belongs to no category. e.g., Packages -> Create New
- // -> "upload new Model jar".
+ // -> "upload new�Model jar".
// The user role is admin
public void testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategory() throws Exception {
try {
@@ -195,13 +195,14 @@
}
}
- //Access an asset that belongs to no category. e.g., Packages -> Create New -> "upload new Model jar".
+ //Access an asset that belongs to no category. e.g., Packages -> Create New -> "upload new�Model jar".
//The user role is admin
public void testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryPackageAdmin() throws Exception {
try {
ServiceImplementation impl = getService();
PackageItem packageItem = impl.repository.createPackage(
"testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryPackageAdminPack", "desc");
+ String packageName = packageItem.getName();
String packageUuid = packageItem.getUUID();
impl.createCategory("",
"testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryPackageAdminCat",
@@ -229,7 +230,7 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_ADMIN,
- packageUuid, null));
+ packageName, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -241,7 +242,7 @@
}
}
- //Access an asset that belongs to no category. e.g., Packages -> Create New -> "upload new Model jar".
+ //Access an asset that belongs to no category. e.g., Packages -> Create New -> "upload new�Model jar".
//The user role is analyst
public void testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryAnalyst() throws Exception {
try {
@@ -381,38 +382,27 @@
public void testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonly() throws Exception {
try {
ServiceImplementation impl = getService();
- impl.repository.createPackage(
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack1", "desc");
- impl.createCategory("",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyCat1",
- "this is a cat");
+ String package1Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack1";
+ String category1Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyCat1";
+
+ impl.repository.createPackage(package1Name, "desc");
+ impl.createCategory("", category1Name, "this is a cat");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyCat1",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack1", "drl");
+ "description", category1Name, package1Name, "drl");
- impl.repository.createPackage(
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack2", "desc");
+ String package2Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack2";
+ impl.repository.createPackage(package2Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyCat1",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack2", "drl");
+ "description", category1Name, package2Name, "drl");
- impl.repository.createPackage(
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack3", "desc");
+ String package3Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack3";
+ impl.repository.createPackage(package3Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyCat1",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack3", "drl");
+ "description", category1Name, package3Name, "drl");
- PackageItem source = impl.repository.loadPackage("testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack1");
- String package1Uuid = source.getUUID();
- source = impl.repository.loadPackage("testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack2");
- String package2Uuid = source.getUUID();
-
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
@@ -429,11 +419,11 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
- RoleTypes.PACKAGE_READONLY,
- package1Uuid, null));
+ RoleTypes.PACKAGE_READONLY,
+ package1Name, null));
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_DEVELOPER,
- package2Uuid, null));
+ package2Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -450,38 +440,27 @@
public void testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalyst() throws Exception {
try {
ServiceImplementation impl = getService();
+ String package1Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack1";
+ String category1Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystCat1";
impl.repository.createPackage(
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack1", "desc");
- impl.createCategory("",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystCat1",
- "this is a cat");
+ package1Name, "desc");
+ impl.createCategory("",category1Name, "this is a cat");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystCat1",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack1", "drl");
+ "description", category1Name, package1Name, "drl");
- impl.repository.createPackage(
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack2", "desc");
+ String package2Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack2";
+ impl.repository.createPackage(package2Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystCat1",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack2", "drl");
+ "description", category1Name, package2Name, "drl");
- impl.repository.createPackage(
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack3", "desc");
+ String package3Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack3";
+ impl.repository.createPackage(package3Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystCat1",
- "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack3", "drl");
+ "description", category1Name, package3Name, "drl");
- PackageItem source = impl.repository.loadPackage("testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack2");
- String package2Uuid = source.getUUID();
- source = impl.repository.loadPackage("testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack3");
- String package3Uuid = source.getUUID();
-
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
@@ -499,13 +478,13 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.ANALYST,
- null, "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystCat1"));
+ null, category1Name));
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_READONLY,
- package2Uuid, null));
+ package2Name, null));
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_DEVELOPER,
- package3Uuid, null));
+ package3Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -568,8 +547,8 @@
public void testCheckinWithPackageDeveloper() throws Exception {
ServiceImplementation impl = getService();
- String packageUuid = impl.createPackage(
- "testCheckinWithPackageDeveloperPack", "desc");
+ String packageName = "testCheckinWithPackageDeveloperPack";
+ String packageUuid = impl.createPackage(packageName, "desc");
impl.createCategory("/", "testCheckinWithPackageDeveloperCat",
"this is a description");
impl.createCategory("testCheckinWithPackageDeveloperCat", "deeper", "description");
@@ -599,7 +578,7 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_DEVELOPER,
- packageUuid, null));
+ packageName, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -649,7 +628,7 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_READONLY,
- package3Uuid, null));
+ package3Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -701,7 +680,7 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_READONLY,
- packageItem7UUID, null));
+ package7Name, null));
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.ANALYST,
null, category7Name));
@@ -763,10 +742,10 @@
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_READONLY,
- packageItem5UUID, null));
+ package5Name, null));
pbps.add(new RoleBasedPermission("jervis",
RoleTypes.PACKAGE_READONLY,
- packageItem6UUID, null));
+ package6Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java 2008-08-13 13:51:59 UTC (rev 21515)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java 2008-08-13 14:17:53 UTC (rev 21516)
@@ -36,22 +36,22 @@
public void testGetRoleBasedPermissionsByUserName() throws Exception {
RoleBasedPermissionStore store = getStore();
- store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, "package1Uuid", null));
- store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package2Uuid", null));
- store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package3Uuid", null));
+ store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, "package1Name", null));
+ store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package2Name", null));
+ store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package3Name", null));
store.addRoleBasedPermission("jervis", new RoleBasedPermission("jervis", RoleTypes.ANALYST, null, "category1"));
store.addRoleBasedPermission("john", new RoleBasedPermission("jervis", RoleTypes.ANALYST, null, "category2"));
List<RoleBasedPermission> perms = store.getRoleBasedPermissionsByUserName("jervis");
assertTrue(perms.size() == 4);
List<RoleBasedPermission> expectedPerms = new ArrayList<RoleBasedPermission>();
- expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, "package1Uuid", null));
- expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package2Uuid", null));
- expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package3Uuid", null));
+ expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, "package1Name", null));
+ expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package2Name", null));
+ expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "package3Name", null));
expectedPerms.add(new RoleBasedPermission("jervis", RoleTypes.ANALYST, null, "category1"));
for(RoleBasedPermission perm : perms) {
for(RoleBasedPermission expectedPerm : expectedPerms) {
- if(perm.getPackageUUID() != null && perm.getPackageUUID().equals(expectedPerm.getPackageUUID()) &&
+ if(perm.getPackageName() != null && perm.getPackageName().equals(expectedPerm.getPackageName()) &&
perm.getRole().equals(expectedPerm.getRole())) {
expectedPerms.remove(expectedPerm);
break;
@@ -76,4 +76,4 @@
return store;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java 2008-08-13 13:51:59 UTC (rev 21515)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java 2008-08-13 14:17:53 UTC (rev 21516)
@@ -26,7 +26,7 @@
import org.drools.guvnor.server.security.CategoryPathType;
import org.drools.guvnor.server.security.MockIdentity;
import org.drools.guvnor.server.security.MockRoleBasedPermissionStore;
-import org.drools.guvnor.server.security.PackageUUIDType;
+import org.drools.guvnor.server.security.PackageNameType;
import org.drools.guvnor.server.security.RoleBasedPermission;
import org.drools.guvnor.server.security.RoleTypes;
import org.jboss.seam.contexts.Contexts;
@@ -44,10 +44,12 @@
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
Contexts.getSessionContext().set("org.jboss.seam.security.identity", midentity);
+ String package1Name = "testCategoryBasedPermissionAnalystPackageName1";
+ String package2Name = "testCategoryBasedPermissionAnalystPackageName2";
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, "631b3d79-5b67-42fb-83da-714624970a6b", null));
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "47982482-7912-4881-97ec-e852494383d7", null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, package1Name, null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, package2Name, null));
pbps.add(new RoleBasedPermission("jervis", RoleTypes.ANALYST, null, "category1"));
pbps.add(new RoleBasedPermission("jervis", RoleTypes.ANALYST, null, "category2"));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
@@ -89,19 +91,20 @@
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
Contexts.getSessionContext().set("org.jboss.seam.security.identity", midentity);
+ String package1Name = "testPackageBasedPermissionAdminPackageName1";
+ String package2Name = "testPackageBasedPermissionAdminPackageName2";
-
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.ADMIN, "631b3d79-5b67-42fb-83da-714624970a6b", null));
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "47982482-7912-4881-97ec-e852494383d7", null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.ADMIN, package1Name, null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, package2Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
RoleBasedPermissionResolver resolver = new RoleBasedPermissionResolver();
resolver.setEnableRoleBasedAuthorization(true);
- assertTrue(resolver.hasPermission(new PackageUUIDType("631b3d79-5b67-42fb-83da-714624970a6b"), RoleTypes.ADMIN));
- assertTrue(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.ADMIN));
+ assertTrue(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.ADMIN));
+ assertTrue(resolver.hasPermission(new PackageNameType(package2Name), RoleTypes.ADMIN));
Lifecycle.endApplication();
}
@@ -115,17 +118,19 @@
MockIdentity midentity = new MockIdentity();
Contexts.getSessionContext().set("org.jboss.seam.security.identity", midentity);
+ String packageName = "testPackageBasedPermissionPackageAdminPackageName";
+
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, "631b3d79-5b67-42fb-83da-714624970a6b", null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_ADMIN, packageName, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
RoleBasedPermissionResolver resolver = new RoleBasedPermissionResolver();
resolver.setEnableRoleBasedAuthorization(true);
- assertTrue(resolver.hasPermission(new PackageUUIDType("631b3d79-5b67-42fb-83da-714624970a6b"), RoleTypes.PACKAGE_ADMIN));
- assertTrue(resolver.hasPermission(new PackageUUIDType("631b3d79-5b67-42fb-83da-714624970a6b"), RoleTypes.PACKAGE_DEVELOPER));
- assertTrue(resolver.hasPermission(new PackageUUIDType("631b3d79-5b67-42fb-83da-714624970a6b"), RoleTypes.PACKAGE_READONLY));
+ assertTrue(resolver.hasPermission(new PackageNameType(packageName), RoleTypes.PACKAGE_ADMIN));
+ assertTrue(resolver.hasPermission(new PackageNameType(packageName), RoleTypes.PACKAGE_DEVELOPER));
+ assertTrue(resolver.hasPermission(new PackageNameType(packageName), RoleTypes.PACKAGE_READONLY));
assertFalse(resolver.hasPermission("47982482-7912-4881-97ec-e852494383d7", RoleTypes.PACKAGE_READONLY));
@@ -140,21 +145,22 @@
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
Contexts.getSessionContext().set("org.jboss.seam.security.identity", midentity);
+ String package1Name = "testPackageBasedPermissionPackageDeveloperPackageName1";
+ String package2Name = "testPackageBasedPermissionPackageDeveloperPackageName2";
-
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_DEVELOPER, "47982482-7912-4881-97ec-e852494383d7", null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_DEVELOPER, package1Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
RoleBasedPermissionResolver resolver = new RoleBasedPermissionResolver();
resolver.setEnableRoleBasedAuthorization(true);
- assertFalse(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.PACKAGE_ADMIN));
- assertTrue(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.PACKAGE_DEVELOPER));
- assertTrue(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.PACKAGE_READONLY));
+ assertFalse(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.PACKAGE_ADMIN));
+ assertTrue(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.PACKAGE_DEVELOPER));
+ assertTrue(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.PACKAGE_READONLY));
- assertFalse(resolver.hasPermission("631b3d79-5b67-42fb-83da-714624970a6b", RoleTypes.PACKAGE_READONLY));
+ assertFalse(resolver.hasPermission(package2Name, RoleTypes.PACKAGE_READONLY));
Lifecycle.endApplication();
}
@@ -167,21 +173,22 @@
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
Contexts.getSessionContext().set("org.jboss.seam.security.identity", midentity);
+ String package1Name = "testPackageBasedPermissionPackageReadOnlyPackageName1";
+ String package2Name = "testPackageBasedPermissionPackageReadOnlyPackageName2";
-
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "47982482-7912-4881-97ec-e852494383d7", null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, package1Name, null));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
RoleBasedPermissionResolver resolver = new RoleBasedPermissionResolver();
resolver.setEnableRoleBasedAuthorization(true);
- assertFalse(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.PACKAGE_DEVELOPER));
- assertFalse(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.PACKAGE_DEVELOPER));
- assertTrue(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.PACKAGE_READONLY));
+ assertFalse(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.PACKAGE_DEVELOPER));
+ assertFalse(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.PACKAGE_DEVELOPER));
+ assertTrue(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.PACKAGE_READONLY));
- assertFalse(resolver.hasPermission("631b3d79-5b67-42fb-83da-714624970a6b", RoleTypes.PACKAGE_READONLY));
+ assertFalse(resolver.hasPermission(package2Name, RoleTypes.PACKAGE_READONLY));
Lifecycle.endApplication();
}
@@ -193,10 +200,11 @@
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
Contexts.getSessionContext().set("org.jboss.seam.security.identity", midentity);
+ String package1Name = "testPackageBasedPermissionAnalystPackageName1";
+ String package2Name = "testPackageBasedPermissionAnalystPackageName2";
-
List<RoleBasedPermission> pbps = new ArrayList<RoleBasedPermission>();
- pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, "47982482-7912-4881-97ec-e852494383d7", null));
+ pbps.add(new RoleBasedPermission("jervis", RoleTypes.PACKAGE_READONLY, package1Name, null));
pbps.add(new RoleBasedPermission("jervis", RoleTypes.ANALYST, null, "category1"));
MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
@@ -204,10 +212,10 @@
RoleBasedPermissionResolver resolver = new RoleBasedPermissionResolver();
resolver.setEnableRoleBasedAuthorization(true);
- assertTrue(resolver.hasPermission(new PackageUUIDType("47982482-7912-4881-97ec-e852494383d7"), RoleTypes.ANALYST));
- assertTrue(resolver.hasPermission(new PackageUUIDType("631b3d79-5b67-42fb-83da-714624970a6b"), RoleTypes.ANALYST));
+ assertTrue(resolver.hasPermission(new PackageNameType(package1Name), RoleTypes.ANALYST));
+ assertTrue(resolver.hasPermission(new PackageNameType(package2Name), RoleTypes.ANALYST));
Lifecycle.endApplication();
}
- }
\ No newline at end of file
+ }
More information about the jboss-svn-commits
mailing list