From dd1ba34ee5dadbd77b05de4df2e01605d056c552 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 26 Oct 2021 00:24:29 +0100 Subject: [PATCH] Prevent panic in serv.go with Deploy Keys (#17434) (#17435) Backport #17434 Unfortunately there was a regression in #17373 which missed that the user is not for deploy keys. This leads to a panic when pushing with deploy keys. Fix #17412 Signed-off-by: Andrew Thornton --- routers/private/serv.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/private/serv.go b/routers/private/serv.go index 3367959ac6b..5fcb9da4142 100644 --- a/routers/private/serv.go +++ b/routers/private/serv.go @@ -282,7 +282,7 @@ func ServCommand(ctx *context.PrivateContext) { (mode > models.AccessModeRead || repo.IsPrivate || owner.Visibility.IsPrivate() || - user.IsRestricted || + (user != nil && user.IsRestricted) || // user will be nil if the key is a deploykey setting.Service.RequireSignInView) { if key.Type == models.KeyTypeDeploy { if deployKey.Mode < mode {