From 6a6dd6612997418d8bac177ec4f0ecf168034f4b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 9 Aug 2009 14:21:47 -0700 Subject: More removal of HG2 code, this time authentication module and handlers. --- .../Resources/CoreModulePlugin.addin.xml | 1 - .../HGAuthServiceInConnectorModule.cs | 122 --------------------- .../Authentication/HGAuthServerConnector.cs | 64 ----------- .../Authentication/HGAuthenticationHandlers.cs | 117 -------------------- 4 files changed, 304 deletions(-) delete mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs delete mode 100644 OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs delete mode 100644 OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index c0932bd..8e85559 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml @@ -37,7 +37,6 @@ \ - \ diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs deleted file mode 100644 index 6f2371d..0000000 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs +++ /dev/null @@ -1,122 +0,0 @@ -/* - * 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.Reflection; -using System.Collections.Generic; -using log4net; -using Nini.Config; -using OpenSim.Framework; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Region.Framework.Scenes; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Server.Base; -using OpenSim.Services.Interfaces; -using OpenSim.Server.Handlers.Authentication; - - -namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication -{ - public class HGAuthServiceInConnectorModule : ISharedRegionModule - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static bool m_Enabled = false; - private static bool m_Registered = false; - - private IConfigSource m_Config; - - #region IRegionModule interface - - public void Initialise(IConfigSource config) - { - m_Config = config; - - IConfig moduleConfig = config.Configs["Modules"]; - if (moduleConfig != null) - { - // Boolean because there may be many of these in peaceful coexistence - m_Enabled = moduleConfig.GetBoolean("HGAuthServiceInConnector", false); - if (m_Enabled) - { - m_log.Info("[HGAUTH IN CONNECTOR]: HGAuthServiceInConnector enabled"); - } - - } - - } - - public void PostInitialise() - { - if (!m_Enabled) - return; - - m_log.Info("[HGAUTH IN CONNECTOR]: Starting..."); - } - - public void Close() - { - } - - public Type ReplacableInterface - { - get { return null; } - } - - public string Name - { - get { return "HGAuthServiceInConnectorModule"; } - } - - public void AddRegion(Scene scene) - { - if (!m_Enabled) - return; - - if (!m_Registered) - { - m_Registered = true; - new HGAuthServiceInConnector(m_Config, MainServer.Instance, scene); - - //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; - //ServerUtils.LoadPlugin("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); - } - - - } - - public void RemoveRegion(Scene scene) - { - } - - public void RegionLoaded(Scene scene) - { - } - - #endregion - - } -} diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs deleted file mode 100644 index f4f8309..0000000 --- a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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.Framework; -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, IScene registry) : - 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(authenticationService, args); - registry.RegisterModuleInterface(m_AuthenticationService); - - 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 deleted file mode 100644 index 58a1823..0000000 --- a/OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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; - } - - } -} -- cgit v1.1