3 files changed, 77 insertions, 8 deletions

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 46b0c67..ff45d94 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -67,10 +67,25 @@ namespace OpenSim.Server.Handlers.Asset
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
             bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false);
+            bool allowDeleteAllTypes = serverConfig.GetBoolean("AllowRemoteDeleteAllTypes", false);
+
+            AllowedRemoteDeleteTypes allowedRemoteDeleteTypes;
+
+            if (!allowDelete)
+            {
+                allowedRemoteDeleteTypes = AllowedRemoteDeleteTypes.None;
+            }
+            else
+            {
+                if (allowDeleteAllTypes)
+                    allowedRemoteDeleteTypes = AllowedRemoteDeleteTypes.All;
+                else
+                    allowedRemoteDeleteTypes = AllowedRemoteDeleteTypes.MapTile;
+            }
 
             server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
-            server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete));
+            server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowedRemoteDeleteTypes));
 
             MainConsole.Instance.Commands.AddCommand("Assets", false,
                     "show asset",
@@ -141,6 +156,9 @@ namespace OpenSim.Server.Handlers.Asset
             }
             
             string fileName = rawAssetId;
+
+            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
+                return;
             
             using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
             {
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index 0cfe5b1..986394b 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -42,18 +42,32 @@ using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Server.Handlers.Asset
 {
+    /// <summary>
+    /// Remote deletes allowed.
+    /// </summary>
+    public enum AllowedRemoteDeleteTypes
+    {
+        None,
+        MapTile,
+        All
+    }
+
     public class AssetServerDeleteHandler : BaseStreamHandler
     {
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IAssetService m_AssetService;
-        protected bool m_allowDelete;
 
-        public AssetServerDeleteHandler(IAssetService service, bool allowDelete) :
+        /// <summary>
+        /// Asset types that can be deleted remotely.
+        /// </summary>
+        private AllowedRemoteDeleteTypes m_allowedTypes;
+
+        public AssetServerDeleteHandler(IAssetService service, AllowedRemoteDeleteTypes allowedTypes) :
                 base("DELETE", "/assets")
         {
             m_AssetService = service;
-            m_allowDelete = allowDelete;
+            m_allowedTypes = allowedTypes;
         }
 
         public override byte[] Handle(string path, Stream request,
@@ -63,13 +77,32 @@ namespace OpenSim.Server.Handlers.Asset
 
             string[] p = SplitParams(path);
 
-            if (p.Length > 0 && m_allowDelete)
+            if (p.Length > 0)
             {
-                result = m_AssetService.Delete(p[0]);
+                if (m_allowedTypes != AllowedRemoteDeleteTypes.None)
+                {
+                    string assetID = p[0];
+
+                    AssetBase asset = m_AssetService.Get(assetID);
+                    if (asset != null)
+                    {
+                        if (m_allowedTypes == AllowedRemoteDeleteTypes.All
+                            || (int)(asset.Flags & AssetFlags.Maptile) != 0)
+                        {
+                            result = m_AssetService.Delete(assetID);
+                        }
+                        else
+                        {
+                            m_log.DebugFormat(
+                                "[ASSET SERVER DELETE HANDLER]: Request to delete asset {0}, but type is {1} and allowed remote delete types are {2}",
+                                assetID, (AssetFlags)asset.Flags, m_allowedTypes);
+                        }
+                    }
+                }
             }
 
             XmlSerializer xs = new XmlSerializer(typeof(bool));
             return ServerUtils.SerializeResult(xs, result);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index 393584e..8cd747e 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -137,6 +137,8 @@ namespace OpenSim.Server.Handlers.Avatar
             if (!UUID.TryParse(request["UserID"].ToString(), out user))
                 return FailureResult();
 
+            RemoveRequestParamsNotForStorage(request);
+
             AvatarData avatar = new AvatarData(request);
             if (m_AvatarService.SetAvatar(user, avatar))
                 return SuccessResult();
@@ -153,11 +155,25 @@ namespace OpenSim.Server.Handlers.Avatar
             if (!UUID.TryParse(request["UserID"].ToString(), out user))
                 return FailureResult();
 
+            RemoveRequestParamsNotForStorage(request);
+
             if (m_AvatarService.ResetAvatar(user))
                 return SuccessResult();
 
             return FailureResult();
         }
+
+        /// <summary>
+        /// Remove parameters that were used to invoke the method and should not in themselves be persisted.
+        /// </summary>
+        /// <param name='request'></param>
+        private void RemoveRequestParamsNotForStorage(Dictionary<string, object> request)
+        {
+            request.Remove("VERSIONMAX");
+            request.Remove("VERSIONMIN");
+            request.Remove("METHOD");
+            request.Remove("UserID");
+        }
         
         byte[] SetItems(Dictionary<string, object> request)
         {
@@ -173,6 +189,8 @@ namespace OpenSim.Server.Handlers.Avatar
             if (!(request["Names"] is List<string> || request["Values"] is List<string>))
                 return FailureResult();
 
+            RemoveRequestParamsNotForStorage(request);
+
             List<string> _names = (List<string>)request["Names"];
             names = _names.ToArray();
             List<string> _values = (List<string>)request["Values"];