diff options
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 37c0bd8..db4e2ec 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -40,7 +40,7 @@ using Nwc.XmlRpc; | |||
40 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
41 | using OpenSim.Framework.Statistics; | 41 | using OpenSim.Framework.Statistics; |
42 | 42 | ||
43 | namespace OpenSim.Framework.UserManagement | 43 | namespace OpenSim.Framework.Communications |
44 | { | 44 | { |
45 | public abstract class LoginService | 45 | public abstract class LoginService |
46 | { | 46 | { |
@@ -122,8 +122,8 @@ namespace OpenSim.Framework.UserManagement | |||
122 | lastname = (string) requestData["last"]; | 122 | lastname = (string) requestData["last"]; |
123 | 123 | ||
124 | m_log.InfoFormat( | 124 | m_log.InfoFormat( |
125 | "[LOGIN BEGIN]: Received login request message from user {0} {1}", | 125 | "[LOGIN BEGIN]: Received login request message from user {0} {1}", |
126 | firstname, lastname); | 126 | firstname, lastname); |
127 | 127 | ||
128 | string clientVersion = "Unknown"; | 128 | string clientVersion = "Unknown"; |
129 | 129 | ||
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.UserManagement | |||
138 | } | 138 | } |
139 | 139 | ||
140 | m_log.DebugFormat( | 140 | m_log.DebugFormat( |
141 | "[LOGIN]: Client is {0}, start location is {1}", clientVersion, startLocationRequest); | 141 | "[LOGIN]: Client is {0}, start location is {1}", clientVersion, startLocationRequest); |
142 | 142 | ||
143 | userProfile = GetTheUser(firstname, lastname); | 143 | userProfile = GetTheUser(firstname, lastname); |
144 | if (userProfile == null) | 144 | if (userProfile == null) |
@@ -163,8 +163,8 @@ namespace OpenSim.Framework.UserManagement | |||
163 | catch (Exception e) | 163 | catch (Exception e) |
164 | { | 164 | { |
165 | m_log.InfoFormat( | 165 | m_log.InfoFormat( |
166 | "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", | 166 | "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", |
167 | requestData["web_login_key"], firstname, lastname, e); | 167 | requestData["web_login_key"], firstname, lastname, e); |
168 | 168 | ||
169 | return logResponse.CreateFailedResponse(); | 169 | return logResponse.CreateFailedResponse(); |
170 | } | 170 | } |
@@ -201,8 +201,8 @@ namespace OpenSim.Framework.UserManagement | |||
201 | // Reject the login | 201 | // Reject the login |
202 | 202 | ||
203 | m_log.InfoFormat( | 203 | m_log.InfoFormat( |
204 | "[LOGIN END]: Notifying user {0} {1} that they are already logged in", | 204 | "[LOGIN END]: Notifying user {0} {1} that they are already logged in", |
205 | firstname, lastname); | 205 | firstname, lastname); |
206 | 206 | ||
207 | return logResponse.CreateAlreadyLoggedInResponse(); | 207 | return logResponse.CreateAlreadyLoggedInResponse(); |
208 | } | 208 | } |
@@ -286,8 +286,8 @@ namespace OpenSim.Framework.UserManagement | |||
286 | StatsManager.UserStats.AddSuccessfulLogin(); | 286 | StatsManager.UserStats.AddSuccessfulLogin(); |
287 | 287 | ||
288 | m_log.DebugFormat( | 288 | m_log.DebugFormat( |
289 | "[LOGIN END]: Authentication of user {0} {1} successful. Sending response to client.", | 289 | "[LOGIN END]: Authentication of user {0} {1} successful. Sending response to client.", |
290 | firstname, lastname); | 290 | firstname, lastname); |
291 | 291 | ||
292 | return logResponse.ToXmlRpcResponse(); | 292 | return logResponse.ToXmlRpcResponse(); |
293 | } | 293 | } |
@@ -516,9 +516,9 @@ namespace OpenSim.Framework.UserManagement | |||
516 | statuscode = 301; | 516 | statuscode = 301; |
517 | 517 | ||
518 | string redirectURL = "about:blank?redirect-http-hack=" + | 518 | string redirectURL = "about:blank?redirect-http-hack=" + |
519 | HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + | 519 | HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + |
520 | lastname + | 520 | lastname + |
521 | "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); | 521 | "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); |
522 | //m_log.Info("[WEB]: R:" + redirectURL); | 522 | //m_log.Info("[WEB]: R:" + redirectURL); |
523 | returnactions["int_response_code"] = statuscode; | 523 | returnactions["int_response_code"] = statuscode; |
524 | returnactions["str_redirect_location"] = redirectURL; | 524 | returnactions["str_redirect_location"] = redirectURL; |
@@ -677,7 +677,7 @@ namespace OpenSim.Framework.UserManagement | |||
677 | //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); | 677 | //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); |
678 | 678 | ||
679 | passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) | 679 | passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) |
680 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); | 680 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); |
681 | 681 | ||
682 | return passwordSuccess; | 682 | return passwordSuccess; |
683 | } | 683 | } |
@@ -792,4 +792,4 @@ namespace OpenSim.Framework.UserManagement | |||
792 | } | 792 | } |
793 | } | 793 | } |
794 | } | 794 | } |
795 | } | 795 | } \ No newline at end of file |