add more files for robust mutes suport. (module is still named MuteListModuleTst for testing, others in core will be removed later

0.9.0.1-postfixes
UbitUmarov 2018-01-04 20:56:48 +00:00
parent 8eea9531ee
commit 48dbba3441
6 changed files with 641 additions and 4 deletions

View File

@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using OpenMetaverse;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MuteList
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalMuteListServicesConnector")]
public class LocalMuteListServicesConnector : ISharedRegionModule, IMuteListService
@ -66,7 +66,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["Modules"];
// only active for core mute lists module
IConfig moduleConfig = source.Configs["Messaging"];
if (moduleConfig == null)
return;
if (moduleConfig.GetString("MuteListModule", "None") != "MuteListModuleTst")
return;
moduleConfig = source.Configs["Modules"];
if (moduleConfig == null)
return;
@ -99,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
catch
{
m_log.Error("[MuteList LOCALCONNECTOR]: Failed to load mute service");
return;
return;
}
if (m_service == null)

View File

@ -0,0 +1,143 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* 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
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Services.Connectors;
using OpenMetaverse;
using log4net;
using Mono.Addins;
using Nini.Config;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MuteList
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteMuteListServicesConnector")]
public class RemoteMuteListServicesConnector : ISharedRegionModule, IMuteListService
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#region ISharedRegionModule
private bool m_Enabled = false;
private IMuteListService m_remoteConnector;
public Type ReplaceableInterface
{
get { return null; }
}
public string Name
{
get { return "RemoteMuteListServicesConnector"; }
}
public void Initialise(IConfigSource source)
{
// only active for core mute lists module
IConfig moduleConfig = source.Configs["Messaging"];
if (moduleConfig == null)
return;
if (moduleConfig.GetString("MuteListModule", "None") != "MuteListModuleTst")
return;
moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("MuteListService", "");
if (name == Name)
{
m_remoteConnector = new MuteListServicesConnector(source);
m_Enabled = true;
}
}
}
public void PostInitialise()
{
}
public void Close()
{
}
public void AddRegion(Scene scene)
{
if (!m_Enabled)
return;
scene.RegisterModuleInterface<IMuteListService>(this);
m_log.InfoFormat("[MUTELIST CONNECTOR]: Enabled for region {0}", scene.RegionInfo.RegionName);
}
public void RemoveRegion(Scene scene)
{
if (!m_Enabled)
return;
}
public void RegionLoaded(Scene scene)
{
if (!m_Enabled)
return;
}
#endregion
#region IMuteListService
public Byte[] MuteListRequest(UUID agentID, uint crc)
{
if (!m_Enabled)
return null;
return m_remoteConnector.MuteListRequest(agentID, crc);
}
public bool UpdateMute(MuteData mute)
{
if (!m_Enabled)
return false;
return m_remoteConnector.UpdateMute(mute);
}
public bool RemoveMute(UUID agentID, UUID muteID, string muteName)
{
if (!m_Enabled)
return false;
return m_remoteConnector.RemoveMute(agentID, muteID, muteName);
}
#endregion IMuteListService
}
}

View File

@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.GridUser
Object[] args = new Object[] { config };
m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(service, args);
IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); ;
IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
server.AddStreamHandler(new GridUserServerPostHandler(m_GridUserService, auth));
}

View File

@ -0,0 +1,63 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* 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
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using Nini.Config;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework.ServiceAuth;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Server.Handlers.Base;
namespace OpenSim.Server.Handlers.GridUser
{
public class MuteListServiceConnector : ServiceConnector
{
private IMuteListService m_MuteListService;
private string m_ConfigName = "MuteListService";
public MuteListServiceConnector(IConfigSource config, IHttpServer server, string configName) :
base(config, server, configName)
{
IConfig serverConfig = config.Configs[m_ConfigName];
if (serverConfig == null)
throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
string service = serverConfig.GetString("LocalServiceModule", String.Empty);
if (service == String.Empty)
throw new Exception("LocalServiceModule not present in MuteListService config file MuteListService section");
Object[] args = new Object[] { config };
m_MuteListService = ServerUtils.LoadPlugin<IMuteListService>(service, args);
IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
server.AddStreamHandler(new MuteListServerPostHandler(m_MuteListService, auth));
}
}
}

View File

@ -0,0 +1,240 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* 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
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using Nini.Config;
using log4net;
using System;
using System.Reflection;
using System.IO;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
using System.Collections.Generic;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework;
using OpenSim.Framework.ServiceAuth;
using OpenSim.Framework.Servers.HttpServer;
using OpenMetaverse;
namespace OpenSim.Server.Handlers.GridUser
{
public class MuteListServerPostHandler : BaseStreamHandler
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IMuteListService m_service;
public MuteListServerPostHandler(IMuteListService service, IServiceAuth auth) :
base("POST", "/mutelist", auth)
{
m_service = service;
}
protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
string body;
using(StreamReader sr = new StreamReader(requestData))
body = sr.ReadToEnd();
body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body);
string method = string.Empty;
try
{
Dictionary<string, object> request =
ServerUtils.ParseQueryString(body);
if (!request.ContainsKey("METHOD"))
return FailureResult();
method = request["METHOD"].ToString();
switch (method)
{
case "get":
return getmutes(request);
case "update":
return updatemute(request);
case "delete":
return deletemute(request);
}
m_log.DebugFormat("[MUTELIST HANDLER]: unknown method request: {0}", method);
}
catch (Exception e)
{
m_log.DebugFormat("[MUTELIST HANDLER]: Exception in method {0}: {1}", method, e);
}
return FailureResult();
}
byte[] getmutes(Dictionary<string, object> request)
{
if(!request.ContainsKey("agentid") || !request.ContainsKey("mutecrc"))
return FailureResult();
UUID agentID;
if(!UUID.TryParse(request["agentid"].ToString(), out agentID))
return FailureResult();
uint mutecrc;
if(!UInt32.TryParse(request["mutecrc"].ToString(), out mutecrc))
return FailureResult();
byte[] data = m_service.MuteListRequest(agentID, mutecrc);
Dictionary<string, object> result = new Dictionary<string, object>();
result["result"] = Convert.ToBase64String(data);
string xmlString = ServerUtils.BuildXmlResponse(result);
//m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
return Util.UTF8NoBomEncoding.GetBytes(xmlString);
}
byte[] updatemute(Dictionary<string, object> request)
{
if(!request.ContainsKey("agentid") || !request.ContainsKey("muteid"))
return FailureResult();
MuteData mute = new MuteData();
if( !UUID.TryParse(request["agentid"].ToString(), out mute.AgentID))
return FailureResult();
if(!UUID.TryParse(request["muteid"].ToString(), out mute.MuteID))
return FailureResult();
if(request.ContainsKey("mutename"))
{
mute.MuteName = request["mutename"].ToString();
}
else
mute.MuteName = String.Empty;
if(request.ContainsKey("mutetype"))
{
if(!Int32.TryParse(request["mutetype"].ToString(), out mute.MuteType))
return FailureResult();
}
else
mute.MuteType = 0;
if(request.ContainsKey("muteflags"))
{
if(!Int32.TryParse(request["muteflags"].ToString(), out mute.MuteFlags))
return FailureResult();
}
else
mute.MuteFlags = 0;
if(request.ContainsKey("mutestamp"))
{
if(!Int32.TryParse(request["mutestamp"].ToString(), out mute.Stamp))
return FailureResult();
}
else
mute.Stamp = Util.UnixTimeSinceEpoch();
return m_service.UpdateMute(mute) ? SuccessResult() : FailureResult();
}
byte[] deletemute(Dictionary<string, object> request)
{
if(!request.ContainsKey("agentid") || !request.ContainsKey("muteid"))
return FailureResult();
UUID agentID;
if( !UUID.TryParse(request["agentid"].ToString(), out agentID))
return FailureResult();
UUID muteID;
if(!UUID.TryParse(request["muteid"].ToString(), out muteID))
return FailureResult();
string muteName;
if(request.ContainsKey("mutename"))
{
muteName = request["mutename"].ToString();
}
else
muteName = String.Empty;
return m_service.RemoveMute(agentID, muteID, muteName) ? SuccessResult() : FailureResult();
}
private byte[] SuccessResult()
{
XmlDocument doc = new XmlDocument();
XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
"", "");
doc.AppendChild(xmlnode);
XmlElement rootElement = doc.CreateElement("", "ServerResponse",
"");
doc.AppendChild(rootElement);
XmlElement result = doc.CreateElement("", "result", "");
result.AppendChild(doc.CreateTextNode("Success"));
rootElement.AppendChild(result);
return Util.DocToBytes(doc);
}
private byte[] FailureResult()
{
XmlDocument doc = new XmlDocument();
XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
"", "");
doc.AppendChild(xmlnode);
XmlElement rootElement = doc.CreateElement("", "ServerResponse",
"");
doc.AppendChild(rootElement);
XmlElement result = doc.CreateElement("", "result", "");
result.AppendChild(doc.CreateTextNode("Failure"));
rootElement.AppendChild(result);
return Util.DocToBytes(doc);
}
}
}

View File

@ -0,0 +1,183 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* 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
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using log4net;
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.ServiceAuth;
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
using OpenSim.Server.Base;
using OpenMetaverse;
namespace OpenSim.Services.Connectors
{
public class MuteListServicesConnector : BaseServiceConnector, IMuteListService
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty;
public MuteListServicesConnector()
{
}
public MuteListServicesConnector(string serverURI)
{
m_ServerURI = serverURI.TrimEnd('/') + "/mutelist";
}
public MuteListServicesConnector(IConfigSource source)
{
Initialise(source);
}
public virtual void Initialise(IConfigSource source)
{
IConfig gridConfig = source.Configs["MuteListService"];
if (gridConfig == null)
{
m_log.Error("[MUTELIST CONNECTOR]: MuteListService missing from configuration");
throw new Exception("MuteList connector init error");
}
string serviceURI = gridConfig.GetString("MuteListServerURI",
String.Empty);
if (serviceURI == String.Empty)
{
m_log.Error("[GRID USER CONNECTOR]: No Server URI named in section GridUserService");
throw new Exception("GridUser connector init error");
}
m_ServerURI = serviceURI + "/mutelist";;
base.Initialise(source, "MuteListService");
}
#region IMuteListService
public Byte[] MuteListRequest(UUID agentID, uint crc)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["METHOD"] = "get";
sendData["agentid"] = agentID.ToString();
sendData["mutecrc"] = crc.ToString();
try
{
string reply = SynchronousRestFormsRequester.MakeRequest("POST", m_ServerURI,
ServerUtils.BuildQueryString(sendData), m_Auth);
if (reply != string.Empty)
{
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
if (replyData.ContainsKey("result"))
{
string datastr = replyData["result"].ToString();
if(String.IsNullOrWhiteSpace(datastr))
return null;
return Convert.FromBase64String(datastr);
}
else
m_log.DebugFormat("[MUTELIST CONNECTOR]: get reply data does not contain result field");
}
else
m_log.DebugFormat("[MUTELIST CONNECTOR]: get received empty reply");
}
catch (Exception e)
{
m_log.DebugFormat("[MUTELIST CONNECTOR]: Exception when contacting server at {0}: {1}", m_ServerURI, e.Message);
}
return null;
}
public bool UpdateMute(MuteData mute)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["METHOD"] = "update";
sendData["agentid"] = mute.AgentID.ToString();
sendData["muteid"] = mute.MuteID.ToString();
if(mute.MuteType != 0)
sendData["mutetype"] = mute.MuteType.ToString();
if(mute.MuteFlags != 0)
sendData["muteflags"] = mute.MuteFlags.ToString();
sendData["mutestamp"] = mute.Stamp.ToString();
if(!String.IsNullOrEmpty(mute.MuteName))
sendData["mutename"] = mute.MuteName;
return doSimplePost(ServerUtils.BuildQueryString(sendData), "update");
}
public bool RemoveMute(UUID agentID, UUID muteID, string muteName)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["METHOD"] = "delete";
sendData["agentid"] = agentID.ToString();
sendData["muteid"] = muteID.ToString();
if(!String.IsNullOrEmpty(muteName))
sendData["mutename"] = muteName;
return doSimplePost(ServerUtils.BuildQueryString(sendData), "remove");
}
#endregion IMuteListService
private bool doSimplePost(string reqString, string meth)
{
try
{
string reply = SynchronousRestFormsRequester.MakeRequest("POST", m_ServerURI, reqString, m_Auth);
if (reply != string.Empty)
{
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
if (replyData.ContainsKey("result"))
{
if (replyData["result"].ToString().ToLower() == "success")
return true;
else
return false;
}
else
m_log.DebugFormat("[MUTELIST CONNECTOR]: {0} reply data does not contain result field", meth);
}
else
m_log.DebugFormat("[MUTELIST CONNECTOR]: {0} received empty reply", meth);
}
catch (Exception e)
{
m_log.DebugFormat("[MUTELIST CONNECTOR]: Exception when contacting server at {0}: {1}", m_ServerURI, e.Message);
}
return false;
}
}
}