mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 11:33:28 +08:00
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
This commit is contained in:
Melanie
@@ -0,0 +1,107 @@
|
||||
/*
|
||||
* 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 OpenSim.Framework;
|
||||
using System.IO;
|
||||
|
||||
namespace OpenSim.Framework.Servers.HttpServer
|
||||
{
|
||||
/// <summary>
|
||||
/// BaseStreamHandlerBasicDOSProtector Base streamed request handler.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Inheriting classes should override ProcessRequest() rather than Handle()
|
||||
/// </remarks>
|
||||
public abstract class BaseStreamHandlerBasicDOSProtector : BaseRequestHandler, IStreamedRequestHandler
|
||||
{
|
||||
|
||||
private readonly BasicDosProtectorOptions _options;
|
||||
private readonly BasicDOSProtector _dosProtector;
|
||||
|
||||
protected BaseStreamHandlerBasicDOSProtector(string httpMethod, string path, BasicDosProtectorOptions options) : this(httpMethod, path, null, null, options) {}
|
||||
|
||||
protected BaseStreamHandlerBasicDOSProtector(string httpMethod, string path, string name, string description, BasicDosProtectorOptions options)
|
||||
: base(httpMethod, path, name, description)
|
||||
{
|
||||
_options = options;
|
||||
_dosProtector = new BasicDOSProtector(_options);
|
||||
}
|
||||
|
||||
public virtual byte[] Handle(
|
||||
string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
|
||||
{
|
||||
byte[] result;
|
||||
RequestsReceived++;
|
||||
string clientstring = GetClientString(httpRequest);
|
||||
string endpoint = GetRemoteAddr(httpRequest);
|
||||
if (_dosProtector.Process(clientstring, endpoint))
|
||||
result = ProcessRequest(path, request, httpRequest, httpResponse);
|
||||
else
|
||||
result = ThrottledRequest(path, request, httpRequest, httpResponse);
|
||||
if (_options.MaxConcurrentSessions > 0)
|
||||
_dosProtector.ProcessEnd(clientstring, endpoint);
|
||||
|
||||
RequestsHandled++;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
protected virtual byte[] ProcessRequest(
|
||||
string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
protected virtual byte[] ThrottledRequest(
|
||||
string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
|
||||
{
|
||||
return new byte[0];
|
||||
}
|
||||
|
||||
|
||||
private string GetRemoteAddr(IOSHttpRequest httpRequest)
|
||||
{
|
||||
string remoteaddr = string.Empty;
|
||||
if (httpRequest.Headers["remote_addr"] != null)
|
||||
remoteaddr = httpRequest.Headers["remote_addr"];
|
||||
|
||||
return remoteaddr;
|
||||
}
|
||||
|
||||
private string GetClientString(IOSHttpRequest httpRequest)
|
||||
{
|
||||
string clientstring = string.Empty;
|
||||
|
||||
if (_options.AllowXForwardedFor && httpRequest.Headers["x-forwarded-for"] != null)
|
||||
clientstring = httpRequest.Headers["x-forwarded-for"];
|
||||
else
|
||||
clientstring = GetRemoteAddr(httpRequest);
|
||||
|
||||
return clientstring;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
/*
|
||||
* 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.Collections;
|
||||
|
||||
namespace OpenSim.Framework.Servers.HttpServer
|
||||
{
|
||||
public class GenericHTTPDOSProtector
|
||||
{
|
||||
private readonly GenericHTTPMethod _normalMethod;
|
||||
private readonly GenericHTTPMethod _throttledMethod;
|
||||
|
||||
private readonly BasicDosProtectorOptions _options;
|
||||
private readonly BasicDOSProtector _dosProtector;
|
||||
|
||||
public GenericHTTPDOSProtector(GenericHTTPMethod normalMethod, GenericHTTPMethod throttledMethod, BasicDosProtectorOptions options)
|
||||
{
|
||||
_normalMethod = normalMethod;
|
||||
_throttledMethod = throttledMethod;
|
||||
|
||||
_options = options;
|
||||
_dosProtector = new BasicDOSProtector(_options);
|
||||
}
|
||||
public Hashtable Process(Hashtable request)
|
||||
{
|
||||
Hashtable process = null;
|
||||
string clientstring= GetClientString(request);
|
||||
string endpoint = GetRemoteAddr(request);
|
||||
if (_dosProtector.Process(clientstring, endpoint))
|
||||
process = _normalMethod(request);
|
||||
else
|
||||
process = _throttledMethod(request);
|
||||
|
||||
if (_options.MaxConcurrentSessions>0)
|
||||
_dosProtector.ProcessEnd(clientstring, endpoint);
|
||||
|
||||
return process;
|
||||
}
|
||||
|
||||
private string GetRemoteAddr(Hashtable request)
|
||||
{
|
||||
string remoteaddr = "";
|
||||
if (!request.ContainsKey("headers"))
|
||||
return remoteaddr;
|
||||
Hashtable requestinfo = (Hashtable)request["headers"];
|
||||
if (!requestinfo.ContainsKey("remote_addr"))
|
||||
return remoteaddr;
|
||||
object remote_addrobj = requestinfo["remote_addr"];
|
||||
if (remote_addrobj != null)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(remote_addrobj.ToString()))
|
||||
{
|
||||
remoteaddr = remote_addrobj.ToString();
|
||||
}
|
||||
|
||||
}
|
||||
return remoteaddr;
|
||||
}
|
||||
|
||||
private string GetClientString(Hashtable request)
|
||||
{
|
||||
string clientstring = "";
|
||||
if (!request.ContainsKey("headers"))
|
||||
return clientstring;
|
||||
|
||||
Hashtable requestinfo = (Hashtable)request["headers"];
|
||||
if (_options.AllowXForwardedFor && requestinfo.ContainsKey("x-forwarded-for"))
|
||||
{
|
||||
object str = requestinfo["x-forwarded-for"];
|
||||
if (str != null)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(str.ToString()))
|
||||
{
|
||||
return str.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!requestinfo.ContainsKey("remote_addr"))
|
||||
return clientstring;
|
||||
|
||||
object remote_addrobj = requestinfo["remote_addr"];
|
||||
if (remote_addrobj != null)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(remote_addrobj.ToString()))
|
||||
{
|
||||
clientstring = remote_addrobj.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
return clientstring;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
/*
|
||||
* 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 Nwc.XmlRpc;
|
||||
using OpenSim.Framework;
|
||||
|
||||
|
||||
namespace OpenSim.Framework.Servers.HttpServer
|
||||
{
|
||||
public class XmlRpcBasicDOSProtector
|
||||
{
|
||||
private readonly XmlRpcMethod _normalMethod;
|
||||
private readonly XmlRpcMethod _throttledMethod;
|
||||
|
||||
private readonly BasicDosProtectorOptions _options;
|
||||
private readonly BasicDOSProtector _dosProtector;
|
||||
|
||||
public XmlRpcBasicDOSProtector(XmlRpcMethod normalMethod, XmlRpcMethod throttledMethod,BasicDosProtectorOptions options)
|
||||
{
|
||||
_normalMethod = normalMethod;
|
||||
_throttledMethod = throttledMethod;
|
||||
|
||||
_options = options;
|
||||
_dosProtector = new BasicDOSProtector(_options);
|
||||
|
||||
}
|
||||
public XmlRpcResponse Process(XmlRpcRequest request, IPEndPoint client)
|
||||
{
|
||||
|
||||
XmlRpcResponse resp = null;
|
||||
string clientstring = GetClientString(request, client);
|
||||
string endpoint = GetEndPoint(request, client);
|
||||
if (_dosProtector.Process(clientstring, endpoint))
|
||||
resp = _normalMethod(request, client);
|
||||
else
|
||||
resp = _throttledMethod(request, client);
|
||||
if (_options.MaxConcurrentSessions > 0)
|
||||
_dosProtector.ProcessEnd(clientstring, endpoint);
|
||||
return resp;
|
||||
}
|
||||
|
||||
private string GetClientString(XmlRpcRequest request, IPEndPoint client)
|
||||
{
|
||||
string clientstring;
|
||||
if (_options.AllowXForwardedFor && request.Params.Count > 3)
|
||||
{
|
||||
object headerstr = request.Params[3];
|
||||
if (headerstr != null && !string.IsNullOrEmpty(headerstr.ToString()))
|
||||
clientstring = request.Params[3].ToString();
|
||||
else
|
||||
clientstring = client.Address.ToString();
|
||||
}
|
||||
else
|
||||
clientstring = client.Address.ToString();
|
||||
return clientstring;
|
||||
}
|
||||
|
||||
private string GetEndPoint(XmlRpcRequest request, IPEndPoint client)
|
||||
{
|
||||
return client.Address.ToString();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user