appengine/swarming/handlers_bot.py - Issue 2984843002: swarming: switch to a 'capability focused' ACL system

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: appengine/swarming/handlers_bot.py

Issue 2984843002: swarming: switch to a 'capability focused' ACL system (Closed)

Patch Set: Tuned permissions, added tests Created 3 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: appengine/swarming/handlers_bot.py

diff --git a/appengine/swarming/handlers_bot.py b/appengine/swarming/handlers_bot.py

index a15ed7302dfdd1b862567273b1510b30e4e09956..4415f4689b504a37ef85e135d471106f4c480562 100644

--- a/appengine/swarming/handlers_bot.py

+++ b/appengine/swarming/handlers_bot.py

@@ -151,7 +151,7 @@ class _BotAuthenticatingHandler(auth.AuthenticatingHandler):

# TODO(vadimsh): Remove is_ip_whitelisted_machine check once all bots are

# using auth for bootstrap and updating.

- if (not acl.is_bootstrapper() and

+ if (not acl.can_create_bot() and

not acl.is_ip_whitelisted_machine() and

not (bot_id and bot_auth.is_authenticated_bot(bot_id, machine_type))):

raise auth.AuthorizationError('Not allowed to access the bot code')

« no previous file with comments | « no previous file | appengine/swarming/handlers_endpoints.py » ('j') | no next file with comments »