-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
Github Oauth2 verification #1584
Changes from 4 commits
642b597
d2d80d4
68dad1d
ce8c921
bdec501
b9fbe35
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
package github_oauth2 | ||
|
||
import ( | ||
"context" | ||
"regexp" | ||
"strings" | ||
|
||
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors" | ||
"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" | ||
"golang.org/x/oauth2/clientcredentials" | ||
"golang.org/x/oauth2/github" | ||
) | ||
|
||
type Scanner struct{ detectors.EndpointSetter } | ||
|
||
// Ensure the Scanner satisfies the interfaces at compile time. | ||
var _ detectors.Detector = (*Scanner)(nil) | ||
var _ detectors.Versioner = (*Scanner)(nil) | ||
var _ detectors.EndpointCustomizer = (*Scanner)(nil) | ||
|
||
func (Scanner) Version() int { return 2 } | ||
func (Scanner) DefaultEndpoint() string { return "https://api.github.com" } | ||
|
||
var ( | ||
// Oauth2 client ID and secret | ||
oauth2ClientIDPat = regexp.MustCompile(detectors.PrefixRegex([]string{"github"}) + `\b([a-f0-9]{20})\b`) | ||
oauth2ClientSecretPat = regexp.MustCompile(detectors.PrefixRegex([]string{"github"}) + `\b([a-f0-9]{40})\b`) | ||
) | ||
|
||
const ( | ||
githubBadVerificationCodeError = "bad_verification_code" | ||
) | ||
|
||
// Keywords are used for efficiently pre-filtering chunks. | ||
// Use identifiers in the secret preferably, or the provider name. | ||
func (s Scanner) Keywords() []string { | ||
return []string{"github"} | ||
} | ||
|
||
// FromData will find and optionally verify GitHub secrets in a given set of bytes. | ||
func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) { | ||
dataStr := string(data) | ||
|
||
// Oauth2 client ID and secret | ||
oauth2ClientIDMatches := oauth2ClientIDPat.FindAllStringSubmatch(dataStr, -1) | ||
oauth2ClientSecretMatches := oauth2ClientSecretPat.FindAllStringSubmatch(dataStr, -1) | ||
|
||
for _, idMatch := range oauth2ClientIDMatches { | ||
if len(idMatch) != 2 { | ||
continue | ||
} | ||
for _, secretMatch := range oauth2ClientSecretMatches { | ||
if len(secretMatch) != 2 { | ||
continue | ||
} | ||
|
||
s1 := detectors.Result{ | ||
DetectorType: detectorspb.DetectorType_GitHubOauth2, | ||
Raw: []byte(idMatch[1]), | ||
RawV2: []byte(idMatch[1] + secretMatch[1]), | ||
Comment on lines
+54
to
+55
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can make cc @mcastorina for your understanding as well There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Won't that cause confusion in OSS where the raw value is shown? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, you're right, I didn't consider that aspect. Keep it how it is then. |
||
} | ||
|
||
config := &clientcredentials.Config{ | ||
ClientID: idMatch[1], | ||
ClientSecret: secretMatch[1], | ||
TokenURL: github.Endpoint.TokenURL, | ||
} | ||
_, err := config.Token(ctx) | ||
if err != nil && strings.Contains(err.Error(), githubBadVerificationCodeError) { | ||
s1.Verified = true | ||
} | ||
|
||
if !s1.Verified && detectors.IsKnownFalsePositive(string(s1.Raw), detectors.DefaultFalsePositives, true) { | ||
continue | ||
} | ||
|
||
results = append(results, s1) | ||
} | ||
} | ||
|
||
return | ||
} | ||
|
||
func (s Scanner) Type() detectorspb.DetectorType { | ||
return detectorspb.DetectorType_GitHubOauth2 | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this needs to be versioned (yet) since it's the only
GitHubOauth2
detector.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call. Definitely not v2 at least