Author: taylor
Date: Mon Dec 1 13:53:21 2008
New Revision: 722251
URL: http://svn.apache.org/viewvc?rev=722251&view=rev
Log:
merging back from trunk
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java?rev=722251&r1=722250&r2=722251&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
Mon Dec 1 13:53:21 2008
@@ -40,6 +40,7 @@
import org.apache.jetspeed.security.SubjectHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
+import org.apache.jetspeed.security.UserSubjectPrincipal;
public class ShibbolethPortalFilter implements Filter
{
@@ -72,7 +73,7 @@
Subject subject = (Subject) request.getSession().getAttribute(PortalReservedParameters.SESSION_KEY_SUBJECT);
if (subject != null)
{
- Principal principal = SubjectHelper.getPrincipal(subject, User.class);
+ Principal principal = SubjectHelper.getPrincipal(subject, UserSubjectPrincipal.class);
if (principal != null)
{
if (principal.getName().equals(username))
@@ -96,12 +97,12 @@
try
{
authProvider.authenticate(username, username);
+ success = true;
}
catch (SecurityException e)
{
throw new ServletException();
}
- // success = userManager.authenticate(; // TODO: this is bogus, need to login with a
real password.
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org
|