From 64a3ab24e290cc5900f170ec8f8f6beda4907ccd Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Thu, 15 Oct 2020 14:37:24 +0800 Subject: [PATCH] FIX devops pwd auth bug --- README.md | 2 +- app/controllers/ci/cloud_accounts_controller.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62bfa67c9..fae9bdf96 100644 --- a/README.md +++ b/README.md @@ -2640,7 +2640,7 @@ GET /api/users/ci/oauth_grant *示例* ``` curl -X GET \ --d "password=123456" +-d "password=123456" \ http://localhost:3000/api/users/ci/oauth_grant.json | jq ``` *请求参数说明:* diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb index a005075a9..0b230566f 100644 --- a/app/controllers/ci/cloud_accounts_controller.rb +++ b/app/controllers/ci/cloud_accounts_controller.rb @@ -84,7 +84,8 @@ class Ci::CloudAccountsController < Ci::BaseController end def oauth_grant - return render_error('你输入的密码不正确.') unless current_user.check_password?(params[:password].to_s) + password = params[:password].to_s + return render_error('你输入的密码不正确.') unless current_user.check_password?(password) result = gitea_oauth_grant!(current_user.login, password, @cloud_account.drone_url, current_user.oauths.last&.client_id) result === true ? render_ok : render_error('授权失败.')