doorkeeper-openid_connect 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b125dc43aa1d61bb63f9e21847c283cab2c049061aab519c6a3c7075537d749
-  data.tar.gz: e77fd739cd18693a7ad91531ab198d46fa3577328fef7c8301c8e0611038ab41
+  metadata.gz: ad886e65fd13b81ceb33165b6108992890073e9069524d383ee45948f64a2b17
+  data.tar.gz: c1aaff72cbf9031e456c8f022845ce680799a1eadf6ec6ef171357bd1064f1fd
 SHA512:
-  metadata.gz: a9bab8209fe8082dfda99b2055b5a7c60f1181077649ed671765f68596647646cb4462744f8d3e50f224f62ae42c4d3090036fef79e9994995f47af95cff1b39
-  data.tar.gz: 4b5bea2726c1f2147fdacfec185dbf93cecc4fb36aa9597faf49c57fe33ac40e474b061b4d69a16e49450b26443097ec0461300d2ae4d7d60cf5e87560cd79b8
+  metadata.gz: '08aa15acd68b90ebb2dadab4f50a3718a71a13a9fe7a6b6c3f628dfee1ffe85e8c10ac98217ff1b8c33e8afaacbf4ec392043c5ac6b3d27e5516ed5070bf5956'
+  data.tar.gz: 1ed88f7c7b84daa5bd95c71ebba114a1bda3e0a1985e4187854113db3f3c2454ac62451e7d581ccfd41de4419eadf64008a920cc540963e6c5a73561351f238f

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 No changes yet.
 
+## v1.6.2 (2019-08-09)
+
+### Bugfixes
+
+- [#80] Check for client presence in controller, fixes a 500 error when `client_id` is missing (thanks to @cincospenguinos @urnf @isabellechalhoub)
+
 ## v1.6.1 (2019-06-07)
 
 ### Bugfixes

data/lib/doorkeeper/openid_connect/helpers/controller.rb

@@ -6,14 +6,23 @@ module Doorkeeper
 
         def authenticate_resource_owner!
           super.tap do |owner|
-            next unless controller_path == Doorkeeper::Rails::Routes.mapping[:authorizations][:controllers] &&
-              action_name == 'new'
-            next unless pre_auth.scopes.include?('openid')
+            next unless oidc_authorization_request?
 
-            handle_prompt_param!(owner)
-            handle_max_age_param!(owner)
+            handle_oidc_prompt_param!(owner)
+            handle_oidc_max_age_param!(owner)
           end
         rescue Errors::OpenidConnectError => exception
+          handle_oidc_error!(exception)
+        end
+
+        def oidc_authorization_request?
+          controller_path == Doorkeeper::Rails::Routes.mapping[:authorizations][:controllers] &&
+            action_name == 'new' &&
+            pre_auth.client &&
+            pre_auth.scopes.include?('openid')
+        end
+
+        def handle_oidc_error!(exception)
           # clear the previous response body to avoid a DoubleRenderError
           self.response_body = nil
 
@@ -39,7 +48,7 @@ module Doorkeeper
           end
         end
 
-        def handle_prompt_param!(owner)
+        def handle_oidc_prompt_param!(owner)
           prompt_values ||= params[:prompt].to_s.split(/ +/).uniq
 
           prompt_values.each do |prompt|
@@ -47,9 +56,9 @@ module Doorkeeper
             when 'none' then
               raise Errors::InvalidRequest if (prompt_values - [ 'none' ]).any?
               raise Errors::LoginRequired unless owner
-              raise Errors::ConsentRequired unless matching_tokens_for_resource_owner(owner).present?
+              raise Errors::ConsentRequired unless matching_tokens_for_oidc_resource_owner(owner).present?
             when 'login' then
-              reauthenticate_resource_owner(owner) if owner
+              reauthenticate_oidc_resource_owner(owner) if owner
             when 'consent' then
               render :new
             when 'select_account' then
@@ -61,7 +70,7 @@ module Doorkeeper
           end
         end
 
-        def handle_max_age_param!(owner)
+        def handle_oidc_max_age_param!(owner)
           max_age = params[:max_age].to_i
           return unless max_age > 0 && owner
 
@@ -69,11 +78,11 @@ module Doorkeeper
             &Doorkeeper::OpenidConnect.configuration.auth_time_from_resource_owner
 
           if !auth_time || (Time.zone.now - auth_time) > max_age
-            reauthenticate_resource_owner(owner)
+            reauthenticate_oidc_resource_owner(owner)
           end
         end
 
-        def reauthenticate_resource_owner(owner)
+        def reauthenticate_oidc_resource_owner(owner)
           return_to = URI.parse(request.path)
           return_to.query = request.query_parameters.tap do |params|
             params['prompt'] = params['prompt'].to_s.sub(/\blogin\s*\b/, '').strip
@@ -86,7 +95,7 @@ module Doorkeeper
           raise Errors::LoginRequired unless performed?
         end
 
-        def matching_tokens_for_resource_owner(owner)
+        def matching_tokens_for_oidc_resource_owner(owner)
           Doorkeeper::AccessToken.authorized_tokens_for(pre_auth.client.id, owner.id).select do |token|
             Doorkeeper::AccessToken.scopes_match?(token.scopes, pre_auth.scopes, pre_auth.client.scopes)
           end

data/lib/doorkeeper/openid_connect/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.6.1'.freeze
+    VERSION = '1.6.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Sam Dengler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper