Refactor user services and separate authentication (issue-281)

Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd

1 files changed, 0 insertions, 170 deletions

diff --git a/src/test/java/com/gitblit/tests/LdapUserServiceTest.java b/src/test/java/com/gitblit/tests/LdapUserServiceTest.java
deleted file mode 100644
index 8bd90147..00000000
--- a/src/test/java/com/gitblit/tests/LdapUserServiceTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2012 John Crygier
- * Copyright 2012 gitblit.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gitblit.tests;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.gitblit.LdapUserService;
-import com.gitblit.models.UserModel;
-import com.gitblit.tests.mock.MemorySettings;
-import com.gitblit.tests.mock.MockRuntimeManager;
-import com.gitblit.utils.StringUtils;
-import com.unboundid.ldap.listener.InMemoryDirectoryServer;
-import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
-import com.unboundid.ldap.listener.InMemoryListenerConfig;
-import com.unboundid.ldif.LDIFReader;
-
-/**
- * An Integration test for LDAP that tests going against an in-memory UnboundID
- * LDAP server.
- *
- * @author jcrygier
- *
- */
-public class LdapUserServiceTest extends GitblitUnitTest {
-
-	private LdapUserService ldapUserService;
-
-	static int ldapPort = 1389;
-
-	@BeforeClass
-	public static void createInMemoryLdapServer() throws Exception {
-		InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=MyDomain");
-		config.addAdditionalBindCredentials("cn=Directory Manager", "password");
-		config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", ldapPort));
-		config.setSchema(null);
-
-		InMemoryDirectoryServer ds = new InMemoryDirectoryServer(config);
-		ds.importFromLDIF(true, new LDIFReader(LdapUserServiceTest.class.getResourceAsStream("resources/ldapUserServiceSampleData.ldif")));
-		ds.startListening();
-	}
-
-	@Before
-	public void createLdapUserService() {
-		ldapUserService = new LdapUserService();
-		ldapUserService.setup(new MockRuntimeManager(getSettings()));
-	}
-
-	private MemorySettings getSettings() {
-		Map<String, Object> backingMap = new HashMap<String, Object>();
-		backingMap.put("realm.ldap.server", "ldap://localhost:" + ldapPort);
-		backingMap.put("realm.ldap.domain", "");
-		backingMap.put("realm.ldap.username", "cn=Directory Manager");
-		backingMap.put("realm.ldap.password", "password");
-		backingMap.put("realm.ldap.backingUserService", "users.conf");
-		backingMap.put("realm.ldap.maintainTeams", "true");
-		backingMap.put("realm.ldap.accountBase", "OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain");
-		backingMap.put("realm.ldap.accountPattern", "(&(objectClass=person)(sAMAccountName=${username}))");
-		backingMap.put("realm.ldap.groupBase", "OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain");
-		backingMap.put("realm.ldap.groupPattern", "(&(objectClass=group)(member=${dn}))");
-		backingMap.put("realm.ldap.admins", "UserThree @Git_Admins \"@Git Admins\"");
-		backingMap.put("realm.ldap.displayName", "displayName");
-		backingMap.put("realm.ldap.email", "email");
-
-		MemorySettings ms = new MemorySettings(backingMap);
-		return ms;
-	}
-
-	@Test
-	public void testAuthenticate() {
-		UserModel userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
-		assertNotNull(userOneModel);
-		assertNotNull(userOneModel.getTeam("git_admins"));
-		assertNotNull(userOneModel.getTeam("git_users"));
-		assertTrue(userOneModel.canAdmin);
-
-		UserModel userOneModelFailedAuth = ldapUserService.authenticate("UserOne", "userTwoPassword".toCharArray());
-		assertNull(userOneModelFailedAuth);
-
-		UserModel userTwoModel = ldapUserService.authenticate("UserTwo", "userTwoPassword".toCharArray());
-		assertNotNull(userTwoModel);
-		assertNotNull(userTwoModel.getTeam("git_users"));
-		assertNull(userTwoModel.getTeam("git_admins"));
-		assertNotNull(userTwoModel.getTeam("git admins"));
-		assertTrue(userTwoModel.canAdmin);
-
-		UserModel userThreeModel = ldapUserService.authenticate("UserThree", "userThreePassword".toCharArray());
-		assertNotNull(userThreeModel);
-		assertNotNull(userThreeModel.getTeam("git_users"));
-		assertNull(userThreeModel.getTeam("git_admins"));
-		assertTrue(userThreeModel.canAdmin);
-	}
-
-	@Test
-	public void testDisplayName() {
-		UserModel userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
-		assertNotNull(userOneModel);
-		assertEquals("User One", userOneModel.displayName);
-
-		// Test more complicated scenarios - concat
-		MemorySettings ms = getSettings();
-		ms.put("realm.ldap.displayName", "${personalTitle}. ${givenName} ${surname}");
-		ldapUserService = new LdapUserService();
-		ldapUserService.setup(new MockRuntimeManager(ms));
-
-		userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
-		assertNotNull(userOneModel);
-		assertEquals("Mr. User One", userOneModel.displayName);
-	}
-
-	@Test
-	public void testEmail() {
-		UserModel userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
-		assertNotNull(userOneModel);
-		assertEquals("userone@gitblit.com", userOneModel.emailAddress);
-
-		// Test more complicated scenarios - concat
-		MemorySettings ms = getSettings();
-		ms.put("realm.ldap.email", "${givenName}.${surname}@gitblit.com");
-		ldapUserService = new LdapUserService();
-		ldapUserService.setup(new MockRuntimeManager(ms));
-
-		userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
-		assertNotNull(userOneModel);
-		assertEquals("User.One@gitblit.com", userOneModel.emailAddress);
-	}
-
-	@Test
-	public void testLdapInjection() {
-		// Inject so "(&(objectClass=person)(sAMAccountName=${username}))" becomes "(&(objectClass=person)(sAMAccountName=*)(userPassword=userOnePassword))"
-		// Thus searching by password
-
-		UserModel userOneModel = ldapUserService.authenticate("*)(userPassword=userOnePassword", "userOnePassword".toCharArray());
-		assertNull(userOneModel);
-	}
-
-	@Test
-	public void testLocalAccount() {
-		UserModel localAccount = new UserModel("bruce");
-		localAccount.displayName = "Bruce Campbell";
-		localAccount.password = StringUtils.MD5_TYPE + StringUtils.getMD5("gimmesomesugar");
-		ldapUserService.deleteUser(localAccount.username);
-		assertTrue("Failed to add local account",
-				ldapUserService.updateUserModel(localAccount));
-		assertEquals("Accounts are not equal!",
-				localAccount,
-				ldapUserService.authenticate(localAccount.username, "gimmesomesugar".toCharArray()));
-		assertTrue("Failed to delete local account!",
-				ldapUserService.deleteUser(localAccount.username));
-	}
-
-}