adding files that were not included in r5589

2 files changed, 348 insertions, 0 deletions

diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs
new file mode 100644
index 0000000..0e7861a
--- /dev/null
+++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs
@@ -0,0 +1,125 @@
+/*
+ * 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.Collections.Generic;
+using libsecondlife;
+using OpenSim.Framework.Communications.Cache;
+
+namespace OpenSim.Framework.Communications
+{
+
+    /// <summary>
+    /// Defines all the operations one can perform on a user's inventory.
+    /// </summary>
+    public interface ISecureInventoryService
+    {
+        string Host
+        {
+            get;
+        }
+        /// <summary>
+        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
+        /// inventory has been received
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="callback"></param>
+        void RequestInventoryForUser(LLUUID userID, LLUUID session_id, InventoryReceiptCallback callback);
+
+        /// <summary>
+        /// Add a new folder to the user's inventory
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully added</returns>
+        bool AddFolder(InventoryFolderBase folder, LLUUID session_id);
+
+        /// <summary>
+        /// Update a folder in the user's inventory
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully updated</returns>
+        bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id);
+
+        /// <summary>
+        /// Move an inventory folder to a new location
+        /// </summary>
+        /// <param name="folder">A folder containing the details of the new location</param>
+        /// <returns>true if the folder was successfully moved</returns>
+        bool MoveFolder(InventoryFolderBase folder, LLUUID session_id);
+
+        /// <summary>
+        /// Purge an inventory folder of all its items and subfolders.
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully purged</returns>
+        bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id);
+
+        /// <summary>
+        /// Add a new item to the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully added</returns>
+        bool AddItem(InventoryItemBase item, LLUUID session_id);
+
+        /// <summary>
+        /// Update an item in the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully updated</returns>
+        bool UpdateItem(InventoryItemBase item, LLUUID session_id);
+
+        /// <summary>
+        /// Delete an item from the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully deleted</returns>
+        bool DeleteItem(InventoryItemBase item, LLUUID session_id);
+
+        /// <summary>
+        /// Create a new inventory for the given user.
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns>true if the inventory was successfully created, false otherwise</returns>
+        bool CreateNewUserInventory(LLUUID user);
+
+        bool HasInventoryForUser(LLUUID userID);
+
+        /// <summary>
+        /// Retrieve the root inventory folder for the given user.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns>null if no root folder was found</returns>
+        InventoryFolderBase RequestRootFolder(LLUUID userID);
+
+        /// <summary>
+        /// Returns a list of all the folders in a given user's inventory.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns>A flat list of the user's inventory folder tree,
+        /// null if there is no inventory for this user</returns>
+        List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);
+    }
+}
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
new file mode 100644
index 0000000..3c79844
--- /dev/null
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -0,0 +1,223 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace OpenSim.Framework.Servers
+{
+    public class RestSessionObject<TRequest>
+    {
+        private string sid;
+        private string aid;
+        private TRequest request_body;
+
+        public string SessionID
+        {
+            get { return sid; }
+            set { sid = value; }
+        }
+
+        public string AvatarID
+        {
+            get { return aid; }
+            set { aid = value; }
+        }
+
+        public TRequest Body
+        {
+            get { return request_body; }
+            set { request_body = value; }
+        }
+    }
+
+    public class SynchronousRestSessionObjectPoster<TRequest, TResponse>
+    {
+        public static TResponse BeginPostObject(string verb, string requestUrl, TRequest obj, string sid, string aid)
+        {
+            RestSessionObject<TRequest> sobj = new RestSessionObject<TRequest>();
+            sobj.SessionID = sid;
+            sobj.AvatarID = aid;
+            sobj.Body = obj;
+
+            Type type = typeof(RestSessionObject<TRequest>);
+
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = verb;
+            request.ContentType = "text/xml";
+
+            MemoryStream buffer = new MemoryStream();
+
+            XmlWriterSettings settings = new XmlWriterSettings();
+            settings.Encoding = Encoding.UTF8;
+
+            using (XmlWriter writer = XmlWriter.Create(buffer, settings))
+            {
+                XmlSerializer serializer = new XmlSerializer(type);
+                serializer.Serialize(writer, sobj);
+                writer.Flush();
+            }
+
+            int length = (int)buffer.Length;
+            request.ContentLength = length;
+
+            Stream requestStream = request.GetRequestStream();
+            requestStream.Write(buffer.ToArray(), 0, length);
+            TResponse deserial = default(TResponse);
+            using (WebResponse resp = request.GetResponse())
+            {
+                XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
+                deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
+            }
+            return deserial;
+        }
+    }
+
+    public class RestSessionObjectPosterResponse<TRequest, TResponse>
+    {
+
+        public ReturnResponse<TResponse> ResponseCallback;
+
+        public void BeginPostObject(string requestUrl, TRequest obj, string sid, string aid)
+        {
+            BeginPostObject("POST", requestUrl, obj, sid, aid);
+        }
+
+        public void BeginPostObject(string verb, string requestUrl, TRequest obj, string sid, string aid)
+        {
+            RestSessionObject<TRequest> sobj = new RestSessionObject<TRequest>();
+            sobj.SessionID = sid;
+            sobj.AvatarID = aid;
+            sobj.Body = obj;
+
+            Type type = typeof(RestSessionObject<TRequest>);
+
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = verb;
+            request.ContentType = "text/xml";
+
+            MemoryStream buffer = new MemoryStream();
+
+            XmlWriterSettings settings = new XmlWriterSettings();
+            settings.Encoding = Encoding.UTF8;
+
+            using (XmlWriter writer = XmlWriter.Create(buffer, settings))
+            {
+                XmlSerializer serializer = new XmlSerializer(type);
+                serializer.Serialize(writer, sobj);
+                writer.Flush();
+            }
+
+            int length = (int)buffer.Length;
+            request.ContentLength = length;
+
+            Stream requestStream = request.GetRequestStream();
+            requestStream.Write(buffer.ToArray(), 0, length);
+            // IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
+            request.BeginGetResponse(AsyncCallback, request);
+        }
+
+        private void AsyncCallback(IAsyncResult result)
+        {
+            WebRequest request = (WebRequest)result.AsyncState;
+            using (WebResponse resp = request.EndGetResponse(result))
+            {
+                TResponse deserial;
+                XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
+                Stream stream = resp.GetResponseStream();
+
+                // This is currently a bad debug stanza since it gobbles us the response...
+                //                StreamReader reader = new StreamReader(stream);
+                //                m_log.DebugFormat("[REST OBJECT POSTER RESPONSE]: Received {0}", reader.ReadToEnd());
+
+                deserial = (TResponse)deserializer.Deserialize(stream);
+
+                if (deserial != null && ResponseCallback != null)
+                {
+                    ResponseCallback(deserial);
+                }
+            }
+        }
+    }
+
+    public delegate bool CheckIdentityMethod(string sid, string aid);
+
+    public class RestDeserialiseSecureHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
+        where TRequest : new()
+    {
+        private RestDeserialiseMethod<TRequest, TResponse> m_method;
+        private CheckIdentityMethod m_smethod;
+
+        public RestDeserialiseSecureHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, CheckIdentityMethod smethod)
+            : base(httpMethod, path)
+        {
+            m_smethod = smethod;
+            m_method = method;
+        }
+
+        public void Handle(string path, Stream request, Stream responseStream,
+                           OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            RestSessionObject<TRequest> deserial;
+            using (XmlTextReader xmlReader = new XmlTextReader(request))
+            {
+                XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
+                deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
+            }
+
+            TResponse response = default(TResponse);
+            if (m_smethod(deserial.SessionID, deserial.AvatarID))
+            {
+                response = m_method(deserial.Body);
+            }
+
+            using (XmlWriter xmlWriter = XmlTextWriter.Create(responseStream))
+            {
+                XmlSerializer serializer = new XmlSerializer(typeof(TResponse));
+                serializer.Serialize(xmlWriter, response);
+            }
+        }
+    }
+
+    public delegate bool CheckTrustedSourceMethod(IPEndPoint peer);
+
+    public class RestDeserialiseTrustedHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
+        where TRequest : new()
+    {
+        private RestDeserialiseMethod<TRequest, TResponse> m_method;
+        private CheckTrustedSourceMethod m_tmethod;
+
+        public RestDeserialiseTrustedHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, CheckTrustedSourceMethod tmethod)
+            : base(httpMethod, path)
+        {
+            m_tmethod = tmethod;
+            m_method = method;
+        }
+
+        public void Handle(string path, Stream request, Stream responseStream,
+                           OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            TRequest deserial;
+            using (XmlTextReader xmlReader = new XmlTextReader(request))
+            {
+                XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
+                deserial = (TRequest)deserializer.Deserialize(xmlReader);
+            }
+
+            TResponse response = default(TResponse);
+            if (m_tmethod(httpRequest.RemoteIPEndPoint))
+            {
+                response = m_method(deserial);
+            }
+
+            using (XmlWriter xmlWriter = XmlTextWriter.Create(responseStream))
+            {
+                XmlSerializer serializer = new XmlSerializer(typeof(TResponse));
+                serializer.Serialize(xmlWriter, response);
+            }
+        }
+    }
+
+}