omniauth-swedbank 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0771558c29f141a92ba04dac605eca8dcc169009
-  data.tar.gz: 4617272b07b93f44b1d9e8526871206e91dfba63
+SHA256:
+  metadata.gz: '08dd6ff19fc5206753cdbaa5d52bd6e996bdc010c6a5ee5a2a1a3326c3b0377a'
+  data.tar.gz: e5f10b84a4bf54f2103b4b7ff2562e820934be35e390bae1e85dd4bd47703400
 SHA512:
-  metadata.gz: e01dac01185b8e267efded3598fd5f69b8d2dcaa3e6a30847434b5c7a490986f5f3c3684985731914968838cd90b0c7852a1e11002cea2693ed40298b93467c3
-  data.tar.gz: 1008eb879420bde49410875e903dd0d801099c646ebfc4754974937e0923edb6aafb7b80ca43a9ecc9304a08b301e5fe856b0c08c5516771c8ef0ed2967aab66
+  metadata.gz: 624179716be3b0ffc26462e1fd11cdc9b532cde86ec059d2ba2fb927ec4ac06e1df436ee5dd43a6b1643bb3daffa522b1b3b8822090805ba514dd6acbfebaffd
+  data.tar.gz: a7f24969ca3acf4c424c2b65af68b5c46687ef4a722e95ffc9ae0bb971bc03cee8e31f08d5a8e27408bedc5652957624d2b57947adc77b7f9a800fe25b80b6c6

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec

data/README.md

@@ -2,22 +2,20 @@
 
 Omniauth strategy for using Swedbank as an authentication service provider.
 
-[![Gem Version](https://badge.fury.io/rb/omniauth-swedbank.png)](http://badge.fury.io/rb/omniauth-swedbank)
-[![Build Status](https://travis-ci.org/mak-it/omniauth-swedbank.svg?branch=master)](https://travis-ci.org/mak-it/omniauth-swedbank)
-
-Supported Ruby versions: 2.2+
+Supported Ruby versions: 2.7+
 
 ## Related projects
 
-- [omniauth-citadele](https://github.com/mak-it/omniauth-citadele) - strategy for authenticating with Citadele
-- [omniauth-dnb](https://github.com/mak-it/omniauth-dnb) - strategy for authenticating with DNB
-- [omniauth-nordea](https://github.com/mak-it/omniauth-nordea) - strategy for authenticating with Nordea
-- [omniauth-seb-elink](https://github.com/mak-it/omniauth-seb-elink) - strategy for authenticating with SEB
+- [omniauth-citadele](https://github.com/mitigate-dev/omniauth-citadele) - strategy for authenticating with Citadele
+- [omniauth-dnb](https://github.com/mitigate-dev/omniauth-dnb) - strategy for authenticating with DNB
+- [omniauth-nordea](https://github.com/mitigate-dev/omniauth-nordea) - strategy for authenticating with Nordea
+- [omniauth-seb-elink](https://github.com/mitigate-dev/omniauth-seb-elink) - strategy for authenticating with SEB
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add these lines to your application's Gemfile (omniauth-rails_csrf_protection is required if using Rails):
 
+    gem 'omniauth-rails_csrf_protection'
     gem 'omniauth-swedbank'
 
 And then execute:
@@ -26,7 +24,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install omniauth-swedbank
+    $ gem install omniauth-rails_csrf_protection omniauth-swedbank
 
 ## Usage
 

data/lib/omniauth/strategies/swedbank.rb

@@ -9,6 +9,14 @@ module OmniAuth
       AUTH_SERVICE = '4002'
       AUTH_VERSION = '008'
 
+      def self.render_nonce?
+         defined?(ActionDispatch::ContentSecurityPolicy::Request) != nil
+      end
+      if render_nonce?
+        include ActionDispatch::ContentSecurityPolicy::Request
+        delegate :get_header, :set_header, to: :request
+      end
+
       args [:private_key, :public_key, :snd_id, :rec_id]
 
       option :private_key, nil
@@ -102,6 +110,8 @@ module OmniAuth
           return fail!(:private_key_load_err, e)
         end
 
+        set_locale_from_query_param
+
         form = OmniAuth::Form.new(:title => I18n.t('omniauth.swedbank.please_wait'), :url => options.site)
 
         {
@@ -112,18 +122,45 @@ module OmniAuth
           'VK_NONCE' => stamp,
           'VK_RETURN' => callback_url,
           'VK_MAC' => signature(priv_key),
-          'VK_LANG' => 'LAT',
+          'VK_LANG' => resolve_bank_ui_language,
           'VK_ENCODING' => 'UTF-8'
         }.each do |name, val|
-          form.html "<input type=\"hidden\" name=\"#{name}\" value=\"#{val}\" />"
+          form.html "<input type=\"hidden\" name=\"#{name}\" value=\"#{escape(val)}\" />"
         end
 
         form.button I18n.t('omniauth.swedbank.click_here_if_not_redirected')
 
+        nonce_attribute = nil
+        if self.class.render_nonce?
+          nonce_attribute = " nonce='#{escape(content_security_policy_nonce)}'"
+        end
         form.instance_variable_set('@html',
-          form.to_html.gsub('</form>', '</form><script type="text/javascript">document.forms[0].submit();</script>'))
+          form.to_html.gsub('</form>', "</form><script type=\"text/javascript\"#{nonce_attribute}>document.forms[0].submit();</script>"))
         form.to_response
       end
+
+      private
+
+      def set_locale_from_query_param
+        locale = request.params['locale']
+        if (locale != nil && locale.strip != '' && I18n.locale_available?(locale))
+          I18n.locale = locale
+        end
+      end
+
+      def resolve_bank_ui_language
+        case I18n.locale
+        when :ru then 'RUS'
+        when :en then 'ENG'
+        when :et then 'EST'
+        when :lt then 'LIT'
+        else 'LAT'
+        end
+      end
+
+      def escape(html_attribute_value)
+         CGI.escapeHTML(html_attribute_value) unless html_attribute_value.nil?
+      end
     end
   end
 end

data/lib/omniauth/swedbank/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Swedbank
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/omniauth-swedbank.gemspec

@@ -6,11 +6,11 @@ require 'omniauth/swedbank/version'
 Gem::Specification.new do |spec|
   spec.name          = 'omniauth-swedbank'
   spec.version       = Omniauth::Swedbank::VERSION
-  spec.authors       = ['MAK IT', 'Jānis Kiršteins', 'Kristaps Ērglis']
-  spec.email         = ['admin@makit.lv', 'janis@montadigital.com', 'kristaps.erglis@gmail.com' ]
+  spec.authors       = ['Mitigate', 'Jānis Kiršteins', 'Kristaps Ērglis']
+  spec.email         = ['admin@mitigate.dev', 'janis@montadigital.com', 'kristaps.erglis@gmail.com' ]
   spec.description   = %q{OmniAuth strategy for Swedbank Banklink}
   spec.summary       = %q{OmniAuth strategy for Swedbank Banklink}
-  spec.homepage      = 'https://github.com/mak-it/omniauth-swedbank'
+  spec.homepage      = 'https://github.com/mitigate-dev/omniauth-swedbank'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -18,13 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.2.2'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'omniauth', '~> 1.0'
-  spec.add_runtime_dependency "i18n"
+  spec.add_runtime_dependency 'omniauth', '~> 2.1'
+  spec.add_runtime_dependency 'i18n'
 
+  spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'rspec', '~> 2.7'
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rack-session'
 end

data/spec/omniauth/strategies/swedbank_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'rack-protection'
+require 'rack/session'
 
 describe OmniAuth::Strategies::Swedbank do
 
@@ -6,11 +8,13 @@ describe OmniAuth::Strategies::Swedbank do
   PUBLIC_KEY = File.read(File.join(RSpec.configuration.cert_folder, 'response.public.pem'))
 
   let(:app){ Rack::Builder.new do |b|
-    b.use Rack::Session::Cookie, {secret: 'abc123'}
+    b.use Rack::Session::Cookie, {secret: '5242e6bd9daf0e9645c2d4e22b11ba8cee0bed44439906d5f1bd5dad409d8637'}
     b.use(OmniAuth::Strategies::Swedbank, PRIVATE_KEY, PUBLIC_KEY, 'MY_SND_ID', 'MY_REC_ID')
     b.run lambda{|env| [404, {}, ['Not Found']]}
   end.to_app }
 
+  let(:token){ Rack::Protection::AuthenticityToken.random_token }
+
   let(:last_response_nonce) { last_response.body.match(/name="VK_NONCE" value="([^"]*)"/)[1] }
   let(:last_response_mac) { last_response.body.match(/name="VK_MAC" value="([^"]*)"/)[1] }
 
@@ -23,7 +27,14 @@ describe OmniAuth::Strategies::Swedbank do
       'VK_RETURN' =>  'http://example.org/auth/swedbank/callback'
     }
 
-    before(:each){ get '/auth/swedbank' }
+    before(:each) do
+      post(
+        '/auth/swedbank',
+        {},
+        'rack.session' => {csrf: token},
+        'HTTP_X_CSRF_TOKEN' => token
+      )
+    end
 
     it 'displays a single form' do
       expect(last_response.status).to eq(200)
@@ -71,7 +82,7 @@ describe OmniAuth::Strategies::Swedbank do
 
     context 'with custom options' do
       let(:app){ Rack::Builder.new do |b|
-        b.use Rack::Session::Cookie, {secret: 'abc123'}
+        b.use Rack::Session::Cookie, {secret: '5242e6bd9daf0e9645c2d4e22b11ba8cee0bed44439906d5f1bd5dad409d8637'}
         b.use(OmniAuth::Strategies::Swedbank, PRIVATE_KEY, PUBLIC_KEY, 'MY_SND_ID', 'MY_REC_ID',
           site: 'https://test.lv/banklink')
         b.run lambda{|env| [404, {}, ['Not Found']]}
@@ -84,7 +95,7 @@ describe OmniAuth::Strategies::Swedbank do
 
     context 'with non-existant private key files' do
       let(:app){ Rack::Builder.new do |b|
-        b.use Rack::Session::Cookie, {secret: 'abc123'}
+        b.use Rack::Session::Cookie, {secret: '5242e6bd9daf0e9645c2d4e22b11ba8cee0bed44439906d5f1bd5dad409d8637'}
         b.use(OmniAuth::Strategies::Swedbank, 'missing-private-key-file.pem', PUBLIC_KEY, 'MY_SND_ID', 'MY_REC_ID')
         b.run lambda{|env| [404, {}, ['Not Found']]}
       end.to_app }
@@ -124,7 +135,7 @@ describe OmniAuth::Strategies::Swedbank do
 
     context 'with non-existant public key file' do
       let(:app){ Rack::Builder.new do |b|
-        b.use Rack::Session::Cookie, {secret: 'abc123'}
+        b.use Rack::Session::Cookie, {secret: '5242e6bd9daf0e9645c2d4e22b11ba8cee0bed44439906d5f1bd5dad409d8637'}
         b.use(OmniAuth::Strategies::Swedbank, PRIVATE_KEY, 'missing-public-key-file.pem', 'MY_SND_ID', 'MY_REC_ID')
         b.run lambda{|env| [404, {}, ['Not Found']]}
       end.to_app }

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-swedbank
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
-- MAK IT
+- Mitigate
 - Jānis Kiršteins
 - Kristaps Ērglis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -40,6 +40,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -58,30 +72,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,17 +110,31 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OmniAuth strategy for Swedbank Banklink
 email:
-- admin@makit.lv
+- admin@mitigate.dev
 - janis@montadigital.com
 - kristaps.erglis@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -122,11 +150,11 @@ files:
 - spec/certs/response.public.pem
 - spec/omniauth/strategies/swedbank_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/mak-it/omniauth-swedbank
+homepage: https://github.com/mitigate-dev/omniauth-swedbank
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,16 +162,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: OmniAuth strategy for Swedbank Banklink
 test_files:

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.1
-script: bundle exec rspec