Reverted mess of eclipse formatting.

This commit is contained in:
Clemens Rabe
2013-10-15 20:57:38 +02:00
parent 13bd150c6f
commit 814b940998
2 changed files with 459 additions and 403 deletions

View File

@@ -29,6 +29,8 @@
*
*/
package sonia.scm.web.security;
//~--- non-JDK imports --------------------------------------------------------
@@ -64,296 +66,324 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
*
*
* @author Sebastian Sdorra
*/
@Singleton
public class ChainAuthenticatonManager extends AbstractAuthenticationManager {
public class ChainAuthenticatonManager extends AbstractAuthenticationManager
{
/** Field description */
public static final String CACHE_NAME = "sonia.cache.auth";
/** Field description */
public static final String CACHE_NAME = "sonia.cache.auth";
/** the logger for ChainAuthenticatonManager */
private static final Logger logger = LoggerFactory
.getLogger(ChainAuthenticatonManager.class);
/** the logger for ChainAuthenticatonManager */
private static final Logger logger =
LoggerFactory.getLogger(ChainAuthenticatonManager.class);
// ~--- constructors
// ---------------------------------------------------------
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
*
*
* @param userManager
* @param authenticationHandlerSet
* @param encryptionHandler
* @param cacheManager
* @param authenticationListenerProvider
* @param authenticationListeners
*/
@Inject
public ChainAuthenticatonManager(UserManager userManager,
Set<AuthenticationHandler> authenticationHandlerSet,
EncryptionHandler encryptionHandler, CacheManager cacheManager,
Set<AuthenticationListener> authenticationListeners) {
AssertUtil.assertIsNotEmpty(authenticationHandlerSet);
AssertUtil.assertIsNotNull(cacheManager);
this.authenticationHandlers = sort(userManager,
authenticationHandlerSet);
this.encryptionHandler = encryptionHandler;
this.cache = cacheManager.getCache(String.class,
AuthenticationCacheValue.class, CACHE_NAME);
/**
* Constructs ...
*
*
*
* @param userManager
* @param authenticationHandlerSet
* @param encryptionHandler
* @param cacheManager
* @param authenticationListenerProvider
* @param authenticationListeners
*/
@Inject
public ChainAuthenticatonManager(UserManager userManager,
Set<AuthenticationHandler> authenticationHandlerSet,
EncryptionHandler encryptionHandler, CacheManager cacheManager,
Set<AuthenticationListener> authenticationListeners)
{
AssertUtil.assertIsNotEmpty(authenticationHandlerSet);
AssertUtil.assertIsNotNull(cacheManager);
this.authenticationHandlers = sort(userManager, authenticationHandlerSet);
this.encryptionHandler = encryptionHandler;
this.cache = cacheManager.getCache(String.class,
AuthenticationCacheValue.class, CACHE_NAME);
if (Util.isNotEmpty(authenticationListeners)) {
addListeners(authenticationListeners);
}
}
if (Util.isNotEmpty(authenticationListeners))
{
addListeners(authenticationListeners);
}
}
// ~--- methods
// --------------------------------------------------------------
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param request
* @param response
* @param username
* @param password
*
* @return
*/
@Override
public AuthenticationResult authenticate(HttpServletRequest request,
HttpServletResponse response, String username, String password) {
AssertUtil.assertIsNotEmpty(username);
AssertUtil.assertIsNotEmpty(password);
/**
* Method description
*
*
* @param request
* @param response
* @param username
* @param password
*
* @return
*/
@Override
public AuthenticationResult authenticate(HttpServletRequest request,
HttpServletResponse response, String username, String password)
{
AssertUtil.assertIsNotEmpty(username);
AssertUtil.assertIsNotEmpty(password);
String encryptedPassword = encryptionHandler.encrypt(password);
AuthenticationResult ar = getCached(username, encryptedPassword);
String encryptedPassword = encryptionHandler.encrypt(password);
AuthenticationResult ar = getCached(username, encryptedPassword);
if (ar == null) {
if (logger.isTraceEnabled()) {
logger.trace(
"no authentication result for user {} found in cache",
username);
}
if (ar == null)
{
if (logger.isTraceEnabled())
{
logger.trace("no authentication result for user {} found in cache",
username);
}
ar = doAuthentication(request, response, username, password);
ar = doAuthentication(request, response, username, password);
if ((ar != null) && ar.isCacheable()) {
cache.put(username, new AuthenticationCacheValue(ar,
encryptedPassword));
}
} else if (logger.isDebugEnabled()) {
logger.debug("authenticate {} via cache", username);
}
if ((ar != null) && ar.isCacheable())
{
cache.put(username,
new AuthenticationCacheValue(ar, encryptedPassword));
}
}
else if (logger.isDebugEnabled())
{
logger.debug("authenticate {} via cache", username);
}
return ar;
}
return ar;
}
/**
* Method description
*
*
* @throws IOException
*/
@Override
public void close() throws IOException {
for (AuthenticationHandler authenticator : authenticationHandlers) {
if (logger.isTraceEnabled()) {
logger.trace("close authenticator {}", authenticator.getClass());
}
/**
* Method description
*
*
* @throws IOException
*/
@Override
public void close() throws IOException
{
for (AuthenticationHandler authenticator : authenticationHandlers)
{
if (logger.isTraceEnabled())
{
logger.trace("close authenticator {}", authenticator.getClass());
}
IOUtil.close(authenticator);
}
}
IOUtil.close(authenticator);
}
}
/**
* Method description
*
*
* @param context
*/
@Override
public void init(SCMContextProvider context) {
for (AuthenticationHandler authenticator : authenticationHandlers) {
if (logger.isTraceEnabled()) {
logger.trace("initialize authenticator {}",
authenticator.getClass());
}
/**
* Method description
*
*
* @param context
*/
@Override
public void init(SCMContextProvider context)
{
for (AuthenticationHandler authenticator : authenticationHandlers)
{
if (logger.isTraceEnabled())
{
logger.trace("initialize authenticator {}", authenticator.getClass());
}
authenticator.init(context);
}
}
authenticator.init(context);
}
}
/**
* Method description
*
*
* @param request
* @param response
* @param username
* @param password
*
* @return
*/
private AuthenticationResult doAuthentication(HttpServletRequest request,
HttpServletResponse response, String username, String password) {
AuthenticationResult ar = null;
/**
* Method description
*
*
* @param request
* @param response
* @param username
* @param password
*
* @return
*/
private AuthenticationResult doAuthentication(HttpServletRequest request,
HttpServletResponse response, String username, String password)
{
AuthenticationResult ar = null;
if (logger.isTraceEnabled()) {
logger.trace("start authentication chain for user {}", username);
}
if (logger.isTraceEnabled())
{
logger.trace("start authentication chain for user {}", username);
}
for (AuthenticationHandler authenticator : authenticationHandlers) {
if (logger.isTraceEnabled()) {
logger.trace("check authenticator {} for user {}",
authenticator.getClass(), username);
}
for (AuthenticationHandler authenticator : authenticationHandlers)
{
if (logger.isTraceEnabled())
{
logger.trace("check authenticator {} for user {}",
authenticator.getClass(), username);
}
try {
AuthenticationResult result = authenticator.authenticate(
request, response, username, password);
try
{
AuthenticationResult result = authenticator.authenticate(request,
response, username, password);
if (logger.isDebugEnabled()) {
logger.debug("authenticator {} ends with result, {}",
authenticator.getClass().getName(), result);
}
if (logger.isDebugEnabled())
{
logger.debug("authenticator {} ends with result, {}",
authenticator.getClass().getName(), result);
}
// CR: Removed check on state=failed to allow next module to
// continue
if ((result != null) && (result.getState() != null)
&& result.getState().isSuccessfully()) {
if (result.getUser() != null) {
User user = result.getUser();
// CR: Removed check on state=failed to allow next module to
// continue
if ((result != null) && (result.getState() != null)
&& result.getState().isSuccessfully())
{
if (result.getUser() != null)
{
User user = result.getUser();
user.setType(authenticator.getType());
ar = result;
user.setType(authenticator.getType());
ar = result;
// notify authentication listeners
fireAuthenticationEvent(request, response, user);
}
// notify authentication listeners
fireAuthenticationEvent(request, response, user);
}
break;
}
} catch (Exception ex) {
logger.error("error durring authentication process of "
.concat(authenticator.getClass().getName()), ex);
}
}
break;
}
}
catch (Exception ex)
{
logger.error(
"error durring authentication process of ".concat(
authenticator.getClass().getName()), ex);
}
}
return ar;
}
return ar;
}
/**
* Method description
*
*
* @param userManager
* @param authenticationHandlerSet
*
* @return
*/
@VisibleForTesting
private List<AuthenticationHandler> sort(UserManager userManager,
Set<AuthenticationHandler> authenticationHandlerSet) {
List<AuthenticationHandler> handlers = Lists
.newArrayListWithCapacity(authenticationHandlerSet.size());
/**
* Method description
*
*
* @param userManager
* @param authenticationHandlerSet
*
* @return
*/
@VisibleForTesting
private List<AuthenticationHandler> sort(UserManager userManager,
Set<AuthenticationHandler> authenticationHandlerSet)
{
List<AuthenticationHandler> handlers =
Lists.newArrayListWithCapacity(authenticationHandlerSet.size());
String first = Strings.nullToEmpty(userManager.getDefaultType());
String first = Strings.nullToEmpty(userManager.getDefaultType());
for (AuthenticationHandler handler : authenticationHandlerSet) {
if (first.equals(handler.getType())) {
handlers.add(0, handler);
} else {
handlers.add(handler);
}
}
for (AuthenticationHandler handler : authenticationHandlerSet)
{
if (first.equals(handler.getType()))
{
handlers.add(0, handler);
}
else
{
handlers.add(handler);
}
}
return handlers;
}
return handlers;
}
// ~--- get methods
// ----------------------------------------------------------
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param username
* @param encryptedPassword
*
* @return
*/
private AuthenticationResult getCached(String username,
String encryptedPassword) {
AuthenticationResult result = null;
AuthenticationCacheValue value = cache.get(username);
/**
* Method description
*
*
* @param username
* @param encryptedPassword
*
* @return
*/
private AuthenticationResult getCached(String username,
String encryptedPassword)
{
AuthenticationResult result = null;
AuthenticationCacheValue value = cache.get(username);
if (value != null) {
String cachedPassword = value.password;
if (value != null)
{
String cachedPassword = value.password;
if (cachedPassword.equals(encryptedPassword)) {
result = value.authenticationResult;
}
}
if (cachedPassword.equals(encryptedPassword))
{
result = value.authenticationResult;
}
}
return result;
}
return result;
}
// ~--- inner classes
// --------------------------------------------------------
//~--- inner classes --------------------------------------------------------
/**
* Class description
*
*
* @version Enter version here..., 2011-01-15
* @author Sebastian Sdorra
*/
private static class AuthenticationCacheValue implements Serializable {
/**
* Class description
*
*
* @version Enter version here..., 2011-01-15
* @author Sebastian Sdorra
*/
private static class AuthenticationCacheValue implements Serializable
{
/** Field description */
private static final long serialVersionUID = 2201116145941277549L;
/** Field description */
private static final long serialVersionUID = 2201116145941277549L;
// ~--- constructors
// -------------------------------------------------------
//~--- constructors -------------------------------------------------------
/**
* Constructs ...
*
*
*
* @param ar
* @param password
*/
public AuthenticationCacheValue(AuthenticationResult ar, String password) {
this.authenticationResult = new AuthenticationResult(ar.getUser()
.clone(), ar.getGroups(), ar.getState());
this.password = password;
}
/**
* Constructs ...
*
*
*
* @param ar
* @param password
*/
public AuthenticationCacheValue(AuthenticationResult ar, String password)
{
this.authenticationResult =
new AuthenticationResult(ar.getUser().clone(), ar.getGroups(),
ar.getState());
this.password = password;
}
// ~--- fields
// -------------------------------------------------------------
//~--- fields -------------------------------------------------------------
/** Field description */
private AuthenticationResult authenticationResult;
/** Field description */
private AuthenticationResult authenticationResult;
/** Field description */
private String password;
}
/** Field description */
private String password;
}
// ~--- fields
// ---------------------------------------------------------------
/** Field description */
private List<AuthenticationHandler> authenticationHandlers;
//~--- fields ---------------------------------------------------------------
/** Field description */
private Cache<String, AuthenticationCacheValue> cache;
/** Field description */
private List<AuthenticationHandler> authenticationHandlers;
/** Field description */
private EncryptionHandler encryptionHandler;
/** Field description */
private Cache<String, AuthenticationCacheValue> cache;
/** Field description */
private EncryptionHandler encryptionHandler;
}