You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2008/09/09 17:48:05 UTC
svn commit: r693492 [3/3] -
/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/
Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java?rev=693492&r1=693491&r2=693492&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java Tue Sep 9 08:48:04 2008
@@ -28,8 +28,6 @@
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.portals.bridges.jsf.FacesPortlet;
/**
* Provides maintenance capabilities for User Administration.
@@ -50,11 +48,11 @@
}
// System.out.println("user manager = " + userManager);
try {
- Iterator users = userManager.getUsers("");
+ Iterator users = userManager.getUsers("").iterator();
while (users.hasNext()) {
User user = (User) users.next();
// System.out.println("++++ User = " + user);
- getPrincipal(user.getSubject(), UserPrincipal.class);
+// getPrincipal(user.getSubject(), User.class);
// System.out.println("principal = " + principal.getName());
}
} catch (SecurityException se) {
Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java?rev=693492&r1=693491&r2=693492&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java Tue Sep 9 08:48:04 2008
@@ -16,57 +16,29 @@
*/
package org.apache.jetspeed.portlets.security.users;
-import java.io.Serializable;
-import java.io.NotSerializableException;
-import java.util.Set;
-import java.util.List;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.Iterator;
-import java.util.prefs.Preferences;
-import java.security.Principal;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletRequest;
-
-import org.apache.wicket.RequestContext;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.PasswordTextField;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-
-import org.apache.portals.messaging.PortletMessaging;
+import java.util.LinkedList;
+import java.util.List;
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.audit.AuditActivity;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
-import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.document.NodeSet;
-import org.apache.jetspeed.profiler.Profiler;
-import org.apache.jetspeed.profiler.rules.PrincipalRule;
+import org.apache.jetspeed.portlets.security.SecurityResources;
+import org.apache.jetspeed.portlets.security.SecurityUtil;
import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.security.PasswordCredential;
import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.jetspeed.portlets.security.SecurityResources;
-import org.apache.jetspeed.portlets.security.SecurityUtil;
-
-import org.apache.jetspeed.portlets.wicket.component.LinkPropertyColumn;
-import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
+import org.apache.portals.messaging.PortletMessaging;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.PropertyModel;
/**
* User Add Wicket WebPage
@@ -99,24 +71,27 @@
throw new SecurityException(SecurityException.PASSWORD_REQUIRED);
}
- getUserManager().addUser(getUserName(), getPassword());
+ User user = getUserManager().addUser(getUserName());
+
getAuditActivity().logAdminUserActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.USER_CREATE, USER_ADMINISTRATION);
PortletMessaging.publish(getPortletRequest(), SecurityResources.TOPIC_USERS, SecurityResources.MESSAGE_REFRESH, "true");
PortletMessaging.publish(getPortletRequest(), SecurityResources.TOPIC_USERS, SecurityResources.MESSAGE_SELECTED, getUserName());
- User user = getUserManager().getUser(getUserName());
-
+ //User user = getUserManager().getUser(getUserName());
PasswordCredential credential = getCredential(user);
+ credential.setPassword(null,password);
+
if ( credential != null )
{
if (getChangePasswordRequiredOnFirstLogin() != credential.isUpdateRequired())
{
- getUserManager().setPasswordUpdateRequired(getUserName(), getChangePasswordRequiredOnFirstLogin());
+ credential.setUpdateRequired(getChangePasswordRequiredOnFirstLogin());
+ //getUserManager().setPasswordUpdateRequired(getUserName(), getChangePasswordRequiredOnFirstLogin());
}
}
-
+ getUserManager().storePasswordCredential(credential);
if (!SecurityUtil.isEmpty(getRole()) && user != null)
{
getRoleManager().addRoleToUser(getUserName(), getRole());
@@ -133,8 +108,9 @@
else
{
subsite = subsite + Folder.USER_FOLDER + getUserName();
- Preferences attributes = user.getUserAttributes();
- attributes.put(User.USER_INFO_SUBSITE, subsite);
+ //Preferences attributes = user.getUserAttributes();
+ //attributes.put(User.USER_INFO_SUBSITE, subsite);
+ user.getSecurityAttributes().getAttribute(User.USER_INFO_SUBSITE).setStringValue(subsite);
}
// copy the entire dir tree from the template folder
@@ -147,8 +123,8 @@
if (!SecurityUtil.isEmpty(getRule()) && user != null)
{
- Principal principal = SecurityUtil.getPrincipal(user.getSubject(), UserPrincipal.class);
- getProfiler().setRuleForPrincipal(principal, getProfiler().getRule(getRule()), "page");
+ //Principal principal = SecurityUtil.getPrincipal(user.getSubject(), UserPrincipal.class);
+ getProfiler().setRuleForPrincipal(user, getProfiler().getRule(getRule()), "page");
}
setResponsePage(WicketUserDetails.class);
@@ -178,10 +154,10 @@
try
{
- for (Iterator it = getRoleManager().getRoles(""); it.hasNext(); )
+ for (Iterator it = getRoleManager().getRoles("").iterator(); it.hasNext(); )
{
Role role = (Role) it.next();
- roles.add(role.getPrincipal().getName());
+ roles.add(role.getName());
}
}
catch (SecurityException e)
Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdmin.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdmin.java?rev=693492&r1=693491&r2=693492&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdmin.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdmin.java Tue Sep 9 08:48:04 2008
@@ -16,59 +16,24 @@
*/
package org.apache.jetspeed.portlets.security.users;
-import java.io.Serializable;
-import java.io.NotSerializableException;
-import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.prefs.Preferences;
-import java.security.Principal;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletSession;
import javax.portlet.PortletRequest;
-import org.apache.wicket.RequestContext;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.PasswordTextField;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-
-import org.apache.portals.messaging.PortletMessaging;
-
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.PortalReservedParameters;
+import org.apache.jetspeed.administration.PortalConfiguration;
import org.apache.jetspeed.audit.AuditActivity;
-import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.folder.FolderNotFoundException;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.page.PageManager;
+import org.apache.jetspeed.portlets.wicket.AdminWicketPortlet;
import org.apache.jetspeed.profiler.Profiler;
-import org.apache.jetspeed.profiler.rules.PrincipalRule;
-import org.apache.jetspeed.profiler.rules.ProfilingRule;
+import org.apache.jetspeed.security.GroupManager;
import org.apache.jetspeed.security.PasswordCredential;
-import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
-import org.apache.jetspeed.security.GroupManager;
-import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.jetspeed.portlets.security.SecurityResources;
-import org.apache.jetspeed.portlets.security.SecurityUtil;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.administration.PortalConfiguration;
-
-import org.apache.jetspeed.portlets.wicket.AdminWicketPortlet;
-import org.apache.jetspeed.portlets.wicket.component.LinkPropertyColumn;
-import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
+import org.apache.wicket.RequestContext;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
/**
* User Admin Wicket WebPage
@@ -136,8 +101,9 @@
}
protected PasswordCredential getCredential(User user)
- {
- PasswordCredential credential = null;
+ {
+ return getUserManager().getPasswordCredential(user);
+ /*PasswordCredential credential = null;
Set credentials = user.getSubject().getPrivateCredentials();
Iterator iter = credentials.iterator();
@@ -153,7 +119,7 @@
}
}
- return credential;
+ return credential;*/
}
protected String getIPAddress()
Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java?rev=693492&r1=693491&r2=693492&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java Tue Sep 9 08:48:04 2008
@@ -209,7 +209,7 @@
}
this.userNameList = new ArrayList();
- Iterator users = getUserManager().getUserNames(getSearchString());
+ Iterator users = getUserManager().getUserNames(getSearchString()).iterator();
while (users.hasNext())
{
Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.java?rev=693492&r1=693491&r2=693492&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.java Tue Sep 9 08:48:04 2008
@@ -17,96 +17,61 @@
package org.apache.jetspeed.portlets.security.users;
import java.io.Serializable;
-import java.io.NotSerializableException;
-import java.util.Collection;
-import java.util.List;
+import java.security.Principal;
import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Iterator;
+import java.util.Collection;
import java.util.Date;
-import java.util.Set;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.ResourceBundle;
-import java.security.Principal;
-import java.util.prefs.Preferences;
import java.util.prefs.BackingStoreException;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletRequest;
import javax.security.auth.Subject;
-import org.apache.wicket.RequestContext;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.PasswordTextField;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.RadioChoice;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-import org.apache.wicket.extensions.markup.html.tabs.ITab;
-import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
-import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-
-import org.apache.portals.messaging.PortletMessaging;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.PortalReservedParameters;
-import org.apache.jetspeed.administration.PortalConfiguration;
-import org.apache.jetspeed.administration.PortalConfigurationConstants;
import org.apache.jetspeed.audit.AuditActivity;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.container.JetspeedPortletContext;
-import org.apache.jetspeed.om.common.UserAttribute;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.folder.FolderNotFoundException;
-import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.page.document.NodeSet;
import org.apache.jetspeed.portlets.security.SecurityResources;
import org.apache.jetspeed.portlets.security.SecurityUtil;
-import org.apache.jetspeed.profiler.Profiler;
+import org.apache.jetspeed.portlets.wicket.component.CheckBoxPropertyColumn;
+import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
+import org.apache.jetspeed.portlets.wicket.component.TextFieldPropertyColumn;
import org.apache.jetspeed.profiler.rules.PrincipalRule;
import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.security.Group;
-import org.apache.jetspeed.security.GroupManager;
import org.apache.jetspeed.security.InvalidNewPasswordException;
import org.apache.jetspeed.security.InvalidPasswordException;
import org.apache.jetspeed.security.PasswordAlreadyUsedException;
import org.apache.jetspeed.security.PasswordCredential;
import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.jetspeed.security.om.InternalCredential;
-
-import org.apache.jetspeed.portlets.wicket.component.LinkPropertyColumn;
-import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
-import org.apache.jetspeed.portlets.wicket.component.SelectionImagePropertyColumn;
-import org.apache.jetspeed.portlets.wicket.component.CheckBoxPropertyColumn;
-import org.apache.jetspeed.portlets.wicket.component.TextFieldPropertyColumn;
-
-import org.apache.jetspeed.portlets.wicket.AdminWicketPortlet;
+import org.apache.portals.messaging.PortletMessaging;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
+import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.markup.html.form.RadioChoice;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
/**
* User Details Wicket WebPage
@@ -206,11 +171,12 @@
{
try
{
- Preferences attributes = user.getUserAttributes();
+ //Preferences attributes = user.getUserAttributes();
+ Map<String,String> attributes = user.getInfoMap();
- String firstName = attributes.get("user.name.given", "n/a");
- String lastName = attributes.get("user.name.family", "n/a");
- String subsite = attributes.get(User.USER_INFO_SUBSITE, null);
+ String firstName = attributes.get("user.name.given") == null ? "n/a":attributes.get("user.name.given");
+ String lastName = attributes.get("user.name.family") == null ? "n/a":attributes.get("user.name.family");
+ String subsite = user.getSecurityAttributes().getAttribute(User.USER_INFO_SUBSITE).getStringValue();
getUserManager().removeUser(getUserName());
@@ -268,7 +234,7 @@
if (this.user != null)
{
- this.userPrincipal = createPrincipal(this.user.getSubject(), UserPrincipal.class);
+ this.userPrincipal = user;
this.credential = getCredential(this.user);
}
}
@@ -377,15 +343,16 @@
{
public void onSubmit()
{
- Preferences prefs = user.getUserAttributes();
+ //Preferences prefs = user.getUserAttributes();
+ Map<String,String> attribs = user.getInfoMap();
for (Iterator it = userAttributes.iterator(); it.hasNext(); )
{
Map userAttrMap = (Map) it.next();
String userAttrName = (String) userAttrMap.get("name");
String userAttrValue = (String) userAttrMap.get("value");
- String oldUserAttrValue = user.getUserAttributes().get(userAttrName, "");
- prefs.put(userAttrName, userAttrValue);
+ String oldUserAttrValue = attribs.get(userAttrName);
+ attribs.put(userAttrName, userAttrValue);
getAuditActivity().logAdminAttributeActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.USER_UPDATE_ATTRIBUTE, userAttrName, oldUserAttrValue, userAttrValue, USER_ADMINISTRATION);
}
@@ -398,7 +365,8 @@
{
public void onSubmit()
{
- Preferences prefs = user.getUserAttributes();
+ //Preferences prefs = user.getUserAttributes();
+ Map<String,String> attribs = user.getInfoMap();
for (Iterator it = userAttributes.iterator(); it.hasNext(); )
{
@@ -408,7 +376,7 @@
{
String userAttrName = (String) userAttrMap.get("name");
String userAttrValue = (String) userAttrMap.get("value");
- prefs.remove(userAttrName);
+ attribs.remove(userAttrName);
getAuditActivity().logAdminAttributeActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.USER_DELETE_ATTRIBUTE, userAttrName, userAttrValue, "", USER_ADMINISTRATION);
}
@@ -432,8 +400,9 @@
if (userAttrName != null && userAttrName.trim().length() > 0)
{
- Preferences prefs = user.getUserAttributes();
- prefs.put(userAttrName, userAttrValue);
+ //Preferences prefs = user.getUserAttributes();
+ //prefs.put(userAttrName, userAttrValue);
+ user.getInfoMap().put(userAttrName, userAttrValue);
getAuditActivity().logAdminAttributeActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.USER_ADD_ATTRIBUTE, userAttrName, "", userAttrValue, USER_ADMINISTRATION);
}
@@ -492,24 +461,22 @@
if (user != null)
{
- try
- {
- Preferences prefs = user.getUserAttributes();
- String [] keys = prefs.keys();
-
- for (int i = 0; i < keys.length; i++)
- {
- Map item = new HashMap();
- item.put("checked", Boolean.FALSE);
- item.put("name", keys[i]);
- item.put("value", prefs.get(keys[i], ""));
-
- this.userAttributes.add(item);
- }
- }
- catch (BackingStoreException e)
- {
- }
+ //Preferences prefs = user.getUserAttributes();
+ Map<String,String> attribs = user.getInfoMap();
+ Map item = new HashMap();
+ //String [] keys = prefs.keys();
+
+ /*for (int i = 0; i < keys.length; i++)
+ {
+
+ item.put("checked", Boolean.FALSE);
+ item.put("name", keys[i]);
+ item.put("value", prefs.get(keys[i], ""));
+
+ this.userAttributes.add(item);
+ }*/
+ //Map item = new HashMap();
+ item.putAll(attribs);
}
}
}
@@ -543,23 +510,27 @@
try
{
boolean passwordSet = false;
-
+ User user = getUserManager().getUser(getUserName());
+ PasswordCredential credential = getUserManager().getPasswordCredential(user);
if ( getCredentialValue() != null && getCredentialValue().trim().length() > 0 )
{
- getUserManager().setPassword(getUserName(), null, getCredentialValue());
+ //getUserManager().setPassword(getUserName(), null, getCredentialValue());
+ credential.setPassword(null,getCredentialValue());
getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.PASSWORD_RESET, USER_ADMINISTRATION);
passwordSet = true;
}
if (getCredentialUpdateRequired() != credential.isUpdateRequired())
{
- getUserManager().setPasswordUpdateRequired(getUserName(), getCredentialUpdateRequired());
+ //getUserManager().setPasswordUpdateRequired(getUserName(), getCredentialUpdateRequired());
+ credential.setUpdateRequired(getCredentialUpdateRequired());
getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.PASSWORD_UPDATE_REQUIRED, USER_ADMINISTRATION);
}
if (getCredentialEnabled() != credential.isEnabled())
{
- getUserManager().setPasswordEnabled(getUserName(), getCredentialEnabled());
+ //getUserManager().setPasswordEnabled(getUserName(), getCredentialEnabled());
+ credential.setEnabled(getCredentialEnabled());
String activity = (getCredentialEnabled() ? AuditActivity.PASSWORD_ENABLED : AuditActivity.PASSWORD_DISABLED);
getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), activity, USER_ADMINISTRATION);
}
@@ -571,20 +542,25 @@
if (!passwordSet && expiredFlagStr.equals("expired"))
{
java.sql.Date today = new java.sql.Date(new Date().getTime());
- getUserManager().setPasswordExpiration(getUserName(), today);
+ //getUserManager().setPasswordExpiration(getUserName(), today);
+ credential.setExpirationDate(today);
getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.PASSWORD_EXPIRE, USER_ADMINISTRATION);
}
else if (expiredFlagStr.equals("extend"))
{
- getUserManager().setPasswordExpiration(getUserName(), null);
+ //getUserManager().setPasswordExpiration(getUserName(), null);
+ //TODO confirm with Ate/David
+ credential.setExpirationDate(User.MAX_DATE);
getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.PASSWORD_EXTEND, USER_ADMINISTRATION);
}
else if (expiredFlagStr.equals("unlimited"))
{
- getUserManager().setPasswordExpiration(getUserName(), InternalCredential.MAX_DATE);
+ //getUserManager().setPasswordExpiration(getUserName(), User.MAX_DATE);
+ credential.setExpirationDate(User.MAX_DATE);
getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(), getUserName(), AuditActivity.PASSWORD_UNLIMITED, USER_ADMINISTRATION);
}
}
+ getUserManager().storePasswordCredential(credential);
}
catch ( InvalidPasswordException ipe )
{
@@ -871,10 +847,10 @@
try
{
- for (Iterator it = getRoleManager().getRoles(""); it.hasNext(); )
+ for (Iterator it = getRoleManager().getRoles("").iterator(); it.hasNext(); )
{
Role role = (Role) it.next();
- this.fullRoleNames.add(role.getPrincipal().getName());
+ this.fullRoleNames.add(role.getName());
}
if (getUserName() != null)
@@ -885,7 +861,7 @@
{
Role role = (Role) it.next();
Map roleMap = new HashMap();
- roleMap.put("name", role.getPrincipal().getName());
+ roleMap.put("name", role.getName());
roleMap.put("checked", Boolean.FALSE);
this.roleNames.add(roleMap);
}
@@ -1052,10 +1028,10 @@
try
{
- for (Iterator it = getGroupManager().getGroups(""); it.hasNext(); )
+ for (Iterator it = getGroupManager().getGroups("").iterator(); it.hasNext(); )
{
Group group = (Group) it.next();
- this.fullGroupNames.add(group.getPrincipal().getName());
+ this.fullGroupNames.add(group.getName());
}
if (getUserName() != null)
@@ -1066,7 +1042,7 @@
{
Group group = (Group) it.next();
Map groupMap = new HashMap();
- groupMap.put("name", group.getPrincipal().getName());
+ groupMap.put("name", group.getName());
groupMap.put("checked", Boolean.FALSE);
this.groupNames.add(groupMap);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org