From e5e1666c8467f1b2375367150288832648ee8682 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 24 Jul 2008 15:27:21 +0000 Subject: * Fix spelling mistake in OGS1SecureInvenotryService --- .../OGS1/OGS1SecureInvenotryService.cs | 324 --------------------- .../OGS1/OGS1SecureInventoryService.cs | 324 +++++++++++++++++++++ 2 files changed, 324 insertions(+), 324 deletions(-) delete mode 100644 OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs create mode 100644 OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs deleted file mode 100644 index bb94c20..0000000 --- a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs +++ /dev/null @@ -1,324 +0,0 @@ -/* - * 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 OpenSim 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.Collections.Generic; -using System.Net; -using System.Reflection; -using libsecondlife; -using log4net; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Statistics; - -namespace OpenSim.Region.Communications.OGS1 -{ - public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices - { - private static readonly ILog m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - private string _inventoryServerUrl; - private Uri m_Uri; - private Dictionary m_RequestingInventory - = new Dictionary(); - - public OGS1SecureInventoryService(string inventoryServerUrl) - { - _inventoryServerUrl = inventoryServerUrl; - m_Uri = new Uri(_inventoryServerUrl); - } - - #region IInventoryServices Members - - public string Host - { - get { return m_Uri.Host; } - } - - /// - /// - /// - /// - /// - public void RequestInventoryForUser(LLUUID userID, LLUUID session_id, InventoryReceiptCallback callback) - { - if (!m_RequestingInventory.ContainsKey(userID)) - { - m_RequestingInventory.Add(userID, callback); - - try - { - m_log.InfoFormat( - "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}", - _inventoryServerUrl, userID); - - RestSessionObjectPosterResponse requester - = new RestSessionObjectPosterResponse(); - requester.ResponseCallback = InventoryResponse; - - requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID, session_id.ToString(), userID.ToString()); - } - catch (WebException e) - { - if (StatsManager.SimExtraStats != null) - StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure(); - - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", - e.Source, e.Message); - } - } - else - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID); - } - } - - /// - /// Callback used by the inventory server GetInventory request - /// - /// - private void InventoryResponse(InventoryCollection response) - { - LLUUID userID = response.UserID; - if (m_RequestingInventory.ContainsKey(userID)) - { - m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + - "Received inventory response for user {0} containing {1} folders and {2} items", - userID, response.Folders.Count, response.Items.Count); - - InventoryFolderImpl rootFolder = null; - InventoryReceiptCallback callback = m_RequestingInventory[userID]; - - ICollection folders = new List(); - ICollection items = new List(); - - foreach (InventoryFolderBase folder in response.Folders) - { - if (folder.ParentID == LLUUID.Zero) - { - rootFolder = new InventoryFolderImpl(folder); - folders.Add(rootFolder); - - break; - } - } - - if (rootFolder != null) - { - foreach (InventoryFolderBase folder in response.Folders) - { - if (folder.ID != rootFolder.ID) - { - folders.Add(new InventoryFolderImpl(folder)); - } - } - - foreach (InventoryItemBase item in response.Items) - { - items.Add(item); - } - } - else - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID); - } - - callback(folders, items); - - m_RequestingInventory.Remove(userID); - } - else - { - m_log.WarnFormat( - "[OGS1 INVENTORY SERVICE]: " + - "Received inventory response for {0} for which we do not have a record of requesting!", - userID); - } - } - - /// - /// - /// - public bool AddFolder(InventoryFolderBase folder, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/NewFolder/", folder, session_id.ToString(), folder.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - /// - /// - /// - /// - public bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/UpdateFolder/", folder, session_id.ToString(), folder.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update inventory folder operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - /// - /// - /// - /// - public bool MoveFolder(InventoryFolderBase folder, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/MoveFolder/", folder, session_id.ToString(), folder.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - /// - /// - /// - public bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/PurgeFolder/", folder, session_id.ToString(), folder.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - /// - /// - /// - public bool AddItem(InventoryItemBase item, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/NewItem/", item, session_id.ToString(), item.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented - public bool UpdateItem(InventoryItemBase item, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/NewItem/", item, session_id.ToString(), item.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - /// - /// - /// - public bool DeleteItem(InventoryItemBase item, LLUUID session_id) - { - try - { - return SynchronousRestSessionObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "/DeleteItem/", item, session_id.ToString(), item.Owner.ToString()); - } - catch (WebException e) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", - e.Source, e.Message); - } - - return false; - } - - public bool HasInventoryForUser(LLUUID userID) - { - return false; - } - - public InventoryFolderBase RequestRootFolder(LLUUID userID) - { - return null; - } - - public bool CreateNewUserInventory(LLUUID user) - { - return false; - } - - // See IInventoryServices - public List GetInventorySkeleton(LLUUID userId) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); - - return new List(); - } - - #endregion - } -} diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs new file mode 100644 index 0000000..bb94c20 --- /dev/null +++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs @@ -0,0 +1,324 @@ +/* + * 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 OpenSim 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.Collections.Generic; +using System.Net; +using System.Reflection; +using libsecondlife; +using log4net; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Communications.Cache; +using OpenSim.Framework.Servers; +using OpenSim.Framework.Statistics; + +namespace OpenSim.Region.Communications.OGS1 +{ + public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices + { + private static readonly ILog m_log + = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + private string _inventoryServerUrl; + private Uri m_Uri; + private Dictionary m_RequestingInventory + = new Dictionary(); + + public OGS1SecureInventoryService(string inventoryServerUrl) + { + _inventoryServerUrl = inventoryServerUrl; + m_Uri = new Uri(_inventoryServerUrl); + } + + #region IInventoryServices Members + + public string Host + { + get { return m_Uri.Host; } + } + + /// + /// + /// + /// + /// + public void RequestInventoryForUser(LLUUID userID, LLUUID session_id, InventoryReceiptCallback callback) + { + if (!m_RequestingInventory.ContainsKey(userID)) + { + m_RequestingInventory.Add(userID, callback); + + try + { + m_log.InfoFormat( + "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}", + _inventoryServerUrl, userID); + + RestSessionObjectPosterResponse requester + = new RestSessionObjectPosterResponse(); + requester.ResponseCallback = InventoryResponse; + + requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID, session_id.ToString(), userID.ToString()); + } + catch (WebException e) + { + if (StatsManager.SimExtraStats != null) + StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure(); + + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", + e.Source, e.Message); + } + } + else + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID); + } + } + + /// + /// Callback used by the inventory server GetInventory request + /// + /// + private void InventoryResponse(InventoryCollection response) + { + LLUUID userID = response.UserID; + if (m_RequestingInventory.ContainsKey(userID)) + { + m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + + "Received inventory response for user {0} containing {1} folders and {2} items", + userID, response.Folders.Count, response.Items.Count); + + InventoryFolderImpl rootFolder = null; + InventoryReceiptCallback callback = m_RequestingInventory[userID]; + + ICollection folders = new List(); + ICollection items = new List(); + + foreach (InventoryFolderBase folder in response.Folders) + { + if (folder.ParentID == LLUUID.Zero) + { + rootFolder = new InventoryFolderImpl(folder); + folders.Add(rootFolder); + + break; + } + } + + if (rootFolder != null) + { + foreach (InventoryFolderBase folder in response.Folders) + { + if (folder.ID != rootFolder.ID) + { + folders.Add(new InventoryFolderImpl(folder)); + } + } + + foreach (InventoryItemBase item in response.Items) + { + items.Add(item); + } + } + else + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID); + } + + callback(folders, items); + + m_RequestingInventory.Remove(userID); + } + else + { + m_log.WarnFormat( + "[OGS1 INVENTORY SERVICE]: " + + "Received inventory response for {0} for which we do not have a record of requesting!", + userID); + } + } + + /// + /// + /// + public bool AddFolder(InventoryFolderBase folder, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/NewFolder/", folder, session_id.ToString(), folder.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + /// + /// + /// + /// + public bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/UpdateFolder/", folder, session_id.ToString(), folder.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update inventory folder operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + /// + /// + /// + /// + public bool MoveFolder(InventoryFolderBase folder, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/MoveFolder/", folder, session_id.ToString(), folder.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + /// + /// + /// + public bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/PurgeFolder/", folder, session_id.ToString(), folder.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + /// + /// + /// + public bool AddItem(InventoryItemBase item, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/NewItem/", item, session_id.ToString(), item.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented + public bool UpdateItem(InventoryItemBase item, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/NewItem/", item, session_id.ToString(), item.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + /// + /// + /// + public bool DeleteItem(InventoryItemBase item, LLUUID session_id) + { + try + { + return SynchronousRestSessionObjectPoster.BeginPostObject( + "POST", _inventoryServerUrl + "/DeleteItem/", item, session_id.ToString(), item.Owner.ToString()); + } + catch (WebException e) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", + e.Source, e.Message); + } + + return false; + } + + public bool HasInventoryForUser(LLUUID userID) + { + return false; + } + + public InventoryFolderBase RequestRootFolder(LLUUID userID) + { + return null; + } + + public bool CreateNewUserInventory(LLUUID user) + { + return false; + } + + // See IInventoryServices + public List GetInventorySkeleton(LLUUID userId) + { + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); + + return new List(); + } + + #endregion + } +} -- cgit v1.1