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 
11403: NTLM authentication filter for SURF web-framework apps


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-12-17 05:53:21 +00:00
parent 9bce6404be
commit c5bdc7f05b
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/alfresco/templates/webscripts/org/alfresco/repository/touch.get.desc.xml Normal file
View File

@@ -0,0 +1,8 @@
<webscript>
<shortname>Touch</shortname>
<description>Touch the server - return a simple 200 OK status</description>
<url>/touch</url>
<format default="html"/>
<authentication>none</authentication>
<transaction>none</transaction>
</webscript>

0
config/alfresco/templates/webscripts/org/alfresco/repository/touch.get.html.ftl Normal file
View File

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

@@ -527,7 +527,7 @@ public abstract class BaseNTLMAuthenticationFilter implements Filter
{ {
// Passthru mode, send the hashed password details to the passthru authentication server // Passthru mode, send the hashed password details to the passthru authentication server
NTLMPassthruToken authToken = (NTLMPassthruToken) ntlmDetails.getAuthenticationToken(); NTLMPassthruToken authToken = (NTLMPassthruToken) ntlmDetails.getAuthenticationToken();
authToken.setUserAndPassword( type3Msg.getUserName(), type3Msg.getNTLMHash(), PasswordEncryptor.NTLM1); authToken.setUserAndPassword(type3Msg.getUserName(), type3Msg.getNTLMHash(), PasswordEncryptor.NTLM1);
try try
{ {
@@ -592,7 +592,7 @@ public abstract class BaseNTLMAuthenticationFilter implements Filter
if (ntlmDetails == null) if (ntlmDetails == null)
{ {
// No cached NTLM details // No cached NTLM details
ntlmDetails = new NTLMLogonDetails( userName, workstation, domain, false, m_srvName); ntlmDetails = new NTLMLogonDetails(userName, workstation, domain, false, m_srvName);
ntlmDetails.setNTLMHashedPassword(type3Msg.getNTLMHash()); ntlmDetails.setNTLMHashedPassword(type3Msg.getNTLMHash());
session.setAttribute(NTLM_AUTH_DETAILS, ntlmDetails); session.setAttribute(NTLM_AUTH_DETAILS, ntlmDetails);

18
source/java/org/alfresco/repo/webdav/auth/NTLMAuthenticationFilter.java
View File

@@ -256,8 +256,6 @@ public class NTLMAuthenticationFilter extends BaseNTLMAuthenticationFilter
protected SessionUser createUserEnvironment(HttpSession session, String userName) protected SessionUser createUserEnvironment(HttpSession session, String userName)
throws IOException, ServletException throws IOException, ServletException
{ {
Log logger = getLogger();
SessionUser user = null; SessionUser user = null;
UserTransaction tx = m_transactionService.getUserTransaction(); UserTransaction tx = m_transactionService.getUserTransaction();
@@ -266,15 +264,17 @@ public class NTLMAuthenticationFilter extends BaseNTLMAuthenticationFilter
{ {
tx.begin(); tx.begin();
// Get user details for the authenticated user
m_authComponent.setCurrentUser(userName.toLowerCase());
// The user name used may be a different case to the NTLM supplied user name,
// read the current user and use that name
userName = m_authComponent.getCurrentUserName();
// Setup User object and Home space ID etc. // Setup User object and Home space ID etc.
NodeRef personNodeRef = m_personService.getPerson(userName); NodeRef personNodeRef = m_personService.getPerson(userName);
// Use the system user context to do the user lookup
m_authComponent.setCurrentUser(m_authComponent.getSystemUserName());
// User name should match the uid in the person entry found
m_authComponent.setSystemUserAsCurrentUser();
userName = (String) m_nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
m_authComponent.setCurrentUser(userName);
String currentTicket = m_authService.getCurrentTicket(); String currentTicket = m_authService.getCurrentTicket();
user = new WebDAVUser(userName, currentTicket, personNodeRef); user = new WebDAVUser(userName, currentTicket, personNodeRef);