5 files changed, 105 insertions, 38 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index defaa9c..582df22 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -1125,7 +1125,6 @@ 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
@@ -1147,10 +1146,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse())
                     using (Stream s = rsp.GetResponseStream())
                     using (XmlTextReader rdr = new XmlTextReader(s))
-                    {
-                            rdr.ProhibitDtd = true;
                             doc.Load(rdr);
-                    }
                 }
                 catch (Exception e)
                 {
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs
index 50276ae..817170f 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Region.DataSnapshot
 //        private Scene m_scene = null;
         private DataSnapshotManager m_externalData = null;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private ExpiringCache<string, int> throotleGen = new ExpiringCache<string, int>();
 
         public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
         {
@@ -52,29 +53,91 @@ namespace OpenSim.Region.DataSnapshot
             m_externalData = externalData;
 
             //Register HTTP handler
-            if (MainServer.Instance.AddHTTPHandler("collector", OnGetSnapshot))
+            if (MainServer.UnSecureInstance.AddHTTPHandler("collector", OnGetSnapshot))
             {
                 m_log.Info("[DATASNAPSHOT]: Set up snapshot service");
             }
             // Register validation callback handler
-            MainServer.Instance.AddHTTPHandler("validate", OnValidate);
+            MainServer.UnSecureInstance.AddHTTPHandler("validate", OnValidate);
 
         }
 
+        private string GetClientString(Hashtable request)
+        {
+            string clientstring = "";
+            if (!request.ContainsKey("headers"))
+                return clientstring;
+
+            Hashtable requestinfo = (Hashtable)request["headers"];
+            if (requestinfo.ContainsKey("x-forwarded-for"))
+            {
+                object str = requestinfo["x-forwarded-for"];
+                if (str != null)
+                {
+                    if (!string.IsNullOrEmpty(str.ToString()))
+                    {
+                        return str.ToString();
+                    }
+                }
+            }
+            if (!requestinfo.ContainsKey("remote_addr"))
+                return clientstring;
+
+            object remote_addrobj = requestinfo["remote_addr"];
+            if (remote_addrobj != null)
+            {
+                if (!string.IsNullOrEmpty(remote_addrobj.ToString()))
+                {
+                    clientstring = remote_addrobj.ToString();
+                }
+            }
+
+            return clientstring;
+        }
+
         public Hashtable OnGetSnapshot(Hashtable keysvals)
         {
-            m_log.Debug("[DATASNAPSHOT] Received collection request");
             Hashtable reply = new Hashtable();
-            int statuscode = 200;
-
+            string reqtag;
             string snapObj = (string)keysvals["region"];
+            if(string.IsNullOrWhiteSpace(snapObj))
+                reqtag = GetClientString(keysvals);
+            else
+                reqtag = snapObj + GetClientString(keysvals);
+
+
+            if(!string.IsNullOrWhiteSpace(reqtag))
+            {
+                if(throotleGen.Contains(reqtag))
+                {
+                    reply["str_response_string"] = "Please try your request again later";
+                    reply["int_response_code"] = 503;
+                    reply["content_type"] = "text/plain";
+                    m_log.Debug("[DATASNAPSHOT] Collection request spam. reply try later");
+                    return reply;
+                }
+
+                throotleGen.AddOrUpdate(reqtag, 0, 60);
+            }
+
+            if(string.IsNullOrWhiteSpace(snapObj))
+                m_log.DebugFormat("[DATASNAPSHOT] Received collection request for all");
+            else
+               m_log.DebugFormat("[DATASNAPSHOT] Received collection request for {0}", snapObj);
 
             XmlDocument response = m_externalData.GetSnapshot(snapObj);
+            if(response == null)
+            {
+                reply["str_response_string"] = "Please try your request again later";
+                reply["int_response_code"] = 503;
+                reply["content_type"] = "text/plain";
+                m_log.Debug("[DATASNAPSHOT] Collection request spam. reply try later");
+                return reply;
+            }
 
             reply["str_response_string"] = response.OuterXml;
-            reply["int_response_code"] = statuscode;
+            reply["int_response_code"] = 200;
             reply["content_type"] = "text/xml";
-
             return reply;
         }
 
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
index 0436f96..fd841d4 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Reflection;
+using System.Threading;
 using System.Text;
 using System.Xml;
 using log4net;
@@ -64,6 +65,7 @@ namespace OpenSim.Region.DataSnapshot
         //Various internal objects
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         internal object m_syncInit = new object();
+        private object m_serializeGen = new object();
 
         //DataServices and networking
         private string m_dataServices = "noservices";
@@ -148,11 +150,8 @@ namespace OpenSim.Region.DataSnapshot
                         m_enabled = false;
                         return;
                     }
-
                 }
-
             }
-
         }
 
         public void AddRegion(Scene scene)
@@ -160,23 +159,14 @@ namespace OpenSim.Region.DataSnapshot
             if (!m_enabled)
                 return;
 
-            m_log.DebugFormat("[DATASNAPSHOT]: Module added to Scene {0}.", scene.RegionInfo.RegionName);
+            m_scenes.Add(scene);
 
-            if (!m_servicesNotified)
+            if (m_snapStore == null)
             {
                 m_hostname = scene.RegionInfo.ExternalHostName;
                 m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
-
-                //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
-                new DataRequestHandler(scene, this);
-
-                if (m_dataServices != "" && m_dataServices != "noservices")
-                    NotifyDataServices(m_dataServices, "online");
-
-                m_servicesNotified = true;
             }
 
-            m_scenes.Add(scene);
             m_snapStore.AddScene(scene);
 
             Assembly currentasm = Assembly.GetExecutingAssembly();
@@ -201,7 +191,7 @@ namespace OpenSim.Region.DataSnapshot
                     }
                 }
             }
-
+            m_log.DebugFormat("[DATASNAPSHOT]: Module added to Scene {0}.", scene.RegionInfo.RegionName);
         }
 
         public void RemoveRegion(Scene scene)
@@ -244,8 +234,16 @@ namespace OpenSim.Region.DataSnapshot
             if (!m_enabled)
                 return;
 
-            m_log.DebugFormat("[DATASNAPSHOT]: Marking scene {0} as stale.", scene.RegionInfo.RegionName);
-            m_snapStore.ForceSceneStale(scene);
+            if (!m_servicesNotified)
+            {
+                //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
+                new DataRequestHandler(scene, this);
+
+                if (m_dataServices != "" && m_dataServices != "noservices")
+                    NotifyDataServices(m_dataServices, "online");
+
+                m_servicesNotified = true;
+            }
         }
 
         public void Close()
@@ -257,7 +255,6 @@ namespace OpenSim.Region.DataSnapshot
                 NotifyDataServices(m_dataServices, "offline");
         }
 
-
         public string Name
         {
             get { return "External Data Generator"; }
@@ -319,8 +316,14 @@ namespace OpenSim.Region.DataSnapshot
         /**
          * Reply to the http request
          */
+
         public XmlDocument GetSnapshot(string regionName)
         {
+            if(!Monitor.TryEnter(m_serializeGen,30000))
+            {
+                return null;
+            }
+
             CheckStale();
 
             XmlDocument requestedSnap = new XmlDocument();
@@ -360,9 +363,13 @@ namespace OpenSim.Region.DataSnapshot
                 m_log.Warn("[DATASNAPSHOT]: Caught unknown exception while trying to load snapshot: " + e.StackTrace);
                 requestedSnap = GetErrorMessage(regionName, e);
             }
-
+            finally
+            {
+                Monitor.Exit(m_serializeGen);
+            }
 
             return requestedSnap;
+
         }
 
         private XmlDocument GetErrorMessage(string regionName, Exception e)
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs
index 480aaaf..0ed421a 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Region.DataSnapshot
                             snapXWriter.WriteStartDocument();
                             data.WriteTo(snapXWriter);
                             snapXWriter.WriteEndDocument();
+                            snapXWriter.Flush();
                         }
                     }
                     catch (Exception e)
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index a14d819..64513a0 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// <summary>
         /// Identifies the module to the system.
         /// </summary>
-        string IRegionModuleBase.Name
+        public string  Name
         {
             get { return "AutoBackupModule"; }
         }
@@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// <summary>
         /// We don't implement an interface, this is a single-use module.
         /// </summary>
-        Type IRegionModuleBase.ReplaceableInterface
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// Called once in the lifetime of the module at startup.
         /// </summary>
         /// <param name="source">The input config source for OpenSim.ini.</param>
-        void IRegionModuleBase.Initialise(IConfigSource source)
+        public void Initialise(IConfigSource source)
         {
             // Determine if we have been enabled at all in OpenSim.ini -- this is part and parcel of being an optional module
             m_configSource = source;
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// <summary>
         /// Called once at de-init (sim shutting down).
         /// </summary>
-        void IRegionModuleBase.Close()
+        public void Close()
         {
             if (!m_enabled)
                 return;
@@ -197,7 +197,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// Currently a no-op for AutoBackup because we have to wait for region to be fully loaded.
         /// </summary>
         /// <param name="scene"></param>
-        void IRegionModuleBase.AddRegion (Scene scene)
+        public void AddRegion (Scene scene)
         {
             if (!m_enabled)
                 return;
@@ -210,7 +210,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// Here we just clean up some resources and stop the OAR backup (if any) for the given scene.
         /// </summary>
         /// <param name="scene">The scene (region) to stop performing AutoBackup on.</param>
-        void IRegionModuleBase.RemoveRegion(Scene scene)
+        public void RemoveRegion(Scene scene)
         {
             if (m_enabled)
                 return;
@@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// We read lots of Nini config, maybe set a timer, add members to state tracking Dictionaries, etc.
         /// </summary>
         /// <param name="scene">The scene to (possibly) perform AutoBackup on.</param>
-        void IRegionModuleBase.RegionLoaded(Scene scene)
+        public void RegionLoaded(Scene scene)
         {
             if (!m_enabled)
                 return;
@@ -258,7 +258,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// <summary>
         /// Currently a no-op.
         /// </summary>
-        void ISharedRegionModule.PostInitialise()
+        public void PostInitialise()
         {
         }