From 133ae18b61c5d3bdfc7670b8320abe84dd96cbe2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 5 Jan 2020 19:48:47 +0100
Subject: [BugFix] Hide public repos owned by private orgs (#9609)

* Restrict AllPublic to actually public repos.
* Add new parameter to add in AllLimited Repos
---
 models/repo_list.go      | 9 +++++++--
 models/repo_list_test.go | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'models')

diff --git a/models/repo_list.go b/models/repo_list.go
index 34fac8b055..7b48834dba 100644
--- a/models/repo_list.go
+++ b/models/repo_list.go
@@ -121,7 +121,8 @@ type SearchRepoOptions struct {
 	StarredByID     int64
 	Page            int
 	IsProfile       bool
-	AllPublic       bool // Include also all public repositories
+	AllPublic       bool // Include also all public repositories of users and public organisations
+	AllLimited      bool // Include also all public repositories of limited organisations
 	PageSize        int  // Can be smaller than or equal to setting.ExplorePagingNum
 	// None -> include collaborative AND non-collaborative
 	// True -> include just collaborative
@@ -228,7 +229,11 @@ func SearchRepository(opts *SearchRepoOptions) (RepositoryList, int64, error) {
 		}
 
 		if opts.AllPublic {
-			accessCond = accessCond.Or(builder.Eq{"is_private": false})
+			accessCond = accessCond.Or(builder.Eq{"is_private": false}.And(builder.In("owner_id", builder.Select("`user`.id").From("`user`").Where(builder.Eq{"`user`.visibility": structs.VisibleTypePublic}))))
+		}
+
+		if opts.AllLimited {
+			accessCond = accessCond.Or(builder.Eq{"is_private": false}.And(builder.In("owner_id", builder.Select("`user`.id").From("`user`").Where(builder.Eq{"`user`.visibility": structs.VisibleTypeLimited}))))
 		}
 
 		cond = cond.And(accessCond)
diff --git a/models/repo_list_test.go b/models/repo_list_test.go
index a1eed18b83..07f84207e2 100644
--- a/models/repo_list_test.go
+++ b/models/repo_list_test.go
@@ -177,8 +177,8 @@ func TestSearchRepository(t *testing.T) {
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, AllPublic: true, Template: util.OptionalBoolFalse},
 			count: 25},
 		{name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative",
-			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true, Template: util.OptionalBoolFalse},
-			count: 31},
+			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true, AllLimited: true, Template: util.OptionalBoolFalse},
+			count: 30},
 		{name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName",
 			opts:  &SearchRepoOptions{Keyword: "test", Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true},
 			count: 15},
-- 
cgit v1.2.3