diff options
author | Diva Canto | 2010-01-09 18:04:50 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-09 18:04:50 -0800 |
commit | 96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1 (patch) | |
tree | 330ddb23901e60acc9772b6df48a7795f51e3bbe /OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |
parent | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff) | |
download | opensim-SC-96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1.zip opensim-SC-96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1.tar.gz opensim-SC-96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1.tar.bz2 opensim-SC-96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1.tar.xz |
* Added SetPassword to IAuthenticationService.
* Added create user command to UserAccountService. Works.
* Deleted create user command from OpenSim.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index dcf090e..f6dd085 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
@@ -32,6 +32,7 @@ using Nini.Config; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Services.Base; | 33 | using OpenSim.Services.Base; |
34 | using OpenSim.Data; | 34 | using OpenSim.Data; |
35 | using OpenSim.Framework; | ||
35 | 36 | ||
36 | namespace OpenSim.Services.AuthenticationService | 37 | namespace OpenSim.Services.AuthenticationService |
37 | { | 38 | { |
@@ -43,9 +44,9 @@ namespace OpenSim.Services.AuthenticationService | |||
43 | // | 44 | // |
44 | public class AuthenticationServiceBase : ServiceBase | 45 | public class AuthenticationServiceBase : ServiceBase |
45 | { | 46 | { |
46 | // private static readonly ILog m_log = | 47 | private static readonly ILog m_log = |
47 | // LogManager.GetLogger( | 48 | LogManager.GetLogger( |
48 | // MethodBase.GetCurrentMethod().DeclaringType); | 49 | MethodBase.GetCurrentMethod().DeclaringType); |
49 | 50 | ||
50 | protected IAuthenticationData m_Database; | 51 | protected IAuthenticationData m_Database; |
51 | 52 | ||
@@ -100,6 +101,27 @@ namespace OpenSim.Services.AuthenticationService | |||
100 | return m_Database.CheckToken(principalID, token, 0); | 101 | return m_Database.CheckToken(principalID, token, 0); |
101 | } | 102 | } |
102 | 103 | ||
104 | public virtual bool SetPassword(UUID principalID, string password) | ||
105 | { | ||
106 | string passwordSalt = Util.Md5Hash(UUID.Random().ToString()); | ||
107 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + passwordSalt); | ||
108 | |||
109 | AuthenticationData auth = new AuthenticationData(); | ||
110 | auth.PrincipalID = principalID; | ||
111 | auth.Data = new System.Collections.Generic.Dictionary<string, object>(); | ||
112 | auth.Data["passwordHash"] = md5PasswdHash; | ||
113 | auth.Data["passwordSalt"] = passwordSalt; | ||
114 | auth.Data["webLoginKey"] = UUID.Zero.ToString(); | ||
115 | if (!m_Database.Store(auth)) | ||
116 | { | ||
117 | m_log.DebugFormat("[AUTHENTICATION DB]: Failed to store authentication data"); | ||
118 | return false; | ||
119 | } | ||
120 | |||
121 | m_log.InfoFormat("[AUTHENTICATION DB]: Set password for principalID {0}", principalID); | ||
122 | return true; | ||
123 | } | ||
124 | |||
103 | protected string GetToken(UUID principalID, int lifetime) | 125 | protected string GetToken(UUID principalID, int lifetime) |
104 | { | 126 | { |
105 | UUID token = UUID.Random(); | 127 | UUID token = UUID.Random(); |
@@ -109,5 +131,6 @@ namespace OpenSim.Services.AuthenticationService | |||
109 | 131 | ||
110 | return String.Empty; | 132 | return String.Empty; |
111 | } | 133 | } |
134 | |||
112 | } | 135 | } |
113 | } | 136 | } |