Implementation of a simple authentication service + in connector in route to making HGInventory (client access) work in standalone again. This is the refactoring of what was/is there, but done in the new model. Not complete yet, but key authentication works. It should be enough to make HGInventory work again soon.

author: diva 2009-06-17 03:52:39 +0000
committer: diva 2009-06-17 03:52:39 +0000
commit: ce7de3581cd678dd09227bdfde94fefb779f5a86 (patch)
tree: 2eab5b5424e8463d30cdc918604629fe3fe08cc5 /OpenSim/Server/Handlers/Authentication
parent: Moving these nice HG connectors to their homes. (diff)
download: opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.zip
opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.tar.gz
opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.tar.bz2
opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.tar.xz
2 files changed, 179 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
new file mode 100644
index 0000000..2b4c380
--- /dev/null
+++ b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
@@ -0,0 +1,62 @@
+/*
+ * 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 Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+namespace OpenSim.Server.Handlers.Authentication
+{
+    public class HGAuthServiceInConnector : ServiceConnector
+    {
+        private IAuthenticationService m_AuthenticationService;
+        public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :
+                base(config, server)
+        {
+            IConfig serverConfig = config.Configs["AuthenticationService"];
+            if (serverConfig == null)
+                throw new Exception("No section 'AuthenticationService' in config file");
+            string authenticationService = serverConfig.GetString("LocalServiceModule",
+                    String.Empty);
+            if (authenticationService == String.Empty)
+                throw new Exception("No AuthenticationService in config file");
+            Object[] args = new Object[] { config };
+            m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
+            HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
+            server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
+            server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);
+        }
+    }
+}
diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs b/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs
new file mode 100644
index 0000000..1bcbaf5
--- /dev/null
+++ b/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs
@@ -0,0 +1,117 @@
+/*
+ * 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.Collections;
+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 Nwc.XmlRpc;
+using Nini.Config;
+using log4net;
+namespace OpenSim.Server.Handlers.Authentication
+{
+    public class HGAuthenticationHandlers
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IAuthenticationService m_LocalService;
+        public HGAuthenticationHandlers(IAuthenticationService service)
+        {
+            m_LocalService = service;
+        }
+        public XmlRpcResponse GenerateKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            if (request.Params.Count < 2)
+            {
+                response.IsFault = true;
+                response.SetFault(-1, "Invalid parameters");
+                return response;
+            }
+            // Verify the key of who's calling
+            UUID userID = UUID.Zero;
+            string authKey = string.Empty;
+            UUID.TryParse((string)request.Params[0], out userID);
+            authKey = (string)request.Params[1];
+            m_log.InfoFormat("[AUTH HANDLER] GenerateKey called with authToken {0}", authKey);
+            string newKey = string.Empty;
+            newKey = m_LocalService.GetKey(userID, authKey.ToString());
+ 
+            response.Value = (string)newKey;
+            return response;
+        }
+        public XmlRpcResponse VerifyKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            bool success = false;
+            XmlRpcResponse response = new XmlRpcResponse();
+            if (request.Params.Count != 2)
+            {
+                response.IsFault = true;
+                response.SetFault(-1, "Invalid parameters");
+                return response;
+            }
+            // Verify the key of who's calling
+            UUID userID = UUID.Zero;
+            string authKey = string.Empty;
+            if (UUID.TryParse((string)request.Params[0], out userID))
+            {
+                authKey = (string)request.Params[1];
+                m_log.InfoFormat("[AUTH HANDLER] VerifyKey called with key {0}", authKey);
+                success = m_LocalService.VerifyKey(userID, authKey);
+            }
+            m_log.DebugFormat("[AUTH HANDLER]: Response to VerifyKey is {0}", success);
+            response.Value = success;
+            return response;
+        }
+    }
+}
author	diva	2009-06-17 03:52:39 +0000
committer	diva	2009-06-17 03:52:39 +0000
commit	ce7de3581cd678dd09227bdfde94fefb779f5a86 (patch)
tree	2eab5b5424e8463d30cdc918604629fe3fe08cc5 /OpenSim/Server/Handlers/Authentication
parent	Moving these nice HG connectors to their homes. (diff)
download	opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.zip opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.tar.gz opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.tar.bz2 opensim-SC-ce7de3581cd678dd09227bdfde94fefb779f5a86.tar.xz

diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs new file mode 100644 index 0000000..2b4c380 --- /dev/null +++ b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
@@ -0,0 +1,62 @@
	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 Nini.Config;
	30	using OpenSim.Server.Base;
	31	using OpenSim.Services.Interfaces;
	32	using OpenSim.Framework.Servers.HttpServer;
	33	using OpenSim.Server.Handlers.Base;
	34
	35	namespace OpenSim.Server.Handlers.Authentication
	36	{
	37	public class HGAuthServiceInConnector : ServiceConnector
	38	{
	39	private IAuthenticationService m_AuthenticationService;
	40
	41	public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :
	42	base(config, server)
	43	{
	44	IConfig serverConfig = config.Configs["AuthenticationService"];
	45	if (serverConfig == null)
	46	throw new Exception("No section 'AuthenticationService' in config file");
	47
	48	string authenticationService = serverConfig.GetString("LocalServiceModule",
	49	String.Empty);
	50
	51	if (authenticationService == String.Empty)
	52	throw new Exception("No AuthenticationService in config file");
	53
	54	Object[] args = new Object[] { config };
	55	m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
	56
	57	HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
	58	server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
	59	server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);
	60	}
	61	}
	62	}


diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs b/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs new file mode 100644 index 0000000..1bcbaf5 --- /dev/null +++ b/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.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
	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 OpenSim.Framework;
	39	using OpenSim.Framework.Servers.HttpServer;
	40
	41	using OpenMetaverse;
	42	using OpenMetaverse.StructuredData;
	43	using Nwc.XmlRpc;
	44	using Nini.Config;
	45	using log4net;
	46
	47	namespace OpenSim.Server.Handlers.Authentication
	48	{
	49	public class HGAuthenticationHandlers
	50	{
	51	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
	52
	53	private IAuthenticationService m_LocalService;
	54
	55	public HGAuthenticationHandlers(IAuthenticationService service)
	56	{
	57	m_LocalService = service;
	58	}
	59
	60
	61	public XmlRpcResponse GenerateKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
	62	{
	63	XmlRpcResponse response = new XmlRpcResponse();
	64
	65	if (request.Params.Count < 2)
	66	{
	67	response.IsFault = true;
	68	response.SetFault(-1, "Invalid parameters");
	69	return response;
	70	}
	71
	72	// Verify the key of who's calling
	73	UUID userID = UUID.Zero;
	74	string authKey = string.Empty;
	75	UUID.TryParse((string)request.Params[0], out userID);
	76	authKey = (string)request.Params[1];
	77
	78	m_log.InfoFormat("[AUTH HANDLER] GenerateKey called with authToken {0}", authKey);
	79	string newKey = string.Empty;
	80
	81	newKey = m_LocalService.GetKey(userID, authKey.ToString());
	82
	83	response.Value = (string)newKey;
	84	return response;
	85	}
	86
	87	public XmlRpcResponse VerifyKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
	88	{
	89	bool success = false;
	90	XmlRpcResponse response = new XmlRpcResponse();
	91
	92	if (request.Params.Count != 2)
	93	{
	94	response.IsFault = true;
	95	response.SetFault(-1, "Invalid parameters");
	96	return response;
	97	}
	98
	99	// Verify the key of who's calling
	100	UUID userID = UUID.Zero;
	101	string authKey = string.Empty;
	102	if (UUID.TryParse((string)request.Params[0], out userID))
	103	{
	104	authKey = (string)request.Params[1];
	105
	106	m_log.InfoFormat("[AUTH HANDLER] VerifyKey called with key {0}", authKey);
	107
	108	success = m_LocalService.VerifyKey(userID, authKey);
	109	}
	110
	111	m_log.DebugFormat("[AUTH HANDLER]: Response to VerifyKey is {0}", success);
	112	response.Value = success;
	113	return response;
	114	}
	115
	116	}
	117	}