Pulled out HelloNeighbour into its own service, INeighbourService, which may get more functions as we go along. It's a very simple service and service connectors, and it served primarily to establish the design of services that dependent on Scenes and that must always have a local connector. More refactoring coming, as this showed how to do it right.

author: diva 2009-06-14 15:35:09 +0000
committer: diva 2009-06-14 15:35:09 +0000
commit: 7a9c85526cb99495bdd436150679941ef021b782 (patch)
tree: 888b5bdf86f8327d2df0c1ca8f1cd3dd999d125d /OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
parent: * Temporarily resolve another problem in http://opensimulator.org/mantis/view... (diff)
download: opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.zip
opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.tar.gz
opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.tar.bz2
opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.tar.xz
1 files changed, 203 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
new file mode 100644
index 0000000..6336f4f
--- /dev/null
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.IO;
+using System.Reflection;
+using System.Net;
+using System.Text;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using Nini.Config;
+using log4net;
+namespace OpenSim.Server.Handlers.Neighbour
+{
+    public class NeighbourGetHandler : BaseStreamHandler
+    {
+        // TODO: unused: private ISimulationService m_SimulationService;
+        // TODO: unused: private IAuthenticationService m_AuthenticationService;
+        public NeighbourGetHandler(INeighbourService service, IAuthenticationService authentication) :
+                base("GET", "/region")
+        {
+            // TODO: unused: m_SimulationService = service;
+            // TODO: unused: m_AuthenticationService = authentication;
+        }
+        public override byte[] Handle(string path, Stream request,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            // Not implemented yet
+            Console.WriteLine("--- Get region --- " + path);
+            httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
+            return new byte[] { };
+        }
+    }
+    public class NeighbourPostHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private INeighbourService m_NeighbourService;
+        private IAuthenticationService m_AuthenticationService;
+        // TODO: unused: private bool m_AllowForeignGuests;
+        public NeighbourPostHandler(INeighbourService service, IAuthenticationService authentication) :
+            base("POST", "/region")
+        {
+            m_NeighbourService = service;
+            m_AuthenticationService = authentication;
+            // TODO: unused: m_AllowForeignGuests = foreignGuests;
+        }
+        public override byte[] Handle(string path, Stream request,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            byte[] result = new byte[0];
+            UUID regionID;
+            string action;
+            ulong regionHandle;
+            if (RestHandlerUtils.GetParams(path, out regionID, out regionHandle, out action))
+            {
+                m_log.InfoFormat("[RegionPostHandler]: Invalid parameters for neighbour message {0}", path);
+                httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
+                httpResponse.StatusDescription = "Invalid parameters for neighbour message " + path;
+                return result;
+            }
+            if (m_AuthenticationService != null)
+            {
+                // Authentication
+                string authority = string.Empty;
+                string authToken = string.Empty;
+                if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken))
+                {
+                    m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
+                    httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized;
+                    return result;
+                }
+                if (!m_AuthenticationService.VerifyUserKey(regionID, authToken))
+                {
+                    m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
+                    httpResponse.StatusCode = (int)HttpStatusCode.Forbidden;
+                    return result;
+                }
+                m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID);
+            }
+            OSDMap args = Util.GetOSDMap(request, (int)httpRequest.ContentLength);
+            if (args == null)
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
+                httpResponse.StatusDescription = "Unable to retrieve data";
+                m_log.DebugFormat("[RegionPostHandler]: Unable to retrieve data for post {0}", path);
+                return result;
+            }
+            // retrieve the regionhandle
+            ulong regionhandle = 0;
+            if (args["destination_handle"] != null)
+                UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
+            RegionInfo aRegion = new RegionInfo();
+            try
+            {
+                aRegion.UnpackRegionInfoData(args);
+            }
+            catch (Exception ex)
+            {
+                m_log.InfoFormat("[RegionPostHandler]: exception on unpacking region info {0}", ex.Message);
+                httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
+                httpResponse.StatusDescription = "Problems with data deserialization";
+                return result;
+            }
+            // Finally!
+            bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
+            OSDMap resp = new OSDMap(1);
+            resp["success"] = OSD.FromBoolean(success);
+            httpResponse.StatusCode = (int)HttpStatusCode.OK;
+            return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
+        }
+    }
+    public class NeighbourPutHandler : BaseStreamHandler
+    {
+        // TODO: unused: private ISimulationService m_SimulationService;
+        // TODO: unused: private IAuthenticationService m_AuthenticationService;
+        public NeighbourPutHandler(INeighbourService service, IAuthenticationService authentication) :
+            base("PUT", "/region")
+        {
+            // TODO: unused: m_SimulationService = service;
+            // TODO: unused: m_AuthenticationService = authentication;
+        }
+        public override byte[] Handle(string path, Stream request,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            // Not implemented yet
+            httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
+            return new byte[] { };
+        }
+    }
+    public class NeighbourDeleteHandler : BaseStreamHandler
+    {
+        // TODO: unused: private ISimulationService m_SimulationService;
+        // TODO: unused: private IAuthenticationService m_AuthenticationService;
+        public NeighbourDeleteHandler(INeighbourService service, IAuthenticationService authentication) :
+            base("DELETE", "/region")
+        {
+            // TODO: unused: m_SimulationService = service;
+            // TODO: unused: m_AuthenticationService = authentication;
+        }
+        public override byte[] Handle(string path, Stream request,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            // Not implemented yet
+            httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
+            return new byte[] { };
+        }
+    }
+}
author	diva	2009-06-14 15:35:09 +0000
committer	diva	2009-06-14 15:35:09 +0000
commit	7a9c85526cb99495bdd436150679941ef021b782 (patch)
tree	888b5bdf86f8327d2df0c1ca8f1cd3dd999d125d /OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
parent	* Temporarily resolve another problem in http://opensimulator.org/mantis/view... (diff)
download	opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.zip opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.tar.gz opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.tar.bz2 opensim-SC_OLD-7a9c85526cb99495bdd436150679941ef021b782.tar.xz

diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs new file mode 100644 index 0000000..6336f4f --- /dev/null +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -0,0 +1,203 @@
	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.IO;
	30	using System.Reflection;
	31	using System.Net;
	32	using System.Text;
	33
	34	using OpenSim.Server.Base;
	35	using OpenSim.Server.Handlers.Base;
	36	using OpenSim.Services.Interfaces;
	37	using OpenSim.Framework;
	38	using OpenSim.Framework.Servers.HttpServer;
	39
	40	using OpenMetaverse;
	41	using OpenMetaverse.StructuredData;
	42	using Nini.Config;
	43	using log4net;
	44
	45
	46	namespace OpenSim.Server.Handlers.Neighbour
	47	{
	48	public class NeighbourGetHandler : BaseStreamHandler
	49	{
	50	// TODO: unused: private ISimulationService m_SimulationService;
	51	// TODO: unused: private IAuthenticationService m_AuthenticationService;
	52
	53	public NeighbourGetHandler(INeighbourService service, IAuthenticationService authentication) :
	54	base("GET", "/region")
	55	{
	56	// TODO: unused: m_SimulationService = service;
	57	// TODO: unused: m_AuthenticationService = authentication;
	58	}
	59
	60	public override byte[] Handle(string path, Stream request,
	61	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
	62	{
	63	// Not implemented yet
	64	Console.WriteLine("--- Get region --- " + path);
	65	httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
	66	return new byte[] { };
	67	}
	68	}
	69
	70	public class NeighbourPostHandler : BaseStreamHandler
	71	{
	72	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
	73	private INeighbourService m_NeighbourService;
	74	private IAuthenticationService m_AuthenticationService;
	75	// TODO: unused: private bool m_AllowForeignGuests;
	76
	77	public NeighbourPostHandler(INeighbourService service, IAuthenticationService authentication) :
	78	base("POST", "/region")
	79	{
	80	m_NeighbourService = service;
	81	m_AuthenticationService = authentication;
	82	// TODO: unused: m_AllowForeignGuests = foreignGuests;
	83	}
	84
	85	public override byte[] Handle(string path, Stream request,
	86	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
	87	{
	88	byte[] result = new byte[0];
	89
	90	UUID regionID;
	91	string action;
	92	ulong regionHandle;
	93	if (RestHandlerUtils.GetParams(path, out regionID, out regionHandle, out action))
	94	{
	95	m_log.InfoFormat("[RegionPostHandler]: Invalid parameters for neighbour message {0}", path);
	96	httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
	97	httpResponse.StatusDescription = "Invalid parameters for neighbour message " + path;
	98
	99	return result;
	100	}
	101
	102	if (m_AuthenticationService != null)
	103	{
	104	// Authentication
	105	string authority = string.Empty;
	106	string authToken = string.Empty;
	107	if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken))
	108	{
	109	m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
	110	httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized;
	111	return result;
	112	}
	113	if (!m_AuthenticationService.VerifyUserKey(regionID, authToken))
	114	{
	115	m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
	116	httpResponse.StatusCode = (int)HttpStatusCode.Forbidden;
	117	return result;
	118	}
	119	m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID);
	120	}
	121
	122	OSDMap args = Util.GetOSDMap(request, (int)httpRequest.ContentLength);
	123	if (args == null)
	124	{
	125	httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
	126	httpResponse.StatusDescription = "Unable to retrieve data";
	127	m_log.DebugFormat("[RegionPostHandler]: Unable to retrieve data for post {0}", path);
	128	return result;
	129	}
	130
	131	// retrieve the regionhandle
	132	ulong regionhandle = 0;
	133	if (args["destination_handle"] != null)
	134	UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
	135
	136	RegionInfo aRegion = new RegionInfo();
	137	try
	138	{
	139	aRegion.UnpackRegionInfoData(args);
	140	}
	141	catch (Exception ex)
	142	{
	143	m_log.InfoFormat("[RegionPostHandler]: exception on unpacking region info {0}", ex.Message);
	144	httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
	145	httpResponse.StatusDescription = "Problems with data deserialization";
	146	return result;
	147	}
	148
	149	// Finally!
	150	bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
	151
	152	OSDMap resp = new OSDMap(1);
	153
	154	resp["success"] = OSD.FromBoolean(success);
	155
	156	httpResponse.StatusCode = (int)HttpStatusCode.OK;
	157
	158	return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
	159	}
	160	}
	161
	162	public class NeighbourPutHandler : BaseStreamHandler
	163	{
	164	// TODO: unused: private ISimulationService m_SimulationService;
	165	// TODO: unused: private IAuthenticationService m_AuthenticationService;
	166
	167	public NeighbourPutHandler(INeighbourService service, IAuthenticationService authentication) :
	168	base("PUT", "/region")
	169	{
	170	// TODO: unused: m_SimulationService = service;
	171	// TODO: unused: m_AuthenticationService = authentication;
	172	}
	173
	174	public override byte[] Handle(string path, Stream request,
	175	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
	176	{
	177	// Not implemented yet
	178	httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
	179	return new byte[] { };
	180	}
	181	}
	182
	183	public class NeighbourDeleteHandler : BaseStreamHandler
	184	{
	185	// TODO: unused: private ISimulationService m_SimulationService;
	186	// TODO: unused: private IAuthenticationService m_AuthenticationService;
	187
	188	public NeighbourDeleteHandler(INeighbourService service, IAuthenticationService authentication) :
	189	base("DELETE", "/region")
	190	{
	191	// TODO: unused: m_SimulationService = service;
	192	// TODO: unused: m_AuthenticationService = authentication;
	193	}
	194
	195	public override byte[] Handle(string path, Stream request,
	196	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
	197	{
	198	// Not implemented yet
	199	httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
	200	return new byte[] { };
	201	}
	202	}
	203	}