From 2eaf1d693ae08c0312dd1f977f81675f418f3770 Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Tue, 6 Oct 2020 15:43:28 +0800 Subject: db: migrate access table to use GORM (#6371) --- internal/db/ssh_key.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'internal/db/ssh_key.go') diff --git a/internal/db/ssh_key.go b/internal/db/ssh_key.go index 49cee17a..37bf9ae1 100644 --- a/internal/db/ssh_key.go +++ b/internal/db/ssh_key.go @@ -753,10 +753,12 @@ func DeleteDeployKey(doer *User, id int64) error { if err != nil { return fmt.Errorf("GetRepositoryByID: %v", err) } - yes, err := HasAccess(doer.ID, repo, AccessModeAdmin) - if err != nil { - return fmt.Errorf("HasAccess: %v", err) - } else if !yes { + if !Perms.Authorize(doer.ID, repo.ID, AccessModeAdmin, + AccessModeOptions{ + OwnerID: repo.OwnerID, + Private: repo.IsPrivate, + }, + ) { return ErrKeyAccessDenied{doer.ID, key.ID, "deploy"} } } -- cgit v1.2.3