Author: ate
Date: Tue Sep 16 14:09:13 2008
New Revision: 696059
URL: http://svn.apache.org/viewvc?rev=696059&view=rev
Log:
adjusting the JBossLoginModule for the changes in DefaultLoginModule
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java?rev=696059&r1=696058&r2=696059&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
(original)
+++
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
Tue Sep 16 14:09:13 2008
@@ -25,9 +25,13 @@
import javax.security.auth.Subject;
+import org.apache.jetspeed.security.AuthenticatedUser;
import org.apache.jetspeed.security.AuthenticationProvider;
+import org.apache.jetspeed.security.Role;
+import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
+import org.apache.jetspeed.security.UserSubjectPrincipal;
import org.apache.jetspeed.security.impl.DefaultLoginModule;
import org.apache.jetspeed.security.impl.RoleImpl;
@@ -100,14 +104,15 @@
super(authProvider, userManager, portalUserRole);
}
- protected void commitSubject(Subject containerSubject, User user,
List<Principal> rolePrincipals)
+ protected void commitSubject(Subject containerSubject, Subject
jetspeedSubject, AuthenticatedUser user)
{
// add user specific portal user name and roles
- subject.getPrincipals().add(user);
+ Principal userSubjectPrincipal =
SecurityHelper.getPrincipal(jetspeedSubject, UserSubjectPrincipal.class);
+ subject.getPrincipals().add(userSubjectPrincipal);
boolean hasPortalUserRole = false;
JBossGroup roles = new JBossGroup("Roles");
- for (Principal role : rolePrincipals)
+ for (Principal role : SecurityHelper.getPrincipals(jetspeedSubject,
Role.class))
{
roles.addMember(role);
if (role.getName().equals(portalUserRole))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
