diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs (renamed from OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs) | 53 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs (renamed from OpenSim/Services/Connectors/User/UserServiceConnector.cs) | 84 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs | 104 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 181 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 117 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | 168 |
6 files changed, 621 insertions, 86 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs index 4b8fc26..c951653 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs +++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | |||
@@ -27,46 +27,43 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.IO; |
31 | using System.Net; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using System.Text.RegularExpressions; | 32 | using System.Net; |
34 | using System.Xml.Serialization; | 33 | using System.Text; |
35 | using log4net; | 34 | |
36 | using Nwc.XmlRpc; | 35 | using OpenSim.Server.Base; |
37 | using OpenMetaverse; | 36 | using OpenSim.Server.Handlers.Base; |
38 | using OpenSim.Data; | 37 | using OpenSim.Services.Interfaces; |
38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Servers.HttpServer; |
41 | using OpenSim.Framework.Communications.Clients; | 41 | using OpenSim.Server.Handlers.Simulation; |
42 | using OpenSim.Region.Communications.OGS1; | 42 | using Utils = OpenSim.Server.Handlers.Simulation.Utils; |
43 | |||
44 | using OpenMetaverse; | ||
45 | using OpenMetaverse.StructuredData; | ||
46 | using Nini.Config; | ||
47 | using log4net; | ||
48 | |||
43 | 49 | ||
44 | namespace OpenSim.Region.Communications.Hypergrid | 50 | namespace OpenSim.Server.Handlers.Hypergrid |
45 | { | 51 | { |
46 | public class HGUserDataPlugin : OGS1UserDataPlugin | 52 | public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentHandler |
47 | { | 53 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | private IGatekeeperService m_GatekeeperService; | ||
49 | 56 | ||
50 | HGUserServices m_UserServices; | 57 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper) |
51 | |||
52 | public HGUserDataPlugin() | ||
53 | { | 58 | { |
59 | m_GatekeeperService = gatekeeper; | ||
54 | } | 60 | } |
55 | 61 | ||
56 | public HGUserDataPlugin(CommunicationsManager commsManager, HGUserServices userServices) | 62 | protected override bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) |
57 | { | 63 | { |
58 | m_log.DebugFormat("[HG USER SERVICES]: {0} initialized", Name); | 64 | return m_GatekeeperService.LoginAgent(aCircuit, destination, out reason); |
59 | m_commsManager = commsManager; | ||
60 | m_UserServices = userServices; | ||
61 | } | ||
62 | |||
63 | protected override string GetUserServerURL(UUID userID) | ||
64 | { | ||
65 | string url = string.Empty; | ||
66 | if (m_UserServices.IsForeignUser(userID, out url)) | ||
67 | return url; | ||
68 | return m_commsManager.NetworkServersInfo.UserURL; | ||
69 | } | 65 | } |
70 | 66 | ||
71 | } | 67 | } |
68 | |||
72 | } | 69 | } |
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs index 683990f..f2d9321 100644 --- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -25,90 +25,58 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using log4net; | ||
29 | using System; | 28 | using System; |
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.IO; | ||
32 | using System.Reflection; | 30 | using System.Reflection; |
33 | using Nini.Config; | 31 | using Nini.Config; |
34 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 33 | using OpenSim.Server.Base; |
36 | using OpenSim.Framework.Servers.HttpServer; | ||
37 | using OpenSim.Services.Interfaces; | 34 | using OpenSim.Services.Interfaces; |
38 | using OpenMetaverse; | 35 | using OpenSim.Framework.Servers.HttpServer; |
36 | using OpenSim.Server.Handlers.Base; | ||
39 | 37 | ||
40 | namespace OpenSim.Services.Connectors | 38 | using log4net; |
39 | |||
40 | namespace OpenSim.Server.Handlers.Hypergrid | ||
41 | { | 41 | { |
42 | public class UserServicesConnector : IUserAccountService | 42 | public class GatekeeperServiceInConnector : ServiceConnector |
43 | { | 43 | { |
44 | private static readonly ILog m_log = | 44 | private static readonly ILog m_log = |
45 | LogManager.GetLogger( | 45 | LogManager.GetLogger( |
46 | MethodBase.GetCurrentMethod().DeclaringType); | 46 | MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | // private string m_ServerURI = String.Empty; | 48 | private IGatekeeperService m_GatekeeperService; |
49 | 49 | public IGatekeeperService GateKeeper | |
50 | public UserServicesConnector() | ||
51 | { | 50 | { |
51 | get { return m_GatekeeperService; } | ||
52 | } | 52 | } |
53 | 53 | ||
54 | public UserServicesConnector(string serverURI) | 54 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) : |
55 | base(config, server, String.Empty) | ||
55 | { | 56 | { |
56 | // m_ServerURI = serverURI.TrimEnd('/'); | 57 | IConfig gridConfig = config.Configs["GatekeeperService"]; |
57 | } | 58 | if (gridConfig != null) |
58 | |||
59 | public UserServicesConnector(IConfigSource source) | ||
60 | { | ||
61 | Initialise(source); | ||
62 | } | ||
63 | |||
64 | public virtual void Initialise(IConfigSource source) | ||
65 | { | ||
66 | IConfig assetConfig = source.Configs["UserService"]; | ||
67 | if (assetConfig == null) | ||
68 | { | 59 | { |
69 | m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini"); | 60 | string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty); |
70 | throw new Exception("User connector init error"); | 61 | Object[] args = new Object[] { config, simService }; |
71 | } | 62 | m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args); |
72 | 63 | ||
73 | string serviceURI = assetConfig.GetString("UserServerURI", | ||
74 | String.Empty); | ||
75 | |||
76 | if (serviceURI == String.Empty) | ||
77 | { | ||
78 | m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService"); | ||
79 | throw new Exception("User connector init error"); | ||
80 | } | 64 | } |
81 | //m_ServerURI = serviceURI; | 65 | if (m_GatekeeperService == null) |
82 | } | 66 | throw new Exception("Gatekeeper server connector cannot proceed because of missing service"); |
83 | 67 | ||
84 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) | 68 | HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService); |
85 | { | 69 | server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false); |
86 | return null; | 70 | server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false); |
87 | } | ||
88 | 71 | ||
89 | public UserAccount GetUserAccount(UUID scopeID, UUID userID) | 72 | server.AddHTTPHandler("/foreignagent/", new GatekeeperAgentHandler(m_GatekeeperService).Handler); |
90 | { | ||
91 | return null; | ||
92 | } | ||
93 | 73 | ||
94 | public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret) | ||
95 | { | ||
96 | return false; | ||
97 | } | ||
98 | |||
99 | public bool SetUserAccount(UserAccount data, UUID principalID, string token) | ||
100 | { | ||
101 | return false; | ||
102 | } | 74 | } |
103 | 75 | ||
104 | public bool CreateUserAccount(UserAccount data, UUID principalID, string token) | 76 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) |
77 | : this(config, server, null) | ||
105 | { | 78 | { |
106 | return false; | ||
107 | } | 79 | } |
108 | 80 | ||
109 | public List<UserAccount> GetUserAccount(UUID scopeID, string query) | ||
110 | { | ||
111 | return null; | ||
112 | } | ||
113 | } | 81 | } |
114 | } | 82 | } |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs new file mode 100644 index 0000000..41897eb --- /dev/null +++ b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Net; | ||
32 | using System.Reflection; | ||
33 | using log4net; | ||
34 | using Nini.Config; | ||
35 | using Nwc.XmlRpc; | ||
36 | using OpenSim.Server.Base; | ||
37 | using OpenSim.Server.Handlers.Inventory; | ||
38 | using OpenSim.Services.Interfaces; | ||
39 | using OpenSim.Framework; | ||
40 | using OpenSim.Framework.Servers.HttpServer; | ||
41 | using OpenSim.Server.Handlers.Base; | ||
42 | using OpenMetaverse; | ||
43 | |||
44 | namespace OpenSim.Server.Handlers.Hypergrid | ||
45 | { | ||
46 | public class HGInventoryServiceInConnector : InventoryServiceInConnector | ||
47 | { | ||
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
49 | |||
50 | //private static readonly int INVENTORY_DEFAULT_SESSION_TIME = 30; // secs | ||
51 | //private AuthedSessionCache m_session_cache = new AuthedSessionCache(INVENTORY_DEFAULT_SESSION_TIME); | ||
52 | |||
53 | private IUserAgentService m_UserAgentService; | ||
54 | |||
55 | public HGInventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) : | ||
56 | base(config, server, configName) | ||
57 | { | ||
58 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
59 | if (serverConfig == null) | ||
60 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); | ||
61 | |||
62 | string userAgentService = serverConfig.GetString("UserAgentService", string.Empty); | ||
63 | string m_userserver_url = serverConfig.GetString("UserAgentURI", String.Empty); | ||
64 | if (m_userserver_url != string.Empty) | ||
65 | { | ||
66 | Object[] args = new Object[] { m_userserver_url }; | ||
67 | m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(userAgentService, args); | ||
68 | } | ||
69 | |||
70 | AddHttpHandlers(server); | ||
71 | m_log.Debug("[HG INVENTORY HANDLER]: handlers initialized"); | ||
72 | } | ||
73 | |||
74 | /// <summary> | ||
75 | /// Check that the source of an inventory request for a particular agent is a current session belonging to | ||
76 | /// that agent. | ||
77 | /// </summary> | ||
78 | /// <param name="session_id"></param> | ||
79 | /// <param name="avatar_id"></param> | ||
80 | /// <returns></returns> | ||
81 | public override bool CheckAuthSession(string session_id, string avatar_id) | ||
82 | { | ||
83 | //m_log.InfoFormat("[HG INVENTORY IN CONNECTOR]: checking authed session {0} {1}", session_id, avatar_id); | ||
84 | // This doesn't work | ||
85 | |||
86 | // if (m_session_cache.getCachedSession(session_id, avatar_id) == null) | ||
87 | // { | ||
88 | // //cache miss, ask userserver | ||
89 | // m_UserAgentService.VerifyAgent(session_id, ???); | ||
90 | // } | ||
91 | // else | ||
92 | // { | ||
93 | // // cache hits | ||
94 | // m_log.Info("[HG INVENTORY IN CONNECTOR]: got authed session from cache"); | ||
95 | // return true; | ||
96 | // } | ||
97 | |||
98 | // m_log.Warn("[HG INVENTORY IN CONNECTOR]: unknown session_id, request rejected"); | ||
99 | // return false; | ||
100 | |||
101 | return true; | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs new file mode 100644 index 0000000..17d7850 --- /dev/null +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -0,0 +1,181 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.IO; | ||
31 | using System.Reflection; | ||
32 | using System.Net; | ||
33 | using System.Text; | ||
34 | |||
35 | using OpenSim.Server.Base; | ||
36 | using OpenSim.Server.Handlers.Base; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
39 | using OpenSim.Framework; | ||
40 | using OpenSim.Framework.Servers.HttpServer; | ||
41 | using OpenSim.Server.Handlers.Simulation; | ||
42 | using Utils = OpenSim.Server.Handlers.Simulation.Utils; | ||
43 | |||
44 | using OpenMetaverse; | ||
45 | using OpenMetaverse.StructuredData; | ||
46 | using Nini.Config; | ||
47 | using log4net; | ||
48 | |||
49 | |||
50 | namespace OpenSim.Server.Handlers.Hypergrid | ||
51 | { | ||
52 | public class HomeAgentHandler | ||
53 | { | ||
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
55 | private IUserAgentService m_UserAgentService; | ||
56 | |||
57 | public HomeAgentHandler(IUserAgentService userAgentService) | ||
58 | { | ||
59 | m_UserAgentService = userAgentService; | ||
60 | } | ||
61 | |||
62 | public Hashtable Handler(Hashtable request) | ||
63 | { | ||
64 | m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called"); | ||
65 | |||
66 | m_log.Debug("---------------------------"); | ||
67 | m_log.Debug(" >> uri=" + request["uri"]); | ||
68 | m_log.Debug(" >> content-type=" + request["content-type"]); | ||
69 | m_log.Debug(" >> http-method=" + request["http-method"]); | ||
70 | m_log.Debug("---------------------------\n"); | ||
71 | |||
72 | Hashtable responsedata = new Hashtable(); | ||
73 | responsedata["content_type"] = "text/html"; | ||
74 | responsedata["keepalive"] = false; | ||
75 | |||
76 | |||
77 | UUID agentID; | ||
78 | UUID regionID; | ||
79 | string action; | ||
80 | if (!Utils.GetParams((string)request["uri"], out agentID, out regionID, out action)) | ||
81 | { | ||
82 | m_log.InfoFormat("[HOME AGENT HANDLER]: Invalid parameters for agent message {0}", request["uri"]); | ||
83 | responsedata["int_response_code"] = 404; | ||
84 | responsedata["str_response_string"] = "false"; | ||
85 | |||
86 | return responsedata; | ||
87 | } | ||
88 | |||
89 | // Next, let's parse the verb | ||
90 | string method = (string)request["http-method"]; | ||
91 | if (method.Equals("POST")) | ||
92 | { | ||
93 | DoAgentPost(request, responsedata, agentID); | ||
94 | return responsedata; | ||
95 | } | ||
96 | else | ||
97 | { | ||
98 | m_log.InfoFormat("[HOME AGENT HANDLER]: method {0} not supported in agent message", method); | ||
99 | responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed; | ||
100 | responsedata["str_response_string"] = "Method not allowed"; | ||
101 | |||
102 | return responsedata; | ||
103 | } | ||
104 | |||
105 | } | ||
106 | |||
107 | protected void DoAgentPost(Hashtable request, Hashtable responsedata, UUID id) | ||
108 | { | ||
109 | OSDMap args = Utils.GetOSDMap((string)request["body"]); | ||
110 | if (args == null) | ||
111 | { | ||
112 | responsedata["int_response_code"] = HttpStatusCode.BadRequest; | ||
113 | responsedata["str_response_string"] = "Bad request"; | ||
114 | return; | ||
115 | } | ||
116 | |||
117 | // retrieve the input arguments | ||
118 | int x = 0, y = 0; | ||
119 | UUID uuid = UUID.Zero; | ||
120 | string regionname = string.Empty; | ||
121 | string gatekeeper_host = string.Empty; | ||
122 | int gatekeeper_port = 0; | ||
123 | |||
124 | if (args.ContainsKey("gatekeeper_host") && args["gatekeeper_host"] != null) | ||
125 | gatekeeper_host = args["gatekeeper_host"].AsString(); | ||
126 | if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null) | ||
127 | Int32.TryParse(args["gatekeeper_port"].AsString(), out gatekeeper_port); | ||
128 | |||
129 | GridRegion gatekeeper = new GridRegion(); | ||
130 | gatekeeper.ExternalHostName = gatekeeper_host; | ||
131 | gatekeeper.HttpPort = (uint)gatekeeper_port; | ||
132 | gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
133 | |||
134 | if (args.ContainsKey("destination_x") && args["destination_x"] != null) | ||
135 | Int32.TryParse(args["destination_x"].AsString(), out x); | ||
136 | else | ||
137 | m_log.WarnFormat(" -- request didn't have destination_x"); | ||
138 | if (args.ContainsKey("destination_y") && args["destination_y"] != null) | ||
139 | Int32.TryParse(args["destination_y"].AsString(), out y); | ||
140 | else | ||
141 | m_log.WarnFormat(" -- request didn't have destination_y"); | ||
142 | if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null) | ||
143 | UUID.TryParse(args["destination_uuid"].AsString(), out uuid); | ||
144 | if (args.ContainsKey("destination_name") && args["destination_name"] != null) | ||
145 | regionname = args["destination_name"].ToString(); | ||
146 | |||
147 | GridRegion destination = new GridRegion(); | ||
148 | destination.RegionID = uuid; | ||
149 | destination.RegionLocX = x; | ||
150 | destination.RegionLocY = y; | ||
151 | destination.RegionName = regionname; | ||
152 | |||
153 | AgentCircuitData aCircuit = new AgentCircuitData(); | ||
154 | try | ||
155 | { | ||
156 | aCircuit.UnpackAgentCircuitData(args); | ||
157 | } | ||
158 | catch (Exception ex) | ||
159 | { | ||
160 | m_log.InfoFormat("[HOME AGENT HANDLER]: exception on unpacking ChildCreate message {0}", ex.Message); | ||
161 | responsedata["int_response_code"] = HttpStatusCode.BadRequest; | ||
162 | responsedata["str_response_string"] = "Bad request"; | ||
163 | return; | ||
164 | } | ||
165 | |||
166 | OSDMap resp = new OSDMap(2); | ||
167 | string reason = String.Empty; | ||
168 | |||
169 | bool result = m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason); | ||
170 | |||
171 | resp["reason"] = OSD.FromString(reason); | ||
172 | resp["success"] = OSD.FromBoolean(result); | ||
173 | |||
174 | // TODO: add reason if not String.Empty? | ||
175 | responsedata["int_response_code"] = HttpStatusCode.OK; | ||
176 | responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); | ||
177 | } | ||
178 | |||
179 | } | ||
180 | |||
181 | } | ||
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs new file mode 100644 index 0000000..0b65245 --- /dev/null +++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |||
@@ -0,0 +1,117 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | using System; | ||
28 | using System.Collections; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Net; | ||
31 | using System.Reflection; | ||
32 | |||
33 | using OpenSim.Services.Interfaces; | ||
34 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
35 | |||
36 | using log4net; | ||
37 | using Nwc.XmlRpc; | ||
38 | using OpenMetaverse; | ||
39 | |||
40 | namespace OpenSim.Server.Handlers.Hypergrid | ||
41 | { | ||
42 | public class HypergridHandlers | ||
43 | { | ||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
46 | private IGatekeeperService m_GatekeeperService; | ||
47 | |||
48 | public HypergridHandlers(IGatekeeperService gatekeeper) | ||
49 | { | ||
50 | m_GatekeeperService = gatekeeper; | ||
51 | } | ||
52 | |||
53 | /// <summary> | ||
54 | /// Someone wants to link to us | ||
55 | /// </summary> | ||
56 | /// <param name="request"></param> | ||
57 | /// <returns></returns> | ||
58 | public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request, IPEndPoint remoteClient) | ||
59 | { | ||
60 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
61 | //string host = (string)requestData["host"]; | ||
62 | //string portstr = (string)requestData["port"]; | ||
63 | string name = (string)requestData["region_name"]; | ||
64 | |||
65 | UUID regionID = UUID.Zero; | ||
66 | string externalName = string.Empty; | ||
67 | string imageURL = string.Empty; | ||
68 | ulong regionHandle = 0; | ||
69 | string reason = string.Empty; | ||
70 | |||
71 | bool success = m_GatekeeperService.LinkRegion(name, out regionID, out regionHandle, out externalName, out imageURL, out reason); | ||
72 | |||
73 | Hashtable hash = new Hashtable(); | ||
74 | hash["result"] = success.ToString(); | ||
75 | hash["uuid"] = regionID.ToString(); | ||
76 | hash["handle"] = regionHandle.ToString(); | ||
77 | hash["region_image"] = imageURL; | ||
78 | hash["external_name"] = externalName; | ||
79 | |||
80 | XmlRpcResponse response = new XmlRpcResponse(); | ||
81 | response.Value = hash; | ||
82 | return response; | ||
83 | } | ||
84 | |||
85 | public XmlRpcResponse GetRegion(XmlRpcRequest request, IPEndPoint remoteClient) | ||
86 | { | ||
87 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
88 | //string host = (string)requestData["host"]; | ||
89 | //string portstr = (string)requestData["port"]; | ||
90 | string regionID_str = (string)requestData["region_uuid"]; | ||
91 | UUID regionID = UUID.Zero; | ||
92 | UUID.TryParse(regionID_str, out regionID); | ||
93 | |||
94 | GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID); | ||
95 | |||
96 | Hashtable hash = new Hashtable(); | ||
97 | if (regInfo == null) | ||
98 | hash["result"] = "false"; | ||
99 | else | ||
100 | { | ||
101 | hash["result"] = "true"; | ||
102 | hash["uuid"] = regInfo.RegionID.ToString(); | ||
103 | hash["x"] = regInfo.RegionLocX.ToString(); | ||
104 | hash["y"] = regInfo.RegionLocY.ToString(); | ||
105 | hash["region_name"] = regInfo.RegionName; | ||
106 | hash["hostname"] = regInfo.ExternalHostName; | ||
107 | hash["http_port"] = regInfo.HttpPort.ToString(); | ||
108 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | ||
109 | } | ||
110 | XmlRpcResponse response = new XmlRpcResponse(); | ||
111 | response.Value = hash; | ||
112 | return response; | ||
113 | |||
114 | } | ||
115 | |||
116 | } | ||
117 | } | ||
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs new file mode 100644 index 0000000..79c6b2a --- /dev/null +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -0,0 +1,168 @@ | |||
1 | using System; | ||
2 | using System.Collections; | ||
3 | using System.Collections.Generic; | ||
4 | using System.Net; | ||
5 | using System.Reflection; | ||
6 | |||
7 | using Nini.Config; | ||
8 | using OpenSim.Framework; | ||
9 | using OpenSim.Server.Base; | ||
10 | using OpenSim.Services.Interfaces; | ||
11 | using OpenSim.Framework.Servers.HttpServer; | ||
12 | using OpenSim.Server.Handlers.Base; | ||
13 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
14 | |||
15 | using log4net; | ||
16 | using Nwc.XmlRpc; | ||
17 | using OpenMetaverse; | ||
18 | |||
19 | namespace OpenSim.Server.Handlers.Hypergrid | ||
20 | { | ||
21 | public class UserAgentServerConnector : ServiceConnector | ||
22 | { | ||
23 | private static readonly ILog m_log = | ||
24 | LogManager.GetLogger( | ||
25 | MethodBase.GetCurrentMethod().DeclaringType); | ||
26 | |||
27 | private IUserAgentService m_HomeUsersService; | ||
28 | |||
29 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : | ||
30 | base(config, server, String.Empty) | ||
31 | { | ||
32 | IConfig gridConfig = config.Configs["UserAgentService"]; | ||
33 | if (gridConfig != null) | ||
34 | { | ||
35 | string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty); | ||
36 | Object[] args = new Object[] { config }; | ||
37 | m_HomeUsersService = ServerUtils.LoadPlugin<IUserAgentService>(serviceDll, args); | ||
38 | } | ||
39 | if (m_HomeUsersService == null) | ||
40 | throw new Exception("UserAgent server connector cannot proceed because of missing service"); | ||
41 | |||
42 | server.AddXmlRPCHandler("agent_is_coming_home", AgentIsComingHome, false); | ||
43 | server.AddXmlRPCHandler("get_home_region", GetHomeRegion, false); | ||
44 | server.AddXmlRPCHandler("verify_agent", VerifyAgent, false); | ||
45 | server.AddXmlRPCHandler("verify_client", VerifyClient, false); | ||
46 | server.AddXmlRPCHandler("logout_agent", LogoutAgent, false); | ||
47 | |||
48 | server.AddHTTPHandler("/homeagent/", new HomeAgentHandler(m_HomeUsersService).Handler); | ||
49 | } | ||
50 | |||
51 | public XmlRpcResponse GetHomeRegion(XmlRpcRequest request, IPEndPoint remoteClient) | ||
52 | { | ||
53 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
54 | //string host = (string)requestData["host"]; | ||
55 | //string portstr = (string)requestData["port"]; | ||
56 | string userID_str = (string)requestData["userID"]; | ||
57 | UUID userID = UUID.Zero; | ||
58 | UUID.TryParse(userID_str, out userID); | ||
59 | |||
60 | Vector3 position = Vector3.UnitY, lookAt = Vector3.UnitY; | ||
61 | GridRegion regInfo = m_HomeUsersService.GetHomeRegion(userID, out position, out lookAt); | ||
62 | |||
63 | Hashtable hash = new Hashtable(); | ||
64 | if (regInfo == null) | ||
65 | hash["result"] = "false"; | ||
66 | else | ||
67 | { | ||
68 | hash["result"] = "true"; | ||
69 | hash["uuid"] = regInfo.RegionID.ToString(); | ||
70 | hash["x"] = regInfo.RegionLocX.ToString(); | ||
71 | hash["y"] = regInfo.RegionLocY.ToString(); | ||
72 | hash["region_name"] = regInfo.RegionName; | ||
73 | hash["hostname"] = regInfo.ExternalHostName; | ||
74 | hash["http_port"] = regInfo.HttpPort.ToString(); | ||
75 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | ||
76 | hash["position"] = position.ToString(); | ||
77 | hash["lookAt"] = lookAt.ToString(); | ||
78 | } | ||
79 | XmlRpcResponse response = new XmlRpcResponse(); | ||
80 | response.Value = hash; | ||
81 | return response; | ||
82 | |||
83 | } | ||
84 | |||
85 | public XmlRpcResponse AgentIsComingHome(XmlRpcRequest request, IPEndPoint remoteClient) | ||
86 | { | ||
87 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
88 | //string host = (string)requestData["host"]; | ||
89 | //string portstr = (string)requestData["port"]; | ||
90 | string sessionID_str = (string)requestData["sessionID"]; | ||
91 | UUID sessionID = UUID.Zero; | ||
92 | UUID.TryParse(sessionID_str, out sessionID); | ||
93 | string gridName = (string)requestData["externalName"]; | ||
94 | |||
95 | bool success = m_HomeUsersService.AgentIsComingHome(sessionID, gridName); | ||
96 | |||
97 | Hashtable hash = new Hashtable(); | ||
98 | hash["result"] = success.ToString(); | ||
99 | XmlRpcResponse response = new XmlRpcResponse(); | ||
100 | response.Value = hash; | ||
101 | return response; | ||
102 | |||
103 | } | ||
104 | |||
105 | public XmlRpcResponse VerifyAgent(XmlRpcRequest request, IPEndPoint remoteClient) | ||
106 | { | ||
107 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
108 | //string host = (string)requestData["host"]; | ||
109 | //string portstr = (string)requestData["port"]; | ||
110 | string sessionID_str = (string)requestData["sessionID"]; | ||
111 | UUID sessionID = UUID.Zero; | ||
112 | UUID.TryParse(sessionID_str, out sessionID); | ||
113 | string token = (string)requestData["token"]; | ||
114 | |||
115 | bool success = m_HomeUsersService.VerifyAgent(sessionID, token); | ||
116 | |||
117 | Hashtable hash = new Hashtable(); | ||
118 | hash["result"] = success.ToString(); | ||
119 | XmlRpcResponse response = new XmlRpcResponse(); | ||
120 | response.Value = hash; | ||
121 | return response; | ||
122 | |||
123 | } | ||
124 | |||
125 | public XmlRpcResponse VerifyClient(XmlRpcRequest request, IPEndPoint remoteClient) | ||
126 | { | ||
127 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
128 | //string host = (string)requestData["host"]; | ||
129 | //string portstr = (string)requestData["port"]; | ||
130 | string sessionID_str = (string)requestData["sessionID"]; | ||
131 | UUID sessionID = UUID.Zero; | ||
132 | UUID.TryParse(sessionID_str, out sessionID); | ||
133 | string token = (string)requestData["token"]; | ||
134 | |||
135 | bool success = m_HomeUsersService.VerifyClient(sessionID, token); | ||
136 | |||
137 | Hashtable hash = new Hashtable(); | ||
138 | hash["result"] = success.ToString(); | ||
139 | XmlRpcResponse response = new XmlRpcResponse(); | ||
140 | response.Value = hash; | ||
141 | return response; | ||
142 | |||
143 | } | ||
144 | |||
145 | public XmlRpcResponse LogoutAgent(XmlRpcRequest request, IPEndPoint remoteClient) | ||
146 | { | ||
147 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
148 | //string host = (string)requestData["host"]; | ||
149 | //string portstr = (string)requestData["port"]; | ||
150 | string sessionID_str = (string)requestData["sessionID"]; | ||
151 | UUID sessionID = UUID.Zero; | ||
152 | UUID.TryParse(sessionID_str, out sessionID); | ||
153 | string userID_str = (string)requestData["userID"]; | ||
154 | UUID userID = UUID.Zero; | ||
155 | UUID.TryParse(userID_str, out userID); | ||
156 | |||
157 | m_HomeUsersService.LogoutAgent(userID, sessionID); | ||
158 | |||
159 | Hashtable hash = new Hashtable(); | ||
160 | hash["result"] = "true"; | ||
161 | XmlRpcResponse response = new XmlRpcResponse(); | ||
162 | response.Value = hash; | ||
163 | return response; | ||
164 | |||
165 | } | ||
166 | |||
167 | } | ||
168 | } | ||