From 23b83422836d573aea2fa7e1ed9047a7b0386cac Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 24 Aug 2021 17:48:51 +0800 Subject: [PATCH 1/2] fix: project member authorize --- app/controllers/members_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index e835b5bd0..097da69db 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -47,7 +47,7 @@ class MembersController < ApplicationController end def member_exists? - @project.member?(params[:user_id]) + @project.members.exists?(user_id: params[:user_id]) end def operate! @@ -59,6 +59,6 @@ class MembersController < ApplicationController end def check_member_not_exists! - return render_error("user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id]) + return render_error("user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists? end end From c8b21f818d59d85d04baa76f05a7ec98ecfebb12 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 24 Aug 2021 18:04:17 +0800 Subject: [PATCH 2/2] fix: migrate project password decode --- app/services/gitea/accelerator/migrate_service.rb | 2 +- app/services/repositories/migrate_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/gitea/accelerator/migrate_service.rb b/app/services/gitea/accelerator/migrate_service.rb index 26541b48e..86b8b3db1 100644 --- a/app/services/gitea/accelerator/migrate_service.rb +++ b/app/services/gitea/accelerator/migrate_service.rb @@ -44,7 +44,7 @@ class Gitea::Accelerator::MigrateService < Gitea::Accelerator::BaseService clone_addr: params[:clone_addr], repo_name: params[:repository_name], auth_username: params[:auth_username], - auth_password: params[:auth_password], + auth_password: Base64.decode64(params[:auth_password]), mirror: ActiveModel::Type::Boolean.new.cast(params[:is_mirror]) } end diff --git a/app/services/repositories/migrate_service.rb b/app/services/repositories/migrate_service.rb index 374115bf0..2870faba9 100644 --- a/app/services/repositories/migrate_service.rb +++ b/app/services/repositories/migrate_service.rb @@ -32,7 +32,7 @@ class Repositories::MigrateService < ApplicationService private: params[:hidden], mirror: wrapper_mirror || false, auth_username: params[:login], - auth_password: params[:password] + auth_password: Base64.decode64(params[:password]) } end