diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Services | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Services')
7 files changed, 192 insertions, 10 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs index d1a5b0f..2344c0e 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | |||
@@ -31,6 +31,9 @@ using OpenSim.Services.Interfaces; | |||
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Data; | ||
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Console; | ||
34 | 37 | ||
35 | namespace OpenSim.Services.AuthenticationService | 38 | namespace OpenSim.Services.AuthenticationService |
36 | { | 39 | { |
@@ -43,17 +46,45 @@ namespace OpenSim.Services.AuthenticationService | |||
43 | public class WebkeyAuthenticationService : | 46 | public class WebkeyAuthenticationService : |
44 | AuthenticationServiceBase, IAuthenticationService | 47 | AuthenticationServiceBase, IAuthenticationService |
45 | { | 48 | { |
46 | // private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
47 | // LogManager.GetLogger( | 50 | LogManager.GetLogger( |
48 | // MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
49 | 52 | ||
50 | public WebkeyAuthenticationService(IConfigSource config) : | 53 | public WebkeyAuthenticationService(IConfigSource config) : |
51 | base(config) | 54 | base(config) |
52 | { | 55 | { |
53 | } | 56 | } |
54 | 57 | ||
55 | public string Authenticate(UUID principalID, string password, int lifetime) | 58 | public string Authenticate(UUID principalID, string password, int lifetime) |
56 | { | 59 | { |
60 | if (new UUID(password) == UUID.Zero) | ||
61 | { | ||
62 | m_log.DebugFormat("[AUTH SERVICE]: UUID.Zero is not a valid web_login_key on PrincipalID {0}", principalID); | ||
63 | } | ||
64 | else | ||
65 | { | ||
66 | AuthenticationData data = m_Database.Get(principalID); | ||
67 | if (data != null && data.Data != null) | ||
68 | { | ||
69 | if (data.Data.ContainsKey("webLoginKey")) | ||
70 | { | ||
71 | string key = data.Data["webLoginKey"].ToString(); | ||
72 | if (key == password) | ||
73 | { | ||
74 | data.Data["webLoginKey"] = UUID.Zero.ToString(); | ||
75 | m_Database.Store(data); | ||
76 | return GetToken(principalID, lifetime); | ||
77 | } | ||
78 | else | ||
79 | { | ||
80 | m_log.DebugFormat("[AUTH SERVICE]: web login auth failed, got PrincipalID {0} gave {1} instead of {2}", principalID, password, key); | ||
81 | } | ||
82 | }else{ | ||
83 | m_log.DebugFormat("[AUTH SERVICE]: no col webLoginKey in passwd.db"); | ||
84 | } | ||
85 | } | ||
86 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); | ||
87 | } | ||
57 | return String.Empty; | 88 | return String.Empty; |
58 | } | 89 | } |
59 | } | 90 | } |
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs new file mode 100644 index 0000000..3590e12 --- /dev/null +++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs | |||
@@ -0,0 +1,94 @@ | |||
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.Generic; | ||
30 | using OpenMetaverse; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using log4net; | ||
33 | using Nini.Config; | ||
34 | using System.Reflection; | ||
35 | using OpenSim.Data; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Framework.Console; | ||
38 | using OpenSim.Server.Base; | ||
39 | |||
40 | namespace OpenSim.Services.AuthenticationService | ||
41 | { | ||
42 | public class WebkeyOrPasswordAuthenticationService : AuthenticationServiceBase, IAuthenticationService | ||
43 | { | ||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
46 | private IConfigSource m_config; | ||
47 | private Dictionary<string, IAuthenticationService> m_svcChecks | ||
48 | = new Dictionary<string, IAuthenticationService>(); | ||
49 | |||
50 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) | ||
51 | : base(config) | ||
52 | { | ||
53 | this.m_config = config; | ||
54 | m_svcChecks["web_login_key"] = new WebkeyAuthenticationService(config); | ||
55 | m_svcChecks["password"] = new PasswordAuthenticationService(config); | ||
56 | } | ||
57 | |||
58 | public string Authenticate(UUID principalID, string password, int lifetime) | ||
59 | { | ||
60 | AuthenticationData data = m_Database.Get(principalID); | ||
61 | string result = String.Empty; | ||
62 | if (data != null && data.Data != null) | ||
63 | { | ||
64 | if (data.Data.ContainsKey("webLoginKey")) | ||
65 | { | ||
66 | m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID); | ||
67 | result = m_svcChecks["web_login_key"].Authenticate(principalID, password, lifetime); | ||
68 | if (result == String.Empty) | ||
69 | { | ||
70 | m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID); | ||
71 | } | ||
72 | } | ||
73 | if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt")) | ||
74 | { | ||
75 | m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID); | ||
76 | result = m_svcChecks["password"].Authenticate(principalID, password, lifetime); | ||
77 | if (result == String.Empty) | ||
78 | { | ||
79 | m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID); | ||
80 | } | ||
81 | } | ||
82 | if (result == string.Empty) | ||
83 | { | ||
84 | m_log.DebugFormat("[AUTH SERVICE]: Both password and webLoginKey-based authentication failed for PrincipalID {0}", principalID); | ||
85 | } | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); | ||
90 | } | ||
91 | return result; | ||
92 | } | ||
93 | } | ||
94 | } \ No newline at end of file | ||
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs index b6df5a2..7184ba1 100644 --- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs | |||
@@ -90,6 +90,11 @@ namespace OpenSim.Services.Connectors | |||
90 | { | 90 | { |
91 | return m_database.LoadEstateSettings(estateID); | 91 | return m_database.LoadEstateSettings(estateID); |
92 | } | 92 | } |
93 | |||
94 | public List<EstateSettings> LoadEstateSettingsAll() | ||
95 | { | ||
96 | return m_database.LoadEstateSettingsAll(); | ||
97 | } | ||
93 | 98 | ||
94 | public void StoreEstateSettings(EstateSettings es) | 99 | public void StoreEstateSettings(EstateSettings es) |
95 | { | 100 | { |
@@ -100,6 +105,16 @@ namespace OpenSim.Services.Connectors | |||
100 | { | 105 | { |
101 | return m_database.GetEstates(search); | 106 | return m_database.GetEstates(search); |
102 | } | 107 | } |
108 | |||
109 | public List<int> GetEstatesAll() | ||
110 | { | ||
111 | return m_database.GetEstatesAll(); | ||
112 | } | ||
113 | |||
114 | public List<int> GetEstatesByOwner(UUID ownerID) | ||
115 | { | ||
116 | return m_database.GetEstatesByOwner(ownerID); | ||
117 | } | ||
103 | 118 | ||
104 | public bool LinkRegion(UUID regionID, int estateID) | 119 | public bool LinkRegion(UUID regionID, int estateID) |
105 | { | 120 | { |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 463b2fb..93b3ae6 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -79,9 +79,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
79 | return "agent/"; | 79 | return "agent/"; |
80 | } | 80 | } |
81 | 81 | ||
82 | /// <summary> | ||
83 | /// | ||
84 | /// </summary> | ||
85 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) | 82 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) |
86 | { | 83 | { |
87 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start"); | 84 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start"); |
@@ -109,6 +106,9 @@ namespace OpenSim.Services.Connectors.Simulation | |||
109 | if (result["Success"].AsBoolean()) | 106 | if (result["Success"].AsBoolean()) |
110 | return true; | 107 | return true; |
111 | 108 | ||
109 | m_log.WarnFormat( | ||
110 | "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {1}", | ||
111 | aCircuit.firstname, aCircuit.lastname, destination.RegionName); | ||
112 | reason = result["Message"] != null ? result["Message"].AsString() : "error"; | 112 | reason = result["Message"] != null ? result["Message"].AsString() : "error"; |
113 | return false; | 113 | return false; |
114 | } | 114 | } |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 12ea453..c539047 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -65,6 +65,8 @@ namespace OpenSim.Services.GridService | |||
65 | protected UUID m_ScopeID = UUID.Zero; | 65 | protected UUID m_ScopeID = UUID.Zero; |
66 | protected bool m_Check4096 = true; | 66 | protected bool m_Check4096 = true; |
67 | protected string m_MapTileDirectory = string.Empty; | 67 | protected string m_MapTileDirectory = string.Empty; |
68 | protected string m_ThisGatekeeper = string.Empty; | ||
69 | protected Uri m_ThisGatekeeperURI = null; | ||
68 | 70 | ||
69 | // Hyperlink regions are hyperlinks on the map | 71 | // Hyperlink regions are hyperlinks on the map |
70 | public readonly Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>(); | 72 | public readonly Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>(); |
@@ -123,6 +125,16 @@ namespace OpenSim.Services.GridService | |||
123 | 125 | ||
124 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); | 126 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); |
125 | 127 | ||
128 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty); | ||
129 | try | ||
130 | { | ||
131 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); | ||
132 | } | ||
133 | catch | ||
134 | { | ||
135 | m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper); | ||
136 | } | ||
137 | |||
126 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); | 138 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); |
127 | 139 | ||
128 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); | 140 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); |
@@ -246,6 +258,8 @@ namespace OpenSim.Services.GridService | |||
246 | remoteRegionName, xloc / Constants.RegionSize, yloc / Constants.RegionSize); | 258 | remoteRegionName, xloc / Constants.RegionSize, yloc / Constants.RegionSize); |
247 | 259 | ||
248 | reason = string.Empty; | 260 | reason = string.Empty; |
261 | Uri uri = null; | ||
262 | |||
249 | regInfo = new GridRegion(); | 263 | regInfo = new GridRegion(); |
250 | if ( externalPort > 0) | 264 | if ( externalPort > 0) |
251 | regInfo.HttpPort = externalPort; | 265 | regInfo.HttpPort = externalPort; |
@@ -256,8 +270,17 @@ namespace OpenSim.Services.GridService | |||
256 | else | 270 | else |
257 | regInfo.ExternalHostName = "0.0.0.0"; | 271 | regInfo.ExternalHostName = "0.0.0.0"; |
258 | if ( serverURI != null) | 272 | if ( serverURI != null) |
273 | { | ||
259 | regInfo.ServerURI = serverURI; | 274 | regInfo.ServerURI = serverURI; |
260 | 275 | try | |
276 | { | ||
277 | uri = new Uri(serverURI); | ||
278 | regInfo.ExternalHostName = uri.Host; | ||
279 | regInfo.HttpPort = (uint)uri.Port; | ||
280 | } | ||
281 | catch {} | ||
282 | } | ||
283 | |||
261 | if ( remoteRegionName != string.Empty ) | 284 | if ( remoteRegionName != string.Empty ) |
262 | regInfo.RegionName = remoteRegionName; | 285 | regInfo.RegionName = remoteRegionName; |
263 | 286 | ||
@@ -266,6 +289,18 @@ namespace OpenSim.Services.GridService | |||
266 | regInfo.ScopeID = scopeID; | 289 | regInfo.ScopeID = scopeID; |
267 | regInfo.EstateOwner = ownerID; | 290 | regInfo.EstateOwner = ownerID; |
268 | 291 | ||
292 | // Make sure we're not hyperlinking to regions on this grid! | ||
293 | if (m_ThisGatekeeperURI != null) | ||
294 | { | ||
295 | if (regInfo.ExternalHostName == m_ThisGatekeeperURI.Host && regInfo.HttpPort == m_ThisGatekeeperURI.Port) | ||
296 | { | ||
297 | reason = "Cannot hyperlink to regions on the same grid"; | ||
298 | return false; | ||
299 | } | ||
300 | } | ||
301 | else | ||
302 | m_log.WarnFormat("[HYPERGRID LINKER]: Please set this grid's Gatekeeper's address in [GridService]!"); | ||
303 | |||
269 | // Check for free coordinates | 304 | // Check for free coordinates |
270 | GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); | 305 | GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); |
271 | if (region != null) | 306 | if (region != null) |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 3ead180..445d45e 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -253,7 +253,7 @@ namespace OpenSim.Services.HypergridService | |||
253 | 253 | ||
254 | TravelingAgentInfo travel = m_TravelingAgents[sessionID]; | 254 | TravelingAgentInfo travel = m_TravelingAgents[sessionID]; |
255 | 255 | ||
256 | return travel.GridExternalName == thisGridExternalName; | 256 | return travel.GridExternalName.ToLower() == thisGridExternalName.ToLower(); |
257 | } | 257 | } |
258 | 258 | ||
259 | public bool VerifyClient(UUID sessionID, string reportedIP) | 259 | public bool VerifyClient(UUID sessionID, string reportedIP) |
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index b796757..55c9cc5 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -40,6 +40,13 @@ namespace OpenSim.Services.Interfaces | |||
40 | 40 | ||
41 | #region Agents | 41 | #region Agents |
42 | 42 | ||
43 | /// <summary> | ||
44 | /// Ask the simulator hosting the destination to create an agent on that region. | ||
45 | /// </summary> | ||
46 | /// <param name="destination"></param> | ||
47 | /// <param name="aCircuit"></param> | ||
48 | /// <param name="flags"></param> | ||
49 | /// <param name="reason">Reason message in the event of a failure.</param> | ||
43 | bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason); | 50 | bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason); |
44 | 51 | ||
45 | /// <summary> | 52 | /// <summary> |