ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

useless ms xml things

Browse Source
This commit is contained in:
UbitUmarov
2021-12-14 16:04:45 +00:00
parent da4d4149f0
commit a0e039e876
21 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Capabilities/LLSD.cs
View File

@@ -83,6 +83,8 @@ namespace OpenSim.Framework.Capabilities
{
using (XmlTextReader reader = new XmlTextReader(st))
{
reader.DtdProcessing = DtdProcessing.Ignore;
reader.Read();
SkipWS(reader);
@@ -146,7 +148,7 @@ namespace OpenSim.Framework.Capabilities
writer.WriteString(obj.ToString());
writer.WriteEndElement();
}
else if (obj is double)
else if (obj is double || obj is float)
{
writer.WriteStartElement(String.Empty, "real", String.Empty);
writer.WriteString(obj.ToString());

4
OpenSim/Framework/PhysicsInertia.cs
View File

@@ -191,12 +191,14 @@ namespace OpenSim.Framework
PhysicsInertiaData v;
UTF8Encoding enc = new UTF8Encoding();
using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
{
using(XmlTextReader xreader = new XmlTextReader(ms))
{
xreader.DtdProcessing = DtdProcessing.Ignore;
v = new PhysicsInertiaData();
v.FromXml2(xreader, out error);
}
}
if (error)
return null;

1
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -1558,6 +1558,7 @@ namespace OpenSim.Framework
{
using (XmlTextReader xtr = new XmlTextReader(sr))
{
xtr.DtdProcessing = DtdProcessing.Ignore;
xtr.MoveToContent();
string type = xtr.GetAttribute("type");

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

@@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Text;
using System.Xml;
using log4net;
using OpenMetaverse;
@@ -221,7 +222,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.Ignore}))
{
TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);

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

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

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

@@ -69,6 +69,7 @@ namespace OpenSim.Framework.Serialization.External
StringReader sr = new StringReader(serializedSettings);
XmlTextReader xtr = new XmlTextReader(sr);
xtr.DtdProcessing = DtdProcessing.Ignore;
xtr.ReadStartElement("RegionSettings");

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

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

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

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

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

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

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

@@ -122,6 +122,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
{
using(XmlTextReader sr = new XmlTextReader(s))
{
sr.DtdProcessing = DtdProcessing.Ignore;
sr.ReadStartElement("BakedAppearance");
while (sr.LocalName == "BakedTexture")
{

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

@@ -1192,6 +1192,7 @@ 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.Ignore;
// Loaded metadata will be empty if no information exists in the archive
dearchivedScenes.LoadedCreationDateTime = 0;

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

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

2
OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
View File

@@ -720,6 +720,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
string xml = SceneObjectSerializer.ToOriginalXmlFormat(so);
XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
xtr.DtdProcessing = DtdProcessing.Ignore;
xtr.ReadStartElement("SceneObjectGroup");
xtr.ReadStartElement("RootPart");
xtr.ReadStartElement("SceneObjectPart");
@@ -831,6 +832,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options);
XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
xtr.DtdProcessing = DtdProcessing.Ignore;
xtr.ReadStartElement("SceneObjectGroup");
xtr.ReadStartElement("SceneObjectPart");

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

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

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

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

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

@@ -2543,7 +2543,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.Ignore}))
{
reader.Read();
bool isSingleObject = reader.Name != "CoalescedObject";

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

@@ -132,6 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
// Quickly check if this is a coalesced object, without fully parsing the XML
using (XmlTextReader reader = new XmlTextReader(new StringReader(xml)))
{
reader.DtdProcessing = DtdProcessing.Ignore;
reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
@@ -196,22 +197,27 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
return false;
if (data[len - 1] == 0)
--len;
MemoryStream ms;
XmlDocument doc;
// Quickly check if this is a coalesced object, without fully parsing the XML
MemoryStream ms = new MemoryStream(data, 0, len, false);
StreamReader sr = new StreamReader(ms, Encoding.UTF8);
using (XmlTextReader reader = new XmlTextReader(sr))
{
reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
{
return false;
}
}
XmlDocument doc = new XmlDocument();
using (ms = new MemoryStream(data, 0, len, false))
{
using(StreamReader sr = new StreamReader(ms, Encoding.UTF8))
{
using (XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Ignore;
reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
return false;
}
}
ms.Seek(0, SeekOrigin.Begin);
doc = new XmlDocument();
doc.Load(ms);
}
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null)

9
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.Ignore }))
{
try
{
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
}
}
}
/*
public static SceneObjectGroup FromOriginalXmlData(byte[] data)
{
int len = data.Length;
@@ -104,6 +104,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
}
}
}
*/
/// <summary>
/// Deserialize a scene object from the original xml format
@@ -295,7 +296,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
using(StringReader sr = new StringReader(parts[0].OuterXml))
{
using(XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Ignore;
sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
}
}
// Then deal with the rest
@@ -306,6 +310,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
{
using(XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Ignore;
part = SceneObjectPart.FromXml(reader);
}
}

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

@@ -55,6 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
{
using(XmlTextReader reader = new XmlTextReader(fileName))
{
reader.DtdProcessing = DtdProcessing.Ignore;
reader.WhitespaceHandling = WhitespaceHandling.None;
doc.Load(reader);
@@ -236,7 +237,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// <param name="fileName"></param>
public static void LoadPrimsFromXml2(Scene scene, string fileName)
{
LoadPrimsFromXml2(scene, new XmlTextReader(fileName), false);
var xr = new XmlTextReader(fileName);
xr.DtdProcessing = DtdProcessing.Ignore;
LoadPrimsFromXml2(scene, xr , false);
}
/// <summary>
@@ -247,7 +250,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// <param name="startScripts"></param>
public static void LoadPrimsFromXml2(Scene scene, TextReader reader, bool startScripts)
{
LoadPrimsFromXml2(scene, new XmlTextReader(reader), startScripts);
var xr = new XmlTextReader(reader);
xr.DtdProcessing = DtdProcessing.Ignore;
LoadPrimsFromXml2(scene, xr, startScripts);
}
/// <summary>
@@ -258,7 +263,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// <param name="startScripts"></param>
protected static void LoadPrimsFromXml2(Scene scene, XmlTextReader reader, bool startScripts)
{
XmlDocument doc = new XmlDocument();
reader.DtdProcessing = DtdProcessing.Ignore;
reader.WhitespaceHandling = WhitespaceHandling.None;
doc.Load(reader);
reader.Close();

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

@@ -196,7 +196,10 @@ namespace OpenSim.Region.Framework.Scenes
using(StringReader sr = new StringReader(data))
{
using(XmlTextReader reader = new XmlTextReader(sr))
{
reader.DtdProcessing = DtdProcessing.Ignore;
ReadXml(reader);
}
}
}

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

@@ -711,6 +711,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
response.RawBuffer = Util.UTF8.GetBytes("<llsd><undef /></llsd>");
}
/*
/// <summary>
/// Callback for a client request for a private chat channel
/// </summary>
@@ -736,6 +737,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
response.RawBuffer = Util.UTF8.GetBytes("<llsd>true</llsd>");
response.StatusCode = (int)HttpStatusCode.OK;
}
*/
private string RegionGetOrCreateChannel(Scene scene, LandData land)
{
@@ -1183,7 +1185,10 @@ 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.Ignore;
doc.Load(rdr);
}
}
catch (Exception e)
{