datasette/datasette/views/base.py

Lines 69 to 77 in e627510

    
           async def check_permission(self, request, action, resource=None): 
        
               ok = await self.ds.permission_allowed( 
        
                   request.actor, 
        
                   action, 
        
                   resource=resource, 
        
                   default=True, 
        
               ) 
        
               if not ok: 
        
                   raise Forbidden(action)

This is weirdly different from how check_permissions() used to work, in that it doesn't differentiate between None and False.

datasette/datasette/views/base.py

Lines 79 to 103 in 4a4164b

    
           async def check_permissions(self, request, permissions): 
        
               """permissions is a list of (action, resource) tuples or 'action' strings""" 
        
               for permission in permissions: 
        
                   if isinstance(permission, str): 
        
                       action = permission 
        
                       resource = None 
        
                   elif isinstance(permission, (tuple, list)) and len(permission) == 2: 
        
                       action, resource = permission 
        
                   else: 
        
                       assert ( 
        
                           False 
        
                       ), "permission should be string or tuple of two items: {}".format( 
        
                           repr(permission) 
        
                       ) 
        
                   ok = await self.ds.permission_allowed( 
        
                       request.actor, 
        
                       action, 
        
                       resource=resource, 
        
                       default=None, 
        
                   ) 
        
                   if ok is not None: 
        
                       if ok: 
        
                           return 
        
                       else: 
        
                           raise Forbidden(action)

	async def check_permission(self, request, action, resource=None):
	ok = await self.ds.permission_allowed(
	request.actor,
	action,
	resource=resource,
	default=True,
	)
	if not ok:
	raise Forbidden(action)

	async def check_permissions(self, request, permissions):
	"""permissions is a list of (action, resource) tuples or 'action' strings"""
	for permission in permissions:
	if isinstance(permission, str):
	action = permission
	resource = None
	elif isinstance(permission, (tuple, list)) and len(permission) == 2:
	action, resource = permission
	else:
	assert (
	False
	), "permission should be string or tuple of two items: {}".format(
	repr(permission)
	)
	ok = await self.ds.permission_allowed(
	request.actor,
	action,
	resource=resource,
	default=None,
	)
	if ok is not None:
	if ok:
	return
	else:
	raise Forbidden(action)

Uh oh!

Remove check_permission() from BaseView #1677

Description

Metadata

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

Issue actions

Remove `check_permission()` from `BaseView` #1677