aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Clients/AuthClient.cs22
-rw-r--r--OpenSim/Framework/Communications/Services/HGInventoryService.cs3
-rw-r--r--OpenSim/Framework/Communications/Services/HGLoginAuthService.cs13
3 files changed, 20 insertions, 18 deletions
diff --git a/OpenSim/Framework/Communications/Clients/AuthClient.cs b/OpenSim/Framework/Communications/Clients/AuthClient.cs
index 95af7e1..ba5cf66 100644
--- a/OpenSim/Framework/Communications/Clients/AuthClient.cs
+++ b/OpenSim/Framework/Communications/Clients/AuthClient.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Framework.Communications.Clients
82 XmlRpcResponse reply; 82 XmlRpcResponse reply;
83 try 83 try
84 { 84 {
85 reply = request.Send(authurl, 6000); 85 reply = request.Send(authurl, 10000);
86 } 86 }
87 catch (Exception e) 87 catch (Exception e)
88 { 88 {
@@ -90,17 +90,25 @@ namespace OpenSim.Framework.Communications.Clients
90 return false; 90 return false;
91 } 91 }
92 92
93 if (!reply.IsFault) 93 if (reply != null)
94 { 94 {
95 bool success = false; 95 if (!reply.IsFault)
96 if (reply.Value != null) 96 {
97 success = (bool)reply.Value; 97 bool success = false;
98 if (reply.Value != null)
99 success = (bool)reply.Value;
98 100
99 return success; 101 return success;
102 }
103 else
104 {
105 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode);
106 return false;
107 }
100 } 108 }
101 else 109 else
102 { 110 {
103 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode); 111 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key returned null reply");
104 return false; 112 return false;
105 } 113 }
106 } 114 }
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
index eef9e80..b01c30e 100644
--- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs
+++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
@@ -490,7 +490,7 @@ namespace OpenSim.Framework.Communications.Services
490 // This is the meaning of POST agent 490 // This is the meaning of POST agent
491 491
492 // Check Auth Token 492 // Check Auth Token
493 if (!(m_userService is IAuthentication)) 493 if ((m_userService != null) && !(m_userService is IAuthentication))
494 { 494 {
495 m_log.Debug("[HGStandaloneInvService]: UserService is not IAuthentication. Denying access to inventory."); 495 m_log.Debug("[HGStandaloneInvService]: UserService is not IAuthentication. Denying access to inventory.");
496 responsedata["int_response_code"] = 501; 496 responsedata["int_response_code"] = 501;
@@ -499,6 +499,7 @@ namespace OpenSim.Framework.Communications.Services
499 } 499 }
500 500
501 bool success = VerifyKey(userID, authToken); 501 bool success = VerifyKey(userID, authToken);
502 m_log.Debug("[HGStandaloneInvService]: Key verification returned " + success);
502 503
503 if (success) 504 if (success)
504 { 505 {
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
index cd4ca5c..72e2dfb 100644
--- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
+++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
@@ -161,14 +161,6 @@ namespace OpenSim.Framework.Communications.Services
161 161
162 public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request) 162 public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request)
163 { 163 {
164 foreach (object o in request.Params)
165 {
166 if (o != null)
167 m_log.Debug(" >> Param " + o.ToString());
168 else
169 m_log.Debug(" >> Null");
170 }
171
172 bool success = false; 164 bool success = false;
173 165
174 if (request.Params.Count >= 2) 166 if (request.Params.Count >= 2)
@@ -180,7 +172,7 @@ namespace OpenSim.Framework.Communications.Services
180 { 172 {
181 authKey = (string)request.Params[1]; 173 authKey = (string)request.Params[1];
182 174
183 m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key ", authKey); 175 m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key {0}", authKey);
184 176
185 if (!(m_userManager is IAuthentication)) 177 if (!(m_userManager is IAuthentication))
186 { 178 {
@@ -193,8 +185,9 @@ namespace OpenSim.Framework.Communications.Services
193 } 185 }
194 } 186 }
195 187
188 m_log.DebugFormat("[HGLOGIN]: Response to VerifyKey is {0}", success);
196 XmlRpcResponse response = new XmlRpcResponse(); 189 XmlRpcResponse response = new XmlRpcResponse();
197 response.Value = (string)success.ToString(); 190 response.Value = success;
198 return response; 191 return response;
199 } 192 }
200 193