mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
@@ -310,15 +310,8 @@ public class AlfrescoCifsAuthenticator extends CifsAuthenticatorBase
|
||||
|
||||
// Save the authentication token for the second stage of the authentication
|
||||
|
||||
sess.setAuthenticationContext( new AuthTokenAuthContext( authToken));
|
||||
|
||||
// Get the challenge from the token
|
||||
|
||||
if ( authToken.getChallenge() != null)
|
||||
{
|
||||
authCtx = new NTLanManAuthContext( authToken.getChallenge().getBytes());
|
||||
sess.setAuthenticationContext( authCtx);
|
||||
}
|
||||
authCtx = new AuthTokenAuthContext( authToken);
|
||||
sess.setAuthenticationContext( authCtx);
|
||||
}
|
||||
|
||||
// Return the authentication context
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ public class AlfrescoFtpAuthenticator implements FTPAuthenticator {
|
||||
|
||||
if ( md4hash != null)
|
||||
{
|
||||
// Check if the client has supplied an NTLM hashed password, if not then do not allow access
|
||||
// Check if the client has supplied a password, if not then do not allow access
|
||||
|
||||
if ( client.getPassword() == null)
|
||||
return false;
|
||||
@@ -293,4 +293,11 @@ public class AlfrescoFtpAuthenticator implements FTPAuthenticator {
|
||||
{
|
||||
return m_alfrescoConfig.getTransactionService();
|
||||
}
|
||||
|
||||
/**
|
||||
* Close the authenticator, perform any cleanup
|
||||
*/
|
||||
public void closeAuthenticator()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,590 @@
|
||||
/*
|
||||
* Copyright (C) 2006-2008 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
|
||||
package org.alfresco.filesys.auth.ftp;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.InetAddress;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import javax.transaction.Status;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import net.sf.acegisecurity.Authentication;
|
||||
|
||||
import org.alfresco.config.ConfigElement;
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.filesys.AlfrescoConfigSection;
|
||||
import org.alfresco.filesys.ServerConfigurationBean;
|
||||
import org.alfresco.filesys.alfresco.AlfrescoClientInfo;
|
||||
import org.alfresco.jlan.ftp.FTPAuthenticator;
|
||||
import org.alfresco.jlan.ftp.FTPSrvSession;
|
||||
import org.alfresco.jlan.server.SrvSession;
|
||||
import org.alfresco.jlan.server.auth.ClientInfo;
|
||||
import org.alfresco.jlan.server.auth.PasswordEncryptor;
|
||||
import org.alfresco.jlan.server.auth.passthru.AuthSessionFactory;
|
||||
import org.alfresco.jlan.server.auth.passthru.AuthenticateSession;
|
||||
import org.alfresco.jlan.server.auth.passthru.DomainMapping;
|
||||
import org.alfresco.jlan.server.auth.passthru.PassthruServers;
|
||||
import org.alfresco.jlan.server.config.InvalidConfigurationException;
|
||||
import org.alfresco.jlan.server.config.SecurityConfigSection;
|
||||
import org.alfresco.jlan.server.config.ServerConfiguration;
|
||||
import org.alfresco.jlan.smb.Protocol;
|
||||
import org.alfresco.jlan.util.IPAddress;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* Passthru FTP Authenticator Class
|
||||
*
|
||||
* @author gkspencer
|
||||
*/
|
||||
public class PassthruFtpAuthenticator implements FTPAuthenticator {
|
||||
|
||||
// Logging
|
||||
|
||||
protected static final Log logger = LogFactory.getLog("org.alfresco.ftp.protocol.auth");
|
||||
|
||||
// Constants
|
||||
|
||||
public final static int DefaultSessionTmo = 5000; // 5 seconds
|
||||
public final static int MinSessionTmo = 2000; // 2 seconds
|
||||
public final static int MaxSessionTmo = 30000; // 30 seconds
|
||||
|
||||
// Passthru keep alive interval
|
||||
|
||||
public final static long PassthruKeepAliveInterval = 60000L; // 60 seconds
|
||||
|
||||
// Passthru servers used to authenticate users
|
||||
|
||||
private PassthruServers m_passthruServers;
|
||||
|
||||
// Password encryption, for CIFS NTLM style encryption/hashing
|
||||
|
||||
private PasswordEncryptor m_passwordEncryptor;
|
||||
|
||||
// Alfresco configuration section
|
||||
|
||||
private AlfrescoConfigSection m_alfrescoConfig;
|
||||
|
||||
// Security configuration
|
||||
|
||||
private SecurityConfigSection m_securityConfig;
|
||||
|
||||
/**
|
||||
* Initialize the authenticator
|
||||
*
|
||||
* @param config ServerConfiguration
|
||||
* @param params ConfigElement
|
||||
* @exception InvalidConfigurationException
|
||||
*/
|
||||
public void initialize(ServerConfiguration config, ConfigElement params)
|
||||
throws InvalidConfigurationException {
|
||||
|
||||
// Get the alfresco configuration section, required to get hold of various
|
||||
// services/components
|
||||
|
||||
m_alfrescoConfig = (AlfrescoConfigSection) config.getConfigSection(AlfrescoConfigSection.SectionName);
|
||||
|
||||
// Get the security configuration, for domain mapping
|
||||
|
||||
m_securityConfig = (SecurityConfigSection) config.getConfigSection(SecurityConfigSection.SectionName);
|
||||
|
||||
// Check that the required authentication classes are available
|
||||
|
||||
if ( m_alfrescoConfig == null || getAuthenticationComponent() == null)
|
||||
throw new InvalidConfigurationException("Authentication component not available");
|
||||
|
||||
// Create the password encryptor
|
||||
|
||||
m_passwordEncryptor = new PasswordEncryptor();
|
||||
|
||||
// Create the passthru authentication server list
|
||||
|
||||
m_passthruServers = new PassthruServers();
|
||||
|
||||
// Check if the session timeout has been specified
|
||||
|
||||
ConfigElement sessTmoElem = params.getChild("Timeout");
|
||||
if ( sessTmoElem != null) {
|
||||
|
||||
try {
|
||||
|
||||
// Validate the session timeout value
|
||||
|
||||
int sessTmo = Integer.parseInt(sessTmoElem.getValue());
|
||||
|
||||
// Range check the timeout
|
||||
|
||||
if ( sessTmo < MinSessionTmo || sessTmo > MaxSessionTmo)
|
||||
throw new InvalidConfigurationException("Invalid session timeout, valid range is " + MinSessionTmo + " to "
|
||||
+ MaxSessionTmo);
|
||||
|
||||
// Set the session timeout for connecting to an authentication server
|
||||
|
||||
m_passthruServers.setConnectionTimeout(sessTmo);
|
||||
}
|
||||
catch (NumberFormatException ex) {
|
||||
throw new InvalidConfigurationException("Invalid timeout value specified");
|
||||
}
|
||||
}
|
||||
|
||||
// Get the server configuration bean
|
||||
|
||||
ServerConfigurationBean configBean = null;
|
||||
|
||||
if ( config instanceof ServerConfigurationBean)
|
||||
configBean = (ServerConfigurationBean) config;
|
||||
|
||||
// Check if the local server should be used
|
||||
|
||||
String srvList = null;
|
||||
|
||||
if ( params.getChild("LocalServer") != null && configBean != null) {
|
||||
|
||||
// Get the local server name, trim the domain name
|
||||
|
||||
srvList = configBean.getLocalServerName( true);
|
||||
if ( srvList == null)
|
||||
throw new AlfrescoRuntimeException("Passthru authenticator failed to get local server name");
|
||||
}
|
||||
|
||||
// Check if a server name has been specified
|
||||
|
||||
ConfigElement srvNamesElem = params.getChild("Server");
|
||||
|
||||
if ( srvNamesElem != null && srvNamesElem.getValue().length() > 0) {
|
||||
|
||||
// Check if the server name was already set
|
||||
|
||||
if ( srvList != null)
|
||||
throw new AlfrescoRuntimeException("Set passthru server via local server or specify name");
|
||||
|
||||
// Get the passthru authenticator server name
|
||||
|
||||
srvList = srvNamesElem.getValue();
|
||||
}
|
||||
|
||||
// If the passthru server name has been set initialize the passthru connection
|
||||
|
||||
if ( srvList != null) {
|
||||
// Initialize using a list of server names/addresses
|
||||
|
||||
m_passthruServers.setServerList(srvList);
|
||||
}
|
||||
else {
|
||||
|
||||
// Get the domain/workgroup name
|
||||
|
||||
String domainName = null;
|
||||
|
||||
// Check if the local domain/workgroup should be used
|
||||
|
||||
if ( params.getChild("LocalDomain") != null && configBean != null) {
|
||||
|
||||
// Get the local domain/workgroup name
|
||||
|
||||
domainName = configBean.getLocalDomainName();
|
||||
}
|
||||
|
||||
// Check if a domain name has been specified
|
||||
|
||||
ConfigElement domNameElem = params.getChild("Domain");
|
||||
|
||||
if ( domNameElem != null && domNameElem.getValue().length() > 0) {
|
||||
|
||||
// Check if the authentication server has already been set, ie. server name was also
|
||||
// specified
|
||||
|
||||
if ( srvList != null)
|
||||
throw new AlfrescoRuntimeException("Specify server or domain name for passthru authentication");
|
||||
|
||||
domainName = domNameElem.getValue();
|
||||
}
|
||||
|
||||
// If the domain name has been set initialize the passthru connection
|
||||
|
||||
if ( domainName != null) {
|
||||
try {
|
||||
// Initialize using the domain
|
||||
|
||||
m_passthruServers.setDomain(domainName);
|
||||
}
|
||||
catch (IOException ex) {
|
||||
throw new AlfrescoRuntimeException("Error setting passthru domain, " + ex.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check if a protocol order has been set
|
||||
|
||||
ConfigElement protoOrderElem = params.getChild("ProtocolOrder");
|
||||
|
||||
if ( protoOrderElem != null && protoOrderElem.getValue().length() > 0)
|
||||
{
|
||||
// Parse the protocol order list
|
||||
|
||||
StringTokenizer tokens = new StringTokenizer( protoOrderElem.getValue(), ",");
|
||||
int primaryProto = Protocol.None;
|
||||
int secondaryProto = Protocol.None;
|
||||
|
||||
// There should only be one or two tokens
|
||||
|
||||
if ( tokens.countTokens() > 2)
|
||||
throw new AlfrescoRuntimeException("Invalid protocol order list, " + protoOrderElem.getValue());
|
||||
|
||||
// Get the primary protocol
|
||||
|
||||
if ( tokens.hasMoreTokens())
|
||||
{
|
||||
// Parse the primary protocol
|
||||
|
||||
String primaryStr = tokens.nextToken();
|
||||
|
||||
if ( primaryStr.equalsIgnoreCase( "TCPIP"))
|
||||
primaryProto = Protocol.NativeSMB;
|
||||
else if ( primaryStr.equalsIgnoreCase( "NetBIOS"))
|
||||
primaryProto = Protocol.TCPNetBIOS;
|
||||
else
|
||||
throw new AlfrescoRuntimeException("Invalid protocol type, " + primaryStr);
|
||||
|
||||
// Check if there is a secondary protocol, and validate
|
||||
|
||||
if ( tokens.hasMoreTokens())
|
||||
{
|
||||
// Parse the secondary protocol
|
||||
|
||||
String secondaryStr = tokens.nextToken();
|
||||
|
||||
if ( secondaryStr.equalsIgnoreCase( "TCPIP") && primaryProto != Protocol.NativeSMB)
|
||||
secondaryProto = Protocol.NativeSMB;
|
||||
else if ( secondaryStr.equalsIgnoreCase( "NetBIOS") && primaryProto != Protocol.TCPNetBIOS)
|
||||
secondaryProto = Protocol.TCPNetBIOS;
|
||||
else
|
||||
throw new AlfrescoRuntimeException("Invalid secondary protocol, " + secondaryStr);
|
||||
}
|
||||
}
|
||||
|
||||
// Set the protocol order used for passthru authentication sessions
|
||||
|
||||
AuthSessionFactory.setProtocolOrder( primaryProto, secondaryProto);
|
||||
|
||||
// DEBUG
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Protocol order primary=" + Protocol.asString(primaryProto) + ", secondary=" + Protocol.asString(secondaryProto));
|
||||
}
|
||||
|
||||
// Check if we have an authentication server
|
||||
|
||||
if ( m_passthruServers.getTotalServerCount() == 0)
|
||||
throw new AlfrescoRuntimeException("No valid authentication servers found for passthru");
|
||||
}
|
||||
|
||||
/**
|
||||
* Authenticate the user
|
||||
*
|
||||
* @param client ClientInfo
|
||||
* @param sess FTPSrvSession
|
||||
* @return boolean
|
||||
*/
|
||||
public boolean authenticateUser(ClientInfo client, FTPSrvSession sess) {
|
||||
|
||||
// Check that the client is an Alfresco client
|
||||
|
||||
if ( client instanceof AlfrescoClientInfo == false)
|
||||
return false;
|
||||
|
||||
// Check if this is a guest logon
|
||||
|
||||
boolean authSts = false;
|
||||
UserTransaction tx = null;
|
||||
|
||||
try {
|
||||
if ( client.isGuest()) {
|
||||
|
||||
// Get a guest authentication token
|
||||
|
||||
doGuestLogon((AlfrescoClientInfo) client, sess);
|
||||
|
||||
// Indicate logged on as guest
|
||||
|
||||
authSts = true;
|
||||
|
||||
// DEBUG
|
||||
|
||||
if ( logger.isDebugEnabled())
|
||||
logger.debug("Authenticated guest user " + client.getUserName() + " sts=" + authSts);
|
||||
|
||||
// Return the guest status
|
||||
|
||||
return authSts;
|
||||
}
|
||||
|
||||
// Start a transaction
|
||||
|
||||
tx = getTransactionService().getUserTransaction(false);
|
||||
tx.begin();
|
||||
|
||||
// Perform passthru authentication check
|
||||
|
||||
authSts = doPassthruUserAuthentication(client, sess);
|
||||
}
|
||||
catch (Exception ex) {
|
||||
if ( logger.isDebugEnabled())
|
||||
logger.debug(ex);
|
||||
}
|
||||
finally {
|
||||
|
||||
// Commit the transaction
|
||||
|
||||
if ( tx != null) {
|
||||
try {
|
||||
|
||||
// Commit or rollback the transaction
|
||||
|
||||
if ( tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
|
||||
|
||||
// Transaction is marked for rollback
|
||||
|
||||
tx.rollback();
|
||||
}
|
||||
else {
|
||||
// Commit the transaction
|
||||
|
||||
tx.commit();
|
||||
}
|
||||
}
|
||||
catch (Exception ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// DEBUG
|
||||
|
||||
if ( logger.isDebugEnabled())
|
||||
logger.debug("Authenticated user " + client.getUserName() + " sts=" + authSts + " via Passthru");
|
||||
|
||||
// Return the authentication status
|
||||
|
||||
return authSts;
|
||||
}
|
||||
|
||||
/**
|
||||
* Logon using the guest user account
|
||||
*
|
||||
* @param client AlfrescoClientInfo
|
||||
* @param sess SrvSession
|
||||
*/
|
||||
protected void doGuestLogon(AlfrescoClientInfo client, SrvSession sess) {
|
||||
|
||||
// Get a guest authentication token
|
||||
|
||||
getAuthenticationService().authenticateAsGuest();
|
||||
Authentication authToken = getAuthenticationComponent().getCurrentAuthentication();
|
||||
|
||||
client.setAuthenticationToken(authToken);
|
||||
|
||||
// Mark the client as being a guest logon
|
||||
|
||||
client.setGuest(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform passthru authentication
|
||||
*
|
||||
* @param client Client information
|
||||
* @param sess Server session
|
||||
* @return boolean
|
||||
*/
|
||||
private final boolean doPassthruUserAuthentication(ClientInfo client, SrvSession sess) {
|
||||
|
||||
// Authenticate the FTP user by opening a session to a remote CIFS server
|
||||
|
||||
boolean authSts = false;
|
||||
AuthenticateSession authSess = null;
|
||||
|
||||
try
|
||||
{
|
||||
// Try and map the client address to a domain
|
||||
|
||||
String domain = mapClientAddressToDomain( sess.getRemoteAddress());
|
||||
|
||||
authSess = m_passthruServers.openSession( false, domain);
|
||||
|
||||
if (authSess != null)
|
||||
{
|
||||
// Use the challenge key returned from the authentication server to generate the hashed password
|
||||
|
||||
byte[] challenge = authSess.getEncryptionKey();
|
||||
byte[] ntlmHash = m_passwordEncryptor.generateEncryptedPassword( client.getPasswordAsString(), challenge, PasswordEncryptor.NTLM1, client.getUserName(), null);
|
||||
|
||||
// Run the passthru authentication second stage
|
||||
|
||||
authSess.doSessionSetup(client.getDomain(), client.getUserName(), null, null, ntlmHash, 0);
|
||||
|
||||
// Check if the user has been logged on as a guest
|
||||
|
||||
if (authSess.isGuest())
|
||||
{
|
||||
// Get a guest authentication token
|
||||
|
||||
doGuestLogon((AlfrescoClientInfo) client, sess);
|
||||
|
||||
// Allow the user access as a guest
|
||||
|
||||
authSts = true;
|
||||
|
||||
// Debug
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Passthru authenticate user=" + client.getUserName() + ", GUEST");
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the current user to be authenticated, save the authentication token
|
||||
|
||||
AlfrescoClientInfo alfClient = (AlfrescoClientInfo) client;
|
||||
alfClient.setAuthenticationToken(getAuthenticationComponent().setCurrentUser(client.getUserName()));
|
||||
|
||||
// Passwords match, grant access
|
||||
|
||||
authSts = true;
|
||||
|
||||
// Logging
|
||||
|
||||
if ( logger.isInfoEnabled())
|
||||
logger.info("Logged on user " + client.getUserName() + " ( address " + sess.getRemoteAddress() + ")");
|
||||
}
|
||||
|
||||
// Close the passthru authentication session
|
||||
|
||||
authSess.CloseSession();
|
||||
authSess = null;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.error("Passthru error", ex);
|
||||
}
|
||||
finally {
|
||||
|
||||
// Make sure the authentication session has been closed
|
||||
|
||||
if ( authSess != null) {
|
||||
try {
|
||||
authSess.CloseSession();
|
||||
}
|
||||
catch( Exception ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Return the logon status
|
||||
|
||||
return authSts;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the authentication componenet
|
||||
*
|
||||
* @return AuthenticationComponent
|
||||
*/
|
||||
protected final AuthenticationComponent getAuthenticationComponent() {
|
||||
return m_alfrescoConfig.getAuthenticationComponent();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the authentication service
|
||||
*
|
||||
* @return AuthenticationService
|
||||
*/
|
||||
protected final AuthenticationService getAuthenticationService() {
|
||||
return m_alfrescoConfig.getAuthenticationService();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the transaction service
|
||||
*
|
||||
* @return TransactionService
|
||||
*/
|
||||
protected final TransactionService getTransactionService() {
|
||||
return m_alfrescoConfig.getTransactionService();
|
||||
}
|
||||
|
||||
/**
|
||||
* Map a client IP address to a domain
|
||||
*
|
||||
* @param clientIP InetAddress
|
||||
* @return String
|
||||
*/
|
||||
protected final String mapClientAddressToDomain(InetAddress clientIP) {
|
||||
|
||||
// Check if there are any domain mappings
|
||||
|
||||
if ( m_securityConfig.hasDomainMappings() == false)
|
||||
return null;
|
||||
|
||||
// Convert the client IP address to an integer value
|
||||
|
||||
int clientAddr = IPAddress.asInteger(clientIP);
|
||||
|
||||
for (DomainMapping domainMap : m_securityConfig.getDomainMappings()) {
|
||||
|
||||
if ( domainMap.isMemberOfDomain(clientAddr)) {
|
||||
|
||||
// DEBUG
|
||||
|
||||
if ( logger.isDebugEnabled())
|
||||
logger.debug("Mapped client IP " + clientIP + " to domain " + domainMap.getDomain());
|
||||
|
||||
return domainMap.getDomain();
|
||||
}
|
||||
}
|
||||
|
||||
// DEBUG
|
||||
|
||||
if ( logger.isDebugEnabled())
|
||||
logger.debug("Failed to map client IP " + clientIP + " to a domain");
|
||||
|
||||
// No domain mapping for the client address
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Close the authenticator
|
||||
*/
|
||||
public void closeAuthenticator()
|
||||
{
|
||||
// Close the passthru authentication server list
|
||||
|
||||
if ( m_passthruServers != null)
|
||||
m_passthruServers.shutdown();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user