Refactor user services and separate authentication (issue-281)

Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd

5 files changed, 161 insertions, 0 deletions

diff --git a/src/test/resources/htpasswdUSTest/htpasswd-user.in b/src/test/resources/htpasswd/htpasswd-user.in
index 3ea87ede..3ea87ede 100644
--- a/src/test/resources/htpasswdUSTest/htpasswd-user.in
+++ b/src/test/resources/htpasswd/htpasswd-user.in
diff --git a/src/test/resources/htpasswdUSTest/htpasswd.in b/src/test/resources/htpasswd/htpasswd.in
index f2900e70..f2900e70 100644
--- a/src/test/resources/htpasswdUSTest/htpasswd.in
+++ b/src/test/resources/htpasswd/htpasswd.in
diff --git a/src/test/resources/htpasswdUSTest/users.conf.in b/src/test/resources/htpasswd/users.conf.in
index 142265a4..142265a4 100644
--- a/src/test/resources/htpasswdUSTest/users.conf.in
+++ b/src/test/resources/htpasswd/users.conf.in
diff --git a/src/test/resources/ldap/sampledata.ldif b/src/test/resources/ldap/sampledata.ldif
new file mode 100644
index 00000000..df79333e
--- /dev/null
+++ b/src/test/resources/ldap/sampledata.ldif
@@ -0,0 +1,108 @@
+dn: DC=MyDomain
+dc: MyDomain
+objectClass: top
+objectClass: domain
+
+dn: OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: organizationalUnit
+ou: MyOrganization
+
+dn: OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: organizationalUnit
+ou: UserControl
+
+dn: OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: organizationalUnit
+ou: Groups
+
+dn: CN=Git_Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: group
+cn: Git_Admins
+sAMAccountName: Git_Admins
+member: CN=UserOne,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+
+dn: CN=Git Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: group
+cn: Git Admins
+sAMAccountName: Git_Admins_With_Space
+member: CN=UserTwo,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+
+dn: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: group
+cn: Git_Users
+sAMAccountName: Git_Users
+member: CN=UserOne,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+member: CN=UserTwo,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+member: CN=UserThree,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+member: CN=UserFour,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+
+dn: OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: organizationalUnit
+ou: Users
+
+dn: OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: organizationalUnit
+ou: US
+
+dn: OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: top
+objectClass: organizationalUnit
+ou: Canada
+
+dn: CN=UserOne,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: user
+objectClass: person
+sAMAccountName: UserOne
+userPassword: userOnePassword
+displayName: User One
+givenName: User
+surname: One
+personalTitle: Mr
+email: userone@gitblit.com
+memberOf: CN=Git_Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+
+dn: CN=UserTwo,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: user
+objectClass: person
+sAMAccountName: UserTwo
+userPassword: userTwoPassword
+displayName: User Two
+givenName: User
+surname: Two
+personalTitle: Mr
+email: usertwo@gitblit.com
+memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+memberOf: CN=Git Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+
+dn: CN=UserThree,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: user
+objectClass: person
+sAMAccountName: UserThree
+userPassword: userThreePassword
+displayName: User Three
+givenName: User
+surname: Three
+personalTitle: Mrs
+email: userthree@gitblit.com
+memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
+
+dn: CN=UserFour,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
+objectClass: user
+objectClass: person
+sAMAccountName: UserFour
+userPassword: userFourPassword
+displayName: User Four
+givenName: User
+surname: Four
+personalTitle: Miss
+email: userfour@gitblit.com
+memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
\ No newline at end of file
diff --git a/src/test/resources/ldap/users.conf b/src/test/resources/ldap/users.conf
new file mode 100644
index 00000000..b4b4a6ea
--- /dev/null
+++ b/src/test/resources/ldap/users.conf
@@ -0,0 +1,53 @@
+[user "admin"]
+	password = admin
+	cookie = dd94709528bb1c83d08f3088d4043f4742891f4f
+	accountType = LOCAL
+	role = "#admin"
+	role = "#notfederated"
+[user "userthree"]
+	password = "#externalAccount"
+	cookie = d7d3894fc517612aa6c595555b6e1ab8e147e597
+	displayName = User Three
+	emailAddress = userthree@gitblit.com
+	accountType = LDAP
+	role = "#admin"
+[user "userone"]
+	password = "#externalAccount"
+	cookie = c97cd38e50858cd0b389ec61b18fb9a89b4da54c
+	displayName = Mr. User One
+	emailAddress = userone@gitblit.com
+	accountType = LDAP
+	role = "#admin"
+[user "usertwo"]
+	password = "#externalAccount"
+	cookie = 498ca9bd2841d39050fa45d1d737b9f9f767858d
+	displayName = User Two
+	emailAddress = usertwo@gitblit.com
+	accountType = LDAP
+	role = "#admin"
+[user "basic"]
+	password = MD5:f17aaabc20bfe045075927934fed52d2
+	cookie = dd94709528bb1c83d08f3088d4043f4742891f4f
+	accountType = LOCAL
+	role = "#fork"
+	repository = RW:~repocreator/shb.git
+	repository = V:test/gitective.git
+[user "repocreator"]
+	password = MD5:b77e53bb561c47368d133b22e285f60b
+	cookie = dd94709528bb1c83d08f3088d4043f4742891f4f
+	accountType = LOCAL
+	role = "#create"
+[team "Git_Admins"]
+	role = "#none"
+	accountType = LOCAL
+	user = userone
+[team "Git_Users"]
+	role = "#none"
+	accountType = LOCAL
+	user = userone
+	user = usertwo
+	user = userthree
+[team "Git Admins"]
+	role = "#none"
+	accountType = LOCAL
+	user = usertwo