diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index 67903555bd..57230e2986 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -104,4 +104,5 @@ namespace OpenSim.Framework.Servers.HttpServer
public delegate void SimpleStreamMethod(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse);
public delegate void SimpleOSDMapMethod(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, OSDMap args);
+ public delegate void SimpleBinaryMethod(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, byte[] data);
}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/SimpleBinaryHandler.cs b/OpenSim/Framework/Servers/HttpServer/SimpleBinaryHandler.cs
new file mode 100644
index 0000000000..03855c2799
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/SimpleBinaryHandler.cs
@@ -0,0 +1,163 @@
+/*
+ * 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.IO;
+using OpenSim.Framework.ServiceAuth;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+ ///
+ /// simple OSD streamed request handler.
+ /// for well defined simple uri paths, single http method and a OSDMap encoded body
+ ///
+ ///
+ /// Inheriting classes should override ProcessRequest() rather than Handle()
+ ///
+ public class SimpleBinaryHandler : SimpleBaseRequestHandler, ISimpleStreamHandler
+ {
+ protected string m_httMethod;
+ protected IServiceAuth m_Auth;
+ protected SimpleBinaryMethod m_processRequest;
+ protected int m_maxDatasize = -1;
+
+ public SimpleBinaryHandler(string httpmethod, string path) : base(path)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ }
+ public SimpleBinaryHandler(string httpmethod, string path, string name) : base(path, name)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ }
+ public SimpleBinaryHandler(string httpmethod, string path, SimpleBinaryMethod processRequest) : base(path)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ m_processRequest = processRequest;
+ }
+ public SimpleBinaryHandler(string httpmethod, string path, SimpleBinaryMethod processRequest, string name) : base(path, name)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ m_processRequest = processRequest;
+ }
+
+ public SimpleBinaryHandler(string httpmethod, string path, IServiceAuth auth) : base(path)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ m_Auth = auth;
+ }
+
+ public SimpleBinaryHandler(string httpmethod, string path, IServiceAuth auth, SimpleBinaryMethod processRequest)
+ : base(path)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ m_Auth = auth;
+ m_processRequest = processRequest;
+ }
+
+ public SimpleBinaryHandler(string httpmethod, string path, IServiceAuth auth, SimpleBinaryMethod processRequest, string name)
+ : base(path, name)
+ {
+ m_httMethod = httpmethod.ToUpper();
+ m_Auth = auth;
+ m_processRequest = processRequest;
+ }
+
+ public virtual void Handle(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+ {
+ RequestsReceived++;
+ if(httpRequest.HttpMethod != m_httMethod)
+ {
+ httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
+ return;
+ }
+
+ if (httpRequest.InputStream == null || httpRequest.InputStream.Length == 0)
+ {
+ httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
+ return;
+ }
+
+ if (m_maxDatasize > 0 && httpRequest.InputStream.Length > m_maxDatasize)
+ {
+ httpResponse.StatusCode = (int)HttpStatusCode.RequestEntityTooLarge;
+ return;
+ }
+
+ byte[] data;
+ try
+ {
+ Stream request = httpRequest.InputStream;
+ if (request is MemoryStream)
+ data = ((MemoryStream)request).ToArray();
+ else
+ {
+ request.Seek(0, SeekOrigin.Begin);
+ using (MemoryStream ms = new MemoryStream((int)request.Length))
+ {
+ request.CopyTo(ms);
+ data = ms.ToArray();
+ }
+ }
+ request.Dispose();
+ }
+ catch
+ {
+ httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
+ return;
+ }
+
+ if (m_Auth != null)
+ {
+ if (!m_Auth.Authenticate(httpRequest.Headers, httpResponse.AddHeader, out HttpStatusCode statusCode))
+ {
+ httpResponse.StatusCode = (int)statusCode;
+ return;
+ }
+ }
+ try
+ {
+ if(m_processRequest != null)
+ m_processRequest(httpRequest, httpResponse, data);
+ else
+ ProcessRequest(httpRequest, httpResponse, data);
+ }
+ catch
+ {
+ httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError;
+ }
+
+ RequestsHandled++;
+ }
+
+ public int MaxDataSize { get { return m_maxDatasize; } set { m_maxDatasize = value; }}
+
+ protected virtual void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, byte[] data)
+ {
+ }
+ }
+}
\ No newline at end of file