From 7870152d23db4cb6f5834d4921fac17feb717220 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 Sep 2009 14:54:12 +0100
Subject: Allow load/save iar password checks to be done in grid mode This
 should allow load/save iar to work for grid mode as long as the grid user
 service is later than this revision Grid services of earlier revisions will
 always erroneously report incorrect password.  This will be addressed
 shortly.

---
 .../Communications/Local/LocalUserServices.cs      | 19 +++++++++-
 .../Region/Communications/OGS1/OGS1UserServices.cs | 43 +++++++++++++++++++++-
 .../Inventory/Archiver/InventoryArchiverModule.cs  | 21 +++--------
 3 files changed, 64 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index af4fb37..d18937e 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -80,6 +80,21 @@ namespace OpenSim.Region.Communications.Local
                 throw new Exception("[LOCAL USER SERVICES]: Unknown master user UUID. Possible reason: UserServer is not running.");
             }
             return data;
-        }       
+        }
+
+        public override bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+            UserProfileData userProfile = GetUserProfile(userID);
+
+            if (null == userProfile)
+                return false;
+      
+            string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt);
+    
+            if (md5PasswordHash == userProfile.PasswordHash)
+                return true;
+            else
+                return false;         
+        }        
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index dff8305..89b3e42 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -140,6 +140,47 @@ namespace OpenSim.Region.Communications.OGS1
         {
             m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID);
             return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID);
-        }  
+        }
+
+        public override bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["user_uuid"] = userID.ToString();
+                param["password"] = password;
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("authenticate_user_by_password", parameters);
+                XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+//                foreach (object key in respData.Keys)
+//                {                   
+//                    Console.WriteLine("respData {0}, {1}", key, respData[key]);
+//                }
+
+//                m_log.DebugFormat(
+//                    "[OGS1 USER SERVICES]: AuthenticatedUserByPassword response for {0} is [{1}]", 
+//                    userID, respData["auth_user"]);
+
+                if ((string)respData["auth_user"] == "TRUE")
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[OGS1 USER SERVICES]: Error when trying to authenticate user by password from remote user server: {0}",
+                    e);
+
+                return false;
+            }            
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 196205c..b82b940 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <param name="pass">User password</param>
         /// <returns></returns>
         protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass)
-        {
+        {            
             CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
             //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName);
             if (null == userInfo)
@@ -333,29 +333,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
             }
 
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(pass) + ":" + userInfo.UserProfile.PasswordSalt);
-
-            if (userInfo.UserProfile.PasswordHash == null || userInfo.UserProfile.PasswordHash == String.Empty)
+            if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass))
             {
-                m_log.ErrorFormat(
-                    "[INVENTORY ARCHIVER]: Sorry, the grid mode service is not providing password hash details for the check.  This will be fixed in an OpenSim git revision soon");
-
-                return null;
+                return userInfo;
             }
-
-//            m_log.DebugFormat(
-//                "[INVENTORY ARCHIVER]: received salt {0}, hash {1}, supplied hash {2}", 
-//                userInfo.UserProfile.PasswordSalt, userInfo.UserProfile.PasswordHash, md5PasswdHash);
-            
-            if (userInfo.UserProfile.PasswordHash != md5PasswdHash)
+            else
             {
                 m_log.ErrorFormat(
                     "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect.  Please try again.", 
                     firstName, lastName);
+                
                 return null;
             }
-            
-            return userInfo;
         }
         
         /// <summary>
-- 
cgit v1.1