From b5d731caca8f556f6c8f39b179a06e36debd3273 Mon Sep 17 00:00:00 2001
From: "mosse.benjamin" <mosse.benjamin@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Sat, 13 Nov 2010 03:51:47 +0000
Subject: [PATCH] fixing filters for the requester

git-svn-id: https://beef.googlecode.com/svn/trunk@512 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 beef.db                       | Bin 30720 -> 34816 bytes
 lib/filter.rb                 |  38 ++++++++++++++--------------------
 lib/ui/requester/requester.rb |   6 ++++--
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/beef.db b/beef.db
index d6c01d842958483631e07b88aa9f4fef2539198a..2f72c2d9e58ae16e088e43d1e9ed0565aca15cc5 100644
GIT binary patch
delta 1065
zcmchWy>Ami5XE<QY<$>`KjIHAN+b>xPz2cCz4KwS2mul(mQq0BiY5x-oJ3$b!Y5sY
z5?3i`Vp-J4N=K^XB*Y(ps3Uq(rz9w%fCARB_q-sbprM)KcXLl~=FM(?#hcq?dm3Na
zn>mV1Mxc-28+?HS_yiwd7y5oW^ctdC1af%Qb=OI6H#Uo>{DT<P^e{pQ;8;|28Ggcd
zIL3F-N3_uG%=PYNW5m;X{rp<W<cxB&dYv&&DfJ>FNNrxWBs?eJbN^j#o+O3ZC0!IF
zCCWu@Uk}~T2suR1B8Ptb!Dq73Nsu_|gi$70xP3Q?=O5OM(le*oYM0v1@=M2ETwhvo
zimPt(g;A^5AD38>MQg3L%MH)-iccM<G3YKXx0+G$FZ~;yp=DA=3yc-mhE-=}UcSj~
zduYEwItl#$9L)yf1(r@7S!Hepj`nMzkVfDH!4EhQAs#_23>Xt~TK!*-@SHv&7ObHK
z1YOX{TSD=BnV%){3-xyLEB_SU6Oz?X6~PuH$Qv?)cknf|hpOHC2JuoN;6`TX)8ZDB
z!6y|?dATBaV$4m8)6rbin@~98X3!rWb5`Y6&>vHHMbVE+ZiyI!y;1MH;A>ZHPAi<r
z>m2UsjKOp%G&~6^2e_bc@yV1tuW+%5;92DU;55+5Dx4`g8HH0$1O3S{x2nnuOAq+8
fJQQ|o<YzD&hAk1AIFeUDys1H7dU)a$ZcE+YH*XH(

delta 275
zcmZpez|`=8ae_3Xz($!D>;i1es~MO-G2dmrz<i8(2lML9f-KXSC$HvKVPxBUf!lyX
zf|r4TfsN6Yfq5dc1k-#b1IBGY&UOZeiH#bQ9YnYl3Ucx@OF}YI71W*cb8=FXOB8%E
z^RkQ86_WFFa})DYCch9>)w49xGc>c%Gc+~>Vgq#}149E{ATqEBF*LR^F|snW)HXD<
zGN@)}XV7d^oorYu$A!=``9PhOJW#!Hh#^p=nUw)Vv4KGW8#{w!qr5$TIosrgV%eKl
zRYox_W|7e0U|?ZjVDw}>wwcG}64T~<RVBtv9xN<iVdh^9!azU1V`gP#W@KdC{NJBZ
F0{}ndM%w@Y

diff --git a/lib/filter.rb b/lib/filter.rb
index 9bea06b78..43a851ffc 100644
--- a/lib/filter.rb
+++ b/lib/filter.rb
@@ -88,29 +88,23 @@ module BeEF
     end
 
     # check if request is valid
-    def self.is_valid_request?(str)
-      req_parts = str.split(/ |\n/)
-
-      #check verb
-      verb = req_parts[0]
-      return false if not verb.eql? "GET" or verb.eql? "POST"
-
-      #check uri
-      uri = req_parts[1]
-      return false if not uri.eql? WEBrick::HTTPUtils.normalize_path(uri)
+    # @param: {WEBrick::HTTPUtils::FormData} request object
+    def self.is_valid_request?(request)
+      #check a webrick object is sent
+      raise 'your request is of invalide type' if not request.is_a? WEBrick::HTTPRequest
+      
+      #check http method
+      raise 'only GET or POST requests are supported for http requests' if not request.request_method.eql? 'GET' or request.request_method.eql? 'POST'
+      
+      #check uri
+      raise 'the uri is missing' if not webrick.unparsed_uri
+      
+      #check host
+      raise 'http host missing' if request.host.nil?
+      
+      #check domain
+      raise 'invalid http domain' if not URI.parse(request.host)
       
-      # check trailer
-      trailer = req_parts[2]
-      return false if not trailer.eql? "HTTP/1.1" or trailer.eql? "HTTP/1.0"
-
-      # check host
-      host_param_key = req_parts[3]
-      return false if not host_param_key.eql? "Host:"
-
-      # check ip address of target
-      host_param_value = req_parts[4]
-      return false if not host_param_value =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/
-            
       true
     end
 
diff --git a/lib/ui/requester/requester.rb b/lib/ui/requester/requester.rb
index 54e2e8d80..8e9343a72 100644
--- a/lib/ui/requester/requester.rb
+++ b/lib/ui/requester/requester.rb
@@ -33,7 +33,6 @@ class Requester < BeEF::HttpController
     raw_request = @params['raw_request'] || nil
     raise WEBrick::HTTPStatus::BadRequest, "raw_request is nil" if raw_request.nil?
     raise WEBrick::HTTPStatus::BadRequest, "raw_request contains non-printable chars" if not Filter.has_non_printable_char?(raw_request)
-    raise WEBrick::HTTPStatus::BadRequest, "raw_request is invalid request" if not Filter.is_valid_request?(raw_request)
     
     # validate nonce
     nonce = @params['nonce'] || nil
@@ -46,7 +45,10 @@ class Requester < BeEF::HttpController
     # will raise an exception on failure
     s = StringIO.new raw_request
     webrick.parse(s)
-
+    
+    # if the request is invalide, an exception will be raised
+    Filter.is_valid_request?(webrick)
+    
     # Saves the new HTTP request.
     http = H.new(
       :request => raw_request,