diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/AuthenticationService')
-rw-r--r-- | OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | 39 | ||||
-rw-r--r-- | OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs | 94 |
2 files changed, 129 insertions, 4 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs index 6d9aae3..d02ff9b 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,9 +46,9 @@ 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, IUserAccountService userService) : | 53 | public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) : |
51 | base(config, userService) | 54 | base(config, userService) |
@@ -53,12 +56,40 @@ namespace OpenSim.Services.AuthenticationService | |||
53 | } | 56 | } |
54 | 57 | ||
55 | public WebkeyAuthenticationService(IConfigSource config) : | 58 | public WebkeyAuthenticationService(IConfigSource config) : |
56 | base(config) | 59 | base(config) |
57 | { | 60 | { |
58 | } | 61 | } |
59 | 62 | ||
60 | public string Authenticate(UUID principalID, string password, int lifetime) | 63 | public string Authenticate(UUID principalID, string password, int lifetime) |
61 | { | 64 | { |
65 | if (new UUID(password) == UUID.Zero) | ||
66 | { | ||
67 | m_log.DebugFormat("[AUTH SERVICE]: UUID.Zero is not a valid web_login_key on PrincipalID {0}", principalID); | ||
68 | } | ||
69 | else | ||
70 | { | ||
71 | AuthenticationData data = m_Database.Get(principalID); | ||
72 | if (data != null && data.Data != null) | ||
73 | { | ||
74 | if (data.Data.ContainsKey("webLoginKey")) | ||
75 | { | ||
76 | string key = data.Data["webLoginKey"].ToString(); | ||
77 | if (key == password) | ||
78 | { | ||
79 | data.Data["webLoginKey"] = UUID.Zero.ToString(); | ||
80 | m_Database.Store(data); | ||
81 | return GetToken(principalID, lifetime); | ||
82 | } | ||
83 | else | ||
84 | { | ||
85 | m_log.DebugFormat("[AUTH SERVICE]: web login auth failed, got PrincipalID {0} gave {1} instead of {2}", principalID, password, key); | ||
86 | } | ||
87 | }else{ | ||
88 | m_log.DebugFormat("[AUTH SERVICE]: no col webLoginKey in passwd.db"); | ||
89 | } | ||
90 | } | ||
91 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); | ||
92 | } | ||
62 | return String.Empty; | 93 | return String.Empty; |
63 | } | 94 | } |
64 | } | 95 | } |
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 | ||