Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/policies/group_policy.rb')
-rw-r--r--app/policies/group_policy.rb26
1 files changed, 2 insertions, 24 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index f927d976f0d..ca170133105 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -69,9 +69,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
end
condition(:dependency_proxy_access_allowed) do
- valid_dependency_proxy_human_token ||
- valid_dependency_proxy_group_access_token ||
- valid_dependency_proxy_deploy_token
+ access_level(for_any_session: true) >= GroupMember::GUEST || valid_dependency_proxy_deploy_token
end
desc "Deploy token with read_package_registry scope"
@@ -388,18 +386,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
user.is_a?(User)
end
- def user_is_human?
- user_is_user? && user.human?
- end
-
- def user_is_project_bot?
- user_is_user? && user.project_bot?
- end
-
- def user_is_deploy_token?
- user.is_a?(DeployToken)
- end
-
def group
@subject
end
@@ -420,16 +406,8 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
resource_access_token_create_feature_available? && group.root_ancestor.namespace_settings.resource_access_token_creation_allowed?
end
- def valid_dependency_proxy_human_token
- user_is_human? && access_level(for_any_session: true) >= GroupMember::GUEST
- end
-
- def valid_dependency_proxy_group_access_token
- user_is_project_bot? && access_level(for_any_session: true) >= GroupMember::GUEST
- end
-
def valid_dependency_proxy_deploy_token
- user_is_deploy_token? && @user&.valid_for_dependency_proxy? && @user&.has_access_to_group?(@subject)
+ @user.is_a?(DeployToken) && @user&.valid_for_dependency_proxy? && @user&.has_access_to_group?(@subject)
end
end