watobo 0.9.12 → 0.9.13

data/lib/watobo/interceptor/transparent.rb

@@ -0,0 +1,37 @@
+# .
+# transparent.rb
+# 
+# Copyright 2013 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+# @private 
+module Watobo#:nodoc: all
+  module Interceptor
+    module Transparent
+      @nfq_drb = nil
+      def self.start
+        DRb.start_service
+        @nfq_drb = DRbObject.new nil, "druby://127.0.0.1:9090"
+      end
+      
+      def self.info(data)
+        @nfq_drb.info(data)
+      end
+    end
+  end
+end

data/lib/watobo/interceptor.rb

@@ -0,0 +1,25 @@
+# .
+# interceptor.rb
+# 
+# Copyright 2013 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+%w( proxy transparent ).each do |lib|
+  require "watobo/interceptor/#{lib}"
+end
+

data/lib/watobo/mixins/check_info.rb

@@ -0,0 +1,50 @@
+# .
+# check_info.rb
+# 
+# Copyright 2013 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+# @private 
+module Watobo#:nodoc: all
+  module CheckInfoMixin
+    module InfoMethods
+      def check_name
+       
+        #puts self.methods.sort
+        info = instance_variable_get("@info")
+        return nil if info.nil?
+        return info[:check_name]
+      end
+      
+      def check_group
+        info = instance_variable_get("@info")
+        return nil if info.nil?
+        return info[:check_group]
+      end
+
+    end
+
+    extend InfoMethods
+
+    def self.included( other )
+      other.extend InfoMethods
+    end
+  #:name => "#{check.info[:check_group]}|#{check.info[:check_name]}",
+
+  end
+end

data/lib/watobo/mixins/httpparser.rb

@@ -1,7 +1,7 @@
 # .
 # httpparser.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -36,9 +36,18 @@
 # fext = "php"
 # path_ext = "my/path/show.php?p=aaa&debug=true"
 
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Mixin
   module Parser
+    
+    module Parameters
+      def each(prefs, &block)
+        
+        
+      end  
+    end
+    
     module Url
       include Watobo::Constants
       def file
@@ -95,6 +104,18 @@ module Watobo
           return nil
         end
       end
+      
+      def method_get?
+        return false if method.nil?
+        return true if method =~ /^get$/i
+        return false
+      end
+      
+       def method_post?
+        return false if method.nil?
+        return true if method =~ /^post$/i
+        return false
+      end
 
       #The path may consist of a sequence of path segments separated by a
       #single slash "/" character.  Within a path segment, the characters
@@ -199,15 +220,13 @@ module Watobo
         return false
       end
 
-      def url
-        #@url ||= nil
+      def url_string
+        url = ''        
         #return @url unless @url.nil?
         if self.first =~ /^[^[:space:]]{1,} (https?:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}.*) HTTP\//i then
-          @url = $1
-        else
-          @url = ''
+          url = $1
         end
-        @url
+        url
       end
 
       def site
@@ -297,7 +316,7 @@ module Watobo
 
       #################### doubles
 
-      def get_parm_names
+      def get_parm_names(&block)
 
         parm_names=[]
         parmlist=[]
@@ -306,7 +325,8 @@ module Watobo
         parmlist.each do |p|
           if p then
             p.gsub!(/=.*/,'')
-            parm_names.push p
+            yield p if block_given?
+            parm_names.push p            
           end
         end
 
@@ -355,9 +375,9 @@ module Watobo
           parmlist = self.last.split(/\&/)
         end
         rescue => bang
-          puts bang
-           puts self.last.unpack("C*").pack("C*").gsub(/[^[:print:]]/,".")
+          # puts self.last.unpack("C*").pack("C*").gsub(/[^[:print:]]/,".")
           if $DEBUG
+            puts bang
           puts bang.backtrace 
          
           end
@@ -387,7 +407,7 @@ module Watobo
 
       end
 
-      def post_parm_names
+      def post_parm_names(&block)
 
         parm_names=[]
         parmlist=[]
@@ -396,7 +416,9 @@ module Watobo
         parmlist.each do |p|
           if p then
             p.gsub!(/=.*/,'')
-            parm_names.push p
+            p.strip!
+            yield p if block_given?
+            parm_names << p
           end
         end
 
@@ -439,17 +461,29 @@ module Watobo
         return header_values
       end
 
-      def content_type
-        ct = "undefined"
+      def content_type(default_ct='undefined')
+        ct = default_ct
         self.each do |line|
           break if line.strip.empty?
-          if line =~ /^Content-Type: (.*)/i then
+          if line =~ /^Content-Type: ([^;]*);?/i then
             ct = $1
             break
           end
         end
         return ct.strip
       end
+      
+      def content_type_ex(default_ct='undefined')
+        ct = default_ct
+        self.each do |line|
+          break if line.strip.empty?
+          if line =~ /^Content-Type: (.*)/i then
+            ct = $1.strip
+            break
+          end
+        end
+        return ct.strip
+      end
 
       def content_length
         # Note: Calculate Chunk-Encoded Content-Length
@@ -570,12 +604,37 @@ def content_encoding
 
       def body
         begin
-          #return nil if self.nil?
+          return nil if self.nil? or self.length < 3
           return self.last if self[-2].strip.empty?
         rescue
           return nil
         end
       end
+      
+      def body_is_text?
+        ct = self.content_type(nil) 
+        if ct.nil?
+          return true if self.body_encoded.ascii_only?
+          return false
+        else
+          return true if ct =~ /text/
+          return false
+        end
+      end
+      
+      def body_encoded
+        b = self.body
+        cs = self.charset
+        return nil if b.nil?
+        return b.unpack("C*").pack("C*") if cs.nil?
+        begin
+            return  b.encode(cs, :invalid => :replace, :undef => :replace, :replace => '').unpack("C*").pack("C*")
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+          return b.unpack("C*").pack("C*")
+        end
+      end
 
       def responseCode
         if self.first =~ /^HTTP\/... (\d+) /
@@ -592,8 +651,9 @@ def new_cookies(&b)
   headers("Set-Cookie") do |h|
     cookie = Watobo::Cookie.new(h)
     yield cookie if block_given?
-    nc.push cookie
+    nc << cookie
   end
+  nc
 end
 
       def status
@@ -615,6 +675,18 @@ end
           return nil
         end
       end
+      
+      def charset
+        cs = nil
+        self.each do |line|
+          break if line.strip.empty?
+          if line =~ /^Content-Type: .*charset=([^;]*)/i then
+            cs = $1
+            break
+          end
+        end
+        return cs
+      end
 
       def headers(filter=nil, &b)
         begin
@@ -659,7 +731,7 @@ end
         return cookie_list
       end
 
-      def data
+      def data_UNUSED
         return self.last.strip if self.last =~ /\=.*\&?/i
         return ""
       end

data/lib/watobo/mixins/request_parser.rb

@@ -1,7 +1,7 @@
 # .
 # request_parser.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Mixins
     # This mixin can be used to parse a String or any object which supports method.to_s into a valid http request string
     module RequestParser
@@ -35,113 +36,127 @@ module Watobo
         cprefs = { :code_dlmtr => '%%' } # default delimiter for ruby code
         cprefs.update(prefs)
 
-        pattern="(#{cprefs[:code_dlmtr]}.*?#{cprefs[:code_dlmtr]})"
+        #pattern="(#{cprefs[:code_dlmtr]}.*?#{cprefs[:code_dlmtr]})"
+        pattern = cprefs[:code_dlmtr]
         request = self.to_s
+        expression = ""
 
         begin
           # puts new_request
           expr = ''
-          new_request = ''
+          
           pos = 0
           off = 0
+          match = []
+          code_marks = []
           while pos >= 0 and pos < request.length
-             code_offset = request.index(/#{pattern}/, pos)
-          unless code_offset.nil?
-            expression = request.match(/#{pattern}/, code_offset)[0]
-              new_request << request[pos..code_offset-1]
-              expr = expression.gsub(/%%/,"")
-              puts "DEBUG: executing: #{expr}" if $DEBUG
-              result = eval(expr)
-              puts "DEBUG: got #{result.class}" if $DEBUG
-              if result.is_a? File
-                data = result.read
-                result.close
-              elsif result.is_a? String
-                data = result
-              elsif result.is_a? Array
-                data = result.join
-              else
-                log("!!!WATOBO - expression must return String or File !!!",'')
-              end
-              new_request << data
-              pos = code_offset + expression.length
+             code_offset = request.index(pattern, pos)
+             
+             unless code_offset.nil?
+               new_line_index = request.index("\n", pos)   
+               unless new_line_index.nil?
+                 if new_line_index < code_offset
+                  # new_request << request[match[0]..code_offset-1] unless match.empty?
+                   match = [] 
+                  # pos = code_offset
+                 end
+               end
+               match << code_offset
+               
+               if match.length == 2
+                 code_marks << match.dup
+                 match = []
+               end
+               pos = code_offset + pattern.length
+             else
+               break
+             end
+           end
+           
+           new_request = ''
+           unless code_marks.empty?           
+           code_marks.each_with_index do |cm,i|
+             #puts cm.to_yaml
+             last = i > 0 ? ( code_marks[i-1][1] + pattern.length ) : 0
+             new_request << request[last..cm[0]-1] if cm[0] > 0
+                 exp_start = cm[0] + pattern.length
+                 exp_end = cm[1] - 1
+                
+                 expression = request[exp_start..exp_end]
+                 expression.strip!
+                 next if expression.empty?
+                 puts "DEBUG: executing: #{expression}" if $DEBUG
+                 #result = expression.empty? ? "" : eval("#{expression}")
+                 result = eval(expression)
+                 puts "DEBUG: got #{result.class}" if $DEBUG
+                 if result.is_a? File
+                   data = result.read
+                   result.close
+                 elsif result.is_a? String
+                   data = result
+                 elsif result.is_a? Array
+                    data = result.join
+                 else
+                    puts "!!!WATOBO - expression must return String or File !!!"
+                 end
+                 new_request << data
+               end
+               new_request << request[code_marks.last[1]+pattern.length..-2] unless code_marks.last[1] >= request.length-1
+           
             else
-              new_request << request[pos..-1]
-              pos = request.length
+              new_request = request
             end
-          end
+         
           return new_request
 
         rescue SyntaxError, LocalJumpError, NameError => e
-          raise SyntaxError, "SyntaxError in '#{expr}'"
+        #  raise SyntaxError, "SyntaxError in '#{expression}'"
+        puts e
+        puts e.backtrace
+          
         end
         return nil
       end
 
-      def unchunked_UNUSED( opts = {} )
-        options = { :update_content_length => false }
-        options.update opts
-        begin
-          text = parse_code
-          eoh = self.index("\n\n")
-          unless eoh.nil?
-            raw_header = text[0..eoh-1]
-            raw_body = text[eoh+1..-1]
-          else
-            raw_header = text
-            raw_body = nil
-          end
-
-          unchunked = raw_header.split("\n")
-          unchunked.extend Watobo::Mixin::Parser::Url
-          unchunked.extend Watobo::Mixin::Parser::Web10
-          unchunked.extend Watobo::Mixin::Shaper::Web10
-
-          unless raw_body.nil?
-            unchunked
-          end
-
-        rescue => bang
-        end
-      end
-
+      
       def to_request(opts={})
         options = { :update_content_length => false }
         options.update opts
+        body = nil
         begin
           text = parse_code
-          result = []
-
-          if text =~ /\n\n/
-            dummy = text.split(/\n\n/)
-            header = dummy.shift.split(/\n/)
-            body = dummy.join("\n\n")
-          else
-            header = text.split(/\n/)
+          request = []
+          
+          eoh = nil
+         eoh = text.index("\n\n") unless text.nil?
+           
+         unless eoh.nil?
+           header = text.slice(0, eoh).split("\n").map{|h| "#{h}\r\n"}
+           body = text.slice(eoh+2, text.length-1)
+         else
+            header = text.split(/\n/).map{|h| "#{h}\r\n"}
             body = nil
-          end
-
-          header.each do |h|
-            result.push "#{h}\r\n"
-          end
+         end
+         
+         request.concat header
 
-         # result.extend Watobo::Mixin::Parser::Url
-         # result.extend Watobo::Mixin::Parser::Web10
-         # result.extend Watobo::Mixin::Shaper::Web10
-         Watobo::Request.create result
+         #Watobo::Request.create request
+         request = Watobo::Request.new(request)
         
-          ct = result.content_type
+          ct = request.content_type_ex
+         # puts ct
           # last line is without "\r\n" if text has a body
-          if ct =~ /multipart\/form/ and body then
+          if ct =~ /multipart/ and body then
             #Content-Type: multipart/form-data; boundary=---------------------------3035221901842
             if ct =~ /boundary=([\-\w]+)/
               boundary = $1.strip
-              chunks = body.split(boundary)
-              e = chunks.pop # remove "--"
+              chunks = body.split(/--#{boundary}[\-]{0,2}/)
+              #chunks.pop # remove "--"
+              #puts "Multipart request has #{chunks.length} chunks"
               new_body = []
               chunks.each do |c|
                 new_chunk = ''
-                c.gsub!(/[\-]+$/,'')
+                #c.gsub!(/[\-]+$/,'')
                 next if c.nil?
                 next if c.strip.empty?
                 c.strip!
@@ -162,22 +177,20 @@ module Watobo
 
               end
               body = "--#{boundary}\r\n"
-              body += new_body.join("--#{boundary}\r\n")
-              body += "--#{boundary}--"
+              body << new_body.join("--#{boundary}\r\n")
+              body << "--#{boundary}--\r\n"
             end
             #  body.gsub!(/\n/, "\r\n") if body
 
           end
 
-          if body then
-            result.push "\r\n"
-            result.push body.strip
+          unless body.nil?
+            request.push "\r\n"
+            request.push body.strip
           end
  
-          result.fixupContentLength() if options[:update_content_length] == true
-          puts ">>"
-          puts result
-          return result
+          request.fixupContentLength() if options[:update_content_length] == true
+          return request
         rescue => bang
           puts bang
           puts bang.backtrace
@@ -207,7 +220,8 @@ module Watobo
           end
 
 
-         Watobo::Response.create result
+         #Watobo::Response.create result
+         result = Watobo::Response.new(result)
         
           if body then
             result.push "\r\n"
@@ -250,7 +264,8 @@ module Watobo
          # result.extend Watobo::Mixin::Parser::Url
          # result.extend Watobo::Mixin::Parser::Web10
          # result.extend Watobo::Mixin::Shaper::Web10
-         Watobo::Request.create result
+         #Watobo::Request.create result
+         result = Watobo::Request.new(result)
 
           ct = result.content_type
           # last line is without "\r\n" if text has a body