aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserManager.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs1
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs141
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs113
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs33
-rw-r--r--OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs61
-rw-r--r--OpenSim/Server/Handlers/Authorization/AuthorizationServerGetHandler.cs70
-rw-r--r--OpenSim/Services/AuthorizationService/AuthorizationService.cs56
-rw-r--r--OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs83
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs91
-rw-r--r--OpenSim/Services/Interfaces/IAuthorizationService.cs46
-rw-r--r--bin/config-include/Standalone.ini4
-rw-r--r--prebuild.xml31
14 files changed, 732 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index 0320156..002f232 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -166,6 +166,7 @@ namespace OpenSim.Grid.UserServer.Modules
166 // Account information 166 // Account information
167 responseData["firstname"] = profile.FirstName; 167 responseData["firstname"] = profile.FirstName;
168 responseData["lastname"] = profile.SurName; 168 responseData["lastname"] = profile.SurName;
169 responseData["email"] = profile.Email;
169 responseData["uuid"] = profile.ID.ToString(); 170 responseData["uuid"] = profile.ID.ToString();
170 // Server Information 171 // Server Information
171 responseData["server_inventory"] = profile.UserInventoryURI; 172 responseData["server_inventory"] = profile.UserInventoryURI;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
index ec8512a..adc12aa 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
@@ -651,6 +651,7 @@ namespace OpenSim.Region.Communications.OGS1
651 UserProfileData userData = new UserProfileData(); 651 UserProfileData userData = new UserProfileData();
652 userData.FirstName = (string)data["firstname"]; 652 userData.FirstName = (string)data["firstname"];
653 userData.SurName = (string)data["lastname"]; 653 userData.SurName = (string)data["lastname"];
654 userData.Email = (string)data["email"];
654 userData.ID = new UUID((string)data["uuid"]); 655 userData.ID = new UUID((string)data["uuid"]);
655 userData.Created = Convert.ToInt32(data["profile_created"]); 656 userData.Created = Convert.ToInt32(data["profile_created"]);
656 userData.UserInventoryURI = (string)data["server_inventory"]; 657 userData.UserInventoryURI = (string)data["server_inventory"];
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 0de5215..f9e61aa 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -26,6 +26,8 @@
26 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.User.RemoteUserServicesConnector" /> 26 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.User.RemoteUserServicesConnector" />
27 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" /> 27 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
28 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" /> 28 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />
29 <RegionModule id="LocalAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.LocalAuthorizationServicesConnector" />
30 <RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />
29 <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" /> 31 <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" />
30 <RegionModule id="LocalInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" /> 32 <RegionModule id="LocalInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" />
31 <RegionModule id="RemoteInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteInventoryServicesConnector" /> 33 <RegionModule id="RemoteInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteInventoryServicesConnector" />
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
new file mode 100644
index 0000000..7973496
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -0,0 +1,141 @@
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 log4net;
29using Nini.Config;
30using System;
31using System.Collections.Generic;
32using System.Reflection;
33using OpenSim.Framework;
34using OpenSim.Server.Base;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces;
38using OpenMetaverse;
39
40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
41{
42 public class LocalAuthorizationServicesConnector :
43 ISharedRegionModule, IAuthorizationService
44 {
45 private static readonly ILog m_log =
46 LogManager.GetLogger(
47 MethodBase.GetCurrentMethod().DeclaringType);
48
49 private IAuthorizationService m_AuthorizationService;
50
51 private bool m_Enabled = false;
52
53 public Type ReplaceableInterface
54 {
55 get { return null; }
56 }
57
58 public string Name
59 {
60 get { return "LocalAuthorizationServicesConnector"; }
61 }
62
63 public void Initialise(IConfigSource source)
64 {
65 m_log.Info("[AUTHORIZATION CONNECTOR]: Initialise");
66
67 IConfig moduleConfig = source.Configs["Modules"];
68 if (moduleConfig != null)
69 {
70 string name = moduleConfig.GetString("AuthorizationServices", "");
71 if (name == Name)
72 {
73 IConfig authorizationConfig = source.Configs["AuthorizationService"];
74 if (authorizationConfig == null)
75 {
76 m_log.Error("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
77 return;
78 }
79
80 string serviceDll = authorizationConfig.GetString("LocalServiceModule",
81 String.Empty);
82
83 if (serviceDll == String.Empty)
84 {
85 m_log.Error("[AUTHORIZATION CONNECTOR]: No LocalServiceModule named in section AuthorizationService");
86 return;
87 }
88
89 Object[] args = new Object[] { source };
90 m_AuthorizationService =
91 ServerUtils.LoadPlugin<IAuthorizationService>(serviceDll,
92 args);
93
94 if (m_AuthorizationService == null)
95 {
96 m_log.Error("[AUTHORIZATION CONNECTOR]: Can't load authorization service");
97 return;
98 }
99 m_Enabled = true;
100 m_log.Info("[AUTHORIZATION CONNECTOR]: Local authorization connector enabled");
101 }
102 }
103 }
104
105 public void PostInitialise()
106 {
107 }
108
109 public void Close()
110 {
111 }
112
113 public void AddRegion(Scene scene)
114 {
115 if (!m_Enabled)
116 return;
117
118 scene.RegisterModuleInterface<IAuthorizationService>(this);
119 }
120
121 public void RemoveRegion(Scene scene)
122 {
123 }
124
125 public void RegionLoaded(Scene scene)
126 {
127 if (!m_Enabled)
128 return;
129
130 m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: Enabled local authorization for region {0}", scene.RegionInfo.RegionName);
131
132
133 }
134
135 public bool isAuthorizedForRegion(UserProfileData user, RegionInfo region)
136 {
137 return m_AuthorizationService.isAuthorizedForRegion( user, region);
138 }
139
140 }
141}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
new file mode 100644
index 0000000..5870111
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -0,0 +1,113 @@
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 log4net;
29using System;
30using System.Collections.Generic;
31using System.Reflection;
32using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Services.Connectors;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces;
38
39namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
40{
41 public class RemoteAuthorizationServicesConnector :
42 AuthorizationServicesConnector, ISharedRegionModule, IAuthorizationService
43 {
44 private static readonly ILog m_log =
45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType);
47
48 private bool m_Enabled = false;
49
50 public Type ReplaceableInterface
51 {
52 get { return null; }
53 }
54
55 public string Name
56 {
57 get { return "RemoteAuthorizationServicesConnector"; }
58 }
59
60 public override void Initialise(IConfigSource source)
61 {
62 IConfig moduleConfig = source.Configs["Modules"];
63 if (moduleConfig != null)
64 {
65 string name = moduleConfig.GetString("AuthorizationServices", "");
66 if (name == Name)
67 {
68 IConfig authorizationConfig = source.Configs["AuthorizationService"];
69 if (authorizationConfig == null)
70 {
71 m_log.Error("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
72 return;
73 }
74
75 m_Enabled = true;
76
77 base.Initialise(source);
78
79 m_log.Info("[AUTHORIZATION CONNECTOR]: Remote assets enabled");
80 }
81 }
82 }
83
84 public void PostInitialise()
85 {
86 }
87
88 public void Close()
89 {
90 }
91
92 public void AddRegion(Scene scene)
93 {
94 if (!m_Enabled)
95 return;
96
97 scene.RegisterModuleInterface<IAuthorizationService>(this);
98 }
99
100 public void RemoveRegion(Scene scene)
101 {
102 }
103
104 public void RegionLoaded(Scene scene)
105 {
106 if (!m_Enabled)
107 return;
108
109 m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: Enabled remote authorization for region {0}", scene.RegionInfo.RegionName);
110
111 }
112 }
113}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5e27eff..1346844 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -134,6 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
134 public IXfer XferManager; 134 public IXfer XferManager;
135 135
136 protected IAssetService m_AssetService = null; 136 protected IAssetService m_AssetService = null;
137 protected IAuthorizationService m_AuthorizationService = null;
137 138
138 public IAssetService AssetService 139 public IAssetService AssetService
139 { 140 {
@@ -152,6 +153,25 @@ namespace OpenSim.Region.Framework.Scenes
152 return m_AssetService; 153 return m_AssetService;
153 } 154 }
154 } 155 }
156
157 public IAuthorizationService AuthorizationService
158 {
159 get
160 {
161 if (m_AuthorizationService == null)
162 {
163 m_AuthorizationService = RequestModuleInterface<IAuthorizationService>();
164
165 if (m_AuthorizationService == null)
166 {
167 // don't throw an exception if no authorization service is set for the time being
168 m_log.InfoFormat("[SCENE]: No Authorization service is configured");
169 }
170 }
171
172 return m_AuthorizationService;
173 }
174 }
155 175
156 protected IInventoryService m_InventoryService = null; 176 protected IInventoryService m_InventoryService = null;
157 177
@@ -3230,7 +3250,18 @@ namespace OpenSim.Region.Framework.Scenes
3230 3250
3231 if (!m_strictAccessControl) return true; 3251 if (!m_strictAccessControl) return true;
3232 if (Permissions.IsGod(agent.AgentID)) return true; 3252 if (Permissions.IsGod(agent.AgentID)) return true;
3233 3253
3254 UserProfileData userProfile = CommsManager.UserService.GetUserProfile(agent.AgentID);
3255
3256 if(AuthorizationService!=null)
3257 {
3258 if(!AuthorizationService.isAuthorizedForRegion(userProfile,RegionInfo))
3259 {
3260 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
3261 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
3262 return false;
3263 }
3264 }
3234 3265
3235 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 3266 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
3236 { 3267 {
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
new file mode 100644
index 0000000..725cf78
--- /dev/null
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
@@ -0,0 +1,61 @@
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.Server.Base;
31using OpenSim.Services.Interfaces;
32using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Server.Handlers.Base;
34
35namespace OpenSim.Server.Handlers.Authorization
36{
37 public class AuthorizationServerConnector : ServiceConnector
38 {
39 private IAuthorizationService m_AuthorizationService;
40
41 public AuthorizationServerConnector(IConfigSource config, IHttpServer server) :
42 base(config, server)
43 {
44 IConfig serverConfig = config.Configs["AuthorizationService"];
45 if (serverConfig == null)
46 throw new Exception("No section 'Server' in config file");
47
48 string authorizationService = serverConfig.GetString("LocalServiceModule",
49 String.Empty);
50
51 if (authorizationService == String.Empty)
52 throw new Exception("No AuthorizationService in config file");
53
54 Object[] args = new Object[] { config };
55 m_AuthorizationService =
56 ServerUtils.LoadPlugin<IAuthorizationService>(authorizationService, args);
57
58 server.AddStreamHandler(new AuthorizationServerGetHandler(m_AuthorizationService));
59 }
60 }
61}
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerGetHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerGetHandler.cs
new file mode 100644
index 0000000..4e4960c
--- /dev/null
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerGetHandler.cs
@@ -0,0 +1,70 @@
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 Nini.Config;
29using log4net;
30using System;
31using System.IO;
32using System.Reflection;
33using System.Net;
34using System.Text;
35using System.Text.RegularExpressions;
36using System.Xml;
37using System.Xml.Serialization;
38using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces;
40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer;
42
43namespace OpenSim.Server.Handlers.Authorization
44{
45 public class AuthorizationServerGetHandler : BaseStreamHandler
46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
49
50 public AuthorizationServerGetHandler(IAuthorizationService service) :
51 base("GET", "/authorization")
52 {
53 }
54
55 public override byte[] Handle(string path, Stream request,
56 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
57 {
58 byte[] result = new byte[0];
59
60 string[] p = SplitParams(path);
61
62 if (p.Length == 0)
63 return result;
64
65 // Process web request
66
67 return result;
68 }
69 }
70}
diff --git a/OpenSim/Services/AuthorizationService/AuthorizationService.cs b/OpenSim/Services/AuthorizationService/AuthorizationService.cs
new file mode 100644
index 0000000..e779325
--- /dev/null
+++ b/OpenSim/Services/AuthorizationService/AuthorizationService.cs
@@ -0,0 +1,56 @@
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 Nini.Config;
31using log4net;
32using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Data;
35using OpenSim.Services.Interfaces;
36using OpenMetaverse;
37
38namespace OpenSim.Services.AuthorizationService
39{
40 public class AuthorizationService : AuthorizationServiceBase, IAuthorizationService
41 {
42 private static readonly ILog m_log =
43 LogManager.GetLogger(
44 MethodBase.GetCurrentMethod().DeclaringType);
45
46 public AuthorizationService(IConfigSource config) : base(config)
47 {
48 m_log.Info("[AUTHORIZATION CONNECTOR]: Local Authorization service enabled");
49 }
50
51 public bool isAuthorizedForRegion(UserProfileData user, RegionInfo region)
52 {
53 return true;
54 }
55 }
56}
diff --git a/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs b/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs
new file mode 100644
index 0000000..9e6d070
--- /dev/null
+++ b/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs
@@ -0,0 +1,83 @@
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 Nini.Config;
31using OpenSim.Framework;
32using OpenSim.Data;
33using OpenSim.Services.Interfaces;
34using OpenSim.Services.Base;
35
36namespace OpenSim.Services.AuthorizationService
37{
38 public class AuthorizationServiceBase : ServiceBase
39 {
40 protected IAssetDataPlugin m_Database = null;
41
42 public AuthorizationServiceBase(IConfigSource config) : base(config)
43 {
44 string dllName = String.Empty;
45 string connString = String.Empty;
46
47 //
48 // Try reading the [AuthorizationService] section first, if it exists
49 //
50 IConfig assetConfig = config.Configs["AuthorizationService"];
51 if (assetConfig != null)
52 {
53 dllName = assetConfig.GetString("StorageProvider", dllName);
54 connString = assetConfig.GetString("ConnectionString", connString);
55 }
56
57 //
58 // Try reading the [DatabaseService] section, if it exists
59 //
60 IConfig dbConfig = config.Configs["DatabaseService"];
61 if (dbConfig != null)
62 {
63 if (dllName == String.Empty)
64 dllName = dbConfig.GetString("StorageProvider", String.Empty);
65 if (connString == String.Empty)
66 connString = dbConfig.GetString("ConnectionString", String.Empty);
67 }
68
69 //
70 // We tried, but this doesn't exist. We can't proceed.
71 //
72 if (dllName.Equals(String.Empty))
73 throw new Exception("No StorageProvider configured");
74
75 m_Database = LoadPlugin<IAssetDataPlugin>(dllName);
76 if (m_Database == null)
77 throw new Exception("Could not find a storage interface in the given module");
78
79 m_Database.Initialise(connString);
80
81 }
82 }
83}
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
new file mode 100644
index 0000000..a0cdc30
--- /dev/null
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -0,0 +1,91 @@
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 log4net;
29using System;
30using System.Collections.Generic;
31using System.IO;
32using System.Reflection;
33using Nini.Config;
34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Services.Interfaces;
38using OpenMetaverse;
39
40namespace OpenSim.Services.Connectors
41{
42 public class AuthorizationServicesConnector : IAuthorizationService
43 {
44 private static readonly ILog m_log =
45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType);
47
48 private string m_ServerURI = String.Empty;
49
50 public AuthorizationServicesConnector()
51 {
52 }
53
54 public AuthorizationServicesConnector(string serverURI)
55 {
56 m_ServerURI = serverURI.TrimEnd('/');
57 }
58
59 public AuthorizationServicesConnector(IConfigSource source)
60 {
61 Initialise(source);
62 }
63
64 public virtual void Initialise(IConfigSource source)
65 {
66 IConfig authorizationConfig = source.Configs["AuthorizationService"];
67 if (authorizationConfig == null)
68 {
69 m_log.Error("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpanSim.ini");
70 throw new Exception("Authorization connector init error");
71 }
72
73 string serviceURI = authorizationConfig.GetString("AuthorizationServerURI",
74 String.Empty);
75
76 if (serviceURI == String.Empty)
77 {
78 m_log.Error("[AUTHORIZATION CONNECTOR]: No Server URI named in section AssetService");
79 throw new Exception("Authorization connector init error");
80 }
81 m_ServerURI = serviceURI;
82 }
83
84 public bool isAuthorizedForRegion(UserProfileData user, RegionInfo region)
85 {
86 // call remote service
87 return true;
88 }
89
90 }
91}
diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs
new file mode 100644
index 0000000..e8b7298
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs
@@ -0,0 +1,46 @@
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 OpenSim.Framework;
30
31namespace OpenSim.Services.Interfaces
32{
33 // Generic Authorization service used for authorizing principals in a particular region
34
35 public interface IAuthorizationService
36 {
37 //////////////////////////////////////////////////////
38 // Authorized
39 //
40 // This method returns a simple true false indicating
41 // whether or not a user has access to the region
42 //
43 bool isAuthorizedForRegion(UserProfileData user, RegionInfo region);
44
45 }
46}
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c187358..24020b6 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -11,9 +11,13 @@
11 AssetServices = "LocalAssetServicesConnector" 11 AssetServices = "LocalAssetServicesConnector"
12 InventoryServices = "LocalInventoryServicesConnector" 12 InventoryServices = "LocalInventoryServicesConnector"
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector"
14 15
15[AssetService] 16[AssetService]
16 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 17 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
17 18
18[InventoryService] 19[InventoryService]
19 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 20 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
21
22[AuthorizationService]
23 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
diff --git a/prebuild.xml b/prebuild.xml
index b84fddd..77e536a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1289,6 +1289,37 @@
1289 <Match pattern="*.cs" recurse="true"/> 1289 <Match pattern="*.cs" recurse="true"/>
1290 </Files> 1290 </Files>
1291 </Project> 1291 </Project>
1292
1293 <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
1294 <Configuration name="Debug">
1295 <Options>
1296 <OutputPath>../../../bin/</OutputPath>
1297 </Options>
1298 </Configuration>
1299 <Configuration name="Release">
1300 <Options>
1301 <OutputPath>../../../bin/</OutputPath>
1302 </Options>
1303 </Configuration>
1304
1305 <ReferencePath>../../../bin/</ReferencePath>
1306 <Reference name="System"/>
1307 <Reference name="OpenMetaverseTypes.dll"/>
1308 <Reference name="OpenMetaverse.dll"/>
1309 <Reference name="OpenSim.Framework"/>
1310 <Reference name="OpenSim.Framework.Console"/>
1311 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1312 <Reference name="OpenSim.Services.Interfaces"/>
1313 <Reference name="OpenSim.Services.Base"/>
1314 <Reference name="OpenSim.Services.Connectors"/>
1315 <Reference name="OpenSim.Data"/>
1316 <Reference name="Nini.dll" />
1317 <Reference name="log4net.dll"/>
1318
1319 <Files>
1320 <Match pattern="*.cs" recurse="true"/>
1321 </Files>
1322 </Project>
1292 1323
1293 <Project frameworkVersion="v3_5" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library"> 1324 <Project frameworkVersion="v3_5" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
1294 <Configuration name="Debug"> 1325 <Configuration name="Debug">