Upstream rails 5.1 fixes

.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.8

Gemfile

@@ -1,17 +1,18 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 group :development, :test do
   platforms :ruby, :mswin, :mingw do
     gem 'sqlite3'
-    #gem 'mysql2'
-    #gem 'pg'
+    gem 'mysql2'
+    gem 'pg'
+    gem 'byebug'
     #gem 'activerecord-oracle_enhanced-adapter'
     #gem 'ruby-plsql'
     #gem 'ruby-oci8'
   end
   gem 'minitest'
+  gem 'rails-controller-testing'
   gem 'test-unit', '~> 3.0'
-  gem 'turn'
   gem 'mocha'
   gem 'ruby_gntp'
   gem 'guard-minitest'

Gemfile.lock

@@ -2,129 +2,176 @@ PATH
   remote: .
   specs:
     masq (0.3.4)
+      erb
       i18n_data
-      rails (~> 3.2.0)
+      rails (~> 5.1.0)
+      rails-controller-testing
       ruby-openid
       ruby-yadis
       yubikey
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-    activesupport (3.2.22.2)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    ansi (1.5.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    concurrent-ruby (1.0.5)
-    erubis (2.7.0)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
+      globalid (>= 0.3.6)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
+      arel (~> 8.0)
+    activesupport (5.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    builder (3.3.0)
+    byebug (11.1.3)
+    cgi (0.4.1)
+    concurrent-ruby (1.3.4)
+    crass (1.0.6)
+    date (3.4.0)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
+    erubi (1.13.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
     guard-compat (1.2.1)
-    guard-minitest (2.4.5)
+    guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    hike (1.2.3)
-    i18n (0.9.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.8.0)
-    journey (1.0.4)
-    json (1.8.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.12.2)
-    polyglot (0.3.5)
-    power_assert (0.2.2)
-    rack (1.4.7)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.2.22.2)
-      actionmailer (= 3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activerecord (= 3.2.22.2)
-      activeresource (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      bundler (~> 1.0)
-      railties (= 3.2.22.2)
-    railties (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      rack-ssl (~> 1.3.2)
+    i18n_data (0.17.1)
+      simple_po_parser (~> 1.1)
+    loofah (2.23.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
+    mocha (2.5.0)
+      ruby2_keywords (>= 0.0.5)
+    mysql2 (0.5.6)
+    net-imap (0.4.17)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.15.6-arm64-darwin)
+      racc (~> 1.4)
+    pg (1.5.9)
+    racc (1.8.1)
+    rack (2.2.10)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
+      bundler (>= 1.3.0)
+      railties (= 5.1.7)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
+      method_source
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (12.3.0)
-    rb-fsevent (0.9.7)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ruby-openid (2.7.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    ruby-openid (2.9.2)
     ruby-yadis (0.3.4)
+    ruby2_keywords (0.0.5)
     ruby_gntp (0.3.4)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.11)
-    test-unit (3.0.8)
-      power_assert
-    thor (0.20.0)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turn (0.9.7)
-      ansi
-      minitest (~> 4)
-    tzinfo (0.3.53)
+    simple_po_parser (1.1.6)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    thor (1.3.2)
+    thread_safe (0.3.6)
+    timeout (0.4.2)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     yubikey (1.4.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
 
 DEPENDENCIES
+  byebug
   guard-minitest
   masq!
   minitest
   mocha
+  mysql2
+  pg
+  rails-controller-testing
   rb-fsevent
   ruby_gntp
   sqlite3
-  test-unit (~> 3.0)
-  turn
 
 BUNDLED WITH
-   1.12.5
+   2.4.22

README.md

@@ -1,31 +1,33 @@
-# Masq OpenID Server
+# Masq2 OpenID Server
 
-[![Build Status](https://travis-ci.org/bardbess/masq.svg?branch=master)](http://travis-ci.org/bardbess/masq)
+Masq2 is a mountable Rails engine that provides OpenID server/identity provider functionality.
+It is the successor to the [masq gem](https://github.com/dennisreimann/masq), which in turn
+was the successor of the stand-alone Rails application of the same purpose, [masquerade](http://github.com/dennisreimann/masquerade/).
 
-Masq is a mountable Rails engine that provides OpenID server/identity provider functionality.
-It is the successor of the stand-alone Rails application [masquerade](http://github.com/dennisreimann/masquerade/).
+Because of this history, and the desire to be drop-in compatible with `masq`,
+the namespace remains `Masq`, not `Masq2`.
 
-The project is released under the MIT-License and its source code is available at [GitHub](http://github.com/dennisreimann/masquerade/).
+The project is released under the MIT-License and its source code is available at [GitHub](http://github.com/oauth-xx/masq2/).
 Feel free to fork and submit patches :)
 
 ## Installation
 
-0. In case you want to run masq as a standalone application (not integrated into an existing app), you will have to generate a barebone Rails app first:
+1. In case you want to run Masq2 as a standalone application (not integrated into an existing app), you will have to generate a bare-bone Rails app first:
     * `rails new my_openid_provider`
 
-1. Add masq to your Gemfile and install it:
-    * `gem 'masq'`
+2. Add `masq2` to your Gemfile and install it:
+    * `gem 'masq2'`
     * `bundle install`
 
-2. Copy the configuration and edit it:
+3. Copy the configuration and edit it:
     * `bundle exec rake masq:install:config`
     * `$EDITOR config/masq.yml`
 
-3. Copy the migrations and migrate:
+4. Copy the migrations and migrate:
     * `bundle exec rake masq:install:migrations`
     * `bundle exec rake db:migrate`
 
-4. Configure the routes by mounting the masq engine:
+5. Configure the routes by mounting the masq engine:
     * For integration into an existing app, mount it in a subdirectory, like:
         * `mount Masq::Engine => "/masq"` or
         * `mount Masq::Engine => "/openid"`
@@ -56,7 +58,9 @@ client-server communication (like requesting simple registration data).
 
 ### Introduction
 
-This fork adds ORACLE database support to the existing dennisreimann/masq gem.
+`masq2` adds ORACLE database support, as well as support for 
+Rails 5.1, 5.2, 6.0, 6.1, 7.0, 7.1, 7.2, 8.0,
+which `masq` never had. 
 
 The main functionality is in the server controller, which is the endpoint for incoming
 OpenID requests. The server controller is supposed to only interact with relying parties
@@ -66,11 +70,13 @@ handy methods to access and answer OpenID requests.
 ### Testing
 
 You can run the tests with Rake:
-    * `DB_ADAPTER=sqlite3 bundle exec rake app:masq:test:ci`
-    * `DB_ADAPTER=mysql2 bundle exec rake app:masq:test:ci`
-    * `DB_ADAPTER=postgresql bundle exec rake app:masq:test:ci`
+
+* `DB_ADAPTER=sqlite3 bundle exec rake app:masq:test:ci`
+* `DB_ADAPTER=mysql2 bundle exec rake app:masq:test:ci`
+* `DB_ADAPTER=postgresql bundle exec rake app:masq:test:ci`
 
 The Rake task configures the database.yml for the chosen adapter.
 
 In case you prefer running the tests continuously, use Guard:
-    * `bundle exec guard`
+
+* `bundle exec guard`