strongmind-auth 1.0.16 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2306b7e1bd1a267836f1fef6f86f79233f31c12cd5dcb792332d822f0ad48b7a
-  data.tar.gz: 28f82b40cd09b68cd707d44f3da9db20050a7696576fa132f095ea730df1dbd8
+  metadata.gz: 1526ec8b78d6caea36cd40f7c943b5e376a4da4fcb0a5f37a4a3222d658e612f
+  data.tar.gz: f8bd96c7bb4d8658961224bf6c5ed9f1b9c2f9afd789d683e95afd3817a93864
 SHA512:
-  metadata.gz: 80a6b9990e257f8ce2c3a5a3cd84a52a6531cfbaeafaabcff14e6db4595143c5ddd0d33d24c4766c05fba0ee0f7a7e1ba1ea1fe462293d2ee463bd007c47c596
-  data.tar.gz: dfe36023e2f0cfac32111a853748cc01a7822959b1702416cbb3f8ee2d08f58afda4cc2ea7f80b6746b47fd9f9da3395f2a24cbf9f0424a25dc9e94d1799d91f
+  metadata.gz: 06353b6d2d5f5d8554af61ba484e97ad6bc2b287a0d44a0e26f447a26df6e6c2de095b991f9b8002aaf676e3b6f080c1e095b1890ec2559f19bbbcb8292cb6d2
+  data.tar.gz: b37c854e2fc115f6a802b5dee2fcc6d45393951a4ad6891f78efa80bb3e24aa7e4e5ab08c86ad7baa4b28c67e12db3eabad4a84d84f15ab312b4a07ecdd9b290

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/setup"
 
-APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
 load "rails/tasks/statistics.rake"

data/app/controllers/concerns/jwt_utilities.rb

@@ -4,32 +4,14 @@
 module JwtUtilities
   extend ActiveSupport::Concern
 
-  def jwt_valid?(jwt, condition_key = nil, scopes = [])
-    begin
-      payload, _header = JWT.decode(jwt, public_key, true, {
-        verify_iat: true,
-        verify_iss: true,
-        verify_aud: true,
-        verify_sub: true,
-        algorithm: 'RS256',
-        leeway: 60
-      })
-    rescue JWT::DecodeError => e
-      Rails.logger.error e.message
-      return false
-    end
-
-    payload = payload.with_indifferent_access
-
-    unless !scopes.empty? && payload['scope'].present? && payload['scope'].all? { |elem| scopes.include?(elem) }
-      return false
-    end
-
-    return false unless payload['nonce'].nil?
-
-    return false unless condition_key.nil? || payload['events'].key?(condition_key)
-
-    true
+  def jwt_valid?(jwt, condition_key = nil, scopes = [], attributes = [])
+    payload = decode_jwt(jwt)
+    return false unless payload
+
+    scope_valid?(payload,
+                 scopes) && nonce_valid?(payload) && condition_key_valid?(payload,
+                                                                          condition_key) && attributes_valid?(payload,
+                                                                                                              attributes)
   end
 
   def public_key
@@ -42,6 +24,41 @@ module JwtUtilities
 
   private
 
+  def decode_jwt(jwt)
+    payload, _header = JWT.decode(jwt, public_key, true, jwt_decode_options)
+    payload.with_indifferent_access
+  rescue JWT::DecodeError => e
+    Rails.logger.error e.message
+    nil
+  end
+
+  def jwt_decode_options
+    {
+      verify_iat: true,
+      verify_iss: true,
+      verify_aud: true,
+      verify_sub: true,
+      algorithm: 'RS256',
+      leeway: 60
+    }
+  end
+
+  def scope_valid?(payload, scopes)
+    scopes.empty? || (payload['scope'].present? && scopes.all? { |scope| payload['scope'].include?(scope) })
+  end
+
+  def nonce_valid?(payload)
+    payload['nonce'].nil?
+  end
+
+  def condition_key_valid?(payload, condition_key)
+    condition_key.nil? || payload['events'].to_h.key?(condition_key)
+  end
+
+  def attributes_valid?(payload, attributes)
+    attributes.empty? || attributes.all? { |attribute| payload.include?(attribute) }
+  end
+
   def fetch_user_token_info
     user_jwt(session)
   end

data/app/controllers/concerns/strong_mind_nav.rb

@@ -14,8 +14,8 @@ module StrongMindNav
     rescue Strongmind::Exceptions::TokenNotFoundError, Strongmind::Exceptions::UserNotFoundError => e
       Sentry.capture_exception(e)
       Rails.logger.error(e)
-      flash[:alert] = e.inspect if Rails.env.development?
-      @stop_redirect = true if Rails.env.development?
+      flash[:alert] = e.inspect if Rails.env.development? || Rails.env.test?
+      @stop_redirect = true if Rails.env.development? || Rails.env.test?
       render 'logins/index'
     rescue Exception => e
       Sentry.capture_exception(e)

data/app/views/logins/index.html.erb

@@ -16,16 +16,11 @@
 </style>
 <%= button_to 'Sign in with StrongMind', '/users/auth/strongmind', style: 'display:none' %>
 <script type="text/javascript">
-    function submitForm() {
-        document.forms[0].submit();
-    }
-
     // Submit the form on load
     window.addEventListener("load", (event) => {
-        <% if @stop_redirect %>
-        return;
+        <% unless @stop_redirect %>
+        document.forms[0].submit();
         <% end %>
-        submitForm();
     });
 
 </script>

data/config/routes.rb

@@ -9,6 +9,7 @@ Rails.application.routes.draw do
 
   devise_scope :user do
     get 'users/sign_out', to: 'users/sessions#initiate_backchannel_logout'
+    post 'users/endsession', to: 'users/sessions#endsession'
 
     unauthenticated do
       root 'logins#index', as: :unauthenticated_root

data/lib/strongmind/auth/engine.rb

@@ -1,6 +1,11 @@
 module Strongmind
   module Auth
     class Engine < ::Rails::Engine
+      config.generators do |g|
+        g.test_framework :rspec
+        g.fixture_replacement :factory_bot
+        g.factory_bot dir: 'spec/factories'
+      end
     end
   end
 end

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.0.16"
+    VERSION = "1.1.0"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -12,6 +12,9 @@ module Strongmind
     def initialize(user, request)
       raise Strongmind::Exceptions::UserNotFoundError, 'User not found' unless user.present?
       raise ArgumentError, 'Request not found' unless request.present?
+      raise ArgumentError, 'Identity base URL not found at IDENTITY_BASE_URL in environment' unless ENV['IDENTITY_BASE_URL'].present?
+      raise ArgumentError, 'Identity client ID not found at IDENTITY_CLIENT_ID in environment' unless ENV['IDENTITY_CLIENT_ID'].present?
+      raise ArgumentError, 'Identity client secret not found at IDENTITY_CLIENT_SECRET in environment' unless ENV['IDENTITY_CLIENT_SECRET'].present?
 
       @user = user
       @request = request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.1.0
 platform: ruby
 authors:
 - Team Belding