HG 1.5 is in place. Tested in standalone only.

3 files changed, 242 insertions, 112 deletions

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 3cb5d50..3bf0836 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
+using OpenSim.Services.Connectors.Hypergrid;
 
 using OpenMetaverse;
 
@@ -50,9 +51,8 @@ namespace OpenSim.Services.HypergridService
 
         IGridService m_GridService;
         IPresenceService m_PresenceService;
-        IAuthenticationService m_AuthenticationService;
         IUserAccountService m_UserAccountService;
-        IHomeUsersSecurityService m_HomeUsersSecurityService;
+        IUserAgentService m_UserAgentService;
         ISimulationService m_SimulationService;
 
         string m_AuthDll;
@@ -69,12 +69,12 @@ namespace OpenSim.Services.HypergridService
                 throw new Exception(String.Format("No section GatekeeperService in config file"));
 
             string accountService = serverConfig.GetString("UserAccountService", String.Empty);
-            string homeUsersSecurityService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
+            string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
             string gridService = serverConfig.GetString("GridService", String.Empty);
             string presenceService = serverConfig.GetString("PresenceService", String.Empty);
             string simulationService = serverConfig.GetString("SimulationService", String.Empty);
 
-            m_AuthDll = serverConfig.GetString("AuthenticationService", String.Empty);
+            //m_AuthDll = serverConfig.GetString("AuthenticationService", String.Empty);
 
             // These 3 are mandatory, the others aren't
             if (gridService == string.Empty || presenceService == string.Empty || m_AuthDll == string.Empty)
@@ -92,8 +92,8 @@ namespace OpenSim.Services.HypergridService
 
             if (accountService != string.Empty)
                 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
-            if (homeUsersSecurityService != string.Empty)
-                m_HomeUsersSecurityService = ServerUtils.LoadPlugin<IHomeUsersSecurityService>(homeUsersSecurityService, args);
+            if (homeUsersService != string.Empty)
+                m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
 
             if (simService != null)
                 m_SimulationService = simService;
@@ -206,13 +206,12 @@ namespace OpenSim.Services.HypergridService
                 account = m_UserAccountService.GetUserAccount(m_ScopeID, aCircuit.AgentID);
                 if (account != null)
                 {
-                    // Make sure this is the user coming home, and not a fake
-                    if (m_HomeUsersSecurityService != null)
+                    // Make sure this is the user coming home, and not a foreign user with same UUID as a local user
+                    if (m_UserAgentService != null)
                     {
-                        Object ep = m_HomeUsersSecurityService.GetEndPoint(aCircuit.SessionID);
-                        if (ep == null)
+                        if (!m_UserAgentService.AgentIsComingHome(aCircuit.SessionID, m_ExternalName))
                         {
-                            // This is a fake, this session never left this grid
+                            // Can't do, sorry
                             reason = "Unauthorized";
                             m_log.InfoFormat("[GATEKEEPER SERVICE]: Foreign agent {0} {1} has same ID as local user. Refusing service.",
                                 aCircuit.firstname, aCircuit.lastname);
@@ -266,32 +265,35 @@ namespace OpenSim.Services.HypergridService
             //
             // Finally launch the agent at the destination
             //
-            return m_SimulationService.CreateAgent(destination, aCircuit, 0, out reason);
+            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason);
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)
         {
-            string authURL = string.Empty;
+            if (!CheckAddress(aCircuit.ServiceSessionID))
+                return false;
+
+            string userURL = string.Empty;
             if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
-                authURL = aCircuit.ServiceURLs["HomeURI"].ToString();
+                userURL = aCircuit.ServiceURLs["HomeURI"].ToString();
 
-            if (authURL == string.Empty)
+            if (userURL == string.Empty)
             {
                 m_log.DebugFormat("[GATEKEEPER SERVICE]: Agent did not provide an authentication server URL");
                 return false;
             }
 
-            Object[] args = new Object[] { authURL };
-            IAuthenticationService authService = ServerUtils.LoadPlugin<IAuthenticationService>(m_AuthDll, args);
-            if (authService != null)
+            Object[] args = new Object[] { userURL };
+            IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); //ServerUtils.LoadPlugin<IUserAgentService>(m_AuthDll, args);
+            if (userAgentService != null)
             {
                 try
                 {
-                    return authService.Verify(aCircuit.AgentID, aCircuit.SecureSessionID.ToString(), 30);
+                    return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
                 }
                 catch
                 {
-                    m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", authURL);
+                    m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
                     return false;
                 }
             }
@@ -299,35 +301,20 @@ namespace OpenSim.Services.HypergridService
             return false;
         }
 
-        #endregion
-
-        public GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt)
+        // Check that the service token was generated for *this* grid.
+        // If it wasn't then that's a fake agent.
+        protected bool CheckAddress(string serviceToken)
         {
-            position = new Vector3(128, 128, 0); lookAt = Vector3.UnitY;
+            string[] parts = serviceToken.Split(new char[] { ';' });
+            if (parts.Length < 2)
+                return false;
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to get home region of user {0}", userID);
+            string addressee = parts[0];
+            return (addressee == m_ExternalName);
+        }
 
-            GridRegion home = null;
-            PresenceInfo[] presences = m_PresenceService.GetAgents(new string[] { userID.ToString() });
-            if (presences != null && presences.Length > 0)
-            {
-                UUID homeID = presences[0].HomeRegionID;
-                if (homeID != UUID.Zero)
-                {
-                    home = m_GridService.GetRegionByUUID(m_ScopeID, homeID);
-                    position = presences[0].HomePosition;
-                    lookAt = presences[0].HomeLookAt;
-                }
-                if (home == null)
-                {
-                    List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);
-                    if (defs != null && defs.Count > 0)
-                        home = defs[0];
-                }
-            }
+        #endregion
 
-            return home;
-        }
 
         #region Misc
 
diff --git a/OpenSim/Services/HypergridService/HomeUsersSecurityService.cs b/OpenSim/Services/HypergridService/HomeUsersSecurityService.cs
deleted file mode 100644
index a7adfc1..0000000
--- a/OpenSim/Services/HypergridService/HomeUsersSecurityService.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-
-using OpenSim.Services.Interfaces;
-
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-
-namespace OpenSim.Services.HypergridService
-{
-    /// <summary>
-    /// This service is for HG1.5 only, to make up for the fact that clients don't
-    /// keep any private information in themselves, and that their 'home service'
-    /// needs to do it for them.
-    /// Once we have better clients, this shouldn't be needed.
-    /// </summary>
-    public class HomeUsersSecurityService : IHomeUsersSecurityService
-    {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        //
-        // This is a persistent storage wannabe for dealing with the
-        // quirks of HG1.5. We don't really want to store this in a table.
-        // But this is the necessary information for securing clients
-        // coming home.
-        //
-        protected static Dictionary<UUID, IPEndPoint> m_ClientEndPoints = new Dictionary<UUID, IPEndPoint>();
-
-        public HomeUsersSecurityService(IConfigSource config)
-        {
-            m_log.DebugFormat("[HOME USERS SECURITY]: Starting...");
-        }
-
-        public void SetEndPoint(UUID sessionID, IPEndPoint ep)
-        {
-            m_log.DebugFormat("[HOME USERS SECURITY]: Set EndPoint {0} for session {1}", ep.ToString(), sessionID);
-
-            lock (m_ClientEndPoints)
-                m_ClientEndPoints[sessionID] = ep;
-        }
-
-        public IPEndPoint GetEndPoint(UUID sessionID)
-        {
-            lock (m_ClientEndPoints)
-                if (m_ClientEndPoints.ContainsKey(sessionID))
-                {
-                    m_log.DebugFormat("[HOME USERS SECURITY]: Get EndPoint {0} for session {1}", m_ClientEndPoints[sessionID].ToString(), sessionID);
-                    return m_ClientEndPoints[sessionID];
-                }
-
-            return null;
-        }
-
-        public void RemoveEndPoint(UUID sessionID)
-        {
-            m_log.DebugFormat("[HOME USERS SECURITY]: Remove EndPoint for session {0}", sessionID);
-            lock (m_ClientEndPoints)
-                if (m_ClientEndPoints.ContainsKey(sessionID))
-                    m_ClientEndPoints.Remove(sessionID);
-        }
-    }
-}
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
new file mode 100644
index 0000000..0873a2b
--- /dev/null
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+
+using OpenSim.Framework;
+using OpenSim.Services.Connectors.Hypergrid;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+
+namespace OpenSim.Services.HypergridService
+{
+    /// <summary>
+    /// This service is for HG1.5 only, to make up for the fact that clients don't
+    /// keep any private information in themselves, and that their 'home service'
+    /// needs to do it for them.
+    /// Once we have better clients, this shouldn't be needed.
+    /// </summary>
+    public class UserAgentService : IUserAgentService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        // This will need to go into a DB table
+        static Dictionary<UUID, TravelingAgentInfo> m_TravelingAgents = new Dictionary<UUID, TravelingAgentInfo>();
+
+        static bool m_Initialized = false;
+
+        protected static IPresenceService m_PresenceService;
+        protected static IGridService m_GridService;
+        protected static GatekeeperServiceConnector m_GatekeeperConnector;
+
+        public UserAgentService(IConfigSource config)
+        {
+            if (!m_Initialized)
+            {
+                m_log.DebugFormat("[HOME USERS SECURITY]: Starting...");
+                
+                IConfig serverConfig = config.Configs["UserAgentService"];
+                if (serverConfig == null)
+                    throw new Exception(String.Format("No section UserAgentService in config file"));
+
+                string gridService = serverConfig.GetString("GridService", String.Empty);
+                string presenceService = serverConfig.GetString("PresenceService", String.Empty);
+
+                if (gridService == string.Empty || presenceService == string.Empty)
+                    throw new Exception(String.Format("Incomplete specifications, UserAgent Service cannot function."));
+
+                Object[] args = new Object[] { config };
+                m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
+                m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
+                m_GatekeeperConnector = new GatekeeperServiceConnector();
+
+                m_Initialized = true;
+            }
+        }
+
+        public GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt)
+        {
+            position = new Vector3(128, 128, 0); lookAt = Vector3.UnitY;
+
+            m_log.DebugFormat("[USER AGENT SERVICE]: Request to get home region of user {0}", userID);
+
+            GridRegion home = null;
+            PresenceInfo[] presences = m_PresenceService.GetAgents(new string[] { userID.ToString() });
+            if (presences != null && presences.Length > 0)
+            {
+                UUID homeID = presences[0].HomeRegionID;
+                if (homeID != UUID.Zero)
+                {
+                    home = m_GridService.GetRegionByUUID(UUID.Zero, homeID);
+                    position = presences[0].HomePosition;
+                    lookAt = presences[0].HomeLookAt;
+                }
+                if (home == null)
+                {
+                    List<GridRegion> defs = m_GridService.GetDefaultRegions(UUID.Zero);
+                    if (defs != null && defs.Count > 0)
+                        home = defs[0];
+                }
+            }
+
+            return home;
+        }
+
+        public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, out string reason)
+        {
+            m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} to grid {2}", 
+                agentCircuit.firstname, agentCircuit.lastname, gatekeeper.ExternalHostName +":"+ gatekeeper.HttpPort);
+
+            // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination
+            GridRegion region = new GridRegion(gatekeeper);
+            region.RegionName = finalDestination.RegionName;
+            region.RegionID = finalDestination.RegionID;
+            region.RegionLocX = finalDestination.RegionLocX;
+            region.RegionLocY = finalDestination.RegionLocY;
+
+            // Generate a new service session
+            agentCircuit.ServiceSessionID = "http://" + region.ExternalHostName + ":" + region.HttpPort + ";" + UUID.Random();
+            TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region);
+
+            bool success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason);
+
+            if (!success)
+            {
+                m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", 
+                    agentCircuit.firstname, agentCircuit.lastname, region.ExternalHostName + ":" + region.HttpPort, reason);
+
+                // restore the old travel info
+                lock (m_TravelingAgents)
+                    m_TravelingAgents[agentCircuit.SessionID] = old;
+
+                return false;
+            }
+
+            return true;
+        }
+
+        TravelingAgentInfo UpdateTravelInfo(AgentCircuitData agentCircuit, GridRegion region)
+        {
+            TravelingAgentInfo travel = new TravelingAgentInfo();
+            TravelingAgentInfo old = null;
+            lock (m_TravelingAgents)
+            {
+                if (m_TravelingAgents.ContainsKey(agentCircuit.SessionID))
+                {
+                    old = m_TravelingAgents[agentCircuit.SessionID];
+                }
+
+                m_TravelingAgents[agentCircuit.SessionID] = travel;
+            }
+            travel.UserID = agentCircuit.AgentID;
+            travel.GridExternalName = region.ExternalHostName + ":" + region.HttpPort;
+            travel.ServiceToken = agentCircuit.ServiceSessionID;
+            if (old != null)
+                travel.ClientToken = old.ClientToken;
+
+            return old;
+        }
+
+        public void LogoutAgent(UUID userID, UUID sessionID)
+        {
+            m_log.DebugFormat("[USER AGENT SERVICE]: User {0} logged out", userID);
+
+            lock (m_TravelingAgents)
+            {
+                List<UUID> travels = new List<UUID>();
+                foreach (KeyValuePair<UUID, TravelingAgentInfo> kvp in m_TravelingAgents)
+                    if (kvp.Value.UserID == userID)
+                        travels.Add(kvp.Key);
+                foreach (UUID session in travels)
+                    m_TravelingAgents.Remove(session);
+            }
+        }
+
+        // We need to prevent foreign users with the same UUID as a local user
+        public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName)
+        {
+            if (!m_TravelingAgents.ContainsKey(sessionID))
+                return false;
+
+            TravelingAgentInfo travel = m_TravelingAgents[sessionID];
+            return travel.GridExternalName == thisGridExternalName;
+        }
+
+        public bool VerifyClient(UUID sessionID, string token)
+        {
+            if (m_TravelingAgents.ContainsKey(sessionID))
+            {
+                // Aquiles heel. Must trust the first grid upon login
+                if (m_TravelingAgents[sessionID].ClientToken == string.Empty)
+                {
+                    m_TravelingAgents[sessionID].ClientToken = token;
+                    return true;
+                }
+                return m_TravelingAgents[sessionID].ClientToken == token;
+            }
+            return false;
+        }
+
+        public bool VerifyAgent(UUID sessionID, string token)
+        {
+            if (m_TravelingAgents.ContainsKey(sessionID))
+            {
+                m_log.DebugFormat("[USER AGENT SERVICE]: Verifying agent token {0} against {1}", token, m_TravelingAgents[sessionID].ServiceToken);
+                return m_TravelingAgents[sessionID].ServiceToken == token;
+            }
+
+            m_log.DebugFormat("[USER AGENT SERVICE]: Token verification for session {0}: no such session", sessionID);
+
+            return false;
+        }
+
+    }
+
+    class TravelingAgentInfo
+    {
+        public UUID UserID;
+        public string GridExternalName = string.Empty;
+        public string ServiceToken = string.Empty;
+        public string ClientToken = string.Empty;
+    }
+
+}