aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Clients
diff options
context:
space:
mode:
authordiva2009-03-30 19:26:25 +0000
committerdiva2009-03-30 19:26:25 +0000
commit4cbf963354128f6d30e28ea68fe06a85ba5790c5 (patch)
treebfe313ab6fc9e2c5fac9d583a71e94993d2cb1a2 /OpenSim/Framework/Communications/Clients
parent* Fix test breakage by always inserting a gods module when testing (diff)
downloadopensim-SC_OLD-4cbf963354128f6d30e28ea68fe06a85ba5790c5.zip
opensim-SC_OLD-4cbf963354128f6d30e28ea68fe06a85ba5790c5.tar.gz
opensim-SC_OLD-4cbf963354128f6d30e28ea68fe06a85ba5790c5.tar.bz2
opensim-SC_OLD-4cbf963354128f6d30e28ea68fe06a85ba5790c5.tar.xz
HGInventoryService now uses the actual authority portion of the user's key to verify the key.
Diffstat (limited to 'OpenSim/Framework/Communications/Clients')
-rw-r--r--OpenSim/Framework/Communications/Clients/AuthClient.cs234
1 files changed, 118 insertions, 116 deletions
diff --git a/OpenSim/Framework/Communications/Clients/AuthClient.cs b/OpenSim/Framework/Communications/Clients/AuthClient.cs
index ba5cf66..39a886c 100644
--- a/OpenSim/Framework/Communications/Clients/AuthClient.cs
+++ b/OpenSim/Framework/Communications/Clients/AuthClient.cs
@@ -1,116 +1,118 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the 12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Framework.Communications.Clients 33namespace OpenSim.Framework.Communications.Clients
34{ 34{
35 public class AuthClient 35 public class AuthClient
36 { 36 {
37 public static string GetNewKey(string authurl, UUID userID, UUID authToken) 37 public static string GetNewKey(string authurl, UUID userID, UUID authToken)
38 { 38 {
39 //Hashtable keyParams = new Hashtable(); 39 //Hashtable keyParams = new Hashtable();
40 //keyParams["user_id"] = userID; 40 //keyParams["user_id"] = userID;
41 //keyParams["auth_token"] = authKey; 41 //keyParams["auth_token"] = authKey;
42 42
43 List<string> SendParams = new List<string>(); 43 List<string> SendParams = new List<string>();
44 SendParams.Add(userID.ToString()); 44 SendParams.Add(userID.ToString());
45 SendParams.Add(authToken.ToString()); 45 SendParams.Add(authToken.ToString());
46 46
47 XmlRpcRequest request = new XmlRpcRequest("hg_new_auth_key", SendParams); 47 XmlRpcRequest request = new XmlRpcRequest("hg_new_auth_key", SendParams);
48 XmlRpcResponse reply; 48 XmlRpcResponse reply;
49 try 49 try
50 { 50 {
51 reply = request.Send(authurl, 6000); 51 reply = request.Send(authurl, 6000);
52 } 52 }
53 catch (Exception e) 53 catch (Exception e)
54 { 54 {
55 System.Console.WriteLine("[HGrid]: Failed to get new key. Reason: " + e.Message); 55 System.Console.WriteLine("[HGrid]: Failed to get new key. Reason: " + e.Message);
56 return string.Empty; 56 return string.Empty;
57 } 57 }
58 58
59 if (!reply.IsFault) 59 if (!reply.IsFault)
60 { 60 {
61 string newKey = string.Empty; 61 string newKey = string.Empty;
62 if (reply.Value != null) 62 if (reply.Value != null)
63 newKey = (string)reply.Value; 63 newKey = (string)reply.Value;
64 64
65 return newKey; 65 return newKey;
66 } 66 }
67 else 67 else
68 { 68 {
69 System.Console.WriteLine("[HGrid]: XmlRpc request to get auth key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode); 69 System.Console.WriteLine("[HGrid]: XmlRpc request to get auth key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode);
70 return string.Empty; 70 return string.Empty;
71 } 71 }
72 72
73 } 73 }
74 74
75 public static bool VerifyKey(string authurl, UUID userID, string authKey) 75 public static bool VerifyKey(string authurl, UUID userID, string authKey)
76 { 76 {
77 List<string> SendParams = new List<string>(); 77 List<string> SendParams = new List<string>();
78 SendParams.Add(userID.ToString()); 78 SendParams.Add(userID.ToString());
79 SendParams.Add(authKey); 79 SendParams.Add(authKey);
80 80
81 XmlRpcRequest request = new XmlRpcRequest("hg_verify_auth_key", SendParams); 81 System.Console.WriteLine("[HGrid]: Verifying user key with authority " + authurl);
82 XmlRpcResponse reply; 82
83 try 83 XmlRpcRequest request = new XmlRpcRequest("hg_verify_auth_key", SendParams);
84 { 84 XmlRpcResponse reply;
85 reply = request.Send(authurl, 10000); 85 try
86 } 86 {
87 catch (Exception e) 87 reply = request.Send(authurl, 10000);
88 { 88 }
89 System.Console.WriteLine("[HGrid]: Failed to verify key. Reason: " + e.Message); 89 catch (Exception e)
90 return false; 90 {
91 } 91 System.Console.WriteLine("[HGrid]: Failed to verify key. Reason: " + e.Message);
92 92 return false;
93 if (reply != null) 93 }
94 { 94
95 if (!reply.IsFault) 95 if (reply != null)
96 { 96 {
97 bool success = false; 97 if (!reply.IsFault)
98 if (reply.Value != null) 98 {
99 success = (bool)reply.Value; 99 bool success = false;
100 100 if (reply.Value != null)
101 return success; 101 success = (bool)reply.Value;
102 } 102
103 else 103 return success;
104 { 104 }
105 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode); 105 else
106 return false; 106 {
107 } 107 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode);
108 } 108 return false;
109 else 109 }
110 { 110 }
111 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key returned null reply"); 111 else
112 return false; 112 {
113 } 113 System.Console.WriteLine("[HGrid]: XmlRpc request to verify key returned null reply");
114 } 114 return false;
115 } 115 }
116} 116 }
117 }
118}