diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-07 15:39:19 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-07 15:39:19 +0000 |
commit | 66e7b4cd07f3ad29765a4f60a4c13fc6a26c3575 (patch) | |
tree | a50da05b584754fe30e747cdec2461519afdcc14 /app/services | |
parent | 8c4d590973dcf137e163cda5ba4b2ec5da1ef2f8 (diff) | |
parent | 64aa9e21b254e1f03e55d359e8fe9a349c660b43 (diff) | |
download | gitlab-ce-66e7b4cd07f3ad29765a4f60a4c13fc6a26c3575.tar.gz |
Merge branch 'add-star-for-action-scope' into 'master'
add star for action scope, in order to delete image from registry
Closes #26465
See merge request !13248
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/auth/container_registry_authentication_service.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb index 5e151b0f044..7dae5880931 100644 --- a/app/services/auth/container_registry_authentication_service.rb +++ b/app/services/auth/container_registry_authentication_service.rb @@ -103,6 +103,8 @@ module Auth build_can_pull?(requested_project) || user_can_pull?(requested_project) when 'push' build_can_push?(requested_project) || user_can_push?(requested_project) + when '*' + user_can_admin?(requested_project) else false end @@ -120,6 +122,11 @@ module Auth (requested_project == project || can?(current_user, :build_read_container_image, requested_project)) end + def user_can_admin?(requested_project) + has_authentication_ability?(:admin_container_image) && + can?(current_user, :admin_container_image, requested_project) + end + def user_can_pull?(requested_project) has_authentication_ability?(:read_container_image) && can?(current_user, :read_container_image, requested_project) |