Merged V3.0 to HEAD

11590: Explict list of Win binaries to include in tomcat bundle
   11592: Created an extra class between NTLanManAuthContext and the AuthContext base class. ETHREEOH-601.
   11593: Base the AuthTokenAuthContext on the new ChallengeAuthContext, implemented getChallenge() to retrieve the NTLM challenge from the auth token. ETHREEOH-601.
   11595: Changes to FTP base code required for passthru authentication.
   11596: Passthru FTP authenticator implementation.
   11604: Fix for ETHREEOH-715: Forms drop down is still present in 'Create Content Wizard'
   11605: Fix for ETHREEOH-726 - Unable to accept/reject email invite from Share when NTLM filter is enabled on web-tier.
   11609: Final part of fix for ETHREEOH-726 - fix to issue where login page would be displayed even though user had authenticated correctly over NTLM.
   11610: Correct NTLM sample config for web-tier.
   11611: Fix to ETHREEOH-728 - RSS feeds now work when NTLM is enabled.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12478 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 10:15:15 +00:00
parent 3b1910140f
commit 036e9179f7
4 changed files with 611 additions and 12 deletions

View File

@@ -24,7 +24,7 @@
*/
package org.alfresco.filesys.auth.cifs;
import org.alfresco.jlan.server.auth.AuthContext;
import org.alfresco.jlan.server.auth.ChallengeAuthContext;
import org.alfresco.repo.security.authentication.ntlm.NTLMPassthruToken;
/**
@@ -32,7 +32,7 @@ import org.alfresco.repo.security.authentication.ntlm.NTLMPassthruToken;
*
* @author gkspencer
*/
public class AuthTokenAuthContext extends AuthContext {
public class AuthTokenAuthContext extends ChallengeAuthContext {
// Passthru authentication token
@@ -57,4 +57,13 @@ public class AuthTokenAuthContext extends AuthContext {
{
return m_token;
}
/**
* Get the challenge
*
* return byte[]
*/
public byte[] getChallenge() {
return m_token.getChallenge().getBytes();
}
}