Mirrors/trufflehog
2
0
Fork 0
mirror of https://github.com/trufflesecurity/trufflehog.git synced 2024-11-10 07:04:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(git): scan commit metadata (#2713)

Browse source 
This fixes #2683. It scans the commit author, committer (which is typically GitHub <noreply@github.com> for GitHub, but can be different), and message.

It also scans Git notes.
This commit is contained in:
Richard Gomez 2024-04-25 10:13:09 -04:00 committed by GitHub
parent a5f04e65f7
commit 81a9c813a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 501 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
pkg/gitparse/gitparse.go
View file

@ -22,7 +22,7 @@ import (
const ( const (
// defaultDateFormat is the standard date format for git. // defaultDateFormat is the standard date format for git.
defaultDateFormat = "Mon Jan 02 15:04:05 2006 -0700" defaultDateFormat = "Mon Jan 2 15:04:05 2006 -0700"
// defaultMaxDiffSize is the maximum size for a diff. Larger diffs will be cut off. // defaultMaxDiffSize is the maximum size for a diff. Larger diffs will be cut off.
defaultMaxDiffSize = 2 * 1024 * 1024 * 1024 // 2GB defaultMaxDiffSize = 2 * 1024 * 1024 * 1024 // 2GB
@ -106,11 +106,12 @@ func (d *Diff) finalize() error {
// Commit contains commit header info and diffs. // Commit contains commit header info and diffs.
type Commit struct { type Commit struct {
Hash string Hash string
Author string Author string
Date time.Time Committer string
Message strings.Builder Date time.Time
Size int // in bytes Message strings.Builder
Size int // in bytes
hasDiffs bool hasDiffs bool
} }
@ -131,10 +132,15 @@ const (
CommitLine CommitLine
MergeLine MergeLine
AuthorLine AuthorLine
DateLine AuthorDateLine
CommitterLine
CommitterDateLine
MessageStartLine MessageStartLine
MessageLine MessageLine
MessageEndLine MessageEndLine
NotesStartLine
NotesLine
NotesEndLine
DiffLine DiffLine
ModeLine ModeLine
IndexLine IndexLine
@ -152,10 +158,15 @@ func (state ParseState) String() string {
"CommitLine", "CommitLine",
"MergeLine", "MergeLine",
"AuthorLine", "AuthorLine",
"DateLine", "AuthorDateLine",
"CommitterLine",
"CommitterDateLine",
"MessageStartLine", "MessageStartLine",
"MessageLine", "MessageLine",
"MessageEndLine", "MessageEndLine",
"NotesStartLine",
"NotesLine",
"NotesEndLine",
"DiffLine", "DiffLine",
"ModeLine", "ModeLine",
"IndexLine", "IndexLine",
@ -209,7 +220,15 @@ func NewParser(options ...Option) *Parser {
// RepoPath parses the output of the `git log` command for the `source` path. // RepoPath parses the output of the `git log` command for the `source` path.
// The Diff chan will return diffs in the order they are parsed from the log. // The Diff chan will return diffs in the order they are parsed from the log.
func (c *Parser) RepoPath(ctx context.Context, source string, head string, abbreviatedLog bool, excludedGlobs []string, isBare bool) (chan *Diff, error) { func (c *Parser) RepoPath(ctx context.Context, source string, head string, abbreviatedLog bool, excludedGlobs []string, isBare bool) (chan *Diff, error) {
args := []string{"-C", source, "log", "-p", "--full-history", "--date=format:%a %b %d %H:%M:%S %Y %z"} args := []string{
"-C", source,
"log",
"--patch", // https://git-scm.com/docs/git-log#Documentation/git-log.txt---patch
"--full-history",
"--date=format:%a %b %d %H:%M:%S %Y %z",
"--pretty=fuller", // https://git-scm.com/docs/git-log#_pretty_formats
"--notes", // https://git-scm.com/docs/git-log#Documentation/git-log.txt---notesltrefgt
}
if abbreviatedLog { if abbreviatedLog {
args = append(args, "--diff-filter=AM") args = append(args, "--diff-filter=AM")
} }
@ -373,16 +392,23 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, diffChan chan
latestState = MergeLine latestState = MergeLine
case isAuthorLine(isStaged, latestState, line): case isAuthorLine(isStaged, latestState, line):
latestState = AuthorLine latestState = AuthorLine
currentCommit.Author = strings.TrimRight(string(line[8:]), "\n") currentCommit.Author = strings.TrimSpace(string(line[8:]))
case isAuthorDateLine(isStaged, latestState, line):
latestState = AuthorDateLine
case isDateLine(isStaged, latestState, line): date, err := time.Parse(c.dateFormat, strings.TrimSpace(string(line[12:])))
latestState = DateLine
date, err := time.Parse(c.dateFormat, strings.TrimSpace(string(line[6:])))
if err != nil { if err != nil {
ctx.Logger().V(2).Info("Could not parse date from git stream.", "error", err) ctx.Logger().Error(err, "failed to parse commit date", "commit", currentCommit.Hash, "latestState", latestState.String())
latestState = ParseFailure
continue
} }
currentCommit.Date = date currentCommit.Date = date
case isCommitterLine(isStaged, latestState, line):
latestState = CommitterLine
currentCommit.Committer = strings.TrimSpace(string(line[8:]))
case isCommitterDateLine(isStaged, latestState, line):
latestState = CommitterDateLine
// NoOp
case isMessageStartLine(isStaged, latestState, line): case isMessageStartLine(isStaged, latestState, line):
latestState = MessageStartLine latestState = MessageStartLine
// NoOp // NoOp
@ -393,6 +419,17 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, diffChan chan
case isMessageEndLine(isStaged, latestState, line): case isMessageEndLine(isStaged, latestState, line):
latestState = MessageEndLine latestState = MessageEndLine
// NoOp // NoOp
case isNotesStartLine(isStaged, latestState, line):
latestState = NotesStartLine
currentCommit.Message.WriteString("\n")
currentCommit.Message.Write(line)
case isNotesLine(isStaged, latestState, line):
latestState = NotesLine
currentCommit.Message.Write(line[4:]) // Notes are indented by 4 spaces.
case isNotesEndLine(isStaged, latestState, line):
latestState = NotesEndLine
// NoOp
case isDiffLine(isStaged, latestState, line): case isDiffLine(isStaged, latestState, line):
latestState = DiffLine latestState = DiffLine
@ -577,20 +614,42 @@ func isAuthorLine(isStaged bool, latestState ParseState, line []byte) bool {
return false return false
} }
// Date: Tue Aug 10 15:20:40 2021 +0100 // AuthorDate: Tue Aug 10 15:20:40 2021 +0100
func isDateLine(isStaged bool, latestState ParseState, line []byte) bool { func isAuthorDateLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || latestState != AuthorLine { if isStaged || latestState != AuthorLine {
return false return false
} }
if len(line) > 7 && bytes.Equal(line[:5], []byte("Date:")) { if len(line) > 10 && bytes.Equal(line[:11], []byte("AuthorDate:")) {
return true return true
} }
return false return false
} }
// Line directly after Date with only a newline. // Commit: Bill Rich <bill.rich@trufflesec.com>
func isCommitterLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || latestState != AuthorDateLine {
return false
}
if len(line) > 8 && bytes.Equal(line[:7], []byte("Commit:")) {
return true
}
return false
}
// CommitDate: Wed Apr 17 19:59:28 2024 -0400
func isCommitterDateLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || latestState != CommitterLine {
return false
}
if len(line) > 10 && bytes.Equal(line[:11], []byte("CommitDate:")) {
return true
}
return false
}
// Line directly after CommitterDate with only a newline.
func isMessageStartLine(isStaged bool, latestState ParseState, line []byte) bool { func isMessageStartLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || latestState != DateLine { if isStaged || latestState != CommitterDateLine {
return false return false
} }
// TODO: Improve the implementation of this and isMessageEndLine // TODO: Improve the implementation of this and isMessageEndLine
@ -622,15 +681,51 @@ func isMessageEndLine(isStaged bool, latestState ParseState, line []byte) bool {
return false return false
} }
// `Notes:` or `Notes (context):`
// See https://tylercipriani.com/blog/2022/11/19/git-notes-gits-coolest-most-unloved-feature/
func isNotesStartLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || latestState != MessageEndLine {
return false
}
if len(line) > 5 && bytes.Equal(line[:5], []byte("Notes")) {
return true
}
return false
}
// Line after NotesStartLine that starts with 4 spaces
func isNotesLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || !(latestState == NotesStartLine || latestState == NotesLine) {
return false
}
if len(line) > 4 && bytes.Equal(line[:4], []byte(" ")) {
return true
}
return false
}
// Line directly after NotesLine with only a newline.
func isNotesEndLine(isStaged bool, latestState ParseState, line []byte) bool {
if isStaged || latestState != NotesLine {
return false
}
if len(strings.TrimRight(string(line[:]), "\r\n")) == 0 {
return true
}
return false
}
// diff --git a/internal/addrs/move_endpoint_module.go b/internal/addrs/move_endpoint_module.go // diff --git a/internal/addrs/move_endpoint_module.go b/internal/addrs/move_endpoint_module.go
func isDiffLine(isStaged bool, latestState ParseState, line []byte) bool { func isDiffLine(isStaged bool, latestState ParseState, line []byte) bool {
if !(latestState == MessageStartLine || // Empty commit messages can go from MessageStart->Diff if !(latestState == MessageStartLine || // Empty commit messages can go from MessageStart->Diff
latestState == MessageEndLine || latestState == MessageEndLine ||
latestState == NotesEndLine ||
latestState == BinaryFileLine || latestState == BinaryFileLine ||
latestState == ModeLine ||
latestState == IndexLine || latestState == IndexLine ||
latestState == HunkContentLine || latestState == HunkContentLine ||
latestState == ParseFailure) { latestState == ParseFailure) {
if latestState == Initial && !isStaged { if !(isStaged && latestState == Initial) {
return false return false
} }
} }

512
pkg/gitparse/gitparse_test.go
View file

@ -78,7 +78,7 @@ func TestLineChecksWithStaged(t *testing.T) {
}, },
fails: []testCaseLine{ fails: []testCaseLine{
{ {
DateLine, CommitterDateLine,
[]byte(" Merge pull request #34511 from cescoffier/duplicated-context-doc"), []byte(" Merge pull request #34511 from cescoffier/duplicated-context-doc"),
}, },
{ {
@ -111,16 +111,16 @@ func TestLineChecksWithStaged(t *testing.T) {
}, },
function: isAuthorLine, function: isAuthorLine,
}, },
"dateLine": { "authorDateLine": {
passes: []testCaseLine{ passes: []testCaseLine{
{ {
AuthorLine, AuthorLine,
[]byte("Date: Tue Jan 18 16:59:18 2022 -0800"), []byte("AuthorDate: Tue Jan 18 16:59:18 2022 -0800"),
}, },
}, },
fails: []testCaseLine{ fails: []testCaseLine{
{ {
DateLine, AuthorDateLine,
[]byte(""), []byte(""),
}, },
{ {
@ -128,12 +128,54 @@ func TestLineChecksWithStaged(t *testing.T) {
[]byte("notcorrect"), []byte("notcorrect"),
}, },
}, },
function: isDateLine, function: isAuthorDateLine,
},
"committerLine": {
passes: []testCaseLine{
{
AuthorDateLine,
[]byte("Commit: Zachary Rice <zachary.rice@trufflesec.com>"),
},
{
AuthorDateLine,
[]byte("Commit: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>"),
},
},
fails: []testCaseLine{
{
CommitLine,
[]byte("Date: Tue Jun 20 13:55:31 2023 -0500"),
},
{
AuthorLine,
[]byte("Author: Bill Rich <bill.rich@trufflesec.com>"),
},
},
function: isCommitterLine,
},
"committerDateLine": {
passes: []testCaseLine{
{
CommitterLine,
[]byte("CommitDate: Tue Jan 18 16:59:18 2022 -0800"),
},
},
fails: []testCaseLine{
{
CommitterDateLine,
[]byte(""),
},
{
CommitterLine,
[]byte("notcorrect"),
},
},
function: isCommitterDateLine,
}, },
"messageStartLine": { "messageStartLine": {
passes: []testCaseLine{ passes: []testCaseLine{
{ {
DateLine, CommitterDateLine,
[]byte(""), []byte(""),
}, },
}, },
@ -143,7 +185,7 @@ func TestLineChecksWithStaged(t *testing.T) {
[]byte("Date: Tue Jun 20 13:21:19 2023 -0700"), []byte("Date: Tue Jun 20 13:21:19 2023 -0700"),
}, },
{ {
DateLine, CommitterDateLine,
[]byte("notcorrect"), []byte("notcorrect"),
}, },
}, },
@ -166,7 +208,7 @@ func TestLineChecksWithStaged(t *testing.T) {
[]byte("Date: Tue Jun 20 13:21:19 2023 -0700"), []byte("Date: Tue Jun 20 13:21:19 2023 -0700"),
}, },
{ {
DateLine, CommitterDateLine,
[]byte("notcorrect"), []byte("notcorrect"),
}, },
}, },
@ -191,6 +233,67 @@ func TestLineChecksWithStaged(t *testing.T) {
}, },
function: isMessageEndLine, function: isMessageEndLine,
}, },
"notesStartLine": {
passes: []testCaseLine{
{
MessageEndLine,
[]byte("Notes:"),
},
{
MessageEndLine,
[]byte("Notes (review):"),
},
},
fails: []testCaseLine{
{
MessageStartLine,
[]byte(""),
},
{
MessageEndLine,
[]byte("notcorrect"),
},
},
function: isNotesStartLine,
},
"notesLine": {
passes: []testCaseLine{
{
NotesStartLine,
[]byte(" Submitted-by: Random J Developer <random@developer.example.org>"),
},
},
fails: []testCaseLine{
{
MessageEndLine,
[]byte(""),
},
{
MessageEndLine,
[]byte("notcorrect"),
},
},
function: isNotesLine,
},
"notesEndLine": {
passes: []testCaseLine{
{
NotesLine,
[]byte("\n"),
},
},
fails: []testCaseLine{
{
MessageEndLine,
[]byte("\n"),
},
{
NotesLine,
[]byte("notcorrect"),
},
},
function: isNotesEndLine,
},
"diffLine": { "diffLine": {
passes: []testCaseLine{ passes: []testCaseLine{
{ {
@ -201,6 +304,10 @@ func TestLineChecksWithStaged(t *testing.T) {
MessageEndLine, MessageEndLine,
[]byte("diff --git a/ Lunch and Learn - HCDiag.pdf b/ Lunch and Learn - HCDiag.pdf"), []byte("diff --git a/ Lunch and Learn - HCDiag.pdf b/ Lunch and Learn - HCDiag.pdf"),
}, },
{
NotesEndLine,
[]byte("diff --git \"a/one.txt\" \"b/one.txt\""),
},
{ {
BinaryFileLine, BinaryFileLine,
[]byte("diff --git a/pkg/decoders/utf16_test.go b/pkg/decoders/utf16_test.go"), []byte("diff --git a/pkg/decoders/utf16_test.go b/pkg/decoders/utf16_test.go"),
@ -209,16 +316,24 @@ func TestLineChecksWithStaged(t *testing.T) {
HunkContentLine, HunkContentLine,
[]byte("diff --git a/pkg/decoders/utf8.go b/pkg/decoders/utf8.go"), []byte("diff --git a/pkg/decoders/utf8.go b/pkg/decoders/utf8.go"),
}, },
{
ModeLine,
[]byte("diff --git a/pkg/decoders/utf8.go b/pkg/decoders/utf8.go"),
},
}, },
fails: []testCaseLine{ fails: []testCaseLine{
{ {
DateLine, CommitterDateLine,
[]byte(" Make trace error message so newlines aren't escaped (#1396)"), []byte(" Make trace error message so newlines aren't escaped (#1396)"),
}, },
{ {
MessageLine, MessageLine,
[]byte("notcorrect"), []byte("notcorrect"),
}, },
{
NotesLine,
[]byte("diff --git a/pkg/decoders/utf8.go b/pkg/decoders/utf8.go"),
},
}, },
function: isDiffLine, function: isDiffLine,
}, },
@ -928,30 +1043,33 @@ func TestCommitParseFailureRecovery(t *testing.T) {
PathB: ".travis.yml", PathB: ".travis.yml",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27", Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <stephen@egroat.com>", Author: "Stephen <stephen@egroat.com>",
Date: newTime("Wed Dec 06 14:44:41 2017 -0800"), Committer: "Stephen <stephen@egroat.com>",
Message: newStringBuilderValue("Add travis testing\n"), Date: newTime("Wed Dec 06 14:44:41 2017 -0800"),
Message: newStringBuilderValue("Add travis testing\n"),
}, },
contentWriter: newBufferWithContent([]byte("language: python\npython:\n - \"2.6\"\n - \"2.7\"\n - \"3.2\"\n - \"3.3\"\n - \"3.4\"\n - \"3.5\"\n - \"3.5-dev\" # 3.5 development branch\n - \"3.6\"\n - \"3.6-dev\" # 3.6 development branch\n - \"3.7-dev\" # 3.7 development branch\n - \"nightly\"\n")), contentWriter: newBufferWithContent([]byte("language: python\npython:\n - \"2.6\"\n - \"2.7\"\n - \"3.2\"\n - \"3.3\"\n - \"3.4\"\n - \"3.5\"\n - \"3.5-dev\" # 3.5 development branch\n - \"3.6\"\n - \"3.6-dev\" # 3.6 development branch\n - \"3.7-dev\" # 3.7 development branch\n - \"nightly\"\n")),
IsBinary: false, IsBinary: false,
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35", Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:03:54 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: strings.Builder{}, Date: newTime("Tue Jul 11 18:03:54 2023 -0400"),
Message: strings.Builder{},
}, },
}, },
{ {
PathB: "tzu", PathB: "tzu",
LineStart: 11, LineStart: 11,
Commit: &Commit{ Commit: &Commit{
Hash: "7bd16429f1f708746dabf970e54b05d2b4734997", Hash: "7bd16429f1f708746dabf970e54b05d2b4734997",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:10:49 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Change file\n"), Date: newTime("Tue Jul 11 18:10:49 2023 -0400"),
Message: newStringBuilderValue("Change file\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")), contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false, IsBinary: false,
@ -979,30 +1097,33 @@ func TestCommitParseFailureRecoveryBufferedFileWriter(t *testing.T) {
PathB: ".travis.yml", PathB: ".travis.yml",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27", Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <stephen@egroat.com>", Author: "Stephen <stephen@egroat.com>",
Date: newTime("Wed Dec 06 14:44:41 2017 -0800"), Committer: "Stephen <stephen@egroat.com>",
Message: newStringBuilderValue("Add travis testing\n"), Date: newTime("Wed Dec 06 14:44:41 2017 -0800"),
Message: newStringBuilderValue("Add travis testing\n"),
}, },
contentWriter: newBufferedFileWriterWithContent([]byte("language: python\npython:\n - \"2.6\"\n - \"2.7\"\n - \"3.2\"\n - \"3.3\"\n - \"3.4\"\n - \"3.5\"\n - \"3.5-dev\" # 3.5 development branch\n - \"3.6\"\n - \"3.6-dev\" # 3.6 development branch\n - \"3.7-dev\" # 3.7 development branch\n - \"nightly\"\n")), contentWriter: newBufferedFileWriterWithContent([]byte("language: python\npython:\n - \"2.6\"\n - \"2.7\"\n - \"3.2\"\n - \"3.3\"\n - \"3.4\"\n - \"3.5\"\n - \"3.5-dev\" # 3.5 development branch\n - \"3.6\"\n - \"3.6-dev\" # 3.6 development branch\n - \"3.7-dev\" # 3.7 development branch\n - \"nightly\"\n")),
IsBinary: false, IsBinary: false,
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35", Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:03:54 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: strings.Builder{}, Date: newTime("Tue Jul 11 18:03:54 2023 -0400"),
Message: strings.Builder{},
}, },
}, },
{ {
PathB: "tzu", PathB: "tzu",
LineStart: 11, LineStart: 11,
Commit: &Commit{ Commit: &Commit{
Hash: "7bd16429f1f708746dabf970e54b05d2b4734997", Hash: "7bd16429f1f708746dabf970e54b05d2b4734997",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:10:49 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Change file\n"), Date: newTime("Tue Jul 11 18:10:49 2023 -0400"),
Message: newStringBuilderValue("Change file\n"),
}, },
contentWriter: newBufferedFileWriterWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")), contentWriter: newBufferedFileWriterWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false, IsBinary: false,
@ -1031,7 +1152,9 @@ func TestCommitParseFailureRecoveryBufferedFileWriter(t *testing.T) {
const recoverableCommits = `commit df393b4125c2aa217211b2429b8963d0cefcee27 const recoverableCommits = `commit df393b4125c2aa217211b2429b8963d0cefcee27
Author: Stephen <stephen@egroat.com> Author: Stephen <stephen@egroat.com>
Date: Wed Dec 06 14:44:41 2017 -0800 AuthorDate: Wed Dec 06 14:44:41 2017 -0800
Commit: Stephen <stephen@egroat.com>
CommitDate: Wed Dec 06 14:44:41 2017 -0800
Add travis testing Add travis testing
@ -1071,7 +1194,9 @@ index 00000000..e69de29b
commit 3d76a97faad96e0f326afb61c232b9c2a18dca35 (HEAD -> master) commit 3d76a97faad96e0f326afb61c232b9c2a18dca35 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:03:54 2023 -0400 AuthorDate: Tue Jul 11 18:03:54 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:03:54 2023 -0400
diff --git a/sample.txt b/sample.txt diff --git a/sample.txt b/sample.txt
new file mode 100644 new file mode 100644
@ -1083,7 +1208,9 @@ index 0000000..af5626b
commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master) commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:10:49 2023 -0400 AuthorDate: Tue Jul 11 18:10:49 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:10:49 2023 -0400
Change file Change file
@ -1357,7 +1484,9 @@ func TestMaxCommitSize(t *testing.T) {
const commitLog = `commit e50b135fd29e91b2fbb25923797f5ecffe59f359 const commitLog = `commit e50b135fd29e91b2fbb25923797f5ecffe59f359
Author: lionzxy <nikita@kulikof.ru> Author: lionzxy <nikita@kulikof.ru>
Date: Wed Mar 1 18:20:04 2017 +0300 AuthorDate: Wed Mar 1 18:20:04 2017 +0300
Commit: lionzxy <nikita@kulikof.ru>
CommitDate: Wed Mar 1 18:20:04 2017 +0300
Все работает, но он не принимает :( Все работает, но он не принимает :(
@ -1379,10 +1508,15 @@ index 85bfb17..89b08b5 100644
commit fd6e99e7a80199b76a694603be57c5ade1de18e7 commit fd6e99e7a80199b76a694603be57c5ade1de18e7
Author: Jaliborc <jaliborc@gmail.com> Author: Jaliborc <jaliborc@gmail.com>
Date: Mon Apr 25 16:28:06 2011 +0100 AuthorDate: Mon Apr 25 16:28:06 2011 +0100
Commit: Jaliborc <jaliborc@gmail.com>
CommitDate: Mon Apr 25 16:28:06 2011 +0100
Added Unusable coloring Added Unusable coloring
Notes:
Message-Id: <1264640755-22447-1-git-send-email-user@example.de>
diff --git a/components/item.lua b/components/item.lua diff --git a/components/item.lua b/components/item.lua
index fc74534..f8d7d50 100755 index fc74534..f8d7d50 100755
--- a/components/item.lua --- a/components/item.lua
@ -1417,17 +1551,23 @@ new file mode 160000
commit 4727ffb7ad6dc5130bf4b4dd166e00705abdd018 (HEAD -> master) commit 4727ffb7ad6dc5130bf4b4dd166e00705abdd018 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 22:26:11 2023 -0400 AuthorDate: Tue Jul 11 22:26:11 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 22:26:11 2023 -0400
commit c904e0f5cd9f30ae520c66bd5f70806219fe7ca2 (HEAD -> master) commit c904e0f5cd9f30ae520c66bd5f70806219fe7ca2 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Mon Jul 10 10:17:11 2023 -0400 AuthorDate: Mon Jul 10 10:17:11 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Mon Jul 10 10:17:11 2023 -0400
Empty Commit Empty Commit
commit 3d76a97faad96e0f326afb61c232b9c2a18dca35 (HEAD -> master) commit 3d76a97faad96e0f326afb61c232b9c2a18dca35 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:03:54 2023 -0400 AuthorDate: Tue Jul 11 18:03:54 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:03:54 2023 -0400
diff --git a/sample.txt b/sample.txt diff --git a/sample.txt b/sample.txt
new file mode 100644 new file mode 100644
@ -1439,7 +1579,9 @@ index 0000000..af5626b
commit df393b4125c2aa217211b2429b8963d0cefcee27 commit df393b4125c2aa217211b2429b8963d0cefcee27
Author: Stephen <stephen@egroat.com> Author: Stephen <stephen@egroat.com>
Date: Wed Dec 06 14:44:41 2017 -0800 AuthorDate: Wed Dec 06 14:44:41 2017 -0800
Commit: Stephen <stephen@egroat.com>
CommitDate: Wed Dec 06 14:44:41 2017 -0800
Add travis testing Add travis testing
@ -1479,7 +1621,9 @@ index 00000000..e69de29b
commit 4218c39d99b5f30153f62471c1be1c1596f0a4d4 commit 4218c39d99b5f30153f62471c1be1c1596f0a4d4
Author: Dustin Decker <dustin@trufflesec.com> Author: Dustin Decker <dustin@trufflesec.com>
Date: Thu Jan 13 12:02:24 2022 -0800 AuthorDate: Thu Jan 13 12:02:24 2022 -0800
Commit: Dustin Decker <dustin@trufflesec.com>
CommitDate: Thu Jan 13 12:02:24 2022 -0800
Initial CLI w/ partially implemented Git source and demo detector (#1) Initial CLI w/ partially implemented Git source and demo detector (#1)
@ -1535,7 +1679,9 @@ index 00000000..7fb2f73c
commit 934cf5d255fd8e28b33f5a6ba64276caf0b284bf (HEAD -> master) commit 934cf5d255fd8e28b33f5a6ba64276caf0b284bf (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:43:22 2023 -0400 AuthorDate: Tue Jul 11 18:43:22 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:43:22 2023 -0400
Test toFile/plusLine parsing Test toFile/plusLine parsing
@ -1551,7 +1697,9 @@ index 0000000..451be67
commit 2a5d703b02b52d65c65ee9f7928f158b919ab741 commit 2a5d703b02b52d65c65ee9f7928f158b919ab741
Author: Sergey Beryozkin <sberyozkin@gmail.com> Author: Sergey Beryozkin <sberyozkin@gmail.com>
Date: Fri Jul 7 17:44:26 2023 +0100 AuthorDate: Fri Jul 7 17:44:26 2023 +0100
Commit: Sergey Beryozkin <sberyozkin@gmail.com>
CommitDate: Fri Jul 7 17:44:26 2023 +0100
Do not refresh OIDC session if the user is requesting logout Do not refresh OIDC session if the user is requesting logout
@ -1659,7 +1807,9 @@ index 51e1b9a932d..472c2743bc4 100644
commit 2a057632d7f5fa3d1c77b9aa037263211c0e0290 commit 2a057632d7f5fa3d1c77b9aa037263211c0e0290
Author: rjtmahinay <rjt.mahinay@gmail.com> Author: rjtmahinay <rjt.mahinay@gmail.com>
Date: Mon Jul 10 01:22:32 2023 +0800 AuthorDate: Mon Jul 10 01:22:32 2023 +0800
Commit: rjtmahinay <rjt.mahinay@gmail.com>
CommitDate: Mon Jul 10 01:22:32 2023 +0800
Add QuarkusApplication javadoc Add QuarkusApplication javadoc
@ -1677,7 +1827,9 @@ index 350685123d5..87d2220eb98 100644
commit bca2d17491015ea1522f34517223b5a366aea73c (HEAD -> master) commit bca2d17491015ea1522f34517223b5a366aea73c (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:12:21 2023 -0400 AuthorDate: Tue Jul 11 18:12:21 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:12:21 2023 -0400
Delete binary file Delete binary file
@ -1688,7 +1840,9 @@ Binary files a/trufflehog_3.42.0_linux_arm64.tar.gz and /dev/null differ
commit afc6dc5d47f28366638da877ecb6b819c69e659b commit afc6dc5d47f28366638da877ecb6b819c69e659b
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Mon Jul 10 12:21:33 2023 -0400 AuthorDate: Mon Jul 10 12:21:33 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Mon Jul 10 12:21:33 2023 -0400
Change binary file Change binary file
@ -1698,7 +1852,9 @@ Binary files a/trufflehog_3.42.0_linux_arm64.tar.gz and b/trufflehog_3.42.0_linu
commit 638595917417c5c8a956937b28c5127719023363 commit 638595917417c5c8a956937b28c5127719023363
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Mon Jul 10 12:20:35 2023 -0400 AuthorDate: Mon Jul 10 12:20:35 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Mon Jul 10 12:20:35 2023 -0400
Add binary file Add binary file
@ -1709,7 +1865,9 @@ Binary files /dev/null and b/trufflehog_3.42.0_linux_arm64.tar.gz differ
commit ce0f5d1fe0272f180ccb660196f439c0c2f4ec8e (HEAD -> master) commit ce0f5d1fe0272f180ccb660196f439c0c2f4ec8e (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:08:52 2023 -0400 AuthorDate: Tue Jul 11 18:08:52 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:08:52 2023 -0400
Delete file Delete file
@ -1733,7 +1891,9 @@ index 635ef2c..0000000
commit d606a729383371558473b70a6a7b1ca264b0d205 commit d606a729383371558473b70a6a7b1ca264b0d205
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Mon Jul 10 14:17:04 2023 -0400 AuthorDate: Mon Jul 10 14:17:04 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Mon Jul 10 14:17:04 2023 -0400
Rename file Rename file
@ -1744,7 +1904,9 @@ rename to tzu.txt
commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master) commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Tue Jul 11 18:10:49 2023 -0400 AuthorDate: Tue Jul 11 18:10:49 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Tue Jul 11 18:10:49 2023 -0400
Change file Change file
@ -1761,7 +1923,9 @@ index 5af88a8..c729cdb 100644
commit c7062674c17192caa284615ab2fa9778c6602164 (HEAD -> master) commit c7062674c17192caa284615ab2fa9778c6602164 (HEAD -> master)
Author: John Smith <john.smith@example.com> Author: John Smith <john.smith@example.com>
Date: Mon Jul 10 10:15:18 2023 -0400 AuthorDate: Mon Jul 10 10:15:18 2023 -0400
Commit: John Smith <john.smith@example.com>
CommitDate: Mon Jul 10 10:15:18 2023 -0400
Create files Create files
@ -1821,10 +1985,11 @@ func expectedDiffs() []*Diff {
PathB: "C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml", PathB: "C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml",
LineStart: 29, LineStart: 29,
Commit: &Commit{ Commit: &Commit{
Hash: "e50b135fd29e91b2fbb25923797f5ecffe59f359", Hash: "e50b135fd29e91b2fbb25923797f5ecffe59f359",
Author: "lionzxy <nikita@kulikof.ru>", Author: "lionzxy <nikita@kulikof.ru>",
Date: newTime("Wed Mar 1 18:20:04 2017 +0300"), Committer: "lionzxy <nikita@kulikof.ru>",
Message: newStringBuilderValue("Все работает, но он не принимает :(\n"), Date: newTime("Wed Mar 1 18:20:04 2017 +0300"),
Message: newStringBuilderValue("Все работает, но он не принимает :(\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n\n <state relative-caret-position=\"72\">\n <caret line=\"4\" column=\"0\" lean-forward=\"false\" selection-start-line=\"4\" selection-start-column=\"0\" selection-end-line=\"4\" selection-end-column=\"0\" />\n\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n\n <state relative-caret-position=\"72\">\n <caret line=\"4\" column=\"0\" lean-forward=\"false\" selection-start-line=\"4\" selection-start-column=\"0\" selection-end-line=\"4\" selection-end-column=\"0\" />\n\n\n\n")),
IsBinary: false, IsBinary: false,
@ -1833,10 +1998,11 @@ func expectedDiffs() []*Diff {
PathB: "components/item.lua", PathB: "components/item.lua",
LineStart: 9, LineStart: 9,
Commit: &Commit{ Commit: &Commit{
Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7", Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7",
Author: "Jaliborc <jaliborc@gmail.com>", Author: "Jaliborc <jaliborc@gmail.com>",
Date: newTime("Mon Apr 25 16:28:06 2011 +0100"), Committer: "Jaliborc <jaliborc@gmail.com>",
Message: newStringBuilderValue("Added Unusable coloring\n"), Date: newTime("Mon Apr 25 16:28:06 2011 +0100"),
Message: newStringBuilderValue("Added Unusable coloring\n\nNotes:\nMessage-Id: <1264640755-22447-1-git-send-email-user@example.de>\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\nlocal Unfit = LibStub('Unfit-1.0')\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\nlocal Unfit = LibStub('Unfit-1.0')\n\n\n")),
IsBinary: false, IsBinary: false,
@ -1846,10 +2012,11 @@ func expectedDiffs() []*Diff {
LineStart: 6, LineStart: 6,
contentWriter: newBufferWithContent([]byte("\n\n <Script file=\"libs\\Unfit-1.0\\Unfit-1.0.lua\"/>\n\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n <Script file=\"libs\\Unfit-1.0\\Unfit-1.0.lua\"/>\n\n\n\n")),
Commit: &Commit{ Commit: &Commit{
Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7", Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7",
Author: "Jaliborc <jaliborc@gmail.com>", Author: "Jaliborc <jaliborc@gmail.com>",
Date: newTime("Mon Apr 25 16:28:06 2011 +0100"), Committer: "Jaliborc <jaliborc@gmail.com>",
Message: newStringBuilderValue("Added Unusable coloring\n"), Date: newTime("Mon Apr 25 16:28:06 2011 +0100"),
Message: newStringBuilderValue("Added Unusable coloring\n\nNotes:\nMessage-Id: <1264640755-22447-1-git-send-email-user@example.de>\n"),
}, },
IsBinary: false, IsBinary: false,
}, },
@ -1858,27 +2025,30 @@ func expectedDiffs() []*Diff {
LineStart: 1, LineStart: 1,
contentWriter: newBufferWithContent([]byte("Subproject commit 0000000000000000000000000000000000000000\n")), contentWriter: newBufferWithContent([]byte("Subproject commit 0000000000000000000000000000000000000000\n")),
Commit: &Commit{ Commit: &Commit{
Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7", Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7",
Author: "Jaliborc <jaliborc@gmail.com>", Author: "Jaliborc <jaliborc@gmail.com>",
Date: newTime("Mon Apr 25 16:28:06 2011 +0100"), Committer: "Jaliborc <jaliborc@gmail.com>",
Message: newStringBuilderValue("Added Unusable coloring\n"), Date: newTime("Mon Apr 25 16:28:06 2011 +0100"),
Message: newStringBuilderValue("Added Unusable coloring\n\nNotes:\nMessage-Id: <1264640755-22447-1-git-send-email-user@example.de>\n"),
}, },
IsBinary: false, IsBinary: false,
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "4727ffb7ad6dc5130bf4b4dd166e00705abdd018", Hash: "4727ffb7ad6dc5130bf4b4dd166e00705abdd018",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 22:26:11 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: strings.Builder{}, Date: newTime("Tue Jul 11 22:26:11 2023 -0400"),
Message: strings.Builder{},
}, },
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "c904e0f5cd9f30ae520c66bd5f70806219fe7ca2", Hash: "c904e0f5cd9f30ae520c66bd5f70806219fe7ca2",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Mon Jul 10 10:17:11 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Empty Commit\n"), Date: newTime("Mon Jul 10 10:17:11 2023 -0400"),
Message: newStringBuilderValue("Empty Commit\n"),
}, },
}, },
{ {
@ -1886,10 +2056,11 @@ func expectedDiffs() []*Diff {
LineStart: 1, LineStart: 1,
contentWriter: newBufferWithContent([]byte("Hello, world!\n")), contentWriter: newBufferWithContent([]byte("Hello, world!\n")),
Commit: &Commit{ Commit: &Commit{
Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35", Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:03:54 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: strings.Builder{}, Date: newTime("Tue Jul 11 18:03:54 2023 -0400"),
Message: strings.Builder{},
}, },
IsBinary: false, IsBinary: false,
}, },
@ -1898,10 +2069,11 @@ func expectedDiffs() []*Diff {
LineStart: 1, LineStart: 1,
contentWriter: newBufferWithContent([]byte("\n\n\n**/__pycache__/\n**/*.pyc\n")), contentWriter: newBufferWithContent([]byte("\n\n\n**/__pycache__/\n**/*.pyc\n")),
Commit: &Commit{ Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27", Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <stephen@egroat.com>", Author: "Stephen <stephen@egroat.com>",
Date: newTime("Wed Dec 06 14:44:41 2017 -0800"), Committer: "Stephen <stephen@egroat.com>",
Message: newStringBuilderValue("Add travis testing\n"), Date: newTime("Wed Dec 06 14:44:41 2017 -0800"),
Message: newStringBuilderValue("Add travis testing\n"),
}, },
IsBinary: false, IsBinary: false,
}, },
@ -1909,10 +2081,11 @@ func expectedDiffs() []*Diff {
PathB: ".travis.yml", PathB: ".travis.yml",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27", Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <stephen@egroat.com>", Author: "Stephen <stephen@egroat.com>",
Date: newTime("Wed Dec 06 14:44:41 2017 -0800"), Committer: "Stephen <stephen@egroat.com>",
Message: newStringBuilderValue("Add travis testing\n"), Date: newTime("Wed Dec 06 14:44:41 2017 -0800"),
Message: newStringBuilderValue("Add travis testing\n"),
}, },
contentWriter: newBufferWithContent([]byte(`language: python contentWriter: newBufferWithContent([]byte(`language: python
python: python:
@ -1934,10 +2107,11 @@ python:
PathB: "Makefile", PathB: "Makefile",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "4218c39d99b5f30153f62471c1be1c1596f0a4d4", Hash: "4218c39d99b5f30153f62471c1be1c1596f0a4d4",
Author: "Dustin Decker <dustin@trufflesec.com>", Author: "Dustin Decker <dustin@trufflesec.com>",
Date: newTime("Thu Jan 13 12:02:24 2022 -0800"), Committer: "Dustin Decker <dustin@trufflesec.com>",
Message: newStringBuilderValue("Initial CLI w/ partially implemented Git source and demo detector (#1)\n"), Date: newTime("Thu Jan 13 12:02:24 2022 -0800"),
Message: newStringBuilderValue("Initial CLI w/ partially implemented Git source and demo detector (#1)\n"),
}, },
contentWriter: newBufferWithContent([]byte(`PROTOS_IMAGE=us-docker.pkg.dev/thog-artifacts/public/go-ci-1.17-1 contentWriter: newBufferWithContent([]byte(`PROTOS_IMAGE=us-docker.pkg.dev/thog-artifacts/public/go-ci-1.17-1
@ -1978,10 +2152,11 @@ protos:
PathB: "plusLine.txt", PathB: "plusLine.txt",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "934cf5d255fd8e28b33f5a6ba64276caf0b284bf", Hash: "934cf5d255fd8e28b33f5a6ba64276caf0b284bf",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:43:22 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Test toFile/plusLine parsing\n"), Date: newTime("Tue Jul 11 18:43:22 2023 -0400"),
Message: newStringBuilderValue("Test toFile/plusLine parsing\n"),
}, },
contentWriter: newBufferWithContent([]byte("-- test\n++ test\n\n")), contentWriter: newBufferWithContent([]byte("-- test\n++ test\n\n")),
IsBinary: false, IsBinary: false,
@ -1990,10 +2165,11 @@ protos:
PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java", PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java",
LineStart: 45, LineStart: 45,
Commit: &Commit{ Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741", Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <sberyozkin@gmail.com>", Author: "Sergey Beryozkin <sberyozkin@gmail.com>",
Date: newTime("Fri Jul 7 17:44:26 2023 +0100"), Committer: "Sergey Beryozkin <sberyozkin@gmail.com>",
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"), Date: newTime("Fri Jul 7 17:44:26 2023 +0100"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n public boolean containsTokenVerification(String token) {\n return cacheMap.containsKey(token);\n }\n\n\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n public boolean containsTokenVerification(String token) {\n return cacheMap.containsKey(token);\n }\n\n\n\n\n")),
IsBinary: false, IsBinary: false,
@ -2002,10 +2178,11 @@ protos:
PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java", PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java",
LineStart: 1023, LineStart: 1023,
Commit: &Commit{ Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741", Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <sberyozkin@gmail.com>", Author: "Sergey Beryozkin <sberyozkin@gmail.com>",
Date: newTime("Fri Jul 7 17:44:26 2023 +0100"), Committer: "Sergey Beryozkin <sberyozkin@gmail.com>",
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"), Date: newTime("Fri Jul 7 17:44:26 2023 +0100"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n private boolean isRpInitiatedLogout(RoutingContext context, TenantConfigContext configContext) {\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n private boolean isRpInitiatedLogout(RoutingContext context, TenantConfigContext configContext) {\n\n\n")),
IsBinary: false, IsBinary: false,
@ -2014,10 +2191,11 @@ protos:
PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java", PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java",
LineStart: 1214, LineStart: 1214,
Commit: &Commit{ Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741", Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <sberyozkin@gmail.com>", Author: "Sergey Beryozkin <sberyozkin@gmail.com>",
Date: newTime("Fri Jul 7 17:44:26 2023 +0100"), Committer: "Sergey Beryozkin <sberyozkin@gmail.com>",
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"), Date: newTime("Fri Jul 7 17:44:26 2023 +0100"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n\n\n private class LogoutCall implements Function<SecurityIdentity, Uni<?>> {\n RoutingContext context;\n TenantConfigContext configContext;\n String idToken;\n\n LogoutCall(RoutingContext context, TenantConfigContext configContext, String idToken) {\n this.context = context;\n this.configContext = configContext;\n this.idToken = idToken;\n }\n\n @Override\n public Uni<Void> apply(SecurityIdentity identity) {\n if (isRpInitiatedLogout(context, configContext)) {\n LOG.debug(\"Performing an RP initiated logout\");\n fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity);\n return buildLogoutRedirectUriUni(context, configContext, idToken);\n }\n if (isBackChannelLogoutPendingAndValid(configContext, identity)\n || isFrontChannelLogoutValid(context, configContext,\n identity)) {\n return removeSessionCookie(context, configContext.oidcConfig)\n .map(new Function<Void, Void>() {\n @Override\n public Void apply(Void t) {\n throw new LogoutException();\n }\n });\n\n }\n return VOID_UNI;\n }\n }\n\n")), contentWriter: newBufferWithContent([]byte("\n\n\n\n private class LogoutCall implements Function<SecurityIdentity, Uni<?>> {\n RoutingContext context;\n TenantConfigContext configContext;\n String idToken;\n\n LogoutCall(RoutingContext context, TenantConfigContext configContext, String idToken) {\n this.context = context;\n this.configContext = configContext;\n this.idToken = idToken;\n }\n\n @Override\n public Uni<Void> apply(SecurityIdentity identity) {\n if (isRpInitiatedLogout(context, configContext)) {\n LOG.debug(\"Performing an RP initiated logout\");\n fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity);\n return buildLogoutRedirectUriUni(context, configContext, idToken);\n }\n if (isBackChannelLogoutPendingAndValid(configContext, identity)\n || isFrontChannelLogoutValid(context, configContext,\n identity)) {\n return removeSessionCookie(context, configContext.oidcConfig)\n .map(new Function<Void, Void>() {\n @Override\n public Void apply(Void t) {\n throw new LogoutException();\n }\n });\n\n }\n return VOID_UNI;\n }\n }\n\n")),
IsBinary: false, IsBinary: false,
@ -2026,10 +2204,11 @@ protos:
PathB: "integration-tests/oidc-wiremock/src/main/resources/application.properties", PathB: "integration-tests/oidc-wiremock/src/main/resources/application.properties",
LineStart: 20, LineStart: 20,
Commit: &Commit{ Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741", Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <sberyozkin@gmail.com>", Author: "Sergey Beryozkin <sberyozkin@gmail.com>",
Date: newTime("Fri Jul 7 17:44:26 2023 +0100"), Committer: "Sergey Beryozkin <sberyozkin@gmail.com>",
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"), Date: newTime("Fri Jul 7 17:44:26 2023 +0100"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n\nquarkus.oidc.code-flow.token.refresh-expired=true\nquarkus.oidc.code-flow.token.refresh-token-time-skew=5M\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n\nquarkus.oidc.code-flow.token.refresh-expired=true\nquarkus.oidc.code-flow.token.refresh-token-time-skew=5M\n\n\n")),
IsBinary: false, IsBinary: false,
@ -2039,10 +2218,11 @@ protos:
PathB: "integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java", PathB: "integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java",
LineStart: 6, LineStart: 6,
Commit: &Commit{ Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741", Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <sberyozkin@gmail.com>", Author: "Sergey Beryozkin <sberyozkin@gmail.com>",
Date: newTime("Fri Jul 7 17:44:26 2023 +0100"), Committer: "Sergey Beryozkin <sberyozkin@gmail.com>",
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"), Date: newTime("Fri Jul 7 17:44:26 2023 +0100"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n\n\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n\n\n\n\n")),
IsBinary: false, IsBinary: false,
@ -2051,10 +2231,11 @@ protos:
PathB: "integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java", PathB: "integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java",
LineStart: 76, LineStart: 76,
Commit: &Commit{ Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741", Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <sberyozkin@gmail.com>", Author: "Sergey Beryozkin <sberyozkin@gmail.com>",
Date: newTime("Fri Jul 7 17:44:26 2023 +0100"), Committer: "Sergey Beryozkin <sberyozkin@gmail.com>",
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"), Date: newTime("Fri Jul 7 17:44:26 2023 +0100"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n // Logout\n\n\n\n")), contentWriter: newBufferWithContent([]byte("\n\n // Logout\n\n\n\n")),
IsBinary: false, IsBinary: false,
@ -2063,29 +2244,32 @@ protos:
PathB: "core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java", PathB: "core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java",
LineStart: 3, LineStart: 3,
Commit: &Commit{ Commit: &Commit{
Hash: "2a057632d7f5fa3d1c77b9aa037263211c0e0290", Hash: "2a057632d7f5fa3d1c77b9aa037263211c0e0290",
Author: "rjtmahinay <rjt.mahinay@gmail.com>", Author: "rjtmahinay <rjt.mahinay@gmail.com>",
Date: newTime("Mon Jul 10 01:22:32 2023 +0800"), Committer: "rjtmahinay <rjt.mahinay@gmail.com>",
Message: newStringBuilderValue("Add QuarkusApplication javadoc\n\n* Fix #34463\n"), Date: newTime("Mon Jul 10 01:22:32 2023 +0800"),
Message: newStringBuilderValue("Add QuarkusApplication javadoc\n\n* Fix #34463\n"),
}, },
contentWriter: newBufferWithContent([]byte("/**\n * This is usually used for command mode applications with a startup logic. The logic is executed inside\n * {@link QuarkusApplication#run} method before the main application exits.\n */\n")), contentWriter: newBufferWithContent([]byte("/**\n * This is usually used for command mode applications with a startup logic. The logic is executed inside\n * {@link QuarkusApplication#run} method before the main application exits.\n */\n")),
IsBinary: false, IsBinary: false,
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "bca2d17491015ea1522f34517223b5a366aea73c", Hash: "bca2d17491015ea1522f34517223b5a366aea73c",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:12:21 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Delete binary file\n"), Date: newTime("Tue Jul 11 18:12:21 2023 -0400"),
Message: newStringBuilderValue("Delete binary file\n"),
}, },
}, },
{ {
PathB: "trufflehog_3.42.0_linux_arm64.tar.gz", PathB: "trufflehog_3.42.0_linux_arm64.tar.gz",
Commit: &Commit{ Commit: &Commit{
Hash: "afc6dc5d47f28366638da877ecb6b819c69e659b", Hash: "afc6dc5d47f28366638da877ecb6b819c69e659b",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Mon Jul 10 12:21:33 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Change binary file\n"), Date: newTime("Mon Jul 10 12:21:33 2023 -0400"),
Message: newStringBuilderValue("Change binary file\n"),
}, },
contentWriter: newBufferWithContent([]byte("")), contentWriter: newBufferWithContent([]byte("")),
IsBinary: true, IsBinary: true,
@ -2093,38 +2277,42 @@ protos:
{ {
PathB: "trufflehog_3.42.0_linux_arm64.tar.gz", PathB: "trufflehog_3.42.0_linux_arm64.tar.gz",
Commit: &Commit{ Commit: &Commit{
Hash: "638595917417c5c8a956937b28c5127719023363", Hash: "638595917417c5c8a956937b28c5127719023363",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Mon Jul 10 12:20:35 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Add binary file\n"), Date: newTime("Mon Jul 10 12:20:35 2023 -0400"),
Message: newStringBuilderValue("Add binary file\n"),
}, },
contentWriter: newBufferWithContent([]byte("")), contentWriter: newBufferWithContent([]byte("")),
IsBinary: true, IsBinary: true,
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "ce0f5d1fe0272f180ccb660196f439c0c2f4ec8e", Hash: "ce0f5d1fe0272f180ccb660196f439c0c2f4ec8e",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:08:52 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Delete file\n"), Date: newTime("Tue Jul 11 18:08:52 2023 -0400"),
Message: newStringBuilderValue("Delete file\n"),
}, },
}, },
{ {
Commit: &Commit{ Commit: &Commit{
Hash: "d606a729383371558473b70a6a7b1ca264b0d205", Hash: "d606a729383371558473b70a6a7b1ca264b0d205",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Mon Jul 10 14:17:04 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Rename file\n"), Date: newTime("Mon Jul 10 14:17:04 2023 -0400"),
Message: newStringBuilderValue("Rename file\n"),
}, },
}, },
{ {
PathB: "tzu", PathB: "tzu",
LineStart: 11, LineStart: 11,
Commit: &Commit{ Commit: &Commit{
Hash: "7bd16429f1f708746dabf970e54b05d2b4734997", Hash: "7bd16429f1f708746dabf970e54b05d2b4734997",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Tue Jul 11 18:10:49 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Change file\n"), Date: newTime("Tue Jul 11 18:10:49 2023 -0400"),
Message: newStringBuilderValue("Change file\n"),
}, },
contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")), contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false, IsBinary: false,
@ -2133,10 +2321,11 @@ protos:
PathB: "lao", PathB: "lao",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "c7062674c17192caa284615ab2fa9778c6602164", Hash: "c7062674c17192caa284615ab2fa9778c6602164",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Mon Jul 10 10:15:18 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Create files\n"), Date: newTime("Mon Jul 10 10:15:18 2023 -0400"),
Message: newStringBuilderValue("Create files\n"),
}, },
contentWriter: newBufferWithContent([]byte("The Way that can be told of is not the eternal Way;\nThe name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\nThe Named is the mother of all things.\nTherefore let there always be non-being,\n so we may see their subtlety,\nAnd let there always be being,\n so we may see their outcome.\nThe two are the same,\nBut after they are produced,\n they have different names.\n")), contentWriter: newBufferWithContent([]byte("The Way that can be told of is not the eternal Way;\nThe name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\nThe Named is the mother of all things.\nTherefore let there always be non-being,\n so we may see their subtlety,\nAnd let there always be being,\n so we may see their outcome.\nThe two are the same,\nBut after they are produced,\n they have different names.\n")),
IsBinary: false, IsBinary: false,
@ -2145,10 +2334,11 @@ protos:
PathB: "tzu", PathB: "tzu",
LineStart: 1, LineStart: 1,
Commit: &Commit{ Commit: &Commit{
Hash: "c7062674c17192caa284615ab2fa9778c6602164", Hash: "c7062674c17192caa284615ab2fa9778c6602164",
Author: "John Smith <john.smith@example.com>", Author: "John Smith <john.smith@example.com>",
Date: newTime("Mon Jul 10 10:15:18 2023 -0400"), Committer: "John Smith <john.smith@example.com>",
Message: newStringBuilderValue("Create files\n"), Date: newTime("Mon Jul 10 10:15:18 2023 -0400"),
Message: newStringBuilderValue("Create files\n"),
}, },
contentWriter: newBufferWithContent([]byte("The Nameless is the origin of Heaven and Earth;\nThe named is the mother of all things.\n\nTherefore let there always be non-being,\n so we may see their subtlety,\nAnd let there always be being,\n so we may see their outcome.\nThe two are the same,\nBut after they are produced,\n they have different names.\nThey both may be called deep and profound.\nDeeper and more profound,\nThe door of all subtleties!\n")), contentWriter: newBufferWithContent([]byte("The Nameless is the origin of Heaven and Earth;\nThe named is the mother of all things.\n\nTherefore let there always be non-being,\n so we may see their subtlety,\nAnd let there always be being,\n so we may see their outcome.\nThe two are the same,\nBut after they are produced,\n they have different names.\nThey both may be called deep and profound.\nDeeper and more profound,\nThe door of all subtleties!\n")),
IsBinary: false, IsBinary: false,
@ -2283,7 +2473,9 @@ index 0000000..5af88a8
const singleCommitMultiDiff = `commit 70001020fab32b1fcf2f1f0e5c66424eae649826 (HEAD -> master, origin/master, origin/HEAD) const singleCommitMultiDiff = `commit 70001020fab32b1fcf2f1f0e5c66424eae649826 (HEAD -> master, origin/master, origin/HEAD)
Author: Dustin Decker <humanatcomputer@gmail.com> Author: Dustin Decker <humanatcomputer@gmail.com>
Date: Mon Mar 15 23:27:16 2021 -0700 AuthorDate: Mon Mar 15 23:27:16 2021 -0700
Commit: Dustin Decker <humanatcomputer@gmail.com>
CommitDate: Mon Mar 15 23:27:16 2021 -0700
Update aws Update aws
@ -2324,7 +2516,9 @@ index 239b415..2ee133b 100644
const singleCommitSingleDiff = `commit 70001020fab32b1fcf2f1f0e5c66424eae649826 (HEAD -> master, origin/master, origin/HEAD) const singleCommitSingleDiff = `commit 70001020fab32b1fcf2f1f0e5c66424eae649826 (HEAD -> master, origin/master, origin/HEAD)
Author: Dustin Decker <humanatcomputer@gmail.com> Author: Dustin Decker <humanatcomputer@gmail.com>
Date: Mon Mar 15 23:27:16 2021 -0700 AuthorDate: Mon Mar 15 23:27:16 2021 -0700
Commit: Dustin Decker <humanatcomputer@gmail.com>
CommitDate: Mon Mar 15 23:27:16 2021 -0700
Update aws Update aws

38
pkg/sources/git/git.go
View file

@ -562,29 +562,55 @@ func (s *Git) ScanCommits(ctx context.Context, repo *git.Repository, path string
break break
} }
fullHash := diff.Commit.Hash commit := diff.Commit
fullHash := commit.Hash
if scanOptions.BaseHash != "" && scanOptions.BaseHash == fullHash { if scanOptions.BaseHash != "" && scanOptions.BaseHash == fullHash {
logger.V(1).Info("reached base commit", "commit", fullHash) logger.V(1).Info("reached base commit", "commit", fullHash)
break break
} }
email := commit.Author
when := commit.Date.UTC().Format("2006-01-02 15:04:05 -0700")
if fullHash != lastCommitHash { if fullHash != lastCommitHash {
depth++ depth++
lastCommitHash = fullHash lastCommitHash = fullHash
atomic.AddUint64(&s.metrics.commitsScanned, 1) atomic.AddUint64(&s.metrics.commitsScanned, 1)
logger.V(5).Info("scanning commit", "commit", fullHash) logger.V(5).Info("scanning commit", "commit", fullHash)
}
if !scanOptions.Filter.Pass(diff.PathB) { // Scan the commit metadata.
continue // See https://github.com/trufflesecurity/trufflehog/issues/2683
var (
metadata = s.sourceMetadataFunc("", email, fullHash, when, remoteURL, 0)
sb strings.Builder
)
sb.WriteString(email)
sb.WriteString("\n")
sb.WriteString(commit.Committer)
sb.WriteString("\n")
sb.WriteString(commit.Message.String())
chunk := sources.Chunk{
SourceName: s.sourceName,
SourceID: s.sourceID,
JobID: s.jobID,
SourceType: s.sourceType,
SourceMetadata: metadata,
Data: []byte(sb.String()),
Verify: s.verify,
}
if err := reporter.ChunkOk(ctx, chunk); err != nil {
return err
}
} }
fileName := diff.PathB fileName := diff.PathB
if fileName == "" { if fileName == "" {
continue continue
} }
email := diff.Commit.Author
when := diff.Commit.Date.UTC().Format("2006-01-02 15:04:05 -0700") if !scanOptions.Filter.Pass(fileName) {
continue
}
// Handle binary files by reading the entire file rather than using the diff. // Handle binary files by reading the entire file rather than using the diff.
if diff.IsBinary { if diff.IsBinary {