watobo 0.9.16 → 0.9.17

data/lib/watobo/gui/main_window.rb

@@ -1791,6 +1791,7 @@ request_splitter.connect(SEL_COMMAND){
         rescue => bang
           puts "!!!ERROR: chat_selected"
           puts bang
+          puts bang.backtrace
           puts "!!!"
         ensure
         getApp().endWaitCursor()

data/lib/watobo/gui/manual_request_editor.rb

@@ -572,16 +572,8 @@ module Watobo#:nodoc: all
             
             csrf_requests = []           
 
-           # if @updateCSRF.checked?
-           #    csrf_requests = Watobo::OTTCache.requests(new_request)
-           # end
-            
             prefs = Watobo::Conf::Scanner.to_h
-          #  puts "= SCANNER PREFS ="
-          #  puts prefs[:csrf_patterns]
-          puts prefs.to_yaml
-            
-
+        
             current_prefs = {:run_login => @updateSession.checked? ? @runLogin.checked? : false,
                :update_session => @updateSession.checked?,
                :update_contentlength => @updateContentLength.checked?,
@@ -612,9 +604,10 @@ module Watobo#:nodoc: all
             return nil if request.nil?
             request = Watobo::Request.new request
 
-            if request.method =~ /POST/i
+            if request.method =~ /POST/i and request.content_type =~ /www\-form/i
                request.setMethod("GET")
                request.removeHeader("Content-Length")
+               request.removeHeader("Content-Type")
                data = request.data.to_s
                #      puts "Data: "
                #      puts data
@@ -631,7 +624,8 @@ module Watobo#:nodoc: all
 
              if request.method =~ /GET/i
                request.setMethod("POST")
-               request.addHeader("Content-Length", "0")
+               request.set_header("Content-Length", "0")
+               request.set_header("Content-Type", "application/x-www-form-urlencoded")
                data = request.query
                request.setData(data)
                request.removeUrlParms()

data/lib/watobo/gui/table_editor.rb

@@ -23,6 +23,8 @@
 module Watobo#:nodoc: all
   module Gui
     class AddTableParmDialog < FXDialogBox
+      attr :param
+      
       def location()
         @location_combo.getItemData(@location_combo.currentItem)
       end
@@ -42,6 +44,7 @@ module Watobo#:nodoc: all
         @location = nil
         @pname = nil
         @pval = nil
+        @param = nil
 
         base_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
         frame = FXHorizontalFrame.new(base_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
@@ -77,10 +80,11 @@ module Watobo#:nodoc: all
         buttons_frame = FXHorizontalFrame.new(base_frame,
         :opts => LAYOUT_FILL_X|LAYOUT_SIDE_TOP)
 
-        @finishButton = FXButton.new(buttons_frame, "Accept" ,  nil, nil, :opts => BUTTON_NORMAL|LAYOUT_RIGHT)
+        @finishButton = FXButton.new(buttons_frame, "Add" ,  nil, nil, :opts => BUTTON_NORMAL|LAYOUT_RIGHT)
         @finishButton.enable
         @finishButton.connect(SEL_COMMAND) do |sender, sel, item|
         #self.handle(self, FXSEL(SEL_COMMAND, ID_CANCEL), nil)
+          create_param
           self.handle(self, FXSEL(SEL_COMMAND, ID_ACCEPT), nil)
         end
 
@@ -89,6 +93,21 @@ module Watobo#:nodoc: all
             :opts => BUTTON_NORMAL|LAYOUT_RIGHT)
 
       end
+      
+      private
+      
+      def create_param
+        @param = case @location_combo.getItemData(@location_combo.currentItem)
+        when /Post/i
+         Watobo::WWWFormParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
+         when /Url/i
+           Watobo::UrlParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
+         when /Cookie/i
+           Watobo::CookieParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
+         else
+           nil
+         end
+      end
 
     end
 
@@ -99,55 +118,32 @@ module Watobo#:nodoc: all
       end
 
       def parseRequest
-        cookies = []
-        url = ""
+        request = @request.copy
         
-        parms = []
         self.numRows.times do |i|
           name = CGI.escape(self.getItemText(i, 1))
-          value = self.getItemText(i, 2).strip
           location = self.getItemText(i, 0)
-          case location
-          when /req/i
-            url = self.getItemText(i, 2)
-          when /post/i
-            @request.set Watobo::WWWFormParameter.new( :name => name, :value => value)            
-          when /url/i
-            @request.set Watobo::UrlParameter.new( :name => name, :value => value)
-          when /cookie2?/i
-            cookies << "#{name}=#{value}"
-          end
+          parm = self.getItemData(i, 0)
+          parm.value = self.getItemText(i, 2).unpack("C*").pack("C*").strip 
+          request.set parm
         end
         
-        request = @request.copy
-
-        unless cookies.empty?
-          # puts cookies
-          request.removeHeader("Cookie")
-          request.addHeader("Cookie", cookies.join("; "))
-        end
         request
       end
 
       def setRequest(request)
+        initTable()
+        return false if request.empty?
         @request = request.copy
 
-        return false if @request.content_type =~ /(multipart|xml|json)/
+        return false if @request.content_type =~ /(multipart|json)/
 
-        initTable()
+        
         @request = Watobo::Utils.text2request(request) if request.is_a? String
         # addParmList("REQ", ["URL=#{request.url}"])
 
-        if @request.get_parms.length > 0
-          addParmList("URL", @request.get_parms)
-        end
-
-        if @request.post_parms.length > 0
-          addParmList("Post", @request.post_parms)
-        end
-
-        if @request.cookies.length > 0
-          addParmList("Cookie", @request.cookies)
+        @request.parameters.each do |parm|
+          add_parm parm
         end
 
         true
@@ -264,15 +260,29 @@ module Watobo#:nodoc: all
       end
 
       private
+      
+      def add_parm(parm)
+        lastRowIndex = self.getNumRows
+          self.appendRows(1)
+          self.setItemText(lastRowIndex, 0, parm.location.to_s)
+          self.setItemData(lastRowIndex, 0, parm)
+          self.setItemText(lastRowIndex, 1, CGI.unescape(parm.name))
+          self.setItemText(lastRowIndex, 2, parm.value)
+         
+          3.times do |i|
+            self.getItem(lastRowIndex, i).justify = FXTableItem::LEFT
+          end
+      end
 
       def addNewParm()
 
         dlg = AddTableParmDialog.new(self)
         if dlg.execute != 0 then
-          loc = dlg.location
-          pname = dlg.parmName
-          pval = dlg.parmValue
-          addParmList(loc, ["#{pname}=#{pval}"])
+          #loc = dlg.location
+          #pname = dlg.parmName
+          #pval = dlg.parmValue
+          parm = dlg.param
+          add_parm parm unless parm.nil?
         end
       end
 
@@ -322,19 +332,18 @@ module Watobo#:nodoc: all
             else
               notify(:hotkey_ctrl_f) if event.code == KEY_f
               notify(:hotkey_ctrl_s) if event.code == KEY_s
+              
+              text = self.getItemText(cr, 2).unpack("C*").pack("C*")
 
               if event.code == KEY_u
-                text = self.getItemText(cr, 2)
-                #puts "* Encode URL: #{text}"
                 cgi = CGI::escape(text)
               self.acceptInput(true)
               self.setItemText(cr, 2, cgi.strip, true)
               end
 
               if event.code == KEY_b
-                text = self.getItemText(cr, 2)
                 #puts "* Encode B64: #{text}"
-                b64 = Base64.encode64(text)
+                b64 = Base64.strict_encode64(text)
                 self.acceptInput(true)
                 self.setItemText(cr, 2, b64.strip, true)
                 puts b64.class
@@ -342,15 +351,11 @@ module Watobo#:nodoc: all
 
              # puts "CTRL-SHIFT-U" if event.code == KEY_U
               if event.code == KEY_U
-                text = self.getItemText(cr, 2)
-                #puts "* Encode URL: #{text}"
                 uncgi = CGI::unescape(text)
               self.acceptInput(true)
               self.setItemText(cr, 2, uncgi.strip, true)
               end
               if event.code == KEY_B
-                text = self.getItemText(cr, 2)
-                #puts "* Encode B64: #{text}"
                 b64 = Base64.decode64(text)
                 self.acceptInput(true)
                 self.setItemText(cr, 2, b64.strip, true)
@@ -375,7 +380,7 @@ module Watobo#:nodoc: all
         end
       end
 
-      def addParmList(parm_origin, parm_list)
+      def addParmList_UNUSED(parm_origin, parm_list)
         parm_list.each do |parm|
           p,v = parm.split("=")
           lastRowIndex = self.getNumRows
@@ -428,9 +433,11 @@ module Watobo#:nodoc: all
        
 
         @editor.setRequest request
-        @req_line.text = request.first.strip
+        @req_line.text = request.first.strip unless request.empty?
 
       end
+      
+      alias :setText :setRequest
 
       def initialize(owner, opts)
         super(owner, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)

data/lib/watobo/http.rb

@@ -0,0 +1,25 @@
+# .
+# http.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
+# .
+require 'watobo/http/data/data'
+require 'watobo/http/url/url'
+require 'watobo/http/cookies/cookies'
+require 'watobo/http/xml/xml'

data/lib/watobo/http/cookies/cookies.rb

@@ -19,49 +19,112 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-# @private 
+# @private
 module Watobo#:nodoc: all
   module HTTP
     class Cookies
       def to_s
-        s = @root.url_string
+        s = []
+        @cookies.each_value do |v|
+          s << "#{v.name}=#{v.value}"
+        end
+        s.join("; ")
+      end
+
+      def inspect
+        self.to_a
+      end
+      
+      def to_a
+        cookies = []
+        raw_cookies do |c|
+          cookies << Watobo::Cookie.new(c)
+        end
+        cookies
       end
       
-            
+
+      def each(&block)
+        @cookies.each_value do |cookie|
+          yield cookie if block_given?
+        end
+      end
+
       def set(parm)
-       
+        @cookies[parm.name.to_sym] = parm
+        @root.set_header("Cookie", self.to_s)
       end
 
       def has_parm?(parm_name)
         false
       end
 
+      #def
+
       def parameters(&block)
-        parms = []
-        cookie_list=[]
-        cookie_prefs={ :secure => false, :http_only => false }
+        params = []
+        raw_cookies do |cprefs|
+          cookie = Watobo::CookieParameter.new(cprefs)
+          yield cookie if block_given?
+          params << cookie
+
+        end
+        params
+      end
+
+      def initialize(root)
+        @root = root
+        @cookies = {}
+        
+        init_cookies
+
+      end
+
+      private
+      
+      def init_cookies
+        raw_cookies do |rc|
+          if rc.has_key? :name
+            @cookies[rc[:name].to_sym] = Watobo::Cookie.new(rc)
+          end
+        end
+      end
+      
+      def raw_cookies(&block)
+        rcs = []
+
         @root.headers.each do |line|
           if line =~ /^(Set\-)?Cookie2?: (.*)/i then
-            cookie_prefs[:secure] = true if line =~ /secure/i
-          cookie_prefs[:http_only] = true if line =~ /httponly/i
             clist = $2.split(";")
+            cookie_prefs = { :secure => false, :http_only => false }
+            cookie_prefs[:secure] = true if line =~ /secure/i
+            cookie_prefs[:http_only] = true if line =~ /httponly/i
+
             clist.each do |c|
-             name, value = c.strip.split("=").map{|v| v.strip}
-             puts "NEW COOKIE: #{name} - #{value}"
-             cookie_prefs[:name] = name
-             cookie_prefs[:value] = value
-             cookie = Watobo::CookieParameter.new(cookie_prefs)
-             yield cookie if block_given?
-             cookie_list << cookie
+              c.strip!
+              i = c.index("=")
+              
+              # skip cookie options
+              next if i.nil?
+                
+              name = c[0..i-1]
+              value = i < c.length ? c[i+1..-1] : ""
+              cookie_prefs[:name] = name.strip
+              cookie_prefs[:value] = value.strip
+              #cookie = Watobo::CookieParameter.new(cookie_prefs)
+              yield cookie_prefs if block_given?
+              rcs << cookie_prefs
             end
           end
         end
-        return cookie_list
-      end
+        return rcs
 
-      def initialize(root)
-         @root = root
+      end
 
+      module Mixin
+        def cookies
+          @cookies ||= Cookies.new(self)
+        end
       end
     end
   end

data/lib/watobo/http/url/url.rb

@@ -46,7 +46,10 @@ module Watobo#:nodoc: all
       def parameters(&block)
         parms = []
         @root.get_parms.each do |p|
-          name, val = p.split("=")
+          p.strip!
+          i = p.index("=")
+          name = p[0..i-1]
+          val = i < p.length ? p[i+1..-1] : ""
           parms << Watobo::UrlParameter.new( :name => name, :value => val )
         end
         parms

data/lib/watobo/http/xml/xml.rb

@@ -0,0 +1,143 @@
+# .
+# xml.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 HTTP
+    class Xml
+
+      module Mixin
+        def xml
+            @xml ||= Watobo::HTTP::Xml.new(self)
+        end
+      end
+
+      def to_s
+        s = @root.body.to_s
+      end
+
+      def set(parm)
+        return false unless parm.location == :xml
+       # puts "= set "
+       # puts parm.to_yaml
+        
+        doc = Nokogiri::XML(@root.body.strip)
+        namespaces = doc.collect_namespaces
+        parent = doc.xpath("//#{parm.parent}", namespaces).first
+        if parent.nil?
+          puts "* could not find parent node #{parm.parent}"
+          return false
+        end
+        
+        parm_name = parm.namespace.nil? ? "" : parm.namespace
+        parm_name << parm.name
+        # find node
+        node = parent.xpath("//#{parm_name}", namespaces).first
+        if node.nil?
+          puts "* node does not exist #{parm_name}"
+        end
+        
+        child = node.children.first
+        if child.nil?
+          child = Nokogiri::XML::Text.new(parm.value, node)
+          node.add_child child
+        else        
+          child.content = parm.value
+        end
+        
+        @root.set_body doc.to_s
+
+      end
+
+      def has_parm?(parm_name)
+        false
+      end
+
+      def parameters(&block)
+        params = []
+
+        return params unless @root.is_xml?
+        leaf_nodes do |n|
+          p = { :name => n.name }
+          val = n.children.size == 0 ? "" : n.children.first.to_s
+
+            p[:value] = val
+            parent_name = ""
+            unless n.parent.namespace.nil?
+              parent_name << n.parent.namespace.prefix
+              parent_name << ":"  
+            end
+            parent_name << n.parent.name
+            p[:parent] = "#{parent_name}"
+
+            unless n.namespace.nil?
+              p[:namespace] = n.namespace.prefix
+            end
+          param = XmlParameter.new(p)
+          yield param if block_given?
+          params << param
+        end
+
+        return params
+      end
+
+      def initialize(root)
+        @root = root
+
+      end
+
+      private
+
+      def leaf_nodes(&block)
+
+        nodes = []
+        begin
+          doc = Nokogiri::XML(@root.body.strip)
+          prefix = doc.children.first.namespace.prefix
+          # check if doc has a body element
+          start = doc
+          doc.traverse { |node|
+            if node.name =~ /^body$/i
+            start = node
+            end
+          }
+          start.traverse { |node|
+             if node.children.size == 0 and node.is_a? Nokogiri::XML::Element
+               yield node if block_given?
+               nodes << node
+             end
+            if node.children.size == 1
+              if node.children.first.is_a? Nokogiri::XML::Text
+                yield node if block_given?
+                nodes << node
+              end
+            end
+          }
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+        nodes
+      end
+
+    end
+  end
+end