svnno****@sourc*****
svnno****@sourc*****
2007年 7月 17日 (火) 13:07:55 JST
Revision: 279
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=279
Author: shinsuke
Date: 2007-07-17 13:07:55 +0900 (Tue, 17 Jul 2007)
Log Message:
-----------
removed log4j
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-07-17 04:07:01 UTC (rev 278)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-07-17 04:07:55 UTC (rev 279)
@@ -40,8 +40,8 @@
import jp.sf.pal.admin.pager.RolePager;
import jp.sf.pal.admin.pager.UserAttributePager;
import jp.sf.pal.admin.pager.UserPager;
-import jp.sf.pal.admin.util.PortalComponentUtil;
import jp.sf.pal.admin.util.PALAdminUtil;
+import jp.sf.pal.admin.util.PortalComponentUtil;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.page.PageManager;
@@ -57,10 +57,9 @@
import org.apache.jetspeed.security.om.InternalCredential;
import org.apache.jetspeed.security.spi.GroupSecurityHandler;
import org.apache.jetspeed.security.spi.RoleSecurityHandler;
-import org.apache.log4j.Logger;
+import org.seasar.framework.log.Logger;
-public class SecurityProviderLogic implements Serializable
-{
+public class SecurityProviderLogic implements Serializable {
/**
*
*/
@@ -69,7 +68,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(SecurityProviderLogic.class);
+ private static final Logger logger = Logger
+ .getLogger(SecurityProviderLogic.class);
private transient SecurityProvider securityProvider = null;
@@ -94,11 +94,10 @@
/**
* @return the authenticationProviderProxy
*/
- public AuthenticationProviderProxy getAuthenticationProviderProxy()
- {
- if (authenticationProviderProxy == null)
- {
- authenticationProviderProxy = getSecurityProvider().getAuthenticationProviderProxy();
+ public AuthenticationProviderProxy getAuthenticationProviderProxy() {
+ if (authenticationProviderProxy == null) {
+ authenticationProviderProxy = getSecurityProvider()
+ .getAuthenticationProviderProxy();
}
return authenticationProviderProxy;
}
@@ -106,19 +105,18 @@
/**
* @param authenticationProviderProxy the authenticationProviderProxy to set
*/
- public void setAuthenticationProviderProxy(AuthenticationProviderProxy authenticationProviderProxy)
- {
+ public void setAuthenticationProviderProxy(
+ AuthenticationProviderProxy authenticationProviderProxy) {
this.authenticationProviderProxy = authenticationProviderProxy;
}
/**
* @return the roleSecurityHandler
*/
- public RoleSecurityHandler getRoleSecurityHandler()
- {
- if (roleSecurityHandler == null)
- {
- roleSecurityHandler = getSecurityProvider().getRoleSecurityHandler();
+ public RoleSecurityHandler getRoleSecurityHandler() {
+ if (roleSecurityHandler == null) {
+ roleSecurityHandler = getSecurityProvider()
+ .getRoleSecurityHandler();
}
return roleSecurityHandler;
}
@@ -126,19 +124,17 @@
/**
* @param roleSecurityHandler the roleSecurityHandler to set
*/
- public void setRoleSecurityHandler(RoleSecurityHandler roleSecurityHandler)
- {
+ public void setRoleSecurityHandler(RoleSecurityHandler roleSecurityHandler) {
this.roleSecurityHandler = roleSecurityHandler;
}
/**
* @return the groupSecurityHandler
*/
- public GroupSecurityHandler getGroupSecurityHandler()
- {
- if (groupSecurityHandler == null)
- {
- groupSecurityHandler = getSecurityProvider().getGroupSecurityHandler();
+ public GroupSecurityHandler getGroupSecurityHandler() {
+ if (groupSecurityHandler == null) {
+ groupSecurityHandler = getSecurityProvider()
+ .getGroupSecurityHandler();
}
return groupSecurityHandler;
}
@@ -146,18 +142,16 @@
/**
* @param groupSecurityHandler the groupSecurityHandler to set
*/
- public void setGroupSecurityHandler(GroupSecurityHandler groupSecurityHandler)
- {
+ public void setGroupSecurityHandler(
+ GroupSecurityHandler groupSecurityHandler) {
this.groupSecurityHandler = groupSecurityHandler;
}
/**
* @return the userManager
*/
- public UserManager getUserManager()
- {
- if (userManager == null)
- {
+ public UserManager getUserManager() {
+ if (userManager == null) {
userManager = PortalComponentUtil.getUserManager();
}
return userManager;
@@ -166,18 +160,15 @@
/**
* @param userManager the userManager to set
*/
- public void setUserManager(UserManager userManager)
- {
+ public void setUserManager(UserManager userManager) {
this.userManager = userManager;
}
/**
* @return the roleManager
*/
- public RoleManager getRoleManager()
- {
- if (roleManager == null)
- {
+ public RoleManager getRoleManager() {
+ if (roleManager == null) {
roleManager = PortalComponentUtil.getRoleManager();
}
return roleManager;
@@ -186,18 +177,15 @@
/**
* @param roleManager the roleManager to set
*/
- public void setRoleManager(RoleManager roleManager)
- {
+ public void setRoleManager(RoleManager roleManager) {
this.roleManager = roleManager;
}
/**
* @return the groupManager
*/
- public GroupManager getGroupManager()
- {
- if (groupManager == null)
- {
+ public GroupManager getGroupManager() {
+ if (groupManager == null) {
groupManager = PortalComponentUtil.getGroupManager();
}
return groupManager;
@@ -206,18 +194,15 @@
/**
* @param groupManager the groupManager to set
*/
- public void setGroupManager(GroupManager groupManager)
- {
+ public void setGroupManager(GroupManager groupManager) {
this.groupManager = groupManager;
}
/**
* @return the profiler
*/
- public Profiler getProfiler()
- {
- if (profiler == null)
- {
+ public Profiler getProfiler() {
+ if (profiler == null) {
profiler = PortalComponentUtil.getProfiler();
}
return profiler;
@@ -226,18 +211,15 @@
/**
* @param profiler the profiler to set
*/
- public void setProfiler(Profiler profiler)
- {
+ public void setProfiler(Profiler profiler) {
this.profiler = profiler;
}
/**
* @return the pageManager
*/
- public PageManager getPageManager()
- {
- if (pageManager == null)
- {
+ public PageManager getPageManager() {
+ if (pageManager == null) {
pageManager = PortalComponentUtil.getPageManager();
}
return pageManager;
@@ -246,18 +228,15 @@
/**
* @param pageManager the pageManager to set
*/
- public void setPageManager(PageManager pageManager)
- {
+ public void setPageManager(PageManager pageManager) {
this.pageManager = pageManager;
}
/**
* @return the securityProvider
*/
- public SecurityProvider getSecurityProvider()
- {
- if (securityProvider == null)
- {
+ public SecurityProvider getSecurityProvider() {
+ if (securityProvider == null) {
securityProvider = PortalComponentUtil.getSecurityProvider();
}
return securityProvider;
@@ -266,8 +245,7 @@
/**
* @param securityProvider the securityProvider to set
*/
- public void setSecurityProvider(SecurityProvider securityProvider)
- {
+ public void setSecurityProvider(SecurityProvider securityProvider) {
this.securityProvider = securityProvider;
}
@@ -275,11 +253,9 @@
// User
//
- public List<User> getUsers(UserPager pager) throws PALAdminException
- {
+ public List<User> getUsers(UserPager pager) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<User> list = new ArrayList<User>();
User entity = new User();
entity.setName("USER");
@@ -287,9 +263,10 @@
return list;
}
- if (pager.getAuthenticationProviderName() == null)
- {
- pager.setAuthenticationProviderName(getAuthenticationProviderProxy().getDefaultAuthenticationProvider());
+ if (pager.getAuthenticationProviderName() == null) {
+ pager
+ .setAuthenticationProviderName(getAuthenticationProviderProxy()
+ .getDefaultAuthenticationProvider());
}
StringBuffer fb = new StringBuffer("AdvanceFilter: ");
@@ -297,35 +274,35 @@
List<User> userList = new ArrayList<User>();
- try
- {
+ try {
// set count
- pager.setCount(getAuthenticationProviderProxy().getUserCount(fb.toString(), pager.getAuthenticationProviderName()));
+ pager.setCount(getAuthenticationProviderProxy().getUserCount(
+ fb.toString(), pager.getAuthenticationProviderName()));
int startAtIndex = pager.getOffset() + 1;
int endAtIndex = startAtIndex + pager.getLimit();
- fb.append(", startAtIndex=").append(startAtIndex).append(", endAtIndex=").append(endAtIndex);
+ fb.append(", startAtIndex=").append(startAtIndex).append(
+ ", endAtIndex=").append(endAtIndex);
- List<Principal> principals = getAuthenticationProviderProxy().getUserPrincipals(fb.toString(),
- pager.getAuthenticationProviderName());
+ List<Principal> principals = getAuthenticationProviderProxy()
+ .getUserPrincipals(fb.toString(),
+ pager.getAuthenticationProviderName());
int size = principals.size();
- if (logger.isDebugEnabled())
- {
- logger.debug("getUsers(UserPager) - pager.getFilter()=" + pager.getFilter());
- logger.debug("getUsers(UserPager) - size=" + size + ", filter=" + fb.toString());
+ if (logger.isDebugEnabled()) {
+ logger.debug("getUsers(UserPager) - pager.getFilter()="
+ + pager.getFilter());
+ logger.debug("getUsers(UserPager) - size=" + size + ", filter="
+ + fb.toString());
}
- for (int i = 0; i < size; i++)
- {
+ for (int i = 0; i < size; i++) {
User entity = new User();
entity.setName(principals.get(i).getName());
// TODO Others
userList.add(entity);
}
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not get users.", e);
throw new PALAdminException(e);
}
@@ -334,95 +311,93 @@
}
- public void insertUser(User user) throws PALAdminException
- {
+ public void insertUser(User user) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
return;
}
- if (PALAdminUtil.isEmpty(user.getName()) || PALAdminUtil.isEmpty(user.getPassword()))
- {
- throw new PALAdminException("Invalid user name or password. username=" + user.getName() + ", password="
- + user.getPassword());
+ if (PALAdminUtil.isEmpty(user.getName())
+ || PALAdminUtil.isEmpty(user.getPassword())) {
+ throw new PALAdminException(
+ "Invalid user name or password. username=" + user.getName()
+ + ", password=" + user.getPassword());
}
//TODO check duplicate name
- try
- {
+ try {
// Add user
getUserManager().addUser(user.getName(), user.getPassword());
// Set updateRequired
- PasswordCredential credential = getPasswordCredential(user.getName());
- if (credential != null)
- {
- if (user.isUpdateRequired() != credential.isUpdateRequired())
- {
- getUserManager().setPasswordUpdateRequired(user.getName(), user.isUpdateRequired());
+ PasswordCredential credential = getPasswordCredential(user
+ .getName());
+ if (credential != null) {
+ if (user.isUpdateRequired() != credential.isUpdateRequired()) {
+ getUserManager().setPasswordUpdateRequired(user.getName(),
+ user.isUpdateRequired());
}
}
// Set role
- for (Iterator<Role> ite = user.getRoles().iterator(); ite.hasNext();)
- {
+ for (Iterator<Role> ite = user.getRoles().iterator(); ite.hasNext();) {
Role role = ite.next();
- if (!PALAdminUtil.isEmpty(role.getName()))
- {
- getRoleManager().addRoleToUser(user.getName(), role.getName());
+ if (!PALAdminUtil.isEmpty(role.getName())) {
+ getRoleManager().addRoleToUser(user.getName(),
+ role.getName());
}
}
// Add principal rule
Principal principal = getUserPrincipal(user.getName());
- for (Iterator<PrincipalRule> ite = user.getPrincipalRules().iterator(); ite.hasNext();)
+ for (Iterator<PrincipalRule> ite = user.getPrincipalRules()
+ .iterator(); ite.hasNext();)
{
PrincipalRule principalRule = ite.next();
if (!PALAdminUtil.isEmpty(principalRule.getLocatorName())
- && !PALAdminUtil.isEmpty(principalRule.getProfilingRuleName()))
- {
- getProfiler().setRuleForPrincipal(principal, getProfiler().getRule(principalRule.getProfilingRuleName()),
+ && !PALAdminUtil.isEmpty(principalRule
+ .getProfilingRuleName())) {
+ getProfiler().setRuleForPrincipal(
+ principal,
+ getProfiler().getRule(
+ principalRule.getProfilingRuleName()),
principalRule.getLocatorName());
}
}
// Create user's psml
- if (!getPageManager().userFolderExists(user.getName()))
- {
+ if (!getPageManager().userFolderExists(user.getName())) {
//TODO where is template folder
String templateFolder = PALAdminConstants.DEFAULT_TEMPLATE_FOLDER;
Folder source = getPageManager().getFolder(templateFolder);
- getPageManager().deepCopyFolder(source, Folder.USER_FOLDER + user.getName(), user.getName());
+ getPageManager().deepCopyFolder(source,
+ Folder.USER_FOLDER + user.getName(), user.getName());
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
logger.error("Could not create user: " + user, e);
throw new PALAdminException(e);
}
}
- private Subject getUserSubject(String username) throws SecurityException
- {
- org.apache.jetspeed.security.User user = getUserManager().getUser(username);
+ private Subject getUserSubject(String username) throws SecurityException {
+ org.apache.jetspeed.security.User user = getUserManager().getUser(
+ username);
return user.getSubject();
}
- private PasswordCredential getPasswordCredential(String username) throws SecurityException
- {
- org.apache.jetspeed.security.User user = getUserManager().getUser(username);
+ private PasswordCredential getPasswordCredential(String username)
+ throws SecurityException {
+ org.apache.jetspeed.security.User user = getUserManager().getUser(
+ username);
PasswordCredential credential = null;
Set<Object> credentials = user.getSubject().getPrivateCredentials();
Iterator iter = credentials.iterator();
- while (iter.hasNext())
- {
+ while (iter.hasNext()) {
Object o = iter.next();
- if (o instanceof PasswordCredential)
- {
+ if (o instanceof PasswordCredential) {
credential = (PasswordCredential) o;
break;
}
@@ -430,40 +405,34 @@
return credential;
}
- public void deleteUser(User user) throws PALAdminException
- {
+ public void deleteUser(User user) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
return;
}
- try
- {
+ try {
getUserManager().removeUser(user.getName());
// Remove user's psml folder
- if (getPageManager().folderExists(Folder.USER_FOLDER + user.getName()))
- {
- Folder folder = pageManager.getFolder(Folder.USER_FOLDER + user.getName());
+ if (getPageManager().folderExists(
+ Folder.USER_FOLDER + user.getName())) {
+ Folder folder = pageManager.getFolder(Folder.USER_FOLDER
+ + user.getName());
pageManager.removeFolder(folder);
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new PALAdminException(e);
}
}
- public User getUser(String username)
- {
+ public User getUser(String username) {
User user;
- try
- {
- org.apache.jetspeed.security.User j2user = getUserManager().getUser(username);
- if (j2user == null)
- {
+ try {
+ org.apache.jetspeed.security.User j2user = getUserManager()
+ .getUser(username);
+ if (j2user == null) {
return null;
}
PasswordCredential credential = getPasswordCredential(username);
@@ -472,18 +441,14 @@
user.setName(username);
user.setPassword(null);//TODO null?
// not guest
- if (credential != null)
- {
+ if (credential != null) {
user.setUpdateRequired(credential.isUpdateRequired());
user.setLastLogon(credential.getLastAuthenticationDate());
user.setUserEnabled(credential.isEnabled());
user.setExpirationDate(credential.getExpirationDate());
- if (credential.isExpired())
- {
+ if (credential.isExpired()) {
user.setExpires(PALAdminConstants.USER_CREDENTIAL_EXPIRED);
- }
- else
- {
+ } else {
user.setExpires(PALAdminConstants.USER_CREDENTIAL_ACTIVE);
}
}
@@ -492,188 +457,179 @@
//TODO roles
//TODO principal rules
return user;
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not get user: " + username, e);
return null;
}
}
- public void updateUser(User user) throws PALAdminException
- {
+ public void updateUser(User user) throws PALAdminException {
// cannot change username
- try
- {
+ try {
// change password
boolean passwordSet = false;
- if (user.getPassword() != null && user.getPassword().trim().length() > 0)
- {
- getUserManager().setPassword(user.getName(), null, user.getPassword());
+ if (user.getPassword() != null
+ && user.getPassword().trim().length() > 0) {
+ getUserManager().setPassword(user.getName(), null,
+ user.getPassword());
passwordSet = true;
}
- PasswordCredential credential = getPasswordCredential(user.getName());
- if (credential != null)
- {
+ PasswordCredential credential = getPasswordCredential(user
+ .getName());
+ if (credential != null) {
// update update required
- if (user.isUpdateRequired() != credential.isUpdateRequired())
- {
- getUserManager().setPasswordUpdateRequired(user.getName(), user.isUpdateRequired());
+ if (user.isUpdateRequired() != credential.isUpdateRequired()) {
+ getUserManager().setPasswordUpdateRequired(user.getName(),
+ user.isUpdateRequired());
}
// update user enabled
- if (user.isUserEnabled() != credential.isEnabled())
- {
- userManager.setPasswordEnabled(user.getName(), user.isUserEnabled());
+ if (user.isUserEnabled() != credential.isEnabled()) {
+ userManager.setPasswordEnabled(user.getName(), user
+ .isUserEnabled());
}
// update expired
- if (!passwordSet && user.getExpires().equals(PALAdminConstants.USER_CREDENTIAL_ACTIVE))
- {
+ if (!passwordSet
+ && user.getExpires().equals(
+ PALAdminConstants.USER_CREDENTIAL_ACTIVE)) {
//TODO is it correct?
userManager.setPasswordExpiration(user.getName(), null);
- }
- else if (!passwordSet && user.getExpires().equals(PALAdminConstants.USER_CREDENTIAL_EXPIRED))
- {
- java.sql.Date today = new java.sql.Date(Calendar.getInstance().getTimeInMillis());
+ } else if (!passwordSet
+ && user.getExpires().equals(
+ PALAdminConstants.USER_CREDENTIAL_EXPIRED)) {
+ java.sql.Date today = new java.sql.Date(Calendar
+ .getInstance().getTimeInMillis());
userManager.setPasswordExpiration(user.getName(), today);
- }
- else if (user.getExpires().equals(PALAdminConstants.USER_CREDENTIAL_EXTEND))
- {
+ } else if (user.getExpires().equals(
+ PALAdminConstants.USER_CREDENTIAL_EXTEND)) {
userManager.setPasswordExpiration(user.getName(), null);
+ } else if (user.getExpires().equals(
+ PALAdminConstants.USER_CREDENTIAL_EXTEND_UNLIMITED)) {
+ userManager.setPasswordExpiration(user.getName(),
+ InternalCredential.MAX_DATE);
}
- else if (user.getExpires().equals(PALAdminConstants.USER_CREDENTIAL_EXTEND_UNLIMITED))
- {
- userManager.setPasswordExpiration(user.getName(), InternalCredential.MAX_DATE);
- }
}
+ } catch (SecurityException e) {
+ logger.error("Could not update user information correctly. user="
+ + user, e);
+ throw new PALAdminException(
+ "Could not update user information correctly. user=" + user,
+ e);
}
- catch (SecurityException e)
- {
- logger.error("Could not update user information correctly. user=" + user, e);
- throw new PALAdminException("Could not update user information correctly. user=" + user, e);
- }
}
- public void addUserToGroup(User user, Group group) throws PALAdminException
- {
- try
- {
- if (getGroupManager().groupExists(group.getName()))
- {
- getGroupManager().addUserToGroup(user.getName(), group.getName());
+ public void addUserToGroup(User user, Group group) throws PALAdminException {
+ try {
+ if (getGroupManager().groupExists(group.getName())) {
+ getGroupManager().addUserToGroup(user.getName(),
+ group.getName());
+ } else {
+ throw new PALAdminException("The group does not exist. group="
+ + group);
}
- else
- {
- throw new PALAdminException("The group does not exist. group=" + group);
- }
+ } catch (SecurityException e) {
+ logger.error("Could not add the group to the user. user=" + user
+ + ", group=" + group, e);
+ throw new PALAdminException(
+ "Could not add the group to the user. user=" + user
+ + ", group=" + group, e);
}
- catch (SecurityException e)
- {
- logger.error("Could not add the group to the user. user=" + user + ", group=" + group, e);
- throw new PALAdminException("Could not add the group to the user. user=" + user + ", group=" + group, e);
- }
}
- public void removeGroupFromUser(User user, Group group) throws PALAdminException
- {
- try
- {
- if (getGroupManager().groupExists(group.getName()))
- {
- getGroupManager().removeUserFromGroup(user.getName(), group.getName());
+ public void removeGroupFromUser(User user, Group group)
+ throws PALAdminException {
+ try {
+ if (getGroupManager().groupExists(group.getName())) {
+ getGroupManager().removeUserFromGroup(user.getName(),
+ group.getName());
+ } else {
+ throw new PALAdminException("The group does not exist. group="
+ + group);
}
- else
- {
- throw new PALAdminException("The group does not exist. group=" + group);
- }
+ } catch (SecurityException e) {
+ logger.error("Could not remove the group from the user. user="
+ + user + ", group=" + group, e);
+ throw new PALAdminException(
+ "Could not remove the group from the user. user=" + user
+ + ", group=" + group, e);
}
- catch (SecurityException e)
- {
- logger.error("Could not remove the group from the user. user=" + user + ", group=" + group, e);
- throw new PALAdminException("Could not remove the group from the user. user=" + user + ", group=" + group, e);
- }
}
- public boolean exists(Group group)
- {
+ public boolean exists(Group group) {
return getGroupManager().groupExists(group.getName());
}
- public void addUserToRole(User user, Role role) throws PALAdminException
- {
- try
- {
- if (getRoleManager().roleExists(role.getName()))
- {
+ public void addUserToRole(User user, Role role) throws PALAdminException {
+ try {
+ if (getRoleManager().roleExists(role.getName())) {
getRoleManager().addRoleToUser(user.getName(), role.getName());
+ } else {
+ throw new PALAdminException("The role does not exist. role="
+ + role);
}
- else
- {
- throw new PALAdminException("The role does not exist. role=" + role);
- }
+ } catch (SecurityException e) {
+ logger.error("Could not add the role to the user. user=" + user
+ + ", role=" + role, e);
+ throw new PALAdminException(
+ "Could not add the role to the user. user=" + user
+ + ", role=" + role, e);
}
- catch (SecurityException e)
- {
- logger.error("Could not add the role to the user. user=" + user + ", role=" + role, e);
- throw new PALAdminException("Could not add the role to the user. user=" + user + ", role=" + role, e);
- }
}
- public void removeRoleFromUser(User user, Role role) throws PALAdminException
- {
- try
- {
- if (getRoleManager().roleExists(role.getName()))
- {
- getRoleManager().removeRoleFromUser(user.getName(), role.getName());
+ public void removeRoleFromUser(User user, Role role)
+ throws PALAdminException {
+ try {
+ if (getRoleManager().roleExists(role.getName())) {
+ getRoleManager().removeRoleFromUser(user.getName(),
+ role.getName());
+ } else {
+ throw new PALAdminException("The role does not exist. role="
+ + role);
}
- else
- {
- throw new PALAdminException("The role does not exist. role=" + role);
- }
+ } catch (SecurityException e) {
+ logger.error("Could not remove the role from the user. user="
+ + user + ", role=" + role, e);
+ throw new PALAdminException(
+ "Could not remove the role from the user. user=" + user
+ + ", role=" + role, e);
}
- catch (SecurityException e)
- {
- logger.error("Could not remove the role from the user. user=" + user + ", role=" + role, e);
- throw new PALAdminException("Could not remove the role from the user. user=" + user + ", role=" + role, e);
- }
}
- public boolean exists(Role role)
- {
+ public boolean exists(Role role) {
return getRoleManager().roleExists(role.getName());
}
- public void removePrincipalRuleFromUser(User user, PrincipalRule principalRule) throws PALAdminException
- {
- try
- {
- Iterator<org.apache.jetspeed.profiler.rules.PrincipalRule> it = getProfiler().getRulesForPrincipal(
- getUserPrincipal(user.getName())).iterator();
- while (it.hasNext())
- {
- org.apache.jetspeed.profiler.rules.PrincipalRule rule = it.next();
- if (rule.getLocatorName().equals(principalRule.getLocatorName()))
- {
+ public void removePrincipalRuleFromUser(User user,
+ PrincipalRule principalRule) throws PALAdminException {
+ try {
+ Iterator<org.apache.jetspeed.profiler.rules.PrincipalRule> it = getProfiler()
+ .getRulesForPrincipal(getUserPrincipal(user.getName()))
+ .iterator();
+ while (it.hasNext()) {
+ org.apache.jetspeed.profiler.rules.PrincipalRule rule = it
+ .next();
+ if (rule.getLocatorName()
+ .equals(principalRule.getLocatorName())) {
//TODO does not work??
getProfiler().deletePrincipalRule(rule);
}
}
+ } catch (Exception e) {
+ logger.error(
+ "Could not remove the principalRule from the user. user="
+ + user + ", principalRule=" + principalRule, e);
+ throw new PALAdminException(
+ "Could not remove the principalRule from the user. user="
+ + user + ", principalRule=" + principalRule, e);
}
- catch (Exception e)
- {
- logger.error("Could not remove the principalRule from the user. user=" + user + ", principalRule=" + principalRule, e);
- throw new PALAdminException("Could not remove the principalRule from the user. user=" + user + ", principalRule="
- + principalRule, e);
- }
}
@@ -681,11 +637,9 @@
// Role
//
- public List<Role> getRoles(RolePager pager)
- {
+ public List<Role> getRoles(RolePager pager) {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<Role> list = new ArrayList<Role>();
Role r = new Role();
r.setName("ROLE");
@@ -694,7 +648,8 @@
}
List<Role> roleList = new ArrayList<Role>();
- List<Principal> principals = getRoleSecurityHandler().getRolePrincipals(pager.getFilter());
+ List<Principal> principals = getRoleSecurityHandler()
+ .getRolePrincipals(pager.getFilter());
// set count
pager.setCount(principals.size());
@@ -703,13 +658,13 @@
int offset = pager.getOffset();
int limit = pager.getLimit();
int size = principals.size();
- if (logger.isDebugEnabled())
- {
- logger.debug("getRoles(RolePager) - pager.getFilter()=" + pager.getFilter());
- logger.debug("getRoles(RolePager) - offset=" + offset + ", limit=" + limit + ", size=" + size);
+ if (logger.isDebugEnabled()) {
+ logger.debug("getRoles(RolePager) - pager.getFilter()="
+ + pager.getFilter());
+ logger.debug("getRoles(RolePager) - offset=" + offset + ", limit="
+ + limit + ", size=" + size);
}
- for (int i = offset; i < offset + limit && i < size; i++)
- {
+ for (int i = offset; i < offset + limit && i < size; i++) {
Role r = new Role();
r.setName(principals.get(i).getName());
roleList.add(r);
@@ -719,57 +674,45 @@
}
- public void insertRole(Role role) throws PALAdminException
- {
+ public void insertRole(Role role) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
return;
}
- try
- {
+ try {
getRoleManager().addRole(role.getName());
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
throw new PALAdminException(e);
}
}
- public void deleteRole(Role role) throws PALAdminException
- {
+ public void deleteRole(Role role) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
return;
}
- try
- {
+ try {
getRoleManager().removeRole(role.getName());
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
throw new PALAdminException(e);
}
}
- public List<String> getRoleNames()
- {
+ public List<String> getRoleNames() {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<String> list = new ArrayList<String>();
list.add("ROLE");
return list;
}
List<String> roleList = new ArrayList<String>();
- List<Principal> principals = getRoleSecurityHandler().getRolePrincipals("");
+ List<Principal> principals = getRoleSecurityHandler()
+ .getRolePrincipals("");
- for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();)
- {
+ for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();) {
roleList.add(ite.next().getName());
}
@@ -777,30 +720,31 @@
}
- public void addPrincipalRuleToUser(User user, PrincipalRule principalRule) throws PALAdminException
- {
- try
- {
- getProfiler().setRuleForPrincipal(getUserPrincipal(user.getName()),
- getProfiler().getRule(principalRule.getProfilingRuleName()), principalRule.getLocatorName());
+ public void addPrincipalRuleToUser(User user, PrincipalRule principalRule)
+ throws PALAdminException {
+ try {
+ getProfiler()
+ .setRuleForPrincipal(
+ getUserPrincipal(user.getName()),
+ getProfiler().getRule(
+ principalRule.getProfilingRuleName()),
+ principalRule.getLocatorName());
+ } catch (SecurityException e) {
+ logger.error("Could not add the principal rule to user. user="
+ + user + ", principalRule=" + principalRule, e);
+ throw new PALAdminException(
+ "Could not add the principal rule to user. user=" + user
+ + ", principalRule=" + principalRule, e);
}
- catch (SecurityException e)
- {
- logger.error("Could not add the principal rule to user. user=" + user + ", principalRule=" + principalRule, e);
- throw new PALAdminException("Could not add the principal rule to user. user=" + user + ", principalRule="
- + principalRule, e);
- }
}
//
// Group
//
- public List<Group> getGroups(GroupPager pager)
- {
+ public List<Group> getGroups(GroupPager pager) {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<Group> list = new ArrayList<Group>();
Group entity = new Group();
entity.setName("GROUP");
@@ -809,7 +753,8 @@
}
List<Group> groupList = new ArrayList<Group>();
- List<Principal> principals = getGroupSecurityHandler().getGroupPrincipals(pager.getFilter());
+ List<Principal> principals = getGroupSecurityHandler()
+ .getGroupPrincipals(pager.getFilter());
// set count
pager.setCount(principals.size());
@@ -818,13 +763,13 @@
int offset = pager.getOffset();
int limit = pager.getLimit();
int size = principals.size();
- if (logger.isDebugEnabled())
- {
- logger.debug("getGroups(GroupPager) - pager.getFilter()=" + pager.getFilter());
- logger.debug("getGroups(GroupPager) - offset=" + offset + ", limit=" + limit + ", size=" + size);
+ if (logger.isDebugEnabled()) {
+ logger.debug("getGroups(GroupPager) - pager.getFilter()="
+ + pager.getFilter());
+ logger.debug("getGroups(GroupPager) - offset=" + offset
+ + ", limit=" + limit + ", size=" + size);
}
- for (int i = offset; i < offset + limit && i < size; i++)
- {
+ for (int i = offset; i < offset + limit && i < size; i++) {
Group r = new Group();
r.setName(principals.get(i).getName());
groupList.add(r);
@@ -834,57 +779,45 @@
}
- public void insertGroup(Group group) throws PALAdminException
- {
+ public void insertGroup(Group group) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
return;
}
- try
- {
+ try {
getGroupManager().addGroup(group.getName());
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
throw new PALAdminException(e);
}
}
- public void deleteGroup(Group group) throws PALAdminException
- {
+ public void deleteGroup(Group group) throws PALAdminException {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
return;
}
- try
- {
+ try {
getGroupManager().removeGroup(group.getName());
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
throw new PALAdminException(e);
}
}
- public List<String> getGroupNames()
- {
+ public List<String> getGroupNames() {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<String> list = new ArrayList<String>();
list.add("GROUP");
return list;
}
List<String> groupList = new ArrayList<String>();
- List<Principal> principals = getGroupSecurityHandler().getGroupPrincipals("");
+ List<Principal> principals = getGroupSecurityHandler()
+ .getGroupPrincipals("");
- for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();)
- {
+ for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();) {
groupList.add(ite.next().getName());
}
@@ -893,20 +826,18 @@
}
//TODO String to User
- public List<String> getGroupNamesForUsername(String username)
- {
+ public List<String> getGroupNamesForUsername(String username) {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<String> list = new ArrayList<String>();
list.add("GROUP");
return list;
}
List<String> groupList = new ArrayList<String>();
- Set<Principal> principals = getSecurityProvider().getSecurityMappingHandler().getGroupPrincipals(username);
- for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();)
- {
+ Set<Principal> principals = getSecurityProvider()
+ .getSecurityMappingHandler().getGroupPrincipals(username);
+ for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();) {
groupList.add(ite.next().getName());
}
@@ -914,20 +845,18 @@
}
- public List<String> getRoleNamesForUsername(String username)
- {
+ public List<String> getRoleNamesForUsername(String username) {
//Debug
- if (PALAdminConstants.DEBUG)
- {
+ if (PALAdminConstants.DEBUG) {
List<String> list = new ArrayList<String>();
list.add("GROUP");
return list;
}
List<String> roleList = new ArrayList<String>();
- Set<Principal> principals = getSecurityProvider().getSecurityMappingHandler().getRolePrincipals(username);
- for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();)
- {
+ Set<Principal> principals = getSecurityProvider()
+ .getSecurityMappingHandler().getRolePrincipals(username);
+ for (Iterator<Principal> ite = principals.iterator(); ite.hasNext();) {
roleList.add(ite.next().getName());
}
@@ -938,91 +867,77 @@
//
// User Attribute
//
- public void insertUserAttribute(String username, String key, String value) throws PALAdminException
- {
- if (username == null || key == null || value == null)
- {
+ public void insertUserAttribute(String username, String key, String value)
+ throws PALAdminException {
+ if (username == null || key == null || value == null) {
throw new PALAdminException("Invalid value(s).");
}
- try
- {
- org.apache.jetspeed.security.User j2user = getUserManager().getUser(username);
+ try {
+ org.apache.jetspeed.security.User j2user = getUserManager()
+ .getUser(username);
j2user.getUserAttributes().put(key, value);
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not access user attributes.", e);
throw new PALAdminException(e);
}
}
- public void deleteUserAttribute(String username, String key) throws PALAdminException
- {
- if (username == null || key == null)
- {
+ public void deleteUserAttribute(String username, String key)
+ throws PALAdminException {
+ if (username == null || key == null) {
throw new PALAdminException("Invalid value(s).");
}
- try
- {
- org.apache.jetspeed.security.User j2user = getUserManager().getUser(username);
+ try {
+ org.apache.jetspeed.security.User j2user = getUserManager()
+ .getUser(username);
j2user.getUserAttributes().remove(key);
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not access user attributes.", e);
throw new PALAdminException(e);
}
}
- public String getUserAttributeValue(String username, String key) throws PALAdminException
- {
- if (username == null || key == null)
- {
+ public String getUserAttributeValue(String username, String key)
+ throws PALAdminException {
+ if (username == null || key == null) {
return null;
}
- try
- {
- org.apache.jetspeed.security.User j2user = getUserManager().getUser(username);
+ try {
+ org.apache.jetspeed.security.User j2user = getUserManager()
+ .getUser(username);
return j2user.getUserAttributes().get(key, null);
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not get user attributes.", e);
throw new PALAdminException(e);
}
}
- public Map<String, String> getUserAttributes(UserAttributePager pager) throws PALAdminException
- {
+ public Map<String, String> getUserAttributes(UserAttributePager pager)
+ throws PALAdminException {
Map<String, String> map = new HashMap<String, String>();
- if (pager.getUser() == null || pager.getUser().getName() == null)
- {
+ if (pager.getUser() == null || pager.getUser().getName() == null) {
return map;
}
Preferences prefs;
String[] keys;
- try
- {
- org.apache.jetspeed.security.User j2user = getUserManager().getUser(pager.getUser().getName());
+ try {
+ org.apache.jetspeed.security.User j2user = getUserManager()
+ .getUser(pager.getUser().getName());
prefs = j2user.getUserAttributes();
keys = prefs.keys();
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not get user attributes.", e);
throw new PALAdminException(e);
- }
- catch (BackingStoreException e)
- {
+ } catch (BackingStoreException e) {
logger.error("Could not access user attributes.", e);
throw new PALAdminException(e);
}
@@ -1034,12 +949,11 @@
int offset = pager.getOffset();
int limit = pager.getLimit();
int size = keys.length;
- if (logger.isDebugEnabled())
- {
- logger.debug("getUserAttributess(GroupPager) - offset=" + offset + ", limit=" + limit + ", size=" + size);
+ if (logger.isDebugEnabled()) {
+ logger.debug("getUserAttributess(GroupPager) - offset=" + offset
+ + ", limit=" + limit + ", size=" + size);
}
- for (int i = offset; i < offset + limit && i < size; i++)
- {
+ for (int i = offset; i < offset + limit && i < size; i++) {
map.put(keys[i], prefs.get(keys[i], ""));
}
@@ -1049,43 +963,42 @@
//
// ProfilingRule
//
- public List<String> getProfilingRuleNames()
- {
+ public List<String> getProfilingRuleNames() {
ArrayList<String> list = new ArrayList<String>();
- for (Iterator<org.apache.jetspeed.profiler.rules.ProfilingRule> ite = getProfiler().getRules().iterator(); ite.hasNext();)
- {
- org.apache.jetspeed.profiler.rules.ProfilingRule profilingRule = ite.next();
+ for (Iterator<org.apache.jetspeed.profiler.rules.ProfilingRule> ite = getProfiler()
+ .getRules().iterator(); ite.hasNext();) {
+ org.apache.jetspeed.profiler.rules.ProfilingRule profilingRule = ite
+ .next();
list.add(profilingRule.getId());
}
return list;
}
- public List<PrincipalRule> getPrincipalRuleForUser(User user)
- {
+ public List<PrincipalRule> getPrincipalRuleForUser(User user) {
ArrayList<PrincipalRule> list = new ArrayList<PrincipalRule>();
- try
- {
+ try {
Principal userPrincipal = getUserPrincipal(user.getName());
- for (Iterator<org.apache.jetspeed.profiler.rules.PrincipalRule> ite = getProfiler().getRulesForPrincipal(userPrincipal)
- .iterator(); ite.hasNext();)
- {
- org.apache.jetspeed.profiler.rules.PrincipalRule rule = ite.next();
+ for (Iterator<org.apache.jetspeed.profiler.rules.PrincipalRule> ite = getProfiler()
+ .getRulesForPrincipal(userPrincipal).iterator(); ite
+ .hasNext();) {
+ org.apache.jetspeed.profiler.rules.PrincipalRule rule = ite
+ .next();
PrincipalRule principalRule = new PrincipalRule();
principalRule.setLocatorName(rule.getLocatorName());
- principalRule.setProfilingRuleName(rule.getProfilingRule().getId());
+ principalRule.setProfilingRuleName(rule.getProfilingRule()
+ .getId());
list.add(principalRule);
}
- }
- catch (SecurityException e)
- {
+ } catch (SecurityException e) {
logger.error("Could not get principal rules.", e);
}
return list;
}
- private Principal getUserPrincipal(String username) throws SecurityException
- {
- return PALAdminUtil.getPrincipal(getUserSubject(username), UserPrincipal.class);
+ private Principal getUserPrincipal(String username)
+ throws SecurityException {
+ return PALAdminUtil.getPrincipal(getUserSubject(username),
+ UserPrincipal.class);
}
}