miniproxy 0.2.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea9741957bdc4bef7bb92c6578011c272b3d0008b6e709a6f28a353fe6e895cb
-  data.tar.gz: 233289bb7192cde0f0a103309f29161ff49fcce40aa3c7e1b8acda6a98cb5d0a
+  metadata.gz: 3b7f9d3ebcc5ca86f33c600718e26b87fe70dd833c0b569784b85e9d511f1a19
+  data.tar.gz: b90490d44b05ab40035d4d908c308ed3dbd5dd161556ff796a94474f1de737c7
 SHA512:
-  metadata.gz: e0319daa2cd385c9a714b287e3dceff33a27a32feabe905e9661a968d75dc301b31ed1ab3107e5215edcee06ec9ed13ce37f5dbc57feaa71989dc4379c12dc9c
-  data.tar.gz: b810589825cc2a36ce302cfe115c04b78f242239c58cafc4d62a600bb9297f9c04b5e92537d7192bf9a23d8f8f2227c93c0f3f62e21b3e538de02fde4e15749a
+  metadata.gz: f79ee6a1dc87e492ac2bcbd1799d339c3cbe809f13e78c011ecc4db78948cd93e0871449999c944756c6ba9ff2835892c4646780e81aa9c916ac0e89361a98cb
+  data.tar.gz: 31af7de678cc5cc577c93d847e08773e4c440fd143190f13d421c2590a3ec43fe47fd6a5d016ee635ba12ac57f4cf5bd77ad91e0f55aeba28a313fa3c398d198

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,55 @@ 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_POST(req, res)
+        perform_proxy_request(req, res, Net::HTTP::Post, StringIO.new(req.body))
+      end
+
+      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.1".freeze
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniproxy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.7.0
 platform: ruby
 authors:
 - The Conversation Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2021-05-18 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.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easily stub external requests for your browser tests.