miniproxy 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f44f0daaa7c8c5897ee86428737bb7bafba78d60935943056d8daed9baa2111
-  data.tar.gz: 4ec7b5cf714b7afe7d81dda425a6a8f3095caefac4c9511405a189678df71910
+  metadata.gz: 15a74bd747d9a4d3f357e94815beedc9f9994000c2749068c85df8439dd5b2c5
+  data.tar.gz: 0c4c72bc17f6224bfb059b2f96021bb4151418ee712488d3bfb2d87d76b6ac48
 SHA512:
-  metadata.gz: 5410429d11d0cdb1f97cf5423d97d8f3d3d88b80a39bab27de5fd265d2bd02e779c5946d7e28d0ac9ab618758afc1900e1cc294b3b9c7f19ff6c800bd96d0c71
-  data.tar.gz: 2c987fde657f840ae2e6c976ea6bae574aa9ec31dfff19a48fe128f348b97d3aa89a6dedc2d2cc82fd8f497183065b3e02fb277ff2da2ffebe63d337a4995f91
+  metadata.gz: 1cd79a35601b70f84a2b8ff7fc86bbc6cac70b932aba1336d0b3ab089324d724d7051a4bfde63e7a1667bb5b410d6bb94c58da2c1979b14285b164aee8fb008a
+  data.tar.gz: 497e08a015ea8de92aa0fb711779e3105e1635ddeed8140f62d48386b245414cc33e6351eaa5b521b14de9bf6bf78b86777f22aaf0b491a0f45bb5a914ecf3dc

data/lib/miniproxy.rb

@@ -18,7 +18,11 @@ module MiniProxy
   end
 
   def self.host
-    "127.0.0.1"
+    @host || "127.0.0.1"
+  end
+
+  def self.host=(host)
+    @host = host
   end
 
   def self.ignore_all_requests
@@ -33,10 +37,14 @@ 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
-        remote = DRbObject.new(nil, Remote.server)
+        remote = DRbObject.new(nil, Remote.server(self.host))
 
         until remote.started?
           sleep 0.01

data/lib/miniproxy/fake_ssl_server.rb

@@ -5,8 +5,6 @@ module MiniProxy
   # MiniProxy fake SSL enabled server, which receives relayed requests from the ProxyServer
   #
   class FakeSSLServer < WEBrick::HTTPServer
-    ALLOWED_HOSTS = ["127.0.0.1", "localhost"].freeze
-
     def initialize(config = {}, default = WEBrick::Config::HTTP)
       config = config.merge({
         Logger: WEBrick::Log.new(nil, 0), # 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

@@ -4,8 +4,6 @@ module MiniProxy
   # MiniProxy server, which boots a WEBrick proxy server
   #
   class ProxyServer < WEBrick::HTTPProxyServer
-    ALLOWED_HOSTS = ["127.0.0.1", "localhost"].freeze
-
     attr_accessor :requests
 
     def initialize(config = {}, default = WEBrick::Config::HTTP)
@@ -17,32 +15,51 @@ module MiniProxy
       super(config, default)
     end
 
-    def do_PUT(req, res)
-      perform_proxy_request(req, res) do |http, path, header|
-        http.put(path, req.body || "", header)
+    if RUBY_VERSION < "2.6.0"
+      def do_PUT(req, res)
+        perform_proxy_request(req, res) do |http, path, header|
+          http.put(path, req.body || "", header)
+        end
       end
-    end
 
-    def do_DELETE(req, res)
-      perform_proxy_request(req, res) do |http, path, header|
-        http.delete(path, header)
+      def do_DELETE(req, res)
+        perform_proxy_request(req, res) do |http, path, header|
+          http.delete(path, header)
+        end
       end
-    end
 
-    def do_PATCH(req, res)
-      perform_proxy_request(req, res) do |http, path, header|
-        http.patch(path, req.body || "", header)
+      def do_PATCH(req, res)
+        perform_proxy_request(req, res) do |http, path, header|
+          http.patch(path, req.body || "", header)
+        end
+      end
+    else
+      def do_PUT(req, res)
+        perform_proxy_request(req, res, Net::HTTP::Put, req.body_reader)
+      end
+
+      def do_DELETE(req, res)
+        perform_proxy_request(req, res, Net::HTTP::Delete)
+      end
+
+      def do_PATCH(req, res)
+        perform_proxy_request(req, res, Net::HTTP::Patch, req.body_reader)
       end
     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"
+          is_ssl = req.unparsed_uri.include?(":443")
+
           # If something is trying to initiate an SSL connection, rewrite
-          # the URI to point to our fake server.
-          req.instance_variable_set(:@unparsed_uri, "localhost:#{self.config[:FakeServerPort]}")
+          # the URI to point to our fake server so we can stub SSL requests.
+          if is_ssl
+            req.instance_variable_set(:@unparsed_uri, "localhost:#{self.config[:FakeServerPort]}")
+          end
+
           super(req, res)
         else
           # Otherwise, call our handler to respond with an appropriate

data/lib/miniproxy/remote.rb

@@ -20,7 +20,7 @@ module MiniProxy
       false
     end
 
-    def self.server
+    def self.server(host = "127.0.0.1")
       @unix_socket_uri ||= begin
         tempfile = Tempfile.new("mini_proxy")
         socket_path = tempfile.path
@@ -31,12 +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(
+              AllowedRequestCheck: remote.method(:allowed_request?),
               Port: fake_server_port,
               MockHandlerCallback: remote.method(:handler),
             )
@@ -48,6 +49,7 @@ module MiniProxy
           begin
             remote.port = ENV["MINI_PROXY_PORT"] || SERVER_DYNAMIC_PORT_RANGE.sample
             proxy = MiniProxy::ProxyServer.new(
+              AllowedRequestCheck: remote.method(:allowed_request?),
               Port: remote.port,
               FakeServerPort: fake_server_port,
               MockHandlerCallback: remote.method(:handler),
@@ -88,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
@@ -102,6 +114,7 @@ module MiniProxy
 
     def clear
       @stubs.clear
+      @allowed_requests.clear
     end
 
     def drain_messages
@@ -119,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.2.0".freeze
+  VERSION = "0.6.0".freeze
 end

data/ssl/cert.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApiAVWSSbE3OwJ51puqy/AcKu87rMYd0sSz2/Ej8sbtcAI2wA
+/lWMqOxyMcwrDQOQQY5I3zbicVSoNyyXyyEmZNgHRT3WYWaF++AYFEAWjT0hrdBx
+53cBYP7nSAYQjqX+yhDHplukjZ8Pf3wAXVoB67h7SoGopDldbi7Le3hwMPutAkX8
+N8bmGmZ65Oc5ay1EJdUxHS8qyp6I+5kjvFUvLJXMY6DYSEghHOppIHUKSHUno42M
+0ToS97hDbk52rMYPdjmdJtVuNdUkdf+dyieABMObCrnepBe2NS/luGlEvDru6ZHw
+OwhLA9Y5e4imNMyk9Iz7mYZbm85FT75hVXi8LQIDAQABAoIBADU2EaB8GTAh3krS
+IQuqSYRG18M6Ej1Gmul+3bT6h0D5nRG7hpXw0R1Kn0lUHHYOriZRbQYSjnW+qCME
+JZrrA2FJ0QpcxE5uiHwlS5Ew9ghHjIIgQlvhwo9PFsX7K1KF2RbgSRMAR7UVPeGX
+1oYQTo0yiktTPLFdro+cbZEfAtCtSHAKO4/fsKdLKHRiXzvGh5auGu1c4d8p5tW7
+C4ijM+/nwzqZi0V5ymm+XBOCk6M6dORCAba30Ej8RKVWoeTO9rbezRKc1DLhVzdA
+Vdjbm/rOuoeUfRYDHMEKojQE4vyIZftXzQogE8zQjSBdWK1RMIPZqCscfPxfArKj
+SB3pOAECgYEA2ZmE6/O51+z6gnp/b4Syg58IV2SwKGJ1AIGAwFY8+r6TJo8Qid3I
+LwBw0aOm8kM2Sh9ILdPVGMsGyqulzTWoBv2HdTimX2RDyJX0h+92wmkrDjhp1ag0
+FOkFRmRceXu588HAH9DD92f5mf4Y3cx36cuXj6uxrPR+XLPuY0Pl9BcCgYEAw3Ec
+oR5BV3VHGGvVmSR1P2PNznV5XDYRQ8xp7w+rwj7X4Lp06upwJGjbFO2aGq5whbo8
+Upc6vtkHKL2kq9zD8PxWAqUWY7NBoEIY+XMQGKbISjVAXlG9jCx3dfqZAE7N1BXl
+OV4CZpLVSEJh0aSyzmplRmhPgqShFzkCAfTfyFsCgYEApG6yV2tSIK1fkIHpEuh/
+zZ67uu7Hf30HVV6HYNDKO+EPaa/qm4QQ5hO7LXAxlBjeSZzh+l99RMMHWtfi7vOB
+CedEGXy5nJQz9Lv8kUyPvdGjS5etwlrdIIAGEG9+wf6RQnZDLMehjq/vmkK9n74H
+T5Ed8t+X4E7RvlPp7PE+L/kCgYA+33WBU3VbyEutzIrzcCoT0WyU3W/EPVSChhES
+Ke1sWMEj93fDVtXqsJzB98naiYGDU60yOJpaaQEHlzKRYzzZmqOkyC0St8kF4B2e
+qehktcq7LLRfY1Zh8LAhkROFaNSIRN7v/JEzJEteqpRDWAN5qfqYktf5RDLagKln
+rboL/wKBgGWKf1MarJRJBmGV4nO2dJhP/AA8jL2OPDlP2BqEbSgoh389nbOJ6/23
+QW67fvoeiGN2ahX/lqsh6+fsV2UnimXd6MWfAXqFF2CP+7po1tWXKnxSEA8Q8xJl
+rFmBRkDrDWz5rjtISAzKDqlSSQHH6oSiriSeud0MSP79VE8VhE3P
+-----END RSA PRIVATE KEY-----

data/ssl/cert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIJUuraSSDsABizMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQKDApGYXV0aGVudGljMQ0wCwYDVQQLDARUZXN0MRkwFwYD
+VQQDDBB0ZXN0LmV4YW1wbGUuY29tMCAXDTE4MDYyMTA0Mzg1MloYDzIxMTgwNTI4
+MDQzODUyWjBMMQswCQYDVQQGEwJVUzETMBEGA1UECgwKRmF1dGhlbnRpYzENMAsG
+A1UECwwEVGVzdDEZMBcGA1UEAwwQdGVzdC5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKYgFVkkmxNzsCedabqsvwHCrvO6zGHdLEs9
+vxI/LG7XACNsAP5VjKjscjHMKw0DkEGOSN824nFUqDcsl8shJmTYB0U91mFmhfvg
+GBRAFo09Ia3Qced3AWD+50gGEI6l/soQx6ZbpI2fD398AF1aAeu4e0qBqKQ5XW4u
+y3t4cDD7rQJF/DfG5hpmeuTnOWstRCXVMR0vKsqeiPuZI7xVLyyVzGOg2EhIIRzq
+aSB1Ckh1J6ONjNE6Eve4Q25OdqzGD3Y5nSbVbjXVJHX/ncongATDmwq53qQXtjUv
+5bhpRLw67umR8DsISwPWOXuIpjTMpPSM+5mGW5vORU++YVV4vC0CAwEAAaOBsTCB
+rjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQG073fuLEEQGaNZZ33uCDv801H
+JDB8BgNVHSMEdTBzgBQG073fuLEEQGaNZZ33uCDv801HJKFQpE4wTDELMAkGA1UE
+BhMCVVMxEzARBgNVBAoMCkZhdXRoZW50aWMxDTALBgNVBAsMBFRlc3QxGTAXBgNV
+BAMMEHRlc3QuZXhhbXBsZS5jb22CCVLq2kkg7AAYszANBgkqhkiG9w0BAQsFAAOC
+AQEAJ1ZACsEQzlhwCzVWib4IRYsdPimHd7VrLTlqGJFbBp8y+CnCWevA8gJXQxlv
+VZ7eAOlOMyBba0gluz+zis+3nixZXzlZyvfh4bTMKVU/7UO/m8p9v44g7ErT3Zrc
+4DD+TGEcTwasqb4y5GoKcFF6Rd9j2tbaKWY13JtxMe8gZKW0bubae0pfBPLAw3ep
+p1c4/3uzxbFNGkyacb1scFEdqq8RNRmhgdFzcM00Kqk5niftfgZgPjYK+hwzK2vY
+Q8ZQ3EoF2OTte46qf6chHuhJHvmyIXArX13O3H7aUWirOtY+5dt+CCRS9szQY4K6
+pdnjOJ5PefUoIunXv6BtmMHsGQ==
+-----END CERTIFICATE-----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniproxy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - The Conversation Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,8 @@ files:
 - lib/miniproxy/stub/request.rb
 - lib/miniproxy/stub/response.rb
 - lib/miniproxy/version.rb
+- ssl/cert.key
+- ssl/cert.pem
 homepage: https://github.com/conversation/miniproxy
 licenses:
 - MIT