aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMike Mazur2008-07-24 00:32:06 +0000
committerMike Mazur2008-07-24 00:32:06 +0000
commit635b7158801bace4d974526f7946b1a2c45db427 (patch)
treeaac2f85cd9fc986dd65eeba2b53ca9c9f173246e /OpenSim
parent* refactor: break out inter grid inventory services further (diff)
downloadopensim-SC-635b7158801bace4d974526f7946b1a2c45db427.zip
opensim-SC-635b7158801bace4d974526f7946b1a2c45db427.tar.gz
opensim-SC-635b7158801bace4d974526f7946b1a2c45db427.tar.bz2
opensim-SC-635b7158801bace4d974526f7946b1a2c45db427.tar.xz
Thanks, cmickeyb, for a patch that addresses secure inventory assuming IP addresses in configuration. Fix issue 1812.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 78f33a3..b8a0436 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -60,9 +60,11 @@ namespace OpenSim.Grid.InventoryServer
60 { 60 {
61 m_log.InfoFormat("[GRID AGENT INVENTORY]: checking trusted source {0}", peer.ToString()); 61 m_log.InfoFormat("[GRID AGENT INVENTORY]: checking trusted source {0}", peer.ToString());
62 UriBuilder ub = new UriBuilder(m_userserver_url); 62 UriBuilder ub = new UriBuilder(m_userserver_url);
63 if (ub.Host == peer.Address.ToString()) 63 IPAddress[] uaddrs = Dns.GetHostAddresses(ub.Host);
64 { 64 foreach (IPAddress uaddr in uaddrs) {
65 return true; 65 if (uaddr.Equals(peer.Address)) {
66 return true;
67 }
66 } 68 }
67 return false; 69 return false;
68 } 70 }