diff options
author | Melanie | 2011-10-25 03:26:09 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 03:26:09 +0100 |
commit | 4e9457ca0c8669a0d47341c651d5f439fda1eb8d (patch) | |
tree | 002620738b62275e4dca20a56b701b5ac8b7642d /OpenSim | |
parent | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge (diff) | |
parent | Add optional getauthinfo and setauthinfo authentication service calls. (diff) | |
download | opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.zip opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.gz opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.bz2 opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.xz |
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
Diffstat (limited to 'OpenSim')
7 files changed, 176 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs index acc362b..9484a5a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | |||
@@ -158,7 +158,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication | |||
158 | return m_AuthenticationService.SetPassword(principalID, passwd); | 158 | return m_AuthenticationService.SetPassword(principalID, passwd); |
159 | } | 159 | } |
160 | 160 | ||
161 | #endregion | 161 | public AuthInfo GetAuthInfo(UUID principalID) |
162 | { | ||
163 | return m_AuthenticationService.GetAuthInfo(principalID); | ||
164 | } | ||
162 | 165 | ||
166 | public bool SetAuthInfo(AuthInfo info) | ||
167 | { | ||
168 | return m_AuthenticationService.SetAuthInfo(info); | ||
169 | } | ||
170 | |||
171 | #endregion | ||
163 | } | 172 | } |
164 | } | 173 | } |
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs index ae71945..4d1b0ff 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs | |||
@@ -46,9 +46,12 @@ namespace OpenSim.Server.Handlers.Authentication | |||
46 | { | 46 | { |
47 | public class AuthenticationServerPostHandler : BaseStreamHandler | 47 | public class AuthenticationServerPostHandler : BaseStreamHandler |
48 | { | 48 | { |
49 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | private IAuthenticationService m_AuthenticationService; | 51 | private IAuthenticationService m_AuthenticationService; |
52 | |||
53 | private bool m_AllowGetAuthInfo = false; | ||
54 | private bool m_AllowSetAuthInfo = false; | ||
52 | private bool m_AllowSetPassword = false; | 55 | private bool m_AllowSetPassword = false; |
53 | 56 | ||
54 | public AuthenticationServerPostHandler(IAuthenticationService service) : | 57 | public AuthenticationServerPostHandler(IAuthenticationService service) : |
@@ -61,6 +64,8 @@ namespace OpenSim.Server.Handlers.Authentication | |||
61 | 64 | ||
62 | if (config != null) | 65 | if (config != null) |
63 | { | 66 | { |
67 | m_AllowGetAuthInfo = config.GetBoolean("AllowGetAuthInfo", m_AllowGetAuthInfo); | ||
68 | m_AllowSetAuthInfo = config.GetBoolean("AllowSetAuthInfo", m_AllowSetAuthInfo); | ||
64 | m_AllowSetPassword = config.GetBoolean("AllowSetPassword", m_AllowSetPassword); | 69 | m_AllowSetPassword = config.GetBoolean("AllowSetPassword", m_AllowSetPassword); |
65 | } | 70 | } |
66 | } | 71 | } |
@@ -161,6 +166,18 @@ namespace OpenSim.Server.Handlers.Authentication | |||
161 | return SuccessResult(); | 166 | return SuccessResult(); |
162 | 167 | ||
163 | return FailureResult(); | 168 | return FailureResult(); |
169 | |||
170 | case "getauthinfo": | ||
171 | if (m_AllowGetAuthInfo) | ||
172 | return GetAuthInfo(principalID); | ||
173 | |||
174 | break; | ||
175 | |||
176 | case "setauthinfo": | ||
177 | if (m_AllowSetAuthInfo) | ||
178 | return SetAuthInfo(principalID, request); | ||
179 | |||
180 | break; | ||
164 | } | 181 | } |
165 | 182 | ||
166 | return FailureResult(); | 183 | return FailureResult(); |
@@ -193,6 +210,54 @@ namespace OpenSim.Server.Handlers.Authentication | |||
193 | return DocToBytes(doc); | 210 | return DocToBytes(doc); |
194 | } | 211 | } |
195 | 212 | ||
213 | byte[] GetAuthInfo(UUID principalID) | ||
214 | { | ||
215 | AuthInfo info = m_AuthenticationService.GetAuthInfo(principalID); | ||
216 | |||
217 | if (info != null) | ||
218 | { | ||
219 | Dictionary<string, object> result = new Dictionary<string, object>(); | ||
220 | result["result"] = info.ToKeyValuePairs(); | ||
221 | |||
222 | return ResultToBytes(result); | ||
223 | } | ||
224 | else | ||
225 | { | ||
226 | return FailureResult(); | ||
227 | } | ||
228 | } | ||
229 | |||
230 | byte[] SetAuthInfo(UUID principalID, Dictionary<string, object> request) | ||
231 | { | ||
232 | AuthInfo existingInfo = m_AuthenticationService.GetAuthInfo(principalID); | ||
233 | |||
234 | if (existingInfo == null) | ||
235 | return FailureResult(); | ||
236 | |||
237 | if (request.ContainsKey("AccountType")) | ||
238 | existingInfo.AccountType = request["AccountType"].ToString(); | ||
239 | |||
240 | if (request.ContainsKey("PasswordHash")) | ||
241 | existingInfo.PasswordHash = request["PasswordHash"].ToString(); | ||
242 | |||
243 | if (request.ContainsKey("PasswordSalt")) | ||
244 | existingInfo.PasswordSalt = request["PasswordSalt"].ToString(); | ||
245 | |||
246 | if (request.ContainsKey("WebLoginKey")) | ||
247 | existingInfo.WebLoginKey = request["WebLoginKey"].ToString(); | ||
248 | |||
249 | if (!m_AuthenticationService.SetAuthInfo(existingInfo)) | ||
250 | { | ||
251 | m_log.ErrorFormat( | ||
252 | "[AUTHENTICATION SERVER POST HANDLER]: Authentication info store failed for account {0} {1} {2}", | ||
253 | existingInfo.PrincipalID); | ||
254 | |||
255 | return FailureResult(); | ||
256 | } | ||
257 | |||
258 | return SuccessResult(); | ||
259 | } | ||
260 | |||
196 | private byte[] FailureResult() | 261 | private byte[] FailureResult() |
197 | { | 262 | { |
198 | XmlDocument doc = new XmlDocument(); | 263 | XmlDocument doc = new XmlDocument(); |
@@ -252,5 +317,12 @@ namespace OpenSim.Server.Handlers.Authentication | |||
252 | 317 | ||
253 | return ms.GetBuffer(); | 318 | return ms.GetBuffer(); |
254 | } | 319 | } |
320 | |||
321 | private byte[] ResultToBytes(Dictionary<string, object> result) | ||
322 | { | ||
323 | string xmlString = ServerUtils.BuildXmlResponse(result); | ||
324 | UTF8Encoding encoding = new UTF8Encoding(); | ||
325 | return encoding.GetBytes(xmlString); | ||
326 | } | ||
255 | } | 327 | } |
256 | } | 328 | } |
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index f987383..5ab4caf 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
@@ -356,7 +356,5 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
356 | UTF8Encoding encoding = new UTF8Encoding(); | 356 | UTF8Encoding encoding = new UTF8Encoding(); |
357 | return encoding.GetBytes(xmlString); | 357 | return encoding.GetBytes(xmlString); |
358 | } | 358 | } |
359 | |||
360 | |||
361 | } | 359 | } |
362 | } | 360 | } |
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index 5980f0c..e42f9a0 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
@@ -30,11 +30,11 @@ using OpenMetaverse; | |||
30 | using log4net; | 30 | using log4net; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Services.Base; | ||
34 | using OpenSim.Server.Base; | 33 | using OpenSim.Server.Base; |
35 | using OpenSim.Services.Interfaces; | 34 | using OpenSim.Services.Interfaces; |
36 | using OpenSim.Data; | 35 | using OpenSim.Data; |
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Services.Base; | ||
38 | 38 | ||
39 | namespace OpenSim.Services.AuthenticationService | 39 | namespace OpenSim.Services.AuthenticationService |
40 | { | 40 | { |
@@ -134,6 +134,50 @@ namespace OpenSim.Services.AuthenticationService | |||
134 | m_log.InfoFormat("[AUTHENTICATION DB]: Set password for principalID {0}", principalID); | 134 | m_log.InfoFormat("[AUTHENTICATION DB]: Set password for principalID {0}", principalID); |
135 | return true; | 135 | return true; |
136 | } | 136 | } |
137 | |||
138 | public virtual AuthInfo GetAuthInfo(UUID principalID) | ||
139 | { | ||
140 | AuthenticationData data = m_Database.Get(principalID); | ||
141 | |||
142 | if (data == null) | ||
143 | { | ||
144 | return null; | ||
145 | } | ||
146 | else | ||
147 | { | ||
148 | AuthInfo info | ||
149 | = new AuthInfo() | ||
150 | { | ||
151 | PrincipalID = data.PrincipalID, | ||
152 | AccountType = data.Data["accountType"] as string, | ||
153 | PasswordHash = data.Data["passwordHash"] as string, | ||
154 | PasswordSalt = data.Data["passwordSalt"] as string, | ||
155 | WebLoginKey = data.Data["webLoginKey"] as string | ||
156 | }; | ||
157 | |||
158 | return info; | ||
159 | } | ||
160 | } | ||
161 | |||
162 | public virtual bool SetAuthInfo(AuthInfo info) | ||
163 | { | ||
164 | AuthenticationData auth = new AuthenticationData(); | ||
165 | auth.PrincipalID = info.PrincipalID; | ||
166 | auth.Data = new System.Collections.Generic.Dictionary<string, object>(); | ||
167 | auth.Data["accountType"] = info.AccountType; | ||
168 | auth.Data["webLoginKey"] = info.WebLoginKey; | ||
169 | auth.Data["passwordHash"] = info.PasswordHash; | ||
170 | auth.Data["passwordSalt"] = info.PasswordSalt; | ||
171 | |||
172 | if (!m_Database.Store(auth)) | ||
173 | { | ||
174 | m_log.ErrorFormat("[AUTHENTICATION DB]: Failed to store authentication info."); | ||
175 | return false; | ||
176 | } | ||
177 | |||
178 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); | ||
179 | return true; | ||
180 | } | ||
137 | 181 | ||
138 | protected string GetToken(UUID principalID, int lifetime) | 182 | protected string GetToken(UUID principalID, int lifetime) |
139 | { | 183 | { |
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs index c04e7a4..2b77154 100644 --- a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs | |||
@@ -151,5 +151,17 @@ namespace OpenSim.Services.Connectors | |||
151 | // nope, we don't do this | 151 | // nope, we don't do this |
152 | return false; | 152 | return false; |
153 | } | 153 | } |
154 | |||
155 | public AuthInfo GetAuthInfo(UUID principalID) | ||
156 | { | ||
157 | // not done from remote simulators | ||
158 | return null; | ||
159 | } | ||
160 | |||
161 | public bool SetAuthInfo(AuthInfo info) | ||
162 | { | ||
163 | // not done from remote simulators | ||
164 | return false; | ||
165 | } | ||
154 | } | 166 | } |
155 | } | 167 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 51a09f8..69f6ed2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -236,6 +236,16 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
236 | return false; | 236 | return false; |
237 | } | 237 | } |
238 | 238 | ||
239 | public AuthInfo GetAuthInfo(UUID principalID) | ||
240 | { | ||
241 | throw new NotImplementedException(); | ||
242 | } | ||
243 | |||
244 | public bool SetAuthInfo(AuthInfo info) | ||
245 | { | ||
246 | throw new NotImplementedException(); | ||
247 | } | ||
248 | |||
239 | private bool CheckPassword(UUID userID, string password, string simianGridCredential, out string authorizeResult) | 249 | private bool CheckPassword(UUID userID, string password, string simianGridCredential, out string authorizeResult) |
240 | { | 250 | { |
241 | if (simianGridCredential.Contains(":")) | 251 | if (simianGridCredential.Contains(":")) |
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs index 9de261b..cee8bc0 100644 --- a/OpenSim/Services/Interfaces/IAuthenticationService.cs +++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs | |||
@@ -26,10 +26,32 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using OpenMetaverse; | 30 | using OpenMetaverse; |
30 | 31 | ||
31 | namespace OpenSim.Services.Interfaces | 32 | namespace OpenSim.Services.Interfaces |
32 | { | 33 | { |
34 | public class AuthInfo | ||
35 | { | ||
36 | public UUID PrincipalID { get; set; } | ||
37 | public string AccountType { get; set; } | ||
38 | public string PasswordHash { get; set; } | ||
39 | public string PasswordSalt { get; set; } | ||
40 | public string WebLoginKey { get; set; } | ||
41 | |||
42 | public Dictionary<string, object> ToKeyValuePairs() | ||
43 | { | ||
44 | Dictionary<string, object> result = new Dictionary<string, object>(); | ||
45 | result["PrincipalID"] = PrincipalID; | ||
46 | result["AccountType"] = AccountType; | ||
47 | result["PasswordHash"] = PasswordHash; | ||
48 | result["PasswordSalt"] = PasswordSalt; | ||
49 | result["WebLoginKey"] = WebLoginKey; | ||
50 | |||
51 | return result; | ||
52 | } | ||
53 | } | ||
54 | |||
33 | // Generic Authentication service used for identifying | 55 | // Generic Authentication service used for identifying |
34 | // and authenticating principals. | 56 | // and authenticating principals. |
35 | // Principals may be clients acting on users' behalf, | 57 | // Principals may be clients acting on users' behalf, |
@@ -76,6 +98,10 @@ namespace OpenSim.Services.Interfaces | |||
76 | // | 98 | // |
77 | bool SetPassword(UUID principalID, string passwd); | 99 | bool SetPassword(UUID principalID, string passwd); |
78 | 100 | ||
101 | AuthInfo GetAuthInfo(UUID principalID); | ||
102 | |||
103 | bool SetAuthInfo(AuthInfo info); | ||
104 | |||
79 | ////////////////////////////////////////////////////// | 105 | ////////////////////////////////////////////////////// |
80 | // Grid | 106 | // Grid |
81 | // | 107 | // |