diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 0d7ced9..769c3c2 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -103,6 +103,8 @@ namespace OpenSim.Services.AuthenticationService | |||
103 | if ((user.UserFlags & impersonateFlag) == 0) | 103 | if ((user.UserFlags & impersonateFlag) == 0) |
104 | return String.Empty; | 104 | return String.Empty; |
105 | 105 | ||
106 | m_log.DebugFormat("[PASS AUTH]: Attempting impersonation"); | ||
107 | |||
106 | List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); | 108 | List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); |
107 | if (accounts == null || accounts.Count == 0) | 109 | if (accounts == null || accounts.Count == 0) |
108 | return String.Empty; | 110 | return String.Empty; |
@@ -117,6 +119,8 @@ namespace OpenSim.Services.AuthenticationService | |||
117 | continue; | 119 | continue; |
118 | } | 120 | } |
119 | 121 | ||
122 | // m_log.DebugFormat("[PASS AUTH]: Trying {0}", data.PrincipalID); | ||
123 | |||
120 | hashed = Util.Md5Hash(password + ":" + | 124 | hashed = Util.Md5Hash(password + ":" + |
121 | data.Data["passwordSalt"].ToString()); | 125 | data.Data["passwordSalt"].ToString()); |
122 | 126 | ||
@@ -125,13 +129,12 @@ namespace OpenSim.Services.AuthenticationService | |||
125 | m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); | 129 | m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); |
126 | return GetToken(principalID, lifetime); | 130 | return GetToken(principalID, lifetime); |
127 | } | 131 | } |
128 | else | 132 | // else |
129 | { | 133 | // { |
130 | m_log.DebugFormat( | 134 | // m_log.DebugFormat( |
131 | "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.", | 135 | // "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.", |
132 | hashed, data.Data["passwordHash"], principalID); | 136 | // hashed, data.Data["passwordHash"], data.PrincipalID); |
133 | return String.Empty; | 137 | // } |
134 | } | ||
135 | } | 138 | } |
136 | 139 | ||
137 | m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); | 140 | m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); |