-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into add-assume-role-aws
- Loading branch information
Showing
48 changed files
with
1,906 additions
and
488 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| if: ${{ ! github.event.pull_request.head.repo.fork }} | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| actions: 'read' | ||
|
|
@@ -31,6 +32,7 @@ jobs: | |
| - name: Test | ||
| run: make test-integration | ||
| test-detectors: | ||
| if: ${{ ! github.event.pull_request.head.repo.fork }} | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| actions: 'read' | ||
|
|
@@ -50,4 +52,19 @@ jobs: | |
| service_account: '[email protected]' | ||
| - name: Test | ||
| run: make test-detectors | ||
| continue-on-error: true | ||
| continue-on-error: true | ||
| test-fork: | ||
| if: ${{ github.event.pull_request.head.repo.fork }} | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| actions: 'read' | ||
| contents: 'read' | ||
| steps: | ||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: '1.20' | ||
| - name: Checkout code | ||
| uses: actions/checkout@v3 | ||
| - name: Test | ||
| run: make test-forks | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package dockerhub | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "net/http" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "github.com/trufflesecurity/trufflehog/v3/pkg/common" | ||
| "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" | ||
| "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" | ||
| ) | ||
|
|
||
| type Scanner struct{} | ||
|
|
||
| // Ensure the Scanner satisfies the interface at compile time. | ||
| var _ detectors.Detector = (*Scanner)(nil) | ||
|
|
||
| var ( | ||
| client = common.SaneHttpClient() | ||
|
|
||
| // Can use email or username for login. | ||
| usernamePat = regexp.MustCompile(`(?im)(?:user|usr|-u)\S{0,40}?[:=\s]{1,3}[ '"=]?([a-zA-Z0-9]{4,40})\b`) | ||
| emailPat = regexp.MustCompile(common.EmailPattern) | ||
|
|
||
| // Can use password or personal access token (PAT) for login, but this scanner will only check for PATs. | ||
| accessTokenPat = regexp.MustCompile(`\bdckr_pat_([a-zA-Z0-9_-]){27}\b`) | ||
| ) | ||
|
|
||
| // 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{"dckr_pat_"} | ||
| } | ||
|
|
||
| // FromData will find and optionally verify Dockerhub 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) | ||
|
|
||
| emailMatches := emailPat.FindAllString(dataStr, -1) | ||
| dataStr = emailPat.ReplaceAllString(dataStr, "") | ||
| usernameMatches := usernamePat.FindAllStringSubmatch(dataStr, -1) | ||
|
|
||
| accessTokenMatches := accessTokenPat.FindAllString(dataStr, -1) | ||
|
|
||
| userMatches := emailMatches | ||
| for _, usernameMatch := range usernameMatches { | ||
| if len(usernameMatch) > 1 { | ||
| userMatches = append(userMatches, usernameMatch[1]) | ||
| } | ||
| } | ||
|
|
||
| for _, resUserMatch := range userMatches { | ||
| for _, resAccessTokenMatch := range accessTokenMatches { | ||
|
|
||
| s1 := detectors.Result{ | ||
| DetectorType: detectorspb.DetectorType_Dockerhub, | ||
| Raw: []byte(fmt.Sprintf("%s: %s", resUserMatch, resAccessTokenMatch)), | ||
| } | ||
|
|
||
| if verify { | ||
| payload := strings.NewReader(fmt.Sprintf(`{"username": "%s", "password": "%s"}`, resUserMatch, resAccessTokenMatch)) | ||
|
|
||
| req, err := http.NewRequestWithContext(ctx, "GET", "https://hub.docker.com/v2/users/login", payload) | ||
| if err != nil { | ||
| continue | ||
| } | ||
| req.Header.Add("Content-Type", "application/json") | ||
| res, err := client.Do(req) | ||
| if err == nil { | ||
| defer res.Body.Close() | ||
| body, err := io.ReadAll(res.Body) | ||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| // Valid credentials can still return a 401 status code if 2FA is enabled | ||
| if (res.StatusCode >= 200 && res.StatusCode < 300) || (res.StatusCode == 401 && strings.Contains(string(body), "login_2fa_token")) { | ||
| s1.Verified = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| results = append(results, s1) | ||
| } | ||
| } | ||
|
|
||
| return results, nil | ||
| } | ||
|
|
||
| func (s Scanner) Type() detectorspb.DetectorType { | ||
| return detectorspb.DetectorType_Dockerhub | ||
| } |
Oops, something went wrong.