Author: taylor
Date: Thu Oct 12 15:19:42 2006
New Revision: 463466
URL: http://svn.apache.org/viewvc?view=rev&rev=463466
Log:
patch from Sylvain RIBEYRON
http://issues.apache.org/jira/browse/JS2-526
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java?view=diff&rev=463466&r1=463465&r2=463466
==============================================================================
---
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
(original)
+++
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
Thu Oct 12 15:19:42 2006
@@ -52,34 +52,34 @@
{
/** <p>LoginModule debug mode is turned off by default.</p> */
- private boolean debug;
+ protected boolean debug;
/** <p>The authentication status.</p> */
- private boolean success;
+ protected boolean success;
/** <p>The commit status.</p> */
- private boolean commitSuccess;
+ protected boolean commitSuccess;
/** <p>The Subject to be authenticated.</p> */
- private Subject subject;
+ protected Subject subject;
/** <p>A CallbackHandler for communicating with the end user (prompting
for usernames and passwords, for example).</p> */
- private CallbackHandler callbackHandler;
+ protected CallbackHandler callbackHandler;
/** <p>State shared with other configured LoginModules.</p> */
- private Map sharedState;
+ protected Map sharedState;
/** <p>Options specified in the login Configuration for this particular
LoginModule.</p> */
- private Map options;
+ protected Map options;
/** <p>InternalUserPrincipal manager service.</p> */
- private UserManager ums;
+ protected UserManager ums;
/** The portal user role. */
- private String portalUserRole;
+ protected String portalUserRole;
/** <p>The user name.</p> */
- private String username;
+ protected String username;
/**
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java?view=diff&rev=463466&r1=463465&r2=463466
==============================================================================
---
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
(original)
+++
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
Thu Oct 12 15:19:42 2006
@@ -26,6 +26,7 @@
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.security.impl.DefaultLoginModule;
+import org.apache.jetspeed.security.impl.RolePrincipalImpl;
/**
* <p>Configures Subject principals for JBoss JAAS implementation
@@ -95,6 +96,8 @@
{
// add UserPrincipal to subject
subject.getPrincipals().add(getUserPrincipal(user));
- subject.getPrincipals().add(new
JBossGroup("Roles",getUserRoles(user)));
+ JBossGroup roles = new JBossGroup("Roles", getUserRoles(user));
+ roles.addMember(new RolePrincipalImpl(portalUserRole));
+ subject.getPrincipals().add(roles);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
