Merge pull request #5 from trufflesecurity/master

Pull in Trufflehog improvements

gitdiff/apply_test.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 	"io/ioutil"
+	"os/exec"
 	"path/filepath"
 	"testing"
 )
@@ -231,10 +232,16 @@ type applyTest struct {
 func (at applyTest) run(t *testing.T, apply func(io.Writer, *Applier, *File) error) {
 	src, patch, out := at.Files.Load(t)
 
-	files, _, err := Parse(bytes.NewReader(patch))
+	cmd := exec.Command("echo", "hello")
+
+	fileChan, err := Parse(cmd, io.NopCloser(bytes.NewReader(patch)))
 	if err != nil {
 		t.Fatalf("failed to parse patch file: %v", err)
 	}
+	var files []*File
+	for file := range fileChan {
+		files = append(files, file)
+	}
 	if len(files) != 1 {
 		t.Fatalf("patch should contain exactly one file, but it has %d", len(files))
 	}

gitdiff/parser.go

@@ -7,6 +7,7 @@ import (
 	"bufio"
 	"fmt"
 	"io"
+	"os/exec"
 	"strings"
 )
 
@@ -15,7 +16,7 @@ const commitPrefix = "commit"
 // Parse parses a patch with changes to one or more files. Any content before
 // the first file is returned as the second value. If an error occurs while
 // parsing, it returns all files parsed before the error.
-func Parse(r io.Reader) (<-chan *File, error) {
+func Parse(cmd *exec.Cmd, r io.ReadCloser) (<-chan *File, error) {
 	p := newParser(r)
 	out := make(chan *File)
 
@@ -27,8 +28,10 @@ func Parse(r io.Reader) (<-chan *File, error) {
 		return out, err
 	}
 
-	go func() {
+	go func(cmd *exec.Cmd, out chan *File, r io.ReadCloser) {
 		defer close(out)
+		defer cmd.Wait()
+		defer r.Close()
 
 		ph := &PatchHeader{}
 		for {
@@ -65,7 +68,7 @@ func Parse(r io.Reader) (<-chan *File, error) {
 			file.PatchHeader = ph
 			out <- file
 		}
-	}()
+	}(cmd, out, r)
 
 	return out, nil
 }

gitdiff/parser_test.go

@@ -4,10 +4,14 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/json"
+	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"reflect"
+	"strings"
 	"testing"
+	"time"
 )
 
 func TestLineOperations(t *testing.T) {
@@ -394,6 +398,16 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 			InputFile: "testdata/one_file.patch",
 			Output: []*File{
 				{
+					PatchHeader: &PatchHeader{
+						SHA: "5d9790fec7d95aa223f3d20936340bf55ff3dcbe",
+						Author: &PatchIdentity{
+							Name:  "Morton Haypenny",
+							Email: "mhaypenny@example.com",
+						},
+						AuthorDate: asTime("2019-04-02T22:55:40-07:00"),
+						Title:      "A file with multiple fragments.",
+						Body:       "The content is arbitrary.",
+					},
 					OldName:       "dir/file1.txt",
 					NewName:       "dir/file1.txt",
 					OldMode:       os.FileMode(0100644),
@@ -408,6 +422,16 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 			InputFile: "testdata/two_files.patch",
 			Output: []*File{
 				{
+					PatchHeader: &PatchHeader{
+						SHA: "5d9790fec7d95aa223f3d20936340bf55ff3dcbe",
+						Author: &PatchIdentity{
+							Name:  "Morton Haypenny",
+							Email: "mhaypenny@example.com",
+						},
+						AuthorDate: asTime("2019-04-02T22:55:40-07:00"),
+						Title:      "A file with multiple fragments.",
+						Body:       "The content is arbitrary.",
+					},
 					OldName:       "dir/file1.txt",
 					NewName:       "dir/file1.txt",
 					OldMode:       os.FileMode(0100644),
@@ -416,6 +440,16 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 					TextFragments: textFragments,
 				},
 				{
+					PatchHeader: &PatchHeader{
+						SHA: "5d9790fec7d95aa223f3d20936340bf55ff3dcbe",
+						Author: &PatchIdentity{
+							Name:  "Morton Haypenny",
+							Email: "mhaypenny@example.com",
+						},
+						AuthorDate: asTime("2019-04-02T22:55:40-07:00"),
+						Title:      "A file with multiple fragments.",
+						Body:       "The content is arbitrary.",
+					},
 					OldName:       "dir/file2.txt",
 					NewName:       "dir/file2.txt",
 					OldMode:       os.FileMode(0100644),
@@ -430,6 +464,15 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 			InputFile: "testdata/new_binary_file.patch",
 			Output: []*File{
 				{
+					PatchHeader: &PatchHeader{
+						SHA: "5d9790fec7d95aa223f3d20936340bf55ff3dcbe",
+						Author: &PatchIdentity{
+							Name:  "Morton Haypenny",
+							Email: "mhaypenny@example.com",
+						},
+						AuthorDate: asTime("2019-04-02T22:55:40-07:00"),
+						Title:      "A binary file with the first 10 fibonacci numbers.",
+					},
 					OldName:      "",
 					NewName:      "dir/ten.bin",
 					NewMode:      os.FileMode(0100644),
@@ -460,7 +503,9 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 				t.Fatalf("unexpected error opening input file: %v", err)
 			}
 
-			files, pre, err := Parse(f)
+			cmd := exec.Command("echo", "hello")
+
+			fileChan, err := Parse(cmd, f)
 			if test.Err {
 				if err == nil || err == io.EOF {
 					t.Fatalf("expected error parsing patch, but got %v", err)
@@ -470,13 +515,14 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 			if err != nil {
 				t.Fatalf("unexpected error parsing patch: %v", err)
 			}
+			var files []*File
+			for file := range fileChan {
+				files = append(files, file)
+			}
 
 			if len(test.Output) != len(files) {
 				t.Fatalf("incorrect number of parsed files: expected %d, actual %d", len(test.Output), len(files))
 			}
-			if test.Preamble != pre {
-				t.Errorf("incorrect preamble\nexpected: %q\n  actual: %q", test.Preamble, pre)
-			}
 			for i := range test.Output {
 				if !reflect.DeepEqual(test.Output[i], files[i]) {
 					exp, _ := json.MarshalIndent(test.Output[i], "", "  ")
@@ -488,10 +534,73 @@ Date:   Tue Apr 2 22:55:40 2019 -0700
 	}
 }
 
+func BenchmarkParse(b *testing.B) {
+	var inputDiff string
+	{
+		builder := strings.Builder{}
+		builder.WriteString(`commit 5d9790fec7d95aa223f3d20936340bf55ff3dcbe
+Author: Morton Haypenny <mhaypenny@example.com>
+Date:   Tue Apr 2 22:55:40 2019 -0700
+
+    A file with multiple fragments.
+
+    The content is arbitrary.
+
+`)
+		fileDiff := func(i int) string {
+			return fmt.Sprintf(`diff --git a/dir/file%[1]d.txt b/dir/file%[1]d.txt
+index ebe9fa54..fe103e1d 100644
+--- a/dir/file%[1]d.txt
++++ b/dir/file%[1]d.txt
+@@ -3,6 +3,8 @@ fragment 1
+ context line
+-old line 1
+-old line 2
+ context line
++new line 1
++new line 2
++new line 3
+ context line
+-old line 3
++new line 4
++new line 5
+@@ -31,2 +33,2 @@ fragment 2
+ context line
+-old line 4
++new line 6
+`, i)
+		}
+		for i := 0; i < 1000; i++ {
+			_, err := builder.WriteString(fileDiff(i))
+			if err != nil {
+				panic(err)
+			}
+		}
+		inputDiff = builder.String()
+	}
+	for i := 0; i < b.N; i++ {
+		reader := io.NopCloser(strings.NewReader(inputDiff))
+		ch, err := Parse(&exec.Cmd{}, reader)
+		if err != nil {
+			panic(err)
+		}
+		for range ch {
+		}
+	}
+}
+
 func newTestParser(input string, init bool) *parser {
 	p := newParser(bytes.NewBufferString(input))
 	if init {
 		_ = p.Next()
 	}
 	return p
 }
+
+func asTime(s string) time.Time {
+	t, err := time.Parse(time.RFC3339, s)
+	if err != nil {
+		panic(err)
+	}
+	return t
+}