From 00f7d622cbc2c2e61d2efaacd8275da3f9821d8b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Jan 2010 19:19:42 -0800 Subject: HG 1.5 is in place. Tested in standalone only. --- .../Services/HypergridService/UserAgentService.cs | 210 +++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 OpenSim/Services/HypergridService/UserAgentService.cs (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs') 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 +{ + /// + /// 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. + /// + 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 m_TravelingAgents = new Dictionary(); + + 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(gridService, args); + m_PresenceService = ServerUtils.LoadPlugin(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 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 travels = new List(); + foreach (KeyValuePair 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; + } + +} -- cgit v1.1 From 35de8e91ecfbb87054599f3d0f5781d041648688 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 17:27:56 -0800 Subject: * Remove unnecessary debug message * Bug fix in UserAgentService, logout --- OpenSim/Services/HypergridService/UserAgentService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs') diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 0873a2b..97e3705 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs @@ -152,7 +152,9 @@ namespace OpenSim.Services.HypergridService { List travels = new List(); foreach (KeyValuePair kvp in m_TravelingAgents) - if (kvp.Value.UserID == userID) + if (kvp.Value == null) // do some clean up + travels.Add(kvp.Key); + else if (kvp.Value.UserID == userID) travels.Add(kvp.Key); foreach (UUID session in travels) m_TravelingAgents.Remove(session); -- cgit v1.1 From 11ed5dee3bce9af6e222d3938de108d96d45bc49 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 2 Feb 2010 19:41:46 -0800 Subject: Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for now until I understand better the client IP issue. --- .../Services/HypergridService/UserAgentService.cs | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs') diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 97e3705..15379b5 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs @@ -173,17 +173,22 @@ namespace OpenSim.Services.HypergridService 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; + return true; + + // Commenting this for now until I understand better what part of a sender's + // info stays unchanged throughout a session + // + //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) -- cgit v1.1