Skip to content

Ensure that feeds are appropriately restricted #10018

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 7 commits into from
Jan 28, 2020
Merged

Ensure that feeds are appropriately restricted #10018

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfef824
Always limit results by what is accessible to the user
zeripath Jan 27, 2020
d6548c2
Change signature of AccessibleRepoIDsQuery
zeripath Jan 27, 2020
45a89f4
Ensure that user with ID <= 0 is handled
zeripath Jan 27, 2020
3923185
Update models/repo_list.go
zeripath Jan 27, 2020
c68997a
Merge branch 'master' into fix-9981-limited-hidden-activity
zeripath Jan 27, 2020
6a33a74
Merge branch 'master' into fix-9981-limited-hidden-activity
zeripath Jan 28, 2020
0c03606
Merge branch 'master' into fix-9981-limited-hidden-activity
zeripath Jan 28, 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
2 changes: 1 addition & 1 deletion models/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
}

cond = cond.And(builder.In("repo_id", repoIDs))
} else if opts.Actor != nil {
} else {
cond = cond.And(builder.In("repo_id", opts.Actor.AccessibleRepoIDsQuery()))
}

Expand Down
1 change: 1 addition & 0 deletions models/repo_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (RepositoryList, int64, err

// AccessibleRepoIDsQuery queries accessible repository ids. Usable as a subquery wherever repo ids need to be filtered.
func (user *User) AccessibleRepoIDsQuery() *builder.Builder {
// NB: Please note this code needs to still work if user is nil
return builder.Select("id").From("repository").Where(accessibleRepositoryCondition(user))
}

Expand Down