Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Change GHE org enum to use since ID instead of pages (#618)
Dustin Decker9bcddbc45aa7
diff --git a/pkg/sources/github/github.go b/pkg/sources/github/github.goindex 23c18ec8f..71d19da8f 100644--- a/pkg/sources/github/github.go+++ b/pkg/sources/github/github.go@@ -678,7 +678,11 @@ func (s *Source) addReposByApp(ctx context.Context, apiClient *github.Client) erfunc (s *Source) addAllVisibleOrgs(ctx context.Context, apiClient *github.Client) {s.log.Debug("enumerating all visibile organizations on GHE")+ // Enumeration on this endpoint does not use pages. it uses a since ID.+ // The endpoint will return organizations with an ID greater than the given since ID.+ // Empty org response is our cue to break the enumeration loop.orgOpts := &github.OrganizationsListOptions{+ Since: 0,ListOptions: github.ListOptions{PerPage: 100,},@@ -695,7 +699,13 @@ func (s *Source) addAllVisibleOrgs(ctx context.Context, apiClient *github.Clientlog.WithError(err).Errorf("Could not list all organizations")return}- s.log.Debugf("listed organization page %d/%d", orgOpts.Page, resp.LastPage)+ if len(orgs) == 0 {+ break+ }+ lastOrgID := *orgs[len(orgs)-1].ID+ s.log.Debugf("listed organization IDs %d through %d", orgOpts.Since, lastOrgID)+ orgOpts.Since = lastOrgID+for _, org := range orgs {var name stringif org.Name != nil {@@ -705,13 +715,9 @@ func (s *Source) addAllVisibleOrgs(ctx context.Context, apiClient *github.Client} else {continue}- s.log.Debug("adding organization for repository enumeration: ", name)+ s.log.Debugf("adding organization %d for repository enumeration: %s", org.ID, name)common.AddStringSliceItem(name, &s.orgs)}- if resp.NextPage == 0 {- break- }- orgOpts.Page = resp.NextPage}}