From 0ce9be653d2194877cb972cbce261eecb0cd58a8 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 31 Dec 2009 14:59:26 -0800 Subject: * Added the Login server handlers that were lost in yesterday's commit grief * More beef to the LLLoginService * Better design for handling local simulation service --- OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 139 +++++++++++++++++++++ .../Handlers/Login/LLLoginServiceInConnector.cs | 93 ++++++++++++++ .../Simulation/SimulationServiceInConnector.cs | 12 +- 3 files changed, 236 insertions(+), 8 deletions(-) create mode 100644 OpenSim/Server/Handlers/Login/LLLoginHandlers.cs create mode 100644 OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs (limited to 'OpenSim/Server/Handlers') diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs new file mode 100644 index 0000000..b973c11 --- /dev/null +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs @@ -0,0 +1,139 @@ +/* + * 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.Login +{ + public class LLLoginHandlers + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + private ILoginService m_LocalService; + + public LLLoginHandlers(ILoginService service) + { + m_LocalService = service; + } + + public XmlRpcResponse HandleXMLRPCLogin(XmlRpcRequest request, IPEndPoint remoteClient) + { + Hashtable requestData = (Hashtable)request.Params[0]; + + if (requestData != null) + { + if (requestData.ContainsKey("first") && requestData["first"] != null && + requestData.ContainsKey("last") && requestData["last"] != null && + requestData.ContainsKey("passwd") && requestData["passwd"] != null) + { + string startLocation = string.Empty; + if (requestData.ContainsKey("start")) + startLocation = requestData["start"].ToString(); + + LoginResponse reply = null; + reply = m_LocalService.Login(requestData["first"].ToString(), requestData["last"].ToString(), requestData["passwd"].ToString(), startLocation); + + XmlRpcResponse response = new XmlRpcResponse(); + response.Value = reply.ToHashtable(); + return response; + + } + } + + return FailedXMLRPCResponse(); + + } + + public OSD HandleLLSDLogin(OSD request, IPEndPoint remoteClient) + { + if (request.Type == OSDType.Map) + { + OSDMap map = (OSDMap)request; + + if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd")) + { + string startLocation = string.Empty; + + if (map.ContainsKey("start")) + startLocation = map["start"].AsString(); + + m_log.Info("[LOGIN]: LLSD Login Requested for: '" + map["first"].AsString() + "' '" + map["last"].AsString() + "' / " + startLocation); + + LoginResponse reply = null; + reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation); + return reply.ToOSDMap(); + + } + } + + return FailedOSDResponse(); + } + + private XmlRpcResponse FailedXMLRPCResponse() + { + Hashtable hash = new Hashtable(); + hash["reason"] = "key"; + hash["message"] = "Incomplete login credentials. Check your username and password."; + hash["login"] = "false"; + + XmlRpcResponse response = new XmlRpcResponse(); + response.Value = hash; + + return response; + } + + private OSD FailedOSDResponse() + { + OSDMap map = new OSDMap(); + + map["reason"] = OSD.FromString("key"); + map["message"] = OSD.FromString("Invalid login credentials. Check your username and passwd."); + map["login"] = OSD.FromString("false"); + + return map; + } + } + +} diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs new file mode 100644 index 0000000..42ecd4d --- /dev/null +++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs @@ -0,0 +1,93 @@ +/* + * 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.Generic; +using System.Reflection; +using log4net; +using Nini.Config; +using OpenSim.Server.Base; +using OpenSim.Services.Interfaces; +using OpenSim.Framework; +using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Server.Handlers.Base; + +namespace OpenSim.Server.Handlers.Login +{ + public class LLLoginServiceInConnector : ServiceConnector + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + private ILoginService m_LoginService; + + public LLLoginServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : + base(config, server, String.Empty) + { + string loginService = ReadLocalServiceFromConfig(config); + + ISimulationService simService = scene.RequestModuleInterface(); + + Object[] args = new Object[] { config, simService }; + m_LoginService = ServerUtils.LoadPlugin(loginService, args); + + InitializeHandlers(server); + } + + public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) : + base(config, server, String.Empty) + { + string loginService = ReadLocalServiceFromConfig(config); + + Object[] args = new Object[] { config }; + + m_LoginService = ServerUtils.LoadPlugin(loginService, args); + + InitializeHandlers(server); + } + + private string ReadLocalServiceFromConfig(IConfigSource config) + { + IConfig serverConfig = config.Configs["LoginService"]; + if (serverConfig == null) + throw new Exception(String.Format("No section LoginService in config file")); + + string loginService = serverConfig.GetString("LocalServiceModule", String.Empty); + if (loginService == string.Empty) + throw new Exception(String.Format("No LocalServiceModule for LoginService in config file")); + + return loginService; + } + + private void InitializeHandlers(IHttpServer server) + { + LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService); + server.AddXmlRPCHandler("Login_to_simulator", loginHandlers.HandleXMLRPCLogin, false); + server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin); + } + + } +} diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index b2aa52f..8611228 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs @@ -37,7 +37,7 @@ namespace OpenSim.Server.Handlers.Simulation { public class SimulationServiceInConnector : ServiceConnector { - private ISimulationService m_SimulationService; + private ISimulationService m_LocalSimulationService; private IAuthenticationService m_AuthenticationService; public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : @@ -54,20 +54,16 @@ namespace OpenSim.Server.Handlers.Simulation // throw new Exception("No SimulationService in config file"); //Object[] args = new Object[] { config }; - m_SimulationService = scene.RequestModuleInterface(); + m_LocalSimulationService = scene.RequestModuleInterface(); //ServerUtils.LoadPlugin(simService, args); - if (m_SimulationService == null) - throw new Exception("No Local ISimulationService Module"); - - //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService)); //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); - server.AddHTTPHandler("/agent/", new AgentHandler(m_SimulationService).Handler); - server.AddHTTPHandler("/object/", new ObjectHandler(m_SimulationService).Handler); + server.AddHTTPHandler("/agent/", new AgentHandler(m_LocalSimulationService).Handler); + server.AddHTTPHandler("/object/", new ObjectHandler(m_LocalSimulationService).Handler); //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); } -- cgit v1.1