fix(github): lookup wikis per-repo

trufflesecurity · Feb 9, 2024 · 5f16975 · 5f16975
1 parent 8e00cba
commit 5f16975
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/pkg/sources/github/github.go b/pkg/sources/github/github.go
@@ -720,13 +720,13 @@ func (s *Source) scan(ctx context.Context, installationClient *github.Client, ch
 			}
 
 			// Scan the wiki, if enabled, and the repo has one.
-			if s.conn.IncludeWikis && repoInfo.hasWiki {
+			if s.conn.IncludeWikis && repoInfo.hasWiki && s.hasWiki(ctx, repoURL) {
 				wikiURL := strings.TrimSuffix(repoURL, ".git") + ".wiki.git"
 				wikiCtx := context.WithValue(ctx, "repo", wikiURL)
 
 				_, err := s.cloneAndScanRepo(wikiCtx, installationClient, wikiURL, repoInfo, chunksChan)
 				if err != nil {
-					scanErrs.Add(err)
+					scanErrs.Add(fmt.Errorf("error scanning wiki: %s", wikiURL))
 					// Don't return, it still might be possible to scan comments.
 				}
 			}

diff --git a/pkg/sources/github/repo.go b/pkg/sources/github/repo.go
@@ -269,7 +269,7 @@ func (s *Source) processRepos(ctx context.Context, target string, listRepos repo
 				owner:    r.GetOwner().GetLogin(),
 				name:     r.GetName(),
 				fullName: r.GetFullName(),
-				hasWiki:  s.conn.GetIncludeWikis() && s.hasWiki(ctx, r, repoURL),
+				hasWiki:  r.GetHasWiki(),
 				size:     r.GetSize(),
 			}
 			if r.GetPrivate() {
@@ -295,11 +295,7 @@ func (s *Source) processRepos(ctx context.Context, target string, listRepos repo
 
 // hasWiki returns true if the "has_wiki" property is true AND https://github.com/$org/$repo/wiki is not redirected.
 // Unfortunately, this isn't 100% accurate. Some repositories meet both criteria yet don't have a cloneable wiki.
-func (s *Source) hasWiki(ctx context.Context, repo *github.Repository, repoURL string) bool {
-	if !repo.GetHasWiki() {
-		return false
-	}
-
+func (s *Source) hasWiki(ctx context.Context, repoURL string) bool {
 	wikiURL := strings.TrimSuffix(repoURL, ".git") + "/wiki"
 	req, err := http.NewRequestWithContext(ctx, http.MethodHead, wikiURL, nil)
 	if err != nil {