watobo 0.9.19 → 0.9.20

data/lib/watobo/gui/save_chat_dialog.rb

@@ -1,162 +1,150 @@
-# .
+#.
 # save_chat_dialog.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 Gui
-    class SaveChatDialog < FXDialogBox
-      class Sender < Watobo::Session
-        def initialize()
-          @project = Watobo::Gui.project
-          super(@project.object_id,  @project.getScanPreferences())
-
-        end
-
-        def send_request(new_request, opts = {} )
-          prefs = {
-            :run_login => false,
-            :update_csrf_tokens => false
-          }
-          prefs.update opts
-
-          id = 0
-          if prefs[:run_login ] == true
-            puts prefs.to_yaml
-            puts "Scanner Settings:"
-            puts Watobo::Conf::Scanner.to_h.to_yaml
-            runLogin( prefs[:login_chats], prefs)
-          end
-          #if prefs[:update_session ] == true and
-          unless prefs[:update_csrf_tokens] == true
-            prefs[:csrf_requests] = []
-            prefs[:csrf_patterns] = []
-          end
-
-          new_request.extend Watobo::Mixin::Parser::Web10
-          new_request.extend Watobo::Mixin::Shaper::Web10
-          begin
-            test_req, test_resp = self.doRequest(new_request, prefs)
-          rescue => bang
-            puts bang
-          end
-          return test_req,test_resp
-        end
-
-      end
-      include Responder
-
-      def filename
-        @filename_txt.text
-      end
-
-      def initialize(owner, chat, prefs={})
-        raise ArgumentError, "Need Chat Object" unless chat.respond_to? :request
-        super(owner, "Save Response", :opts => DECOR_ALL)
-        @chat = chat
-        @sender = Sender.new
-        @response = chat.response
-
-        FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
-
-        @path = Watobo.workspace_path
-
-        main_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
-
-        frame = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
-        FXLabel.new(frame,"Response:")
-        @reload_btn = FXButton.new(frame, "Reload", nil, self, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_SIDE_RIGHT)
+#.
+# Copyright 2014 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
 
-        @response_viewer = Watobo::Gui::ResponseViewer.new(main_frame, LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @response_viewer.setText(@response)
-        @reload_btn.connect(SEL_COMMAND){
-          s,a = @sender.send_request(@chat.request)
-          @response = a
-          @response.extend Watobo::Mixin::Parser::Web10
-          @response.extend Watobo::Mixin::Shaper::Web10
-          @response_viewer.setText(@response)
-        }
-
-        frame = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
-        FXLabel.new(frame, "Save To:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @filename_txt = FXTextField.new(frame,  25, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
-        @select_btn = FXButton.new(frame, "Select")
-        @select_btn.connect(SEL_COMMAND){ select_target_file }
-        if @chat.respond_to? :response
-        @select_btn.enable
-        @filename_txt.enable
-        else
-        @select_btn.disable
-        @filename_txt.disable
-        end
-
-        buttons = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
-        :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
-
-        accept = FXButton.new(buttons, "&Save", nil, self, ID_ACCEPT,
-        FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-        accept.enable
-        # Cancel
-        FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL,
-        FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-      end
-
-      private
-
-      def select_target_file()
-        file = @chat.request.file
-        file = "chat.txt" if file.strip.empty?
-        dst_file = File.join(@path, file)
-        filename = FXFileDialog.getSaveFilename(self, "Select Destination File", dst_file)
-        if filename != "" then
-        @filename_txt.text = filename
-        end
-      end
-
-      def updateFields()
-        # @sites_combo.handle(self, FXSEL(SEL_UPDATE, 1), nil)
-
-      end
-
-      def onAccept(sender, sel, event)
-        begin
-          f = @filename_txt.text
-          if f != ''
-            @path = File.dirname(f)
-
-            if @response.has_body?
-              File.open(f,"wb"){ |fh| fh.print @response.body }
-            end
-          end
-          status = 1
-        rescue => bang
-          puts bang
-          status = 0
-        ensure
-          getApp().stopModal(self, 1)
-        self.hide()
-        return status
-        end
-
-      end
-    end
-
-  end
-end
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class SaveChatDialog < FXDialogBox
+      class Sender < Watobo::Session
+        def initialize()
+          @project = Watobo::Gui.project
+          super(@project.object_id,  @project.getScanPreferences())
+
+        end
+
+        def send_request(new_request, opts = {} )
+          prefs = {
+            :run_login => false,
+            :update_csrf_tokens => false
+          }
+          prefs.update opts
+
+          id = 0
+          if prefs[:run_login ] == true
+            puts prefs.to_yaml
+            puts "Scanner Settings:"
+            puts Watobo::Conf::Scanner.to_h.to_yaml
+            runLogin( prefs[:login_chats], prefs)
+          end
+          #if prefs[:update_session ] == true and
+          unless prefs[:update_csrf_tokens] == true
+            prefs[:csrf_requests] = []
+            prefs[:csrf_patterns] = []
+          end
+
+          new_request.extend Watobo::Mixin::Parser::Web10
+          new_request.extend Watobo::Mixin::Shaper::Web10
+          begin
+            test_req, test_resp = self.doRequest(new_request, prefs)
+          rescue => bang
+            puts bang
+          end
+          return test_req,test_resp
+        end
+
+      end
+      include Responder
+
+      def filename
+        @filename_txt.text
+      end
+
+      def initialize(owner, chat, prefs={})
+        raise ArgumentError, "Need Chat Object" unless chat.respond_to? :request
+        super(owner, "Save Response", :opts => DECOR_ALL)
+        @chat = chat
+        @sender = Sender.new
+        @response = chat.response
+
+        FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
+
+        @path = Watobo.workspace_path
+
+        main_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
+
+        frame = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
+        FXLabel.new(frame,"Response:")
+        @reload_btn = FXButton.new(frame, "Reload", nil, self, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_SIDE_RIGHT)
+
+        @response_viewer = Watobo::Gui::ResponseViewer.new(main_frame, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @response_viewer.setText(@response)
+        @reload_btn.connect(SEL_COMMAND){
+          s,a = @sender.send_request(@chat.request)
+          @response = a
+          @response.extend Watobo::Mixin::Parser::Web10
+          @response.extend Watobo::Mixin::Shaper::Web10
+          @response_viewer.setText(@response)
+        }
+
+        frame = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
+        FXLabel.new(frame, "Save To:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+        @filename_txt = FXTextField.new(frame,  25, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+        @select_btn = FXButton.new(frame, "Select")
+        @select_btn.connect(SEL_COMMAND){ select_target_file }
+        if @chat.respond_to? :response
+        @select_btn.enable
+        @filename_txt.enable
+        else
+        @select_btn.disable
+        @filename_txt.disable
+        end
+
+        buttons = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
+        :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
+
+        accept = FXButton.new(buttons, "&Save", nil, self, ID_ACCEPT,
+        FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
+        accept.enable
+        # Cancel
+        FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL,
+        FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
+      end
+
+      private
+
+      def select_target_file()
+        file = @chat.request.file
+        file = "chat.txt" if file.strip.empty?
+        dst_file = File.join(@path, file)
+        filename = FXFileDialog.getSaveFilename(self, "Select Destination File", dst_file)
+        if filename != "" then
+        @filename_txt.text = filename
+        end
+      end
+
+      def updateFields()
+        # @sites_combo.handle(self, FXSEL(SEL_UPDATE, 1), nil)
+
+      end
+
+      def onAccept(sender, sel, event)
+        begin
+          f = @filename_txt.text
+          if f != ''
+            @path = File.dirname(f)
+
+            if @response.has_body?
+              File.open(f,"wb"){ |fh| fh.print @response.body }
+            end
+          end
+          status = 1
+        rescue => bang
+          puts bang
+          status = 0
+        ensure
+          getApp().stopModal(self, 1)
+        self.hide()
+        return status
+        end
+
+      end
+    end
+
+  end
+end

data/lib/watobo/gui/scanner_settings_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # scanner_settings_dialog.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
-# .
+#.
+# Copyright 2014 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 Gui

data/lib/watobo/gui/select_chat_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # select_chat_dialog.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
-# .
+#.
+# Copyright 2014 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 Gui

data/lib/watobo/gui/session_management_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # session_management_dialog.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
-# .
+#.
+# Copyright 2014 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 Gui

data/lib/watobo/gui/sites_tree.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # sites_tree.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
-# .
+#.
+# Copyright 2014 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 'qcustomize.rb'
 
 # @private 
@@ -66,6 +54,21 @@ module Watobo#:nodoc: all
         @folderIcon = ICON_FOLDER_SMALL
         @reqIcon = ICON_REQUEST_SMALL
         @siteIcon= ICON_SITE_SMALL
+        
+        @icon_vuln = ICON_VULN_SMALL
+        @icon_vuln_bp = ICON_VULN_BP_SMALL
+        @icon_vuln_low = ICON_VULN_LOW_SMALL
+        @icon_vuln_medium = ICON_VULN_MEDIUM_SMALL
+        @icon_vuln_high = ICON_VULN_HIGH_SMALL
+        @icon_vuln_critical = ICON_VULN_CRITICAL_SMALL
+        
+         @icon_info = ICON_INFO_SMALL
+        @icon_info_info = ICON_INFO_INFO_SMALL
+        @icon_hints_info = ICON_INFO_INFO_SMALL
+        
+        @icon_hints = ICON_HINTS_SMALL
+        
+        
         self.font = small_font
         reload()
       end
@@ -77,6 +80,22 @@ module Watobo#:nodoc: all
         @folderIcon = ICON_FOLDER
         @reqIcon = ICON_REQUEST
         @siteIcon= ICON_SITE
+        
+        
+
+        # Findings Tree Icons
+        @icon_vuln = ICON_VULN
+        @icon_vuln_bp = ICON_VULN_BP
+        @icon_vuln_low = ICON_VULN_LOW
+        @icon_vuln_medium = ICON_VULN_MEDIUM
+        @icon_vuln_high = ICON_VULN_HIGH
+        @icon_vuln_critical = ICON_VULN_CRITICAL
+         @icon_info = ICON_INFO
+        @icon_info_info = ICON_INFO_INFO
+        @icon_hints_info = ICON_INFO_INFO
+
+        @icon_hints = ICON_HINTS
+        
         self.font = regular_font
         reload()
       end
@@ -98,10 +117,74 @@ module Watobo#:nodoc: all
         # @interface.default_settings[:domain_filters].push domain_filter
         # @interface.updateTreeLists()
       end
+      
+    
+      def addFindings4Chat(item, chat)
+        cpath = chat.request.path
+        csite = chat.request.site
+        Watobo::Findings.each do |fid, finding|
+          if finding.details.has_key? :chat_id && finding.details[:chat_id] == chat.id
+            addFindingItem(item, finding)
+          elsif csite == finding.request.site and cpath == finding.request.path
+            addFindingItem(item, finding)
+          end
+          
+        end
+        true
+      end
+
+      def addFindingItem(item, finding)
+        begin          
+          case finding.details[:type]
+            when FINDING_TYPE_INFO
+              finding_type = "Info"
+              icon = @icon_info_info
+
+            when FINDING_TYPE_HINT
+              finding_type = "Hints"
+              icon = @icon_hints_info
+
+            when FINDING_TYPE_VULN
+              finding_type = "Vulnerabilities"
+              icon = @icon_vuln_bp
+              
+              if finding.details[:rating] == VULN_RATING_LOW
+              icon = @icon_vuln_low
+              #  puts "low-rating-vuln"
+              end
+              if finding.details[:rating] == VULN_RATING_MEDIUM
+              icon = @icon_vuln_medium
+              end
+              if finding.details[:rating] == VULN_RATING_HIGH
+              icon = @icon_vuln_high
+              end
+              if finding.details[:rating] == VULN_RATING_CRITICAL
+              icon = @icon_vuln_critical
+              end
+            end
+
+              class_item = self.findItem(finding.details[:class], item, SEARCH_FORWARD|SEARCH_IGNORECASE|SEARCH_NOWRAP|SEARCH_PREFIX)
+              if not class_item or class_item.parent != item
+                class_item = self.appendItem(item, finding.details[:class], icon, icon)
+                self.setItemData(class_item, :finding_class )
+              end
+              title_item = self.findItem(finding.details[:title], class_item, SEARCH_FORWARD|SEARCH_IGNORECASE|SEARCH_NOWRAP)
+              if not title_item or title_item.parent != class_item
+                title_item = self.appendItem(class_item, finding.details[:title], nil, nil)
+                self.setItemData(title_item, finding )
+              # puts finding.details[:title]
+              end
+        rescue => bang
+          puts "!ERROR: could not add finding to tree"
+          puts bang
+          puts bang.backtrace if $DEBUG
+
+        end
+      end
 
       def addChat(chat)
         if @show_scope_only == true
-           return false unless @project.siteInScope?(chat.request.site)
+           return false unless Watobo::Scope.match_site?(chat.request.site)
         end 
         @tree_filters[:response_status].each do |rf|
         #puts "#{chat.response.status} / #{rf}"
@@ -172,6 +255,11 @@ module Watobo#:nodoc: all
         @quick_filter[new_item.object_id] ||= []
         #puts new_item.class
         @quick_filter[new_item.object_id].push chat
+        
+        # also add findings here
+        addFindings4Chat(new_item, chat)
+        
+        
         end
 
       end
@@ -198,6 +286,8 @@ module Watobo#:nodoc: all
         @tree_filters = {
           :response_status => []
         }
+        
+        useRegularIcons()
         #    session_leaf = self.appendItem(nil, @session_name, @projectIcon, @projectIcon)
 
         self.connect(SEL_COMMAND) do |sender, sel, item|
@@ -206,7 +296,7 @@ module Watobo#:nodoc: all
           if self.itemLeaf?(item)
           
               begin
-                if item.data
+                if item.data.is_a? Watobo::Chat
                   #if item.data.class.to_s =~ /Qchat/
                   #@interface.show_chat(item.data)
                   notify(:show_chat, item.data)
@@ -215,6 +305,12 @@ module Watobo#:nodoc: all
                 #         url_parts.unshift chat.request.file_ext
                 #         p = item.parent
                 end
+                
+                if item.data.is_a? Watobo::Finding
+                  #puts "* finding clicked"
+                    #@interface.show_vuln(item.data)
+                    notify(:vuln_click, item.data)
+                  end
               rescue => bang
               #  puts bang
               #  puts bang.backtrace if $DEBUG