diff options
author | Fabio Pitino <fpitino@gitlab.com> | 2019-09-13 07:40:00 +0100 |
---|---|---|
committer | Fabio Pitino <fpitino@gitlab.com> | 2019-09-24 10:25:07 +0100 |
commit | eb1c5b5798da323a7cb922805b2c729f9224ac4a (patch) | |
tree | 36efd283865f280009877b6ce6884aaddd930f03 /app | |
parent | 2e08a701343f471170a854e0ab7fbd92e60d7d85 (diff) | |
download | gitlab-ce-eb1c5b5798da323a7cb922805b2c729f9224ac4a.tar.gz |
Cancel all running CI jobs when user is blocked
This prevents a MITM attack where attacker could
still access Git repository if any jobs were
running long enough.
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 10 | ||||
-rw-r--r-- | app/services/ci/cancel_user_pipelines_service.rb | 13 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 58509976135..d0b14104016 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -265,6 +265,16 @@ class User < ApplicationRecord BLOCKED_MESSAGE end end + + # rubocop: disable CodeReuse/ServiceClass + # Ideally we should not call a service object here but user.block + # is also bcalled by Users::MigrateToGhostUserService which references + # this state transition object in order to do a rollback. + # For this reason the tradeoff is to disable this cop. + after_transition any => :blocked do |user| + Ci::CancelUserPipelinesService.new.execute(user) + end + # rubocop: enable CodeReuse/ServiceClass end # Scopes diff --git a/app/services/ci/cancel_user_pipelines_service.rb b/app/services/ci/cancel_user_pipelines_service.rb new file mode 100644 index 00000000000..bcafb6b4a35 --- /dev/null +++ b/app/services/ci/cancel_user_pipelines_service.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Ci + class CancelUserPipelinesService + # rubocop: disable CodeReuse/ActiveRecord + # This is a bug with CodeReuse/ActiveRecord cop + # https://gitlab.com/gitlab-org/gitlab/issues/32332 + def execute(user) + user.pipelines.cancelable.find_each(&:cancel_running) + end + # rubocop: enable CodeReuse/ActiveRecord + end +end |