diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchLib2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchLib2Handler.cs new file mode 100644 index 0000000000..277d701c6c --- /dev/null +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchLib2Handler.cs @@ -0,0 +1,115 @@ +/* + * 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.Net; +using System.Reflection; +using System.Text; +using OpenMetaverse; +using OpenMetaverse.StructuredData; +using OpenSim.Framework; +using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Services.Interfaces; +using OSDArray = OpenMetaverse.StructuredData.OSDArray; +using OSDMap = OpenMetaverse.StructuredData.OSDMap; + +using log4net; + +namespace OpenSim.Capabilities.Handlers +{ + public class FetchLib2Handler + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + private IInventoryService m_inventoryService; + private ILibraryService m_LibraryService; + private UUID m_agentID; + private UUID libOwner; + + public FetchLib2Handler(IInventoryService invService, ILibraryService libraryService, UUID agentId) + { + m_inventoryService = invService; + m_agentID = agentId; + m_LibraryService = libraryService; + if(libraryService != null) + libOwner = m_LibraryService.LibraryRootFolder.Owner; + } + + public void FetchLibSimpleRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, OSDMap requestmap, ExpiringKey BadRequests) + { + //m_log.DebugFormat("[FETCH LIB INVENTORY HANDLER]: Received FetchInventory capability request {0}", request); + + if (BadRequests == null) + { + httpResponse.StatusCode = (int)HttpStatusCode.NotFound; + return; + } + + if (m_LibraryService == null || m_agentID == UUID.Zero) + { + httpResponse.StatusCode = (int)HttpStatusCode.NotFound; + return; + } + + OSDArray itemsRequested = (OSDArray)requestmap["items"]; + UUID[] itemIDs = new UUID[itemsRequested.Count]; + int i = 0; + foreach (OSDMap osdItemId in itemsRequested) + { + UUID id = osdItemId["item_id"].AsUUID(); + if (!BadRequests.ContainsKey(id)) + itemIDs[i++] = id; + } + + InventoryItemBase[] items = null; + + //items = m_inventoryService.GetMultipleItems(libOwner, itemIDs); + items = m_LibraryService.GetMultipleItems(itemIDs); + + osUTF8 lsl = LLSDxmlEncode2.Start(4096); + LLSDxmlEncode2.AddMap(lsl); + LLSDxmlEncode2.AddElem("agent_id", m_agentID, lsl); + if(items == null || items.Length == 0) + { + LLSDxmlEncode2.AddEmptyArray("items", lsl); + } + else + { + LLSDxmlEncode2.AddArray("items", lsl); + foreach (InventoryItemBase item in items) + { + if (item != null) + item.ToLLSDxml(lsl); + } + LLSDxmlEncode2.AddEndArray(lsl); + } + + LLSDxmlEncode2.AddEndMap(lsl); + httpResponse.RawBuffer = LLSDxmlEncode2.EndToBytes(lsl); + httpResponse.StatusCode = (int)HttpStatusCode.OK; + } + } +} diff --git a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs index b256d7ff8a..2568ce2ac4 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs @@ -49,14 +49,18 @@ namespace OpenSim.Region.ClientStack.Linden // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public bool Enabled { get; private set; } + private bool m_enabledLib; private int m_nScenes; private IInventoryService m_inventoryService = null; private ILibraryService m_LibraryService = null; private string m_fetchInventory2Url; + private ExpiringKey m_badRequests; + private string m_fetchLib2Url; + #region ISharedRegionModule Members public void Initialise(IConfigSource source) @@ -66,9 +70,12 @@ namespace OpenSim.Region.ClientStack.Linden return; m_fetchInventory2Url = config.GetString("Cap_FetchInventory2", string.Empty); + m_fetchLib2Url = config.GetString("Cap_FetchLib2", "localhost"); if (m_fetchInventory2Url != string.Empty) Enabled = true; + if (m_fetchInventory2Url != string.Empty) + m_enabledLib = true; } public void AddRegion(Scene s) @@ -127,6 +134,14 @@ namespace OpenSim.Region.ClientStack.Linden private void RegisterCaps(UUID agentID, Caps caps) { if (m_fetchInventory2Url == "localhost") + RegisterFetchCap(agentID, caps, m_fetchInventory2Url); + if(m_enabledLib) + RegisterFetchLibCap(agentID, caps, "FetchLib2", m_fetchLib2Url); + } + + private void RegisterFetchCap(UUID agentID, Caps caps, string url) + { + if (url == "localhost") { FetchInventory2Handler fetchHandler = new FetchInventory2Handler(m_inventoryService, agentID); caps.RegisterSimpleHandler("FetchInventory2", @@ -138,12 +153,33 @@ namespace OpenSim.Region.ClientStack.Linden } else { - caps.RegisterHandler("FetchInventory2", m_fetchInventory2Url); + caps.RegisterHandler("FetchInventory2", url); } -// m_log.DebugFormat( -// "[FETCH INVENTORY2 MODULE]: Registered capability {0} at {1} in region {2} for {3}", -// capName, capUrl, m_scene.RegionInfo.RegionName, agentID); + //m_log.DebugFormat( + // "[FETCH INVENTORY2 MODULE]: Registered capability FetchInventory2 at {0} in region {1} for {2}", + // capUrl, m_scene.RegionInfo.RegionName, agentID); + } + + private void RegisterFetchLibCap(UUID agentID, Caps caps, string capName, string url) + { + if (url == "localhost") + { + FetchLib2Handler fetchHandler = new FetchLib2Handler(m_inventoryService, m_LibraryService, agentID); + caps.RegisterSimpleHandler("FetchLib2", + new SimpleOSDMapHandler("POST", "/" + UUID.Random(), delegate (IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, OSDMap map) + { + fetchHandler.FetchLibSimpleRequest(httpRequest, httpResponse, map, m_badRequests); + } + )); + } + else + { + caps.RegisterHandler("FetchLib2", url); + } + //m_log.DebugFormat( + // "[FETCH INVENTORY2 MODULE]: Registered capability FetchLib2 at {0} in region {1} for {2}", + // capUrl, m_scene.RegionInfo.RegionName, agentID); } } } diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 407e78ad11..2308db2684 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -844,6 +844,11 @@ Cap_FetchInventoryDescendents2 = "localhost" Cap_FetchInventory2 = "localhost" + ; do uncomment Cap_FetchLib2 for now + ; Current viewers do not suport it for opensim. + ; in same requests they use a hard coded ll library owner id. + ;Cap_FetchLib2 = "localhost" + ; Capability for searching for people Cap_AvatarPickerSearch = "localhost"