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.

Sign up for GitHub

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

Ensure correct SSH permissions check for private and restricted users #17370

Merged
merged 4 commits into from
Oct 20, 2021
Merged

Ensure correct SSH permissions check for private and restricted users #17370

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02836e1
Ensure correct SSH permissions check for private and restricted users
zeripath Oct 20, 2021
196668a
Merge branch 'main' into fix-17364-private-user-should-only-be-org-cl…
zeripath Oct 20, 2021
75ec5b7
Merge branch 'main' into fix-17364-private-user-should-only-be-org-cl…
6543 Oct 20, 2021
bf92792
Merge branch 'main' into fix-17364-private-user-should-only-be-org-cl…
techknowlogick Oct 20, 2021
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
9 changes: 7 additions & 2 deletions routers/private/serv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,12 @@ func ServCommand(ctx *context.PrivateContext) {
}

// Permissions checking:
if repoExist && (mode > models.AccessModeRead || repo.IsPrivate || setting.Service.RequireSignInView) {
if repoExist &&
(mode > models.AccessModeRead ||
repo.IsPrivate ||
owner.Visibility.IsPrivate() ||
user.IsRestricted ||
setting.Service.RequireSignInView) {
if key.Type == models.KeyTypeDeploy {
if deployKey.Mode < mode {
ctx.JSON(http.StatusUnauthorized, private.ErrServCommand{
Expand All @@ -289,7 +294,7 @@ func ServCommand(ctx *context.PrivateContext) {
return
}
} else {
// Because of special ref "refs/for" .. , need delay write permission check
// Because of the special ref "refs/for" we will need to delay write permission check
if git.SupportProcReceive && unitType == models.UnitTypeCode {
mode = models.AccessModeRead
}
Expand Down