rails-auth 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5669f564b62464b0d3078ecfa58fe3732735e44c63bed361061a9f1a663249
-  data.tar.gz: cbee05f42e189e543b059d961d1b926d763d84e07c93a3637165f95eba0fe776
+  metadata.gz: 1c24122c461b2ef37326ca28f26261614ef8215bd85b62bfc171b47f56aeac29
+  data.tar.gz: e6453804040de859e7da0cb344ebe8e75b34f846a221441f246499016e05b4ec
 SHA512:
-  metadata.gz: 0be32c7166ed406dda136608370f059443a56219696c8d13a56f3978f9eca3b37b99ccf0885d4c42d13c660860be52530891d9317a2d2562f7f265d7d751ccd0
-  data.tar.gz: e1ada71b12c7732fe2aced6bb98abd11cb7b8fa665093f9faa5808b9c21bef12dd99e3070fcd2ee343acc4b377626ae885098388f85d7d9027f37e1d08d60890
+  metadata.gz: aa0db28d5b895a29f3fc8563575895cb0bf18e8917f7e816d4e6148a25a5615d9b649ba089f94369a7565c2d24a9622a93eff0f1dbb7c14d62c4926ac2333c7f
+  data.tar.gz: ddae5587f3da9ef4291bb0b9cea00563007e58d55d830a025375ba03a9ad2c83aa754d5b86050cf4dac0a8dbb72280c8eb93c905ef4dd5cbc3f883c09da0a52f

data/.github/workflows/jruby.yml

@@ -0,0 +1,31 @@
+name: CI - JRuby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version:
+          - 8
+          - 11
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Java
+      uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: ${{ matrix.java-version }}
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: jruby
+    - name: Run tests
+      run: bundle exec rake

data/.github/workflows/mri.yml

@@ -0,0 +1,30 @@
+name: CI - MRI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - 2.6
+          - 2.7
+          - 3.0
+          - 3.1
+          - 3.2
+          - 3.3
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -8,24 +9,8 @@ Style/StringLiterals:
 Layout/HashAlignment:
   Enabled: false
 
-Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context']
-
-Metrics/ParameterLists:
-  Max: 5
-  CountKeywordArgs: false
-
-Metrics/LineLength:
-  Max: 128
-
-Metrics/MethodLength:
-  Max: 25
-
-Metrics/AbcSize:
-  Max: 25
-
-Metrics/CyclomaticComplexity:
-  Max: 8
+Metrics:
+  Enabled: false
 
 Naming/MethodParameterName:
   MinNameLength: 2

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 3.1.0 (2021-10-26)
+
+* [#70](https://github.com/square/rails-auth/pull/70)
+  Support URL-encoded PEMs to support new Puma header requirements.
+  ([@drcapulet])
+
 ### 3.0.0 (2020-08-10)
 
 * [#68](https://github.com/square/rails-auth/pull/68)

data/Gemfile

@@ -2,19 +2,12 @@
 
 source "https://rubygems.org"
 
-group :development do
-  gem "guard-rspec"
-end
-
-group :development, :test do
-  gem "activesupport", "~> 4"
-  gem "certificate_authority", require: false
-  gem "coveralls", require: false
-  # Workaround for: https://github.com/bundler/bundler/pull/4650
-  gem "rack", "~> 1.x"
-  gem "rake"
-  gem "rspec"
-  gem "rubocop", "0.77.0"
-end
+gem "activesupport"
+gem "certificate_authority", require: false
+gem "guard-rspec"
+gem "pry-byebug", platform: :mri
+gem "rake"
+gem "rspec"
+gem "rubocop"
 
 gemspec

data/lib/rails/auth/acl.rb

@@ -19,9 +19,14 @@ module Rails
       # @param [String] :yaml serialized YAML to load an ACL from
       def self.from_yaml(yaml, **args)
         require "yaml"
-        # rubocop:todo Security/YAMLLoad
-        new(YAML.load(yaml), **args)
-        # rubocop:enable Security/YAMLLoad
+        new(
+          if YAML::VERSION >= "4.0"
+            YAML.safe_load(yaml, aliases: true)
+          else
+            YAML.safe_load(yaml, [], [], true)
+          end,
+          **args
+        )
       end
 
       # @param [Array<Hash>] :acl Access Control List configuration

data/lib/rails/auth/rack.rb

@@ -24,6 +24,7 @@ require "rails/auth/monitor/middleware"
 
 require "rails/auth/x509/certificate"
 require "rails/auth/x509/filter/pem"
+require "rails/auth/x509/filter/pem_urlencoded"
 require "rails/auth/x509/filter/java" if defined?(JRUBY_VERSION)
 require "rails/auth/x509/matcher"
 require "rails/auth/x509/middleware"

data/lib/rails/auth/rspec/matchers/acl_matchers.rb

@@ -6,7 +6,7 @@ RSpec::Matchers.define(:permit) do |env|
     credentials = Rails::Auth.credentials(env)
     message     = "allow #{method}s by "
 
-    return message + "unauthenticated clients" if credentials.count.zero?
+    return "#{message}unauthenticated clients" if credentials.count.zero?
 
     message + credentials.values.map(&:inspect).join(", ")
   end

data/lib/rails/auth/version.rb

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

data/lib/rails/auth/x509/filter/pem.rb

@@ -11,7 +11,7 @@ module Rails
             # certificates are normally formatted in otherwise parsing with fail
             # with a 'nested asn1 error'. split(" ") handles sequential whitespace
             # characters like \t, \n, and space.
-            OpenSSL::X509::Certificate.new(pem.split(" ").instance_eval do
+            OpenSSL::X509::Certificate.new(pem.split.instance_eval do
               [[self[0], self[1]].join(" "), self[2...-2], [self[-2], self[-1]].join(" ")]
                 .flatten.join("\n")
             end).freeze

data/lib/rails/auth/x509/filter/pem_urlencoded.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rails
+  module Auth
+    module X509
+      module Filter
+        # Extract OpenSSL::X509::Certificates from Privacy Enhanced Mail (PEM) certificates
+        # that are URL encoded ($ssl_client_escaped_cert from Nginx).
+        class PemUrlencoded < Pem
+          def call(encoded_pem)
+            super(URI.decode_www_form_component(encoded_pem))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/auth.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "active_support"
+require "active_support/core_ext/object"
+
 # Pull in core library components that work with any Rack application
 require "rails/auth/rack"
 

data/rails-auth.gemspec

@@ -21,15 +21,14 @@ Gem::Specification.new do |spec|
 
   # Only allow gem to be pushed to https://rubygems.org
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files         = `git ls-files`.split("\n")
   spec.bindir        = "exe"
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency "rack"
-
-  spec.add_development_dependency "bundler", ">= 1.10", "< 3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "rack"
 end

data/spec/rails/auth/controller_methods_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Rails::Auth::ControllerMethods do
       attr_reader :request
 
       def initialize(env)
-        @request = OpenStruct.new(env: env)
+        @request = Struct.new(:env).new(env)
       end
 
       include Rails::Auth::ControllerMethods

data/spec/rails/auth/x509/middleware_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Rails::Auth::X509::Middleware do
     described_class.new(
       app,
       cert_filters: { example_key => cert_filter },
-      logger: Logger.new(STDERR)
+      logger: Logger.new($stderr)
     )
   end
 

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "coveralls"
-Coveralls.wear!
-
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "rails/auth"
 require "rails/auth/rspec"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rails-auth
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Tony Arcieri
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,39 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: A plugin-based framework for supporting multiple authentication and authorization
   systems in Rails/Rack apps. Supports resource-oriented route-by-route access control
   lists with TLS authentication.
@@ -67,10 +47,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/jruby.yml"
+- ".github/workflows/mri.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - BUG-BOUNTY.md
 - CHANGES.md
 - CONDUCT.md
@@ -106,6 +87,7 @@ files:
 - lib/rails/auth/x509/certificate.rb
 - lib/rails/auth/x509/filter/java.rb
 - lib/rails/auth/x509/filter/pem.rb
+- lib/rails/auth/x509/filter/pem_urlencoded.rb
 - lib/rails/auth/x509/matcher.rb
 - lib/rails/auth/x509/middleware.rb
 - lib/rails/auth/x509/subject_alt_name_extension.rb
@@ -137,7 +119,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,15 +128,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Modular resource-oriented authentication and authorization for Rails/Rack
 test_files: []

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-sudo: false
-branches:
-  only:
-    - master
-
-before_install:
-  - gem install bundler
-
-bundler_args: --without development
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-matrix:
-  include:
-    - rvm: jruby
-      jdk: openjdk8
-      env: JRUBY_OPTS="--debug" # for simplecov
-    - rvm: jruby
-      jdk: openjdk11
-      env: JRUBY_OPTS="--debug" # for simplecov
-  fast_finish: true