aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-08-09 14:21:47 -0700
committerDiva Canto2009-08-09 14:21:47 -0700
commit6a6dd6612997418d8bac177ec4f0ecf168034f4b (patch)
tree8aa3f6862c6d8a5659dd040d429c326a42866477 /OpenSim
parentRemoved HGInventory out of core. This is part of HG2, which it now being deve... (diff)
downloadopensim-SC-6a6dd6612997418d8bac177ec4f0ecf168034f4b.zip
opensim-SC-6a6dd6612997418d8bac177ec4f0ecf168034f4b.tar.gz
opensim-SC-6a6dd6612997418d8bac177ec4f0ecf168034f4b.tar.bz2
opensim-SC-6a6dd6612997418d8bac177ec4f0ecf168034f4b.tar.xz
More removal of HG2 code, this time authentication module and handlers.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml1
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs122
-rw-r--r--OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs64
-rw-r--r--OpenSim/Server/Handlers/Authentication/HGAuthenticationHandlers.cs117
4 files changed, 0 insertions, 304 deletions
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 @@
37 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" /> 37 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
38 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" /> 38 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
39 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \ 39 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
40 <RegionModule id="HGAuthServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.HGAuthServiceInConnectorModule" /> \
41 40
42 </Extension> 41 </Extension>
43 42
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 @@
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
28using System;
29using System.Reflection;
30using System.Collections.Generic;
31using log4net;
32using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Framework.Servers.HttpServer;
35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base;
38using OpenSim.Services.Interfaces;
39using OpenSim.Server.Handlers.Authentication;
40
41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
43{
44 public class HGAuthServiceInConnectorModule : ISharedRegionModule
45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private static bool m_Enabled = false;
48 private static bool m_Registered = false;
49
50 private IConfigSource m_Config;
51
52 #region IRegionModule interface
53
54 public void Initialise(IConfigSource config)
55 {
56 m_Config = config;
57
58 IConfig moduleConfig = config.Configs["Modules"];
59 if (moduleConfig != null)
60 {
61 // Boolean because there may be many of these in peaceful coexistence
62 m_Enabled = moduleConfig.GetBoolean("HGAuthServiceInConnector", false);
63 if (m_Enabled)
64 {
65 m_log.Info("[HGAUTH IN CONNECTOR]: HGAuthServiceInConnector enabled");
66 }
67
68 }
69
70 }
71
72 public void PostInitialise()
73 {
74 if (!m_Enabled)
75 return;
76
77 m_log.Info("[HGAUTH IN CONNECTOR]: Starting...");
78 }
79
80 public void Close()
81 {
82 }
83
84 public Type ReplacableInterface
85 {
86 get { return null; }
87 }
88
89 public string Name
90 {
91 get { return "HGAuthServiceInConnectorModule"; }
92 }
93
94 public void AddRegion(Scene scene)
95 {
96 if (!m_Enabled)
97 return;
98
99 if (!m_Registered)
100 {
101 m_Registered = true;
102 new HGAuthServiceInConnector(m_Config, MainServer.Instance, scene);
103
104 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
105 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);
106 }
107
108
109 }
110
111 public void RemoveRegion(Scene scene)
112 {
113 }
114
115 public void RegionLoaded(Scene scene)
116 {
117 }
118
119 #endregion
120
121 }
122}
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 @@
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
28using System;
29using Nini.Config;
30using OpenSim.Framework;
31using OpenSim.Server.Base;
32using OpenSim.Services.Interfaces;
33using OpenSim.Framework.Servers.HttpServer;
34using OpenSim.Server.Handlers.Base;
35
36namespace OpenSim.Server.Handlers.Authentication
37{
38 public class HGAuthServiceInConnector : ServiceConnector
39 {
40 private IAuthenticationService m_AuthenticationService;
41
42 public HGAuthServiceInConnector(IConfigSource config, IHttpServer server, IScene registry) :
43 base(config, server)
44 {
45 IConfig serverConfig = config.Configs["AuthenticationService"];
46 if (serverConfig == null)
47 throw new Exception("No section 'AuthenticationService' in config file");
48
49 string authenticationService = serverConfig.GetString("LocalServiceModule",
50 String.Empty);
51
52 if (authenticationService == String.Empty)
53 throw new Exception("No AuthenticationService in config file");
54
55 Object[] args = new Object[] { config };
56 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
57 registry.RegisterModuleInterface<IAuthenticationService>(m_AuthenticationService);
58
59 HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
60 server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
61 server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);
62 }
63 }
64}
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 @@
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
28using System;
29using System.Collections;
30using System.IO;
31using System.Reflection;
32using System.Net;
33using System.Text;
34
35using OpenSim.Server.Base;
36using OpenSim.Server.Handlers.Base;
37using OpenSim.Services.Interfaces;
38using OpenSim.Framework;
39using OpenSim.Framework.Servers.HttpServer;
40
41using OpenMetaverse;
42using OpenMetaverse.StructuredData;
43using Nwc.XmlRpc;
44using Nini.Config;
45using log4net;
46
47namespace 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}