Skip to content

Slight simplification of accessibleRepositoryCondition #10875

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

Merged
merged 4 commits into from
Mar 29, 2020
Merged

Slight simplification of accessibleRepositoryCondition #10875

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb4b1dd
Slight simplification of accessibleRepositoryCondition
zeripath Mar 29, 2020
826a93d
Update models/repo_list.go
zeripath Mar 29, 2020
4febabb
Apply suggestions from code review
zeripath Mar 29, 2020
d41ce8e
Merge branch 'master' into slight-simplification-accessible-repo-subq…
zeripath Mar 29, 2020
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
11 changes: 6 additions & 5 deletions models/repo_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,12 @@ func accessibleRepositoryCondition(user *User) builder.Cond {
// 1. Be able to see all non-private repositories that either:
cond = cond.Or(builder.And(
builder.Eq{"`repository`.is_private": false},
builder.Or(
// A. Aren't in organisations __OR__
builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(builder.Eq{"type": UserTypeOrganization})),
// B. Isn't a private organisation. Limited is OK as long as we're logged in.
builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(builder.In("visibility", orgVisibilityLimit))))))
// 2. Aren't in an private organisation or limited organisation if we're not logged in
builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(
builder.And(
builder.Eq{"type": UserTypeOrganization},
builder.In("visibility", orgVisibilityLimit)),
))))
}

if user != nil {
Expand Down