From ce62824b1f57308ca463386783c907d4d8c5696f Mon Sep 17 00:00:00 2001
From: AliciaRaven
Date: Sun, 2 Aug 2015 20:02:36 +0100
Subject: Add HGFSAssetService to the HypergridService to provide HG support
for FSAssets.
---
OpenSim/Services/FSAssetService/FSAssetService.cs | 10 +-
.../Services/HypergridService/HGFSAssetService.cs | 189 +++++++++++++++++++++
2 files changed, 194 insertions(+), 5 deletions(-)
create mode 100644 OpenSim/Services/HypergridService/HGFSAssetService.cs
(limited to 'OpenSim/Services')
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
index c2e379b..1bab687 100644
--- a/OpenSim/Services/FSAssetService/FSAssetService.cs
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -330,7 +330,7 @@ namespace OpenSim.Services.FSAssetService
return Path.Combine(HashToPath(hash), hash);
}
- public AssetBase Get(string id)
+ public virtual AssetBase Get(string id)
{
string hash;
@@ -434,13 +434,13 @@ namespace OpenSim.Services.FSAssetService
}
}
- public AssetMetadata GetMetadata(string id)
+ public virtual AssetMetadata GetMetadata(string id)
{
string hash;
return m_DataConnector.Get(id, out hash);
}
- public byte[] GetData(string id)
+ public virtual byte[] GetData(string id)
{
string hash;
if (m_DataConnector.Get(id, out hash) == null)
@@ -521,7 +521,7 @@ namespace OpenSim.Services.FSAssetService
}
- public string Store(AssetBase asset)
+ public virtual string Store(AssetBase asset)
{
return Store(asset, false);
}
@@ -606,7 +606,7 @@ namespace OpenSim.Services.FSAssetService
// return true;
}
- public bool Delete(string id)
+ public virtual bool Delete(string id)
{
m_DataConnector.Delete(id);
diff --git a/OpenSim/Services/HypergridService/HGFSAssetService.cs b/OpenSim/Services/HypergridService/HGFSAssetService.cs
new file mode 100644
index 0000000..54e8ccb
--- /dev/null
+++ b/OpenSim/Services/HypergridService/HGFSAssetService.cs
@@ -0,0 +1,189 @@
+/*
+ * 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.Reflection;
+
+using Nini.Config;
+using log4net;
+using OpenMetaverse;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.FSAssetService;
+
+namespace OpenSim.Services.HypergridService
+{
+ ///
+ /// Hypergrid asset service. It serves the IAssetService interface,
+ /// but implements it in ways that are appropriate for inter-grid
+ /// asset exchanges. This version is for FSAssets.
+ ///
+ public class HGFSAssetService : FSAssetConnector, IAssetService
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(
+ MethodBase.GetCurrentMethod().DeclaringType);
+
+ private string m_HomeURL;
+ private IUserAccountService m_UserAccountService;
+
+ private UserAccountCache m_Cache;
+
+ private AssetPermissions m_AssetPerms;
+
+ public HGFSAssetService(IConfigSource config, string configName) : base(config, "AssetService")
+ {
+ m_log.Debug("[HGAsset Service]: Starting in FSAsset mode");
+ IConfig assetConfig = config.Configs[configName];
+ if (assetConfig == null)
+ throw new Exception("No HGAssetService configuration");
+
+ string userAccountsDll = assetConfig.GetString("UserAccountsService", string.Empty);
+ if (userAccountsDll == string.Empty)
+ throw new Exception("Please specify UserAccountsService in HGAssetService configuration");
+
+ Object[] args = new Object[] { config };
+ m_UserAccountService = ServerUtils.LoadPlugin(userAccountsDll, args);
+ if (m_UserAccountService == null)
+ throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
+
+ m_HomeURL = Util.GetConfigVarFromSections(config, "HomeURI",
+ new string[] { "Startup", "Hypergrid", configName }, string.Empty);
+ if (m_HomeURL == string.Empty)
+ throw new Exception("[HGAssetService] No HomeURI specified");
+
+ m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
+
+ // Permissions
+ m_AssetPerms = new AssetPermissions(assetConfig);
+ }
+
+ #region IAssetService overrides
+ public override AssetBase Get(string id)
+ {
+ AssetBase asset = base.Get(id);
+
+ if (asset == null)
+ return null;
+
+ if (!m_AssetPerms.AllowedExport(asset.Type))
+ return null;
+
+ if (asset.Metadata.Type == (sbyte)AssetType.Object)
+ asset.Data = AdjustIdentifiers(asset.Data);
+
+ AdjustIdentifiers(asset.Metadata);
+
+ return asset;
+ }
+
+ public override AssetMetadata GetMetadata(string id)
+ {
+ AssetMetadata meta = base.GetMetadata(id);
+
+ if (meta == null)
+ return null;
+
+ AdjustIdentifiers(meta);
+
+ return meta;
+ }
+
+ public override byte[] GetData(string id)
+ {
+ AssetBase asset = Get(id);
+
+ if (asset == null)
+ return null;
+
+ if (!m_AssetPerms.AllowedExport(asset.Type))
+ return null;
+
+ // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+ // Fix bad assets before sending them elsewhere
+ if (asset.Type == (int)AssetType.Object && asset.Data != null)
+ {
+ string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+ asset.Data = Utils.StringToBytes(xml);
+ }
+
+ return asset.Data;
+ }
+
+ //public virtual bool Get(string id, Object sender, AssetRetrieved handler)
+
+ public override string Store(AssetBase asset)
+ {
+ if (!m_AssetPerms.AllowedImport(asset.Type))
+ return string.Empty;
+
+ // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+ // Fix bad assets before storing on this server
+ if (asset.Type == (int)AssetType.Object && asset.Data != null)
+ {
+ string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+ asset.Data = Utils.StringToBytes(xml);
+ }
+
+ return base.Store(asset);
+ }
+
+ public override bool Delete(string id)
+ {
+ // NOGO
+ return false;
+ }
+
+ #endregion
+
+ protected void AdjustIdentifiers(AssetMetadata meta)
+ {
+ if (meta == null || m_Cache == null)
+ return;
+
+ UserAccount creator = m_Cache.GetUser(meta.CreatorID);
+ if (creator != null)
+ meta.CreatorID = meta.CreatorID + ";" + m_HomeURL + "/" + creator.FirstName + " " + creator.LastName;
+ }
+
+ // Only for Object
+ protected byte[] AdjustIdentifiers(byte[] data)
+ {
+ string xml = Utils.BytesToString(data);
+
+ // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+ // Fix bad assets before sending them elsewhere
+ xml = ExternalRepresentationUtils.SanitizeXml(xml);
+
+ return Utils.StringToBytes(ExternalRepresentationUtils.RewriteSOP(xml, "HGAssetService", m_HomeURL, m_Cache, UUID.Zero));
+ }
+
+ }
+
+}
--
cgit v1.1