trufflesecurity/trufflehog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
regexp-backtrack-removal
trufflehog/pkg/gitparse/gitparse_test.go
T
meredith 4b7d1d3a68 Low-memory Git Scanning (#5257) 
* Refactor gitparse for reduced peak memory use

Instead of one single `git log` that grows huge, get a commit list with
"log" then request `git show` groups of those commits.

This is currently slightly slower than main, and parallelizing this part
further doesn't improve things because of the diffChan consumer in the
caller.  It does pipeline just enough that one git show can run while
scanning consumes the prior set of diffs.

* Group commits while reading instead of slurp and split

* Make the low-memory scan mode a non-default option
2026-09-10 12:18:33 -05:00

2599 lines
81 KiB
Go
Raw Permalink Blame History

package gitparse
import (
"bytes"
"path/filepath"
"strings"
"testing"
"time"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/trufflesecurity/trufflehog/v3/pkg/context"
"github.com/trufflesecurity/trufflehog/v3/pkg/process"
bufferwriter "github.com/trufflesecurity/trufflehog/v3/pkg/writers/buffer_writer"
bufferedfilewriter "github.com/trufflesecurity/trufflehog/v3/pkg/writers/buffered_file_writer"
)
func TestPrepGitArgs(t *testing.T) {
t.Setenv("GIT_OBJECT_DIRECTORY", "")
t.Setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", "")
repopath := t.TempDir()
p := Parser{}
args := p.prepGitArgs(repopath, "", false, nil, false)
assert.Equal(t, []string{"-C", repopath}, args.global)
assert.Contains(t, args.log, "--all")
assert.NotContains(t, args.log, "--diff-filter=AM")
assert.Equal(t, []string{"GIT_DIR=" + filepath.Join(repopath, ".git")}, args.env)
assert.Empty(t, args.paths)
args = p.prepGitArgs(repopath, "branchname", true, []string{"some/file.txt", "bloated.dat"}, true)
// head
assert.Contains(t, args.log, "branchname")
assert.NotContains(t, args.log, "--all")
// abbreviatedLog
assert.Contains(t, args.log, "--diff-filter=AM")
assert.Contains(t, args.show, "--diff-filter=AM")
// excludedGlobs
assert.Contains(t, args.paths, "--")
assert.Contains(t, args.paths, ":(exclude)bloated.dat")
// isBare
assert.Equal(t, []string{"GIT_DIR=" + repopath}, args.env)
// test env passthrough used for pre-receive
t.Setenv("GIT_OBJECT_DIRECTORY", "foo")
t.Setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", "bar")
args = p.prepGitArgs(repopath, "", false, nil, true)
assert.Equal(t, []string{
"GIT_DIR=" + repopath,
"GIT_OBJECT_DIRECTORY=foo",
"GIT_ALTERNATE_OBJECT_DIRECTORIES=bar",
}, args.env)
}
type testCaseLine struct {
latestState ParseState
line []byte
}
func TestLineChecksWithStaged(t *testing.T) {
type testCase struct {
passes []testCaseLine
fails []testCaseLine
function func(bool, ParseState, []byte) bool
}
tests := map[string]testCase{
"commitLine": {
passes: []testCaseLine{
{
Initial,
[]byte("commit 15c6105be1a18eeed1247478340dca69d02196ed"),
},
{
ModeLine,
[]byte("commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master)\n"),
},
{
IndexLine,
[]byte("commit 9d60549cea17c830df3f99398993e8f6fd154468"),
},
{
MessageStartLine,
[]byte("commit 4727ffb7ad6dc5130bf4b4dd166e00705abdd018"),
},
{
MessageEndLine,
[]byte("commit 2a057632d7f5fa3d1c77b9aa037263211c0e0290"),
},
{
HunkContentLine,
[]byte("commit b38857edb46bd0e2c86db53615ff469aa7b7966b (HEAD -> feat/git-diff-parse, origin/main, origin/HEAD, main)"),
},
{
BinaryFileLine,
[]byte("commit fb76eaf17b2b923bcc3e59314cf3605bce9a8bcd (tag: v3.40.0)"),
},
},
fails: []testCaseLine{
{
Initial,
[]byte(`fatal: ambiguous argument 'branch_2..branch_1': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'`),
},
{
CommitLine,
[]byte("commit 15c6105be1a18eeed1247478340dca69d02196ed"),
},
},
function: isCommitLine,
},
"mergeLine": {
passes: []testCaseLine{
{
CommitLine,
[]byte("Merge: f21a95535a2 ed08d10bcf5"),
},
},
fails: []testCaseLine{
{
CommitterDateLine,
[]byte(" Merge pull request #34511 from cescoffier/duplicated-context-doc"),
},
{
CommitLine,
[]byte("notcorrect"),
},
},
function: isMergeLine,
},
"authorLine": {
passes: []testCaseLine{
{
CommitLine,
[]byte("Author: Zachary Rice <[email protected]>"),
},
{
CommitLine,
[]byte("Author: 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 <[email protected]>"),
},
},
function: isAuthorLine,
},
"authorDateLine": {
passes: []testCaseLine{
{
AuthorLine,
[]byte("AuthorDate: 2022-01-18T16:59:18-08:00"),
},
},
fails: []testCaseLine{
{
AuthorDateLine,
[]byte(""),
},
{
AuthorLine,
[]byte("notcorrect"),
},
},
function: isAuthorDateLine,
},
"committerLine": {
passes: []testCaseLine{
{
AuthorDateLine,
[]byte("Commit: Zachary Rice <[email protected]>"),
},
{
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 <[email protected]>"),
},
},
function: isCommitterLine,
},
"committerDateLine": {
passes: []testCaseLine{
{
CommitterLine,
[]byte("CommitDate: 2022-01-18T16:59:18-08:00"),
},
},
fails: []testCaseLine{
{
CommitterDateLine,
[]byte(""),
},
{
CommitterLine,
[]byte("notcorrect"),
},
},
function: isCommitterDateLine,
},
"messageStartLine": {
passes: []testCaseLine{
{
CommitterDateLine,
[]byte(""),
},
},
fails: []testCaseLine{
{
AuthorLine,
[]byte("Date: Tue Jun 20 13:21:19 2023 -0700"),
},
{
CommitterDateLine,
[]byte("notcorrect"),
},
},
function: isMessageStartLine,
},
"messageLine": {
passes: []testCaseLine{
{
MessageStartLine,
[]byte(" Initial docs and release automation (#5)"),
},
{
MessageLine,
[]byte(" Bump github.com/googleapis/gax-go/v2 from 2.10.0 to 2.11.0 (#1406)"),
},
},
fails: []testCaseLine{
{
AuthorLine,
[]byte("Date: Tue Jun 20 13:21:19 2023 -0700"),
},
{
CommitterDateLine,
[]byte("notcorrect"),
},
},
function: isMessageLine,
},
"messageEndLine": {
passes: []testCaseLine{
{
MessageLine,
[]byte(""),
},
},
fails: []testCaseLine{
{
MessageStartLine,
[]byte(" Initial commit"),
},
{
MessageLine,
[]byte("notcorrect"),
},
},
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 <[email protected]>"),
},
},
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": {
passes: []testCaseLine{
{
MessageEndLine,
[]byte("diff --git a/pkg/sources/source_unit.go b/pkg/sources/source_unit.go"),
},
{
MessageEndLine,
[]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,
[]byte("diff --git a/pkg/decoders/utf16_test.go b/pkg/decoders/utf16_test.go"),
},
{
HunkContentLine,
[]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{
{
CommitterDateLine,
[]byte(" Make trace error message so newlines aren't escaped (#1396)"),
},
{
MessageLine,
[]byte("notcorrect"),
},
{
NotesLine,
[]byte("diff --git a/pkg/decoders/utf8.go b/pkg/decoders/utf8.go"),
},
},
function: isDiffLine,
},
}
for name, test := range tests {
for _, pass := range test.passes {
if !test.function(false, pass.latestState, pass.line) {
t.Errorf("%s: Parser did not recognize correct line. (%s)", name, string(pass.line))
}
}
for _, fail := range test.fails {
if test.function(false, fail.latestState, fail.line) {
t.Errorf("%s: Parser did not recognize incorrect line. (%s)", name, string(fail.line))
}
}
}
}
func TestLineChecksNoStaged(t *testing.T) {
type testCase struct {
passes []testCaseLine
fails []testCaseLine
function func(ParseState, []byte) bool
}
tests := map[string]testCase{
"modeLine": {
passes: []testCaseLine{
{
DiffLine,
[]byte("old mode 100644"),
},
{
ModeLine,
[]byte("new mode 100755"),
},
{
DiffLine,
[]byte("new file mode 100644"),
},
{
DiffLine,
[]byte("similarity index 100%"),
},
{
ModeLine,
[]byte("rename from old.txt"),
},
{
ModeLine,
[]byte("rename to new.txt"),
},
{
DiffLine,
[]byte("deleted file mode 100644"),
},
},
fails: []testCaseLine{
{
MessageLine,
[]byte("diff --git a/pkg/common/recover.go b/pkg/common/recover.go"),
},
{
DiffLine,
[]byte("notcorrect"),
},
},
function: isModeLine,
},
"indexLine": {
passes: []testCaseLine{
{
DiffLine,
[]byte("index 0a7a5b4..7682212 100644"),
},
{
ModeLine,
[]byte("index 1ed6fbee1..aea1e643a 100644"),
},
{
ModeLine,
[]byte("index 00000000..e69de29b"),
},
},
fails: []testCaseLine{
{
MessageLine,
[]byte("diff --git a/pkg/sources/gitlab/gitlab.go b/pkg/sources/gitlab/gitlab.go"),
},
{
DiffLine,
[]byte("notcorrect"),
},
},
function: isIndexLine,
},
"binaryLine": {
passes: []testCaseLine{
{
IndexLine,
[]byte("Binary files /dev/null and b/plugin.sig differ"),
},
{
IndexLine,
[]byte("Binary files /dev/null and b/ Lunch and Learn - HCDiag.pdf differ"),
},
},
fails: []testCaseLine{
{
DiffLine,
[]byte("index eb54cf4f..00000000"),
},
{
IndexLine,
[]byte("notcorrect"),
},
},
function: isBinaryLine,
},
"fromFileLine": {
passes: []testCaseLine{
{
IndexLine,
[]byte("--- a/internal/addrs/move_endpoint_module.go"),
},
{
IndexLine,
[]byte("--- /dev/null"),
},
// New file (https://github.com/trufflesecurity/trufflehog/issues/2109)
// diff --git a/libs/Unfit-1.0 b/libs/Unfit-1.0
// new file mode 160000
{
ModeLine,
[]byte("--- /dev/null"),
},
// Uncommon but valid prefixes. Will these ever show up?
// https://stackoverflow.com/a/2530012
// https://git-scm.com/docs/git-config#Documentation/git-config.txt-diffmnemonicPrefix
{
IndexLine,
[]byte("--- i/pkg/sources/filesystem/filesystem.go"),
},
{
IndexLine,
[]byte("--- w/pkg/sources/gcs/gcs.go"),
},
{
IndexLine,
[]byte("--- c/pkg/sources/git/git.go"),
},
{
IndexLine,
[]byte("--- o/pkg/sources/github/github.go"),
},
},
fails: []testCaseLine{
{
ModeLine,
[]byte("index 00000000..05370a3c"),
},
{
IndexLine,
[]byte("notcorrect"),
},
},
function: isFromFileLine,
},
"toFileLine": {
passes: []testCaseLine{
{
FromFileLine,
[]byte("+++ a/internal/addrs/move_endpoint_module.go"),
},
{
FromFileLine,
[]byte("+++ /dev/null"),
},
// Uncommon but valid prefixes. Will these ever show up?
// https://stackoverflow.com/a/2530012
// https://git-scm.com/docs/git-config#Documentation/git-config.txt-diffmnemonicPrefix
{
FromFileLine,
[]byte("+++ i/pkg/sources/filesystem/filesystem.go"),
},
{
FromFileLine,
[]byte("+++ w/pkg/sources/gcs/gcs.go"),
},
{
FromFileLine,
[]byte("+++ c/pkg/sources/git/git.go"),
},
{
FromFileLine,
[]byte("+++ o/pkg/sources/github/github.go"),
},
},
fails: []testCaseLine{
{
IndexLine,
[]byte("--- a/pkg/detectors/shortcut/shortcut_test.go"),
},
{
FromFileLine,
[]byte("notcorrect"),
},
{
HunkContentLine,
[]byte("+++ The application will interface with REDACTED and REDACTED (REDACTED team)"),
},
},
function: isToFileLine,
},
"lineNumberLine": {
passes: []testCaseLine{
{
ToFileLine,
[]byte("@@ -298 +298 @@ func maxRetryErrorHandler(resp *http.Response, err error, numTries int)"),
},
{
HunkContentLine,
[]byte("@@ -121 +121 @@ require ("),
},
},
fails: []testCaseLine{
{
FromFileLine,
[]byte("+++ b/Dockerfile"),
},
{
ToFileLine,
[]byte("notcorrect"),
},
},
function: isHunkLineNumberLine,
},
"hunkContextLine": {
passes: []testCaseLine{
{
HunkLineNumberLine,
[]byte(" fmt.Println"),
},
{
HunkContentLine,
[]byte(" ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)"),
},
},
fails: []testCaseLine{
{
ToFileLine,
[]byte("@@ -176 +176 @@ require ("),
},
{
HunkLineNumberLine,
[]byte("+import ("),
},
},
function: isHunkContextLine,
},
"hunkPlusLine": {
passes: []testCaseLine{
{
HunkLineNumberLine,
[]byte("+ github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect"),
},
{
HunkContentLine,
[]byte("+cloud.google.com/go/storage v1.31.0/go.mod h1:81ams1PrhW16L4kF7qg+4mTq7SRs5HsbDTM0bWvrwJ0="),
},
},
fails: []testCaseLine{
{
ToFileLine,
[]byte("@@ -176 +176 @@ require ("),
},
{
HunkLineNumberLine,
[]byte("-import ("),
},
{
HunkLineNumberLine,
[]byte("notcorrect"),
},
},
function: isHunkPlusLine,
},
"hunkMinusLine": {
passes: []testCaseLine{
{
HunkLineNumberLine,
[]byte("-fmt.Println"),
},
{
HunkContentLine,
[]byte(`- return []string{"sql", "database", "Data Source"}`),
},
},
fails: []testCaseLine{
{
ToFileLine,
[]byte("@@ -176 +176 @@ require ("),
},
{
HunkLineNumberLine,
[]byte("+import ("),
},
{
HunkLineNumberLine,
[]byte("notcorrect"),
},
},
function: isHunkMinusLine,
},
"hunkNewlineWarningLine": {
passes: []testCaseLine{
{
HunkContentLine,
[]byte("\\ No newline at end of file"),
},
},
fails: []testCaseLine{
{
ToFileLine,
[]byte("@@ -176 +176 @@ require ("),
},
{
HunkContentLine,
[]byte(" \\ No newline at end of file is the current error"),
},
},
function: isHunkNewlineWarningLine,
},
"hunkEmptyLine": {
passes: []testCaseLine{
{
HunkContentLine,
[]byte("\n"),
},
},
fails: []testCaseLine{
{
HunkLineNumberLine,
[]byte(` return "", errors.WrapPrefix(err, "repo remote cannot be sanitized as URI", 0)`),
},
{
HunkContentLine,
[]byte(" \n"),
},
},
function: isHunkEmptyLine,
},
}
for name, test := range tests {
for _, pass := range test.passes {
if !test.function(pass.latestState, pass.line) {
t.Errorf("%s: Parser did not recognize correct line. (%s)", name, string(pass.line))
}
}
for _, fail := range test.fails {
if test.function(fail.latestState, fail.line) {
t.Errorf("%s: Parser did not recognize incorrect line. (%s)", name, string(fail.line))
}
}
}
}
func TestBinaryPathParse(t *testing.T) {
cases := map[string]string{
"Binary files a/trufflehog_3.42.0_linux_arm64.tar.gz and /dev/null differ\n": "",
"Binary files /dev/null and b/plugin.sig differ\n": "plugin.sig",
"Binary files /dev/null and b/ Lunch and Learn - HCDiag.pdf differ\n": " Lunch and Learn - HCDiag.pdf",
"Binary files /dev/null and \"b/assets/retailers/ON-ikony-Platforma-ecom \\342\\200\\224 kopia.png\" differ\n": "assets/retailers/ON-ikony-Platforma-ecom — kopia.png",
"Binary files /dev/null and \"b/\\346\\267\\261\\345\\272\\246\\345\\255\\246\\344\\271\\240500\\351\\227\\256-Tan-00\\347\\233\\256\\345\\275\\225.docx\" differ\n": "深度学习500问-Tan-00目录.docx",
}
for name, expected := range cases {
filename, ok := pathFromBinaryLine([]byte(name))
if !ok {
t.Errorf("Failed to get path: %s", name)
}
if filename != expected {
t.Errorf("Expected: %s, Got: %s", expected, filename)
}
}
}
func TestToFileLinePathParse(t *testing.T) {
cases := map[string]string{
"+++ /dev/null\n": "",
"+++ b/embeds.xml\t\n": "embeds.xml",
"+++ \"b/C++/1 \\320\\243\\321\\200\\320\\276\\320\\272/B.c\"\t\n": "C++/1 Урок/B.c",
}
for name, expected := range cases {
filename, ok := pathFromToFileLine([]byte(name))
if !ok {
t.Errorf("Failed to get path: %s", name)
}
if filename != expected {
t.Errorf("Expected: %s, Got: %s", expected, filename)
}
}
}
// `asserts` on `Diff`'s _structure_, giving better test output than just comparing two
// diffs.
func assertDiffEqualToExpected(t *testing.T, expected *Diff, actual *Diff) {
// Use `cmp.Diff` to automatically compare all the exported fields. This allows this test to grow automatically if
// new exported fields are added to these structs. However, the most important field we want to test is unexpected
// (i.e. contentWriter) which is where the actual content of the diff is stored. We break this out next.
opts := []cmp.Option{
cmpopts.IgnoreUnexported(Diff{}, Commit{}, strings.Builder{}),
cmpopts.IgnoreFields(Commit{}, "Size"),
}
if diff := cmp.Diff(expected, actual, opts...); diff != "" {
t.Errorf("%s", diff)
}
// Here's where we compare the actual content of the diff. We break that out and test it separately so that we can
// keep this test relatively easy to understand and still get meaningful test output on the diff itself
// If the test author hasn't specified a contentWriter, then we don't want to explode, but we _do_
// want to confirm that the actual diff _also_ is nil there
if expected.contentWriter == nil {
assert.Nil(t, actual.contentWriter)
}
// Check that the content of the diff itself is as expected for non-binary diffs
if expected.contentWriter != nil && !actual.IsBinary {
assert.Equal(t, expected.contentWriter.Len(), actual.contentWriter.Len())
expectedDiffStr, err := expected.contentWriter.String()
require.NoError(t, err)
actualDiffStr, err := actual.contentWriter.String()
assert.NoError(t, err)
assert.Equal(t, expectedDiffStr, actualDiffStr)
}
// TODO - Add test coverage for binary diffs (if it isn't already elsewhere)
}
func TestCommitParsing(t *testing.T) {
// Feels bad to skip tests forever and then just forget about them. Skip for a while.
if time.Now().Before(time.Date(2025, time.July, 1, 0, 0, 0, 0, time.UTC)) {
t.Skip("This is failing intermittently. Skipping for now")
}
expected := expectedDiffs()
beforeProcesses := process.GetGitProcessList()
r := bytes.NewReader([]byte(commitLog))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, false)
}()
i := 0
for diff := range diffChan {
if len(expected) <= i {
t.Errorf("Missing expected case for commit: %+v", diff)
break
}
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
afterProcesses := process.GetGitProcessList()
zombies := process.DetectGitZombies(beforeProcesses, afterProcesses)
if len(zombies) > 0 {
t.Errorf("Detected %d zombie git processes: %v", len(zombies), zombies)
}
}
func newBufferedFileWriterWithContent(content []byte) *bufferedfilewriter.BufferedFileWriter {
b := bufferedfilewriter.New()
_, err := b.Write(content) // Using Write method to add content
if err != nil {
panic(err)
}
return b
}
func newBufferWithContent(content []byte) *bufferwriter.BufferWriter {
b := bufferwriter.New()
_, _ = b.Write(content) // Using Write method to add content
return b
}
func TestStagedDiffParsing(t *testing.T) {
expected := []*Diff{
{
PathB: "aws",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("[default]\naws_access_key_id = AKIAXYZDQCEN4B6JSJQI\naws_secret_access_key = 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\noutput = json\nregion = us-east-2\n")),
IsBinary: false,
},
{
PathB: "aws2",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("\n\nthis is the secret: [Default]\nAccess key Id: AKIAILE3JG6KMS3HZGCA\nSecret Access Key: 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\n\nokay thank you bye\n")),
IsBinary: false,
},
{
PathB: "core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java",
LineStart: 3,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
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,
},
{
PathB: "trufflehog_3.42.0_linux_arm64.tar.gz",
IsBinary: true,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent(nil),
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false,
},
{
PathB: "lao",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
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,
},
{
PathB: "tzu",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
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,
},
}
r := bytes.NewReader([]byte(stagedDiffs))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, true)
}()
i := 0
for diff := range diffChan {
if len(expected) <= i {
t.Errorf("Missing expected case for commit: %+v", diff)
break
}
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
}
func TestStagedDiffParsingBufferedFileWriter(t *testing.T) {
expected := []*Diff{
{
PathB: "aws",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent([]byte("[default]\naws_access_key_id = AKIAXYZDQCEN4B6JSJQI\naws_secret_access_key = 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\noutput = json\nregion = us-east-2\n")),
IsBinary: false,
},
{
PathB: "aws2",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent([]byte("\n\nthis is the secret: [Default]\nAccess key Id: AKIAILE3JG6KMS3HZGCA\nSecret Access Key: 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\n\nokay thank you bye\n")),
IsBinary: false,
},
{
PathB: "core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java",
LineStart: 3,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent([]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,
},
{
PathB: "trufflehog_3.42.0_linux_arm64.tar.gz",
IsBinary: true,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent(nil),
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false,
},
{
PathB: "lao",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent([]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,
},
{
PathB: "tzu",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferedFileWriterWithContent([]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,
},
}
r := bytes.NewReader([]byte(stagedDiffs))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, true)
}()
i := 0
for diff := range diffChan {
if len(expected) <= i {
t.Errorf("Missing expected case for commit: %+v", diff)
break
}
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
}
func TestCommitParseFailureRecovery(t *testing.T) {
expected := []*Diff{
{
PathB: ".travis.yml",
LineStart: 1,
Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <[email protected]>",
Committer: "Stephen <[email protected]>",
Date: newTime("2017-12-06T14:44:41-08:00"),
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")),
IsBinary: false,
},
{
Commit: &Commit{
Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:03:54-04:00"),
Message: strings.Builder{},
},
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "7bd16429f1f708746dabf970e54b05d2b4734997",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:10:49-04:00"),
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")),
IsBinary: false,
},
}
r := bytes.NewReader([]byte(recoverableCommits))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, false)
}()
i := 0
for diff := range diffChan {
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
}
func TestCommitParseFailureRecoveryBufferedFileWriter(t *testing.T) {
expected := []*Diff{
{
PathB: ".travis.yml",
LineStart: 1,
Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <[email protected]>",
Committer: "Stephen <[email protected]>",
Date: newTime("2017-12-06T14:44:41-08:00"),
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")),
IsBinary: false,
},
{
Commit: &Commit{
Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:03:54-04:00"),
Message: strings.Builder{},
},
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "7bd16429f1f708746dabf970e54b05d2b4734997",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:10:49-04:00"),
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")),
IsBinary: false,
},
}
r := bytes.NewReader([]byte(recoverableCommits))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, false)
}()
i := 0
for diff := range diffChan {
if len(expected) <= i {
t.Errorf("Missing expected case for commit: %+v", diff)
break
}
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
}
const recoverableCommits = `commit df393b4125c2aa217211b2429b8963d0cefcee27
Author: Stephen <[email protected]>
AuthorDate: 2017-12-06T14:44:41-08:00
Commit: Stephen <[email protected]>
CommitDate: 2017-12-06T14:44:41-08:00
Add travis testing
diff --git a/.gitignore b/.gitignore
index ede6aa39..bb85dcc3 100644
--- a/.gitignore
+++ b/.gitignore
>>>>ERRANT LINE<<<<
/build/
/dist/
/truffleHog.egg-info/
-*/__pycache__/
+**/__pycache__/
+**/*.pyc
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..33b6f107
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: python
+python:
+ - "2.6"
+ - "2.7"
+ - "3.2"
+ - "3.3"
+ - "3.4"
+ - "3.5"
+ - "3.5-dev" # 3.5 development branch
+ - "3.6"
+ - "3.6-dev" # 3.6 development branch
+ - "3.7-dev" # 3.7 development branch
+ - "nightly"
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..e69de29b
commit 3d76a97faad96e0f326afb61c232b9c2a18dca35 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:03:54-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:03:54-04:00
diff --git a/sample.txt b/sample.txt
new file mode 100644
index 0000000..af5626b
--- /dev/null
+++ b/sample.txt
@@ -0,0 +1 @@
!!!ERROR!!!
commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:10:49-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:10:49-04:00
Change file
diff --git a/tzu b/tzu
index 5af88a8..c729cdb 100644
--- a/tzu
+++ b/tzu
@@ -11,3 +11,5 @@ But after they are produced,
They both may be called deep and profound.
Deeper and more profound,
The door of all subtleties!
+
+Source: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format
`
func TestDiffParseFailureRecovery(t *testing.T) {
expected := []*Diff{
{
PathB: "aws",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("[default]\naws_access_key_id = AKIAXYZDQCEN4B6JSJQI\naws_secret_access_key = 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\noutput = json\nregion = us-east-2\n")),
IsBinary: false,
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false,
},
{
PathB: "tzu",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
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,
},
}
r := bytes.NewReader([]byte(recoverableDiffs))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, true)
}()
i := 0
for diff := range diffChan {
if len(expected) <= i {
t.Errorf("Missing expected case for commit: %+v", diff)
break
}
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
}
func TestDiffParseFailureRecoveryBufferedFileWriter(t *testing.T) {
expected := []*Diff{
{
PathB: "aws",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("[default]\naws_access_key_id = AKIAXYZDQCEN4B6JSJQI\naws_secret_access_key = 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\noutput = json\nregion = us-east-2\n")),
IsBinary: false,
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
contentWriter: newBufferWithContent([]byte("\n\n\n\nSource: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format\n")),
IsBinary: false,
},
{
PathB: "tzu",
LineStart: 1,
Commit: &Commit{
Hash: "",
Author: "",
Date: newTime("0001-01-01 00:00:00 +0000 UTC"),
Message: strings.Builder{},
},
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,
},
}
r := bytes.NewReader([]byte(recoverableDiffs))
diffChan := make(chan *Diff)
parser := NewParser()
go func() {
parser.FromReader(context.Background(), r, diffChan, true)
}()
i := 0
for diff := range diffChan {
if len(expected) <= i {
t.Errorf("Missing expected case for commit: %+v", diff)
break
}
assertDiffEqualToExpected(t, expected[i], diff)
i++
}
}
const recoverableDiffs = `diff --git a/aws b/aws
index 2ee133b..12b4843 100644
--- a/aws
+++ b/aws
@@ -1,7 +1,5 @@
-blah blaj
-
-this is the secret: [Default]
-Access key Id: AKIAILE3JG6KMS3HZGCA
-Secret Access Key: 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
-
-okay thank you bye
+[default]
+aws_access_key_id = AKIAXYZDQCEN4B6JSJQI
+aws_secret_access_key = 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
+output = json
+region = us-east-2
diff --git a/aws2 b/aws2
index 239b415..2ee133b 100644
--- a/aws2
+++ b/aws2
!!!ERROR!!!
blah blaj
-this is the secret: AKIA2E0A8F3B244C9986
+this is the secret: [Default]
+Access key Id: AKIAILE3JG6KMS3HZGCA
+Secret Access Key: 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
-okay thank you bye
\ No newline at end of file
+okay thank you bye
diff --git c/requirements.txt i/requirements.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/tzu b/tzu
index 5af88a8..c729cdb 100644
--- a/tzu
+++ b/tzu
@@ -11,3 +11,5 @@ But after they are produced,
They both may be called deep and profound.
Deeper and more profound,
The door of all subtleties!
+
+Source: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format
diff --git a/lao b/lao
new file mode 100644
!!!ERROR!!!!
--- /dev/null
+++ b/lao
@@ -0,0 +1,11 @@
+The Way that can be told of is not the eternal Way;
+The name that can be named is not the eternal name.
+The Nameless is the origin of Heaven and Earth;
+The Named is the mother of all things.
+Therefore let there always be non-being,
+ so we may see their subtlety,
+And let there always be being,
+ so we may see their outcome.
+The two are the same,
+But after they are produced,
+ they have different names.
diff --git a/tzu b/tzu
new file mode 100644
index 0000000..5af88a8
--- /dev/null
+++ b/tzu
@@ -0,0 +1,13 @@
+The Nameless is the origin of Heaven and Earth;
+The named is the mother of all things.
+
+Therefore let there always be non-being,
+ so we may see their subtlety,
+And let there always be being,
+ so we may see their outcome.
+The two are the same,
+But after they are produced,
+ they have different names.
+They both may be called deep and profound.
+Deeper and more profound,
+The door of all subtleties!
`
func TestMaxDiffSize(t *testing.T) {
parser := NewParser(WithMaxDiffSize(1024 * 1024)) // Setting max diff size to 1MB for the test
builder := strings.Builder{}
builder.WriteString(singleCommitSingleDiff)
// Generate a diff that is larger than the maxDiffSize.
for i := int64(0); i <= parser.maxDiffSize/1024+10; i++ {
builder.WriteString("+" + strings.Repeat("0", 1024) + "\n")
}
bigReader := strings.NewReader(builder.String())
diffChan := make(chan *Diff, 1) // Buffer to prevent blocking
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) // Timeout to prevent long wait
defer cancel()
go func() {
parser.FromReader(ctx, bigReader, diffChan, false)
}()
select {
case diff := <-diffChan:
if int64(diff.Len()) > parser.maxDiffSize+1024 {
t.Errorf("diff did not match MaxDiffSize. Got: %d, expected (max): %d", diff.Len(), parser.maxDiffSize+1024)
}
case <-ctx.Done():
t.Fatal("Test timed out")
}
}
func TestMaxCommitSize(t *testing.T) {
parser := NewParser(WithMaxCommitSize(1))
commitText := bytes.Buffer{}
commitText.WriteString(singleCommitMultiDiff)
diffChan := make(chan *Diff)
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(1)*time.Second)
defer cancel()
go func() {
parser.FromReader(ctx, &commitText, diffChan, false)
}()
diffCount := 0
for range diffChan {
diffCount++
}
if diffCount != 2 {
t.Errorf("Commit count does not match. Got: %d, expected: %d", diffCount, 2)
}
}
func TestWaitDelay(t *testing.T) {
// Test that WithWaitDelay sets the waitDelay correctly
customDelay := 10 * time.Second
parser := NewParser(WithWaitDelay(customDelay))
if parser.waitDelay != customDelay {
t.Errorf("waitDelay not set correctly. Got: %v, expected: %v", parser.waitDelay, customDelay)
}
// Test that default waitDelay is used when not specified
defaultParser := NewParser()
if defaultParser.waitDelay != defaultWaitDelay {
t.Errorf("default waitDelay not set correctly. Got: %v, expected: %v", defaultParser.waitDelay, defaultWaitDelay)
}
// Test that zero value is allowed (caller can set to 0 if they want no delay)
zeroDelayParser := NewParser(WithWaitDelay(0))
if zeroDelayParser.waitDelay != 0 {
t.Errorf("zero waitDelay not set correctly. Got: %v, expected: 0", zeroDelayParser.waitDelay)
}
}
const commitLog = `commit e50b135fd29e91b2fbb25923797f5ecffe59f359
Author: lionzxy <[email protected]>
AuthorDate: 2017-03-01T18:20:04+03:00
Commit: lionzxy <[email protected]>
CommitDate: 2017-03-01T18:20:04+03:00
Все работает, но он не принимает :(
diff --git "a/C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml" "b/C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml"
index 85bfb17..89b08b5 100644
--- "a/C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml"
+++ "b/C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml"
@@ -29,8 +29,8 @@
<file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="72">
+ <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
commit fd6e99e7a80199b76a694603be57c5ade1de18e7
Author: Jaliborc <[email protected]>
AuthorDate: 2011-04-25T16:28:06+01:00
Commit: Jaliborc <[email protected]>
CommitDate: 2011-04-25T16:28:06+01:00
Added Unusable coloring
Notes:
Message-Id: <[email protected]>
diff --git a/components/item.lua b/components/item.lua
index fc74534..f8d7d50 100755
--- a/components/item.lua
+++ b/components/item.lua
@@ -9,6 +9,7 @@ ItemSlot:Hide()
Bagnon.ItemSlot = ItemSlot
local ItemSearch = LibStub('LibItemSearch-1.0')
+local Unfit = LibStub('Unfit-1.0')
local function hasBlizzQuestHighlight()
return GetContainerItemQuestInfo and true or false
diff --git a/embeds.xml b/embeds.xml
index d3f4e7c..0c2df69 100755
--- a/embeds.xml
+++ b/embeds.xml
@@ -6,6 +6,7 @@
<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
<Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
+ <Script file="libs\Unfit-1.0\Unfit-1.0.lua"/>
<Script file="libs\LibDataBroker-1.1.lua"/>
<Script file="libs\LibItemSearch-1.0\LibItemSearch-1.0.lua"/>
</Ui>
\ No newline at end of file
diff --git a/libs/Unfit-1.0 b/libs/Unfit-1.0
new file mode 160000
--- /dev/null
+++ b/libs/Unfit-1.0
@@ -0,0 +1 @@
+Subproject commit 0000000000000000000000000000000000000000
commit 4727ffb7ad6dc5130bf4b4dd166e00705abdd018 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T22:26:11-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T22:26:11-04:00
commit c904e0f5cd9f30ae520c66bd5f70806219fe7ca2 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-10T10:17:11-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-10T10:17:11-04:00
Empty Commit
commit 3d76a97faad96e0f326afb61c232b9c2a18dca35 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:03:54-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:03:54-04:00
diff --git a/sample.txt b/sample.txt
new file mode 100644
index 0000000..af5626b
--- /dev/null
+++ b/sample.txt
@@ -0,0 +1 @@
+Hello, world!
commit df393b4125c2aa217211b2429b8963d0cefcee27
Author: Stephen <[email protected]>
AuthorDate: 2017-12-06T14:44:41-08:00
Commit: Stephen <[email protected]>
CommitDate: 2017-12-06T14:44:41-08:00
Add travis testing
diff --git a/.gitignore b/.gitignore
index ede6aa39..bb85dcc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/build/
/dist/
/truffleHog.egg-info/
-*/__pycache__/
+**/__pycache__/
+**/*.pyc
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..33b6f107
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: python
+python:
+ - "2.6"
+ - "2.7"
+ - "3.2"
+ - "3.3"
+ - "3.4"
+ - "3.5"
+ - "3.5-dev" # 3.5 development branch
+ - "3.6"
+ - "3.6-dev" # 3.6 development branch
+ - "3.7-dev" # 3.7 development branch
+ - "nightly"
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..e69de29b
commit 4218c39d99b5f30153f62471c1be1c1596f0a4d4
Author: Dustin Decker <[email protected]>
AuthorDate: 2022-01-13T12:02:24-08:00
Commit: Dustin Decker <[email protected]>
CommitDate: 2022-01-13T12:02:24-08:00
Initial CLI w/ partially implemented Git source and demo detector (#1)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..e69de29b
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..453cf52c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,32 @@
+PROTOS_IMAGE=us-docker.pkg.dev/thog-artifacts/public/go-ci-1.17-1
+
+.PHONY: check
+.PHONY: test
+.PHONY: test-race
+.PHONY: run
+.PHONY: install
+.PHONY: protos
+.PHONY: protos-windows
+.PHONY: vendor
+
+install:
+ CGO_ENABLED=0 go install .
+
+check:
+ go fmt $(shell go list ./... | grep -v /vendor/)
+ go vet $(shell go list ./... | grep -v /vendor/)
+
+test:
+ CGO_ENABLED=0 go test $(shell go list ./... | grep -v /vendor/)
+
+test-race:
+ CGO_ENABLED=1 go test -race $(shell go list ./... | grep -v /vendor/)
+
+bench:
+ CGO_ENABLED=0 go test $(shell go list ./pkg/secrets/... | grep -v /vendor/) -benchmem -run=xxx -bench .
+
+run:
+ CGO_ENABLED=0 go run . git file://.
+
+protos:
+ docker run -u "$(shell id -u)" -v "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))":/pwd "${PROTOS_IMAGE}" bash -c "cd /pwd; /pwd/scripts/gen_proto.sh"
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/go.mod b/go.mod
new file mode 100644
index 00000000..7fb2f73c
--- /dev/null
+++ b/go.mod
commit 934cf5d255fd8e28b33f5a6ba64276caf0b284bf (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:43:22-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:43:22-04:00
Test toFile/plusLine parsing
diff --git a/plusLine.txt b/plusLine.txt
new file mode 100644
index 0000000..451be67
--- /dev/null
+++ b/plusLine.txt
@@ -0,0 +1,3 @@
+-- test
+++ test
+
commit 2a5d703b02b52d65c65ee9f7928f158b919ab741
Author: Sergey Beryozkin <[email protected]>
AuthorDate: 2023-07-07T17:44:26+01:00
Commit: Sergey Beryozkin <[email protected]>
CommitDate: 2023-07-07T17:44:26+01:00
Do not refresh OIDC session if the user is requesting logout
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java
index 096f5b4b092..4150096851c 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java
@@ -45,6 +45,10 @@ public TokenVerificationResult removeTokenVerification(String token) {
return entry == null ? null : entry.result;
}
+ public boolean containsTokenVerification(String token) {
+ return cacheMap.containsKey(token);
+ }
+
public void clearCache() {
cacheMap.clear();
size.set(0);
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
index a9a9699eecd..435cefdf313 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
@@ -1014,7 +1023,7 @@ private String buildUri(RoutingContext context, boolean forceHttps, String autho
.toString();
}
- private boolean isLogout(RoutingContext context, TenantConfigContext configContext) {
+ private boolean isRpInitiatedLogout(RoutingContext context, TenantConfigContext configContext) {
return isEqualToRequestPath(configContext.oidcConfig.logout.path, context, configContext);
}
@@ -1205,4 +1214,38 @@ static String getCookieSuffix(OidcTenantConfig oidcConfig) {
? (tenantIdSuffix + UNDERSCORE + oidcConfig.authentication.cookieSuffix.get())
: tenantIdSuffix;
}
+
+ private class LogoutCall implements Function<SecurityIdentity, Uni<?>> {
+ RoutingContext context;
+ TenantConfigContext configContext;
+ String idToken;
+
+ LogoutCall(RoutingContext context, TenantConfigContext configContext, String idToken) {
+ this.context = context;
+ this.configContext = configContext;
+ this.idToken = idToken;
+ }
+
+ @Override
+ public Uni<Void> apply(SecurityIdentity identity) {
+ if (isRpInitiatedLogout(context, configContext)) {
+ LOG.debug("Performing an RP initiated logout");
+ fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity);
+ return buildLogoutRedirectUriUni(context, configContext, idToken);
+ }
+ if (isBackChannelLogoutPendingAndValid(configContext, identity)
+ || isFrontChannelLogoutValid(context, configContext,
+ identity)) {
+ return removeSessionCookie(context, configContext.oidcConfig)
+ .map(new Function<Void, Void>() {
+ @Override
+ public Void apply(Void t) {
+ throw new LogoutException();
+ }
+ });
+
+ }
+ return VOID_UNI;
+ }
+ }
}
diff --git a/integration-tests/oidc-wiremock/src/main/resources/application.properties b/integration-tests/oidc-wiremock/src/main/resources/application.properties
index bb6917d30bc..4e8bfb21b4c 100644
--- a/integration-tests/oidc-wiremock/src/main/resources/application.properties
+++ b/integration-tests/oidc-wiremock/src/main/resources/application.properties
@@ -20,6 +20,8 @@ quarkus.oidc.code-flow.logout.extra-params.client_id=${quarkus.oidc.code-flow.cl
quarkus.oidc.code-flow.credentials.secret=secret
quarkus.oidc.code-flow.application-type=web-app
quarkus.oidc.code-flow.token.audience=https://server.example.com
+quarkus.oidc.code-flow.token.refresh-expired=true
+quarkus.oidc.code-flow.token.refresh-token-time-skew=5M
quarkus.oidc.code-flow-encrypted-id-token-jwk.auth-server-url=${keycloak.url}/realms/quarkus/
quarkus.oidc.code-flow-encrypted-id-token-jwk.client-id=quarkus-web-app
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
index 51e1b9a932d..472c2743bc4 100644
--- a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
@@ -6,7 +6,6 @@
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.matching;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -77,7 +76,7 @@ public void testCodeFlow() throws IOException {
assertEquals("alice, cache size: 0", page.getBody().asNormalizedText());
assertNotNull(getSessionCookie(webClient, "code-flow"));
-
+ // Logout
page = webClient.getPage("http://localhost:8081/code-flow/logout");
assertEquals("Welcome, clientId: quarkus-web-app", page.getBody().asNormalizedText());
assertNull(getSessionCookie(webClient, "code-flow"));
commit 2a057632d7f5fa3d1c77b9aa037263211c0e0290
Author: rjtmahinay <[email protected]>
AuthorDate: 2023-07-10T01:22:32+08:00
Commit: rjtmahinay <[email protected]>
CommitDate: 2023-07-10T01:22:32+08:00
Add QuarkusApplication javadoc
* Fix #34463
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java b/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java
index 350685123d5..87d2220eb98 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java
@@ -2,0 +3,4 @@
+/**
+ * This is usually used for command mode applications with a startup logic. The logic is executed inside
+ * {@link QuarkusApplication#run} method before the main application exits.
+ */
commit bca2d17491015ea1522f34517223b5a366aea73c (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:12:21-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:12:21-04:00
Delete binary file
diff --git a/trufflehog_3.42.0_linux_arm64.tar.gz b/trufflehog_3.42.0_linux_arm64.tar.gz
deleted file mode 100644
index 7682212..0000000
Binary files a/trufflehog_3.42.0_linux_arm64.tar.gz and /dev/null differ
commit afc6dc5d47f28366638da877ecb6b819c69e659b
Author: John Smith <[email protected]>
AuthorDate: 2023-07-10T12:21:33-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-10T12:21:33-04:00
Change binary file
diff --git a/trufflehog_3.42.0_linux_arm64.tar.gz b/trufflehog_3.42.0_linux_arm64.tar.gz
index 0a7a5b4..7682212 100644
Binary files a/trufflehog_3.42.0_linux_arm64.tar.gz and b/trufflehog_3.42.0_linux_arm64.tar.gz differ
commit 638595917417c5c8a956937b28c5127719023363
Author: John Smith <[email protected]>
AuthorDate: 2023-07-10T12:20:35-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-10T12:20:35-04:00
Add binary file
diff --git a/trufflehog_3.42.0_linux_arm64.tar.gz b/trufflehog_3.42.0_linux_arm64.tar.gz
new file mode 100644
index 0000000..0a7a5b4
Binary files /dev/null and b/trufflehog_3.42.0_linux_arm64.tar.gz differ
commit ce0f5d1fe0272f180ccb660196f439c0c2f4ec8e (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:08:52-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:08:52-04:00
Delete file
diff --git a/lao b/lao
deleted file mode 100644
index 635ef2c..0000000
--- a/lao
+++ /dev/null
@@ -1,11 +0,0 @@
-The Way that can be told of is not the eternal Way;
-The name that can be named is not the eternal name.
-The Nameless is the origin of Heaven and Earth;
-The Named is the mother of all things.
-Therefore let there always be non-being,
- so we may see their subtlety,
-And let there always be being,
- so we may see their outcome.
-The two are the same,
-But after they are produced,
- they have different names.
commit d606a729383371558473b70a6a7b1ca264b0d205
Author: John Smith <[email protected]>
AuthorDate: 2023-07-10T14:17:04-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-10T14:17:04-04:00
Rename file
diff --git a/tzu b/tzu.txt
similarity index 100%
rename from tzu
rename to tzu.txt
commit 7bd16429f1f708746dabf970e54b05d2b4734997 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-11T18:10:49-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-11T18:10:49-04:00
Change file
diff --git a/tzu b/tzu
index 5af88a8..c729cdb 100644
--- a/tzu
+++ b/tzu
@@ -11,3 +11,5 @@ But after they are produced,
They both may be called deep and profound.
Deeper and more profound,
The door of all subtleties!
+
+Source: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format
commit c7062674c17192caa284615ab2fa9778c6602164 (HEAD -> master)
Author: John Smith <[email protected]>
AuthorDate: 2023-07-10T10:15:18-04:00
Commit: John Smith <[email protected]>
CommitDate: 2023-07-10T10:15:18-04:00
Create files
diff --git a/lao b/lao
new file mode 100644
index 0000000..635ef2c
--- /dev/null
+++ b/lao
@@ -0,0 +1,11 @@
+The Way that can be told of is not the eternal Way;
+The name that can be named is not the eternal name.
+The Nameless is the origin of Heaven and Earth;
+The Named is the mother of all things.
+Therefore let there always be non-being,
+ so we may see their subtlety,
+And let there always be being,
+ so we may see their outcome.
+The two are the same,
+But after they are produced,
+ they have different names.
diff --git a/tzu b/tzu
new file mode 100644
index 0000000..5af88a8
--- /dev/null
+++ b/tzu
@@ -0,0 +1,13 @@
+The Nameless is the origin of Heaven and Earth;
+The named is the mother of all things.
+
+Therefore let there always be non-being,
+ so we may see their subtlety,
+And let there always be being,
+ so we may see their outcome.
+The two are the same,
+But after they are produced,
+ they have different names.
+They both may be called deep and profound.
+Deeper and more profound,
+The door of all subtleties!
`
func newTime(timestamp string) time.Time {
date, _ := time.Parse(defaultDateFormat, timestamp)
return date
}
func newStringBuilderValue(value string) strings.Builder {
builder := strings.Builder{}
builder.Write([]byte(value))
return builder
}
// This throws a nasty panic if it's a top-level var.
func expectedDiffs() []*Diff {
return []*Diff{
{
PathB: "C++/1 \320\243\321\200\320\276\320\272/.idea/workspace.xml",
LineStart: 29,
Commit: &Commit{
Hash: "e50b135fd29e91b2fbb25923797f5ecffe59f359",
Author: "lionzxy <[email protected]>",
Committer: "lionzxy <[email protected]>",
Date: newTime("2017-03-01T18:20:04+03:00"),
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")),
IsBinary: false,
},
{
PathB: "components/item.lua",
LineStart: 9,
Commit: &Commit{
Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7",
Author: "Jaliborc <[email protected]>",
Committer: "Jaliborc <[email protected]>",
Date: newTime("2011-04-25T16:28:06+01:00"),
Message: newStringBuilderValue("Added Unusable coloring\n\nNotes:\nMessage-Id: <[email protected]>\n"),
},
contentWriter: newBufferWithContent([]byte("\n\nlocal Unfit = LibStub('Unfit-1.0')\n\n\n")),
IsBinary: false,
},
{
PathB: "embeds.xml",
LineStart: 6,
contentWriter: newBufferWithContent([]byte("\n\n <Script file=\"libs\\Unfit-1.0\\Unfit-1.0.lua\"/>\n\n\n\n")),
Commit: &Commit{
Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7",
Author: "Jaliborc <[email protected]>",
Committer: "Jaliborc <[email protected]>",
Date: newTime("2011-04-25T16:28:06+01:00"),
Message: newStringBuilderValue("Added Unusable coloring\n\nNotes:\nMessage-Id: <[email protected]>\n"),
},
IsBinary: false,
},
{
PathB: "libs/Unfit-1.0",
LineStart: 1,
contentWriter: newBufferWithContent([]byte("Subproject commit 0000000000000000000000000000000000000000\n")),
Commit: &Commit{
Hash: "fd6e99e7a80199b76a694603be57c5ade1de18e7",
Author: "Jaliborc <[email protected]>",
Committer: "Jaliborc <[email protected]>",
Date: newTime("2011-04-25T16:28:06+01:00"),
Message: newStringBuilderValue("Added Unusable coloring\n\nNotes:\nMessage-Id: <[email protected]>\n"),
},
IsBinary: false,
},
{
Commit: &Commit{
Hash: "4727ffb7ad6dc5130bf4b4dd166e00705abdd018",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T22:26:11-04:00"),
Message: strings.Builder{},
},
},
{
Commit: &Commit{
Hash: "c904e0f5cd9f30ae520c66bd5f70806219fe7ca2",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-10T10:17:11-04:00"),
Message: newStringBuilderValue("Empty Commit\n"),
},
},
{
PathB: "sample.txt",
LineStart: 1,
contentWriter: newBufferWithContent([]byte("Hello, world!\n")),
Commit: &Commit{
Hash: "3d76a97faad96e0f326afb61c232b9c2a18dca35",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:03:54-04:00"),
Message: strings.Builder{},
},
IsBinary: false,
},
{
PathB: ".gitignore",
LineStart: 1,
contentWriter: newBufferWithContent([]byte("\n\n\n**/__pycache__/\n**/*.pyc\n")),
Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <[email protected]>",
Committer: "Stephen <[email protected]>",
Date: newTime("2017-12-06T14:44:41-08:00"),
Message: newStringBuilderValue("Add travis testing\n"),
},
IsBinary: false,
},
{
PathB: ".travis.yml",
LineStart: 1,
Commit: &Commit{
Hash: "df393b4125c2aa217211b2429b8963d0cefcee27",
Author: "Stephen <[email protected]>",
Committer: "Stephen <[email protected]>",
Date: newTime("2017-12-06T14:44:41-08:00"),
Message: newStringBuilderValue("Add travis testing\n"),
},
contentWriter: newBufferWithContent([]byte(`language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "3.5"
- "3.5-dev" # 3.5 development branch
- "3.6"
- "3.6-dev" # 3.6 development branch
- "3.7-dev" # 3.7 development branch
- "nightly"
`)),
IsBinary: false,
},
{
PathB: "Makefile",
LineStart: 1,
Commit: &Commit{
Hash: "4218c39d99b5f30153f62471c1be1c1596f0a4d4",
Author: "Dustin Decker <[email protected]>",
Committer: "Dustin Decker <[email protected]>",
Date: newTime("2022-01-13T12:02:24-08:00"),
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
.PHONY: check
.PHONY: test
.PHONY: test-race
.PHONY: run
.PHONY: install
.PHONY: protos
.PHONY: protos-windows
.PHONY: vendor
install:
CGO_ENABLED=0 go install .
check:
go fmt $(shell go list ./... | grep -v /vendor/)
go vet $(shell go list ./... | grep -v /vendor/)
test:
CGO_ENABLED=0 go test $(shell go list ./... | grep -v /vendor/)
test-race:
CGO_ENABLED=1 go test -race $(shell go list ./... | grep -v /vendor/)
bench:
CGO_ENABLED=0 go test $(shell go list ./pkg/secrets/... | grep -v /vendor/) -benchmem -run=xxx -bench .
run:
CGO_ENABLED=0 go run . git file://.
protos:
docker run -u "$(shell id -u)" -v "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))":/pwd "${PROTOS_IMAGE}" bash -c "cd /pwd; /pwd/scripts/gen_proto.sh"
`)),
IsBinary: false,
},
{
PathB: "plusLine.txt",
LineStart: 1,
Commit: &Commit{
Hash: "934cf5d255fd8e28b33f5a6ba64276caf0b284bf",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:43:22-04:00"),
Message: newStringBuilderValue("Test toFile/plusLine parsing\n"),
},
contentWriter: newBufferWithContent([]byte("-- test\n++ test\n\n")),
IsBinary: false,
},
{
PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutTokenCache.java",
LineStart: 45,
Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <[email protected]>",
Committer: "Sergey Beryozkin <[email protected]>",
Date: newTime("2023-07-07T17:44:26+01:00"),
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")),
IsBinary: false,
},
{
PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java",
LineStart: 1023,
Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <[email protected]>",
Committer: "Sergey Beryozkin <[email protected]>",
Date: newTime("2023-07-07T17:44:26+01:00"),
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")),
IsBinary: false,
},
{
PathB: "extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java",
LineStart: 1214,
Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <[email protected]>",
Committer: "Sergey Beryozkin <[email protected]>",
Date: newTime("2023-07-07T17:44:26+01:00"),
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")),
IsBinary: false,
},
{
PathB: "integration-tests/oidc-wiremock/src/main/resources/application.properties",
LineStart: 20,
Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <[email protected]>",
Committer: "Sergey Beryozkin <[email protected]>",
Date: newTime("2023-07-07T17:44:26+01:00"),
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")),
IsBinary: false,
},
// WTF, shouldn't this be filtered out?
{
PathB: "integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java",
LineStart: 6,
Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <[email protected]>",
Committer: "Sergey Beryozkin <[email protected]>",
Date: newTime("2023-07-07T17:44:26+01:00"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
},
contentWriter: newBufferWithContent([]byte("\n\n\n\n\n\n")),
IsBinary: false,
},
{
PathB: "integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java",
LineStart: 76,
Commit: &Commit{
Hash: "2a5d703b02b52d65c65ee9f7928f158b919ab741",
Author: "Sergey Beryozkin <[email protected]>",
Committer: "Sergey Beryozkin <[email protected]>",
Date: newTime("2023-07-07T17:44:26+01:00"),
Message: newStringBuilderValue("Do not refresh OIDC session if the user is requesting logout\n"),
},
contentWriter: newBufferWithContent([]byte("\n\n // Logout\n\n\n\n")),
IsBinary: false,
},
{
PathB: "core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java",
LineStart: 3,
Commit: &Commit{
Hash: "2a057632d7f5fa3d1c77b9aa037263211c0e0290",
Author: "rjtmahinay <[email protected]>",
Committer: "rjtmahinay <[email protected]>",
Date: newTime("2023-07-10T01:22:32+08:00"),
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")),
IsBinary: false,
},
{
Commit: &Commit{
Hash: "bca2d17491015ea1522f34517223b5a366aea73c",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:12:21-04:00"),
Message: newStringBuilderValue("Delete binary file\n"),
},
},
{
PathB: "trufflehog_3.42.0_linux_arm64.tar.gz",
Commit: &Commit{
Hash: "afc6dc5d47f28366638da877ecb6b819c69e659b",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-10T12:21:33-04:00"),
Message: newStringBuilderValue("Change binary file\n"),
},
contentWriter: newBufferWithContent([]byte("")),
IsBinary: true,
},
{
PathB: "trufflehog_3.42.0_linux_arm64.tar.gz",
Commit: &Commit{
Hash: "638595917417c5c8a956937b28c5127719023363",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-10T12:20:35-04:00"),
Message: newStringBuilderValue("Add binary file\n"),
},
contentWriter: newBufferWithContent([]byte("")),
IsBinary: true,
},
{
Commit: &Commit{
Hash: "ce0f5d1fe0272f180ccb660196f439c0c2f4ec8e",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:08:52-04:00"),
Message: newStringBuilderValue("Delete file\n"),
},
},
{
Commit: &Commit{
Hash: "d606a729383371558473b70a6a7b1ca264b0d205",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-10T14:17:04-04:00"),
Message: newStringBuilderValue("Rename file\n"),
},
},
{
PathB: "tzu",
LineStart: 11,
Commit: &Commit{
Hash: "7bd16429f1f708746dabf970e54b05d2b4734997",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-11T18:10:49-04:00"),
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")),
IsBinary: false,
},
{
PathB: "lao",
LineStart: 1,
Commit: &Commit{
Hash: "c7062674c17192caa284615ab2fa9778c6602164",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-10T10:15:18-04:00"),
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")),
IsBinary: false,
},
{
PathB: "tzu",
LineStart: 1,
Commit: &Commit{
Hash: "c7062674c17192caa284615ab2fa9778c6602164",
Author: "John Smith <[email protected]>",
Committer: "John Smith <[email protected]>",
Date: newTime("2023-07-10T10:15:18-04:00"),
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")),
IsBinary: false,
},
}
}
const stagedDiffs = `diff --git a/aws b/aws
index 2ee133b..12b4843 100644
--- a/aws
+++ b/aws
@@ -1,7 +1,5 @@
-blah blaj
-
-this is the secret: [Default]
-Access key Id: AKIAILE3JG6KMS3HZGCA
-Secret Access Key: 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
-
-okay thank you bye
+[default]
+aws_access_key_id = AKIAXYZDQCEN4B6JSJQI
+aws_secret_access_key = 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
+output = json
+region = us-east-2
diff --git a/aws2 b/aws2
index 239b415..2ee133b 100644
--- a/aws2
+++ b/aws2
@@ -1,5 +1,7 @@
blah blaj
-this is the secret: AKIA2E0A8F3B244C9986
+this is the secret: [Default]
+Access key Id: AKIAILE3JG6KMS3HZGCA
+Secret Access Key: 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
-okay thank you bye
\ No newline at end of file
+okay thank you bye
diff --git c/requirements.txt i/requirements.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java b/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java
index 350685123d5..87d2220eb98 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/QuarkusApplication.java
@@ -2,0 +3,4 @@
+/**
+ * This is usually used for command mode applications with a startup logic. The logic is executed inside
+ * {@link QuarkusApplication#run} method before the main application exits.
+ */
diff --git a/trufflehog_3.42.0_linux_arm64.tar.gz b/trufflehog_3.42.0_linux_arm64.tar.gz
new file mode 100644
index 0000000..0a7a5b4
Binary files /dev/null and b/trufflehog_3.42.0_linux_arm64.tar.gz differ
diff --git a/lao b/lao
deleted file mode 100644
index 635ef2c..0000000
--- a/lao
+++ /dev/null
@@ -1,11 +0,0 @@
-The Way that can be told of is not the eternal Way;
-The name that can be named is not the eternal name.
-The Nameless is the origin of Heaven and Earth;
-The Named is the mother of all things.
-Therefore let there always be non-being,
- so we may see their subtlety,
-And let there always be being,
- so we may see their outcome.
-The two are the same,
-But after they are produced,
- they have different names.
diff --git a/tzu b/tzu.txt
similarity index 100%
rename from tzu
rename to tzu.txt
diff --git a/tzu b/tzu
index 5af88a8..c729cdb 100644
--- a/tzu
+++ b/tzu
@@ -11,3 +11,5 @@ But after they are produced,
They both may be called deep and profound.
Deeper and more profound,
The door of all subtleties!
+
+Source: https://www.gnu.org/software/diffutils/manual/diffutils.html#An-Example-of-Unified-Format
diff --git a/lao b/lao
new file mode 100644
index 0000000..635ef2c
--- /dev/null
+++ b/lao
@@ -0,0 +1,11 @@
+The Way that can be told of is not the eternal Way;
+The name that can be named is not the eternal name.
+The Nameless is the origin of Heaven and Earth;
+The Named is the mother of all things.
+Therefore let there always be non-being,
+ so we may see their subtlety,
+And let there always be being,
+ so we may see their outcome.
+The two are the same,
+But after they are produced,
+ they have different names.
diff --git a/tzu b/tzu
new file mode 100644
index 0000000..5af88a8
--- /dev/null
+++ b/tzu
@@ -0,0 +1,13 @@
+The Nameless is the origin of Heaven and Earth;
+The named is the mother of all things.
+
+Therefore let there always be non-being,
+ so we may see their subtlety,
+And let there always be being,
+ so we may see their outcome.
+The two are the same,
+But after they are produced,
+ they have different names.
+They both may be called deep and profound.
+Deeper and more profound,
+The door of all subtleties!
`
const singleCommitMultiDiff = `commit 70001020fab32b1fcf2f1f0e5c66424eae649826 (HEAD -> master, origin/master, origin/HEAD)
Author: Dustin Decker <[email protected]>
AuthorDate: 2021-03-15T23:27:16-07:00
Commit: Dustin Decker <[email protected]>
CommitDate: 2021-03-15T23:27:16-07:00
Update aws
diff --git a/aws b/aws
index 2ee133b..12b4843 100644
--- a/aws
+++ b/aws
@@ -1,7 +1,5 @@
-blah blaj
-
-this is the secret: [Default]
-Access key Id: AKIAILE3JG6KMS3HZGCA
-Secret Access Key: 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
-
-okay thank you bye
+[default]
+aws_access_key_id = AKIAXYZDQCEN4B6JSJQI
+aws_secret_access_key = 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
+output = json
+region = us-east-2
diff --git a/aws b/aws
index 239b415..2ee133b 100644
--- a/aws
+++ b/aws
@@ -1,5 +1,7 @@
blah blaj
-this is the secret: AKIA2E0A8F3B244C9986
+this is the secret: [Default]
+Access key Id: AKIAILE3JG6KMS3HZGCA
+Secret Access Key: 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
-okay thank you bye
\ No newline at end of file
+okay thank you bye
`
const singleCommitSingleDiff = `commit 70001020fab32b1fcf2f1f0e5c66424eae649826 (HEAD -> master, origin/master, origin/HEAD)
Author: Dustin Decker <[email protected]>
AuthorDate: 2021-03-15T23:27:16-07:00
Commit: Dustin Decker <[email protected]>
CommitDate: 2021-03-15T23:27:16-07:00
Update aws
diff --git a/aws b/aws
index 2ee133b..12b4843 100644
--- a/aws
+++ b/aws
@@ -1,7 +1,5 @@
-blah blaj
-
-this is the secret: [Default]
-Access key Id: AKIAILE3JG6KMS3HZGCA
-Secret Access Key: 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
-
-okay thank you bye
+[default]
+aws_access_key_id = AKIAXYZDQCEN4B6JSJQI
+aws_secret_access_key = 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
+output = json
+region = us-east-2
`
Reference in New Issue View Git Blame Copy Permalink