evil-proxy 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53684305896f9e807ca7a800ce16365d1075047b
-  data.tar.gz: 9f3436b932cd284a97d572630b8eef0c82f8ccba
+  metadata.gz: e12b1710eab8280289c94ab841cdb69271e39b89
+  data.tar.gz: 8d435616b24ca533588b7be6985a16f35758465a
 SHA512:
-  metadata.gz: f4ab48b584aedfb81bdd292a29764fbcd17a2b55f91ad648ef1c07f572ccc5a8552bcea270a088c5766dc806bbf6f1243b6d77e0c34e4e9ed9fcc70503ff15f8
-  data.tar.gz: 6f4f16d5c257a680e7e13a6b8090ffa2bc561f324e75e7b29d302ee36f5dcd146ba761333942066042ffdd6af54900b2e34f2e30da7cfe4ead31d7fa9f3852fa
+  metadata.gz: 5de1a8b09415db4ec3b66b5e889b68c1bdfaa702c11f9499e090b21670da7ffb079edf9134448ed63dcb061b2d14c625759373ceb3bfd28a3d7d00744a097d25
+  data.tar.gz: 3c8bba1bb4da4d7b33430093f74a525c0dfc4304e3e33eb0cfe4233c032b6446f75becbcb4af03543d3b33ee73309ebf74376ab5318b096c7206c77703879b11

data/.gitignore

@@ -10,6 +10,8 @@ coverage
 doc/
 lib/bundler/man
 pkg
+bin
+data
 certs
 rdoc
 spec/reports

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in evil-proxy.gemspec
 gemspec
+
+gem 'colorize'
+gem 'pry-byebug'
+gem 'activesupport'

data/bin/evil-proxy

@@ -1,8 +1,41 @@
+# encoding: utf-8
 #!/usr/bin/env ruby
 
 require 'evil-proxy'
+require 'active_support/all'
+require 'colorize'
 
-logger = WEBrick::Log.new(nil, 5)
+Options = { BindAddress: '0.0.0.0', Port: 8080, AccessLog: [] }
+# PROXY = EvilProxy::MITMProxyServer.new Options
+PROXY = EvilProxy::HTTPProxyServer.new Options
 
-proxy = EvilProxy::MITMProxyServer.new Port: 8080, Logger: logger
-proxy.start
+def puts_include str, match
+  puts str.inspect.colorize(:red) if str && str.include?(match)
+end
+
+file = ARGV.first || 'evil-proxy'
+file = "#{file}.rb"
+fullpath = File.expand_path file, File.dirname(__FILE__)
+require fullpath
+
+interrupted = false
+stoped = false
+Signal.trap("INT") do
+  print "\r" # cleanup ^C
+  Thread.new do
+    sleep 1
+    interrupted = false
+  end
+
+  if interrupted # double CTRL-C to quit full program
+    PROXY.stop
+    PROXY.exit if stoped
+    stoped = true
+  else
+    interrupted = true
+    PROXY.logger.info "RELOAD #{file}, double CTRL-C to quit full program"
+    load fullpath
+  end
+end
+
+PROXY.start

data/evil-proxy.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry-byebug"
 end

data/lib/evil-proxy/agentproxy.rb

@@ -3,8 +3,6 @@ require 'webrick/https'
 require 'webrick/httpproxy'
 require 'openssl'
 
-require 'pry-byebug'
-
 class EvilProxy::AgentProxyServer < EvilProxy::HTTPProxyServer
 
   def initialize_callbacks config
@@ -49,6 +47,10 @@ class EvilProxy::AgentProxyServer < EvilProxy::HTTPProxyServer
     res.body = response.body
   end
 
-  alias_method :service, :proxy_service
+  def service req, res
+    fire :before_request, req
+    proxy_service req, res
+    fire :before_response, req, res
+  end
 
 end

data/lib/evil-proxy/httpproxy.rb

@@ -4,12 +4,15 @@ require 'webrick/httpproxy'
 class EvilProxy::HTTPProxyServer < WEBrick::HTTPProxyServer
   attr_reader :callbacks
 
-  VALID_CALBACKS = Array.new
   DEFAULT_CALLBACKS = Hash.new
 
   def initialize config = {}, default = WEBrick::Config::HTTP
     initialize_callbacks config
     fire :when_initialize, config, default
+    config.merge!(
+      Logger: WEBrick::Log.new(nil, 0),
+      AccessLog: []
+    ) if config[:Quiet]
     super
   end
 
@@ -22,6 +25,22 @@ class EvilProxy::HTTPProxyServer < WEBrick::HTTPProxyServer
     end
   end
 
+  def stop
+    self.logger.info "#{self.class}#stop: pid=#{$$}"
+    super
+  end
+
+  def exit
+    self.logger.info "#{self.class}#exit: pid=#{$$}"
+    Kernel.exit
+  end
+
+  def restart &block
+    self.logger.info "#{self.class}#restart: pid=#{$$}" if @status == :Running
+    initialize_callbacks Hash.new
+    instance_exec &block if block
+  end
+
   def fire key, *args
     return unless @callbacks[key]
     @callbacks[key].each do |callback|
@@ -35,11 +54,23 @@ class EvilProxy::HTTPProxyServer < WEBrick::HTTPProxyServer
     fire :before_response, req, res
   end
 
-  VALID_CALBACKS << :when_initialize
-  VALID_CALBACKS << :when_start
-  VALID_CALBACKS << :when_shutdown
-  VALID_CALBACKS << :before_request
-  VALID_CALBACKS << :before_response
+  def self.define_callback_methods callback
+    define_method callback do |&block|
+      @callbacks[callback] ||= []
+      @callbacks[callback] << block
+    end
+
+    define_singleton_method callback do |&block|
+      DEFAULT_CALLBACKS[callback] ||= []
+      DEFAULT_CALLBACKS[callback] << block
+    end
+  end
+
+  define_callback_methods :when_initialize
+  define_callback_methods :when_start
+  define_callback_methods :when_shutdown
+  define_callback_methods :before_request
+  define_callback_methods :before_response
 
   %w(GET HEAD POST OPTIONS CONNECT).each do |method|
     do_method = "do_#{method}".to_sym
@@ -47,8 +78,8 @@ class EvilProxy::HTTPProxyServer < WEBrick::HTTPProxyServer
     before_method = "before_#{method.downcase}".to_sym
     after_method = "after_#{method.downcase}".to_sym
 
-    VALID_CALBACKS << before_method
-    VALID_CALBACKS << after_method
+    define_callback_methods before_method
+    define_callback_methods after_method
 
     alias_method do_method_without_callbacks, do_method
     define_method do_method do |req, res|
@@ -58,13 +89,6 @@ class EvilProxy::HTTPProxyServer < WEBrick::HTTPProxyServer
     end
   end
 
-  VALID_CALBACKS.each do |callback|
-    define_method callback do |&block|
-      @callbacks[callback] ||= []
-      @callbacks[callback] << block
-    end
-  end
-
 private
   def initialize_callbacks config
     @callbacks = Hash.new
@@ -72,14 +96,4 @@ private
       @callbacks[key] = callbacks.clone
     end
   end
-
-  class << self
-    VALID_CALBACKS.each do |callback|
-      define_method callback do |&block|
-        DEFAULT_CALLBACKS[callback] ||= []
-        DEFAULT_CALLBACKS[callback] << block
-      end
-    end
-  end
-
 end

data/lib/evil-proxy/mitmproxy.rb

@@ -6,13 +6,14 @@ class EvilProxy::MITMProxyServer < EvilProxy::HTTPProxyServer
 
   def initialize config
     super
+    @mitm_pattern = config[:MITMPattern]
     @mitm_servers = {}
     @mitm_port = 4433
   end
 
   def ca
     return @ca if @ca
-    logger.info "Create CA"
+    logger.info "Create CA root cert"
 
     ca_config = {}
     ca_config[:hostname] = 'ca'
@@ -70,6 +71,9 @@ class EvilProxy::MITMProxyServer < EvilProxy::HTTPProxyServer
         config = config.merge(Port: @mitm_port)
         mitm_server = EvilProxy::AgentProxyServer.new config
       rescue Errno::EADDRINUSE
+      rescue Errno::EINVAL => e
+        logger.error e.message
+        return
       ensure
         @mitm_port += 1
         return mitm_server if mitm_server
@@ -78,9 +82,9 @@ class EvilProxy::MITMProxyServer < EvilProxy::HTTPProxyServer
     raise RuntimeError, "No avaliable port found, stop retrying"
   end
 
-  def start_mitm_server unparsed_uri, host, port
-    if @mitm_servers[unparsed_uri]
-      return @mitm_servers[unparsed_uri].config[:Port]
+  def start_mitm_server host, port
+    if @mitm_servers[host]
+      return @mitm_servers[host].config[:Port]
     else
       cert, key = create_self_signed_cert host
       agent_config = self.config.merge(
@@ -92,24 +96,32 @@ class EvilProxy::MITMProxyServer < EvilProxy::HTTPProxyServer
       )
       mitm_server = retry_start_agent_server agent_config
 
-      @mitm_servers[unparsed_uri] = mitm_server
+      @mitm_servers[host] = mitm_server
 
       Thread.new do mitm_server.start end
       return mitm_server.config[:Port]
     end
   end
 
+  define_callback_methods :before_mitm
+  define_callback_methods :after_mitm
+
   def do_MITM req, res
-    unparsed_uri = req.unparsed_uri
-    host, port = unparsed_uri.split(":")
+    fire :before_mitm, req
+
+    host, port = req.unparsed_uri.split(":")
     port ||= 443
 
-    mitm_port = start_mitm_server unparsed_uri, host, port
+    mitm_port = start_mitm_server host, port
     req.unparsed_uri = "127.0.0.1:#{mitm_port}"
+
+    fire :after_mitm, req, res
   end
 
   def do_CONNECT req, res
-    do_MITM req, res
+    if !@mitm_pattern || req.unparsed_uri =~ @mitm_pattern
+      do_MITM req, res
+    end
     super
   end
 

data/lib/evil-proxy/version.rb

@@ -1,3 +1,3 @@
 module EvilProxy
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evil-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Theo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,25 +38,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A ruby http/https proxy, with SSL MITM support.
 email:
 - bbtfrr@gmail.com
 executables:
 - evil-proxy
+- evil-proxy.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -66,6 +53,7 @@ files:
 - README.md
 - Rakefile
 - bin/evil-proxy
+- bin/evil-proxy.rb
 - evil-proxy.gemspec
 - lib/evil-proxy.rb
 - lib/evil-proxy/agentproxy.rb
@@ -97,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A ruby http/https proxy to do EVIL things.