commit d250ccfa170a8f9ed24c17515467ed1f0e70333b · notnite.com/core

+21 -5

patchutil/patchutil.go

···

       40
       40
        
       

     

       41
       41
        
       // IsPatchValid checks if the given patch string is valid.

     

       42
       42
        
       // It performs very basic sniffing for either git-diff or git-format-patch

     

       43
       43
       -
       // header lines.

     

       43
       43
       +
       // header lines. For format patches, it attempts to extract and validate each one.

     

       44
       44
        
       func IsPatchValid(patch string) bool {

     

       45
       45
        
       	if len(patch) == 0 {

     

       46
       46
        
       		return false

     
···

       52
       52
        
       	}

     

       53
       53
        
       

     

       54
       54
        
       	firstLine := strings.TrimSpace(lines[0])

     

       55
       55
       -
       	return strings.HasPrefix(firstLine, "diff ") ||

     

       55
       55
       +
       

     

       56
       56
       +
       	// check if it's a git diff

     

       57
       57
       +
       	if strings.HasPrefix(firstLine, "diff ") ||

     

       56
       58
        
       		strings.HasPrefix(firstLine, "--- ") ||

     

       57
       59
        
       		strings.HasPrefix(firstLine, "Index: ") ||

     

       58
       60
        
       		strings.HasPrefix(firstLine, "+++ ") ||

     

       59
       59
       -
       		strings.HasPrefix(firstLine, "@@ ") ||

     

       60
       60
       -
       		strings.HasPrefix(firstLine, "From ") && strings.Contains(firstLine, " Mon Sep 17 00:00:00 2001") ||

     

       61
       61
       -
       		strings.HasPrefix(firstLine, "From: ")

     

       61
       61
       +
       		strings.HasPrefix(firstLine, "@@ ") {

     

       62
       62
       +
       		return true

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	// check if it's format-patch

     

       66
       66
       +
       	if strings.HasPrefix(firstLine, "From ") && strings.Contains(firstLine, " Mon Sep 17 00:00:00 2001") ||

     

       67
       67
       +
       		strings.HasPrefix(firstLine, "From: ") {

     

       68
       68
       +
       		// ExtractPatches already runs it through gitdiff.Parse so if that errors,

     

       69
       69
       +
       		// it's safe to say it's broken.

     

       70
       70
       +
       		patches, err := ExtractPatches(patch)

     

       71
       71
       +
       		if err != nil {

     

       72
       72
       +
       			return false

     

       73
       73
       +
       		}

     

       74
       74
       +
       		return len(patches) > 0

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	return false

     

       62
       78
        
       }

     

       63
       79
        
       

     

       64
       80
        
       func IsFormatPatch(patch string) bool {

+115 -1

patchutil/patchutil_test.go

···

       5
       5
        
       	"testing"

     

       6
       6
        
       )

     

       7
       7
        
       

     

       8
       8
       +
       func TestIsPatchValid(t *testing.T) {

     

       9
       9
       +
       	tests := []struct {

     

       10
       10
       +
       		name     string

     

       11
       11
       +
       		patch    string

     

       12
       12
       +
       		expected bool

     

       13
       13
       +
       	}{

     

       14
       14
       +
       		{

     

       15
       15
       +
       			name:     `empty patch`,

     

       16
       16
       +
       			patch:    ``,

     

       17
       17
       +
       			expected: false,

     

       18
       18
       +
       		},

     

       19
       19
       +
       		{

     

       20
       20
       +
       			name:     `single line patch`,

     

       21
       21
       +
       			patch:    `single line`,

     

       22
       22
       +
       			expected: false,

     

       23
       23
       +
       		},

     

       24
       24
       +
       		{

     

       25
       25
       +
       			name: `valid diff patch`,

     

       26
       26
       +
       			patch: `diff --git a/file.txt b/file.txt

     

       27
       27
       +
       index abc..def 100644

     

       28
       28
       +
       --- a/file.txt

     

       29
       29
       +
       +++ b/file.txt

     

       30
       30
       +
       @@ -1,3 +1,3 @@

     

       31
       31
       +
       -old line

     

       32
       32
       +
       +new line

     

       33
       33
       +
       	context`,

     

       34
       34
       +
       			expected: true,

     

       35
       35
       +
       		},

     

       36
       36
       +
       		{

     

       37
       37
       +
       			name: `valid patch starting with ---`,

     

       38
       38
       +
       			patch: `--- a/file.txt

     

       39
       39
       +
       +++ b/file.txt

     

       40
       40
       +
       @@ -1,3 +1,3 @@

     

       41
       41
       +
       -old line

     

       42
       42
       +
       +new line

     

       43
       43
       +
       	context`,

     

       44
       44
       +
       			expected: true,

     

       45
       45
       +
       		},

     

       46
       46
       +
       		{

     

       47
       47
       +
       			name: `valid patch starting with Index`,

     

       48
       48
       +
       			patch: `Index: file.txt

     

       49
       49
       +
       ==========

     

       50
       50
       +
       --- a/file.txt

     

       51
       51
       +
       +++ b/file.txt

     

       52
       52
       +
       @@ -1,3 +1,3 @@

     

       53
       53
       +
       -old line

     

       54
       54
       +
       +new line

     

       55
       55
       +
       	context`,

     

       56
       56
       +
       			expected: true,

     

       57
       57
       +
       		},

     

       58
       58
       +
       		{

     

       59
       59
       +
       			name: `valid patch starting with +++`,

     

       60
       60
       +
       			patch: `+++ b/file.txt

     

       61
       61
       +
       --- a/file.txt

     

       62
       62
       +
       @@ -1,3 +1,3 @@

     

       63
       63
       +
       -old line

     

       64
       64
       +
       +new line

     

       65
       65
       +
       	context`,

     

       66
       66
       +
       			expected: true,

     

       67
       67
       +
       		},

     

       68
       68
       +
       		{

     

       69
       69
       +
       			name: `valid patch starting with @@`,

     

       70
       70
       +
       			patch: `@@ -1,3 +1,3 @@

     

       71
       71
       +
       -old line

     

       72
       72
       +
       +new line

     

       73
       73
       +
       	context

     

       74
       74
       +
       `,

     

       75
       75
       +
       			expected: true,

     

       76
       76
       +
       		},

     

       77
       77
       +
       		{

     

       78
       78
       +
       			name: `valid format patch`,

     

       79
       79
       +
       			patch: `From 3c5035488318164b81f60fe3adcd6c9199d76331 Mon Sep 17 00:00:00 2001

     

       80
       80
       +
       From: Author <author@example.com>

     

       81
       81
       +
       Date: Wed, 16 Apr 2025 11:01:00 +0300

     

       82
       82
       +
       Subject: [PATCH] Example patch

     

       83
       83
       +
       

     

       84
       84
       +
       diff --git a/file.txt b/file.txt

     

       85
       85
       +
       index 123456..789012 100644

     

       86
       86
       +
       --- a/file.txt

     

       87
       87
       +
       +++ b/file.txt

     

       88
       88
       +
       @@ -1 +1 @@

     

       89
       89
       +
       -old content

     

       90
       90
       +
       +new content

     

       91
       91
       +
       --

     

       92
       92
       +
       2.48.1`,

     

       93
       93
       +
       			expected: true,

     

       94
       94
       +
       		},

     

       95
       95
       +
       		{

     

       96
       96
       +
       			name: `invalid format patch`,

     

       97
       97
       +
       			patch: `From 1234567890123456789012345678901234567890 Mon Sep 17 00:00:00 2001

     

       98
       98
       +
       From: Author <author@example.com>

     

       99
       99
       +
       This is not a valid patch format`,

     

       100
       100
       +
       			expected: false,

     

       101
       101
       +
       		},

     

       102
       102
       +
       		{

     

       103
       103
       +
       			name: `not a patch at all`,

     

       104
       104
       +
       			patch: `This is

     

       105
       105
       +
       just some

     

       106
       106
       +
       random text

     

       107
       107
       +
       that isn't a patch`,

     

       108
       108
       +
       			expected: false,

     

       109
       109
       +
       		},

     

       110
       110
       +
       	}

     

       111
       111
       +
       

     

       112
       112
       +
       	for _, tt := range tests {

     

       113
       113
       +
       		t.Run(tt.name, func(t *testing.T) {

     

       114
       114
       +
       			result := IsPatchValid(tt.patch)

     

       115
       115
       +
       			if result != tt.expected {

     

       116
       116
       +
       				t.Errorf("IsPatchValid() = %v, want %v", result, tt.expected)

     

       117
       117
       +
       			}

     

       118
       118
       +
       		})

     

       119
       119
       +
       	}

     

       120
       120
       +
       }

     

       121
       121
       +
       

     

       8
       122
        
       func TestSplitPatches(t *testing.T) {

     

       9
       123
        
       	tests := []struct {

     

       10
       124
        
       		name     string

     
···

       18
       132
        
       		},

     

       19
       133
        
       		{

     

       20
       134
        
       			name:     "No valid patches",

     

       21
       21
       -
       			input:    "This is not a patch\nJust some random text",

     

       135
       135
       +
       			input:    "This is not a \nJust some random text",

     

       22
       136
        
       			expected: []string{},

     

       23
       137
        
       		},

     

       24
       138
        
       		{