1 files changed, 85 insertions, 5 deletions

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index dcf090e..e42f9a0 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -30,8 +30,11 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using System.Reflection;
-using OpenSim.Services.Base;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
 using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Services.Base;
 
 namespace OpenSim.Services.AuthenticationService
 {
@@ -43,11 +46,17 @@ namespace OpenSim.Services.AuthenticationService
     //
     public class AuthenticationServiceBase : ServiceBase
     {
-//        private static readonly ILog m_log =
-//                LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
  
         protected IAuthenticationData m_Database;
+        protected IUserAccountService m_UserAccountService = null;
+
+        public AuthenticationServiceBase(IConfigSource config, IUserAccountService acct) : this(config)
+        {
+            m_UserAccountService = acct;
+        }
 
         public AuthenticationServiceBase(IConfigSource config) : base(config)
         {
@@ -87,7 +96,7 @@ namespace OpenSim.Services.AuthenticationService
             m_Database = LoadPlugin<IAuthenticationData>(dllName,
                     new Object[] {connString, realm});
             if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module");
+                throw new Exception(string.Format("Could not find a storage interface in module {0}", dllName));
         }
 
         public bool Verify(UUID principalID, string token, int lifetime)
@@ -100,6 +109,76 @@ namespace OpenSim.Services.AuthenticationService
             return m_Database.CheckToken(principalID, token, 0);
         }
 
+        public virtual bool SetPassword(UUID principalID, string password)
+        {
+            string passwordSalt = Util.Md5Hash(UUID.Random().ToString());
+            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + passwordSalt);
+
+            AuthenticationData auth = m_Database.Get(principalID);
+            if (auth == null)
+            {
+                auth = new AuthenticationData();
+                auth.PrincipalID = principalID;
+                auth.Data = new System.Collections.Generic.Dictionary<string, object>();
+                auth.Data["accountType"] = "UserAccount";
+                auth.Data["webLoginKey"] = UUID.Zero.ToString();
+            }
+            auth.Data["passwordHash"] = md5PasswdHash;
+            auth.Data["passwordSalt"] = passwordSalt;
+            if (!m_Database.Store(auth))
+            {
+                m_log.DebugFormat("[AUTHENTICATION DB]: Failed to store authentication data");
+                return false;
+            }
+
+            m_log.InfoFormat("[AUTHENTICATION DB]: Set password for principalID {0}", principalID);
+            return true;
+        }
+
+        public virtual AuthInfo GetAuthInfo(UUID principalID)
+        {
+            AuthenticationData data = m_Database.Get(principalID);
+
+            if (data == null)
+            {
+                return null;
+            }
+            else
+            {
+                AuthInfo info
+                    = new AuthInfo()
+                        {
+                            PrincipalID = data.PrincipalID,
+                            AccountType = data.Data["accountType"] as string,
+                            PasswordHash = data.Data["passwordHash"] as string,
+                            PasswordSalt = data.Data["passwordSalt"] as string,
+                            WebLoginKey = data.Data["webLoginKey"] as string
+                        };
+
+                return info;
+            }
+        }
+
+        public virtual bool SetAuthInfo(AuthInfo info)
+        {
+            AuthenticationData auth = new AuthenticationData();
+            auth.PrincipalID = info.PrincipalID;
+            auth.Data = new System.Collections.Generic.Dictionary<string, object>();
+            auth.Data["accountType"] = info.AccountType;
+            auth.Data["webLoginKey"] = info.WebLoginKey;
+            auth.Data["passwordHash"] = info.PasswordHash;
+            auth.Data["passwordSalt"] = info.PasswordSalt;
+
+            if (!m_Database.Store(auth))
+            {
+                m_log.ErrorFormat("[AUTHENTICATION DB]: Failed to store authentication info.");
+                return false;
+            }
+
+            m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID);
+            return true;
+        }
+        
         protected string GetToken(UUID principalID, int lifetime)
         {
             UUID token = UUID.Random();
@@ -109,5 +188,6 @@ namespace OpenSim.Services.AuthenticationService
 
             return String.Empty;
         }
+
     }
 }