omniauth-multipassword 2.0.0.rc1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c42cc59feffb560101a1ca960ea75b5099054097dc688570f814fde8a07d33a
-  data.tar.gz: d8a94787d62f2d9ab2a8435cbaa81d087a4a2332e703a560fa907e3da0c9f9d5
+  metadata.gz: db4e255ccd2a90d205d8ad9b0a6aea7456e4af42d9d30ad88bcd32b59b5619b9
+  data.tar.gz: acce514c49e0fe34f39ce6161a9bb4277720d5af0dfb10056726c3c7761b235a
 SHA512:
-  metadata.gz: caef3ce2da16ace112cb73c2f178fb3909ad5fe184f57912cc0ae50622511e6f581638c0f4ab79d84c39229486b2114cc4799d47ba1057e02129392f892e4173
-  data.tar.gz: 2bb20ced2304ba9496012e1b186619b7149fc4c19265b013305afb1ce68a3c76b12fa1d7300432f38851fe6d7e1c7fa21225f337b227da89662b47ace17d9937
+  metadata.gz: 8830e6455ecc2205409219603966056d9a99ee4b9cf556216c77113e0f323c6df78993d4631b96066d179bf16d3deedd225c04eb4c20b218cd2c7df574e1e7e6
+  data.tar.gz: 858305c757402a42b61d0cf90b493b1a82f0d928e5ec3991c78ca56aa27edbf5caab08b169eb6e463960ada74030d3a5e30bf182f3c4c706ac9edc4143b270b7

data/.github/workflows/maintenance-cache-wipe.yml

@@ -0,0 +1,13 @@
+---
+name: maintenance-cache-clear
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+
+jobs:
+  cache-clear:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: easimon/wipe-cache@v2

data/.github/workflows/maintenance-workflow-cleanup.yml

@@ -0,0 +1,17 @@
+---
+name: maintenance-workflow-cleanup
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+
+jobs:
+  delete-workflow-runs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 180
+          keep_minimum_runs: 50

data/.github/workflows/release.yml

@@ -0,0 +1,36 @@
+name: release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  rubygems:
+    if: github.repository == 'jgraichen/omniauth-multipassword'
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: write
+      id-token: write
+
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 10
+      BUNDLE_WITHOUT: development test
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler-cache: true
+
+      - uses: rubygems/release-gem@v1
+
+      - uses: taiki-e/create-gh-release-action@v1
+        with:
+          changelog: CHANGELOG.md
+          draft: true
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -1,45 +1,61 @@
 ---
 name: test
-on: push
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+
 jobs:
   rspec:
-    name: "Ruby ${{ matrix.ruby }}"
-    runs-on: ubuntu-20.04
+    name: "Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}"
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
       matrix:
         ruby:
+          - "3.3"
+          - "3.2"
+          - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
+        gemfile:
+          - omniauth_2.0
+          - omniauth_2.1
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_WITHOUT: development
 
     steps:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: True
+          bundler-cache: true
         env:
-          BUNDLE_WITHOUT: development
           BUNDLE_JOBS: 4
           BUNDLE_RETRY: 3
 
-      - run: bundle exec rspec --color
+      - run: |
+          bundle exec rspec --color --format documentation
+
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   rubocop:
     name: rubocop
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
-          bundler-cache: True
+          ruby-version: "3.3.5"
+          bundler-cache: true
         env:
-          BUNDLE_WITHOUT: development
           BUNDLE_JOBS: 4
           BUNDLE_RETRY: 3
 

data/.gitignore

@@ -1,13 +1,13 @@
-*.gem
-*.rbc
+_yardoc
 .bundle
 .config
 .yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
+*.gem
+*.rbc
 coverage
 doc/
+*.lock
+InstalledFiles
 lib/bundler/man
 pkg
 rdoc

data/.markdownlint.yml

@@ -0,0 +1,26 @@
+# markdownlint config
+
+# The CHANGELOG contains duplicated headers by design
+MD024: false
+
+# MD013/line-length: disable line length for all. We prefer lines as
+# long as paragraph with in-editor line breaks.
+MD013: false
+
+# MD033/no-inline-html: allow often need tags
+MD033:
+  allowed_elements:
+    - code
+    - dd
+    - dl
+    - dt
+    - figcaption
+    - figure
+
+# MD046/code-block-style: code block style conflicting with
+# admonitions...
+MD046: false
+
+# MD048/code-fence-style: code fence style
+MD048:
+  style: backtick

data/.rubocop.yml

@@ -1,8 +1,8 @@
 inherit_gem:
-  my-rubocop: default.yml
+  rubocop-config: default.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: "2.7"
   SuggestExtensions: False
 
 Naming/FileName:

data/Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+appraise 'omniauth-2.0' do
+  gem 'omniauth', '~> 2.0.0'
+end
+
+appraise 'omniauth-2.1' do
+  gem 'omniauth', '~> 2.1'
+end

data/CHANGELOG.md

@@ -3,16 +3,32 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
 
-## Unreleased
----
+## [Unreleased]
 
-### New
+## [2.1.0] - 2024-11-06
 
-### Changes
+### Changed
 
-### Fixes
+- Pass GET requests to the app if not on the request path by @larskanis
 
-### Breaks
-* Updated strategy to OmniAuth >= 2.0
+## [2.0.1] - 2024-07-20
 
+### Changed
 
+- Version bump due to wrong tag
+
+## [2.0.0] - 2024-07-20
+
+### Added
+
+- Add compatibility with newer Rack and OmniAuth 2.1+
+
+### Changed
+
+- Updated strategy to OmniAuth >= 2.0
+- Drop support for Ruby < 2.7
+
+[Unreleased]: https://github.com/jgraichen/omniauth-multipassword/compare/v2.1.1...HEAD
+[2.1.0]: https://github.com/jgraichen/omniauth-multipassword/compare/v2.0.1...v2.1.0
+[2.0.1]: https://github.com/jgraichen/omniauth-multipassword/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/jgraichen/omniauth-multipassword/releases/tag/v2.0.0

data/Gemfile

@@ -5,16 +5,20 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in omniauth-multipassword.gemspec
 gemspec
 
+gem 'appraisal'
+
 gem 'rake'
 gem 'rake-release'
 
+gem 'rspec', '~> 3.0'
+
 group :test do
   gem 'rack-test'
 
-  gem 'rspec', '~> 3.0'
-
-  gem 'codecov', require: false
-  gem 'simplecov', require: false
+  gem 'simplecov'
+  gem 'simplecov-cobertura'
+end
 
-  gem 'my-rubocop', github: 'jgraichen/my-rubocop', ref: 'v2'
+group :development do
+  gem 'rubocop-config', github: 'jgraichen/rubocop-config', ref: 'v12'
 end

data/README.md

@@ -1,32 +1,39 @@
 # Omniauth::Multipassword
 
-[![Build Status](https://travis-ci.org/jgraichen/omniauth-multipassword.svg?branch=master)](https://travis-ci.org/jgraichen/omniauth-multipassword)
+[![Gem Version](https://img.shields.io/gem/v/omniauth-multipassword?logo=ruby)](https://rubygems.org/gems/omniauth-multipassword)
+[![Workflow Status](https://img.shields.io/github/actions/workflow/status/jgraichen/omniauth-multipassword/test.yml?logo=github)](https://github.com/jgraichen/omniauth-multipassword/actions)
+[![Test Coverage](https://img.shields.io/codecov/c/github/jgraichen/omniauth-multipassword?logo=codecov&logoColor=white)](https://app.codecov.io/gh/jgraichen/omniauth-multipassword)
 [![Code Climate](https://codeclimate.com/github/jgraichen/omniauth-multipassword/badges/gpa.svg)](https://codeclimate.com/github/jgraichen/omniauth-multipassword)
-[![Test Coverage](https://codeclimate.com/github/jgraichen/omniauth-multipassword/badges/coverage.svg)](https://codeclimate.com/github/jgraichen/omniauth-multipassword/coverage)
 
 **omniauth-multipassword** is a [OmniAuth](https://github.com/intridea/omniauth)
 strategy that allows to authenticate again different password strategies at once.
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'omniauth-multipassword'
+```ruby
+gem 'omniauth-multipassword'
+```
 
 Add multipassword compatible omniauth strategies you want to use:
 
-	gem 'omniauth-internal'
-	gem 'omniauth-kerberos'
+```ruby
+gem 'omniauth-internal'
+gem 'omniauth-kerberos'
+```
 
 And then execute:
 
-    $ bundle
+```console
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install omniauth-multipassword
-
+```console
+gem install omniauth-multipassword
+```
 
 ## Usage
 
@@ -37,26 +44,32 @@ Rails.application.config.middleware.use OmniAuth::Strategies::MultiPassword, fie
 end
 ```
 
-
 ## Options
 
-** title **
+<dl>
+  <dt><code>title</code></dt>
+  <dd>
+
 The title text shown on default login form.
 (default: `"Restricted Access"`)
 
-** fields **
+  </dd>
+  <dt><code>fields</code></dt>
+  <dd>
+
 The request parameter names to fetch username and password.
 (default: `[ "username", "password" ]`)
 
+  </dd>
+</dl>
 
 ### Compatible Strategies
 
-* [omniauth-internal](https://github.com/jgraichen/omniauth-internal)
-* [omniauth-kerberos](https://github.com/jgraichen/omniauth-kerberos)
-
+- [omniauth-internal](https://github.com/jgraichen/omniauth-internal)
+- [omniauth-kerberos](https://github.com/jgraichen/omniauth-kerberos)
 
 ## License
 
 [MIT License](http://www.opensource.org/licenses/mit-license.php)
 
-Copyright (c) 2012, Jan Graichen
+Copyright © 2012, Jan Graichen

data/gemfiles/omniauth_2.0.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rake-release"
+gem "omniauth", "~> 2.0.0"
+
+group :test do
+  gem "rack-test"
+  gem "rspec", "~> 3.0"
+  gem "simplecov"
+  gem "simplecov-cobertura"
+end
+
+group :development do
+  gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v12"
+end
+
+gemspec path: "../"

data/gemfiles/omniauth_2.1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rake-release"
+gem "omniauth", "~> 2.1"
+
+group :test do
+  gem "rack-test"
+  gem "rspec", "~> 3.0"
+  gem "simplecov"
+  gem "simplecov-cobertura"
+end
+
+group :development do
+  gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v12"
+end
+
+gemspec path: "../"

data/lib/omniauth/multipassword/base.rb

@@ -13,15 +13,15 @@ module OmniAuth
       end
 
       def username_id
-        options[:fields][0] || 'username'
+        options.dig(:fields, 0) || 'username'
       end
 
       def password_id
-        options[:fields][1] || 'password'
+        options.dig(:fields, 1) || 'password'
       end
 
       def username
-        @username || request[username_id].to_s
+        @username || request.params[username_id.to_s].to_s
       end
 
       def init_authenticator(request, env, username)
@@ -31,7 +31,7 @@ module OmniAuth
       end
 
       def callback_phase
-        if authenticate(username, request[password_id])
+        if authenticate(username, request.params[password_id.to_s])
           super
         else
           fail!(:invalid_credentials)
@@ -49,7 +49,11 @@ module OmniAuth
         # OmniAuth, by default, disables "GET" requests for security reasons.
         # This effectively disables showing a password form on a GET request to
         # the `request_phase`. Instead, we hook the GET requests here.
-        return request_phase if on_request_path?
+        if on_request_path?
+          request_phase
+        else
+          call_app!
+        end
       end
     end
   end

data/lib/omniauth/multipassword/version.rb

@@ -4,12 +4,12 @@ module Omniauth
   module Multipassword
     module VERSION
       MAJOR = 2
-      MINOR = 0
+      MINOR = 1
       PATCH = 0
-      STAGE = 'rc1'
+      STAGE = nil
 
       def self.to_s
-        [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join '.'
+        [MAJOR, MINOR, PATCH, STAGE].compact.join '.'
       end
     end
   end

data/lib/omniauth/strategies/multi_password.rb

@@ -44,8 +44,8 @@ module OmniAuth
       end
 
       def callback_phase
-        username = request[username_id].to_s
-        password = request[password_id].to_s
+        username = request.params[username_id.to_s].to_s
+        password = request.params[password_id.to_s].to_s
         if authenticate(username, password)
           super
         else

data/omniauth-multipassword.gemspec

@@ -3,6 +3,8 @@
 require File.expand_path('lib/omniauth/multipassword/version', __dir__)
 
 Gem::Specification.new do |gem|
+  gem.name          = 'omniauth-multipassword'
+  gem.version       = Omniauth::Multipassword::VERSION
   gem.authors       = ['Jan Graichen']
   gem.email         = ['jgraichen@altimos.de']
   gem.description   = 'A OmniAuth strategy to authenticate using different passwort strategies.'
@@ -10,17 +12,14 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/jgraichen/omniauth-multipassword'
   gem.license       = 'MIT'
 
-  gem.required_ruby_version = '>= 2.5'
+  gem.required_ruby_version = '>= 2.7'
   gem.metadata = {
     'rubygems_mfa_required' => 'true',
   }
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = 'omniauth-multipassword'
   gem.require_paths = ['lib']
-  gem.version       = Omniauth::Multipassword::VERSION
 
   gem.add_dependency 'omniauth', '~> 2.0'
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>jgraichen/renovate-config"
+  ]
+}

data/spec/omniauth/multipassword/base_spec.rb

@@ -3,9 +3,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe OmniAuth::MultiPassword::Base do # rubocop:disable RSpec/FilePath
-  subject { strategy }
-
+describe OmniAuth::MultiPassword::Base do # rubocop:disable RSpec/SpecFilePathFormat  subject { strategy }
   let(:app) { instance_double(Proc) }
   let(:strategy) do
     OmniAuth::Strategies::OneTest.new(app, *args, &block)
@@ -48,6 +46,9 @@ describe OmniAuth::MultiPassword::Base do # rubocop:disable RSpec/FilePath
       Rack::Builder.new do
         use OmniAuth::Test::PhonySession
         use OmniAuth::Strategies::OneTest
+        map '/app-ok' do
+          run ->(env) { [200, {'Content-Type' => 'text/plain'}, ['OK']] }
+        end
         run ->(env) { [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
       end.to_app
     end
@@ -68,5 +69,10 @@ describe OmniAuth::MultiPassword::Base do # rubocop:disable RSpec/FilePath
       post '/auth/onetest/callback', username: 'john', password: 'secret'
       expect(last_response.body).to eq 'true'
     end
+
+    it 'shows app page' do
+      get '/app-ok'
+      expect(last_response.body).to eq 'OK'
+    end
   end
 end

data/spec/omniauth/strategy/multi_password_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe OmniAuth::Strategies::MultiPassword do # rubocop:disable RSpec/FilePath
+describe OmniAuth::Strategies::MultiPassword do # rubocop:disable RSpec/SpecFilePathFormat
   include Rack::Test::Methods
 
   let(:app) do

data/spec/spec_helper.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
 require 'rspec'
-require 'simplecov'
 
-if ENV['CI']
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
+require 'simplecov'
+require 'simplecov-cobertura'
 
 SimpleCov.start do
   add_filter 'spec'
 end
 
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::CoberturaFormatter,
+]
+
 require 'omniauth-multipassword'
 
 Dir[File.expand_path('spec/support/**/*.rb')].sort.each {|f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-multipassword
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Graichen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -32,21 +32,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/maintenance-cache-wipe.yml"
+- ".github/workflows/maintenance-workflow-cleanup.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".markdownlint.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/omniauth_2.0.gemfile
+- gemfiles/omniauth_2.1.gemfile
 - lib/omniauth-multipassword.rb
 - lib/omniauth/multipassword/base.rb
 - lib/omniauth/multipassword/version.rb
 - lib/omniauth/strategies/multi_password.rb
 - omniauth-multipassword.gemspec
+- renovate.json
 - spec/omniauth/multipassword/base_spec.rb
 - spec/omniauth/strategy/multi_password_spec.rb
 - spec/spec_helper.rb
@@ -56,7 +63,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -64,15 +71,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A OmniAuth strategy to authenticate using different passwort strategies.
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-- '2.4.0'
-- '2.3.3'
-- '2.2.6'
-- '2.1.10'
-after_success:
-  - bundle exec codeclimate-test-reporter