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

Merge branch 'master' into httptests

httptests
UbitUmarov 2018-01-05 22:37:42 +00:00
parent 3576d6d764 89a690c11f
commit 875ca104b8
46 changed files with 936 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
View File

@ -93,6 +93,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
xmlSource.Length);
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.XmlResolver = null;
xmlDoc.LoadXml(xmlSource);
if (xmlDoc.FirstChild.Name == "Nini")
{

1
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -3138,6 +3138,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (File.Exists(defaultAppearanceFileName))
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string name = "*unknown*";
string email = "anon@anon";
uint regionXLocation = 1000;

3
OpenSim/Capabilities/LLSD.cs
View File

@ -83,6 +83,9 @@ namespace OpenSim.Framework.Capabilities
{
using (XmlTextReader reader = new XmlTextReader(st))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
reader.Read();
SkipWS(reader);

2
OpenSim/ConsoleClient/ConsoleClient.cs
View File

@ -110,6 +110,7 @@ namespace OpenSim.ConsoleClient
public static void LoginReply(string requestUrl, string requestData, string replyData)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(replyData);
@ -169,6 +170,7 @@ namespace OpenSim.ConsoleClient
public static void ReadResponses(string requestUrl, string requestData, string replyData)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(replyData);

18
OpenSim/Framework/PhysicsInertia.cs
View File

@ -187,16 +187,18 @@ namespace OpenSim.Framework
if (text == String.Empty)
return null;
UTF8Encoding enc = new UTF8Encoding();
MemoryStream ms = new MemoryStream(enc.GetBytes(text));
XmlTextReader xreader = new XmlTextReader(ms);
PhysicsInertiaData v = new PhysicsInertiaData();
bool error;
PhysicsInertiaData v;
UTF8Encoding enc = new UTF8Encoding();
using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
using(XmlTextReader xreader = new XmlTextReader(ms))
{
xreader.DtdProcessing = DtdProcessing.Prohibit;
xreader.XmlResolver = null;
v.FromXml2(xreader, out error);
xreader.Close();
v = new PhysicsInertiaData();
v.FromXml2(xreader, out error);
}
if (error)
return null;

3
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -1595,6 +1595,9 @@ namespace OpenSim.Framework
{
using (XmlTextReader xtr = new XmlTextReader(sr))
{
xtr.DtdProcessing = DtdProcessing.Prohibit;
xtr.XmlResolver = null;
xtr.MoveToContent();
string type = xtr.GetAttribute("type");

3
OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs vendored
View File

@ -156,6 +156,7 @@ namespace OpenSim.Framework.Serialization.External
return xml;
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xml);
XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
@ -220,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External
using (StringWriter sw = new StringWriter())
using (XmlTextWriter writer = new XmlTextWriter(sw))
using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
{
TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);

2
OpenSim/Framework/Serialization/External/LandDataSerializer.cs vendored
View File

@ -178,6 +178,8 @@ namespace OpenSim.Framework.Serialization.External
using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
reader.ReadStartElement("LandData");
ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);

2
OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs vendored
View File

@ -63,6 +63,8 @@ namespace OpenSim.Framework.Serialization.External
StringReader sr = new StringReader(serializedSettings);
XmlTextReader xtr = new XmlTextReader(sr);
xtr.DtdProcessing = DtdProcessing.Prohibit;
xtr.XmlResolver = null;
xtr.ReadStartElement("RegionSettings");

3
OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs vendored
View File

@ -202,6 +202,9 @@ namespace OpenSim.Framework.Serialization.External
using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
reader.ReadStartElement("InventoryItem");
ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(

3
OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
View File

@ -54,6 +54,9 @@ namespace OpenSim.Framework.Servers.HttpServer
TRequest deserial;
using (XmlTextReader xmlReader = new XmlTextReader(request))
{
xmlReader.DtdProcessing = DtdProcessing.Prohibit;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
deserial = (TRequest) deserializer.Deserialize(xmlReader);
}

4
OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
View File

@ -210,6 +210,8 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
xmlReader.DtdProcessing = DtdProcessing.Prohibit;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
}
@ -269,6 +271,8 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
xmlReader.DtdProcessing = DtdProcessing.Prohibit;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
deserial = (TRequest)deserializer.Deserialize(xmlReader);
}

1
OpenSim/Framework/Util.cs
View File

@ -671,6 +671,7 @@ namespace OpenSim.Framework
public static string GetFormattedXml(string rawXml)
{
XmlDocument xd = new XmlDocument();
xd.XmlResolver=null;
xd.LoadXml(rawXml);
StringBuilder sb = new StringBuilder();

2
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -306,6 +306,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string stateData = String.Empty;
IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
@ -372,6 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (itemData.TryGetValue(attach.ItemID, out xmlData))
{
d = new XmlDocument();
d.XmlResolver=null;
d.LoadXml(xmlData);
m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
}

2
OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
View File

@ -124,6 +124,8 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
{
using(XmlTextReader sr = new XmlTextReader(s))
{
sr.DtdProcessing = DtdProcessing.Prohibit;
sr.XmlResolver = null;
sr.ReadStartElement("BakedAppearance");
while(sr.LocalName == "BakedTexture")
{

1
OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
View File

@ -93,6 +93,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID);
string xmlData = Utils.BytesToString(ncAssetGet.Data);
XmlDocument ncAssetGetXmlDoc = new XmlDocument();
ncAssetGetXmlDoc.XmlResolver=null;
ncAssetGetXmlDoc.LoadXml(xmlData);
// Console.WriteLine(ncAssetGetXmlDoc.OuterXml);

14
OpenSim/Region/CoreModules/ServiceConnectorsOut/MuteList/LocalMuteListServiceConnector.cs
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)

143
OpenSim/Region/CoreModules/ServiceConnectorsOut/MuteList/RemoteMuteListServiceConnector.cs Normal file
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
}
}

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -1130,6 +1130,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
xtr.DtdProcessing = DtdProcessing.Prohibit;
xtr.XmlResolver = null;
// Loaded metadata will be empty if no information exists in the archive
dearchivedScenes.LoadedCreationDateTime = 0;

2
OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
View File

@ -93,6 +93,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
StringReader sr = new StringReader(xml);
XmlTextReader reader = new XmlTextReader(sr);
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
reader.ReadStartElement("assets");
reader.Read();

2
OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
MemoryStream stream = new MemoryStream();
XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlstream);
formatter.Formatting = Formatting.Indented;
doc.WriteContentTo(formatter);

4
OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
View File

@ -58,7 +58,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
using (XmlTextReader reader = new XmlTextReader(path))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
XmlDocument doc = new XmlDocument();
doc.XmlResolver = null;
doc.Load(reader);
// if (doc.DocumentElement != null)
// {

2
OpenSim/Region/Framework/Scenes/SOPVehicle.cs
View File

@ -593,6 +593,8 @@ namespace OpenSim.Region.Framework.Scenes
UTF8Encoding enc = new UTF8Encoding();
MemoryStream ms = new MemoryStream(enc.GetBytes(text));
XmlTextReader xreader = new XmlTextReader(ms);
xreader.DtdProcessing = DtdProcessing.Prohibit;
xreader.XmlResolver = null;
SOPVehicle v = new SOPVehicle();
bool error;

3
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
{
using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
{
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
{
reader.Read();
bool isSingleObject = reader.Name != "CoalescedObject";
@ -2420,6 +2420,7 @@ namespace OpenSim.Region.Framework.Scenes
else
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
XmlElement coll = (XmlElement)e;

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -505,6 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (KeyValuePair<UUID, string> state in states)
{
XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
sdoc.LoadXml(state.Value);
XmlNodeList rootL = sdoc.GetElementsByTagName("State");
XmlNode rootNode = rootL[0];
@ -540,6 +541,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try
{
doc.LoadXml(objXMLData);

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1994,6 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<UUID,string> states = new Dictionary<UUID,string>();
SceneObjectPart[] parts = m_parts.GetArray();
@ -2782,7 +2783,7 @@ namespace OpenSim.Region.Framework.Scenes
return RootPart.Torque;
}
// This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
// This is used by llMoveToTarget() in an attached object
public void MoveToTarget(Vector3 target, float tau)
{
if (IsAttachment)
@ -2790,7 +2791,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
if (avatar != null)
avatar.MoveToTarget(target, false, false);
avatar.MoveToTarget(target, false, false, tau);
}
else
{

2
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -455,7 +455,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID))
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
////////// CRUFT WARNING ///////////////////////////////////

284
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -101,7 +101,8 @@ namespace OpenSim.Region.Framework.Scenes
public bool IsGod { get; set; }
private PresenceType m_presenceType;
public PresenceType PresenceType {
public PresenceType PresenceType
{
get {return m_presenceType;}
private set
{
@ -368,8 +369,28 @@ namespace OpenSim.Region.Framework.Scenes
private Quaternion m_headrotation = Quaternion.Identity;
//PauPaw:Proper PID Controler for autopilot************
public bool MovingToTarget { get; private set; }
public Vector3 MoveToPositionTarget { get; private set; }
private bool m_movingToTarget;
public bool MovingToTarget
{
get {return m_movingToTarget;}
private set {m_movingToTarget = value; }
}
private Vector3 m_moveToPositionTarget;
public Vector3 MoveToPositionTarget
{
get {return m_moveToPositionTarget;}
private set {m_moveToPositionTarget = value; }
}
private float m_moveToSpeed;
public float MoveToSpeed
{
get {return m_moveToSpeed;}
private set {m_moveToSpeed = value; }
}
private double m_delayedStop = -1.0;
/// <summary>
@ -1160,7 +1181,7 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.OnStopAnim += HandleStopAnim;
ControllingClient.OnChangeAnim += avnHandleChangeAnim;
ControllingClient.OnForceReleaseControls += HandleForceReleaseControls;
ControllingClient.OnAutoPilotGo += MoveToTarget;
ControllingClient.OnAutoPilotGo += MoveToTargetHandle;
ControllingClient.OnUpdateThrottles += RaiseUpdateThrottles;
// ControllingClient.OnAgentFOV += HandleAgentFOV;
@ -1180,7 +1201,7 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.OnStopAnim -= HandleStopAnim;
ControllingClient.OnChangeAnim -= avnHandleChangeAnim;
ControllingClient.OnForceReleaseControls -= HandleForceReleaseControls;
ControllingClient.OnAutoPilotGo -= MoveToTarget;
ControllingClient.OnAutoPilotGo -= MoveToTargetHandle;
ControllingClient.OnUpdateThrottles -= RaiseUpdateThrottles;
// ControllingClient.OnAgentFOV += HandleAgentFOV;
}
@ -2587,11 +2608,12 @@ namespace OpenSim.Region.Framework.Scenes
}
bool update_movementflag = false;
bool mvToTarget = MovingToTarget;
bool mvToTarget = m_movingToTarget;
if (agentData.UseClientAgentPosition)
{
MovingToTarget = (agentData.ClientAgentPosition - AbsolutePosition).LengthSquared() > 0.04f;
MoveToPositionTarget = agentData.ClientAgentPosition;
m_movingToTarget = (agentData.ClientAgentPosition - AbsolutePosition).LengthSquared() > 0.04f;
m_moveToPositionTarget = agentData.ClientAgentPosition;
m_moveToSpeed = -1f;
}
int i = 0;
@ -2686,7 +2708,7 @@ namespace OpenSim.Region.Framework.Scenes
update_movementflag = true;
}
if (MovingToTarget)
if (m_movingToTarget)
{
// If the user has pressed a key then we want to cancel any move to target.
if (DCFlagKeyPressed)
@ -2787,7 +2809,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
if(MovingToTarget ||
if(m_movingToTarget ||
(Animator.currentControlState != ScenePresenceAnimator.motionControlStates.flying &&
Animator.currentControlState != ScenePresenceAnimator.motionControlStates.onsurface)
)
@ -2878,7 +2900,7 @@ namespace OpenSim.Region.Framework.Scenes
bool updated = false;
Vector3 LocalVectorToTarget3D = MoveToPositionTarget - AbsolutePosition;
Vector3 LocalVectorToTarget3D = m_moveToPositionTarget - AbsolutePosition;
// m_log.DebugFormat(
// "[SCENE PRESENCE]: bAllowUpdateMoveToPosition {0}, m_moveToPositionInProgress {1}, m_autopilotMoving {2}",
@ -2891,9 +2913,8 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
Vector3 hdist = LocalVectorToTarget3D;
hdist.Z = 0;
distanceToTarget = hdist.Length();
distanceToTarget = (float)Math.Sqrt(LocalVectorToTarget3D.X * LocalVectorToTarget3D.X +
LocalVectorToTarget3D.Y * LocalVectorToTarget3D.Y);
}
// m_log.DebugFormat(
@ -2905,128 +2926,126 @@ namespace OpenSim.Region.Framework.Scenes
{
// We are close enough to the target
Velocity = Vector3.Zero;
AbsolutePosition = MoveToPositionTarget;
AbsolutePosition = m_moveToPositionTarget;
if (Flying)
{
if (LandAtTarget)
Flying = false;
if (LandAtTarget)
Flying = false;
// A horrible hack to stop the avatar dead in its tracks rather than having them overshoot
// the target if flying.
// We really need to be more subtle (slow the avatar as it approaches the target) or at
// least be able to set collision status once, rather than 5 times to give it enough
// weighting so that that PhysicsActor thinks it really is colliding.
for (int i = 0; i < 5; i++)
IsColliding = true;
for (int i = 0; i < 5; i++)
IsColliding = true;
}
ResetMoveToTarget();
return false;
}
else
if(m_moveToSpeed > 0 && distanceToTarget <= m_moveToSpeed * Scene.FrameTime)
m_moveToSpeed = distanceToTarget / Scene.FrameTime;
try
{
try
// move avatar in 3D towards target, in avatar coordinate frame.
// This movement vector gets added to the velocity through AddNewMovement().
// Theoretically we might need a more complex PID approach here if other
// unknown forces are acting on the avatar and we need to adaptively respond
// to such forces, but the following simple approach seems to works fine.
float angle = 0.5f * (float)Math.Atan2(LocalVectorToTarget3D.Y, LocalVectorToTarget3D.X);
Quaternion rot = new Quaternion(0,0, (float)Math.Sin(angle),(float)Math.Cos(angle));
Rotation = rot;
LocalVectorToTarget3D = LocalVectorToTarget3D * Quaternion.Inverse(rot); // change to avatar coords
LocalVectorToTarget3D.Normalize();
// update avatar movement flags. the avatar coordinate system is as follows:
//
// +X (forward)
//
// ^
// |
// |
// |
// |
// (left) +Y <--------o--------> -Y
// avatar
// |
// |
// |
// |
// v
// -X
//
// based on the above avatar coordinate system, classify the movement into
// one of left/right/back/forward.
const uint noMovFlagsMask = (uint)(~(Dir_ControlFlags.DIR_CONTROL_FLAG_BACK |
Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD | Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT |
Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT | Dir_ControlFlags.DIR_CONTROL_FLAG_UP |
Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN));
MovementFlag &= noMovFlagsMask;
uint tmpAgentControlFlags = (uint)m_AgentControlFlags;
tmpAgentControlFlags &= noMovFlagsMask;
if (LocalVectorToTarget3D.X < 0) //MoveBack
{
// move avatar in 3D at one meter/second towards target, in avatar coordinate frame.
// This movement vector gets added to the velocity through AddNewMovement().
// Theoretically we might need a more complex PID approach here if other
// unknown forces are acting on the avatar and we need to adaptively respond
// to such forces, but the following simple approach seems to works fine.
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_BACK;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_BACK;
updated = true;
}
else if (LocalVectorToTarget3D.X > 0) //Move Forward
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD;
updated = true;
}
LocalVectorToTarget3D = LocalVectorToTarget3D * Quaternion.Inverse(Rotation); // change to avatar coords
if (LocalVectorToTarget3D.Y > 0) //MoveLeft
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT;
updated = true;
}
else if (LocalVectorToTarget3D.Y < 0) //MoveRight
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT;
updated = true;
}
LocalVectorToTarget3D.Normalize();
if (LocalVectorToTarget3D.Z > 0) //Up
updated = true;
// update avatar movement flags. the avatar coordinate system is as follows:
//
// +X (forward)
//
// ^
// |
// |
// |
// |
// (left) +Y <--------o--------> -Y
// avatar
// |
// |
// |
// |
// v
// -X
//
// based on the above avatar coordinate system, classify the movement into
// one of left/right/back/forward.
const uint noMovFlagsMask = (uint)(~(Dir_ControlFlags.DIR_CONTROL_FLAG_BACK |
Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD | Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT |
Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT | Dir_ControlFlags.DIR_CONTROL_FLAG_UP |
Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN));
MovementFlag &= noMovFlagsMask;
uint tmpAgentControlFlags = (uint)m_AgentControlFlags;
tmpAgentControlFlags &= noMovFlagsMask;
if (LocalVectorToTarget3D.X < 0) //MoveBack
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_BACK;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_BACK;
updated = true;
}
else if (LocalVectorToTarget3D.X > 0) //Move Forward
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD;
updated = true;
}
if (LocalVectorToTarget3D.Y > 0) //MoveLeft
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT;
updated = true;
}
else if (LocalVectorToTarget3D.Y < 0) //MoveRight
{
MovementFlag |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT;
tmpAgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT;
updated = true;
}
if (LocalVectorToTarget3D.Z > 0) //Up
{
// Don't set these flags for up or down - doing so will make the avatar crouch or
// keep trying to jump even if walking along level ground
//MovementFlag += (byte)(uint)Dir_ControlFlags.DIR_CONTROL_FLAG_UP;
//AgentControlFlags
//AgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_UP;
updated = true;
}
else if (LocalVectorToTarget3D.Z < 0) //Down
{
//MovementFlag += (byte)(uint)Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN;
//AgentControlFlags |= (uint)Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN;
updated = true;
}
else if (LocalVectorToTarget3D.Z < 0) //Down
updated = true;
// m_log.DebugFormat(
// "[SCENE PRESENCE]: HandleMoveToTargetUpdate adding {0} to move vector {1} for {2}",
// LocalVectorToTarget3D, agent_control_v3, Name);
m_AgentControlFlags = (AgentManager.ControlFlags) tmpAgentControlFlags;
m_AgentControlFlags = (AgentManager.ControlFlags) tmpAgentControlFlags;
if(updated)
agent_control_v3 += LocalVectorToTarget3D;
}
catch (Exception e)
{
//Avoid system crash, can be slower but...
m_log.DebugFormat("Crash! {0}", e.ToString());
}
}
catch (Exception e)
{
//Avoid system crash, can be slower but...
m_log.DebugFormat("Crash! {0}", e.ToString());
}
return updated;
// AddNewMovement(agent_control_v3);
}
public void MoveToTargetHandle(Vector3 pos, bool noFly, bool landAtTarget)
{
MoveToTarget(pos, noFly, landAtTarget);
}
/// <summary>
/// Move to the given target over time.
/// </summary>
@ -3039,7 +3058,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="landAtTarget">
/// If true and the avatar starts flying during the move then land at the target.
/// </param>
public void MoveToTarget(Vector3 pos, bool noFly, bool landAtTarget)
public void MoveToTarget(Vector3 pos, bool noFly, bool landAtTarget, float tau = -1f)
{
m_delayedStop = -1;
@ -3073,30 +3092,36 @@ namespace OpenSim.Region.Framework.Scenes
// "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}",
// Name, pos, terrainHeight, m_scene.RegionInfo.RegionName);
terrainHeight += Appearance.AvatarHeight; // so 1.5 * AvatarHeight above ground at target
bool shouldfly = Flying;
if (noFly)
shouldfly = false;
else if (pos.Z > terrainHeight || Flying)
shouldfly = true;
LandAtTarget = landAtTarget;
MovingToTarget = true;
MoveToPositionTarget = pos;
Flying = shouldfly;
// Rotate presence around the z-axis to point in same direction as movement.
// Ignore z component of vector
Vector3 localVectorToTarget3D = pos - AbsolutePosition;
// m_log.DebugFormat("[SCENE PRESENCE]: Local vector to target is {0},[1}", localVectorToTarget3D.X,localVectorToTarget3D.Y);
// Calculate the yaw.
Vector3 angle = new Vector3(0, 0, (float)(Math.Atan2(localVectorToTarget3D.Y, localVectorToTarget3D.X)));
m_movingToTarget = true;
LandAtTarget = landAtTarget;
m_moveToPositionTarget = pos;
if(tau > 0)
{
if(tau < Scene.FrameTime)
tau = Scene.FrameTime;
m_moveToSpeed = localVectorToTarget3D.Length() / tau;
if(m_moveToSpeed < 0.5f) //to tune
m_moveToSpeed = 0.5f;
else if(m_moveToSpeed > 50f)
m_moveToSpeed = 50f;
// m_log.DebugFormat("[SCENE PRESENCE]: Angle is {0}", angle);
SetAlwaysRun = false;
}
else
m_moveToSpeed = 4.096f * m_speedModifier;
Rotation = Quaternion.CreateFromEulers(angle);
// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, Rotation);
Flying = shouldfly;
Vector3 control = Vector3.Zero;
if(HandleMoveToTargetUpdate(1f, ref control))
@ -3110,7 +3135,8 @@ namespace OpenSim.Region.Framework.Scenes
{
// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name);
MovingToTarget = false;
m_movingToTarget = false;
m_moveToSpeed = -1f;
// MoveToPositionTarget = Vector3.Zero;
// lock(m_forceToApplyLock)
// m_forceToApplyValid = false; // cancel possible last action
@ -3294,7 +3320,7 @@ namespace OpenSim.Region.Framework.Scenes
RemoveFromPhysicalScene();
}
if (MovingToTarget)
if (m_movingToTarget)
ResetMoveToTarget();
Velocity = Vector3.Zero;
@ -3436,7 +3462,7 @@ namespace OpenSim.Region.Framework.Scenes
RemoveFromPhysicalScene();
if (MovingToTarget)
if (m_movingToTarget)
ResetMoveToTarget();
Velocity = Vector3.Zero;
@ -3716,8 +3742,12 @@ namespace OpenSim.Region.Framework.Scenes
if ((vec.Z == 0f) && !Flying)
direc.Z = 0f; // Prevent camera WASD up.
bool notmvtrgt = !m_movingToTarget || m_moveToSpeed <= 0;
// odd rescalings
direc *= 0.032f * 128f * SpeedModifier * thisAddSpeedModifier;
if(notmvtrgt)
direc *= 4.096f * SpeedModifier * thisAddSpeedModifier;
else
direc *= m_moveToSpeed;
// m_log.DebugFormat("[SCENE PRESENCE]: Force to apply before modification was {0} for {1}", direc, Name);
@ -3735,12 +3765,12 @@ namespace OpenSim.Region.Framework.Scenes
// landing situation, prevent avatar moving or it may fail to land
// animator will handle this condition and do the land
direc = Vector3.Zero;
else
else if(notmvtrgt)
direc *= 4.0f;
}
else if (IsColliding)
{
if (direc.Z > 2.0f) // reinforce jumps
if (direc.Z > 2.0f && notmvtrgt) // reinforce jumps
{
direc.Z *= 2.6f;
}
@ -3780,7 +3810,7 @@ namespace OpenSim.Region.Framework.Scenes
if (IsInTransit || IsLoggingIn)
return;
if(MovingToTarget)
if(m_movingToTarget)
{
m_delayedStop = -1;
Vector3 control = Vector3.Zero;

4
OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
View File

@ -133,6 +133,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
{
using (XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
@ -147,6 +150,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
}
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xml);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null)

32
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
{
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
{
try
{
@ -255,6 +255,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
try
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData);
XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart");
@ -266,18 +267,29 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
return null;
}
StringReader sr = new StringReader(parts[0].OuterXml);
XmlTextReader reader = new XmlTextReader(sr);
SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
reader.Close();
sr.Close();
SceneObjectGroup sceneObject;
using(StringReader sr = new StringReader(parts[0].OuterXml))
{
using(XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
}
}
// Then deal with the rest
SceneObjectPart part;
for (int i = 1; i < parts.Count; i++)
{
sr = new StringReader(parts[i].OuterXml);
reader = new XmlTextReader(sr);
SceneObjectPart part = SceneObjectPart.FromXml(reader);
using(StringReader sr = new StringReader(parts[i].OuterXml))
{
using(XmlTextReader reader = new XmlTextReader(sr))
{
part = SceneObjectPart.FromXml(reader);
}
}
int originalLinkNum = part.LinkNum;
@ -288,8 +300,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
if (originalLinkNum != 0)
part.LinkNum = originalLinkNum;
reader.Close();
sr.Close();
}
XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");

13
OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
View File

@ -49,14 +49,19 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
XmlNode rootNode;
if (fileName.StartsWith("http:") || File.Exists(fileName))
{
XmlTextReader reader = new XmlTextReader(fileName);
reader.WhitespaceHandling = WhitespaceHandling.None;
doc.Load(reader);
reader.Close();
using(XmlTextReader reader = new XmlTextReader(fileName))
{
reader.WhitespaceHandling = WhitespaceHandling.None;
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
doc.Load(reader);
}
rootNode = doc.FirstChild;
foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{

16
OpenSim/Region/Framework/Scenes/TerrainChannel.cs
View File

@ -196,13 +196,15 @@ namespace OpenSim.Region.Framework.Scenes
// ITerrainChannel.LoadFromXmlString()
public void LoadFromXmlString(string data)
{
StringReader sr = new StringReader(data);
XmlTextReader reader = new XmlTextReader(sr);
reader.Read();
ReadXml(reader);
reader.Close();
sr.Close();
using(StringReader sr = new StringReader(data))
{
using(XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.XmlResolver = null;
ReadXml(reader);
}
}
}
// ITerrainChannel.Merge

4
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
View File

@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(sp.AbsolutePosition.Z, Is.EqualTo(startPos.Z));
Assert.That(sp.AbsolutePosition.Z, Is.LessThan(targetPos.X));
m_scene.Update(10);
m_scene.Update(50);
double distanceToTarget = Util.GetDistanceTo(sp.AbsolutePosition, targetPos);
Assert.That(distanceToTarget, Is.LessThan(1), "Avatar not within 1 unit of target position on first move");
@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(sp.AbsolutePosition.Y, Is.EqualTo(startPos.Y));
Assert.That(sp.AbsolutePosition.Z, Is.EqualTo(startPos.Z));
m_scene.Update(10);
m_scene.Update(50);
distanceToTarget = Util.GetDistanceTo(sp.AbsolutePosition, targetPos);
Assert.That(distanceToTarget, Is.LessThan(1), "Avatar not within 1 unit of target position on second move");

7
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -1125,6 +1125,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
return null;
doc = new XmlDocument();
doc.XmlResolver = null;
// Let's serialize all calls to Vivox. Most of these are driven by
// the clients (CAPs), when the user arrives at the region. We don't
@ -1146,7 +1147,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse())
using (Stream s = rsp.GetResponseStream())
using (XmlTextReader rdr = new XmlTextReader(s))
doc.Load(rdr);
{
rdr.DtdProcessing = DtdProcessing.Prohibit;
rdr.XmlResolver = null;
doc.Load(rdr);
}
}
catch (Exception e)
{

1
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
View File

@ -207,6 +207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public static void Deserialize(string xml, ScriptInstance instance)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<string, object> vars = instance.GetVars();

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -2098,6 +2098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
string xml = instance.GetXMLState();
XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
bool loadedState = true;
try
{
@ -2253,6 +2254,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false;
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try
{

2
OpenSim/Server/Base/ServerUtils.cs
View File

@ -513,7 +513,7 @@ namespace OpenSim.Server.Base
Dictionary<string, object> ret = new Dictionary<string, object>();
XmlDocument doc = new XmlDocument();
doc.XmlResolver = null;
try
{
doc.LoadXml(data);

2
OpenSim/Server/Handlers/GridUser/GridUserServerConnector.cs
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));
}

63
OpenSim/Server/Handlers/MuteList/MuteListServerConnector.cs Normal file
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));
}
}
}

240
OpenSim/Server/Handlers/MuteList/MuteListServerPostHandler.cs Normal file
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);
}
}
}

183
OpenSim/Services/Connectors/MuteList/MuteListServicesConnector.cs Normal file
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;
}
}
}

5
bin/Robust.HG.ini.example
View File

@ -110,6 +110,8 @@
;; Uncomment if you want to have centralized estate data
; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
MuteListConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MuteListServiceConnector"
;; Additions for Hypergrid
GatekeeperServiceInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector"
@ -815,3 +817,6 @@
LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
BaseDirectory = "./bakes"
[MuteListService]
LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"

5
bin/Robust.ini.example
View File

@ -101,6 +101,8 @@
;; Uncomment if you want to have centralized estate data
; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
MuteListConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MuteListServiceConnector"
; * This is common for all services, it's the network setup for the entire
; * server instance, if none is specified above
; *
@ -569,3 +571,6 @@
LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
BaseDirectory = "./bakes"
[MuteListService]
LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"

1
bin/config-include/Grid.ini
View File

@ -25,6 +25,7 @@
LandServices = "RemoteLandServicesConnector"
MapImageService = "MapImageServiceModule"
SearchModule = "BasicSearchModule"
MuteListService = "RemoteMuteListServicesConnector"
LandServiceInConnector = true
NeighbourServiceInConnector = true

3
bin/config-include/GridCommon.ini.example
View File

@ -244,3 +244,6 @@
;; Capability assigned by the grid administrator for the simulator
;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
[MuteListService]
MuteListServerURI = "${Const|BaseURL}:${Const|PrivatePort}"

1
bin/config-include/GridHypergrid.ini
View File

@ -30,6 +30,7 @@
MapImageService = "MapImageServiceModule"
UserManagementModule = "HGUserManagementModule"
SearchModule = "BasicSearchModule"
MuteListService = "RemoteMuteListServicesConnector"
LandServiceInConnector = true
NeighbourServiceInConnector = true