diff --git a/Gemfile b/Gemfile index 303ec4a..0bea526 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,13 @@ gem "sprockets" # Authentication against Google, Facebook and others gem 'omniauth' -gem 'omniauth-amazon' -gem 'omniauth-google-oauth2' -gem 'omniauth-github' -gem 'omniauth-openid' +#gem 'omniauth-amazon' +#gem 'omniauth-google-oauth2' +#gem 'omniauth-github' +#gem 'omniauth-openid' + +# Single-sign-on with salsa.debian.net +gem 'omniauth_openid_connect' +# Mitigate CVE-2015-9284 +# https://github.com/cookpad/omniauth-rails_csrf_protection +gem 'omniauth-rails_csrf_protection' diff --git a/Gemfile.lock b/Gemfile.lock index cd49b43..5c57902 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,60 +7,60 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.2.1) - actionpack (= 6.1.2.1) - activesupport (= 6.1.2.1) + actioncable (6.1.3) + actionpack (= 6.1.3) + activesupport (= 6.1.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.2.1) - actionpack (= 6.1.2.1) - activejob (= 6.1.2.1) - activerecord (= 6.1.2.1) - activestorage (= 6.1.2.1) - activesupport (= 6.1.2.1) + actionmailbox (6.1.3) + actionpack (= 6.1.3) + activejob (= 6.1.3) + activerecord (= 6.1.3) + activestorage (= 6.1.3) + activesupport (= 6.1.3) mail (>= 2.7.1) - actionmailer (6.1.2.1) - actionpack (= 6.1.2.1) - actionview (= 6.1.2.1) - activejob (= 6.1.2.1) - activesupport (= 6.1.2.1) + actionmailer (6.1.3) + actionpack (= 6.1.3) + actionview (= 6.1.3) + activejob (= 6.1.3) + activesupport (= 6.1.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.2.1) - actionview (= 6.1.2.1) - activesupport (= 6.1.2.1) + actionpack (6.1.3) + actionview (= 6.1.3) + activesupport (= 6.1.3) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.2.1) - actionpack (= 6.1.2.1) - activerecord (= 6.1.2.1) - activestorage (= 6.1.2.1) - activesupport (= 6.1.2.1) + actiontext (6.1.3) + actionpack (= 6.1.3) + activerecord (= 6.1.3) + activestorage (= 6.1.3) + activesupport (= 6.1.3) nokogiri (>= 1.8.5) - actionview (6.1.2.1) - activesupport (= 6.1.2.1) + actionview (6.1.3) + activesupport (= 6.1.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.2.1) - activesupport (= 6.1.2.1) + activejob (6.1.3) + activesupport (= 6.1.3) globalid (>= 0.3.6) - activemodel (6.1.2.1) - activesupport (= 6.1.2.1) - activerecord (6.1.2.1) - activemodel (= 6.1.2.1) - activesupport (= 6.1.2.1) - activestorage (6.1.2.1) - actionpack (= 6.1.2.1) - activejob (= 6.1.2.1) - activerecord (= 6.1.2.1) - activesupport (= 6.1.2.1) + activemodel (6.1.3) + activesupport (= 6.1.3) + activerecord (6.1.3) + activemodel (= 6.1.3) + activesupport (= 6.1.3) + activestorage (6.1.3) + actionpack (= 6.1.3) + activejob (= 6.1.3) + activerecord (= 6.1.3) + activesupport (= 6.1.3) marcel (~> 0.3.1) mimemagic (~> 0.3.2) - activesupport (6.1.2.1) + activesupport (6.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -68,8 +68,10 @@ GEM zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) + aes_key_wrap (1.1.0) ansi (1.5.0) ast (2.4.2) + attr_required (1.0.1) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -81,6 +83,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) + bindata (2.4.8) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) bootsnap (1.7.2) @@ -116,11 +119,6 @@ GEM e2mmap (0.1.0) erubi (1.10.0) execjs (2.7.0) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) fastimage (2.2.2) ffi (1.14.2) font-awesome-rails (4.7.0.7) @@ -149,6 +147,7 @@ GEM guard (~> 2.11) guard-compat (~> 1.0) hashie (4.1.0) + httpclient (2.8.3) i18n (1.8.9) concurrent-ruby (~> 1.0) image_processing (1.12.1) @@ -164,7 +163,10 @@ GEM js_cookie_rails (2.2.0) railties (>= 3.1) json (1.8.6) - jwt (2.2.2) + json-jwt (1.13.0) + activesupport (>= 4.2) + aes_key_wrap + bindata kramdown (2.3.0) rexml kramdown-parser-gfm (1.1.0) @@ -184,12 +186,12 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0212) + mime-types-data (3.2021.0225) mimemagic (0.3.5) mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.5.0) - minitest (5.14.3) + minitest (5.14.4) minitest-rails (6.1.0) minitest (~> 5.10) railties (~> 6.1.0) @@ -199,9 +201,6 @@ GEM minitest (>= 5.0) ruby-progressbar msgpack (1.4.2) - multi_json (1.15.0) - multi_xml (0.6.0) - multipart-post (2.1.1) nenv (0.3.0) nio4r (2.5.5) nokogiri (1.11.1) @@ -210,32 +209,26 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.4) - faraday (>= 0.8, < 2.0) - jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-amazon (1.0.1) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-github (1.4.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.1) - jwt (>= 2.0) - oauth2 (~> 1.1) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.6) - omniauth-oauth2 (1.7.1) - oauth2 (~> 1.4) - omniauth (>= 1.9, < 3) - omniauth-openid (2.0.1) - omniauth (>= 1.0, < 3.0) - rack-openid (~> 1.4.0) + omniauth-rails_csrf_protection (0.1.2) + actionpack (>= 4.2) + omniauth (>= 1.3.1) + omniauth_openid_connect (0.3.5) + addressable (~> 2.5) + omniauth (~> 1.9) + openid_connect (~> 1.1) + openid_connect (1.2.0) + activemodel + attr_required (>= 1.0.0) + json-jwt (>= 1.5.0) + rack-oauth2 (>= 1.6.1) + swd (>= 1.0.0) + tzinfo + validate_email + validate_url + webfinger (>= 1.0.1) orm_adapter (0.5.0) paperclip (6.1.0) activemodel (>= 4.2.0) @@ -257,30 +250,33 @@ GEM puma (3.12.6) racc (1.5.2) rack (2.2.3) - rack-openid (1.4.2) - rack (>= 1.1.0) - ruby-openid (>= 2.1.8) + rack-oauth2 (1.16.0) + activesupport + attr_required + httpclient + json-jwt (>= 1.11.0) + rack (>= 2.1.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.2.1) - actioncable (= 6.1.2.1) - actionmailbox (= 6.1.2.1) - actionmailer (= 6.1.2.1) - actionpack (= 6.1.2.1) - actiontext (= 6.1.2.1) - actionview (= 6.1.2.1) - activejob (= 6.1.2.1) - activemodel (= 6.1.2.1) - activerecord (= 6.1.2.1) - activestorage (= 6.1.2.1) - activesupport (= 6.1.2.1) + rails (6.1.3) + actioncable (= 6.1.3) + actionmailbox (= 6.1.3) + actionmailer (= 6.1.3) + actionpack (= 6.1.3) + actiontext (= 6.1.3) + actionview (= 6.1.3) + activejob (= 6.1.3) + activemodel (= 6.1.3) + activerecord (= 6.1.3) + activestorage (= 6.1.3) + activesupport (= 6.1.3) bundler (>= 1.15.0) - railties (= 6.1.2.1) + railties (= 6.1.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-erd (1.6.0) + rails-erd (1.6.1) activerecord (>= 4.2) activesupport (>= 4.2) choice (~> 0.2.0) @@ -289,9 +285,9 @@ GEM rails rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.1.2.1) - actionpack (= 6.1.2.1) - activesupport (= 6.1.2.1) + railties (6.1.3) + actionpack (= 6.1.3) + activesupport (= 6.1.3) method_source rake (>= 0.8.7) thor (~> 1.0) @@ -302,14 +298,14 @@ GEM ffi (~> 1.0) rdoc (4.3.0) ref (2.0.0) - regexp_parser (2.0.3) + regexp_parser (2.1.1) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rubocop (1.9.1) + rubocop (1.10.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -322,11 +318,9 @@ GEM parser (>= 2.7.1.5) ruby-graphviz (1.2.5) rexml - ruby-openid (2.9.2) ruby-progressbar (1.11.0) ruby-vips (2.0.17) ffi (~> 1.9) - ruby2_keywords (0.0.4) rubyzip (2.3.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -385,6 +379,10 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + swd (1.2.0) + activesupport (>= 3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) temple (0.8.2) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -401,8 +399,17 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (2.0.0) + validate_email (0.1.6) + activemodel (>= 3.0) + mail (>= 2.2.5) + validate_url (1.0.13) + activemodel (>= 3.0.0) + public_suffix warden (1.2.9) rack (>= 2.0.9) + webfinger (1.1.0) + activesupport + httpclient (>= 2.4) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -439,10 +446,9 @@ DEPENDENCIES minitest-rails minitest-reporters omniauth - omniauth-amazon - omniauth-github - omniauth-google-oauth2 - omniauth-openid + omniauth-rails_csrf_protection + omniauth_openid_connect + openid_connect paperclip pg pg_search