SAMLの設定が行われていない場合にSamlSettingNotFoundのエラーを発生させる (#48)

* release 1.0.1 (#37) * add authors * Change title * Add generator descriptions * Add routing descripiton * Add controller templates info * Add view templates info * Add model and migration templates info * Fix Style/WordArray * Add logo * Add h1 * Add br * center * Tweak * Add gem ber * Fix shields * Add other sheilds * Add license * Remove pre sheilds * Add br * tweak * Add setting relation * tweak * Add migrate description * Fix path * Add emoji * Change headers * Bump rails from 6.1.3.2 to 6.1.4 Bumps [rails](https://github.com/rails/rails) from 6.1.3.2 to 6.1.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](rails/rails@v6.1.3.2...v6.1.4) --- updated-dependencies: - dependency-name: rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * tweak * Update readme * アプリ導入の際に必要になった機能の追加 (#36) * アプリ導入の際に必要になった機能の追加 * setupメソッドを複数回呼び出せる様にする * 修正もれの対応 * saml_responseとsign_in時のユーザー検索で別カラムを別々に設定できる様に修正 * バグ修正 Co-authored-by: yonetani <[email protected]> * Fix typo Co-authored-by: yonetani <[email protected]> Co-authored-by: psyashes <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * gem version up (#47) * saml_settingがない場合にエラーを発生させる様に修正 * version up Co-authored-by: psyashes <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
metaps · Nov 5, 2021 · daaed6a · daaed6a
1 parent a1267be
commit daaed6a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sp-rails-saml (1.0.2)
+    sp-rails-saml (1.0.3)
       ruby-saml
 
 GEM

diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ $ rails g sp_rails_saml:install {reference_table_name}
 At this point, you need to write your account table name in `reference_table_name`.
 This will generate the saml templates for controller, view, model, initializer, etc.
 
+
 If you need only saml sp initiated and idp initiated template
 
 ```

diff --git a/app/controllers/saml/sessions_base_controller.rb b/app/controllers/saml/sessions_base_controller.rb
@@ -11,6 +11,7 @@ def create
       user = setting.user_class.find_by!(setting.user_find_key => params[:email])
       account = user.send(setting.account_class.to_s.downcase.to_sym)
 
+      raise SpRailsSaml::SamlSettingNotFound if account.saml_setting.blank?
       raise SpRailsSaml::SamlLoginForbidden if account.saml_setting.password_only?
 
       if user.blank?

diff --git a/app/controllers/saml/ssos_base_controller.rb b/app/controllers/saml/ssos_base_controller.rb
@@ -9,6 +9,7 @@ def consume
       setting = SpRailsSaml::Settings.instance
       account = setting.account_class.find_by!(setting.account_find_key => params[setting.account_find_key])
 
+      raise SpRailsSaml::SamlSettingNotFound if account.saml_setting.blank?
       raise SpRailsSaml::SamlLoginForbidden if account.saml_setting.password_only?
 
       saml_setting = account.saml_setting

diff --git a/lib/sp-rails-saml.rb b/lib/sp-rails-saml.rb
@@ -20,6 +20,8 @@ class LoginUserNotFound < Error; end
 
   class SamlResponseInvalid < Error; end
 
+  class SamlSettingNotFound < Error; end
+
   autoload :Authnrequest, File.expand_path('./sp-rails-saml/authnrequest', __dir__)
   autoload :SamlResponse, File.expand_path('./sp-rails-saml/saml_response', __dir__)
   autoload :Metadata, File.expand_path('./sp-rails-saml/metadata', __dir__)

diff --git a/lib/sp-rails-saml/version.rb b/lib/sp-rails-saml/version.rb
@@ -1,3 +1,3 @@
 module SpRailsSaml
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,7 @@ $ rails g sp_rails_saml:install {reference_table_name} @@
     At this point, you need to write your account table name in `reference_table_name`.
     This will generate the saml templates for controller, view, model, initializer, etc.
     If you need only saml sp initiated and idp initiated template
     ```
@@ Expand Down @@