jefferies_tube 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec04172e8bd7b0bd7ea623083d7b48df678bec9354f7bef3f0f89560ac5eb0fe
-  data.tar.gz: ecd036b2ac2953e3e3d38a7ff66e55d5f1e06cf84fd2a831da0b0a044f30154f
+  metadata.gz: 482a6104484c8b52279b4963b934c0882c3323508d89c95c050ddc4d485ca530
+  data.tar.gz: 25e75d97decffc3c631225b567044e926d706734c2988ecdc5e094869069b209
 SHA512:
-  metadata.gz: a01bab997e3d86e0093233c7085015af2fb21d7e98122da05bb596f2cedcfa2f40125d7e3804810672cf2e5b4e2ac2448627f2375ff9a27c7f9cdd6ae7dfcdf6
-  data.tar.gz: 3425a5523901811da07b46e6afae124c4bf44541d2cbd2776f558a3e5f7a33190e1feab3d8b26f1ab1dab5af7fc5ad47a3c214b76713182a33f0749f7c1c98ff
+  metadata.gz: c338a5dd7fe14ca23986b370f5610479b9578f690d75cd43ceef485a239447000be24f0c6d7cd1a64526df279c4ba6c37a5f02ebc70290f1e4c9bb37b57d0bfd
+  data.tar.gz: ebe59a2c35f75555ed4f01bac293e36feace65915fb09b6a493fcd54138ed418e33b42f8352918a8f923c8f127ed8eb107d81019b85f7c08b0ccbd9fa3d06f3f

data/CHANGELOG.md

@@ -6,6 +6,9 @@ This project attempts to follow [semantic versioning](https://semver.org/)
 
 ## Unreleased
 
+## 1.7.8
+  * Update middleware to rescue from more invalid requests
+
 ## 1.7.7
   * Add middleware to rescue from mime type errors to avoid spamming it as an error
 

data/lib/jefferies_tube/invalid_request_handler.rb

@@ -0,0 +1,35 @@
+class JefferiesTube::InvaildRequestHandler
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    @app.call(env)
+  rescue ::ActionDispatch::Http::MimeNegotiation::InvalidType
+    Rails.logger.info("[JefferiesTube::InvaildRequestHandler] Rescued from invalid MIME type in request: #{env['HTTP_ACCEPT']}")
+    
+    [406, { 'Content-Type' => 'text/plain' }, ['Invalid Accept header.']]
+  rescue ArgumentError => error
+    if error.message =~ /invalid byte sequence in UTF-8/
+      return rescue_from_error(error, 'Bad request: Invalid UTF-8 sequence')
+    elsif error.message =~ /invalid %-encoding/ # support for rails < 8
+      return rescue_from_error(error, 'Bad request: invalid %-encoding')
+    end
+
+    raise error
+  rescue ActionController::BadRequest => error
+    if error.message =~ /invalid %-encoding/
+      return rescue_from_error(error, 'Bad request: invalid %-encoding')
+    elsif error.message =~ /Invalid encoding for parameter/
+      return rescue_from_error(error, 'Bad request: Invalid encoding for parameter')
+    end
+
+    raise error
+  end
+
+  def rescue_from_error(error, message)
+    Rails.logger.info("[JefferiesTube::InvaildRequestHandler] Rescued from #{error.message.inspect}")
+
+    [400, { 'Content-Type' => 'text/plain' }, [message]]
+  end
+end

data/lib/jefferies_tube/railtie.rb

@@ -1,7 +1,7 @@
 require 'jefferies_tube'
 require 'jefferies_tube/console'
 require 'jefferies_tube/coverage'
-require 'jefferies_tube/invalid_mime_type_handler'
+require 'jefferies_tube/invalid_request_handler'
 require 'rails'
 
 module JefferiesTube
@@ -98,7 +98,7 @@ module JefferiesTube
     end
 
     initializer 'handle invalid mime types' do |config|
-      config.middleware.insert_before Rack::Head, JefferiesTube::InvalidMimeTypeHandler
+      config.middleware.insert_before Rack::Head, JefferiesTube::InvaildRequestHandler
     end
 
     rake_tasks do

data/lib/jefferies_tube/version.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 
 module JefferiesTube
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 
   def self.latest_rubygems_version
     JSON.parse(URI.parse("https://rubygems.org/api/v1/versions/jefferies_tube/latest.json").read)["version"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jefferies_tube
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Brian Samson
@@ -198,7 +198,7 @@ files:
 - lib/jefferies_tube/database_backup.rb
 - lib/jefferies_tube/database_backup_adapter.rb
 - lib/jefferies_tube/engine.rb
-- lib/jefferies_tube/invalid_mime_type_handler.rb
+- lib/jefferies_tube/invalid_request_handler.rb
 - lib/jefferies_tube/postgresql_backup_adapter.rb
 - lib/jefferies_tube/rack/maintenance.rb
 - lib/jefferies_tube/railtie.rb

data/lib/jefferies_tube/invalid_mime_type_handler.rb

@@ -1,13 +0,0 @@
-class JefferiesTube::InvalidMimeTypeHandler
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    @app.call(env)
-  rescue ::ActionDispatch::Http::MimeNegotiation::InvalidType
-    Rails.logger.info("Invalid MIME type in request: #{env['HTTP_ACCEPT']}")
-    
-    [406, { 'Content-Type' => 'text/plain' }, ['Invalid Accept header.']]
-  end
-end