diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 201 |
1 files changed, 49 insertions, 152 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index 968c1e6..04bb9e8 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -49,191 +49,88 @@ using log4net; | |||
49 | 49 | ||
50 | namespace OpenSim.Server.Handlers.Hypergrid | 50 | namespace OpenSim.Server.Handlers.Hypergrid |
51 | { | 51 | { |
52 | public class HomeAgentHandler | 52 | public class HomeAgentHandler : AgentPostHandler |
53 | { | 53 | { |
54 | 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 IUserAgentService m_UserAgentService; | 55 | private IUserAgentService m_UserAgentService; |
56 | 56 | ||
57 | private string m_LoginServerIP; | 57 | private string m_LoginServerIP; |
58 | private bool m_Proxy = false; | ||
59 | 58 | ||
60 | public HomeAgentHandler(IUserAgentService userAgentService, string loginServerIP, bool proxy) | 59 | public HomeAgentHandler(IUserAgentService userAgentService, string loginServerIP, bool proxy) : |
60 | base("/homeagent") | ||
61 | { | 61 | { |
62 | m_UserAgentService = userAgentService; | 62 | m_UserAgentService = userAgentService; |
63 | m_LoginServerIP = loginServerIP; | 63 | m_LoginServerIP = loginServerIP; |
64 | m_Proxy = proxy; | 64 | m_Proxy = proxy; |
65 | } | 65 | } |
66 | 66 | ||
67 | public Hashtable Handler(Hashtable request) | 67 | protected override AgentDestinationData CreateAgentDestinationData() |
68 | { | 68 | { |
69 | // m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called"); | 69 | return new ExtendedAgentDestinationData(); |
70 | // | 70 | } |
71 | // m_log.Debug("---------------------------"); | 71 | |
72 | // m_log.Debug(" >> uri=" + request["uri"]); | 72 | protected override void UnpackData(OSDMap args, AgentDestinationData d, Hashtable request) |
73 | // m_log.Debug(" >> content-type=" + request["content-type"]); | 73 | { |
74 | // m_log.Debug(" >> http-method=" + request["http-method"]); | 74 | base.UnpackData(args, d, request); |
75 | // m_log.Debug("---------------------------\n"); | 75 | ExtendedAgentDestinationData data = (ExtendedAgentDestinationData)d; |
76 | 76 | try | |
77 | Hashtable responsedata = new Hashtable(); | ||
78 | responsedata["content_type"] = "text/html"; | ||
79 | responsedata["keepalive"] = false; | ||
80 | |||
81 | |||
82 | UUID agentID; | ||
83 | UUID regionID; | ||
84 | string action; | ||
85 | if (!Utils.GetParams((string)request["uri"], out agentID, out regionID, out action)) | ||
86 | { | 77 | { |
87 | m_log.InfoFormat("[HOME AGENT HANDLER]: Invalid parameters for agent message {0}", request["uri"]); | 78 | if (args.ContainsKey("gatekeeper_host") && args["gatekeeper_host"] != null) |
88 | responsedata["int_response_code"] = 404; | 79 | data.host = args["gatekeeper_host"].AsString(); |
89 | responsedata["str_response_string"] = "false"; | 80 | if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null) |
81 | Int32.TryParse(args["gatekeeper_port"].AsString(), out data.port); | ||
82 | if (args.ContainsKey("gatekeeper_serveruri") && args["gatekeeper_serveruri"] != null) | ||
83 | data.gatekeeperServerURI = args["gatekeeper_serveruri"]; | ||
84 | if (args.ContainsKey("destination_serveruri") && args["destination_serveruri"] != null) | ||
85 | data.destinationServerURI = args["destination_serveruri"]; | ||
90 | 86 | ||
91 | return responsedata; | ||
92 | } | 87 | } |
93 | 88 | catch (InvalidCastException) | |
94 | // Next, let's parse the verb | ||
95 | string method = (string)request["http-method"]; | ||
96 | if (method.Equals("POST")) | ||
97 | { | 89 | { |
98 | DoAgentPost(request, responsedata, agentID); | 90 | m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData"); |
99 | return responsedata; | ||
100 | } | 91 | } |
101 | else | ||
102 | { | ||
103 | m_log.InfoFormat("[HOME AGENT HANDLER]: method {0} not supported in agent message", method); | ||
104 | responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed; | ||
105 | responsedata["str_response_string"] = "Method not allowed"; | ||
106 | 92 | ||
107 | return responsedata; | 93 | string callerIP = GetCallerIP(request); |
108 | } | 94 | // Verify if this call came from the login server |
95 | if (callerIP == m_LoginServerIP) | ||
96 | data.fromLogin = true; | ||
109 | 97 | ||
110 | } | 98 | } |
111 | 99 | ||
112 | protected void DoAgentPost(Hashtable request, Hashtable responsedata, UUID id) | 100 | protected override GridRegion ExtractGatekeeper(AgentDestinationData d) |
113 | { | 101 | { |
114 | OSDMap args = Utils.GetOSDMap((string)request["body"]); | 102 | if (d is ExtendedAgentDestinationData) |
115 | if (args == null) | ||
116 | { | 103 | { |
117 | responsedata["int_response_code"] = HttpStatusCode.BadRequest; | 104 | ExtendedAgentDestinationData data = (ExtendedAgentDestinationData)d; |
118 | responsedata["str_response_string"] = "Bad request"; | 105 | GridRegion gatekeeper = new GridRegion(); |
119 | return; | 106 | gatekeeper.ServerURI = data.gatekeeperServerURI; |
107 | gatekeeper.ExternalHostName = data.host; | ||
108 | gatekeeper.HttpPort = (uint)data.port; | ||
109 | gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
110 | |||
111 | return gatekeeper; | ||
120 | } | 112 | } |
121 | |||
122 | // retrieve the input arguments | ||
123 | int x = 0, y = 0; | ||
124 | UUID uuid = UUID.Zero; | ||
125 | string regionname = string.Empty; | ||
126 | string gatekeeper_host = string.Empty; | ||
127 | string gatekeeper_serveruri = string.Empty; | ||
128 | string destination_serveruri = string.Empty; | ||
129 | int gatekeeper_port = 0; | ||
130 | IPEndPoint client_ipaddress = null; | ||
131 | |||
132 | if (args.ContainsKey("gatekeeper_host") && args["gatekeeper_host"] != null) | ||
133 | gatekeeper_host = args["gatekeeper_host"].AsString(); | ||
134 | if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null) | ||
135 | Int32.TryParse(args["gatekeeper_port"].AsString(), out gatekeeper_port); | ||
136 | if (args.ContainsKey("gatekeeper_serveruri") && args["gatekeeper_serveruri"] !=null) | ||
137 | gatekeeper_serveruri = args["gatekeeper_serveruri"]; | ||
138 | if (args.ContainsKey("destination_serveruri") && args["destination_serveruri"] !=null) | ||
139 | destination_serveruri = args["destination_serveruri"]; | ||
140 | |||
141 | GridRegion gatekeeper = new GridRegion(); | ||
142 | gatekeeper.ServerURI = gatekeeper_serveruri; | ||
143 | gatekeeper.ExternalHostName = gatekeeper_host; | ||
144 | gatekeeper.HttpPort = (uint)gatekeeper_port; | ||
145 | gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
146 | |||
147 | if (args.ContainsKey("destination_x") && args["destination_x"] != null) | ||
148 | Int32.TryParse(args["destination_x"].AsString(), out x); | ||
149 | else | ||
150 | m_log.WarnFormat(" -- request didn't have destination_x"); | ||
151 | if (args.ContainsKey("destination_y") && args["destination_y"] != null) | ||
152 | Int32.TryParse(args["destination_y"].AsString(), out y); | ||
153 | else | 113 | else |
154 | m_log.WarnFormat(" -- request didn't have destination_y"); | 114 | m_log.WarnFormat("[HOME AGENT HANDLER]: Wrong data type"); |
155 | if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null) | ||
156 | UUID.TryParse(args["destination_uuid"].AsString(), out uuid); | ||
157 | if (args.ContainsKey("destination_name") && args["destination_name"] != null) | ||
158 | regionname = args["destination_name"].ToString(); | ||
159 | |||
160 | if (args.ContainsKey("client_ip") && args["client_ip"] != null) | ||
161 | { | ||
162 | string ip_str = args["client_ip"].ToString(); | ||
163 | try | ||
164 | { | ||
165 | string callerIP = GetCallerIP(request); | ||
166 | // Verify if this caller has authority to send the client IP | ||
167 | if (callerIP == m_LoginServerIP) | ||
168 | client_ipaddress = new IPEndPoint(IPAddress.Parse(ip_str), 0); | ||
169 | else // leaving this for now, but this warning should be removed | ||
170 | m_log.WarnFormat("[HOME AGENT HANDLER]: Unauthorized machine {0} tried to set client ip to {1}", callerIP, ip_str); | ||
171 | } | ||
172 | catch | ||
173 | { | ||
174 | m_log.DebugFormat("[HOME AGENT HANDLER]: Exception parsing client ip address from {0}", ip_str); | ||
175 | } | ||
176 | } | ||
177 | 115 | ||
178 | GridRegion destination = new GridRegion(); | 116 | return null; |
179 | destination.RegionID = uuid; | ||
180 | destination.RegionLocX = x; | ||
181 | destination.RegionLocY = y; | ||
182 | destination.RegionName = regionname; | ||
183 | destination.ServerURI = destination_serveruri; | ||
184 | |||
185 | AgentCircuitData aCircuit = new AgentCircuitData(); | ||
186 | try | ||
187 | { | ||
188 | aCircuit.UnpackAgentCircuitData(args); | ||
189 | } | ||
190 | catch (Exception ex) | ||
191 | { | ||
192 | m_log.InfoFormat("[HOME AGENT HANDLER]: exception on unpacking ChildCreate message {0}", ex.Message); | ||
193 | responsedata["int_response_code"] = HttpStatusCode.BadRequest; | ||
194 | responsedata["str_response_string"] = "Bad request"; | ||
195 | return; | ||
196 | } | ||
197 | |||
198 | OSDMap resp = new OSDMap(2); | ||
199 | string reason = String.Empty; | ||
200 | |||
201 | bool result = m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, client_ipaddress, out reason); | ||
202 | |||
203 | resp["reason"] = OSD.FromString(reason); | ||
204 | resp["success"] = OSD.FromBoolean(result); | ||
205 | |||
206 | // TODO: add reason if not String.Empty? | ||
207 | responsedata["int_response_code"] = HttpStatusCode.OK; | ||
208 | responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); | ||
209 | } | 117 | } |
210 | 118 | ||
211 | private string GetCallerIP(Hashtable request) | ||
212 | { | ||
213 | if (!m_Proxy) | ||
214 | return Util.GetCallerIP(request); | ||
215 | |||
216 | // We're behind a proxy | ||
217 | Hashtable headers = (Hashtable)request["headers"]; | ||
218 | string xff = "X-Forwarded-For"; | ||
219 | if (headers.ContainsKey(xff.ToLower())) | ||
220 | xff = xff.ToLower(); | ||
221 | 119 | ||
222 | if (!headers.ContainsKey(xff) || headers[xff] == null) | 120 | protected override bool CreateAgent(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) |
223 | { | 121 | { |
224 | m_log.WarnFormat("[AGENT HANDLER]: No XFF header"); | 122 | return m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, fromLogin, out reason); |
225 | return Util.GetCallerIP(request); | 123 | } |
226 | } | ||
227 | 124 | ||
228 | m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]); | 125 | } |
229 | 126 | ||
230 | IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]); | 127 | public class ExtendedAgentDestinationData : AgentDestinationData |
231 | if (ep != null) | 128 | { |
232 | return ep.Address.ToString(); | 129 | public string host; |
130 | public int port; | ||
131 | public string gatekeeperServerURI; | ||
132 | public string destinationServerURI; | ||
233 | 133 | ||
234 | // Oops | ||
235 | return Util.GetCallerIP(request); | ||
236 | } | ||
237 | } | 134 | } |
238 | 135 | ||
239 | } | 136 | } |