summaryrefslogtreecommitdiff
path: root/app/services/auth
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-09-16 09:59:10 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-16 11:12:21 +0200
commite941365f3be88cebd57e9b08ba8702c1b688cb94 (patch)
tree903b454248eb3ba230eabfb2c5427a11161e4c5c /app/services/auth
parentac6412d0766fbc090a3aa8272cfd4cc2d9a26c16 (diff)
downloadgitlab-ce-e941365f3be88cebd57e9b08ba8702c1b688cb94.tar.gz
Rename capabilities to authentication_abilities
Diffstat (limited to 'app/services/auth')
-rw-r--r--app/services/auth/container_registry_authentication_service.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index df1c9b2851c..36120a5bc99 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -4,8 +4,8 @@ module Auth
AUDIENCE = 'container_registry'
- def execute(capabilities:)
- @capabilities = capabilities || []
+ def execute(authentication_abilities:)
+ @authentication_abilities = authentication_abilities || []
return error('not found', 404) unless registry.enabled
@@ -92,23 +92,23 @@ module Auth
# Build can:
# 1. pull from it's own project (for ex. a build)
# 2. read images from dependent projects if creator of build is a team member
- @capabilities.include?(:build_read_container_image) &&
+ @authentication_abilities.include?(:build_read_container_image) &&
(requested_project == project || can?(current_user, :build_read_container_image, requested_project))
end
def user_can_pull?(requested_project)
- @capabilities.include?(:read_container_image) &&
+ @authentication_abilities.include?(:read_container_image) &&
can?(current_user, :read_container_image, requested_project)
end
def build_can_push?(requested_project)
# Build can push only to project to from which he originates
- @capabilities.include?(:build_create_container_image) &&
+ @authentication_abilities.include?(:build_create_container_image) &&
requested_project == project
end
def user_can_push?(requested_project)
- @capabilities.include?(:create_container_image) &&
+ @authentication_abilities.include?(:create_container_image) &&
can?(current_user, :create_container_image, requested_project)
end
end