browsermob-proxy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81d8e0cc87644ed0cd3fa3d345810a84a5c37290
-  data.tar.gz: 1c240176d5d088fd887d7e3459dfdc43384eb439
+  metadata.gz: 3a912d832abea44539c98c6637c24219d051287b
+  data.tar.gz: 82ecdd480bfdf34b6fadff244ed19a23e01585b7
 SHA512:
-  metadata.gz: a7213d41a4deb8f17eb879baa0d7af2dabcc29802988fe28c89715164c7783c5fac0f0b47ab428e5c3e27ebe06679ea240746b9d5dda189d2f0a55ab0d349138
-  data.tar.gz: a42bed98b29774661379eb23ed6761d69aea7de8582339e332c15533684bdc33fa078c892a1b6551a7a82a415421992aa6a97f92d6c155a4c85ce49ca9c61911
+  metadata.gz: 87c2537dab9542d0348d1f81b756572f9fa1e790b5454d05a18b8a3fc6374483ded51caddc9a11a0e5af4825ab34b2abc314ec222ca6f7f682748bdb46fa8565
+  data.tar.gz: 248d729cb942ba5eb61a68fe03ad0510760893de9ff0476485e0f4637b2bd8572cbfe91aec4ffd251d380b5fa0d35b32d19ed7aa4a9a3180afcafd8cfe00d842

data/README.md

@@ -82,7 +82,7 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright 2011-2012 Jari Bakken
+Copyright 2011-2013 Jari Bakken
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/browsermob/proxy/client.rb

@@ -70,8 +70,19 @@ module BrowserMob
         Selenium::WebDriver::Proxy.new(proxy_mapping)
       end
 
+      #
+      # Set a list of URL regexes to whitelist
+      #
+      # Note that passed regexp/string should match string as a whole
+      # (i.e. if /example\.com/ is whitelisted "http://www.example.com" won't be allowed
+      # though if /.+example\.com" is whitelisted "http://www.example.com" will be allowed)
+      #
+      # @param regexp [Regexp, String, Array<String, Regexp>]   a regexp, string or an array of regexps/strings that urls should match to
+      # @param status_code [Integer]    the HTTP status code to return for URLs that do not match the whitelist
+      #
+
       def whitelist(regexp, status_code)
-        regex = Regexp === regexp ? regexp.source : regexp.to_s
+        regex = Array(regexp).map { |rx| Regexp === rx ? rx.source : rx.to_s }.join(',')
         @resource['whitelist'].put :regex => regex, :status => status_code
       end
 
@@ -90,6 +101,20 @@ module BrowserMob
         @resource["auth/basic/#{domain}"].post data.to_json, :content_type => "application/json"
       end
 
+      #
+      # Override normal DNS lookups (remap the given hosts with the associated IP address).
+      #
+      # Each invocation of the method will add given hosts to existing BrowserMob's DNS cache
+      # instead of overriding it.
+      #
+      # @example remap_dns_hosts('example.com' => '1.2.3.4')
+      # @param hash [Hash] a hash with domains as keys and IPs as values
+      #
+
+      def remap_dns_hosts(hash)
+        @resource['hosts'].post hash.to_json, :content_type => 'application/json'
+      end
+
       LIMITS = {
         :upstream_kbps   => 'upstreamKbps',
         :downstream_kbps => 'downstreamKbps',

data/lib/browsermob/proxy/version.rb

@@ -1,5 +1,5 @@
 module BrowserMob
   module Proxy
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/e2e/selenium_spec.rb

@@ -44,9 +44,40 @@ describe "Proxy + WebDriver" do
     entry.request.headers.should_not be_empty
   end
 
-  it "should set whitelist and blacklist" do
-    proxy.whitelist(/example\.com/, 201)
-    proxy.blacklist(/bad\.com/, 404)
+  describe 'whitelist' do
+    it "allows access to urls in whitelist" do
+      dest = url_for('1.html')
+
+      proxy.whitelist(Regexp.quote(dest), 404)
+      driver.get dest
+      wait.until { driver.title == '1' }
+    end
+
+    it "disallows access to urls outside whitelist" do
+      proxy.new_har('whitelist')
+      proxy.whitelist('foo\.bar\.com', 404)
+      driver.get url_for('2.html')
+      proxy.har.entries.first.response.status.should == 404
+    end
+  end
+
+  describe 'blacklist' do
+    it "disallows access to urls in blacklist" do
+      proxy.new_har('blacklist')
+
+      dest = url_for('1.html')
+      proxy.blacklist(Regexp.quote(dest), 404)
+      driver.get dest
+
+      proxy.har.entries.first.response.status.should == 404
+    end
+
+    it "allows access to urls outside blacklist" do
+      proxy.blacklist('foo\.bar\.com', 404)
+      driver.get url_for('2.html')
+
+      wait.until { driver.title == '2' }
+    end
   end
 
   it "should set headers" do
@@ -57,4 +88,15 @@ describe "Proxy + WebDriver" do
     proxy.limit(:downstream_kbps => 100, :upstream_kbps => 100, :latency => 2)
   end
 
+  it 'should remap given DNS hosts' do
+    uri = URI.parse url_for('1.html')
+    host = 'plus.google.com'
+
+    proxy.remap_dns_hosts(host => uri.host)
+    uri.host = host
+
+    driver.get uri
+    wait.until { driver.title == '1' }
+  end
+
 end

data/spec/unit/client_spec.rb

@@ -17,7 +17,8 @@ module BrowserMob
           "blacklist"            => double("resource[blacklist]"),
           "limit"                => double("resource[limit]"),
           "headers"              => double("resource[headers]"),
-          "auth/basic/#{DOMAIN}" => double("resource[auth/basic/#{DOMAIN}]")
+          "auth/basic/#{DOMAIN}" => double("resource[auth/basic/#{DOMAIN}]"),
+          "hosts"                => double("resource[hosts]")
         }.each do |path, mock|
           resource.stub(:[]).with(path).and_return(mock)
         end
@@ -84,11 +85,27 @@ module BrowserMob
         client.blacklist(%r[http://example.com], 401)
       end
 
-      it "sets the whitelist" do
-        resource['whitelist'].should_receive(:put).
-                              with(:regex => "http://example.com", :status => 401)
+      describe 'whitelist' do
+        it "supports a string" do
+          resource['whitelist'].should_receive(:put).
+                                with(:regex => 'https?://example\.com', :status => 401)
+
+          client.whitelist('https?://example\.com', 401)
+        end
+
+        it "supports a regexp" do
+          resource['whitelist'].should_receive(:put).
+                                with(:regex => 'https?://example\.com', :status => 401)
+
+          client.whitelist(%r{https?://example\.com}, 401)
+        end
 
-        client.whitelist(%r[http://example.com], 401)
+        it "supports an array of regexps and strings" do
+          resource['whitelist'].should_receive(:put).
+                                with(:regex => 'http://example\.com/1/.+,http://example\.com/2/.+', :status => 401)
+
+          client.whitelist([%r{http://example\.com/1/.+}, 'http://example\.com/2/.+'], 401)
+        end
       end
 
       it "sets the :downstream_kbps limit" do
@@ -137,6 +154,13 @@ module BrowserMob
         client.basic_authentication(DOMAIN, user, password)
       end
 
+      it 'sets mapped dns hosts' do
+        resource['hosts'].should_receive(:post).with(%({"#{DOMAIN}":"1.2.3.4"}),
+                                                     :content_type => "application/json")
+
+        client.remap_dns_hosts(DOMAIN => '1.2.3.4')
+      end
+
       context "#selenium_proxy" do
         it "defaults to HTTP proxy only" do
           proxy = client.selenium_proxy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browsermob-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - jari.bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: browsermob-proxy-rb
-rubygems_version: 2.0.0
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby client for the BrowserMob Proxy REST API