watobo 0.9.21 → 0.9.23

data/lib/watobo/core/interceptor.rb

@@ -1,108 +1,99 @@
-#.
-# interceptor.rb
-#.
-# 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 Interceptor
-    INTERCEPT_NONE = 0x00
-    INTERCEPT_REQUEST = 0x01
-    INTERCEPT_RESPONSE = 0x02
-    INTERCEPT_BOTH = 0x03
-
-    REWRITE_NONE = 0x00
-    REWRITE_REQUEST = 0x01
-    REWRITE_RESPONSE = 0x02
-    REWRITE_BOTH = 0x04
-
-    INTERCEPT_DEFAULT_PORT = 8081
-
-    MODE_REGULAR = 0x01
-    MODE_TRANSPARENT = 0x02
-
-    @proxy_mode ||= MODE_REGULAR
-    @intercept_mode ||= INTERCEPT_NONE
-    @rewrite_mode ||= REWRITE_NONE
-
-    @proxy = nil
-    #@proxy_mode = Watobo::Conf::Interceptor.proxy_mode if Watobo::Conf::Interceptor.respond_to? :proxy_mode
-    def self.proxy_mode
-      @proxy_mode
-    end
-
-    def self.proxy_mode=(mode)
-      @proxy_mode = mode
-    end
-
-    def self.rewrite_mode
-      @rewrite_mode
-    end
-
-    def self.rewrite_mode=(mode)
-      @rewrite_mode = mode
-    end
-
-    def self.intercept_mode
-      @intercept_mode
-    end
-
-    def self.intercept_mode=(mode)
-      @intercept_mode = mode
-    end
-
-    def self.transparent?
-      return true if ( @proxy_mode & MODE_TRANSPARENT ) > 0
-      return false
-    end
-
-    def self.intercept_requests?
-      return true if ( @intercept_mode & INTERCEPT_REQUEST ) > 0
-      return false
-    end
-
-    def self.intercept_responses?
-      return true if ( @intercept_mode & INTERCEPT_RESPONSE ) > 0
-      return false
-    end
-
-    def self.rewrite_requests?
-      return true if ( @rewrite_mode & REWRITE_REQUEST ) > 0
-      return false
-    end
-
-    def self.rewrite_responses?
-      return true if ( @rewrite_mode & REWRITE_RESPONSE ) > 0
-      return false
-    end
-
-    def self.active?
-      return false if @proxy.nil?
-      return true
-    end
-
-    def self.start
-     # @proxy = Watobo::InterceptProxy.new()
-
-      @proxy = Watobo::Interceptor::Proxy.start()
-      puts "DEBUG: Proxy running" if $DEBUG
-    #   puts "* set www_auth for interceptor"
-    #   puts YAML.dump(@project.settings[:www_auth])
-    #@proxy.www_auth = Watobo.project.settings[:www_auth] unless Watobo.project.nil?
-    end
-
-    def self.proxy
-      @proxy
-    end
-
-    def self.stop
-      @proxy.stop
-      @proxy = nil
-    end
-
-  end
-end
+module Watobo#:nodoc: all
+  module Interceptor
+    INTERCEPT_NONE = 0x00
+    INTERCEPT_REQUEST = 0x01
+    INTERCEPT_RESPONSE = 0x02
+    INTERCEPT_BOTH = 0x03
+
+    REWRITE_NONE = 0x00
+    REWRITE_REQUEST = 0x01
+    REWRITE_RESPONSE = 0x02
+    REWRITE_BOTH = 0x04
+
+    INTERCEPT_DEFAULT_PORT = 8081
+
+    MODE_REGULAR = 0x01
+    MODE_TRANSPARENT = 0x02
+
+    @proxy_mode ||= MODE_REGULAR
+    @intercept_mode ||= INTERCEPT_NONE
+    @rewrite_mode ||= REWRITE_NONE
+
+    @proxy = nil
+    #@proxy_mode = Watobo::Conf::Interceptor.proxy_mode if Watobo::Conf::Interceptor.respond_to? :proxy_mode
+    def self.proxy_mode
+      @proxy_mode
+    end
+
+    def self.proxy_mode=(mode)
+      @proxy_mode = mode
+    end
+
+    def self.rewrite_mode
+      @rewrite_mode
+    end
+
+    def self.rewrite_mode=(mode)
+      @rewrite_mode = mode
+    end
+
+    def self.intercept_mode
+      @intercept_mode
+    end
+
+    def self.intercept_mode=(mode)
+      @intercept_mode = mode
+    end
+
+    def self.transparent?
+      return true if ( @proxy_mode & MODE_TRANSPARENT ) > 0
+      return false
+    end
+
+    def self.intercept_requests?
+      return true if ( @intercept_mode & INTERCEPT_REQUEST ) > 0
+      return false
+    end
+
+    def self.intercept_responses?
+      return true if ( @intercept_mode & INTERCEPT_RESPONSE ) > 0
+      return false
+    end
+
+    def self.rewrite_requests?
+      return true if ( @rewrite_mode & REWRITE_REQUEST ) > 0
+      return false
+    end
+
+    def self.rewrite_responses?
+      return true if ( @rewrite_mode & REWRITE_RESPONSE ) > 0
+      return false
+    end
+
+    def self.active?
+      return false if @proxy.nil?
+      return true
+    end
+
+    def self.start
+     # @proxy = Watobo::InterceptProxy.new()
+
+      @proxy = Watobo::Interceptor::Proxy.start()
+      puts "DEBUG: Proxy running" if $DEBUG
+    #   puts "* set www_auth for interceptor"
+    #   puts YAML.dump(@project.settings[:www_auth])
+    #@proxy.www_auth = Watobo.project.settings[:www_auth] unless Watobo.project.nil?
+    end
+
+    def self.proxy
+      @proxy
+    end
+
+    def self.stop
+      @proxy.stop
+      @proxy = nil
+    end
+
+  end
+end

data/lib/watobo/core/min_class.rb

@@ -1,15 +1,6 @@
-#.
-# min_class.rb
-#.
-# 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
-  class MinClass
-    
-  end
+module Watobo#:nodoc: all
+  class MinClass
+    
+  end
 end

data/lib/watobo/core/netfilter_queue.rb

@@ -1,180 +1,171 @@
-#.
-# netfilter_queue.rb
-#.
-# 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 NFQueue
-    @ssl_requests = Hash.new
-    @cert_list = Hash.new
-
-    @netqueue_lock = Mutex.new
-    @t_nfqueue = nil
-
-    @nfq_present = false
-
-    begin
-      require "nfqueue"
-      @nfq_present = true
-    rescue LoadError
-      puts "NFQUEUE not available on this system"
-    end
-
-    def self.get_ip_string(raw_addr)
-      begin
-        ip = ""
-        raw_addr.length.times do |i|
-          ip << "." unless ip.empty?
-          ip << raw_addr[i].ord.to_s
-        end
-      rescue => bang
-        puts bang
-        puts bang.backtrace
-      end
-      ip
-    end
-
-    def self.stop
-      @t_nfqueue.kill if @t_nfqueue.respond_to? :kill
-    end
-
-    def self.start
-      #  @t_nfqueue.raise unless @t_nfqueue.nil?
-      puts @t_nfqueue.status if @t_nfqueue.respond_to? :status
-
-      puts "starting netfilter_queue ..."
-      @t_nfqueue = Thread.new{
-       begin
-        Netfilter::Queue.create(0) do |p|
-          puts ">> Netfilter Packet #" + p.id.to_s
-        #  $stdout.flush
-          puts p.data.class
-          raw_src = p.data[12..15]
-          raw_dst = p.data[16..19]
-          src_port = p.data[20..21].unpack("H4")[0].hex
-          dst_port = p.data[22..24].unpack("H4")[0].hex
-         # if p.data.length > 47
-         # flags = p.data[47].unpack("H*")[0].hex
-         # puts flags.to_s
-         # if flags == 2
-          puts  "ADD SSL REQUEST"
-          puts "#{get_ip_string(raw_src)}:#{src_port} -> #{get_ip_string(raw_dst)}:#{dst_port}"
-           @netqueue_lock.synchronize do
-          if add_ssl_request(get_ip_string(raw_src), src_port, get_ip_string(raw_dst), dst_port)
-          puts "OK"
-          end
-          end
-          #end
-          #end
-          Netfilter::Packet::ACCEPT
-        end
-      rescue => bang
-       puts bang
-       puts bang.backtrace
-      # retry
-      rescue Netfilter::QueueError
-      puts "NetfilterERROR"
-      exit
-      end
-      }
-
-      @t_nfqueue
-    end
-
-    def self.add_ssl_request(c_host, c_port, s_host, s_port)
-      ck = "#{c_host}:#{c_port}"
-      sk = "#{s_host}:#{s_port}"
-
-      begin
-
-        unless @cert_list.has_key? sk
-          if cert = acquire_cert(s_host,s_port)
-          @ssl_requests[ck] = sk
-          @cert_list[sk] = cert
-          else
-          return false
-          end
-        else
-        @ssl_requests[ck] = sk
-        end
-
-        return true
-      rescue => bang
-        puts bang
-        puts bang.backtrace
-      end
-      return false
-
-    end
-
-    def self.get_connection_info(c_host,c_port)
-      begin
-        ck = "#{c_host}:#{c_port}"
-        target_site = nil
-        cert = nil
-        @netqueue_lock.synchronize do
-          if @ssl_requests.has_key? ck
-          target_site = @ssl_requests[ck]
-          cert = @cert_list[target_site] if @cert_list.has_key? target_site
-          end
-        end
-        return target_site, cert
-      rescue => bang
-        puts bang
-        puts bang.backtrace
-      end
-      return nil, nil
-    end
-
-    def self.acquire_cert(host, port)
-      puts "* acquire cert ... #{host}:#{port}"
-      begin
-        tcp_socket = TCPSocket.new( host, port )
-        tcp_socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
-        tcp_socket.sync = true
-        ctx = OpenSSL::SSL::SSLContext.new()
-
-        ctx.tmp_dh_callback = proc { |*args|
-          OpenSSL::PKey::DH.new(128)
-        }
-
-        socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ctx)
-
-        socket.connect
-        #socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
-        sk = "#{host}:#{port}"
-        cert = socket.peer_cert
-        @cert_list[sk] = cert
-        puts "PEER CERT SUBJECT: #{cert.subject}"
-        # puts cert.subject.methods.sort
-        return cert
-
-      rescue => bang
-        puts bang
-        puts bang.backtrace
-      end
-      return nil
-    end
-
-  end
-end
-
-if $0 == __FILE__
-  inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..","..","..", "lib")) # this is the same as rubygems would do
-  $: << inc_path
-
-  require 'watobo'
-  require 'nfqueue'
-
-  Watobo::Interceptor.proxy_mode = Watobo::Interceptor::MODE_TRANSPARENT
-  @iproxy = Watobo::InterceptProxy.new()
-  @iproxy.run
-  while 1
-    sleep 1
-  end
-end
+module Watobo#:nodoc: all
+  module NFQueue
+    @ssl_requests = Hash.new
+    @cert_list = Hash.new
+
+    @netqueue_lock = Mutex.new
+    @t_nfqueue = nil
+
+    @nfq_present = false
+
+    begin
+      require "nfqueue"
+      @nfq_present = true
+    rescue LoadError
+      puts "NFQUEUE not available on this system"
+    end
+
+    def self.get_ip_string(raw_addr)
+      begin
+        ip = ""
+        raw_addr.length.times do |i|
+          ip << "." unless ip.empty?
+          ip << raw_addr[i].ord.to_s
+        end
+      rescue => bang
+        puts bang
+        puts bang.backtrace
+      end
+      ip
+    end
+
+    def self.stop
+      @t_nfqueue.kill if @t_nfqueue.respond_to? :kill
+    end
+
+    def self.start
+      #  @t_nfqueue.raise unless @t_nfqueue.nil?
+      puts @t_nfqueue.status if @t_nfqueue.respond_to? :status
+
+      puts "starting netfilter_queue ..."
+      @t_nfqueue = Thread.new{
+       begin
+        Netfilter::Queue.create(0) do |p|
+          puts ">> Netfilter Packet #" + p.id.to_s
+        #  $stdout.flush
+          puts p.data.class
+          raw_src = p.data[12..15]
+          raw_dst = p.data[16..19]
+          src_port = p.data[20..21].unpack("H4")[0].hex
+          dst_port = p.data[22..24].unpack("H4")[0].hex
+         # if p.data.length > 47
+         # flags = p.data[47].unpack("H*")[0].hex
+         # puts flags.to_s
+         # if flags == 2
+          puts  "ADD SSL REQUEST"
+          puts "#{get_ip_string(raw_src)}:#{src_port} -> #{get_ip_string(raw_dst)}:#{dst_port}"
+           @netqueue_lock.synchronize do
+          if add_ssl_request(get_ip_string(raw_src), src_port, get_ip_string(raw_dst), dst_port)
+          puts "OK"
+          end
+          end
+          #end
+          #end
+          Netfilter::Packet::ACCEPT
+        end
+      rescue => bang
+       puts bang
+       puts bang.backtrace
+      # retry
+      rescue Netfilter::QueueError
+      puts "NetfilterERROR"
+      exit
+      end
+      }
+
+      @t_nfqueue
+    end
+
+    def self.add_ssl_request(c_host, c_port, s_host, s_port)
+      ck = "#{c_host}:#{c_port}"
+      sk = "#{s_host}:#{s_port}"
+
+      begin
+
+        unless @cert_list.has_key? sk
+          if cert = acquire_cert(s_host,s_port)
+          @ssl_requests[ck] = sk
+          @cert_list[sk] = cert
+          else
+          return false
+          end
+        else
+        @ssl_requests[ck] = sk
+        end
+
+        return true
+      rescue => bang
+        puts bang
+        puts bang.backtrace
+      end
+      return false
+
+    end
+
+    def self.get_connection_info(c_host,c_port)
+      begin
+        ck = "#{c_host}:#{c_port}"
+        target_site = nil
+        cert = nil
+        @netqueue_lock.synchronize do
+          if @ssl_requests.has_key? ck
+          target_site = @ssl_requests[ck]
+          cert = @cert_list[target_site] if @cert_list.has_key? target_site
+          end
+        end
+        return target_site, cert
+      rescue => bang
+        puts bang
+        puts bang.backtrace
+      end
+      return nil, nil
+    end
+
+    def self.acquire_cert(host, port)
+      puts "* acquire cert ... #{host}:#{port}"
+      begin
+        tcp_socket = TCPSocket.new( host, port )
+        tcp_socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
+        tcp_socket.sync = true
+        ctx = OpenSSL::SSL::SSLContext.new()
+
+        ctx.tmp_dh_callback = proc { |*args|
+          OpenSSL::PKey::DH.new(128)
+        }
+
+        socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ctx)
+
+        socket.connect
+        #socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
+        sk = "#{host}:#{port}"
+        cert = socket.peer_cert
+        @cert_list[sk] = cert
+        puts "PEER CERT SUBJECT: #{cert.subject}"
+        # puts cert.subject.methods.sort
+        return cert
+
+      rescue => bang
+        puts bang
+        puts bang.backtrace
+      end
+      return nil
+    end
+
+  end
+end
+
+if $0 == __FILE__
+  inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..","..","..", "lib")) # this is the same as rubygems would do
+  $: << inc_path
+
+  require 'watobo'
+  require 'nfqueue'
+
+  Watobo::Interceptor.proxy_mode = Watobo::Interceptor::MODE_TRANSPARENT
+  @iproxy = Watobo::InterceptProxy.new()
+  @iproxy.run
+  while 1
+    sleep 1
+  end
+end