@@ -2,43 +2,88 @@ package github
22
33import (
44 "fmt"
5+ "net/http"
6+ "net/url"
7+ "strings"
58
69 gogit "github.com/go-git/go-git/v5"
710 "github.com/google/go-github/v67/github"
8- "github.com/trufflesecurity/trufflehog/v3/pkg/log "
11+ "github.com/shurcooL/githubv4 "
912
1013 "github.com/trufflesecurity/trufflehog/v3/pkg/context"
14+ "github.com/trufflesecurity/trufflehog/v3/pkg/log"
1115 "github.com/trufflesecurity/trufflehog/v3/pkg/pb/sourcespb"
1216)
1317
14- const cloudEndpoint = "https://api.github.com"
18+ const (
19+ cloudV3Endpoint = "https://api.github.com"
20+ cloudGraphqlEndpoint = "https://api.github.com/graphql" // https://docs.github.com/en/graphql/guides/forming-calls-with-graphql#the-graphql-endpoint
21+ )
1522
1623type connector interface {
1724 // APIClient returns a configured GitHub client that can be used for GitHub API operations.
1825 APIClient () * github.Client
26+ // GraphQLClient returns a client that can be used for GraphQL operations.
27+ GraphQLClient () * githubv4.Client
1928 // Clone clones a repository using the configured authentication information.
2029 Clone (ctx context.Context , repoURL string ) (string , * gogit.Repository , error )
2130}
2231
23- func newConnector (source * Source ) (connector , error ) {
32+ func newConnector (ctx context.Context , source * Source ) (connector , error ) {
33+ // Construct the URLs.
2434 apiEndpoint := source .conn .Endpoint
2535 if apiEndpoint == "" || endsWithGithub .MatchString (apiEndpoint ) {
26- apiEndpoint = cloudEndpoint
36+ apiEndpoint = cloudV3Endpoint
2737 }
2838
2939 switch cred := source .conn .GetCredential ().(type ) {
3040 case * sourcespb.GitHub_GithubApp :
3141 log .RedactGlobally (cred .GithubApp .GetPrivateKey ())
32- return newAppConnector (apiEndpoint , cred .GithubApp )
42+ return newAppConnector (ctx , apiEndpoint , cred .GithubApp )
3343 case * sourcespb.GitHub_BasicAuth :
3444 log .RedactGlobally (cred .BasicAuth .GetPassword ())
35- return newBasicAuthConnector (apiEndpoint , cred .BasicAuth )
45+ return newBasicAuthConnector (ctx , apiEndpoint , cred .BasicAuth )
3646 case * sourcespb.GitHub_Token :
3747 log .RedactGlobally (cred .Token )
38- return newTokenConnector (apiEndpoint , cred .Token , source .handleRateLimit )
48+ return newTokenConnector (ctx , apiEndpoint , cred .Token , source .handleRateLimit )
3949 case * sourcespb.GitHub_Unauthenticated :
40- return newUnauthenticatedConnector (apiEndpoint )
50+ return newUnauthenticatedConnector (ctx , apiEndpoint )
4151 default :
4252 return nil , fmt .Errorf ("unknown connection type" )
4353 }
4454}
55+
56+ func createAPIClient (ctx context.Context , httpClient * http.Client , apiEndpoint string ) (* github.Client , error ) {
57+ getLogger (ctx ).V (2 ).Info ("Creating API client" , "url" , apiEndpoint )
58+
59+ // If we're using public GitHub, make a regular client.
60+ // Otherwise, make an enterprise client.
61+ if strings .EqualFold (apiEndpoint , cloudV3Endpoint ) {
62+ return github .NewClient (httpClient ), nil
63+ }
64+
65+ return github .NewClient (httpClient ).WithEnterpriseURLs (apiEndpoint , apiEndpoint )
66+ }
67+
68+ func createGraphqlClient (ctx context.Context , client * http.Client , apiEndpoint string ) (* githubv4.Client , error ) {
69+ var graphqlEndpoint string
70+ if apiEndpoint == cloudV3Endpoint {
71+ graphqlEndpoint = cloudGraphqlEndpoint
72+ } else {
73+ // Use the root endpoint for the host.
74+ // https://docs.github.com/en/[email protected] /graphql/guides/introduction-to-graphql 75+ parsedURL , err := url .Parse (apiEndpoint )
76+ if err != nil {
77+ return nil , fmt .Errorf ("could not create GraphQL client: %w" , err )
78+ }
79+
80+ // GitHub Enterprise uses `/api/v3` for the base. (https://github.com/google/go-github/issues/958)
81+ // Swap it, and anything before `/api`, with GraphQL.
82+ before , _ := strings .CutSuffix (parsedURL .Path , "/api/v3" )
83+ parsedURL .Path = before + "/api/graphql"
84+ graphqlEndpoint = parsedURL .String ()
85+ }
86+ getLogger (ctx ).V (2 ).Info ("Creating GraphQL client" , "url" , graphqlEndpoint )
87+
88+ return githubv4 .NewEnterpriseClient (graphqlEndpoint , client ), nil
89+ }
0 commit comments