miniproxy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1498d971ffe909b6a3fcaaaaec2cd7aebf1629ed7f3818d0e9475effd677fbe
-  data.tar.gz: b3e56000c850b03e70a85133a2c7b8832b3013ec2ef9d07ea5a72a1017418182
+  metadata.gz: 6875d6201b9252532b5cd9fac07495eff9ac447485aa9160c47af987d963066e
+  data.tar.gz: '09fcb65924875d32764ad9c8ce272b98ade611f1b77e6cfb3b33f2c67f219f97'
 SHA512:
-  metadata.gz: 4c3601e354b1fed1faa3dd789392fc78ee8d5777c78a71bc7ad80bf2db9f9a7131f0df0ebc95cd0e0a634a72ae8eeb2ef58a3afc917cfd6cc7b15576192b7426
-  data.tar.gz: 0b4c1333ce5e0d65289fa7786d270d7bf9903cde687a22fe4cd3c54e12a83e81a4c402ebe26140d99da85369e97b152b0262ca365040bdd2edbb288fa209055e
+  metadata.gz: 6a5c51efa29c16d0aa224ccea3eb51ed69a333ce29e1d6f20e68955a766f820444d619950e0ff44972c7b7f991849ca7b93ab080d142892c7b072e4b735d2784
+  data.tar.gz: 97ffb024d267b00ea822bcf21cc7c92530fbe8e5435d895f898eae1f60e694f4c449e7959f5f518fe6db4a1adbb266591820adce4a0901ce58bac7eb4ba58cab

data/lib/miniproxy.rb

@@ -37,6 +37,10 @@ module MiniProxy
     remote.stub_request(method: method, url: url, response: response)
   end
 
+  def self.allow_request(method:, url:)
+    remote.allow_request(method: method, url: url)
+  end
+
   private_class_method def self.remote
     Timeout.timeout(DRB_SERVICE_TIMEOUT) do
       begin

data/lib/miniproxy/fake_ssl_server.rb

@@ -6,8 +6,6 @@ module MiniProxy
   #
   class FakeSSLServer < WEBrick::HTTPServer
     def initialize(config = {}, default = WEBrick::Config::HTTP)
-      @allowed_hosts = ["127.0.0.1", "localhost", config[:MiniProxyHost]].compact
-
       config = config.merge({
         Logger: WEBrick::Log.new(nil, 0), # silence logging
         AccessLog: [], # silence logging
@@ -21,7 +19,7 @@ module MiniProxy
     end
 
     def service(req, res)
-      if @allowed_hosts.include?(req.host)
+      if self.config[:AllowedRequestCheck].call(req)
         super(req, res)
       else
         self.config[:MockHandlerCallback].call(req, res)

data/lib/miniproxy/proxy_server.rb

@@ -7,8 +7,6 @@ module MiniProxy
     attr_accessor :requests
 
     def initialize(config = {}, default = WEBrick::Config::HTTP)
-      @allowed_hosts = ["127.0.0.1", "localhost", config[:MiniProxyHost]].compact
-
       config = config.merge({
         Logger: WEBrick::Log.new(nil, 0), # silence logging
         AccessLog: [], # silence logging
@@ -36,7 +34,7 @@ module MiniProxy
     end
 
     def service(req, res)
-      if @allowed_hosts.include?(req.host)
+      if self.config[:AllowedRequestCheck].call(req)
         super(req, res)
       else
         if req.request_method == "CONNECT"

data/lib/miniproxy/remote.rb

@@ -31,13 +31,13 @@ module MiniProxy
       return @unix_socket_uri if drb_process_alive?
 
       @pid = fork do
-        remote = Remote.new
+        remote = Remote.new(host)
 
         Timeout.timeout(SERVER_START_TIMEOUT) do
           begin
             fake_server_port = SERVER_DYNAMIC_PORT_RANGE.sample
             fake_server = FakeSSLServer.new(
-              MiniProxyHost: host,
+              AllowedRequestCheck: remote.method(:allowed_request?),
               Port: fake_server_port,
               MockHandlerCallback: remote.method(:handler),
             )
@@ -49,7 +49,7 @@ module MiniProxy
           begin
             remote.port = ENV["MINI_PROXY_PORT"] || SERVER_DYNAMIC_PORT_RANGE.sample
             proxy = MiniProxy::ProxyServer.new(
-              MiniProxyHost: host,
+              AllowedRequestCheck: remote.method(:allowed_request?),
               Port: remote.port,
               FakeServerPort: fake_server_port,
               MockHandlerCallback: remote.method(:handler),
@@ -90,6 +90,16 @@ module MiniProxy
       @stubs.push(request)
     end
 
+    def allow_request(method:, url:)
+      @allowed_requests.push(MiniProxy::Stub::Request.new(method: method, url: url, response: nil))
+    end
+
+    def allowed_request?(req)
+      return true if ["127.0.0.1", "localhost", @host].include?(req.host)
+
+      @allowed_requests.any? { |allowed_request| allowed_request.match?(req) }
+    end
+
     def port
       @port
     end
@@ -104,6 +114,7 @@ module MiniProxy
 
     def clear
       @stubs.clear
+      @allowed_requests.clear
     end
 
     def drain_messages
@@ -121,9 +132,11 @@ module MiniProxy
       @messages.push msg
     end
 
-    def initialize
+    def initialize(host)
+      @host = host
       @stubs = []
       @messages = []
+      @allowed_requests = []
     end
   end
 end

data/lib/miniproxy/stub/request.rb

@@ -16,8 +16,13 @@ module MiniProxy
 
       # @param [WEBrick::HTTPRequest] http_request
       def match?(http_request)
-        request_uri = http_request.host + http_request.path
-        http_request.request_method == @method && request_uri.match?(@url)
+        if http_request.request_method == "CONNECT"
+          host = http_request.unparsed_uri.split(":").first
+          @url.match?(host)
+        else
+          request_uri = http_request.host + http_request.path
+          http_request.request_method == @method && request_uri.match?(@url)
+        end
       end
     end
   end

data/lib/miniproxy/version.rb

@@ -1,3 +1,3 @@
 module MiniProxy
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniproxy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - The Conversation Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -87,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easily stub external requests for your browser tests.