소스 검색

When OAuth password verification fails, return 401 instead of redirect (#5111)

Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.
master
Eugen Rochko 6 년 전
committed by GitHub
부모
커밋
db3ed498b0
1개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. +4
    -5
      config/initializers/doorkeeper.rb

+ 4
- 5
config/initializers/doorkeeper.rb 파일 보기

@@ -7,15 +7,14 @@ Doorkeeper.configure do
current_user || redirect_to(new_user_session_url)
end

resource_owner_from_credentials do |routes|
request.params[:user] = { email: request.params[:username], password: request.params[:password] }
request.env["devise.allow_params_authentication"] = true
request.env["warden"].authenticate!(scope: :user)
resource_owner_from_credentials do |_routes|
user = User.find_by(email: request.params[:username])
user if !user&.otp_required_for_login? && user&.valid_password?(request.params[:password])
end

# If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
admin_authenticator do
(current_user && current_user.admin?) || redirect_to(new_user_session_url)
current_user&.admin? || redirect_to(new_user_session_url)
end

# Authorization Code expiration time (default 10 minutes).


불러오는 중...
취소
저장