diff options
author | John Hurliman | 2010-04-02 13:32:30 -0700 |
---|---|---|
committer | John Hurliman | 2010-04-02 13:32:30 -0700 |
commit | 4c9cc56624188b6b00d18327662d6d0191cc4e5e (patch) | |
tree | 9893d5ef436ea1653fa2e373542117def05bdcab /OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |
parent | Change the SimianGrid connector log messages to start with "[SIMIAN " to avoi... (diff) | |
download | opensim-SC_OLD-4c9cc56624188b6b00d18327662d6d0191cc4e5e.zip opensim-SC_OLD-4c9cc56624188b6b00d18327662d6d0191cc4e5e.tar.gz opensim-SC_OLD-4c9cc56624188b6b00d18327662d6d0191cc4e5e.tar.bz2 opensim-SC_OLD-4c9cc56624188b6b00d18327662d6d0191cc4e5e.tar.xz |
* Better logging for Authenticate() failures
* Changed a warning message to debug when fetching user sessions
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index e78429d..b19135e 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -104,6 +104,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
104 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 104 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); |
105 | if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) | 105 | if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) |
106 | { | 106 | { |
107 | bool md5hashFound = false; | ||
108 | |||
107 | OSDArray identities = (OSDArray)response["Identities"]; | 109 | OSDArray identities = (OSDArray)response["Identities"]; |
108 | for (int i = 0; i < identities.Count; i++) | 110 | for (int i = 0; i < identities.Count; i++) |
109 | { | 111 | { |
@@ -114,13 +116,19 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
114 | { | 116 | { |
115 | string credential = identity["Credential"].AsString(); | 117 | string credential = identity["Credential"].AsString(); |
116 | 118 | ||
117 | if (password == credential || "$1$" + Utils.MD5String(password) == credential) | 119 | if (password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential) |
118 | return Authorize(principalID); | 120 | return Authorize(principalID); |
121 | |||
122 | md5hashFound = true; | ||
123 | break; | ||
119 | } | 124 | } |
120 | } | 125 | } |
121 | } | 126 | } |
122 | 127 | ||
123 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Authentication failed for " + principalID); | 128 | if (md5hashFound) |
129 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Authentication failed for " + principalID + " using md5hash $1$" + Utils.MD5String(password)); | ||
130 | else | ||
131 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Authentication failed for " + principalID + ", no md5hash identity found"); | ||
124 | } | 132 | } |
125 | else | 133 | else |
126 | { | 134 | { |