From f76cc6036ebf446553ee5201321879538dafe3b2 Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 21:35:55 -0500
Subject: * Added a Basic DOS protection container/base object for the most
 common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and
 <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login
 service as both an example, and good practice. * Applied the
 BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of
 the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and
 Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check
 for blocked users and check general velocity, 2. Track velocity per user,    
 It only jumps to 2 if it's getting a lot of requests, and state 1 is about as
 resource friendly as if it wasn't even there.

---
 .../CoreModules/Avatar/Friends/FriendsRequestHandler.cs      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 2116605..ed4b205 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -42,14 +42,22 @@ using log4net;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
-    public class FriendsRequestHandler : BaseStreamHandler
+    public class FriendsRequestHandler : BaseStreamHandlerBasicDOSProtector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private FriendsModule m_FriendsModule;
 
         public FriendsRequestHandler(FriendsModule fmodule)
-                : base("POST", "/friends")
+                : base("POST", "/friends", new BasicDosProtectorOptions()
+                                          {
+                                              AllowXForwardedFor = true,
+                                              ForgetTimeSpan = TimeSpan.FromMinutes(2),
+                                              MaxRequestsInTimeframe = 5,
+                                              ReportingName = "FRIENDSDOSPROTECTOR",
+                                              RequestTimeSpan = TimeSpan.FromSeconds(5),
+                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                          })
         {
             m_FriendsModule = fmodule;
         }
-- 
cgit v1.1


From 75fdd6054d6605877acb511b1bd794de963a15f3 Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 23:19:50 -0500
Subject: * Refactor * Break out common BasicDOSProtector code into separate
 class.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index ed4b205..ff87ece 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -53,10 +53,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                                           {
                                               AllowXForwardedFor = true,
                                               ForgetTimeSpan = TimeSpan.FromMinutes(2),
-                                              MaxRequestsInTimeframe = 5,
+                                              MaxRequestsInTimeframe = 20,
                                               ReportingName = "FRIENDSDOSPROTECTOR",
                                               RequestTimeSpan = TimeSpan.FromSeconds(5),
-                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                              ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
                                           })
         {
             m_FriendsModule = fmodule;
-- 
cgit v1.1