Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/test/java/com/gitblit/tests/LdapAuthenticationTest.java

@@ -39,6 +39,8 @@
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.tests.mock.MemorySettings;
import com.gitblit.utils.XssFilter;
import com.gitblit.utils.XssFilter.AllowXssFilter;
import com.unboundid.ldap.listener.InMemoryDirectoryServer;
import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
@@ -68,7 +70,7 @@
   private static InMemoryDirectoryServer ds;

   private IUserManager userManager;
	

   private AuthenticationManager auth;

   private MemorySettings settings;
@@ -96,15 +98,17 @@
   }

   private LdapAuthProvider newLdapAuthentication(IStoredSettings settings) {
      RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();
      userManager = new UserManager(runtime).start();
      XssFilter xssFilter = new AllowXssFilter();
      RuntimeManager runtime = new RuntimeManager(settings, xssFilter, GitBlitSuite.BASEFOLDER).start();
      userManager = new UserManager(runtime, null).start();
      LdapAuthProvider ldap = new LdapAuthProvider();
      ldap.setup(runtime, userManager);
      return ldap;
   }
	

   private AuthenticationManager newAuthenticationManager(IStoredSettings settings) {
      RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();
      XssFilter xssFilter = new AllowXssFilter();
      RuntimeManager runtime = new RuntimeManager(settings, xssFilter, GitBlitSuite.BASEFOLDER).start();
      AuthenticationManager auth = new AuthenticationManager(runtime, userManager);
      auth.addAuthenticationProvider(newLdapAuthentication(settings));
      return auth;
@@ -236,29 +240,42 @@

   @Test
   public void testAuthenticationManager() {
      UserModel userOneModel = auth.authenticate("UserOne", "userOnePassword".toCharArray());
      UserModel userOneModel = auth.authenticate("UserOne", "userOnePassword".toCharArray(), null);
      assertNotNull(userOneModel);
      assertNotNull(userOneModel.getTeam("git_admins"));
      assertNotNull(userOneModel.getTeam("git_users"));
      assertTrue(userOneModel.canAdmin);

      UserModel userOneModelFailedAuth = auth.authenticate("UserOne", "userTwoPassword".toCharArray());
      UserModel userOneModelFailedAuth = auth.authenticate("UserOne", "userTwoPassword".toCharArray(), null);
      assertNull(userOneModelFailedAuth);

      UserModel userTwoModel = auth.authenticate("UserTwo", "userTwoPassword".toCharArray());
      UserModel userTwoModel = auth.authenticate("UserTwo", "userTwoPassword".toCharArray(), null);
      assertNotNull(userTwoModel);
      assertNotNull(userTwoModel.getTeam("git_users"));
      assertNull(userTwoModel.getTeam("git_admins"));
      assertNotNull(userTwoModel.getTeam("git admins"));
      assertTrue(userTwoModel.canAdmin);

      UserModel userThreeModel = auth.authenticate("UserThree", "userThreePassword".toCharArray());
      UserModel userThreeModel = auth.authenticate("UserThree", "userThreePassword".toCharArray(), null);
      assertNotNull(userThreeModel);
      assertNotNull(userThreeModel.getTeam("git_users"));
      assertNull(userThreeModel.getTeam("git_admins"));
      assertTrue(userThreeModel.canAdmin);
   }

   @Test
   public void testBindWithUser() {
      settings.put(Keys.realm.ldap.bindpattern, "CN=${username},OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain");
      settings.put(Keys.realm.ldap.username, "");
      settings.put(Keys.realm.ldap.password, "");

      UserModel userOneModel = auth.authenticate("UserOne", "userOnePassword".toCharArray(), null);
      assertNotNull(userOneModel);

      UserModel userOneModelFailedAuth = auth.authenticate("UserOne", "userTwoPassword".toCharArray(), null);
      assertNull(userOneModelFailedAuth);
   }

   private int countLdapUsersInUserManager() {
      int ldapAccountCount = 0;
      for (UserModel userModel : userManager.getAllUsers()) {