From c1e1f9bf69be770f5014678a2f28873ff4452000 Mon Sep 17 00:00:00 2001 From: theworldbright Date: Sun, 22 Nov 2015 19:12:26 -0800 Subject: [PATCH] Fix 500 error when unknown algorithm is used for JWT --- .../api/openid_connect/token_endpoint_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/openid_connect/token_endpoint_controller.rb b/app/controllers/api/openid_connect/token_endpoint_controller.rb index c8ebf5b64..9f145058d 100644 --- a/app/controllers/api/openid_connect/token_endpoint_controller.rb +++ b/app/controllers/api/openid_connect/token_endpoint_controller.rb @@ -46,16 +46,16 @@ module Api end end - rescue_from Rack::OAuth2::Server::Authorize::BadRequest, JSON::JWT::InvalidFormat do |e| + rescue_from Rack::OAuth2::Server::Authorize::BadRequest, + JSON::JWT::InvalidFormat, JSON::JWK::UnknownAlgorithm do |e| logger.info e.backtrace[0, 10].join("\n") - render json: {error: :invalid_request, error_description: e.message, status: e.status} - end - rescue_from JSON::JWT::InvalidFormat do |e| render json: {error: :invalid_request, error_description: e.message, status: 400} end rescue_from JSON::JWT::VerificationFailed do |e| + logger.info e.backtrace[0, 10].join("\n") render json: {error: :invalid_grant, error_description: e.message, status: 400} end + end end end