Implement plain password authentication partway. Tested, but no user

functionality yet.

1 files changed, 17 insertions, 11 deletions

diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 83ce0d0..7fdbbf6 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -56,8 +56,24 @@ namespace OpenSim.Services.AuthenticationService
         {
         }
 
-        public string Authenticate(UUID principalID, string password)
+        public string Authenticate(UUID principalID, string password, int lifetime)
         {
+            AuthenticationData data = m_Database.Get(principalID);
+            
+            if (!data.Data.ContainsKey("passwordHash") ||
+                !data.Data.ContainsKey("passwordSalt"))
+            {
+                return String.Empty;
+            }
+
+            string hashed = Util.Md5Hash(Util.Md5Hash(password) + ":" +
+                    data.Data["passwordSalt"].ToString());
+
+            if (data.Data["passwordHash"].ToString() == hashed)
+            {
+                return GetToken(principalID, lifetime);
+            }
+
             return String.Empty;
         }
 
@@ -65,15 +81,5 @@ namespace OpenSim.Services.AuthenticationService
         {
             return new byte[0];
         }
-
-        public bool Verify(UUID principalID, string token)
-        {
-            return false;
-        }
-
-        public bool VerifyEncrypted(byte[] cyphertext, byte[] key)
-        {
-            return false;
-        }
     }
 }