Refactor user services and separate authentication (issue-281)

Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd

3 files changed, 72 insertions, 0 deletions

diff --git a/src/test/resources/htpasswd/htpasswd-user.in b/src/test/resources/htpasswd/htpasswd-user.in
new file mode 100644
index 00000000..3ea87ede
--- /dev/null
+++ b/src/test/resources/htpasswd/htpasswd-user.in
@@ -0,0 +1,15 @@
+# User database
+
+# htpasswd generated entries
+
+# Plaintext
+redone:Yonder
+
+# Unix crypt() "GoRed!"
+redtwo:RMghf6oG.QwAs
+     
+ # Apache MD5  "GoBlue!"
+blueone:$apr1$phRTn/7N$237Owfhw5wZTdTyP9NPvC1
+
+# SHA1  "YayBlue!"
+bluetwo:{SHA}ITMvZI9OU5+Rx324C4jpf+MHAL8=
diff --git a/src/test/resources/htpasswd/htpasswd.in b/src/test/resources/htpasswd/htpasswd.in
new file mode 100644
index 00000000..f2900e70
--- /dev/null
+++ b/src/test/resources/htpasswd/htpasswd.in
@@ -0,0 +1,31 @@
+# User database
+
+user1:pass1
+user2:pass2
+
+# "externalPassword"
+leaderred:{SHA}2VZsTsVQYmWAMfQUjNAScpaAlJI=
+
+#user3:disabled
+	# user4:disabled
+
+# htpasswd generated entries
+
+# Plaintext
+plain:passWord
+
+# Unix crypt()  "password"
+crypt:6TmlbxqZ2kBIA
+     
+ # Apache MD5   "password"
+md5:$apr1$qAGGNfli$sAn14mn.WKId/3EQS7KSX0
+	
+
+# SHA1  "password"
+sha:{SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=
+
+
+trailing:.dAxRAQiOOlN.    
+
+	tabbed:$apr1$Is7zctsH$CMAXrGkgACQKgRYuQ5vHq.	
+    leading:$apr1$O1nQtxjE$8gN15gMeuF3W1Nr8Yz/6J.
diff --git a/src/test/resources/htpasswd/users.conf.in b/src/test/resources/htpasswd/users.conf.in
new file mode 100644
index 00000000..142265a4
--- /dev/null
+++ b/src/test/resources/htpasswd/users.conf.in
@@ -0,0 +1,26 @@
+[user "admin"]
+	password = admin
+	cookie = dd94709528bb1c83d08f3088d4043f4742891f4f
+	role = "#admin"
+	role = "#notfederated"
+[user "user1"]
+	password = "#externalAccount"
+	cookie = 6c7d13cf0aa43054d0fb620546e3a4d79e3d3e89
+	displayName = El Capitan
+	emailAddress = cheffe@example.com
+	role = "#admin"
+[user "user2"]
+	password = "#externalAccount"
+	cookie = d15eabb3a83c44a05ccbdaf3bf5fd1402d971e99
+	displayName = User Two
+	role = "#create"
+	role = "#fork"
+[user "staylocal"]
+	password = localUser
+	cookie = 0a99767e0259dc06ccae5ee6349177be289968f3
+	displayName = Local User
+	role = "#none"
+[user "leaderRed"]
+	password = localPassword
+	displayName = Red Leader
+	role = "#create"