Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor permisions can_read_route? #3929

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/cloud_controller/permissions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,9 @@ def readable_space_scoped_spaces_query
def can_read_route?(space_id)
return true if can_read_globally?

space = VCAP::CloudController::Space.where(id: space_id).first
org_id = VCAP::CloudController::Space.where(id: space_id).get(:organization_id)

space.has_member?(@user) || space.has_supporter?(@user) ||
@user.managed_organizations.map(&:id).include?(space.organization_id) ||
@user.audited_organizations.map(&:id).include?(space.organization_id)
membership.role_applies?(ROLES_FOR_ROUTE_READING, space_id, org_id)
end

def space_guids_with_readable_routes_query
Expand Down
76 changes: 0 additions & 76 deletions spec/unit/lib/cloud_controller/permissions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1028,82 +1028,6 @@ module VCAP::CloudController
end
end

describe '#can_read_route?' do
it 'returns true if user is an admin' do
set_current_user(user, { admin: true })
expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true if user is a read-only admin' do
set_current_user(user, { admin_read_only: true })
expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true if user is a global auditor' do
set_current_user_as_global_auditor
expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true for space developer' do
org.add_user(user)
space.add_developer(user)

expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true for space manager' do
org.add_user(user)
space.add_manager(user)

expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true for space auditor' do
org.add_user(user)
space.add_auditor(user)

expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true for space supporter' do
org.add_user(user)
space.add_supporter(user)

expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true for org manager' do
org.add_user(user)
org.add_manager(user)

expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns true for org auditor' do
org.add_user(user)
org.add_auditor(user)

expect(permissions.can_read_route?(space.id)).to be true
end

it 'returns false for org billing manager' do
org.add_user(user)
org.add_billing_manager(user)

expect(permissions.can_read_route?(space.id)).to be false
end

it 'returns false for regular org user' do
org.add_user(user)

expect(permissions.can_read_route?(space.id)).to be false
end

it 'returns false for other user' do
expect(permissions.can_read_route?(space.id)).to be false
end
end

describe '#readable_app_guids' do
it 'returns all the app guids for admins' do
user = set_current_user_as_admin
Expand Down