mallory 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87eb6511a86298565a32bb4f9a6200773d39fe9e
-  data.tar.gz: dec4a02af3306a9f348d38fa656b448a06a9c92c
+  metadata.gz: 2986cd40c0575541258ea30258a3647ba162d6c3
+  data.tar.gz: ffbeddde71442cb1fc00cab05f48f560cd6b2e19
 SHA512:
-  metadata.gz: c54f259b962ff224ab1031d698c892c94fca926f2249905bb14f463c170ba4ebd5ed17c74a8e6c92ae36aca1e12c8fc70176b3c95b3adbc101f8b685c71e53b0
-  data.tar.gz: 8cbfc1e0028fecf96dffc919f70230bc8c0fe97e4b4f5b874122632be0ad8d5704a421a6efcd306881744855558b562b92c35eedbbda6ca4195aa96b90c5b300
+  metadata.gz: 930f5970b48a7085b177b21da243ea8a4b598a150fdce183a1769036c7f8ede30d8f84080c230e883fc30d0204f687a434c3d5ac853bb3d97f6f9414357dc042
+  data.tar.gz: 7d5bf8c37b5335631e7b61cce9b0402ca99a4dbb6d33980b5670f32fc8741a0f51f5e4cc16e66698bfbc09fa043a00e24ff9079ff201c03f431c4969810995ba

data/.gitignore

@@ -6,3 +6,5 @@ sbin
 keys/*.crt
 keys/*.key
 keys/*.csr
+proxies.txt
+mallory.log

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+#--profile

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 1.9.3
+
+gemfile:
+  - Gemfile
+
+script: "echo 'COME ON!' && bundle exec rake spec"

data/README.md

@@ -1,4 +1,9 @@
-## mallory
+# mallory
+
+[![Gem Version](https://badge.fury.io/rb/mallory.png)](https://rubygems.org/gems/mallory)
+[![Build Status](https://secure.travis-ci.org/odcinek/mallory.png?branch=master)](http://travis-ci.org/odcinek/mallory)
+[![Dependency Status](https://gemnasium.com/odcinek/mallory.png?travis)](https://gemnasium.com/odcinek/mallory)
+[![Code Climate](https://codeclimate.com/github/odcinek/mallory.png)](https://codeclimate.com/github/odcinek/mallory)
 
 Man-in-the-middle http/https transparent http (CONNECT) proxy over bunch of (unreliable) backends.
 It is intended to be used for running test suits / scrapers. It basically shields the proxied application from low responsiveness / poor reliability of underlying proxies.
@@ -7,11 +12,15 @@ Proxy list is provided by external backend (ActiveRecord model, Redis set) and i
 
 For the mallory to work properly client certificate validation needs to be turned off.
 
-### Example usage
+## Usage
+
+### Command line
 
 ```bash
 ./keys/keygen.sh
-bundle exec ./bin/mallory -v -l 9999
+bundle exec ./bin/mallory -v -l 9999 #default (no proxy backend, direct requests)
+bundle exec ./bin/mallory -v -b file://proxies.txt -l 9999 #start with proxy file
+bundle exec ./bin/mallory -v -b redis://127.0.0.1:6379 -l 9999 #start with Redis backend
 ```
 
 ```bash
@@ -19,28 +28,51 @@ curl --insecure --proxy 127.0.0.1:9999 https://www.dropbox.com/login
 phantomjs --debug=yes --ignore-ssl-errors=yes --ssl-protocol=sslv2 --proxy=127.0.0.1:9999 --proxy-type=http hello.js
 ```
 
-### What mallory is not
+### Interface
+
+```ruby
+mb = Mallory::Backend::File.new('proxies.txt')
+mp = Mallory::Proxy.new()
+mp.backend = mb
+mp.start!
+```
+
+### Proxy backends
+
+#### Self
+
+Just direct requests, no proxies, default
+
+#### File
+
+Text file, one http proxy per line, in ```proxy:port``` format.
+
+#### Redis
+
+Redis key TODO
+
+## What mallory is not
 - General purpose proxying daemon
 - General purpose proxy load balancer
 - Anything general purpose really
-- For mature general purpose mitm solution (in Python) see [mallory](https://github.com/mallory/mallory)
+- For mature general purpose mitm solution (in Python) see [mitmproxy](https://github.com/mitmproxy/mitmproxy)
 
-### TODO
+## TODO
 - CA support
 - SOCKS5 backends (mixing http and SOCKS5 proxies)
 - parallel requests
 - even better response reliability
 
-### Resources
+## Resources
 
 - [HTTP Connect Tunneling](http://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_Tunneling)
 - [RFC2817, Upgrading to TLS Within HTTP/1.1](http://www.ietf.org/rfc/rfc2817.txt)
 
-### Contributors
+## Contributors
 
 - [Marcin Sawicki](https://github.com/odcinek)
 - [Maria Kacik](https://github.com/mkacik)
 
-### License
+## License
 
 (The MIT License)

data/Rakefile

@@ -0,0 +1,7 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+
+desc "Run all RSpec tests"
+RSpec::Core::RakeTask.new(:spec)

data/bin/mallory

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
+require 'mallory'
+require 'optparse'
+require 'logging'
+
+#ARGV << '--help' if ARGV.empty?
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: proxybalancer [options]"
+
+  opts.on("-l", "--listen PORT", Integer, "Port to listen on (default 9999)") do |v|
+    options[:listen] = v
+  end
+
+  opts.on("-b", "--backend BACKEND", String, "Backend to use (default 'file://proxies.txt')") do |v|
+    options[:listen] = v
+  end
+
+  opts.on("-ct", "--connect-timeout SECONDS", Integer, "Proxy connect timeout (default 2s)") do |v|
+    options[:ct] = v
+  end
+
+  opts.on("-it", "--inactivity-timeout SECONDS", Integer, "Proxy inactivity timeout (default 2s)") do |v|
+    options[:it] = v
+  end
+
+  opts.on("-v", "--verbose", "Run in debug mode") do |v|
+    options[:verbose] = v
+  end
+end.parse!
+
+def get_logger(verbose)
+  # https://github.com/TwP/logging/blob/master/lib/logging/layouts/pattern.rb
+  layout = Logging::Layouts::Pattern.new({ :pattern => "%d %-5l : %m\n"})
+  logger = Logging.logger['mallory']
+  file_appender = Logging.appenders.file("mallory.log")
+  file_appender.layout = layout
+  file_appender.level = :info
+  logger.add_appenders(file_appender)
+  stdout_appender = Logging.appenders.stdout
+  stdout_appender.layout = layout
+  stdout_appender.level = verbose ? :debug : :info
+  logger.add_appenders(
+      stdout_appender,
+      file_appender
+  )
+  logger
+end
+
+config = Mallory::Configuration.register do |c|
+  c.logger = get_logger(options.delete(:verbose))
+  c.backend = Mallory::Backend::Self.new()
+  #c.backend = Mallory::Backend::File.new("#{Dir.pwd}/proxies.txt")
+#  c.backend = Mallory::Backend::Redis.new("127.0.0.1", 6379)
+  c.connect_timeout = options.delete(:connect_timeout) || 2
+  c.inactivity_timeout = options.delete(:inactivity_timeout) || 2
+  c.listen = options.delete(:listen) || 9999
+end
+
+Mallory::Server.new(config).start!

data/keys/keygen.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+echo "Self signed dummy cert"
+set -e
+openssl genrsa -out ./keys/server.key 1024
+openssl req -subj '/C=US/ST=CA/L=SF/CN=*.com' -new -key ./keys/server.key -out ./keys/server.csr
+openssl x509 -req -days 365 -in ./keys/server.csr -signkey ./keys/server.key -out ./keys/server.crt

data/lib/mallory/backend/file.rb

@@ -0,0 +1,34 @@
+module Mallory
+  module Backend
+    class File
+=begin
+It would be cool to add signal trap to refresh proxy list when file contents change
+(with initial validation, so if file is malformed, old list stays)
+=end
+      def initialize(filename)
+        @proxies = []
+        begin
+          lines = ::File.readlines(filename)
+          raise if lines.nil?
+          raise if lines.empty?
+        rescue
+          raise("Proxy file missing or empty")
+        end
+        lines.each do |line|
+          if line.strip.match(/.*:\d{2,6}/)
+            @proxies << line.strip
+          else raise("Wrong format") end
+        end
+      end
+
+      def any
+        @proxies.sample
+      end
+
+      def all
+        @proxies
+      end
+
+    end
+  end
+end

data/lib/mallory/backend/redis.rb

@@ -0,0 +1,18 @@
+require 'redis'
+
+module Mallory
+  module Backend
+    class Redis
+
+      def initialize(host, port)
+        redis = ::Redis.new(:host => host, :port => port)
+        @proxies = redis.smembers("good_proxies")
+      end
+
+      def any
+        @proxies.sample
+      end
+
+    end
+  end
+end

data/lib/mallory/backend/self.rb

@@ -0,0 +1,18 @@
+module Mallory
+  module Backend
+    class Self
+      def initialize()
+        @proxies = []
+      end
+
+      def any
+        @proxies.sample
+      end
+
+      def all
+        @proxies
+      end
+
+    end
+  end
+end

data/lib/mallory/configuration.rb

@@ -0,0 +1,60 @@
+module Mallory
+  class Configuration
+    # defining instance variable at class level
+    # this will ensure that static config is
+    # not shared with objects created by calling
+    # Configuration.new
+    @settings = {}
+
+    def self.register
+      if block_given?
+        yield(self)
+      end
+      self
+    end
+
+    def self.logger
+      @settings[:logger]
+    end
+
+    def self.logger=(other)
+      @settings[:logger] = other
+    end
+
+    def self.backend
+      @settings[:backend]
+    end
+
+    def self.backend=(other)
+      @settings[:backend] = other
+    end
+
+    def self.listen
+      @settings[:listen]
+    end
+
+    def self.listen=(other)
+      @settings[:listen] = other
+    end
+
+    def self.connect_timeout
+      @settings[:connect_timeout]
+    end
+
+    def self.connect_timeout=(other)
+      @settings[:connect_timeout] = other
+    end
+
+    def self.inactivity_timeout
+      @settings[:inactivity_timeout]
+    end
+
+    def self.inactivity_timeout=(other)
+      @settings[:inactivity_timeout] = other
+    end
+
+    def self.reset!
+      @settings = {}
+    end
+  end
+end

data/lib/mallory/connection.rb

@@ -0,0 +1,60 @@
+require 'eventmachine'
+require 'em-http-request'
+require 'redis'
+
+
+module Mallory
+  class Connection < EM::Connection
+    def initialize(request_builder, proxy_builder, logger)
+      @logger = logger
+      @request_builder = request_builder
+      @proxy_builder = proxy_builder
+      @start = Time.now
+      @secure = false
+      @proto = "http"
+    end
+
+    def ssl_handshake_completed # EM::Connection
+      @logger.debug "Secure connection intercepted"
+      @secure = true
+    end
+
+    def post_init # EM::Connection
+      @logger.debug "Start connection"
+    end
+
+    def unbind(reason=nil) # EM::Connection
+      @logger.debug "Close connection #{reason}"
+    end
+
+    def error
+      @logger.info "Failure in #{Time.now-@start}s"
+      send_data "HTTP/1.1 500 Internal Server Error\nContent-Type: text/html\nConnection: close\n\n"
+      close_connection_after_writing
+    end
+
+    def receive_data(data) # EM::Connection
+      begin
+      request = @request_builder.build(data)
+      rescue
+        error
+        return
+      end
+      if not @secure and request.method.eql?('connect')
+        send_data "HTTP/1.0 200 Connection established\r\n\r\n"
+        start_tls :private_key_file => './keys/server.key', :cert_chain_file => './keys/server.crt', :verify_peer => false
+        return true
+      end
+      proxy = @proxy_builder.build
+      proxy.callback {
+        send_data proxy.response
+        close_connection_after_writing
+      }
+      proxy.errback {
+        error
+      }
+      request.protocol = 'https' if @secure
+      proxy.perform(request)
+    end
+  end
+end

data/lib/mallory/proxy.rb

@@ -0,0 +1,90 @@
+require 'eventmachine'
+require 'em-http-request'
+
+module Mallory
+  class Proxy
+    MAX_ATTEMPTS = 10
+
+    include EventMachine::Deferrable
+
+    def initialize(ct, it, backend, response_builder, logger)
+      @connect_timeout = ct
+      @inactivity_timeout = it
+      @backend = backend
+      @response_builder = response_builder
+      @logger = logger
+      @retries = 0
+      @response = ''
+    end
+
+    def resubmit
+      @proxy = @backend.any
+      submit
+    end
+
+    def perform request
+      @method = request.method.to_s
+      @uri = request.uri
+      @request_headers = request.headers
+      @body = request.body || ''
+      resubmit
+    end
+
+    def send_data data
+      @response << data
+    end
+
+    def response
+      @response
+    end
+
+    def options
+      options = {
+        :connect_timeout => @connect_timeout,
+        :inactivity_timeout => @inactivity_timeout,
+      }
+      if not @proxy.nil?
+        options[:proxy] = {
+          :host => @proxy.split(':')[0],
+          :port => @proxy.split(':')[1]
+        }
+      end
+      return options
+    end
+
+    def submit
+      @retries+=1
+      if @retries > MAX_ATTEMPTS
+        fail
+        return
+      end
+      @logger.debug "Attempt #{@retries} - #{@method.upcase} #{@uri} via #{@proxy}"
+      if [:post, :put].include?(@method)
+        request_params = {:head => @headers, :body => @body}
+      else
+        request_params = {:head => @headers}
+      end
+      http = EventMachine::HttpRequest.new(@uri, options).send(@method, request_params)
+      http.errback {
+        @logger.debug "Attempt #{@retries} - Failed"
+        resubmit
+      }
+      http.callback {
+        @logger.debug "Attempt #{@retries} - Success"
+        response = @response_builder.build(http)
+        if response.status > 400
+          @logger.debug "#{response.status} > 400"
+          resubmit
+        else
+          send_data "HTTP/1.1 #{response.status} #{response.description}\n"
+          send_data response.headers
+          send_data "\r\n\r\n"
+          send_data response.body
+          @logger.debug "Send content #{response.body.length} bytes"
+          @logger.info "Success (#{Time.now-Time.now}s, #{@retries} attempts)"
+        end
+        self.succeed
+      }
+    end
+  end
+end

data/lib/mallory/proxy_builder.rb

@@ -0,0 +1,10 @@
+class Mallory::ProxyBuilder
+  def initialize(config, response_builder)
+    @config = config
+    @response_builder = response_builder
+  end
+
+  def build
+    Mallory::Proxy.new(@config.connect_timeout, @config.inactivity_timeout, @config.backend, @response_builder, @config.logger)
+  end
+end

data/lib/mallory/request.rb

@@ -0,0 +1,45 @@
+require 'webrick'
+
+module Mallory
+  class Request
+
+    attr_accessor :protocol
+
+    def initialize(data, logger)
+      @logger = logger
+      line = data.match(/([A-Z]{3,8})\s(?:(http\w*):\/\/)*(?:(\w*):*(\d{2,5})*)(\/{0,1}.*)\sHTTP/)
+      method = line[1]
+      @protocol = "http"
+      host = line[3] || data.match(/Host:\s(.*)\n/)[1]
+      port = line[4]
+      path = line[5]
+      data.sub!("#{method} #{line[3]}:#{port}", "#{method} #{line[3]}/")
+      data.sub!("Host: #{line[3]}:#{port}", "Host: #{line[3]}")
+      @request = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+      @request.parse(StringIO.new(data))
+    rescue WEBrick::HTTPStatus::BadRequest
+      raise
+    end
+
+    def uri
+      "#{@protocol}://#{@request['host']}#{@request.path}"
+    end
+
+    def method
+      @request.request_method.downcase
+    end
+
+    def headers
+      headers = {}
+      @request.each { |head| headers[head] = @request[head] }
+      headers
+    end
+
+    def body
+      @request.body
+    rescue WEBrick::HTTPStatus::LengthRequired
+      nil
+    end
+
+  end
+end

data/lib/mallory/request_builder.rb

@@ -0,0 +1,11 @@
+module Mallory
+  class RequestBuilder
+    def initialize(config)
+      @config = config
+    end
+
+    def build(data)
+      Mallory::Request.new(data, @config.logger)
+    end
+  end
+end

data/lib/mallory/response.rb

@@ -0,0 +1,39 @@
+module Mallory
+  class Response
+
+    def initialize http, logger
+      @logger = logger #TODO: unsure if logger is needed in plain data structure
+      @http = http
+    end
+
+    def status
+      @http.response_header.status
+    end
+
+    def description
+      @http.response_header.http_reason
+    end
+
+    def body
+      @http.response
+    end
+
+    def headers
+      headers = []
+      @http.response_header.each do |header|
+        next if header[0].match(/^X_|^VARY|^VIA|^SERVER|^TRANSFER_ENCODING|^CONNECTION/)
+        header_name = "#{header[0].downcase.capitalize.gsub('_','-')}"
+        case header[1]
+        when Array
+          header[1].each do |header_value|
+            headers << "#{header_name}: #{header_value}"
+          end
+        when String
+          headers << "#{header_name}: #{header[1]}"
+        end
+      end
+      headers << "Connection: close"
+      return headers.join("\n")
+    end
+  end
+end

data/lib/mallory/response_builder.rb

@@ -0,0 +1,9 @@
+class Mallory::ResponseBuilder
+  def initialize(config)
+    @config = config
+  end
+
+  def build(data)
+    Mallory::Response.new(data, @config.logger)
+  end
+end

data/lib/mallory/server.rb

@@ -0,0 +1,29 @@
+require 'eventmachine'
+
+$stdout.sync = true
+
+Signal.trap("INT")  { puts "Gracefully exiting"; EventMachine.stop }
+Signal.trap("TERM") { puts "Gracefully exiting"; EventMachine.stop }
+# Signal.trap("USR1") { puts "Reloading log files" }
+
+EM.kqueue if EM.kqueue? #osx
+EM.epoll  if EM.epoll? #linux
+
+module Mallory
+  class Server
+    def initialize config
+      @logger = config.logger
+      @listen = config.listen
+      @request_builder = Mallory::RequestBuilder.new(config)
+      response_builder = Mallory::ResponseBuilder.new(config)
+      @proxy_builder = Mallory::ProxyBuilder.new(config, response_builder)
+    end
+
+    def start!
+      EventMachine.run {
+        @logger.info "Starting mallory"
+        EventMachine.start_server '127.0.0.1', @listen, Mallory::Connection, @request_builder, @proxy_builder, @logger
+      }
+    end
+  end
+end

data/lib/mallory/version.rb

@@ -1,5 +1,3 @@
-module EventMachine
-  class Mallory
-    VERSION = "0.0.1"
-  end
+module Mallory
+  VERSION = "0.0.2"
 end

data/lib/mallory.rb

@@ -1 +1,14 @@
+require 'mallory/configuration'
+require 'mallory/backend/redis'
+require 'mallory/backend/file'
+require 'mallory/backend/self'
+require 'mallory/backend/activerecord'
+require 'mallory/request'
+require 'mallory/response'
+require 'mallory/proxy'
+require 'mallory/connection'
+require 'mallory/server'
+require 'mallory/request_builder'
+require 'mallory/response_builder'
+require 'mallory/proxy_builder'
 require 'mallory/version'

data/mallory.gemspec

@@ -4,7 +4,7 @@ require "mallory/version"
 
 Gem::Specification.new do |s|
   s.name        = "mallory"
-  s.version     = EventMachine::Mallory::VERSION
+  s.version     = Mallory::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Marcin Sawicki"]
   s.email       = ["odcinek@gmail.com"]
@@ -16,8 +16,11 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.0.3"
   s.add_dependency "redis"
   s.add_dependency "em-http-request"
+  s.add_dependency "logging"
   s.add_development_dependency "rspec"
   s.add_development_dependency "sinatra"
+  s.add_development_dependency "sinatra-contrib"
+  s.add_development_dependency "thin"
   s.add_development_dependency "rake"
 
   s.files         = `git ls-files`.split("\n")

data/spec/mallory/configuration_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'mallory/configuration'
+
+describe Mallory::Configuration do
+  before(:each) do
+    Mallory::Configuration.reset!
+  end
+
+  it 'should set logger' do
+    logger = 'dummy'
+    Mallory::Configuration.logger = logger
+    expect(Mallory::Configuration.logger).to be(logger)
+  end
+
+  it 'should reset' do
+    Mallory::Configuration.logger = 'dummy'
+    expect(Mallory::Configuration.logger).to_not be_nil
+    Mallory::Configuration.reset!
+    expect(Mallory::Configuration.logger).to be_nil
+  end
+end

data/spec/mallory/connection_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'mallory/connection'
+
+describe Mallory::Connection do
+
+=begin
+  it 'should' do
+  end
+=end
+
+end

data/spec/mallory/file_backend_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'mallory/backend/file'
+
+describe Mallory::Backend::File do
+    
+  let(:proxies){ ["127.0.0.1:5600","127.0.0.1:5601", "127.0.0.1:5602"] }
+
+  it "should return all proxies" do
+    file=File.should_receive(:readlines).with("proxies.txt").and_return(proxies)
+    Mallory::Backend::File.new("proxies.txt").all.should eq(proxies)
+  end
+
+  it "should return one proxy" do
+    File.should_receive(:readlines).with("proxies.txt").and_return([proxies.first])
+    Mallory::Backend::File.new("proxies.txt").any.should eq(proxies.first)
+  end
+
+  it "should raise on empty file" do
+    File.should_receive(:readlines).with("proxies.txt")
+    expect {Mallory::Backend::File.new("proxies.txt")}.to raise_error("Proxy file missing or empty")
+  end
+
+  it "should raise on wrong format" do
+    File.should_receive(:readlines).with("proxies.txt").and_return(["wr0ng:f0rm4t"])
+    expect {Mallory::Backend::File.new("proxies.txt")}.to raise_error("Wrong format")
+  end
+
+  it "should raise on missing file" do 
+    File.should_receive(:readlines).with("proxies.txt").and_raise(Errno::ENOENT)
+    expect {Mallory::Backend::File.new("proxies.txt")}.to raise_error("Proxy file missing or empty")
+  end
+
+end

data/spec/mallory/proxy_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'mallory/proxy'
+
+describe Mallory::Proxy do
+
+=begin
+  it 'should' do
+    EM.run do
+      http = EventMachine::HttpRequest.new("http://127.0.0.1:6701/200", {}).get
+      http.callback do
+        EM.stop
+      end
+      http.errback { EM.stop; raise }
+    end
+  end
+=end
+
+end

data/spec/mallory/request_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'mallory/request'
+
+describe Mallory::Request do
+  let(:logger) { Logger.new(STDOUT) }
+
+  methods = ['GET', 'POST', 'HEAD', 'PUT', 'CONNECT', 'DELETE']
+
+  good_requests = [
+    {:path => "/", :host => "localhost"},
+    {:path => "/index.html", :host => "localhost"},
+    {:path => "/index.html?test", :host => "localhost:80"},
+    {:path => "http://localhost/index.html", :host => "localhost"},
+    {:path => "http://localhost/", :host => "localhost"},
+    {:path => "https://localhost/", :host => "localhost:443"},
+    {:path => "localhost:443", :host => "localhost:443"},
+    {:path => "/login", :host => "localhost"},
+    {:path => "localhost:443/index.html", :host => "localhost:443"}
+  ]
+
+  bad_requests = [
+    {:path => "http://loca lhost :6700", :host => "localhost:6700"}
+  ]
+
+  good_requests.each do |request|
+    it "should accept #{request[:path]}" do
+      methods.each do |method|
+        body =<<-HTTP.gsub(/^ +/, '')
+          #{method} #{request[:path]} HTTP/1.1
+          Host: #{request[:host]}
+        HTTP
+        rq = Mallory::Request.new(body, logger)
+        rq.method.should eq(method.downcase)
+        rq.body.should be(nil)
+      end
+    end
+  end
+
+  bad_requests.each do |request|
+    it "should raise on #{request[:path]}" do
+      methods.each do |method|
+        body =<<-HTTP.gsub(/^ +/, '')
+          #{method} #{request[:path]} HTTP/1.1
+          Host: #{request[:host]}
+        HTTP
+        expect { Mallory::Request.new(body, logger) }.to raise_error
+      end
+    end
+  end
+
+end

data/spec/mallory/response_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'em-http-request'
+require 'mallory/response'
+require 'responder'
+
+describe Mallory::Response do
+  let(:logger) { Logger.new(STDOUT) }
+
+  it "should filter out headers" do
+    EM.run do
+      http = EventMachine::HttpRequest.new("http://127.0.0.1:6701/200/headers", {}).get
+      http.callback do
+        r = Mallory::Response.new(http, logger)
+        r.description.should eq("OK")
+        r.status.should eq(200)
+        r.body.should eq("OK")
+        r.headers.split("\n").reject {|h| h.match(/^Date/)}.join("\n").should eq("Content-type: text/html;charset=utf-8\nContent-length: 2\nSet-cookie: cookie1=JohnDoe; domain=127.0.0.1; path=/; HttpOnly\nSet-cookie: cookie2=JaneRoe; domain=127.0.0.1; path=/; HttpOnly\nConnection: close")
+        EM.stop
+      end
+      http.errback { EM.stop; raise }
+    end
+  end
+
+end

data/spec/mallory.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+require 'mallory'
+options = {:listen => 6701}
+Mallory.new(options).start!

data/spec/responder.rb

@@ -0,0 +1,43 @@
+require 'sinatra/base'
+require "sinatra/cookies"
+
+class Responder < Sinatra::Base
+  
+  helpers Sinatra::Cookies
+
+  set :protection, false
+
+  get '/200' do
+    status 200
+    headers "Server" => "Teapot Server"
+    "OK"
+  end
+
+  get '/200/headers' do
+    status 200
+    cookies[:cookie1] = 'JohnDoe'
+    cookies[:cookie2] = 'JaneRoe'
+    headers "Server" => "Teapot Server",
+            "Connection" => "Keep-Alive",
+            "Via" => "1.0 fred",
+            "Vary" => "Cookie",
+            "X-Powered-By" => "PHP/5.1.2+LOL"
+    "OK"
+    #"Transfer-encoding" => "chunked",
+  end
+
+  get '/418' do
+    status 418
+    headers "Allow"  => "POST, GET, HEAD, PUT, DELETE, CONNECT",
+            "Server" => "Teapot Server"
+    body "I'm a tea pot!"
+  end
+
+  get '/500' do
+    status 500
+    headers "Server" => "Teapot Server",
+            "Connection" => "close"
+    true
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+require 'rspec'
+require 'webrick'
+require 'em-http-request'
+require 'responder'
+require 'logger'
+
+RSpec.configure do |config|
+  config.order = 'random'
+
+  config.before(:suite) do
+    trap(:INT) { EM.stop }
+    trap(:TERM){ EM.stop }
+    Thread.new do
+      Rack::Handler::WEBrick.run(
+        Responder.new,
+        :Port => 6701,
+        :AccessLog => [],
+        :Logger => WEBrick::Log::new("/dev/null", 7))
+    end
+    sleep 3
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mallory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Marcin Sawicki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  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'
+- !ruby/object:Gem::Dependency
+  name: thin
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +140,43 @@ description: Man-in-the-middle http/https transparent http (CONNECT) proxy over
   of (unreliable) backends
 email:
 - odcinek@gmail.com
-executables: []
+executables:
+- mallory
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - README.md
+- Rakefile
+- bin/mallory
+- keys/keygen.sh
 - lib/mallory.rb
+- lib/mallory/backend/file.rb
+- lib/mallory/backend/redis.rb
+- lib/mallory/backend/self.rb
+- lib/mallory/configuration.rb
+- lib/mallory/connection.rb
+- lib/mallory/proxy.rb
+- lib/mallory/proxy_builder.rb
+- lib/mallory/request.rb
+- lib/mallory/request_builder.rb
+- lib/mallory/response.rb
+- lib/mallory/response_builder.rb
+- lib/mallory/server.rb
 - lib/mallory/version.rb
 - mallory.gemspec
+- spec/mallory.rb
+- spec/mallory/configuration_spec.rb
+- spec/mallory/connection_spec.rb
+- spec/mallory/file_backend_spec.rb
+- spec/mallory/proxy_spec.rb
+- spec/mallory/request_spec.rb
+- spec/mallory/response_spec.rb
+- spec/responder.rb
+- spec/spec_helper.rb
 homepage: http://github.com/odcinek/mallory
 licenses:
 - MIT
@@ -133,5 +202,14 @@ signing_key:
 specification_version: 4
 summary: Man-in-the-middle http/https transparent http (CONNECT) proxy over bunch
   of (unreliable) backends
-test_files: []
+test_files:
+- spec/mallory.rb
+- spec/mallory/configuration_spec.rb
+- spec/mallory/connection_spec.rb
+- spec/mallory/file_backend_spec.rb
+- spec/mallory/proxy_spec.rb
+- spec/mallory/request_spec.rb
+- spec/mallory/response_spec.rb
+- spec/responder.rb
+- spec/spec_helper.rb
 has_rdoc: