aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
authorMelanie2010-04-04 02:24:52 +0100
committerMelanie2010-04-04 02:24:52 +0100
commitdc58c985e8850d54b09f47c7938f255cca476167 (patch)
tree49c7436e3ed86cfec2bc50127b2f7afbd1722200 /OpenSim/Services/Connectors/SimianGrid
parentPatch from mcortez. This appears to be a huge change to the groups module (diff)
parent* Guard against null in last commit (diff)
downloadopensim-SC-dc58c985e8850d54b09f47c7938f255cca476167.zip
opensim-SC-dc58c985e8850d54b09f47c7938f255cca476167.tar.gz
opensim-SC-dc58c985e8850d54b09f47c7938f255cca476167.tar.bz2
opensim-SC-dc58c985e8850d54b09f47c7938f255cca476167.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs12
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs2
2 files changed, 11 insertions, 3 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 {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 696be94..c324272 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
395 } 395 }
396 else 396 else
397 { 397 {
398 m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions for " + userID + ": " + response["Message"].AsString()); 398 m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString());
399 } 399 }
400 } 400 }
401 401