rails-auth 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973af02d5cdabe033f2dbdaf000cbbc0ad234d5e9f7af2f029d3648413de0ffd
-  data.tar.gz: 1c2072d5bd8f8a8b251c6feefd5bf731a46813c7686f1db00355dcfaecd6b686
+  metadata.gz: 773018e606b80732c9e9feeba00cc583032a39ee74de25b2ccaf3e6a852f086b
+  data.tar.gz: 755f13226f84aec603eaac1ab5d21ed803aa7ac4b37e35e3e072be3b8c7a7803
 SHA512:
-  metadata.gz: 46ef4b6d00a5a7fddd575ccbe5942101a10cc96cf193df18a3a8ca93a779b55ce4b77855ebb2362d366eccb52ef910d035bbbca36522960365aaa350463d1347
-  data.tar.gz: 0fed93cd383fb6508c4c37511346ab7012ac5efb830f5012920dd51523525104c1ef851319801ebee9029abd15097675f31219e0e3b8fc53439698b6b12722dd
+  metadata.gz: a900eea1969e11b56b431fab48fbe35edd4785a3d15c68ab28e0168a4289678fab7da65ed4cd136821bab93b0fce3b8ac29fb05ab02286542585bbb572d4f217
+  data.tar.gz: 55a2d4e03156e24f75db902f0c5346e756912d053b667ab4c64536902d1d443020e07be138fdc480d4dae951e73d9c55340faea88d41c7587d13f1bb11df3542

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 2.2.2 (2020-07-02)
+
+* [#65](https://github.com/square/rails-auth/pull/65)
+  Fix error when passing `truststore` instead of `ca_file` to X509 middleware.
+  ([@drcapulet])
+
 ### 2.2.1 (2020-01-08)
 
 * [#63](https://github.com/square/rails-auth/pull/63)

data/lib/rails/auth/version.rb

@@ -3,6 +3,6 @@
 module Rails
   # Pluggable authentication and authorization for Rack/Rails
   module Auth
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end

data/lib/rails/auth/x509/middleware.rb

@@ -12,20 +12,21 @@ module Rails
         # Create a new X.509 Middleware object
         #
         # @param [Object]               app next app in the Rack middleware chain
-        # @param [Hash]                 cert_filters maps Rack environment names to cert extractors
         # @param [String]               ca_file path to the CA bundle to verify client certs with
-        # @param [OpenSSL::X509::Store] truststore (optional) provide your own truststore (for e.g. CRLs)
+        # @param [Hash]                 cert_filters maps Rack environment names to cert extractors
+        # @param [Logger]               logger place to log verification successes & failures
         # @param [Boolean]              require_cert causes middleware to raise if certs are unverified
+        # @param [OpenSSL::X509::Store] truststore (optional) provide your own truststore (for e.g. CRLs)
         #
         # @return [Rails::Auth::X509::Middleware] new X509 middleware instance
-        def initialize(app, cert_filters: {}, ca_file: nil, truststore: nil, require_cert: false, logger: nil)
-          raise ArgumentError, "no ca_file given" unless ca_file
+        def initialize(app, ca_file: nil, cert_filters: {}, logger: nil, require_cert: false, truststore: nil)
+          raise ArgumentError, "no ca_file or truststore given" unless ca_file || truststore
 
           @app          = app
+          @cert_filters = cert_filters
           @logger       = logger
-          @truststore   = truststore || OpenSSL::X509::Store.new.add_file(ca_file)
           @require_cert = require_cert
-          @cert_filters = cert_filters
+          @truststore   = truststore || OpenSSL::X509::Store.new.add_file(ca_file)
 
           @cert_filters.each do |key, filter|
             next unless filter.is_a?(Symbol)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-auth
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack