From e9153e1d1aae50024d8cd05fe14a9bce34343a0e Mon Sep 17 00:00:00 2001
From: teravus
Date: Thu, 15 Nov 2012 10:05:16 -0500
Subject: Revert "Merge master into teravuswork", it should have been
avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
---
.../Server/Handlers/Asset/AssetServerConnector.cs | 20 +--------
.../Handlers/Asset/AssetServerDeleteHandler.cs | 47 ++++------------------
.../Handlers/Avatar/AvatarServerPostHandler.cs | 18 ---------
3 files changed, 8 insertions(+), 77 deletions(-)
(limited to 'OpenSim/Server/Handlers')
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index ff45d94..46b0c67 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -67,25 +67,10 @@ 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, allowedRemoteDeleteTypes));
+ server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete));
MainConsole.Instance.Commands.AddCommand("Assets", false,
"show asset",
@@ -156,9 +141,6 @@ 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 986394b..0cfe5b1 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -42,32 +42,18 @@ using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Server.Handlers.Asset
{
- ///
- /// Remote deletes allowed.
- ///
- 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;
- ///
- /// Asset types that can be deleted remotely.
- ///
- private AllowedRemoteDeleteTypes m_allowedTypes;
-
- public AssetServerDeleteHandler(IAssetService service, AllowedRemoteDeleteTypes allowedTypes) :
+ public AssetServerDeleteHandler(IAssetService service, bool allowDelete) :
base("DELETE", "/assets")
{
m_AssetService = service;
- m_allowedTypes = allowedTypes;
+ m_allowDelete = allowDelete;
}
public override byte[] Handle(string path, Stream request,
@@ -77,32 +63,13 @@ namespace OpenSim.Server.Handlers.Asset
string[] p = SplitParams(path);
- if (p.Length > 0)
+ if (p.Length > 0 && m_allowDelete)
{
- 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);
- }
- }
- }
+ result = m_AssetService.Delete(p[0]);
}
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 8cd747e..393584e 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -137,8 +137,6 @@ 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();
@@ -155,25 +153,11 @@ 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();
}
-
- ///
- /// Remove parameters that were used to invoke the method and should not in themselves be persisted.
- ///
- ///
- private void RemoveRequestParamsNotForStorage(Dictionary request)
- {
- request.Remove("VERSIONMAX");
- request.Remove("VERSIONMIN");
- request.Remove("METHOD");
- request.Remove("UserID");
- }
byte[] SetItems(Dictionary request)
{
@@ -189,8 +173,6 @@ namespace OpenSim.Server.Handlers.Avatar
if (!(request["Names"] is List || request["Values"] is List))
return FailureResult();
- RemoveRequestParamsNotForStorage(request);
-
List _names = (List)request["Names"];
names = _names.ToArray();
List _values = (List)request["Values"];
--
cgit v1.1