[jboss-svn-commits] JBL Code SVN: r18828 - in labs/jbosslabs/labs-3.0-build: services/credential/src/main/java/org/jboss/labs/auth/impl and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 11 10:32:49 EDT 2008
Author: szimano
Date: 2008-03-11 10:32:48 -0400 (Tue, 11 Mar 2008)
New Revision: 18828
Modified:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java
labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java
labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java
Log:
slight changes to credential api and admin is super user
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java 2008-03-11 13:48:50 UTC (rev 18827)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java 2008-03-11 14:32:48 UTC (rev 18828)
@@ -23,6 +23,7 @@
package org.jboss.labs.auth;
import java.security.Principal;
+import java.util.Set;
import javax.ejb.Local;
@@ -56,7 +57,8 @@
* @param serviceRoleList
* List of service roles
*/
- public <E extends Enum<E> & ServiceDescriptor> void exposeServiceRoles(E[] serviceRoleList);
+ public <E extends Enum<E> & ServiceDescriptor> void exposeServiceRoles(
+ E[] serviceRoleList);
/**
* Exposes service roles to authentication service and registers custom id
@@ -87,9 +89,9 @@
* @throws NoSuchUserRoleException
* @throws BindingAlreadyExistsException
*/
- public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithProject(E serviceRole,
- UserRole role, String projectId) throws NoSuchUserRoleException,
- BindingAlreadyExistsException;
+ public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithProject(
+ E serviceRole, UserRole role, String projectId)
+ throws NoSuchUserRoleException, BindingAlreadyExistsException;
/**
* Binds given service role with a user role for a given custom id.
@@ -111,9 +113,10 @@
* @see org.jboss.labs.core.model.auth.CustomID
* @see org.jboss.labs.auth.custom.CustomIDProvider
*/
- public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithId(E serviceRole,
- UserRole role, CustomID customId) throws NoSuchUserRoleException,
- BindingAlreadyExistsException, NoSuchCustomIDException;
+ public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithId(
+ E serviceRole, UserRole role, CustomID customId)
+ throws NoSuchUserRoleException, BindingAlreadyExistsException,
+ NoSuchCustomIDException;
/**
* Binds service role to a user role globally. This means that members of
@@ -127,8 +130,8 @@
* @param role
* User role
*/
- public <E extends Enum<E> & ServiceDescriptor> void bindRolesGlobal(E serviceRole, UserRole role)
- throws NoSuchUserRoleException;
+ public <E extends Enum<E> & ServiceDescriptor> void bindRolesGlobal(
+ E serviceRole, UserRole role) throws NoSuchUserRoleException;
/**
* Grants superrole in a project to a user. User with a superrole can
@@ -192,7 +195,8 @@
* Service role
* @return Service role object
*/
- public <E extends Enum<E> & ServiceDescriptor> ServiceRole getServiceRole(E serviceRole);
+ public <E extends Enum<E> & ServiceDescriptor> ServiceRole getServiceRole(
+ E serviceRole);
/**
* Returns entity of project id. Creates new one if it's not in the
@@ -222,8 +226,9 @@
* Project id
* @throws NoSuchUserRoleException
*/
- public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithProject(E serviceRole,
- UserRole role, String projectId) throws NoSuchUserRoleException;
+ public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithProject(
+ E serviceRole, UserRole role, String projectId)
+ throws NoSuchUserRoleException;
/**
* Removes id-type binding
@@ -239,9 +244,9 @@
* @throws NoSuchCustomIDException
* If custom id doesn't exist
*/
- public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithId(E serviceRole,
- UserRole role, CustomID customId) throws NoSuchUserRoleException,
- NoSuchCustomIDException;
+ public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithId(
+ E serviceRole, UserRole role, CustomID customId)
+ throws NoSuchUserRoleException, NoSuchCustomIDException;
/**
* Removes global binding
@@ -252,8 +257,8 @@
* User role
* @throws NoSuchUserRoleException
*/
- public <E extends Enum<E> & ServiceDescriptor> void removeBindingGlobal(E serviceRole,
- UserRole role) throws NoSuchUserRoleException;
+ public <E extends Enum<E> & ServiceDescriptor> void removeBindingGlobal(
+ E serviceRole, UserRole role) throws NoSuchUserRoleException;
/**
* Removes all bindings bound to giver user role
@@ -280,5 +285,13 @@
* Service role
* @return Service object
*/
- public <E extends Enum<E> & ServiceDescriptor> Service getService(E... serviceRoleList);
+ public <E extends Enum<E> & ServiceDescriptor> Service getService(
+ E... serviceRoleList);
+
+ /**
+ * Returns a list of all registered services
+ *
+ * @return List of services
+ */
+ public Set<Service> getAllServices();
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java 2008-03-11 13:48:50 UTC (rev 18827)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java 2008-03-11 14:32:48 UTC (rev 18828)
@@ -220,11 +220,23 @@
* @return UserRole object for a project. Will get created if needed.
*/
public UserRole getCommonRoleForProject(String projectID);
-
- /** Gets all members of a role
- * @param role Role to get from
+
+ /**
+ * Gets all members of a role
+ *
+ * @param role
+ * Role to get from
* @return Set of users
- * @throws NoSuchUserRoleException If this role doesn't exist in database
+ * @throws NoSuchUserRoleException
+ * If this role doesn't exist in database
*/
- public Set<User> getUsersFromUserRole(UserRole role) throws NoSuchUserRoleException;
+ public Set<User> getUsersFromUserRole(UserRole role)
+ throws NoSuchUserRoleException;
+
+ /**
+ * Returns all user roles.
+ *
+ * @return All user roles
+ */
+ public Set<UserRole> getAllUserRoles();
}
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java 2008-03-11 13:48:50 UTC (rev 18827)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java 2008-03-11 14:32:48 UTC (rev 18828)
@@ -73,9 +73,10 @@
private final static Logger log = Logger
.getLogger(RoleBinderServiceImpl.class);
- public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithId(E serviceRole,
- UserRole role, CustomID customId) throws NoSuchUserRoleException,
- BindingAlreadyExistsException, NoSuchCustomIDException {
+ public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithId(
+ E serviceRole, UserRole role, CustomID customId)
+ throws NoSuchUserRoleException, BindingAlreadyExistsException,
+ NoSuchCustomIDException {
// get custom IDs - this will persist new ones
customIDService.getCustomIDs(getService(serviceRole));
@@ -91,9 +92,9 @@
}
- public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithProject(E serviceRole,
- UserRole role, String projectId) throws NoSuchUserRoleException,
- BindingAlreadyExistsException {
+ public <E extends Enum<E> & ServiceDescriptor> void bindRolesWithProject(
+ E serviceRole, UserRole role, String projectId)
+ throws NoSuchUserRoleException, BindingAlreadyExistsException {
ProjectID pid = getProjectID(projectId);
@@ -101,9 +102,9 @@
}
- private <E extends Enum<E> & ServiceDescriptor> void bindRolesWith(E serviceRole,
- UserRole role, AuthID authID) throws NoSuchUserRoleException,
- BindingAlreadyExistsException {
+ private <E extends Enum<E> & ServiceDescriptor> void bindRolesWith(
+ E serviceRole, UserRole role, AuthID authID)
+ throws NoSuchUserRoleException, BindingAlreadyExistsException {
ServiceRole srEn = getServiceRole(serviceRole);
UserRole roleEn = userService.getUserRole(role);
@@ -148,7 +149,8 @@
}
}
- public <E extends Enum<E> & ServiceDescriptor> void exposeServiceRoles(E[] serviceRoleList) {
+ public <E extends Enum<E> & ServiceDescriptor> void exposeServiceRoles(
+ E[] serviceRoleList) {
Service service = getService(serviceRoleList);
// get all current roles
@@ -159,12 +161,12 @@
ServiceRole sr = service.getServiceRole(role);
if (sr == null) {
- sr = new ServiceRole(AuthHelper.getServiceRoleID(role), service, role.getDescription(role));
+ sr = new ServiceRole(AuthHelper.getServiceRoleID(role),
+ service, role.getDescription(role));
manager.persist(sr);
service.addServiceRole(sr);
- }
- else {
+ } else {
sr.setDescription(role.getDescription(role));
manager.merge(sr);
}
@@ -194,8 +196,8 @@
customIDService.getCustomIDs(getService(serviceRoleList));
}
- public <E extends Enum<E> & ServiceDescriptor> void bindRolesGlobal(E serviceRole, UserRole role)
- throws NoSuchUserRoleException {
+ public <E extends Enum<E> & ServiceDescriptor> void bindRolesGlobal(
+ E serviceRole, UserRole role) throws NoSuchUserRoleException {
ServiceRole serviceRoleEn = getServiceRole(serviceRole);
UserRole userRoleEn = userService.getUserRole(role);
@@ -220,8 +222,8 @@
grantUserProjectSuperrole(user, AuthHelper.GLOBAL_PROJECT);
}
- public <E extends Enum<E> & ServiceDescriptor> ServiceRole getServiceRole(E serviceRole)
- throws NoSuchServiceRoleException {
+ public <E extends Enum<E> & ServiceDescriptor> ServiceRole getServiceRole(
+ E serviceRole) throws NoSuchServiceRoleException {
ServiceRole serviceRoleEn = manager.find(ServiceRole.class, AuthHelper
.getServiceRoleID(serviceRole));
@@ -235,7 +237,8 @@
return serviceRoleEn;
}
- public <E extends Enum<E> & ServiceDescriptor> Service getService(E... serviceRoleList) {
+ public <E extends Enum<E> & ServiceDescriptor> Service getService(
+ E... serviceRoleList) {
if (serviceRoleList.length == 0) {
throw new RuntimeException(
"Service role list has to have at least one role");
@@ -245,12 +248,12 @@
.getServiceID(serviceRoleList[0]));
if (service == null) {
- service = new Service(AuthHelper.getServiceID(serviceRoleList[0]), serviceRoleList[0].getServiceDescription());
+ service = new Service(AuthHelper.getServiceID(serviceRoleList[0]),
+ serviceRoleList[0].getServiceDescription());
service.init();
-
+
manager.persist(service);
- }
- else {
+ } else {
service.setDescription(serviceRoleList[0].getServiceDescription());
manager.merge(service);
}
@@ -309,8 +312,8 @@
* @see org.jboss.labs.auth.RoleBinderService#removeBindingGlobal(java.lang.Enum,
* org.jboss.labs.core.model.auth.UserRole)
*/
- public <E extends Enum<E> & ServiceDescriptor> void removeBindingGlobal(E serviceRole,
- UserRole role) throws NoSuchUserRoleException {
+ public <E extends Enum<E> & ServiceDescriptor> void removeBindingGlobal(
+ E serviceRole, UserRole role) throws NoSuchUserRoleException {
ServiceRole srEn = getServiceRole(serviceRole);
UserRole roleEn = userService.getUserRole(role);
@@ -328,9 +331,9 @@
* org.jboss.labs.core.model.auth.UserRole,
* org.jboss.labs.core.model.auth.CustomID)
*/
- public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithId(E serviceRole,
- UserRole role, CustomID customId) throws NoSuchUserRoleException,
- NoSuchCustomIDException {
+ public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithId(
+ E serviceRole, UserRole role, CustomID customId)
+ throws NoSuchUserRoleException, NoSuchCustomIDException {
// get custom IDs - this will persist new ones
customIDService.getCustomIDs(getService(serviceRole));
@@ -350,13 +353,15 @@
* @see org.jboss.labs.auth.RoleBinderService#removeBindingWithProject(java.lang.Enum,
* org.jboss.labs.core.model.auth.UserRole, java.lang.String)
*/
- public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithProject(E serviceRole,
- UserRole role, String projectId) throws NoSuchUserRoleException {
+ public <E extends Enum<E> & ServiceDescriptor> void removeBindingWithProject(
+ E serviceRole, UserRole role, String projectId)
+ throws NoSuchUserRoleException {
removeBindingWith(serviceRole, role, getProjectID(projectId));
}
- private <E extends Enum<E> & ServiceDescriptor> void removeBindingWith(E serviceRole,
- UserRole role, AuthID authID) throws NoSuchUserRoleException {
+ private <E extends Enum<E> & ServiceDescriptor> void removeBindingWith(
+ E serviceRole, UserRole role, AuthID authID)
+ throws NoSuchUserRoleException {
ServiceRole srEn = getServiceRole(serviceRole);
UserRole roleEn = userService.getUserRole(role);
Service service = getService(serviceRole);
@@ -400,4 +405,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.labs.auth.RoleBinderService#getAllServices()
+ */
+ @SuppressWarnings("unchecked")
+ public Set<Service> getAllServices() {
+ List<Service> sr = manager.createQuery("SELECT s from Service s")
+ .getResultList();
+
+ return new TreeSet<Service>(sr);
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java 2008-03-11 13:48:50 UTC (rev 18827)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java 2008-03-11 14:32:48 UTC (rev 18828)
@@ -133,6 +133,9 @@
log.error(e2);
}
+ // make admin super admin
+ binderService.grantUserSuperrole(admin);
+
}
return ctx.proceed();
@@ -424,4 +427,15 @@
return globalUserRole;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.labs.auth.UserService#getAllUserRoles()
+ */
+ @SuppressWarnings("unchecked")
+ public Set<UserRole> getAllUserRoles() {
+ return new TreeSet(manager.createQuery("SELECT r from UserRole r")
+ .getResultList());
+ }
}
More information about the jboss-svn-commits
mailing list