[jboss-svn-commits] JBL Code SVN: r21377 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 6 03:00:48 EDT 2008
Author: jervisliu
Date: 2008-08-06 03:00:47 -0400 (Wed, 06 Aug 2008)
New Revision: 21377
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CategoryBasedPermissionResolver.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/PackageBasedPermissionResolver.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedAuthenticator.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/drools/guvnor/server/security/SecurityServiceImpl.java
Log:
removed deprecated method Identity.instance().getUsername().
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CategoryBasedPermissionResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CategoryBasedPermissionResolver.java 2008-08-06 01:25:42 UTC (rev 21376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CategoryBasedPermissionResolver.java 2008-08-06 07:00:47 UTC (rev 21377)
@@ -71,7 +71,7 @@
requestedPath = ((CategoryPathType)requestedCategoryPath).getCategoryPath();
} else {
// CategoryBasedPermissionResolver only grants permissions based on categoryPath.
- // Return false if the input is not a categoryPath, as this will be the reponsibility
+ // Return false if the input is not a categoryPath, as this will be the responsibility
//of other PermissionResolvers in the resolver chain.
return false;
}
@@ -79,9 +79,9 @@
//category path based permission check only applies to analyst role. If there is no Analyst
- //role (eg, only other roles like admin|package.admin|package.dev|package.readonly) we always grant permisssion.
+ //role (e.g, only other roles like admin|package.admin|package.dev|package.readonly) we always grant permisssion.
boolean isPermitted = true;
- //return true when there is no analyst role, or one of the analyst role has permission to acccess this category
+ //return true when there is no analyst role, or one of the analyst role has permission to access this category
for (RoleBasedPermission pbp : permissions) {
if (RoleTypes.ANALYST.equals(pbp.getRole())) {
isPermitted = false;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java 2008-08-06 01:25:42 UTC (rev 21376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java 2008-08-06 07:00:47 UTC (rev 21377)
@@ -32,7 +32,7 @@
private static final Logger log = Logger.getLogger( DefaultAuthenticator.class );
public boolean authenticate() {
- if (SecurityServiceImpl.GUEST_LOGIN.equals( Identity.instance().getUsername())) {
+ if (SecurityServiceImpl.GUEST_LOGIN.equals( Identity.instance().getCredentials().getUsername())) {
return false;
}
log.info( "User logged in via default authentication module (no security check).");
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/PackageBasedPermissionResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/PackageBasedPermissionResolver.java 2008-08-06 01:25:42 UTC (rev 21376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/PackageBasedPermissionResolver.java 2008-08-06 07:00:47 UTC (rev 21377)
@@ -89,7 +89,7 @@
} else {
// PackageBasedPermissionResolver only grants permissions based on package info.
- // Return false if the input is not a pacakge info, as this will be the reponsibility
+ // Return false if the input is not a package info, as this will be the responsibility
//of other PermissionResolvers in the resolver chain.
return false;
}
@@ -97,7 +97,7 @@
//package based permission check only applies to admin|package.admin|package.dev|package.readonly role.
- //For Analyst we always grant permisssion.
+ //For Analyst we always grant permission.
for (RoleBasedPermission pbp : permissions) {
if (RoleTypes.ANALYST.equals(pbp.getRole())) {
return true;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedAuthenticator.java 2008-08-06 01:25:42 UTC (rev 21376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedAuthenticator.java 2008-08-06 07:00:47 UTC (rev 21377)
@@ -34,14 +34,14 @@
private static final Logger log = Logger.getLogger(RoleBasedAuthenticator.class);
public boolean authenticate() {
- if (SecurityServiceImpl.GUEST_LOGIN.equals( Identity.instance().getUsername())) {
+ if (SecurityServiceImpl.GUEST_LOGIN.equals( Identity.instance().getCredentials().getUsername())) {
return false;
}
log.info( "User logged in via RoleBasedAuthenticator.");
RoleBasedPermissionStore pbps = (RoleBasedPermissionStore) Component
.getInstance("org.drools.guvnor.server.security.RoleBasedPermissionStore");
- List<RoleBasedPermission> permissions = pbps.getRoleBasedPermissionsByUserName(Identity.instance().getUsername());
+ List<RoleBasedPermission> permissions = pbps.getRoleBasedPermissionsByUserName(Identity.instance().getCredentials().getUsername());
//The admin role is added into Identity so that we can call Identity.hadRole("admin")
//later. Other permissions are stored in session context
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-06 01:25:42 UTC (rev 21376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionStore.java 2008-08-06 07:00:47 UTC (rev 21377)
@@ -11,12 +11,11 @@
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.security.Identity;
@Name("org.drools.guvnor.server.security.RoleBasedPermissionStore")
@AutoCreate
public class RoleBasedPermissionStore {
- private static List<RoleBasedPermission> rbps = new ArrayList<RoleBasedPermission>();
+
@In
public RulesRepository repository;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java 2008-08-06 01:25:42 UTC (rev 21376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java 2008-08-06 07:00:47 UTC (rev 21377)
@@ -42,8 +42,8 @@
public boolean login(String userName, String password) {
log.info( "Logging in user [" + userName + "]" );
if (Contexts.isApplicationContextActive()) {
- Identity.instance().setUsername( userName );
- Identity.instance().setPassword( password );
+ Identity.instance().getCredentials().setUsername(userName);
+ Identity.instance().getCredentials().setPassword(password);
try {
Identity.instance().authenticate();
} catch ( LoginException e ) {
@@ -65,7 +65,7 @@
//check to see if we can autologin
return new UserSecurityContext(checkAutoLogin(), disabled);
}
- return new UserSecurityContext(Identity.instance().getUsername(), disabled);
+ return new UserSecurityContext(Identity.instance().getCredentials().getUsername(), disabled);
} else {
HashSet<String> disabled = new HashSet<String>();
//disabled.add("QA");
@@ -82,14 +82,14 @@
*/
private String checkAutoLogin() {
Identity id = Identity.instance();
- id.setUsername( GUEST_LOGIN );
+ id.getCredentials().setUsername( GUEST_LOGIN );
try {
id.authenticate();
} catch ( LoginException e ) {
return null;
}
if (id.isLoggedIn()) {
- return id.getUsername();
+ return id.getCredentials().getUsername();
} else {
return null;
}
More information about the jboss-svn-commits
mailing list