OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setting svn:eol-style=native on new files.

GenericGridServerConcept
Mike Mazur 2009-02-24 23:40:08 +00:00
parent e84ac65b58
commit d81fb565c1
27 changed files with 6122 additions and 6122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
OpenSim/Grid/Framework/IGridMessagingMapper.cs
View File

@ -1,40 +1,40 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.Framework namespace OpenSim.Grid.Framework
{ {
public interface IGridMessagingMapper public interface IGridMessagingMapper
{ {
List<MessageServerInfo> GetMessageServersList(); List<MessageServerInfo> GetMessageServersList();
void RegisterMessageServer(MessageServerInfo m); void RegisterMessageServer(MessageServerInfo m);
void DeRegisterMessageServer(MessageServerInfo m); void DeRegisterMessageServer(MessageServerInfo m);
} }
} }

76
OpenSim/Grid/Framework/IMessageRegionService.cs
View File

@ -1,38 +1,38 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using OpenSim.Data; using OpenSim.Data;
namespace OpenSim.Grid.Framework namespace OpenSim.Grid.Framework
{ {
public interface IMessageRegionService public interface IMessageRegionService
{ {
int ClearRegionCache(); int ClearRegionCache();
RegionProfileData GetRegionInfo(ulong regionhandle); RegionProfileData GetRegionInfo(ulong regionhandle);
} }
} }

70
OpenSim/Grid/Framework/IMessageUserServerService.cs
View File

@ -1,35 +1,35 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
namespace OpenSim.Grid.Framework namespace OpenSim.Grid.Framework
{ {
public interface IMessageUserServerService public interface IMessageUserServerService
{ {
bool SendToUserServer(System.Collections.Hashtable request, string method); bool SendToUserServer(System.Collections.Hashtable request, string method);
} }
} }

80
OpenSim/Grid/Framework/IUGAIMCore.cs
View File

@ -1,40 +1,40 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.Framework namespace OpenSim.Grid.Framework
{ {
public interface IUGAIMCore public interface IUGAIMCore
{ {
T Get<T>(); T Get<T>();
void RegisterInterface<T>(T iface); void RegisterInterface<T>(T iface);
bool TryGet<T>(out T iface); bool TryGet<T>(out T iface);
BaseHttpServer GetHttpServer(); BaseHttpServer GetHttpServer();
} }
} }

220
OpenSim/Grid/Framework/XMPPHTTPService.cs
View File

@ -1,110 +1,110 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.Framework namespace OpenSim.Grid.Framework
{ {
public class XMPPHTTPStreamHandler : BaseStreamHandler public class XMPPHTTPStreamHandler : BaseStreamHandler
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// Constructor. /// Constructor.
/// </summary> /// </summary>
/// <param name="assetManager"></param> /// <param name="assetManager"></param>
/// <param name="assetProvider"></param> /// <param name="assetProvider"></param>
public XMPPHTTPStreamHandler() public XMPPHTTPStreamHandler()
: base("GET", "/presence") : base("GET", "/presence")
{ {
m_log.Info("[REST]: In Get Request"); m_log.Info("[REST]: In Get Request");
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
string param = GetParam(path); string param = GetParam(path);
byte[] result = new byte[] {}; byte[] result = new byte[] {};
try try
{ {
string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries); string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
if (p.Length > 0) if (p.Length > 0)
{ {
UUID assetID = UUID.Zero; UUID assetID = UUID.Zero;
if (!UUID.TryParse(p[0], out assetID)) if (!UUID.TryParse(p[0], out assetID))
{ {
m_log.InfoFormat( m_log.InfoFormat(
"[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]); "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]);
return result; return result;
} }
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error(e.ToString()); m_log.Error(e.ToString());
} }
return result; return result;
} }
} }
public class PostXMPPStreamHandler : BaseStreamHandler public class PostXMPPStreamHandler : BaseStreamHandler
{ {
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
string param = GetParam(path); string param = GetParam(path);
UUID assetId; UUID assetId;
if (param.Length > 0) if (param.Length > 0)
UUID.TryParse(param, out assetId); UUID.TryParse(param, out assetId);
// byte[] txBuffer = new byte[4096]; // byte[] txBuffer = new byte[4096];
// TODO: Read POST serialize XMPP stanzas // TODO: Read POST serialize XMPP stanzas
return new byte[] {}; return new byte[] {};
} }
public PostXMPPStreamHandler() public PostXMPPStreamHandler()
: base("POST", "/presence") : base("POST", "/presence")
{ {
} }
} }
} }

568
OpenSim/Grid/GridServer.Modules/GridDBService.cs
View File

@ -1,284 +1,284 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Xml; using System.Xml;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.GridServer.Modules namespace OpenSim.Grid.GridServer.Modules
{ {
public class GridDBService public class GridDBService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private List<IGridDataPlugin> _plugins = new List<IGridDataPlugin>(); private List<IGridDataPlugin> _plugins = new List<IGridDataPlugin>();
private List<ILogDataPlugin> _logplugins = new List<ILogDataPlugin>(); private List<ILogDataPlugin> _logplugins = new List<ILogDataPlugin>();
/// <summary> /// <summary>
/// Adds a list of grid and log data plugins, as described by /// Adds a list of grid and log data plugins, as described by
/// `provider' and `connect', to `_plugins' and `_logplugins', /// `provider' and `connect', to `_plugins' and `_logplugins',
/// respectively. /// respectively.
/// </summary> /// </summary>
/// <param name="provider"> /// <param name="provider">
/// The filename of the inventory server plugin DLL. /// The filename of the inventory server plugin DLL.
/// </param> /// </param>
/// <param name="connect"> /// <param name="connect">
/// The connection string for the storage backend. /// The connection string for the storage backend.
/// </param> /// </param>
public void AddPlugin(string provider, string connect) public void AddPlugin(string provider, string connect)
{ {
_plugins = DataPluginFactory.LoadDataPlugins<IGridDataPlugin>(provider, connect); _plugins = DataPluginFactory.LoadDataPlugins<IGridDataPlugin>(provider, connect);
_logplugins = DataPluginFactory.LoadDataPlugins<ILogDataPlugin>(provider, connect); _logplugins = DataPluginFactory.LoadDataPlugins<ILogDataPlugin>(provider, connect);
} }
public int GetNumberOfPlugins() public int GetNumberOfPlugins()
{ {
return _plugins.Count; return _plugins.Count;
} }
/// <summary> /// <summary>
/// Logs a piece of information to the database /// Logs a piece of information to the database
/// </summary> /// </summary>
/// <param name="target">What you were operating on (in grid server, this will likely be the region UUIDs)</param> /// <param name="target">What you were operating on (in grid server, this will likely be the region UUIDs)</param>
/// <param name="method">Which method is being called?</param> /// <param name="method">Which method is being called?</param>
/// <param name="args">What arguments are being passed?</param> /// <param name="args">What arguments are being passed?</param>
/// <param name="priority">How high priority is this? 1 = Max, 6 = Verbose</param> /// <param name="priority">How high priority is this? 1 = Max, 6 = Verbose</param>
/// <param name="message">The message to log</param> /// <param name="message">The message to log</param>
private void logToDB(string target, string method, string args, int priority, string message) private void logToDB(string target, string method, string args, int priority, string message)
{ {
foreach (ILogDataPlugin plugin in _logplugins) foreach (ILogDataPlugin plugin in _logplugins)
{ {
try try
{ {
plugin.saveLog("Gridserver", target, method, args, priority, message); plugin.saveLog("Gridserver", target, method, args, priority, message);
} }
catch (Exception) catch (Exception)
{ {
m_log.Warn("[storage]: Unable to write log via " + plugin.Name); m_log.Warn("[storage]: Unable to write log via " + plugin.Name);
} }
} }
} }
/// <summary> /// <summary>
/// Returns a region by argument /// Returns a region by argument
/// </summary> /// </summary>
/// <param name="uuid">A UUID key of the region to return</param> /// <param name="uuid">A UUID key of the region to return</param>
/// <returns>A SimProfileData for the region</returns> /// <returns>A SimProfileData for the region</returns>
public RegionProfileData GetRegion(UUID uuid) public RegionProfileData GetRegion(UUID uuid)
{ {
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
return plugin.GetProfileByUUID(uuid); return plugin.GetProfileByUUID(uuid);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Warn("[storage]: GetRegion - " + e.Message); m_log.Warn("[storage]: GetRegion - " + e.Message);
} }
} }
return null; return null;
} }
/// <summary> /// <summary>
/// Returns a region by argument /// Returns a region by argument
/// </summary> /// </summary>
/// <param name="uuid">A regionHandle of the region to return</param> /// <param name="uuid">A regionHandle of the region to return</param>
/// <returns>A SimProfileData for the region</returns> /// <returns>A SimProfileData for the region</returns>
public RegionProfileData GetRegion(ulong handle) public RegionProfileData GetRegion(ulong handle)
{ {
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
return plugin.GetProfileByHandle(handle); return plugin.GetProfileByHandle(handle);
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.Debug("[storage]: " + ex.Message); m_log.Debug("[storage]: " + ex.Message);
m_log.Warn("[storage]: Unable to find region " + handle.ToString() + " via " + plugin.Name); m_log.Warn("[storage]: Unable to find region " + handle.ToString() + " via " + plugin.Name);
} }
} }
return null; return null;
} }
/// <summary> /// <summary>
/// Returns a region by argument /// Returns a region by argument
/// </summary> /// </summary>
/// <param name="regionName">A partial regionName of the region to return</param> /// <param name="regionName">A partial regionName of the region to return</param>
/// <returns>A SimProfileData for the region</returns> /// <returns>A SimProfileData for the region</returns>
public RegionProfileData GetRegion(string regionName) public RegionProfileData GetRegion(string regionName)
{ {
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
return plugin.GetProfileByString(regionName); return plugin.GetProfileByString(regionName);
} }
catch catch
{ {
m_log.Warn("[storage]: Unable to find region " + regionName + " via " + plugin.Name); m_log.Warn("[storage]: Unable to find region " + regionName + " via " + plugin.Name);
} }
} }
return null; return null;
} }
public List<RegionProfileData> GetRegions(uint xmin, uint ymin, uint xmax, uint ymax) public List<RegionProfileData> GetRegions(uint xmin, uint ymin, uint xmax, uint ymax)
{ {
List<RegionProfileData> regions = new List<RegionProfileData>(); List<RegionProfileData> regions = new List<RegionProfileData>();
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
regions.AddRange(plugin.GetProfilesInRange(xmin, ymin, xmax, ymax)); regions.AddRange(plugin.GetProfilesInRange(xmin, ymin, xmax, ymax));
} }
catch catch
{ {
m_log.Warn("[storage]: Unable to query regionblock via " + plugin.Name); m_log.Warn("[storage]: Unable to query regionblock via " + plugin.Name);
} }
} }
return regions; return regions;
} }
public List<RegionProfileData> GetRegions(string name, int maxNum) public List<RegionProfileData> GetRegions(string name, int maxNum)
{ {
List<RegionProfileData> regions = new List<RegionProfileData>(); List<RegionProfileData> regions = new List<RegionProfileData>();
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
int num = maxNum - regions.Count; int num = maxNum - regions.Count;
List<RegionProfileData> profiles = plugin.GetRegionsByName(name, (uint)num); List<RegionProfileData> profiles = plugin.GetRegionsByName(name, (uint)num);
if (profiles != null) regions.AddRange(profiles); if (profiles != null) regions.AddRange(profiles);
} }
catch catch
{ {
m_log.Warn("[storage]: Unable to query regionblock via " + plugin.Name); m_log.Warn("[storage]: Unable to query regionblock via " + plugin.Name);
} }
} }
return regions; return regions;
} }
public DataResponse AddUpdateRegion(RegionProfileData sim, RegionProfileData existingSim) public DataResponse AddUpdateRegion(RegionProfileData sim, RegionProfileData existingSim)
{ {
DataResponse insertResponse = DataResponse.RESPONSE_ERROR; DataResponse insertResponse = DataResponse.RESPONSE_ERROR;
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
if (existingSim == null) if (existingSim == null)
{ {
insertResponse = plugin.AddProfile(sim); insertResponse = plugin.AddProfile(sim);
} }
else else
{ {
insertResponse = plugin.UpdateProfile(sim); insertResponse = plugin.UpdateProfile(sim);
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Warn("[LOGIN END]: " + m_log.Warn("[LOGIN END]: " +
"Unable to login region " + sim.ToString() + " via " + plugin.Name); "Unable to login region " + sim.ToString() + " via " + plugin.Name);
m_log.Warn("[LOGIN END]: " + e.ToString()); m_log.Warn("[LOGIN END]: " + e.ToString());
} }
} }
return insertResponse; return insertResponse;
} }
public DataResponse DeleteRegion(string uuid) public DataResponse DeleteRegion(string uuid)
{ {
DataResponse insertResponse = DataResponse.RESPONSE_ERROR; DataResponse insertResponse = DataResponse.RESPONSE_ERROR;
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
//OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData(); //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
try try
{ {
//Nice are we not using multiple databases? //Nice are we not using multiple databases?
//MySQLGridData mysqldata = (MySQLGridData)(plugin); //MySQLGridData mysqldata = (MySQLGridData)(plugin);
//DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
insertResponse = plugin.DeleteProfile(uuid); insertResponse = plugin.DeleteProfile(uuid);
} }
catch (Exception) catch (Exception)
{ {
m_log.Error("storage Unable to delete region " + uuid + " via " + plugin.Name); m_log.Error("storage Unable to delete region " + uuid + " via " + plugin.Name);
//MainLog.Instance.Warn("storage", e.ToString()); //MainLog.Instance.Warn("storage", e.ToString());
insertResponse = DataResponse.RESPONSE_ERROR; insertResponse = DataResponse.RESPONSE_ERROR;
} }
} }
return insertResponse; return insertResponse;
} }
public string CheckReservations(RegionProfileData theSim, XmlNode authkeynode) public string CheckReservations(RegionProfileData theSim, XmlNode authkeynode)
{ {
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
//Check reservations //Check reservations
ReservationData reserveData = ReservationData reserveData =
plugin.GetReservationAtPoint(theSim.regionLocX, theSim.regionLocY); plugin.GetReservationAtPoint(theSim.regionLocX, theSim.regionLocY);
if ((reserveData != null && reserveData.gridRecvKey == theSim.regionRecvKey) || if ((reserveData != null && reserveData.gridRecvKey == theSim.regionRecvKey) ||
(reserveData == null && authkeynode.InnerText != theSim.regionRecvKey)) (reserveData == null && authkeynode.InnerText != theSim.regionRecvKey))
{ {
plugin.AddProfile(theSim); plugin.AddProfile(theSim);
m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")"); m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")");
logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5, logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5,
"Region successfully updated and connected to grid."); "Region successfully updated and connected to grid.");
} }
else else
{ {
m_log.Warn("[grid]: " + m_log.Warn("[grid]: " +
"Unable to update region (RestSetSimMethod): Incorrect reservation auth key."); "Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");
// Wanted: " + reserveData.gridRecvKey + ", Got: " + theSim.regionRecvKey + "."); // Wanted: " + reserveData.gridRecvKey + ", Got: " + theSim.regionRecvKey + ".");
return "Unable to update region (RestSetSimMethod): Incorrect auth key."; return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Warn("[GRID]: GetRegionPlugin Handle " + plugin.Name + " unable to add new sim: " + m_log.Warn("[GRID]: GetRegionPlugin Handle " + plugin.Name + " unable to add new sim: " +
e.ToString()); e.ToString());
} }
} }
return "OK"; return "OK";
} }
} }
} }

322
OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
View File

@ -1,161 +1,161 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using log4net; using log4net;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
namespace OpenSim.Grid.GridServer.Modules namespace OpenSim.Grid.GridServer.Modules
{ {
public class GridMessagingModule : IGridMessagingMapper public class GridMessagingModule : IGridMessagingMapper
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected GridDBService m_gridDBService; protected GridDBService m_gridDBService;
protected IUGAIMCore m_gridCore; protected IUGAIMCore m_gridCore;
protected GridConfig m_config; protected GridConfig m_config;
/// <value> /// <value>
/// Used to notify old regions as to which OpenSim version to upgrade to /// Used to notify old regions as to which OpenSim version to upgrade to
/// </value> /// </value>
private string m_opensimVersion; private string m_opensimVersion;
protected BaseHttpServer m_httpServer; protected BaseHttpServer m_httpServer;
// This is here so that the grid server can hand out MessageServer settings to regions on registration // This is here so that the grid server can hand out MessageServer settings to regions on registration
private List<MessageServerInfo> m_messageServers = new List<MessageServerInfo>(); private List<MessageServerInfo> m_messageServers = new List<MessageServerInfo>();
public GridMessagingModule() public GridMessagingModule()
{ {
} }
public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config)
{ {
m_opensimVersion = opensimVersion; m_opensimVersion = opensimVersion;
m_gridDBService = gridDBService; m_gridDBService = gridDBService;
m_gridCore = gridCore; m_gridCore = gridCore;
m_config = config; m_config = config;
m_gridCore.RegisterInterface<IGridMessagingMapper>(this); m_gridCore.RegisterInterface<IGridMessagingMapper>(this);
RegisterHandlers(); RegisterHandlers();
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers() public void RegisterHandlers()
{ {
//have these in separate method as some servers restart the http server and reregister all the handlers. //have these in separate method as some servers restart the http server and reregister all the handlers.
m_httpServer = m_gridCore.GetHttpServer(); m_httpServer = m_gridCore.GetHttpServer();
// Message Server ---> Grid Server // Message Server ---> Grid Server
m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer); m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer);
m_httpServer.AddXmlRPCHandler("deregister_messageserver", XmlRPCDeRegisterMessageServer); m_httpServer.AddXmlRPCHandler("deregister_messageserver", XmlRPCDeRegisterMessageServer);
} }
public List<MessageServerInfo> GetMessageServersList() public List<MessageServerInfo> GetMessageServersList()
{ {
lock (m_messageServers) lock (m_messageServers)
{ {
return new List<MessageServerInfo>(m_messageServers); return new List<MessageServerInfo>(m_messageServers);
} }
} }
public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requestData.Contains("uri")) if (requestData.Contains("uri"))
{ {
string URI = (string)requestData["URI"]; string URI = (string)requestData["URI"];
string sendkey = (string)requestData["sendkey"]; string sendkey = (string)requestData["sendkey"];
string recvkey = (string)requestData["recvkey"]; string recvkey = (string)requestData["recvkey"];
MessageServerInfo m = new MessageServerInfo(); MessageServerInfo m = new MessageServerInfo();
m.URI = URI; m.URI = URI;
m.sendkey = sendkey; m.sendkey = sendkey;
m.recvkey = recvkey; m.recvkey = recvkey;
RegisterMessageServer(m); RegisterMessageServer(m);
responseData["responsestring"] = "TRUE"; responseData["responsestring"] = "TRUE";
response.Value = responseData; response.Value = responseData;
} }
return response; return response;
} }
public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
if (requestData.Contains("uri")) if (requestData.Contains("uri"))
{ {
string URI = (string)requestData["uri"]; string URI = (string)requestData["uri"];
string sendkey = (string)requestData["sendkey"]; string sendkey = (string)requestData["sendkey"];
string recvkey = (string)requestData["recvkey"]; string recvkey = (string)requestData["recvkey"];
MessageServerInfo m = new MessageServerInfo(); MessageServerInfo m = new MessageServerInfo();
m.URI = URI; m.URI = URI;
m.sendkey = sendkey; m.sendkey = sendkey;
m.recvkey = recvkey; m.recvkey = recvkey;
DeRegisterMessageServer(m); DeRegisterMessageServer(m);
responseData["responsestring"] = "TRUE"; responseData["responsestring"] = "TRUE";
response.Value = responseData; response.Value = responseData;
} }
return response; return response;
} }
public void RegisterMessageServer(MessageServerInfo m) public void RegisterMessageServer(MessageServerInfo m)
{ {
lock (m_messageServers) lock (m_messageServers)
{ {
if (!m_messageServers.Contains(m)) if (!m_messageServers.Contains(m))
m_messageServers.Add(m); m_messageServers.Add(m);
} }
} }
public void DeRegisterMessageServer(MessageServerInfo m) public void DeRegisterMessageServer(MessageServerInfo m)
{ {
lock (m_messageServers) lock (m_messageServers)
{ {
if (m_messageServers.Contains(m)) if (m_messageServers.Contains(m))
m_messageServers.Remove(m); m_messageServers.Remove(m);
} }
} }
} }
} }

564
OpenSim/Grid/GridServer.Modules/GridRestModule.cs
View File

@ -1,282 +1,282 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Xml; using System.Xml;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
namespace OpenSim.Grid.GridServer.Modules namespace OpenSim.Grid.GridServer.Modules
{ {
public class GridRestModule public class GridRestModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private GridDBService m_gridDBService; private GridDBService m_gridDBService;
private IUGAIMCore m_gridCore; private IUGAIMCore m_gridCore;
protected GridConfig m_config; protected GridConfig m_config;
/// <value> /// <value>
/// Used to notify old regions as to which OpenSim version to upgrade to /// Used to notify old regions as to which OpenSim version to upgrade to
/// </value> /// </value>
private string m_opensimVersion; private string m_opensimVersion;
protected BaseHttpServer m_httpServer; protected BaseHttpServer m_httpServer;
/// <summary> /// <summary>
/// Constructor /// Constructor
/// </summary> /// </summary>
/// <param name="opensimVersion"> /// <param name="opensimVersion">
/// Used to notify old regions as to which OpenSim version to upgrade to /// Used to notify old regions as to which OpenSim version to upgrade to
/// </param> /// </param>
public GridRestModule() public GridRestModule()
{ {
} }
public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config)
{ {
m_opensimVersion = opensimVersion; m_opensimVersion = opensimVersion;
m_gridDBService = gridDBService; m_gridDBService = gridDBService;
m_gridCore = gridCore; m_gridCore = gridCore;
m_config = config; m_config = config;
RegisterHandlers(); RegisterHandlers();
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers() public void RegisterHandlers()
{ {
//have these in separate method as some servers restart the http server and reregister all the handlers. //have these in separate method as some servers restart the http server and reregister all the handlers.
m_httpServer = m_gridCore.GetHttpServer(); m_httpServer = m_gridCore.GetHttpServer();
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod)); m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod));
m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", RestSetSimMethod)); m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", RestSetSimMethod));
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/regions/", RestGetRegionMethod)); m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/regions/", RestGetRegionMethod));
m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/regions/", RestSetRegionMethod)); m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/regions/", RestSetRegionMethod));
} }
/// <summary> /// <summary>
/// Performs a REST Get Operation /// Performs a REST Get Operation
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="param"></param> /// <param name="param"></param>
/// <param name="httpRequest">HTTP request header object</param> /// <param name="httpRequest">HTTP request header object</param>
/// <param name="httpResponse">HTTP response header object</param> /// <param name="httpResponse">HTTP response header object</param>
/// <returns></returns> /// <returns></returns>
public string RestGetRegionMethod(string request, string path, string param, public string RestGetRegionMethod(string request, string path, string param,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse);
} }
/// <summary> /// <summary>
/// Performs a REST Set Operation /// Performs a REST Set Operation
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="param"></param> /// <param name="param"></param>
/// <param name="httpRequest">HTTP request header object</param> /// <param name="httpRequest">HTTP request header object</param>
/// <param name="httpResponse">HTTP response header object</param> /// <param name="httpResponse">HTTP response header object</param>
/// <returns></returns> /// <returns></returns>
public string RestSetRegionMethod(string request, string path, string param, public string RestSetRegionMethod(string request, string path, string param,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse);
} }
/// <summary> /// <summary>
/// Returns information about a sim via a REST Request /// Returns information about a sim via a REST Request
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="param">A string representing the sim's UUID</param> /// <param name="param">A string representing the sim's UUID</param>
/// <param name="httpRequest">HTTP request header object</param> /// <param name="httpRequest">HTTP request header object</param>
/// <param name="httpResponse">HTTP response header object</param> /// <param name="httpResponse">HTTP response header object</param>
/// <returns>Information about the sim in XML</returns> /// <returns>Information about the sim in XML</returns>
public string RestGetSimMethod(string request, string path, string param, public string RestGetSimMethod(string request, string path, string param,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
string respstring = String.Empty; string respstring = String.Empty;
RegionProfileData TheSim; RegionProfileData TheSim;
UUID UUID; UUID UUID;
if (UUID.TryParse(param, out UUID)) if (UUID.TryParse(param, out UUID))
{ {
TheSim = m_gridDBService.GetRegion(UUID); TheSim = m_gridDBService.GetRegion(UUID);
if (!(TheSim == null)) if (!(TheSim == null))
{ {
respstring = "<Root>"; respstring = "<Root>";
respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>"; respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>";
respstring += "<sim>"; respstring += "<sim>";
respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>";
respstring += "<regionname>" + TheSim.regionName + "</regionname>"; respstring += "<regionname>" + TheSim.regionName + "</regionname>";
respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>"; respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>";
respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>";
respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>";
respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>";
respstring += "<estate_id>1</estate_id>"; respstring += "<estate_id>1</estate_id>";
respstring += "</sim>"; respstring += "</sim>";
respstring += "</Root>"; respstring += "</Root>";
} }
} }
else else
{ {
respstring = "<Root>"; respstring = "<Root>";
respstring += "<error>Param must be a UUID</error>"; respstring += "<error>Param must be a UUID</error>";
respstring += "</Root>"; respstring += "</Root>";
} }
return respstring; return respstring;
} }
/// <summary> /// <summary>
/// Creates or updates a sim via a REST Method Request /// Creates or updates a sim via a REST Method Request
/// BROKEN with SQL Update /// BROKEN with SQL Update
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="param"></param> /// <param name="param"></param>
/// <param name="httpRequest">HTTP request header object</param> /// <param name="httpRequest">HTTP request header object</param>
/// <param name="httpResponse">HTTP response header object</param> /// <param name="httpResponse">HTTP response header object</param>
/// <returns>"OK" or an error</returns> /// <returns>"OK" or an error</returns>
public string RestSetSimMethod(string request, string path, string param, public string RestSetSimMethod(string request, string path, string param,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
m_log.Info("Processing region update via REST method"); m_log.Info("Processing region update via REST method");
RegionProfileData theSim; RegionProfileData theSim;
theSim = m_gridDBService.GetRegion(new UUID(param)); theSim = m_gridDBService.GetRegion(new UUID(param));
if (theSim == null) if (theSim == null)
{ {
theSim = new RegionProfileData(); theSim = new RegionProfileData();
UUID UUID = new UUID(param); UUID UUID = new UUID(param);
theSim.UUID = UUID; theSim.UUID = UUID;
theSim.regionRecvKey = m_config.SimRecvKey; theSim.regionRecvKey = m_config.SimRecvKey;
} }
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.LoadXml(request); doc.LoadXml(request);
XmlNode rootnode = doc.FirstChild; XmlNode rootnode = doc.FirstChild;
XmlNode authkeynode = rootnode.ChildNodes[0]; XmlNode authkeynode = rootnode.ChildNodes[0];
if (authkeynode.Name != "authkey") if (authkeynode.Name != "authkey")
{ {
return "ERROR! bad XML - expected authkey tag"; return "ERROR! bad XML - expected authkey tag";
} }
XmlNode simnode = rootnode.ChildNodes[1]; XmlNode simnode = rootnode.ChildNodes[1];
if (simnode.Name != "sim") if (simnode.Name != "sim")
{ {
return "ERROR! bad XML - expected sim tag"; return "ERROR! bad XML - expected sim tag";
} }
//theSim.regionSendKey = Cfg; //theSim.regionSendKey = Cfg;
theSim.regionRecvKey = m_config.SimRecvKey; theSim.regionRecvKey = m_config.SimRecvKey;
theSim.regionSendKey = m_config.SimSendKey; theSim.regionSendKey = m_config.SimSendKey;
theSim.regionSecret = m_config.SimRecvKey; theSim.regionSecret = m_config.SimRecvKey;
theSim.regionDataURI = String.Empty; theSim.regionDataURI = String.Empty;
theSim.regionAssetURI = m_config.DefaultAssetServer; theSim.regionAssetURI = m_config.DefaultAssetServer;
theSim.regionAssetRecvKey = m_config.AssetRecvKey; theSim.regionAssetRecvKey = m_config.AssetRecvKey;
theSim.regionAssetSendKey = m_config.AssetSendKey; theSim.regionAssetSendKey = m_config.AssetSendKey;
theSim.regionUserURI = m_config.DefaultUserServer; theSim.regionUserURI = m_config.DefaultUserServer;
theSim.regionUserSendKey = m_config.UserSendKey; theSim.regionUserSendKey = m_config.UserSendKey;
theSim.regionUserRecvKey = m_config.UserRecvKey; theSim.regionUserRecvKey = m_config.UserRecvKey;
for (int i = 0; i < simnode.ChildNodes.Count; i++) for (int i = 0; i < simnode.ChildNodes.Count; i++)
{ {
switch (simnode.ChildNodes[i].Name) switch (simnode.ChildNodes[i].Name)
{ {
case "regionname": case "regionname":
theSim.regionName = simnode.ChildNodes[i].InnerText; theSim.regionName = simnode.ChildNodes[i].InnerText;
break; break;
case "sim_ip": case "sim_ip":
theSim.serverIP = simnode.ChildNodes[i].InnerText; theSim.serverIP = simnode.ChildNodes[i].InnerText;
break; break;
case "sim_port": case "sim_port":
theSim.serverPort = Convert.ToUInt32(simnode.ChildNodes[i].InnerText); theSim.serverPort = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
break; break;
case "region_locx": case "region_locx":
theSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); theSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize));
break; break;
case "region_locy": case "region_locy":
theSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); theSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize));
break; break;
} }
} }
theSim.serverURI = "http://" + theSim.serverIP + ":" + theSim.serverPort + "/"; theSim.serverURI = "http://" + theSim.serverIP + ":" + theSim.serverPort + "/";
bool requirePublic = false; bool requirePublic = false;
bool requireValid = true; bool requireValid = true;
if (requirePublic && if (requirePublic &&
(theSim.serverIP.StartsWith("172.16") || theSim.serverIP.StartsWith("192.168") || (theSim.serverIP.StartsWith("172.16") || theSim.serverIP.StartsWith("192.168") ||
theSim.serverIP.StartsWith("10.") || theSim.serverIP.StartsWith("0.") || theSim.serverIP.StartsWith("10.") || theSim.serverIP.StartsWith("0.") ||
theSim.serverIP.StartsWith("255."))) theSim.serverIP.StartsWith("255.")))
{ {
return "ERROR! Servers must register with public addresses."; return "ERROR! Servers must register with public addresses.";
} }
if (requireValid && (theSim.serverIP.StartsWith("0.") || theSim.serverIP.StartsWith("255."))) if (requireValid && (theSim.serverIP.StartsWith("0.") || theSim.serverIP.StartsWith("255.")))
{ {
return "ERROR! 0.*.*.* / 255.*.*.* Addresses are invalid, please check your server config and try again"; return "ERROR! 0.*.*.* / 255.*.*.* Addresses are invalid, please check your server config and try again";
} }
try try
{ {
m_log.Info("[DATA]: " + m_log.Info("[DATA]: " +
"Updating / adding via " + m_gridDBService.GetNumberOfPlugins() + " storage provider(s) registered."); "Updating / adding via " + m_gridDBService.GetNumberOfPlugins() + " storage provider(s) registered.");
return m_gridDBService.CheckReservations(theSim, authkeynode); return m_gridDBService.CheckReservations(theSim, authkeynode);
} }
catch (Exception e) catch (Exception e)
{ {
return "ERROR! Could not save to database! (" + e.ToString() + ")"; return "ERROR! Could not save to database! (" + e.ToString() + ")";
} }
} }
} }
} }

1770
OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
View File

File diff suppressed because it is too large Load Diff

426
OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
View File

@ -1,213 +1,213 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class MessageRegionModule : IMessageRegionService public class MessageRegionModule : IMessageRegionService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private MessageServerConfig m_cfg; private MessageServerConfig m_cfg;
private IMessageUserServerService m_userServerModule; private IMessageUserServerService m_userServerModule;
private IUGAIMCore m_messageCore; private IUGAIMCore m_messageCore;
// a dictionary of all current regions this server knows about // a dictionary of all current regions this server knows about
private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>(); private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();
public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore) public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore)
{ {
m_cfg = config; m_cfg = config;
m_messageCore = messageCore; m_messageCore = messageCore;
} }
public void Initialise() public void Initialise()
{ {
m_messageCore.RegisterInterface<IMessageRegionService>(this); m_messageCore.RegisterInterface<IMessageRegionService>(this);
} }
public void PostInitialise() public void PostInitialise()
{ {
IMessageUserServerService messageUserServer; IMessageUserServerService messageUserServer;
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer)) if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
{ {
m_userServerModule = messageUserServer; m_userServerModule = messageUserServer;
} }
} }
public void RegisterHandlers() public void RegisterHandlers()
{ {
//have these in separate method as some servers restart the http server and reregister all the handlers. //have these in separate method as some servers restart the http server and reregister all the handlers.
} }
/// <summary> /// <summary>
/// Gets and caches a RegionInfo object from the gridserver based on regionhandle /// Gets and caches a RegionInfo object from the gridserver based on regionhandle
/// if the regionhandle is already cached, use the cached values /// if the regionhandle is already cached, use the cached values
/// Gets called by lots of threads!!!!! /// Gets called by lots of threads!!!!!
/// </summary> /// </summary>
/// <param name="regionhandle">handle to the XY of the region we're looking for</param> /// <param name="regionhandle">handle to the XY of the region we're looking for</param>
/// <returns>A RegionInfo object to stick in the presence info</returns> /// <returns>A RegionInfo object to stick in the presence info</returns>
public RegionProfileData GetRegionInfo(ulong regionhandle) public RegionProfileData GetRegionInfo(ulong regionhandle)
{ {
RegionProfileData regionInfo = null; RegionProfileData regionInfo = null;
lock (m_regionInfoCache) lock (m_regionInfoCache)
{ {
m_regionInfoCache.TryGetValue(regionhandle, out regionInfo); m_regionInfoCache.TryGetValue(regionhandle, out regionInfo);
} }
if (regionInfo == null) // not found in cache if (regionInfo == null) // not found in cache
{ {
regionInfo = RequestRegionInfo(regionhandle); regionInfo = RequestRegionInfo(regionhandle);
if (regionInfo != null) // lookup was successful if (regionInfo != null) // lookup was successful
{ {
lock (m_regionInfoCache) lock (m_regionInfoCache)
{ {
m_regionInfoCache[regionhandle] = regionInfo; m_regionInfoCache[regionhandle] = regionInfo;
} }
} }
} }
return regionInfo; return regionInfo;
} }
public int ClearRegionCache() public int ClearRegionCache()
{ {
int cachecount = 0; int cachecount = 0;
lock (m_regionInfoCache) lock (m_regionInfoCache)
{ {
cachecount = m_regionInfoCache.Count; cachecount = m_regionInfoCache.Count;
m_regionInfoCache.Clear(); m_regionInfoCache.Clear();
} }
return cachecount; return cachecount;
} }
/// <summary> /// <summary>
/// Get RegionProfileData from the GridServer. /// Get RegionProfileData from the GridServer.
/// We'll cache this information in GetRegionInfo and use it for presence updates /// We'll cache this information in GetRegionInfo and use it for presence updates
/// </summary> /// </summary>
/// <param name="regionHandle"></param> /// <param name="regionHandle"></param>
/// <returns></returns> /// <returns></returns>
public RegionProfileData RequestRegionInfo(ulong regionHandle) public RegionProfileData RequestRegionInfo(ulong regionHandle)
{ {
RegionProfileData regionProfile = null; RegionProfileData regionProfile = null;
try try
{ {
Hashtable requestData = new Hashtable(); Hashtable requestData = new Hashtable();
requestData["region_handle"] = regionHandle.ToString(); requestData["region_handle"] = regionHandle.ToString();
requestData["authkey"] = m_cfg.GridSendKey; requestData["authkey"] = m_cfg.GridSendKey;
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(requestData); SendParams.Add(requestData);
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000); XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
Hashtable responseData = (Hashtable)GridResp.Value; Hashtable responseData = (Hashtable)GridResp.Value;
if (responseData.ContainsKey("error")) if (responseData.ContainsKey("error"))
{ {
m_log.Error("[GRID]: error received from grid server" + responseData["error"]); m_log.Error("[GRID]: error received from grid server" + responseData["error"]);
return null; return null;
} }
uint regX = Convert.ToUInt32((string)responseData["region_locx"]); uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
uint regY = Convert.ToUInt32((string)responseData["region_locy"]); uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
string internalIpStr = (string)responseData["sim_ip"]; string internalIpStr = (string)responseData["sim_ip"];
regionProfile = new RegionProfileData(); regionProfile = new RegionProfileData();
regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";
regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
regionProfile.regionLocX = regX; regionProfile.regionLocX = regX;
regionProfile.regionLocY = regY; regionProfile.regionLocY = regY;
regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
regionProfile.UUID = new UUID((string)responseData["region_UUID"]); regionProfile.UUID = new UUID((string)responseData["region_UUID"]);
regionProfile.regionName = (string)responseData["region_name"]; regionProfile.regionName = (string)responseData["region_name"];
} }
catch (WebException) catch (WebException)
{ {
m_log.Error("[GRID]: " + m_log.Error("[GRID]: " +
"Region lookup failed for: " + regionHandle.ToString() + "Region lookup failed for: " + regionHandle.ToString() +
" - Is the GridServer down?"); " - Is the GridServer down?");
} }
return regionProfile; return regionProfile;
} }
public XmlRpcResponse RegionStartup(XmlRpcRequest request) public XmlRpcResponse RegionStartup(XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable result = new Hashtable(); Hashtable result = new Hashtable();
result["success"] = "FALSE"; result["success"] = "FALSE";
if (m_userServerModule.SendToUserServer(requestData, "region_startup")) if (m_userServerModule.SendToUserServer(requestData, "region_startup"))
result["success"] = "TRUE"; result["success"] = "TRUE";
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
response.Value = result; response.Value = result;
return response; return response;
} }
public XmlRpcResponse RegionShutdown(XmlRpcRequest request) public XmlRpcResponse RegionShutdown(XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable result = new Hashtable(); Hashtable result = new Hashtable();
result["success"] = "FALSE"; result["success"] = "FALSE";
if (m_userServerModule.SendToUserServer(requestData, "region_shutdown")) if (m_userServerModule.SendToUserServer(requestData, "region_shutdown"))
result["success"] = "TRUE"; result["success"] = "TRUE";
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
response.Value = result; response.Value = result;
return response; return response;
} }
} }
} }

974
OpenSim/Grid/MessagingServer.Modules/MessageService.cs
View File

@ -1,488 +1,488 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
using Timer=System.Timers.Timer; using Timer=System.Timers.Timer;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class MessageService public class MessageService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private MessageServerConfig m_cfg; private MessageServerConfig m_cfg;
private UserDataBaseService m_userDataBaseService; private UserDataBaseService m_userDataBaseService;
private IUGAIMCore m_messageCore; private IUGAIMCore m_messageCore;
private IMessageUserServerService m_userServerModule; private IMessageUserServerService m_userServerModule;
private IMessageRegionService m_regionModule; private IMessageRegionService m_regionModule;
// a dictionary of all current presences this server knows about // a dictionary of all current presences this server knows about
private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>(); private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>();
public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService) public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService)
{ {
m_cfg = cfg; m_cfg = cfg;
m_messageCore = messageCore; m_messageCore = messageCore;
m_userDataBaseService = userDataBaseService; m_userDataBaseService = userDataBaseService;
//??? //???
UserConfig uc = new UserConfig(); UserConfig uc = new UserConfig();
uc.DatabaseConnect = cfg.DatabaseConnect; uc.DatabaseConnect = cfg.DatabaseConnect;
uc.DatabaseProvider = cfg.DatabaseProvider; uc.DatabaseProvider = cfg.DatabaseProvider;
} }
public void Initialise() public void Initialise()
{ {
} }
public void PostInitialise() public void PostInitialise()
{ {
IMessageUserServerService messageUserServer; IMessageUserServerService messageUserServer;
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer)) if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
{ {
m_userServerModule = messageUserServer; m_userServerModule = messageUserServer;
} }
IMessageRegionService messageRegion; IMessageRegionService messageRegion;
if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion)) if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion))
{ {
m_regionModule = messageRegion; m_regionModule = messageRegion;
} }
} }
public void RegisterHandlers() public void RegisterHandlers()
{ {
//have these in separate method as some servers restart the http server and reregister all the handlers. //have these in separate method as some servers restart the http server and reregister all the handlers.
} }
#region FriendList Methods #region FriendList Methods
/// <summary> /// <summary>
/// Process Friendlist subscriptions for a user /// Process Friendlist subscriptions for a user
/// The login method calls this for a User /// The login method calls this for a User
/// </summary> /// </summary>
/// <param name="userpresence">The Agent we're processing the friendlist subscriptions for</param> /// <param name="userpresence">The Agent we're processing the friendlist subscriptions for</param>
private void ProcessFriendListSubscriptions(UserPresenceData userpresence) private void ProcessFriendListSubscriptions(UserPresenceData userpresence)
{ {
lock (m_presences) lock (m_presences)
{ {
m_presences[userpresence.agentData.AgentID] = userpresence; m_presences[userpresence.agentData.AgentID] = userpresence;
} }
Dictionary<UUID, FriendListItem> uFriendList = userpresence.friendData; Dictionary<UUID, FriendListItem> uFriendList = userpresence.friendData;
foreach (KeyValuePair<UUID, FriendListItem> pair in uFriendList) foreach (KeyValuePair<UUID, FriendListItem> pair in uFriendList)
{ {
UserPresenceData friendup = null; UserPresenceData friendup = null;
lock (m_presences) lock (m_presences)
{ {
m_presences.TryGetValue(pair.Key, out friendup); m_presences.TryGetValue(pair.Key, out friendup);
} }
if (friendup != null) if (friendup != null)
{ {
SubscribeToPresenceUpdates(userpresence, friendup, pair.Value); SubscribeToPresenceUpdates(userpresence, friendup, pair.Value);
} }
} }
} }
/// <summary> /// <summary>
/// Enqueues a presence update, sending info about user 'talkingAbout' to user 'receiver'. /// Enqueues a presence update, sending info about user 'talkingAbout' to user 'receiver'.
/// </summary> /// </summary>
/// <param name="talkingAbout">We are sending presence information about this user.</param> /// <param name="talkingAbout">We are sending presence information about this user.</param>
/// <param name="receiver">We are sending the presence update to this user</param> /// <param name="receiver">We are sending the presence update to this user</param>
private void enqueuePresenceUpdate(UserPresenceData talkingAbout, UserPresenceData receiver) private void enqueuePresenceUpdate(UserPresenceData talkingAbout, UserPresenceData receiver)
{ {
UserAgentData p2Handle = m_userDataBaseService.GetUserAgentData(receiver.agentData.AgentID); UserAgentData p2Handle = m_userDataBaseService.GetUserAgentData(receiver.agentData.AgentID);
if (p2Handle != null) if (p2Handle != null)
{ {
if (receiver.lookupUserRegionYN) if (receiver.lookupUserRegionYN)
{ {
receiver.regionData.regionHandle = p2Handle.Handle; receiver.regionData.regionHandle = p2Handle.Handle;
} }
else else
{ {
receiver.lookupUserRegionYN = true; // TODO Huh? receiver.lookupUserRegionYN = true; // TODO Huh?
} }
PresenceInformer friendlistupdater = new PresenceInformer(); PresenceInformer friendlistupdater = new PresenceInformer();
friendlistupdater.presence1 = talkingAbout; friendlistupdater.presence1 = talkingAbout;
friendlistupdater.presence2 = receiver; friendlistupdater.presence2 = receiver;
friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo; friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo;
friendlistupdater.OnDone += PresenceUpdateDone; friendlistupdater.OnDone += PresenceUpdateDone;
WaitCallback cb = new WaitCallback(friendlistupdater.go); WaitCallback cb = new WaitCallback(friendlistupdater.go);
ThreadPool.QueueUserWorkItem(cb); ThreadPool.QueueUserWorkItem(cb);
} }
else else
{ {
m_log.WarnFormat("no data found for user {0}", receiver.agentData.AgentID); m_log.WarnFormat("no data found for user {0}", receiver.agentData.AgentID);
// Skip because we can't find any data on the user // Skip because we can't find any data on the user
} }
} }
/// <summary> /// <summary>
/// Does the necessary work to subscribe one agent to another's presence notifications /// Does the necessary work to subscribe one agent to another's presence notifications
/// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly /// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly
/// unless you know what you're doing /// unless you know what you're doing
/// </summary> /// </summary>
/// <param name="userpresence">P1</param> /// <param name="userpresence">P1</param>
/// <param name="friendpresence">P2</param> /// <param name="friendpresence">P2</param>
/// <param name="uFriendListItem"></param> /// <param name="uFriendListItem"></param>
private void SubscribeToPresenceUpdates(UserPresenceData userpresence, private void SubscribeToPresenceUpdates(UserPresenceData userpresence,
UserPresenceData friendpresence, UserPresenceData friendpresence,
FriendListItem uFriendListItem) FriendListItem uFriendListItem)
{ {
// Can the friend see me online? // Can the friend see me online?
if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0) if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
{ {
// tell user to update friend about user's presence changes // tell user to update friend about user's presence changes
if (!userpresence.subscriptionData.Contains(friendpresence.agentData.AgentID)) if (!userpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))
{ {
userpresence.subscriptionData.Add(friendpresence.agentData.AgentID); userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);
} }
// send an update about user's presence to the friend // send an update about user's presence to the friend
enqueuePresenceUpdate(userpresence, friendpresence); enqueuePresenceUpdate(userpresence, friendpresence);
} }
// Can I see the friend online? // Can I see the friend online?
if ((uFriendListItem.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0) if ((uFriendListItem.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0)
{ {
// tell friend to update user about friend's presence changes // tell friend to update user about friend's presence changes
if (!friendpresence.subscriptionData.Contains(userpresence.agentData.AgentID)) if (!friendpresence.subscriptionData.Contains(userpresence.agentData.AgentID))
{ {
friendpresence.subscriptionData.Add(userpresence.agentData.AgentID); friendpresence.subscriptionData.Add(userpresence.agentData.AgentID);
} }
// send an update about friend's presence to user. // send an update about friend's presence to user.
enqueuePresenceUpdate(friendpresence, userpresence); enqueuePresenceUpdate(friendpresence, userpresence);
} }
} }
/// <summary> /// <summary>
/// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications /// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications
/// </summary> /// </summary>
/// <param name="AgentID"></param> /// <param name="AgentID"></param>
private void ProcessLogOff(UUID AgentID) private void ProcessLogOff(UUID AgentID)
{ {
m_log.Info("[LOGOFF]: Processing Logoff"); m_log.Info("[LOGOFF]: Processing Logoff");
UserPresenceData userPresence = null; UserPresenceData userPresence = null;
lock (m_presences) lock (m_presences)
{ {
m_presences.TryGetValue(AgentID, out userPresence); m_presences.TryGetValue(AgentID, out userPresence);
} }
if (userPresence != null) // found the user if (userPresence != null) // found the user
{ {
List<UUID> AgentsNeedingNotification = userPresence.subscriptionData; List<UUID> AgentsNeedingNotification = userPresence.subscriptionData;
userPresence.OnlineYN = false; userPresence.OnlineYN = false;
for (int i = 0; i < AgentsNeedingNotification.Count; i++) for (int i = 0; i < AgentsNeedingNotification.Count; i++)
{ {
UserPresenceData friendPresence = null; UserPresenceData friendPresence = null;
lock (m_presences) lock (m_presences)
{ {
m_presences.TryGetValue(AgentsNeedingNotification[i], out friendPresence); m_presences.TryGetValue(AgentsNeedingNotification[i], out friendPresence);
} }
// This might need to be enumerated and checked before we try to remove it. // This might need to be enumerated and checked before we try to remove it.
if (friendPresence != null) if (friendPresence != null)
{ {
lock (friendPresence) lock (friendPresence)
{ {
// no updates for this user anymore // no updates for this user anymore
friendPresence.subscriptionData.Remove(AgentID); friendPresence.subscriptionData.Remove(AgentID);
// set user's entry in the friend's list to offline (if it exists) // set user's entry in the friend's list to offline (if it exists)
if (friendPresence.friendData.ContainsKey(AgentID)) if (friendPresence.friendData.ContainsKey(AgentID))
{ {
friendPresence.friendData[AgentID].onlinestatus = false; friendPresence.friendData[AgentID].onlinestatus = false;
} }
} }
enqueuePresenceUpdate(userPresence, friendPresence); enqueuePresenceUpdate(userPresence, friendPresence);
} }
} }
} }
} }
#endregion #endregion
private void PresenceUpdateDone(PresenceInformer obj) private void PresenceUpdateDone(PresenceInformer obj)
{ {
obj.OnGetRegionData -= m_regionModule.GetRegionInfo; obj.OnGetRegionData -= m_regionModule.GetRegionInfo;
obj.OnDone -= PresenceUpdateDone; obj.OnDone -= PresenceUpdateDone;
} }
#region UserServer Comms #region UserServer Comms
/// <summary> /// <summary>
/// Returns a list of FriendsListItems that describe the friends and permissions in the friend /// Returns a list of FriendsListItems that describe the friends and permissions in the friend
/// relationship for UUID friendslistowner. For faster lookup, we index by friend's UUID. /// relationship for UUID friendslistowner. For faster lookup, we index by friend's UUID.
/// </summary> /// </summary>
/// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param> /// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param>
private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner) private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner)
{ {
Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>(); Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
try try
{ {
Hashtable param = new Hashtable(); Hashtable param = new Hashtable();
param["ownerID"] = friendlistowner.ToString(); param["ownerID"] = friendlistowner.ToString();
IList parameters = new ArrayList(); IList parameters = new ArrayList();
parameters.Add(param); parameters.Add(param);
XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters); XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000); XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
Hashtable respData = (Hashtable)resp.Value; Hashtable respData = (Hashtable)resp.Value;
if (respData.Contains("avcount")) if (respData.Contains("avcount"))
{ {
buddies = ConvertXMLRPCDataToFriendListItemList(respData); buddies = ConvertXMLRPCDataToFriendListItemList(respData);
} }
} }
catch (WebException e) catch (WebException e)
{ {
m_log.Warn("Error when trying to fetch Avatar's friends list: " + m_log.Warn("Error when trying to fetch Avatar's friends list: " +
e.Message); e.Message);
// Return Empty list (no friends) // Return Empty list (no friends)
} }
return buddies; return buddies;
} }
/// <summary> /// <summary>
/// Converts XMLRPC Friend List to FriendListItem Object /// Converts XMLRPC Friend List to FriendListItem Object
/// </summary> /// </summary>
/// <param name="data">XMLRPC response data Hashtable</param> /// <param name="data">XMLRPC response data Hashtable</param>
/// <returns></returns> /// <returns></returns>
public Dictionary<UUID, FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data) public Dictionary<UUID, FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)
{ {
Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>(); Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
int buddycount = Convert.ToInt32((string)data["avcount"]); int buddycount = Convert.ToInt32((string)data["avcount"]);
for (int i = 0; i < buddycount; i++) for (int i = 0; i < buddycount; i++)
{ {
FriendListItem buddylistitem = new FriendListItem(); FriendListItem buddylistitem = new FriendListItem();
buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]); buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]); buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]); buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]); buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
buddies.Add(buddylistitem.Friend, buddylistitem); buddies.Add(buddylistitem.Friend, buddylistitem);
} }
return buddies; return buddies;
} }
/// <summary> /// <summary>
/// UserServer sends an expect_user method /// UserServer sends an expect_user method
/// this handles the method and provisions the /// this handles the method and provisions the
/// necessary info for presence to work /// necessary info for presence to work
/// </summary> /// </summary>
/// <param name="request">UserServer Data</param> /// <param name="request">UserServer Data</param>
/// <returns></returns> /// <returns></returns>
public XmlRpcResponse UserLoggedOn(XmlRpcRequest request) public XmlRpcResponse UserLoggedOn(XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
AgentCircuitData agentData = new AgentCircuitData(); AgentCircuitData agentData = new AgentCircuitData();
agentData.SessionID = new UUID((string)requestData["sessionid"]); agentData.SessionID = new UUID((string)requestData["sessionid"]);
agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]); agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
agentData.firstname = (string)requestData["firstname"]; agentData.firstname = (string)requestData["firstname"];
agentData.lastname = (string)requestData["lastname"]; agentData.lastname = (string)requestData["lastname"];
agentData.AgentID = new UUID((string)requestData["agentid"]); agentData.AgentID = new UUID((string)requestData["agentid"]);
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
agentData.CapsPath = (string)requestData["caps_path"]; agentData.CapsPath = (string)requestData["caps_path"];
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
{ {
agentData.child = true; agentData.child = true;
} }
else else
{ {
agentData.startpos = agentData.startpos =
new Vector3(Convert.ToSingle(requestData["positionx"]), new Vector3(Convert.ToSingle(requestData["positionx"]),
Convert.ToSingle(requestData["positiony"]), Convert.ToSingle(requestData["positiony"]),
Convert.ToSingle(requestData["positionz"])); Convert.ToSingle(requestData["positionz"]));
agentData.child = false; agentData.child = false;
} }
ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]); ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user", m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root"); agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
UserPresenceData up = new UserPresenceData(); UserPresenceData up = new UserPresenceData();
up.agentData = agentData; up.agentData = agentData;
up.friendData = GetUserFriendList(agentData.AgentID); up.friendData = GetUserFriendList(agentData.AgentID);
up.regionData = m_regionModule.GetRegionInfo(regionHandle); up.regionData = m_regionModule.GetRegionInfo(regionHandle);
up.OnlineYN = true; up.OnlineYN = true;
up.lookupUserRegionYN = false; up.lookupUserRegionYN = false;
ProcessFriendListSubscriptions(up); ProcessFriendListSubscriptions(up);
return new XmlRpcResponse(); return new XmlRpcResponse();
} }
/// <summary> /// <summary>
/// The UserServer got a Logoff message /// The UserServer got a Logoff message
/// Cleanup time for that user. Send out presence notifications /// Cleanup time for that user. Send out presence notifications
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
public XmlRpcResponse UserLoggedOff(XmlRpcRequest request) public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)
{ {
m_log.Info("[USERLOGOFF]: User logged off called"); m_log.Info("[USERLOGOFF]: User logged off called");
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
UUID AgentID = new UUID((string)requestData["agentid"]); UUID AgentID = new UUID((string)requestData["agentid"]);
ProcessLogOff(AgentID); ProcessLogOff(AgentID);
return new XmlRpcResponse(); return new XmlRpcResponse();
} }
#endregion #endregion
public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request) public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request)
{ {
Hashtable paramHash = (Hashtable)request.Params[0]; Hashtable paramHash = (Hashtable)request.Params[0];
Hashtable result = new Hashtable(); Hashtable result = new Hashtable();
// TODO check access (recv_key/send_key) // TODO check access (recv_key/send_key)
IList list = (IList)paramHash["uuids"]; IList list = (IList)paramHash["uuids"];
// convert into List<UUID> // convert into List<UUID>
List<UUID> uuids = new List<UUID>(); List<UUID> uuids = new List<UUID>();
for (int i = 0; i < list.Count; ++i) for (int i = 0; i < list.Count; ++i)
{ {
UUID uuid; UUID uuid;
if (UUID.TryParse((string)list[i], out uuid)) if (UUID.TryParse((string)list[i], out uuid))
{ {
uuids.Add(uuid); uuids.Add(uuid);
} }
} }
try { try {
Dictionary<UUID, FriendRegionInfo> infos = m_userDataBaseService.GetFriendRegionInfos(uuids); Dictionary<UUID, FriendRegionInfo> infos = m_userDataBaseService.GetFriendRegionInfos(uuids);
m_log.DebugFormat("[FRIEND]: Got {0} region entries back.", infos.Count); m_log.DebugFormat("[FRIEND]: Got {0} region entries back.", infos.Count);
int count = 0; int count = 0;
foreach (KeyValuePair<UUID, FriendRegionInfo> pair in infos) foreach (KeyValuePair<UUID, FriendRegionInfo> pair in infos)
{ {
result["uuid_" + count] = pair.Key.ToString(); result["uuid_" + count] = pair.Key.ToString();
result["isOnline_" + count] = pair.Value.isOnline; result["isOnline_" + count] = pair.Value.isOnline;
result["regionHandle_" + count] = pair.Value.regionHandle.ToString(); // XML-RPC doesn't know ulongs result["regionHandle_" + count] = pair.Value.regionHandle.ToString(); // XML-RPC doesn't know ulongs
++count; ++count;
} }
result["count"] = count; result["count"] = count;
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
response.Value = result; response.Value = result;
return response; return response;
} }
catch(Exception e) { catch(Exception e) {
m_log.Error("Got exception:", e); m_log.Error("Got exception:", e);
throw e; throw e;
} }
} }
public XmlRpcResponse AgentLocation(XmlRpcRequest request) public XmlRpcResponse AgentLocation(XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable result = new Hashtable(); Hashtable result = new Hashtable();
result["success"] = "FALSE"; result["success"] = "FALSE";
if (m_userServerModule.SendToUserServer(requestData, "agent_location")) if (m_userServerModule.SendToUserServer(requestData, "agent_location"))
result["success"] = "TRUE"; result["success"] = "TRUE";
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
response.Value = result; response.Value = result;
return response; return response;
} }
public XmlRpcResponse AgentLeaving(XmlRpcRequest request) public XmlRpcResponse AgentLeaving(XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable result = new Hashtable(); Hashtable result = new Hashtable();
result["success"] = "FALSE"; result["success"] = "FALSE";
if (m_userServerModule.SendToUserServer(requestData, "agent_leaving")) if (m_userServerModule.SendToUserServer(requestData, "agent_leaving"))
result["success"] = "TRUE"; result["success"] = "TRUE";
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
response.Value = result; response.Value = result;
return response; return response;
} }
public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request) public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable result = new Hashtable(); Hashtable result = new Hashtable();
result["success"] = "FALSE"; result["success"] = "FALSE";
UUID regionID; UUID regionID;
if (UUID.TryParse((string)requestData["regionid"], out regionID)) if (UUID.TryParse((string)requestData["regionid"], out regionID))
{ {
m_log.DebugFormat("[PRESENCE] Processing region restart for {0}", regionID); m_log.DebugFormat("[PRESENCE] Processing region restart for {0}", regionID);
result["success"] = "TRUE"; result["success"] = "TRUE";
foreach (UserPresenceData up in m_presences.Values) foreach (UserPresenceData up in m_presences.Values)
{ {
if (up.regionData.UUID == regionID) if (up.regionData.UUID == regionID)
{ {
if (up.OnlineYN) if (up.OnlineYN)
{ {
m_log.DebugFormat("[PRESENCE] Logging off {0} because the region they were in has gone", up.agentData.AgentID); m_log.DebugFormat("[PRESENCE] Logging off {0} because the region they were in has gone", up.agentData.AgentID);
ProcessLogOff(up.agentData.AgentID); ProcessLogOff(up.agentData.AgentID);
} }
} }
} }
} }
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
response.Value = result; response.Value = result;
return response; return response;
} }
} }
} }

372
OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs
View File

@ -1,186 +1,186 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class MessageUserServerModule : IMessageUserServerService public class MessageUserServerModule : IMessageUserServerService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private MessageServerConfig m_cfg; private MessageServerConfig m_cfg;
private IUGAIMCore m_messageCore; private IUGAIMCore m_messageCore;
private Timer reconnectTimer = new Timer(300000); // 5 mins private Timer reconnectTimer = new Timer(300000); // 5 mins
public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore) public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore)
{ {
m_cfg = config; m_cfg = config;
m_messageCore = messageCore; m_messageCore = messageCore;
reconnectTimer.Elapsed += registerWithUserServer; reconnectTimer.Elapsed += registerWithUserServer;
reconnectTimer.Start(); reconnectTimer.Start();
} }
public void Initialise() public void Initialise()
{ {
m_messageCore.RegisterInterface<IMessageUserServerService>(this); m_messageCore.RegisterInterface<IMessageUserServerService>(this);
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers() public void RegisterHandlers()
{ {
//have these in separate method as some servers restart the http server and reregister all the handlers. //have these in separate method as some servers restart the http server and reregister all the handlers.
} }
public void registerWithUserServer(object sender, ElapsedEventArgs e) public void registerWithUserServer(object sender, ElapsedEventArgs e)
{ {
registerWithUserServer(); registerWithUserServer();
} }
public bool registerWithUserServer() public bool registerWithUserServer()
{ {
Hashtable UserParams = new Hashtable(); Hashtable UserParams = new Hashtable();
// Login / Authentication // Login / Authentication
if (m_cfg.HttpSSL) if (m_cfg.HttpSSL)
{ {
UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
else else
{ {
UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
UserParams["recvkey"] = m_cfg.UserRecvKey; UserParams["recvkey"] = m_cfg.UserRecvKey;
UserParams["sendkey"] = m_cfg.UserRecvKey; UserParams["sendkey"] = m_cfg.UserRecvKey;
// Package into an XMLRPC Request // Package into an XMLRPC Request
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(UserParams); SendParams.Add(UserParams);
bool success = true; bool success = true;
string[] servers = m_cfg.UserServerURL.Split(' '); string[] servers = m_cfg.UserServerURL.Split(' ');
foreach (string srv in servers) foreach (string srv in servers)
{ {
// Send Request // Send Request
try try
{ {
XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams); XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
XmlRpcResponse UserResp = UserReq.Send(srv, 16000); XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
// Process Response // Process Response
Hashtable GridRespData = (Hashtable)UserResp.Value; Hashtable GridRespData = (Hashtable)UserResp.Value;
// if we got a response, we were successful // if we got a response, we were successful
if (!GridRespData.ContainsKey("responsestring")) if (!GridRespData.ContainsKey("responsestring"))
success = false; success = false;
else else
m_log.InfoFormat("[SERVER] Registered with {0}", srv); m_log.InfoFormat("[SERVER] Registered with {0}", srv);
} }
catch catch
{ {
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
success = false; success = false;
} }
} }
return success; return success;
} }
public bool deregisterWithUserServer() public bool deregisterWithUserServer()
{ {
Hashtable request = new Hashtable(); Hashtable request = new Hashtable();
return SendToUserServer(request, "deregister_messageserver"); return SendToUserServer(request, "deregister_messageserver");
} }
public bool SendToUserServer(Hashtable request, string method) public bool SendToUserServer(Hashtable request, string method)
{ {
// Login / Authentication // Login / Authentication
if (m_cfg.HttpSSL) if (m_cfg.HttpSSL)
{ {
request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
else else
{ {
request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
request["recvkey"] = m_cfg.UserRecvKey; request["recvkey"] = m_cfg.UserRecvKey;
request["sendkey"] = m_cfg.UserRecvKey; request["sendkey"] = m_cfg.UserRecvKey;
// Package into an XMLRPC Request // Package into an XMLRPC Request
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(request); SendParams.Add(request);
bool success = true; bool success = true;
string[] servers = m_cfg.UserServerURL.Split(' '); string[] servers = m_cfg.UserServerURL.Split(' ');
// Send Request // Send Request
foreach (string srv in servers) foreach (string srv in servers)
{ {
try try
{ {
XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams); XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);
XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000); XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);
// Process Response // Process Response
Hashtable UserRespData = (Hashtable)UserResp.Value; Hashtable UserRespData = (Hashtable)UserResp.Value;
// if we got a response, we were successful // if we got a response, we were successful
if (!UserRespData.ContainsKey("responsestring")) if (!UserRespData.ContainsKey("responsestring"))
success = false; success = false;
} }
catch catch
{ {
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
success = false; success = false;
} }
} }
return success; return success;
} }
} }
} }

192
OpenSim/Grid/MessagingServer.Modules/PresenceBackreferenceEntry.cs
View File

@ -1,96 +1,96 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
// This is a wrapper for a List<UUID> so it can be happily stored in a hashtable. // This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.
public class PresenceBackreferenceEntry public class PresenceBackreferenceEntry
{ {
List<UUID> AgentList = new List<UUID>(); List<UUID> AgentList = new List<UUID>();
public PresenceBackreferenceEntry() public PresenceBackreferenceEntry()
{ {
} }
public void Add(UUID item) public void Add(UUID item)
{ {
lock (AgentList) lock (AgentList)
{ {
AgentList.Add(item); AgentList.Add(item);
} }
} }
public UUID getitem(int index) public UUID getitem(int index)
{ {
UUID result = UUID.Zero; UUID result = UUID.Zero;
lock (AgentList) lock (AgentList)
{ {
if (index > 0 && index < AgentList.Count) if (index > 0 && index < AgentList.Count)
{ {
result = AgentList[index]; result = AgentList[index];
} }
} }
return result; return result;
} }
public int Count public int Count
{ {
get get
{ {
int count = 0; int count = 0;
lock (AgentList) lock (AgentList)
{ {
count = AgentList.Count; count = AgentList.Count;
} }
return count; return count;
} }
} }
public void Remove(UUID item) public void Remove(UUID item)
{ {
lock (AgentList) lock (AgentList)
{ {
if (AgentList.Contains(item)) if (AgentList.Contains(item))
AgentList.Remove(item); AgentList.Remove(item);
} }
} }
public bool contains(UUID item) public bool contains(UUID item)
{ {
bool result = false; bool result = false;
lock (AgentList) lock (AgentList)
{ {
result = AgentList.Contains(item); result = AgentList.Contains(item);
} }
return result; return result;
} }
} }
} }

270
OpenSim/Grid/MessagingServer.Modules/PresenceInformer.cs
View File

@ -1,135 +1,135 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System.Collections; using System.Collections;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Data; using OpenSim.Data;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public delegate RegionProfileData GetRegionData(ulong region_handle); public delegate RegionProfileData GetRegionData(ulong region_handle);
public delegate void Done(PresenceInformer obj); public delegate void Done(PresenceInformer obj);
public class PresenceInformer public class PresenceInformer
{ {
public event GetRegionData OnGetRegionData; public event GetRegionData OnGetRegionData;
public event Done OnDone; public event Done OnDone;
private GetRegionData handlerGetRegionData = null; private GetRegionData handlerGetRegionData = null;
private Done handlerDone = null; private Done handlerDone = null;
public UserPresenceData presence1 = null; public UserPresenceData presence1 = null;
public UserPresenceData presence2 = null; public UserPresenceData presence2 = null;
public string gridserverurl, gridserversendkey, gridserverrecvkey; public string gridserverurl, gridserversendkey, gridserverrecvkey;
public bool lookupRegion = true; public bool lookupRegion = true;
//public methodGroup //public methodGroup
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public PresenceInformer() public PresenceInformer()
{ {
} }
public void go(object o) public void go(object o)
{ {
if (presence1 != null && presence2 != null) if (presence1 != null && presence2 != null)
{ {
SendRegionPresenceUpdate(presence1, presence2); SendRegionPresenceUpdate(presence1, presence2);
} }
} }
/// <summary> /// <summary>
/// Informs a region about an Agent /// Informs a region about an Agent
/// </summary> /// </summary>
/// <param name="TalkingAbout">User to talk about</param> /// <param name="TalkingAbout">User to talk about</param>
/// <param name="UserToUpdate">User we're sending this too (contains the region)</param> /// <param name="UserToUpdate">User we're sending this too (contains the region)</param>
public void SendRegionPresenceUpdate(UserPresenceData TalkingAbout, UserPresenceData UserToUpdate) public void SendRegionPresenceUpdate(UserPresenceData TalkingAbout, UserPresenceData UserToUpdate)
{ {
// TODO: Fill in pertenant Presence Data from 'TalkingAbout' // TODO: Fill in pertenant Presence Data from 'TalkingAbout'
RegionProfileData whichRegion = new RegionProfileData(); RegionProfileData whichRegion = new RegionProfileData();
if (lookupRegion) if (lookupRegion)
{ {
handlerGetRegionData = OnGetRegionData; handlerGetRegionData = OnGetRegionData;
if (handlerGetRegionData != null) if (handlerGetRegionData != null)
{ {
whichRegion = handlerGetRegionData(UserToUpdate.regionData.regionHandle); whichRegion = handlerGetRegionData(UserToUpdate.regionData.regionHandle);
} }
//RegionProfileData rp = RegionProfileData.RequestSimProfileData(UserToUpdate.regionData.regionHandle, gridserverurl, gridserversendkey, gridserverrecvkey); //RegionProfileData rp = RegionProfileData.RequestSimProfileData(UserToUpdate.regionData.regionHandle, gridserverurl, gridserversendkey, gridserverrecvkey);
//whichRegion = rp; //whichRegion = rp;
} }
else else
{ {
whichRegion = UserToUpdate.regionData; whichRegion = UserToUpdate.regionData;
} }
//whichRegion.httpServerURI //whichRegion.httpServerURI
if (whichRegion != null) if (whichRegion != null)
{ {
Hashtable PresenceParams = new Hashtable(); Hashtable PresenceParams = new Hashtable();
PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString()); PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString());
PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString()); PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());
if (TalkingAbout.OnlineYN) if (TalkingAbout.OnlineYN)
PresenceParams.Add("status","TRUE"); PresenceParams.Add("status","TRUE");
else else
PresenceParams.Add("status","FALSE"); PresenceParams.Add("status","FALSE");
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(PresenceParams); SendParams.Add(PresenceParams);
m_log.InfoFormat("[PRESENCE]: Informing {0}@{1} at {2} about {3}", TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname, whichRegion.regionName, whichRegion.httpServerURI, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname); m_log.InfoFormat("[PRESENCE]: Informing {0}@{1} at {2} about {3}", TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname, whichRegion.regionName, whichRegion.httpServerURI, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname);
// Send // Send
XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams); XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams);
try try
{ {
// XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000); // XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
RegionReq.Send(whichRegion.httpServerURI, 6000); RegionReq.Send(whichRegion.httpServerURI, 6000);
} }
catch (WebException) catch (WebException)
{ {
m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname); m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname);
} }
} }
else else
{ {
m_log.Info("[PRESENCEUPDATER]: Region data was null skipping"); m_log.Info("[PRESENCEUPDATER]: Region data was null skipping");
} }
handlerDone = OnDone; handlerDone = OnDone;
if (handlerDone != null) if (handlerDone != null)
{ {
handlerDone(this); handlerDone(this);
} }
} }
} }
} }

66
OpenSim/Grid/MessagingServer.Modules/PresenceService.cs
View File

@ -1,33 +1,33 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
class PresenceService class PresenceService
{ {
} }
} }

150
OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
View File

@ -1,75 +1,75 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class UserDataBaseService : UserManagerBase public class UserDataBaseService : UserManagerBase
{ {
/// <summary> /// <summary>
/// Constructor. /// Constructor.
/// </summary> /// </summary>
/// Passing null to parent because we never use any function that requires an interservice inventory call. /// Passing null to parent because we never use any function that requires an interservice inventory call.
public UserDataBaseService() public UserDataBaseService()
: base(null) : base(null)
{ {
} }
public UserAgentData GetUserAgentData(UUID AgentID) public UserAgentData GetUserAgentData(UUID AgentID)
{ {
UserProfileData userProfile = GetUserProfile(AgentID); UserProfileData userProfile = GetUserProfile(AgentID);
if (userProfile != null) if (userProfile != null)
{ {
return userProfile.CurrentAgent; return userProfile.CurrentAgent;
} }
return null; return null;
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName) public override UserProfileData SetupMasterUser(string firstName, string lastName)
{ {
//throw new Exception("The method or operation is not implemented."); //throw new Exception("The method or operation is not implemented.");
return null; return null;
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
{ {
//throw new Exception("The method or operation is not implemented."); //throw new Exception("The method or operation is not implemented.");
return null; return null;
} }
public override UserProfileData SetupMasterUser(UUID uuid) public override UserProfileData SetupMasterUser(UUID uuid)
{ {
//throw new Exception("The method or operation is not implemented."); //throw new Exception("The method or operation is not implemented.");
return null; return null;
} }
} }
} }

100
OpenSim/Grid/MessagingServer.Modules/UserPresenceData.cs
View File

@ -1,50 +1,50 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Grid.MessagingServer namespace OpenSim.Grid.MessagingServer
{ {
public class UserPresenceData public class UserPresenceData
{ {
public AgentCircuitData agentData = new AgentCircuitData(); public AgentCircuitData agentData = new AgentCircuitData();
public RegionProfileData regionData = new RegionProfileData(); public RegionProfileData regionData = new RegionProfileData();
public string httpURI = String.Empty; public string httpURI = String.Empty;
public Dictionary<UUID, FriendListItem> friendData = new Dictionary<UUID,FriendListItem>(); public Dictionary<UUID, FriendListItem> friendData = new Dictionary<UUID,FriendListItem>();
public List<UUID> subscriptionData = new List<UUID>(); public List<UUID> subscriptionData = new List<UUID>();
public bool OnlineYN = true; public bool OnlineYN = true;
public bool lookupUserRegionYN = true; public bool lookupUserRegionYN = true;
public UserPresenceData() public UserPresenceData()
{ {
} }
} }
} }

66
OpenSim/Grid/MessagingServer.Modules/WorkUnitBase.cs
View File

@ -1,33 +1,33 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class WorkUnitBase public class WorkUnitBase
{ {
} }
} }

66
OpenSim/Grid/MessagingServer.Modules/WorkUnitPresenceUpdate.cs
View File

@ -1,33 +1,33 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class WorkUnitPresenceUpdate : WorkUnitBase public class WorkUnitPresenceUpdate : WorkUnitBase
{ {
} }
} }

1018
OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
View File

File diff suppressed because it is too large Load Diff

674
OpenSim/Grid/UserServer.Modules/OpenIdService.cs
View File

@ -1,337 +1,337 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Web; using System.Web;
using DotNetOpenId; using DotNetOpenId;
using DotNetOpenId.Provider; using DotNetOpenId.Provider;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.UserServer.Modules namespace OpenSim.Grid.UserServer.Modules
{ {
/// <summary> /// <summary>
/// Temporary, in-memory store for OpenID associations /// Temporary, in-memory store for OpenID associations
/// </summary> /// </summary>
public class ProviderMemoryStore : IAssociationStore<AssociationRelyingPartyType> public class ProviderMemoryStore : IAssociationStore<AssociationRelyingPartyType>
{ {
private class AssociationItem private class AssociationItem
{ {
public AssociationRelyingPartyType DistinguishingFactor; public AssociationRelyingPartyType DistinguishingFactor;
public string Handle; public string Handle;
public DateTime Expires; public DateTime Expires;
public byte[] PrivateData; public byte[] PrivateData;
} }
Dictionary<string, AssociationItem> m_store = new Dictionary<string, AssociationItem>(); Dictionary<string, AssociationItem> m_store = new Dictionary<string, AssociationItem>();
SortedList<DateTime, AssociationItem> m_sortedStore = new SortedList<DateTime, AssociationItem>(); SortedList<DateTime, AssociationItem> m_sortedStore = new SortedList<DateTime, AssociationItem>();
object m_syncRoot = new object(); object m_syncRoot = new object();
#region IAssociationStore<AssociationRelyingPartyType> Members #region IAssociationStore<AssociationRelyingPartyType> Members
public void StoreAssociation(AssociationRelyingPartyType distinguishingFactor, Association assoc) public void StoreAssociation(AssociationRelyingPartyType distinguishingFactor, Association assoc)
{ {
AssociationItem item = new AssociationItem(); AssociationItem item = new AssociationItem();
item.DistinguishingFactor = distinguishingFactor; item.DistinguishingFactor = distinguishingFactor;
item.Handle = assoc.Handle; item.Handle = assoc.Handle;
item.Expires = assoc.Expires.ToLocalTime(); item.Expires = assoc.Expires.ToLocalTime();
item.PrivateData = assoc.SerializePrivateData(); item.PrivateData = assoc.SerializePrivateData();
lock (m_syncRoot) lock (m_syncRoot)
{ {
m_store[item.Handle] = item; m_store[item.Handle] = item;
m_sortedStore[item.Expires] = item; m_sortedStore[item.Expires] = item;
} }
} }
public Association GetAssociation(AssociationRelyingPartyType distinguishingFactor) public Association GetAssociation(AssociationRelyingPartyType distinguishingFactor)
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
if (m_sortedStore.Count > 0) if (m_sortedStore.Count > 0)
{ {
AssociationItem item = m_sortedStore.Values[m_sortedStore.Count - 1]; AssociationItem item = m_sortedStore.Values[m_sortedStore.Count - 1];
return Association.Deserialize(item.Handle, item.Expires.ToUniversalTime(), item.PrivateData); return Association.Deserialize(item.Handle, item.Expires.ToUniversalTime(), item.PrivateData);
} }
else else
{ {
return null; return null;
} }
} }
} }
public Association GetAssociation(AssociationRelyingPartyType distinguishingFactor, string handle) public Association GetAssociation(AssociationRelyingPartyType distinguishingFactor, string handle)
{ {
AssociationItem item; AssociationItem item;
bool success = false; bool success = false;
lock (m_syncRoot) lock (m_syncRoot)
success = m_store.TryGetValue(handle, out item); success = m_store.TryGetValue(handle, out item);
if (success) if (success)
return Association.Deserialize(item.Handle, item.Expires.ToUniversalTime(), item.PrivateData); return Association.Deserialize(item.Handle, item.Expires.ToUniversalTime(), item.PrivateData);
else else
return null; return null;
} }
public bool RemoveAssociation(AssociationRelyingPartyType distinguishingFactor, string handle) public bool RemoveAssociation(AssociationRelyingPartyType distinguishingFactor, string handle)
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
for (int i = 0; i < m_sortedStore.Values.Count; i++) for (int i = 0; i < m_sortedStore.Values.Count; i++)
{ {
AssociationItem item = m_sortedStore.Values[i]; AssociationItem item = m_sortedStore.Values[i];
if (item.Handle == handle) if (item.Handle == handle)
{ {
m_sortedStore.RemoveAt(i); m_sortedStore.RemoveAt(i);
break; break;
} }
} }
return m_store.Remove(handle); return m_store.Remove(handle);
} }
} }
public void ClearExpiredAssociations() public void ClearExpiredAssociations()
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
List<AssociationItem> itemsCopy = new List<AssociationItem>(m_sortedStore.Values); List<AssociationItem> itemsCopy = new List<AssociationItem>(m_sortedStore.Values);
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
for (int i = 0; i < itemsCopy.Count; i++) for (int i = 0; i < itemsCopy.Count; i++)
{ {
AssociationItem item = itemsCopy[i]; AssociationItem item = itemsCopy[i];
if (item.Expires <= now) if (item.Expires <= now)
{ {
m_sortedStore.RemoveAt(i); m_sortedStore.RemoveAt(i);
m_store.Remove(item.Handle); m_store.Remove(item.Handle);
} }
} }
} }
} }
#endregion #endregion
} }
public class OpenIdStreamHandler : IStreamHandler public class OpenIdStreamHandler : IStreamHandler
{ {
#region HTML #region HTML
/// <summary>Login form used to authenticate OpenID requests</summary> /// <summary>Login form used to authenticate OpenID requests</summary>
const string LOGIN_PAGE = const string LOGIN_PAGE =
@"<html> @"<html>
<head><title>OpenSim OpenID Login</title></head> <head><title>OpenSim OpenID Login</title></head>
<body> <body>
<h3>OpenSim Login</h3> <h3>OpenSim Login</h3>
<form method=""post""> <form method=""post"">
<label for=""first"">First Name:</label> <input readonly type=""text"" name=""first"" id=""first"" value=""{0}""/> <label for=""first"">First Name:</label> <input readonly type=""text"" name=""first"" id=""first"" value=""{0}""/>
<label for=""last"">Last Name:</label> <input readonly type=""text"" name=""last"" id=""last"" value=""{1}""/> <label for=""last"">Last Name:</label> <input readonly type=""text"" name=""last"" id=""last"" value=""{1}""/>
<label for=""pass"">Password:</label> <input type=""password"" name=""pass"" id=""pass""/> <label for=""pass"">Password:</label> <input type=""password"" name=""pass"" id=""pass""/>
<input type=""submit"" value=""Login""> <input type=""submit"" value=""Login"">
</form> </form>
</body> </body>
</html>"; </html>";
/// <summary>Page shown for a valid OpenID identity</summary> /// <summary>Page shown for a valid OpenID identity</summary>
const string OPENID_PAGE = const string OPENID_PAGE =
@"<html> @"<html>
<head> <head>
<title>{2} {3}</title> <title>{2} {3}</title>
<link rel=""openid2.provider openid.server"" href=""{0}://{1}/openid/server/""/> <link rel=""openid2.provider openid.server"" href=""{0}://{1}/openid/server/""/>
</head> </head>
<body>OpenID identifier for {2} {3}</body> <body>OpenID identifier for {2} {3}</body>
</html> </html>
"; ";
/// <summary>Page shown for an invalid OpenID identity</summary> /// <summary>Page shown for an invalid OpenID identity</summary>
const string INVALID_OPENID_PAGE = const string INVALID_OPENID_PAGE =
@"<html><head><title>Identity not found</title></head> @"<html><head><title>Identity not found</title></head>
<body>Invalid OpenID identity</body></html>"; <body>Invalid OpenID identity</body></html>";
/// <summary>Page shown if the OpenID endpoint is requested directly</summary> /// <summary>Page shown if the OpenID endpoint is requested directly</summary>
const string ENDPOINT_PAGE = const string ENDPOINT_PAGE =
@"<html><head><title>OpenID Endpoint</title></head><body> @"<html><head><title>OpenID Endpoint</title></head><body>
This is an OpenID server endpoint, not a human-readable resource. This is an OpenID server endpoint, not a human-readable resource.
For more information, see <a href='http://openid.net/'>http://openid.net/</a>. For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
</body></html>"; </body></html>";
#endregion HTML #endregion HTML
public string ContentType { get { return m_contentType; } } public string ContentType { get { return m_contentType; } }
public string HttpMethod { get { return m_httpMethod; } } public string HttpMethod { get { return m_httpMethod; } }
public string Path { get { return m_path; } } public string Path { get { return m_path; } }
string m_contentType; string m_contentType;
string m_httpMethod; string m_httpMethod;
string m_path; string m_path;
UserLoginService m_loginService; UserLoginService m_loginService;
ProviderMemoryStore m_openidStore = new ProviderMemoryStore(); ProviderMemoryStore m_openidStore = new ProviderMemoryStore();
/// <summary> /// <summary>
/// Constructor /// Constructor
/// </summary> /// </summary>
public OpenIdStreamHandler(string httpMethod, string path, UserLoginService loginService) public OpenIdStreamHandler(string httpMethod, string path, UserLoginService loginService)
{ {
m_loginService = loginService; m_loginService = loginService;
m_httpMethod = httpMethod; m_httpMethod = httpMethod;
m_path = path; m_path = path;
m_contentType = "text/html"; m_contentType = "text/html";
} }
/// <summary> /// <summary>
/// Handles all GET and POST requests for OpenID identifier pages and endpoint /// Handles all GET and POST requests for OpenID identifier pages and endpoint
/// server communication /// server communication
/// </summary> /// </summary>
public void Handle(string path, Stream request, Stream response, OSHttpRequest httpRequest, OSHttpResponse httpResponse) public void Handle(string path, Stream request, Stream response, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
Uri providerEndpoint = new Uri(String.Format("{0}://{1}{2}", httpRequest.Url.Scheme, httpRequest.Url.Authority, httpRequest.Url.AbsolutePath)); Uri providerEndpoint = new Uri(String.Format("{0}://{1}{2}", httpRequest.Url.Scheme, httpRequest.Url.Authority, httpRequest.Url.AbsolutePath));
// Defult to returning HTML content // Defult to returning HTML content
m_contentType = "text/html"; m_contentType = "text/html";
try try
{ {
NameValueCollection postQuery = HttpUtility.ParseQueryString(new StreamReader(httpRequest.InputStream).ReadToEnd()); NameValueCollection postQuery = HttpUtility.ParseQueryString(new StreamReader(httpRequest.InputStream).ReadToEnd());
NameValueCollection getQuery = HttpUtility.ParseQueryString(httpRequest.Url.Query); NameValueCollection getQuery = HttpUtility.ParseQueryString(httpRequest.Url.Query);
NameValueCollection openIdQuery = (postQuery.GetValues("openid.mode") != null ? postQuery : getQuery); NameValueCollection openIdQuery = (postQuery.GetValues("openid.mode") != null ? postQuery : getQuery);
OpenIdProvider provider = new OpenIdProvider(m_openidStore, providerEndpoint, httpRequest.Url, openIdQuery); OpenIdProvider provider = new OpenIdProvider(m_openidStore, providerEndpoint, httpRequest.Url, openIdQuery);
if (provider.Request != null) if (provider.Request != null)
{ {
if (!provider.Request.IsResponseReady && provider.Request is IAuthenticationRequest) if (!provider.Request.IsResponseReady && provider.Request is IAuthenticationRequest)
{ {
IAuthenticationRequest authRequest = (IAuthenticationRequest)provider.Request; IAuthenticationRequest authRequest = (IAuthenticationRequest)provider.Request;
string[] passwordValues = postQuery.GetValues("pass"); string[] passwordValues = postQuery.GetValues("pass");
UserProfileData profile; UserProfileData profile;
if (TryGetProfile(new Uri(authRequest.ClaimedIdentifier.ToString()), out profile)) if (TryGetProfile(new Uri(authRequest.ClaimedIdentifier.ToString()), out profile))
{ {
// Check for form POST data // Check for form POST data
if (passwordValues != null && passwordValues.Length == 1) if (passwordValues != null && passwordValues.Length == 1)
{ {
if (profile != null && m_loginService.AuthenticateUser(profile, passwordValues[0])) if (profile != null && m_loginService.AuthenticateUser(profile, passwordValues[0]))
authRequest.IsAuthenticated = true; authRequest.IsAuthenticated = true;
else else
authRequest.IsAuthenticated = false; authRequest.IsAuthenticated = false;
} }
else else
{ {
// Authentication was requested, send the client a login form // Authentication was requested, send the client a login form
using (StreamWriter writer = new StreamWriter(response)) using (StreamWriter writer = new StreamWriter(response))
writer.Write(String.Format(LOGIN_PAGE, profile.FirstName, profile.SurName)); writer.Write(String.Format(LOGIN_PAGE, profile.FirstName, profile.SurName));
return; return;
} }
} }
else else
{ {
// Cannot find an avatar matching the claimed identifier // Cannot find an avatar matching the claimed identifier
authRequest.IsAuthenticated = false; authRequest.IsAuthenticated = false;
} }
} }
// Add OpenID headers to the response // Add OpenID headers to the response
foreach (string key in provider.Request.Response.Headers.Keys) foreach (string key in provider.Request.Response.Headers.Keys)
httpResponse.AddHeader(key, provider.Request.Response.Headers[key]); httpResponse.AddHeader(key, provider.Request.Response.Headers[key]);
string[] contentTypeValues = provider.Request.Response.Headers.GetValues("Content-Type"); string[] contentTypeValues = provider.Request.Response.Headers.GetValues("Content-Type");
if (contentTypeValues != null && contentTypeValues.Length == 1) if (contentTypeValues != null && contentTypeValues.Length == 1)
m_contentType = contentTypeValues[0]; m_contentType = contentTypeValues[0];
// Set the response code and document body based on the OpenID result // Set the response code and document body based on the OpenID result
httpResponse.StatusCode = (int)provider.Request.Response.Code; httpResponse.StatusCode = (int)provider.Request.Response.Code;
response.Write(provider.Request.Response.Body, 0, provider.Request.Response.Body.Length); response.Write(provider.Request.Response.Body, 0, provider.Request.Response.Body.Length);
response.Close(); response.Close();
} }
else if (httpRequest.Url.AbsolutePath.Contains("/openid/server")) else if (httpRequest.Url.AbsolutePath.Contains("/openid/server"))
{ {
// Standard HTTP GET was made on the OpenID endpoint, send the client the default error page // Standard HTTP GET was made on the OpenID endpoint, send the client the default error page
using (StreamWriter writer = new StreamWriter(response)) using (StreamWriter writer = new StreamWriter(response))
writer.Write(ENDPOINT_PAGE); writer.Write(ENDPOINT_PAGE);
} }
else else
{ {
// Try and lookup this avatar // Try and lookup this avatar
UserProfileData profile; UserProfileData profile;
if (TryGetProfile(httpRequest.Url, out profile)) if (TryGetProfile(httpRequest.Url, out profile))
{ {
using (StreamWriter writer = new StreamWriter(response)) using (StreamWriter writer = new StreamWriter(response))
{ {
// TODO: Print out a full profile page for this avatar // TODO: Print out a full profile page for this avatar
writer.Write(String.Format(OPENID_PAGE, httpRequest.Url.Scheme, writer.Write(String.Format(OPENID_PAGE, httpRequest.Url.Scheme,
httpRequest.Url.Authority, profile.FirstName, profile.SurName)); httpRequest.Url.Authority, profile.FirstName, profile.SurName));
} }
} }
else else
{ {
// Couldn't parse an avatar name, or couldn't find the avatar in the user server // Couldn't parse an avatar name, or couldn't find the avatar in the user server
using (StreamWriter writer = new StreamWriter(response)) using (StreamWriter writer = new StreamWriter(response))
writer.Write(INVALID_OPENID_PAGE); writer.Write(INVALID_OPENID_PAGE);
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError; httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError;
using (StreamWriter writer = new StreamWriter(response)) using (StreamWriter writer = new StreamWriter(response))
writer.Write(ex.Message); writer.Write(ex.Message);
} }
} }
/// <summary> /// <summary>
/// Parse a URL with a relative path of the form /users/First_Last and try to /// Parse a URL with a relative path of the form /users/First_Last and try to
/// retrieve the profile matching that avatar name /// retrieve the profile matching that avatar name
/// </summary> /// </summary>
/// <param name="requestUrl">URL to parse for an avatar name</param> /// <param name="requestUrl">URL to parse for an avatar name</param>
/// <param name="profile">Profile data for the avatar</param> /// <param name="profile">Profile data for the avatar</param>
/// <returns>True if the parse and lookup were successful, otherwise false</returns> /// <returns>True if the parse and lookup were successful, otherwise false</returns>
bool TryGetProfile(Uri requestUrl, out UserProfileData profile) bool TryGetProfile(Uri requestUrl, out UserProfileData profile)
{ {
if (requestUrl.Segments.Length == 3 && requestUrl.Segments[1] == "users/") if (requestUrl.Segments.Length == 3 && requestUrl.Segments[1] == "users/")
{ {
// Parse the avatar name from the path // Parse the avatar name from the path
string username = requestUrl.Segments[requestUrl.Segments.Length - 1]; string username = requestUrl.Segments[requestUrl.Segments.Length - 1];
string[] name = username.Split('_'); string[] name = username.Split('_');
if (name.Length == 2) if (name.Length == 2)
{ {
profile = m_loginService.GetTheUser(name[0], name[1]); profile = m_loginService.GetTheUser(name[0], name[1]);
return (profile != null); return (profile != null);
} }
} }
profile = null; profile = null;
return false; return false;
} }
} }
} }

222
OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
View File

@ -1,111 +1,111 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
namespace OpenSim.Grid.UserServer.Modules namespace OpenSim.Grid.UserServer.Modules
{ {
public class UserDataBaseService : UserManagerBase public class UserDataBaseService : UserManagerBase
{ {
protected IUGAIMCore m_core; protected IUGAIMCore m_core;
public UserDataBaseService() public UserDataBaseService()
: base(null) : base(null)
{ {
} }
public UserDataBaseService(IInterServiceInventoryServices interServiceInventoryService) public UserDataBaseService(IInterServiceInventoryServices interServiceInventoryService)
: base(interServiceInventoryService) : base(interServiceInventoryService)
{ {
} }
public void Initialise(IUGAIMCore core) public void Initialise(IUGAIMCore core)
{ {
m_core = core; m_core = core;
//we only need core components so we can request them from here //we only need core components so we can request them from here
IInterServiceInventoryServices inventoryService; IInterServiceInventoryServices inventoryService;
if (m_core.TryGet<IInterServiceInventoryServices>(out inventoryService)) if (m_core.TryGet<IInterServiceInventoryServices>(out inventoryService))
{ {
m_interServiceInventoryService = inventoryService; m_interServiceInventoryService = inventoryService;
} }
UserConfig cfg; UserConfig cfg;
if (m_core.TryGet<UserConfig>(out cfg)) if (m_core.TryGet<UserConfig>(out cfg))
{ {
AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect);
} }
m_core.RegisterInterface<UserDataBaseService>(this); m_core.RegisterInterface<UserDataBaseService>(this);
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers(BaseHttpServer httpServer) public void RegisterHandlers(BaseHttpServer httpServer)
{ {
} }
public UserAgentData GetUserAgentData(UUID AgentID) public UserAgentData GetUserAgentData(UUID AgentID)
{ {
UserProfileData userProfile = GetUserProfile(AgentID); UserProfileData userProfile = GetUserProfile(AgentID);
if (userProfile != null) if (userProfile != null)
{ {
return userProfile.CurrentAgent; return userProfile.CurrentAgent;
} }
return null; return null;
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName) public override UserProfileData SetupMasterUser(string firstName, string lastName)
{ {
throw new Exception("The method or operation is not implemented."); throw new Exception("The method or operation is not implemented.");
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
{ {
throw new Exception("The method or operation is not implemented."); throw new Exception("The method or operation is not implemented.");
} }
public override UserProfileData SetupMasterUser(UUID uuid) public override UserProfileData SetupMasterUser(UUID uuid)
{ {
throw new Exception("The method or operation is not implemented."); throw new Exception("The method or operation is not implemented.");
} }
} }
} }

1200
OpenSim/Grid/UserServer.Modules/UserLoginService.cs
View File

File diff suppressed because it is too large Load Diff

1372
OpenSim/Grid/UserServer.Modules/UserManager.cs
View File

File diff suppressed because it is too large Load Diff

248
OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
View File

@ -1,124 +1,124 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.UserServer.Modules namespace OpenSim.Grid.UserServer.Modules
{ {
public class UserServerAvatarAppearanceModule public class UserServerAvatarAppearanceModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private UserDataBaseService m_userDataBaseService; private UserDataBaseService m_userDataBaseService;
private BaseHttpServer m_httpServer; private BaseHttpServer m_httpServer;
public UserServerAvatarAppearanceModule(UserDataBaseService userDataBaseService) public UserServerAvatarAppearanceModule(UserDataBaseService userDataBaseService)
{ {
m_userDataBaseService = userDataBaseService; m_userDataBaseService = userDataBaseService;
} }
public void Initialise() public void Initialise()
{ {
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers(BaseHttpServer httpServer) public void RegisterHandlers(BaseHttpServer httpServer)
{ {
m_httpServer = httpServer; m_httpServer = httpServer;
m_httpServer.AddXmlRPCHandler("get_avatar_appearance", XmlRPCGetAvatarAppearance); m_httpServer.AddXmlRPCHandler("get_avatar_appearance", XmlRPCGetAvatarAppearance);
m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance); m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance);
} }
public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request) public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
AvatarAppearance appearance; AvatarAppearance appearance;
Hashtable responseData; Hashtable responseData;
if (requestData.Contains("owner")) if (requestData.Contains("owner"))
{ {
appearance = m_userDataBaseService.GetUserAppearance(new UUID((string)requestData["owner"])); appearance = m_userDataBaseService.GetUserAppearance(new UUID((string)requestData["owner"]));
if (appearance == null) if (appearance == null)
{ {
responseData = new Hashtable(); responseData = new Hashtable();
responseData["error_type"] = "no appearance"; responseData["error_type"] = "no appearance";
responseData["error_desc"] = "There was no appearance found for this avatar"; responseData["error_desc"] = "There was no appearance found for this avatar";
} }
else else
{ {
responseData = appearance.ToHashTable(); responseData = appearance.ToHashTable();
} }
} }
else else
{ {
responseData = new Hashtable(); responseData = new Hashtable();
responseData["error_type"] = "unknown_avatar"; responseData["error_type"] = "unknown_avatar";
responseData["error_desc"] = "The avatar appearance requested is not in the database"; responseData["error_desc"] = "The avatar appearance requested is not in the database";
} }
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request) public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData; Hashtable responseData;
if (requestData.Contains("owner")) if (requestData.Contains("owner"))
{ {
AvatarAppearance appearance = new AvatarAppearance(requestData); AvatarAppearance appearance = new AvatarAppearance(requestData);
m_userDataBaseService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance); m_userDataBaseService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance);
responseData = new Hashtable(); responseData = new Hashtable();
responseData["returnString"] = "TRUE"; responseData["returnString"] = "TRUE";
} }
else else
{ {
responseData = new Hashtable(); responseData = new Hashtable();
responseData["error_type"] = "unknown_avatar"; responseData["error_type"] = "unknown_avatar";
responseData["error_desc"] = "The avatar appearance requested is not in the database"; responseData["error_desc"] = "The avatar appearance requested is not in the database";
} }
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
} }
} }

346
OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
View File

@ -1,173 +1,173 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.UserServer.Modules namespace OpenSim.Grid.UserServer.Modules
{ {
public class UserServerFriendsModule public class UserServerFriendsModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private UserDataBaseService m_userDataBaseService; private UserDataBaseService m_userDataBaseService;
private BaseHttpServer m_httpServer; private BaseHttpServer m_httpServer;
public UserServerFriendsModule(UserDataBaseService userDataBaseService) public UserServerFriendsModule(UserDataBaseService userDataBaseService)
{ {
m_userDataBaseService = userDataBaseService; m_userDataBaseService = userDataBaseService;
} }
public void Initialise() public void Initialise()
{ {
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers(BaseHttpServer httpServer) public void RegisterHandlers(BaseHttpServer httpServer)
{ {
m_httpServer = httpServer; m_httpServer = httpServer;
m_httpServer.AddXmlRPCHandler("add_new_user_friend", XmlRpcResponseXmlRPCAddUserFriend); m_httpServer.AddXmlRPCHandler("add_new_user_friend", XmlRpcResponseXmlRPCAddUserFriend);
m_httpServer.AddXmlRPCHandler("remove_user_friend", XmlRpcResponseXmlRPCRemoveUserFriend); m_httpServer.AddXmlRPCHandler("remove_user_friend", XmlRpcResponseXmlRPCRemoveUserFriend);
m_httpServer.AddXmlRPCHandler("update_user_friend_perms", XmlRpcResponseXmlRPCUpdateUserFriendPerms); m_httpServer.AddXmlRPCHandler("update_user_friend_perms", XmlRpcResponseXmlRPCUpdateUserFriendPerms);
m_httpServer.AddXmlRPCHandler("get_user_friend_list", XmlRpcResponseXmlRPCGetUserFriendList); m_httpServer.AddXmlRPCHandler("get_user_friend_list", XmlRpcResponseXmlRPCGetUserFriendList);
} }
public XmlRpcResponse FriendListItemListtoXmlRPCResponse(List<FriendListItem> returnUsers) public XmlRpcResponse FriendListItemListtoXmlRPCResponse(List<FriendListItem> returnUsers)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
// Query Result Information // Query Result Information
responseData["avcount"] = returnUsers.Count.ToString(); responseData["avcount"] = returnUsers.Count.ToString();
for (int i = 0; i < returnUsers.Count; i++) for (int i = 0; i < returnUsers.Count; i++)
{ {
responseData["ownerID" + i] = returnUsers[i].FriendListOwner.ToString(); responseData["ownerID" + i] = returnUsers[i].FriendListOwner.ToString();
responseData["friendID" + i] = returnUsers[i].Friend.ToString(); responseData["friendID" + i] = returnUsers[i].Friend.ToString();
responseData["ownerPerms" + i] = returnUsers[i].FriendListOwnerPerms.ToString(); responseData["ownerPerms" + i] = returnUsers[i].FriendListOwnerPerms.ToString();
responseData["friendPerms" + i] = returnUsers[i].FriendPerms.ToString(); responseData["friendPerms" + i] = returnUsers[i].FriendPerms.ToString();
} }
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request) public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
string returnString = "FALSE"; string returnString = "FALSE";
// Query Result Information // Query Result Information
if (requestData.Contains("ownerID") && requestData.Contains("friendID") && if (requestData.Contains("ownerID") && requestData.Contains("friendID") &&
requestData.Contains("friendPerms")) requestData.Contains("friendPerms"))
{ {
// UserManagerBase.AddNewuserFriend // UserManagerBase.AddNewuserFriend
m_userDataBaseService.AddNewUserFriend(new UUID((string)requestData["ownerID"]), m_userDataBaseService.AddNewUserFriend(new UUID((string)requestData["ownerID"]),
new UUID((string)requestData["friendID"]), new UUID((string)requestData["friendID"]),
(uint)Convert.ToInt32((string)requestData["friendPerms"])); (uint)Convert.ToInt32((string)requestData["friendPerms"]));
returnString = "TRUE"; returnString = "TRUE";
} }
responseData["returnString"] = returnString; responseData["returnString"] = returnString;
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request) public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
string returnString = "FALSE"; string returnString = "FALSE";
// Query Result Information // Query Result Information
if (requestData.Contains("ownerID") && requestData.Contains("friendID")) if (requestData.Contains("ownerID") && requestData.Contains("friendID"))
{ {
// UserManagerBase.AddNewuserFriend // UserManagerBase.AddNewuserFriend
m_userDataBaseService.RemoveUserFriend(new UUID((string)requestData["ownerID"]), m_userDataBaseService.RemoveUserFriend(new UUID((string)requestData["ownerID"]),
new UUID((string)requestData["friendID"])); new UUID((string)requestData["friendID"]));
returnString = "TRUE"; returnString = "TRUE";
} }
responseData["returnString"] = returnString; responseData["returnString"] = returnString;
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request) public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request)
{ {
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
string returnString = "FALSE"; string returnString = "FALSE";
if (requestData.Contains("ownerID") && requestData.Contains("friendID") && if (requestData.Contains("ownerID") && requestData.Contains("friendID") &&
requestData.Contains("friendPerms")) requestData.Contains("friendPerms"))
{ {
m_userDataBaseService.UpdateUserFriendPerms(new UUID((string)requestData["ownerID"]), m_userDataBaseService.UpdateUserFriendPerms(new UUID((string)requestData["ownerID"]),
new UUID((string)requestData["friendID"]), new UUID((string)requestData["friendID"]),
(uint)Convert.ToInt32((string)requestData["friendPerms"])); (uint)Convert.ToInt32((string)requestData["friendPerms"]));
// UserManagerBase. // UserManagerBase.
returnString = "TRUE"; returnString = "TRUE";
} }
responseData["returnString"] = returnString; responseData["returnString"] = returnString;
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request) public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request)
{ {
// XmlRpcResponse response = new XmlRpcResponse(); // XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
// Hashtable responseData = new Hashtable(); // Hashtable responseData = new Hashtable();
List<FriendListItem> returndata = new List<FriendListItem>(); List<FriendListItem> returndata = new List<FriendListItem>();
if (requestData.Contains("ownerID")) if (requestData.Contains("ownerID"))
{ {
returndata = m_userDataBaseService.GetUserFriendList(new UUID((string)requestData["ownerID"])); returndata = m_userDataBaseService.GetUserFriendList(new UUID((string)requestData["ownerID"]));
} }
return FriendListItemListtoXmlRPCResponse(returndata); return FriendListItemListtoXmlRPCResponse(returndata);
} }
} }
} }

732
OpenSim/Grid/UserServer/UserServerCommandModule.cs
View File

@ -1,366 +1,366 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using log4net.Config; using log4net.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Grid.Communications.OGS1; using OpenSim.Grid.Communications.OGS1;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
using OpenSim.Grid.UserServer.Modules; using OpenSim.Grid.UserServer.Modules;
namespace OpenSim.Grid.UserServer namespace OpenSim.Grid.UserServer
{ {
public class UserServerCommandModule public class UserServerCommandModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected ConsoleBase m_console; protected ConsoleBase m_console;
protected UserConfig m_cfg; protected UserConfig m_cfg;
protected UserDataBaseService m_userDataBaseService; protected UserDataBaseService m_userDataBaseService;
protected UserLoginService m_loginService; protected UserLoginService m_loginService;
protected UUID m_lastCreatedUser = UUID.Random(); protected UUID m_lastCreatedUser = UUID.Random();
protected IUGAIMCore m_core; protected IUGAIMCore m_core;
public UserServerCommandModule( UserLoginService loginService) public UserServerCommandModule( UserLoginService loginService)
{ {
m_loginService = loginService; m_loginService = loginService;
} }
public void Initialise(IUGAIMCore core) public void Initialise(IUGAIMCore core)
{ {
m_core = core; m_core = core;
} }
public void PostInitialise() public void PostInitialise()
{ {
UserConfig cfg; UserConfig cfg;
if (m_core.TryGet<UserConfig>(out cfg)) if (m_core.TryGet<UserConfig>(out cfg))
{ {
m_cfg = cfg; m_cfg = cfg;
} }
UserDataBaseService userDBservice; UserDataBaseService userDBservice;
if (m_core.TryGet<UserDataBaseService>(out userDBservice)) if (m_core.TryGet<UserDataBaseService>(out userDBservice))
{ {
m_userDataBaseService = userDBservice; m_userDataBaseService = userDBservice;
} }
ConsoleBase console; ConsoleBase console;
if ((m_core.TryGet<ConsoleBase>(out console)) && (m_cfg != null) && (m_userDataBaseService != null)) if ((m_core.TryGet<ConsoleBase>(out console)) && (m_cfg != null) && (m_userDataBaseService != null))
{ {
RegisterConsoleCommands(console); RegisterConsoleCommands(console);
} }
} }
public void RegisterHandlers(BaseHttpServer httpServer) public void RegisterHandlers(BaseHttpServer httpServer)
{ {
} }
private void RegisterConsoleCommands(ConsoleBase console) private void RegisterConsoleCommands(ConsoleBase console)
{ {
m_console = console; m_console = console;
m_console.Commands.AddCommand("userserver", false, "create user", m_console.Commands.AddCommand("userserver", false, "create user",
"create user [<first> [<last> [<x> <y> [email]]]]", "create user [<first> [<last> [<x> <y> [email]]]]",
"Create a new user account", RunCommand); "Create a new user account", RunCommand);
m_console.Commands.AddCommand("userserver", false, "reset user password", m_console.Commands.AddCommand("userserver", false, "reset user password",
"reset user password [<first> [<last> [<new password>]]]", "reset user password [<first> [<last> [<new password>]]]",
"Reset a user's password", RunCommand); "Reset a user's password", RunCommand);
m_console.Commands.AddCommand("userserver", false, "login level", m_console.Commands.AddCommand("userserver", false, "login level",
"login level <level>", "login level <level>",
"Set the minimum user level to log in", HandleLoginCommand); "Set the minimum user level to log in", HandleLoginCommand);
m_console.Commands.AddCommand("userserver", false, "login reset", m_console.Commands.AddCommand("userserver", false, "login reset",
"login reset", "login reset",
"Reset the login level to allow all users", "Reset the login level to allow all users",
HandleLoginCommand); HandleLoginCommand);
m_console.Commands.AddCommand("userserver", false, "login text", m_console.Commands.AddCommand("userserver", false, "login text",
"login text <text>", "login text <text>",
"Set the text users will see on login", HandleLoginCommand); "Set the text users will see on login", HandleLoginCommand);
m_console.Commands.AddCommand("userserver", false, "test-inventory", m_console.Commands.AddCommand("userserver", false, "test-inventory",
"test-inventory", "test-inventory",
"Perform a test inventory transaction", RunCommand); "Perform a test inventory transaction", RunCommand);
m_console.Commands.AddCommand("userserver", false, "logoff-user", m_console.Commands.AddCommand("userserver", false, "logoff-user",
"logoff-user <first> <last> <message>", "logoff-user <first> <last> <message>",
"Log off a named user", RunCommand); "Log off a named user", RunCommand);
} }
#region Console Command Handlers #region Console Command Handlers
public void do_create(string[] args) public void do_create(string[] args)
{ {
switch (args[0]) switch (args[0])
{ {
case "user": case "user":
CreateUser(args); CreateUser(args);
break; break;
} }
} }
/// <summary> /// <summary>
/// Execute switch for some of the reset commands /// Execute switch for some of the reset commands
/// </summary> /// </summary>
/// <param name="args"></param> /// <param name="args"></param>
protected void Reset(string[] args) protected void Reset(string[] args)
{ {
if (args.Length == 0) if (args.Length == 0)
return; return;
switch (args[0]) switch (args[0])
{ {
case "user": case "user":
switch (args[1]) switch (args[1])
{ {
case "password": case "password":
ResetUserPassword(args); ResetUserPassword(args);
break; break;
} }
break; break;
} }
} }
/// <summary> /// <summary>
/// Create a new user /// Create a new user
/// </summary> /// </summary>
/// <param name="cmdparams">string array with parameters: firstname, lastname, password, locationX, locationY, email</param> /// <param name="cmdparams">string array with parameters: firstname, lastname, password, locationX, locationY, email</param>
protected void CreateUser(string[] cmdparams) protected void CreateUser(string[] cmdparams)
{ {
string firstName; string firstName;
string lastName; string lastName;
string password; string password;
string email; string email;
uint regX = 1000; uint regX = 1000;
uint regY = 1000; uint regY = 1000;
if (cmdparams.Length < 2) if (cmdparams.Length < 2)
firstName = MainConsole.Instance.CmdPrompt("First name", "Default"); firstName = MainConsole.Instance.CmdPrompt("First name", "Default");
else firstName = cmdparams[1]; else firstName = cmdparams[1];
if (cmdparams.Length < 3) if (cmdparams.Length < 3)
lastName = MainConsole.Instance.CmdPrompt("Last name", "User"); lastName = MainConsole.Instance.CmdPrompt("Last name", "User");
else lastName = cmdparams[2]; else lastName = cmdparams[2];
if (cmdparams.Length < 4) if (cmdparams.Length < 4)
password = MainConsole.Instance.PasswdPrompt("Password"); password = MainConsole.Instance.PasswdPrompt("Password");
else password = cmdparams[3]; else password = cmdparams[3];
if (cmdparams.Length < 5) if (cmdparams.Length < 5)
regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", regX.ToString())); regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", regX.ToString()));
else regX = Convert.ToUInt32(cmdparams[4]); else regX = Convert.ToUInt32(cmdparams[4]);
if (cmdparams.Length < 6) if (cmdparams.Length < 6)
regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", regY.ToString())); regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", regY.ToString()));
else regY = Convert.ToUInt32(cmdparams[5]); else regY = Convert.ToUInt32(cmdparams[5]);
if (cmdparams.Length < 7) if (cmdparams.Length < 7)
email = MainConsole.Instance.CmdPrompt("Email", ""); email = MainConsole.Instance.CmdPrompt("Email", "");
else email = cmdparams[6]; else email = cmdparams[6];
if (null == m_userDataBaseService.GetUserProfile(firstName, lastName)) if (null == m_userDataBaseService.GetUserProfile(firstName, lastName))
{ {
m_lastCreatedUser = m_userDataBaseService.AddUser(firstName, lastName, password, email, regX, regY); m_lastCreatedUser = m_userDataBaseService.AddUser(firstName, lastName, password, email, regX, regY);
} }
else else
{ {
m_log.ErrorFormat("[USERS]: A user with the name {0} {1} already exists!", firstName, lastName); m_log.ErrorFormat("[USERS]: A user with the name {0} {1} already exists!", firstName, lastName);
} }
} }
/// <summary> /// <summary>
/// Reset a user password. /// Reset a user password.
/// </summary> /// </summary>
/// <param name="cmdparams"></param> /// <param name="cmdparams"></param>
private void ResetUserPassword(string[] cmdparams) private void ResetUserPassword(string[] cmdparams)
{ {
string firstName; string firstName;
string lastName; string lastName;
string newPassword; string newPassword;
if (cmdparams.Length < 3) if (cmdparams.Length < 3)
firstName = MainConsole.Instance.CmdPrompt("First name"); firstName = MainConsole.Instance.CmdPrompt("First name");
else firstName = cmdparams[2]; else firstName = cmdparams[2];
if (cmdparams.Length < 4) if (cmdparams.Length < 4)
lastName = MainConsole.Instance.CmdPrompt("Last name"); lastName = MainConsole.Instance.CmdPrompt("Last name");
else lastName = cmdparams[3]; else lastName = cmdparams[3];
if (cmdparams.Length < 5) if (cmdparams.Length < 5)
newPassword = MainConsole.Instance.PasswdPrompt("New password"); newPassword = MainConsole.Instance.PasswdPrompt("New password");
else newPassword = cmdparams[4]; else newPassword = cmdparams[4];
m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword); m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword);
} }
private void HandleTestCommand(string module, string[] cmd) private void HandleTestCommand(string module, string[] cmd)
{ {
m_log.Info("test command received"); m_log.Info("test command received");
} }
private void HandleLoginCommand(string module, string[] cmd) private void HandleLoginCommand(string module, string[] cmd)
{ {
string subcommand = cmd[1]; string subcommand = cmd[1];
switch (subcommand) switch (subcommand)
{ {
case "level": case "level":
// Set the minimal level to allow login // Set the minimal level to allow login
// Useful to allow grid update without worrying about users. // Useful to allow grid update without worrying about users.
// or fixing critical issues // or fixing critical issues
// //
if (cmd.Length > 2) if (cmd.Length > 2)
{ {
int level = Convert.ToInt32(cmd[2]); int level = Convert.ToInt32(cmd[2]);
m_loginService.setloginlevel(level); m_loginService.setloginlevel(level);
} }
break; break;
case "reset": case "reset":
m_loginService.setloginlevel(0); m_loginService.setloginlevel(0);
break; break;
case "text": case "text":
if (cmd.Length > 2) if (cmd.Length > 2)
{ {
m_loginService.setwelcometext(cmd[2]); m_loginService.setwelcometext(cmd[2]);
} }
break; break;
} }
} }
public void RunCommand(string module, string[] cmd) public void RunCommand(string module, string[] cmd)
{ {
List<string> args = new List<string>(cmd); List<string> args = new List<string>(cmd);
string command = cmd[0]; string command = cmd[0];
args.RemoveAt(0); args.RemoveAt(0);
string[] cmdparams = args.ToArray(); string[] cmdparams = args.ToArray();
switch (command) switch (command)
{ {
case "create": case "create":
do_create(cmdparams); do_create(cmdparams);
break; break;
case "reset": case "reset":
Reset(cmdparams); Reset(cmdparams);
break; break;
case "test-inventory": case "test-inventory":
// RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
// requester.ReturnResponseVal = TestResponse; // requester.ReturnResponseVal = TestResponse;
// requester.BeginPostObject<UUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); // requester.BeginPostObject<UUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
SynchronousRestObjectPoster.BeginPostObject<UUID, List<InventoryFolderBase>>( SynchronousRestObjectPoster.BeginPostObject<UUID, List<InventoryFolderBase>>(
"POST", m_cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); "POST", m_cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
break; break;
case "logoff-user": case "logoff-user":
if (cmdparams.Length >= 3) if (cmdparams.Length >= 3)
{ {
string firstname = cmdparams[0]; string firstname = cmdparams[0];
string lastname = cmdparams[1]; string lastname = cmdparams[1];
string message = ""; string message = "";
for (int i = 2; i < cmdparams.Length; i++) for (int i = 2; i < cmdparams.Length; i++)
message += " " + cmdparams[i]; message += " " + cmdparams[i];
UserProfileData theUser = null; UserProfileData theUser = null;
try try
{ {
theUser = m_loginService.GetTheUser(firstname, lastname); theUser = m_loginService.GetTheUser(firstname, lastname);
} }
catch (Exception) catch (Exception)
{ {
m_log.Error("[LOGOFF]: Error getting user data from the database."); m_log.Error("[LOGOFF]: Error getting user data from the database.");
} }
if (theUser != null) if (theUser != null)
{ {
if (theUser.CurrentAgent != null) if (theUser.CurrentAgent != null)
{ {
if (theUser.CurrentAgent.AgentOnline) if (theUser.CurrentAgent.AgentOnline)
{ {
m_log.Info("[LOGOFF]: Logging off requested user!"); m_log.Info("[LOGOFF]: Logging off requested user!");
m_loginService.LogOffUser(theUser, message); m_loginService.LogOffUser(theUser, message);
theUser.CurrentAgent.AgentOnline = false; theUser.CurrentAgent.AgentOnline = false;
m_loginService.CommitAgent(ref theUser); m_loginService.CommitAgent(ref theUser);
} }
else else
{ {
m_log.Info( m_log.Info(
"[LOGOFF]: User Doesn't appear to be online, sending the logoff message anyway."); "[LOGOFF]: User Doesn't appear to be online, sending the logoff message anyway.");
m_loginService.LogOffUser(theUser, message); m_loginService.LogOffUser(theUser, message);
theUser.CurrentAgent.AgentOnline = false; theUser.CurrentAgent.AgentOnline = false;
m_loginService.CommitAgent(ref theUser); m_loginService.CommitAgent(ref theUser);
} }
} }
else else
{ {
m_log.Error( m_log.Error(
"[LOGOFF]: Unable to logoff-user. User doesn't have an agent record so I can't find the simulator to notify"); "[LOGOFF]: Unable to logoff-user. User doesn't have an agent record so I can't find the simulator to notify");
} }
} }
else else
{ {
m_log.Info("[LOGOFF]: User doesn't exist in the database"); m_log.Info("[LOGOFF]: User doesn't exist in the database");
} }
} }
else else
{ {
m_log.Error( m_log.Error(
"[LOGOFF]: Invalid amount of parameters. logoff-user takes at least three. Firstname, Lastname, and message"); "[LOGOFF]: Invalid amount of parameters. logoff-user takes at least three. Firstname, Lastname, and message");
} }
break; break;
} }
} }
} }
#endregion #endregion
} }