From 0c58a9e68074f3593920dc9f2356bbed96416497 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 26 May 2011 10:04:48 -0700
Subject: HG IM in grid mode working fairly well. Unknown target user
references looked back in source user's User Agent service.
---
OpenSim/Server/Base/ServerUtils.cs | 4 ++
.../Handlers/Hypergrid/UserAgentServerConnector.cs | 57 +++++++++++++++++++---
2 files changed, 54 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Server')
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index f4472c7..6743a2e 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -65,6 +65,10 @@ namespace OpenSim.Server.Base
///
public static T LoadPlugin(string dllName, Object[] args) where T:class
{
+ // This is good to debug configuration problems
+ //if (dllName == string.Empty)
+ // Util.PrintCallStack();
+
string[] parts = dllName.Split(new char[] {':'});
dllName = parts[0];
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 942d960..eb184a5 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -54,6 +54,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
private IUserAgentService m_HomeUsersService;
private string[] m_AuthorizedCallers;
+ private bool m_VerifyCallers = false;
+
public UserAgentServerConnector(IConfigSource config, IHttpServer server) :
this(config, server, null)
{
@@ -76,6 +78,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
string loginServerIP = gridConfig.GetString("LoginServerIP", "127.0.0.1");
bool proxy = gridConfig.GetBoolean("HasProxy", false);
+ m_VerifyCallers = gridConfig.GetBoolean("VerifyCallers", false);
string csv = gridConfig.GetString("AuthorizedCallers", "127.0.0.1");
csv = csv.Replace(" ", "");
m_AuthorizedCallers = csv.Split(',');
@@ -91,6 +94,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
server.AddXmlRPCHandler("get_server_urls", GetServerURLs, false);
server.AddXmlRPCHandler("locate_user", LocateUser, false);
+ server.AddXmlRPCHandler("get_uui", GetUUI, false);
server.AddHTTPHandler("/homeagent/", new HomeAgentHandler(m_HomeUsersService, loginServerIP, proxy).Handler);
}
@@ -324,13 +328,17 @@ namespace OpenSim.Server.Handlers.Hypergrid
{
Hashtable hash = new Hashtable();
- bool authorized = false;
- foreach (string s in m_AuthorizedCallers)
- if (s == remoteClient.Address.ToString())
- {
- authorized = true;
- break;
- }
+ bool authorized = true;
+ if (m_VerifyCallers)
+ {
+ authorized = false;
+ foreach (string s in m_AuthorizedCallers)
+ if (s == remoteClient.Address.ToString())
+ {
+ authorized = true;
+ break;
+ }
+ }
if (authorized)
{
@@ -354,5 +362,40 @@ namespace OpenSim.Server.Handlers.Hypergrid
return response;
}
+
+ ///
+ /// Locates the user.
+ /// This is a sensitive operation, only authorized IP addresses can perform it.
+ ///
+ ///
+ ///
+ ///
+ public XmlRpcResponse GetUUI(XmlRpcRequest request, IPEndPoint remoteClient)
+ {
+ Hashtable hash = new Hashtable();
+
+ Hashtable requestData = (Hashtable)request.Params[0];
+ //string host = (string)requestData["host"];
+ //string portstr = (string)requestData["port"];
+ if (requestData.ContainsKey("userID") && requestData.ContainsKey("targetUserID"))
+ {
+ string userID_str = (string)requestData["userID"];
+ UUID userID = UUID.Zero;
+ UUID.TryParse(userID_str, out userID);
+
+ string tuserID_str = (string)requestData["targetUserID"];
+ UUID targetUserID = UUID.Zero;
+ UUID.TryParse(tuserID_str, out targetUserID);
+ string uui = m_HomeUsersService.GetUUI(userID, targetUserID);
+ if (uui != string.Empty)
+ hash["UUI"] = uui;
+ }
+
+ XmlRpcResponse response = new XmlRpcResponse();
+ response.Value = hash;
+ return response;
+
+ }
+
}
}
--
cgit v1.1