inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-01-16 14:20:15 +00:00
parent 60e4ed397e
commit 533dee1800
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java
View File

@@ -338,6 +338,8 @@ public abstract class BaseKerberosAuthenticationFilter extends BaseSSOAuthentica
if ( getLogger().isErrorEnabled()) if ( getLogger().isErrorEnabled())
getLogger().error("Failed to validate user " + user.getUserName(), ex); getLogger().error("Failed to validate user " + user.getUserName(), ex);
removeSessionUser( httpSess);
reqAuth = true; reqAuth = true;
} }
} }

6
source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java
View File

@@ -250,6 +250,8 @@ public abstract class BaseNTLMAuthenticationFilter extends BaseSSOAuthentication
if (getLogger().isErrorEnabled()) if (getLogger().isErrorEnabled())
getLogger().error("Failed to validate user " + user.getUserName(), ex); getLogger().error("Failed to validate user " + user.getUserName(), ex);
removeSessionUser( httpSess);
reqAuth = true; reqAuth = true;
} }
} }
@@ -536,6 +538,8 @@ public abstract class BaseNTLMAuthenticationFilter extends BaseSSOAuthentication
if (logger.isErrorEnabled()) if (logger.isErrorEnabled())
logger.error("Failed to validate user " + user.getUserName(), ex); logger.error("Failed to validate user " + user.getUserName(), ex);
removeSessionUser(session);
onValidateFailed(req, res, session); onValidateFailed(req, res, session);
return; return;
} }
@@ -659,6 +663,8 @@ public abstract class BaseNTLMAuthenticationFilter extends BaseSSOAuthentication
if (logger.isErrorEnabled()) if (logger.isErrorEnabled())
logger.error("Failed to validate user " + user.getUserName(), ex); logger.error("Failed to validate user " + user.getUserName(), ex);
removeSessionUser(session);
onValidateFailed(req, res, session); onValidateFailed(req, res, session);
return; return;
} }

8
source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java
View File

@@ -249,6 +249,14 @@ public abstract class BaseSSOAuthenticationFilter implements Filter
return (SessionUser)session.getAttribute( getUserAttributeName()); return (SessionUser)session.getAttribute( getUserAttributeName());
} }
/**
* Remove the user from the session - after failed ticket auth
*/
protected void removeSessionUser(HttpSession session)
{
session.removeAttribute( getUserAttributeName());
}
/** /**
* Return the user object session attribute name * Return the user object session attribute name
* *