Merge branch 'ticket/129' into develop

James Moger

2014-09-30 f685ea581f94373a63bcdc94ec417fdf92a95d68

 src/main/java/com/gitblit/manager/AuthenticationManager.java

@@ -27,8 +27,8 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

import org.apache.wicket.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -53,7 +53,6 @@
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.X509Utils.X509Metadata;
import com.gitblit.wicket.GitBlitWebSession;
import com.google.inject.Inject;
import com.google.inject.Singleton;

@@ -205,7 +204,7 @@
               UserModel user = userManager.getUserModel(username);
               if (user != null) {
                  // existing user
                  flagWicketSession(AuthenticationType.CONTAINER);
                  flagSession(httpRequest, AuthenticationType.CONTAINER);
                  logger.debug(MessageFormat.format("{0} authenticated by servlet container principal from {1}",
                        user.username, httpRequest.getRemoteAddr()));
                  return validateAuthentication(user, AuthenticationType.CONTAINER);
@@ -217,7 +216,7 @@
                  user.password = Constants.EXTERNAL_ACCOUNT;
                  user.accountType = AccountType.CONTAINER;
                  userManager.updateUserModel(user);
                  flagWicketSession(AuthenticationType.CONTAINER);
                  flagSession(httpRequest, AuthenticationType.CONTAINER);
                  logger.debug(MessageFormat.format("{0} authenticated and created by servlet container principal from {1}",
                        user.username, httpRequest.getRemoteAddr()));
                  return validateAuthentication(user, AuthenticationType.CONTAINER);
@@ -238,7 +237,7 @@
         UserModel user = userManager.getUserModel(model.username);
         X509Metadata metadata = HttpUtils.getCertificateMetadata(httpRequest);
         if (user != null) {
            flagWicketSession(AuthenticationType.CERTIFICATE);
            flagSession(httpRequest, AuthenticationType.CERTIFICATE);
            logger.debug(MessageFormat.format("{0} authenticated by client certificate {1} from {2}",
                  user.username, metadata.serialNumber, httpRequest.getRemoteAddr()));
            return validateAuthentication(user, AuthenticationType.CERTIFICATE);
@@ -260,7 +259,7 @@
      if (!StringUtils.isEmpty(cookie)) {
         user = userManager.getUserModel(cookie.toCharArray());
         if (user != null) {
            flagWicketSession(AuthenticationType.COOKIE);
            flagSession(httpRequest, AuthenticationType.COOKIE);
            logger.debug(MessageFormat.format("{0} authenticated by cookie from {1}",
               user.username, httpRequest.getRemoteAddr()));
            return validateAuthentication(user, AuthenticationType.COOKIE);
@@ -282,7 +281,7 @@
            char[] password = values[1].toCharArray();
            user = authenticate(username, password);
            if (user != null) {
               flagWicketSession(AuthenticationType.CREDENTIALS);
               flagSession(httpRequest, AuthenticationType.CREDENTIALS);
               logger.debug(MessageFormat.format("{0} authenticated by BASIC request header from {1}",
                     user.username, httpRequest.getRemoteAddr()));
               return validateAuthentication(user, AuthenticationType.CREDENTIALS);
@@ -347,13 +346,8 @@
      return user;
   }

   protected void flagWicketSession(AuthenticationType authenticationType) {
      RequestCycle requestCycle = RequestCycle.get();
      if (requestCycle != null) {
         // flag the Wicket session, if this is a Wicket request
         GitBlitWebSession session = GitBlitWebSession.get();
         session.authenticationType = authenticationType;
      }
   protected void flagSession(HttpServletRequest httpRequest, AuthenticationType authenticationType) {
      httpRequest.getSession().setAttribute(Constants.AUTHENTICATION_TYPE, authenticationType);
   }

   /**
@@ -474,8 +468,9 @@
   @Override
   public void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user) {
      if (settings.getBoolean(Keys.web.allowCookieAuthentication, true)) {
         GitBlitWebSession session = GitBlitWebSession.get();
         boolean standardLogin = session.authenticationType.isStandard();
         HttpSession session = request.getSession();
         AuthenticationType authenticationType = (AuthenticationType) session.getAttribute(Constants.AUTHENTICATION_TYPE);
         boolean standardLogin = authenticationType.isStandard();

         if (standardLogin) {
            Cookie userCookie;