8 files changed, 176 insertions, 124 deletions

diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
index 5651a17..dedf876 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
@@ -39,6 +39,10 @@ using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Grid.Framework;
 using Timer = System.Timers.Timer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 
 namespace OpenSim.Grid.MessagingServer.Modules
 {
@@ -52,6 +56,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
 
         private IGridServiceCore m_messageCore;
 
+        private IGridService m_GridService;
+
         // a dictionary of all current regions this server knows about
         private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();
 
@@ -59,6 +65,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
         {
             m_cfg = config;
             m_messageCore = messageCore;
+
+            m_GridService = new GridServicesConnector(m_cfg.GridServerURL);
         }
 
         public void Initialise()
@@ -134,51 +142,30 @@ namespace OpenSim.Grid.MessagingServer.Modules
         /// <returns></returns>
         public RegionProfileData RequestRegionInfo(ulong regionHandle)
         {
-            RegionProfileData regionProfile = null;
-            try
-            {
-                Hashtable requestData = new Hashtable();
-                requestData["region_handle"] = regionHandle.ToString();
-                requestData["authkey"] = m_cfg.GridSendKey;
-
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(requestData);
+            uint x = 0, y = 0;
+            Utils.LongToUInts(regionHandle, out x, out y);
+            GridRegion region = m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
 
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
+            if (region != null)
+                return GridRegionToRegionProfile(region);
 
-                XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
-
-                Hashtable responseData = (Hashtable)GridResp.Value;
-
-                if (responseData.ContainsKey("error"))
-                {
-                    m_log.Error("[GRID]: error received from grid server" + responseData["error"]);
-                    return null;
-                }
-
-                uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
-                uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
-                string internalIpStr = (string)responseData["sim_ip"];
-
-                regionProfile = new RegionProfileData();
-                regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
-                regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";
-                regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
-                regionProfile.regionLocX = regX;
-                regionProfile.regionLocY = regY;
-
-                regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
-                regionProfile.UUID = new UUID((string)responseData["region_UUID"]);
-                regionProfile.regionName = (string)responseData["region_name"];
-            }
-            catch (WebException)
-            {
-                m_log.Error("[GRID]: " +
-                            "Region lookup failed for: " + regionHandle.ToString() +
-                            " - Is the GridServer down?");
-            }
+            else
+                return null;
+        }
 
-            return regionProfile;
+        private RegionProfileData GridRegionToRegionProfile(GridRegion region)
+        {
+            RegionProfileData rprofile = new RegionProfileData();
+            rprofile.httpPort = region.HttpPort;
+            rprofile.httpServerURI = region.ServerURI;
+            rprofile.regionLocX = (uint)(region.RegionLocX / Constants.RegionSize);
+            rprofile.regionLocY = (uint)(region.RegionLocY / Constants.RegionSize);
+            rprofile.RegionName = region.RegionName;
+            rprofile.ServerHttpPort = region.HttpPort;
+            rprofile.ServerIP = region.ExternalHostName;
+            rprofile.ServerPort = (uint)region.ExternalEndPoint.Port;
+            rprofile.Uuid = region.RegionID;
+            return rprofile;
         }
 
         public XmlRpcResponse RegionStartup(XmlRpcRequest request, IPEndPoint remoteClient)
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index 6f2c1ba..df5eaab 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -324,44 +324,53 @@ namespace OpenSim.Grid.MessagingServer.Modules
         /// <returns></returns>
         public XmlRpcResponse UserLoggedOn(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-            Hashtable requestData = (Hashtable)request.Params[0];
+            try
+            {
+                Hashtable requestData = (Hashtable)request.Params[0];
+
+                AgentCircuitData agentData = new AgentCircuitData();
+                agentData.SessionID = new UUID((string)requestData["sessionid"]);
+                agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
+                agentData.firstname = (string)requestData["firstname"];
+                agentData.lastname = (string)requestData["lastname"];
+                agentData.AgentID = new UUID((string)requestData["agentid"]);
+                agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
+                agentData.CapsPath = (string)requestData["caps_path"];
+
+                if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
+                {
+                    agentData.child = true;
+                }
+                else
+                {
+                    agentData.startpos =
+                         new Vector3(Convert.ToSingle(requestData["positionx"]),
+                                     Convert.ToSingle(requestData["positiony"]),
+                                     Convert.ToSingle(requestData["positionz"]));
+                    agentData.child = false;
+                }
 
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new UUID((string)requestData["sessionid"]);
-            agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
-            agentData.firstname = (string)requestData["firstname"];
-            agentData.lastname = (string)requestData["lastname"];
-            agentData.AgentID = new UUID((string)requestData["agentid"]);
-            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            agentData.CapsPath = (string)requestData["caps_path"];
+                ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
+
+                m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
+                                 agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
+
+                UserPresenceData up = new UserPresenceData();
+                up.agentData = agentData;
+                up.friendData = GetUserFriendList(agentData.AgentID);
+                up.regionData = m_regionModule.GetRegionInfo(regionHandle);
+                up.OnlineYN = true;
+                up.lookupUserRegionYN = false;
+                ProcessFriendListSubscriptions(up);
 
-            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
-            {
-                agentData.child = true;
             }
-            else
+            catch (Exception e)
             {
-                agentData.startpos =
-                     new Vector3(Convert.ToSingle(requestData["positionx"]),
-                                 Convert.ToSingle(requestData["positiony"]),
-                                 Convert.ToSingle(requestData["positionz"]));
-                agentData.child = false;
+                m_log.WarnFormat("[LOGIN]: Exception on UserLoggedOn: {0}", e);
             }
 
-            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
-
-            m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
-                             agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
-
-            UserPresenceData up = new UserPresenceData();
-            up.agentData = agentData;
-            up.friendData = GetUserFriendList(agentData.AgentID);
-            up.regionData = m_regionModule.GetRegionInfo(regionHandle);
-            up.OnlineYN = true;
-            up.lookupUserRegionYN = false;
-            ProcessFriendListSubscriptions(up);
-
             return new XmlRpcResponse();
+
         }
 
         /// <summary>
@@ -372,11 +381,18 @@ namespace OpenSim.Grid.MessagingServer.Modules
         /// <returns></returns>
         public XmlRpcResponse UserLoggedOff(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-            m_log.Info("[USERLOGOFF]: User logged off called");
-            Hashtable requestData = (Hashtable)request.Params[0];
+            try
+            {
+                m_log.Info("[USERLOGOFF]: User logged off called");
+                Hashtable requestData = (Hashtable)request.Params[0];
 
-            UUID AgentID = new UUID((string)requestData["agentid"]);
-            ProcessLogOff(AgentID);
+                UUID AgentID = new UUID((string)requestData["agentid"]);
+                ProcessLogOff(AgentID);
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[USERLOGOFF]: Exception on UserLoggedOff: {0}", e);
+            }
 
             return new XmlRpcResponse();
         }
diff --git a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
index 8006119..76c4899 100644
--- a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
@@ -70,6 +70,6 @@ namespace OpenSim.Grid.MessagingServer.Modules
         {
             //throw new Exception("The method or operation is not implemented.");
             return null;
-        }     
+        }
     }
 }
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
index 9d31d81..77caf47 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
     /// <summary>
     /// Hypergrid login service used in grid mode.
-    /// </summary>     
+    /// </summary>
     public class UserLoginAuthService : HGLoginAuthService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 01d5537..d46ff9b 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -34,6 +34,7 @@ using System.Text.RegularExpressions;
 using log4net;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using Nini.Config;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -42,6 +43,9 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Grid.UserServer.Modules
 {
@@ -51,7 +55,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
     /// <summary>
     /// Login service used in grid mode.
-    /// </summary>     
+    /// </summary>
     public class UserLoginService : LoginService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -63,6 +67,8 @@ namespace OpenSim.Grid.UserServer.Modules
         public UserConfig m_config;
         private readonly IRegionProfileRouter m_regionProfileService;
 
+        private IGridService m_GridService;
+
         protected BaseHttpServer m_httpServer;
 
         public UserLoginService(
@@ -76,6 +82,8 @@ namespace OpenSim.Grid.UserServer.Modules
             m_defaultHomeY = m_config.DefaultY;
             m_interInventoryService = inventoryService;
             m_regionProfileService = regionProfileService;
+
+            m_GridService = new GridServicesConnector(config.GridServerURL.ToString());
         }
 
         public void RegisterHandlers(BaseHttpServer httpServer, bool registerLLSDHandler, bool registerOpenIDHandlers)
@@ -203,47 +211,38 @@ namespace OpenSim.Grid.UserServer.Modules
 
         protected override RegionInfo RequestClosestRegion(string region)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(region,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
-
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
-                return null;
-            }
+            return GridRegionToRegionInfo(m_GridService.GetRegionByName(UUID.Zero, region));
         }
 
         protected override RegionInfo GetRegionInfo(ulong homeRegionHandle)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionHandle,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey,
-                                                                                         m_config.GridRecvKey);
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
-                return null;
-            }
+            uint x = 0, y = 0;
+            Utils.LongToUInts(homeRegionHandle, out x, out y);
+            return GridRegionToRegionInfo(m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y));
         }
 
         protected override RegionInfo GetRegionInfo(UUID homeRegionId)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionId,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey,
-                                                                                         m_config.GridRecvKey);
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
+            return GridRegionToRegionInfo(m_GridService.GetRegionByUUID(UUID.Zero, homeRegionId));
+        }
+
+        private RegionInfo GridRegionToRegionInfo(GridRegion gregion)
+        {
+            if (gregion == null)
                 return null;
-            }
+
+            RegionInfo rinfo = new RegionInfo();
+            rinfo.ExternalHostName = gregion.ExternalHostName;
+            rinfo.HttpPort = gregion.HttpPort;
+            rinfo.InternalEndPoint = gregion.InternalEndPoint;
+            rinfo.RegionID = gregion.RegionID;
+            rinfo.RegionLocX = (uint)(gregion.RegionLocX / Constants.RegionSize);
+            rinfo.RegionLocY = (uint)(gregion.RegionLocY / Constants.RegionSize);
+            rinfo.RegionName = gregion.RegionName;
+            rinfo.ScopeID = gregion.ScopeID;
+            rinfo.ServerURI = gregion.ServerURI;
+
+            return rinfo;
         }
 
         protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient)
@@ -280,9 +279,8 @@ namespace OpenSim.Grid.UserServer.Modules
                 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
 
                 // Take off trailing / so that the caps path isn't //CAPS/someUUID
-                if (regionInfo.httpServerURI.EndsWith("/"))
-                    regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
-                response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
+                string uri = regionInfo.httpServerURI.Trim(new char[] { '/' });
+                response.SeedCapability = uri + CapsUtil.GetCapsSeedPath(capsPath);
 
 
                 // Notify the target of an incoming user
@@ -319,6 +317,7 @@ namespace OpenSim.Grid.UserServer.Modules
                 {
                     m_log.DebugFormat("[LOGIN]: Appearance not for {0} {1}. Creating default.", user.FirstName, user.SurName);
                     appearance = new AvatarAppearance(user.ID);
+                    loginParams["appearance"] = appearance.ToHashTable();
                 }
 
                 ArrayList SendParams = new ArrayList();
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index 002f232..36c6297 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -108,6 +108,9 @@ namespace OpenSim.Grid.UserServer.Modules
             m_httpServer.AddXmlRPCHandler("get_user_by_uuid", XmlRPCGetUserMethodUUID);
             m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar);
 
+            // Used by IAR module to do password checks
+            m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
+
             m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion);
             m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID);
             m_httpServer.AddXmlRPCHandler("get_agent_by_uuid", XmlRPCGetAgentMethodUUID);
@@ -203,6 +206,57 @@ namespace OpenSim.Grid.UserServer.Modules
 
         #region XMLRPC User Methods
 
+        /// <summary>
+        /// Authenticate a user using their password
+        /// </summary>
+        /// <param name="request">Must contain values for "user_uuid" and "password" keys</param>
+        /// <param name="remoteClient"></param>
+        /// <returns></returns>
+        public XmlRpcResponse XmlRPCAuthenticateUserMethodPassword(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+//            m_log.DebugFormat("[USER MANAGER]: Received authenticated user by password request from {0}", remoteClient);
+            
+            Hashtable requestData = (Hashtable)request.Params[0];
+            string userUuidRaw = (string)requestData["user_uuid"];
+            string password = (string)requestData["password"];
+
+            if (null == userUuidRaw)
+                return Util.CreateUnknownUserErrorResponse();
+
+            UUID userUuid;
+            if (!UUID.TryParse(userUuidRaw, out userUuid))
+                return Util.CreateUnknownUserErrorResponse();
+
+            UserProfileData userProfile = m_userDataBaseService.GetUserProfile(userUuid);
+            if (null == userProfile)
+                return Util.CreateUnknownUserErrorResponse();
+
+            string authed;
+            
+            if (null == password)
+            {
+                authed = "FALSE";
+            }
+            else
+            {
+                if (m_userDataBaseService.AuthenticateUserByPassword(userUuid, password))
+                    authed = "TRUE";
+                else
+                    authed = "FALSE";
+            }
+
+//            m_log.DebugFormat(
+//                "[USER MANAGER]: Authentication by password result from {0} for {1} is {2}",
+//                remoteClient, userUuid, authed);
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+            responseData["auth_user"] = authed;
+            response.Value = responseData;
+            
+            return response;
+        }
+
         public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             // XmlRpcResponse response = new XmlRpcResponse();
@@ -246,10 +300,10 @@ namespace OpenSim.Grid.UserServer.Modules
                     m_userDataBaseService.CommitAgent(ref userProfile);
                     //setUserProfile(userProfile);
 
-
                     returnstring = "TRUE";
                 }
             }
+                
             responseData.Add("returnString", returnstring);
             response.Value = responseData;
             return response;
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index baf0fd3..286076d7 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -187,13 +187,13 @@ namespace OpenSim.Grid.UserServer
         /// <param name="inventoryService"></param>
         protected virtual void StartupUserServerModules()
         {
-            m_log.Info("[STARTUP]: Establishing data connection");                        
+            m_log.Info("[STARTUP]: Establishing data connection");
             
             //we only need core components so we can request them from here
             IInterServiceInventoryServices inventoryService;
             TryGet<IInterServiceInventoryServices>(out inventoryService);
             
-            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);            
+            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);
 
             //setup database access service, for now this has to be created before the other modules.
             m_userDataBaseService = new UserDataBaseService(commsManager);
@@ -260,8 +260,6 @@ namespace OpenSim.Grid.UserServer
             m_userManager.PostInitialise();
             m_avatarAppearanceModule.PostInitialise();
             m_friendsModule.PostInitialise();
-
-            m_avatarAppearanceModule.PostInitialise();
         }
 
         protected virtual void RegisterHttpHandlers()
@@ -276,8 +274,6 @@ namespace OpenSim.Grid.UserServer
             m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
             m_messagesService.RegisterHandlers(m_httpServer);
             m_gridInfoService.RegisterHandlers(m_httpServer);
-
-            m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
         }
 
         public override void ShutdownSpecific()
diff --git a/OpenSim/Grid/UserServer/UserServerCommsManager.cs b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
index 7200836..8ef693b 100644
--- a/OpenSim/Grid/UserServer/UserServerCommsManager.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
@@ -28,9 +28,9 @@
 using OpenSim.Framework.Communications;
 
 namespace OpenSim.Grid.UserServer
-{        
+{
     public class UserServerCommsManager : CommunicationsManager
-    {        
+    {
         public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService)
             : base(null, null)
         {