From e7a534d0a311d9fa75b5981879c755281c4c9fba Mon Sep 17 00:00:00 2001
From: Francis Lavoie <lavofr@gmail.com>
Date: Sun, 11 Feb 2024 13:30:14 -0500
Subject: [PATCH] caddyfile: Reject long heredoc markers (#6098)

Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>
---
 caddyconfig/caddyfile/formatter.go            |   5 +++
 caddyconfig/caddyfile/formatter_test.go       |  41 +++++++++++++-----
 caddyconfig/caddyfile/lexer.go                |   4 ++
 ...ase-minimized-fuzz-format-5806400649363456 | Bin 0 -> 139348 bytes
 4 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 caddyconfig/caddyfile/testdata/clusterfuzz-testcase-minimized-fuzz-format-5806400649363456

diff --git a/caddyconfig/caddyfile/formatter.go b/caddyconfig/caddyfile/formatter.go
index 764f7911..423de542 100644
--- a/caddyconfig/caddyfile/formatter.go
+++ b/caddyconfig/caddyfile/formatter.go
@@ -16,6 +16,7 @@ package caddyfile
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"unicode"
 
@@ -118,6 +119,10 @@ func Format(input []byte) []byte {
 				heredoc = heredocClosed
 			} else {
 				heredocMarker = append(heredocMarker, ch)
+				if len(heredocMarker) > 32 {
+					errorString := fmt.Sprintf("heredoc marker too long: <<%s", string(heredocMarker))
+					panic(errorString)
+				}
 				write(ch)
 				continue
 			}
diff --git a/caddyconfig/caddyfile/formatter_test.go b/caddyconfig/caddyfile/formatter_test.go
index 6eec822f..5ea29c33 100644
--- a/caddyconfig/caddyfile/formatter_test.go
+++ b/caddyconfig/caddyfile/formatter_test.go
@@ -15,6 +15,8 @@
 package caddyfile
 
 import (
+	"fmt"
+	"os"
 	"strings"
 	"testing"
 )
@@ -24,6 +26,7 @@ func TestFormatter(t *testing.T) {
 		description string
 		input       string
 		expect      string
+		panics      bool
 	}{
 		{
 			description: "very simple",
@@ -434,18 +437,36 @@ block2 {
 }
 `,
 		},
+		{
+			description: "very long heredoc from fuzzer",
+			input: func() string {
+				bs, _ := os.ReadFile("testdata/clusterfuzz-testcase-minimized-fuzz-format-5806400649363456")
+				return string(bs)
+			}(),
+			panics: true,
+		},
 	} {
-		// the formatter should output a trailing newline,
-		// even if the tests aren't written to expect that
-		if !strings.HasSuffix(tc.expect, "\n") {
-			tc.expect += "\n"
-		}
+		t.Run(fmt.Sprintf("test case %d: %s", i, tc.description), func(t *testing.T) {
+			if tc.panics {
+				defer func() {
+					if r := recover(); r == nil {
+						t.Errorf("[TEST %d: %s] Expected panic, but got none", i, tc.description)
+					}
+				}()
+			}
 
-		actual := Format([]byte(tc.input))
+			// the formatter should output a trailing newline,
+			// even if the tests aren't written to expect that
+			if !strings.HasSuffix(tc.expect, "\n") {
+				tc.expect += "\n"
+			}
 
-		if string(actual) != tc.expect {
-			t.Errorf("\n[TEST %d: %s]\n====== EXPECTED ======\n%s\n====== ACTUAL ======\n%s^^^^^^^^^^^^^^^^^^^^^",
-				i, tc.description, string(tc.expect), string(actual))
-		}
+			actual := Format([]byte(tc.input))
+
+			if !tc.panics && string(actual) != tc.expect {
+				t.Errorf("\n[TEST %d: %s]\n====== EXPECTED ======\n%s\n====== ACTUAL ======\n%s^^^^^^^^^^^^^^^^^^^^^",
+					i, tc.description, string(tc.expect), string(actual))
+			}
+		})
 	}
 }
diff --git a/caddyconfig/caddyfile/lexer.go b/caddyconfig/caddyfile/lexer.go
index 4db63749..a59f0fc4 100644
--- a/caddyconfig/caddyfile/lexer.go
+++ b/caddyconfig/caddyfile/lexer.go
@@ -149,6 +149,10 @@ func (l *lexer) next() (bool, error) {
 				continue
 			}
 
+			if len(val) > 32 {
+				return false, fmt.Errorf("heredoc marker too long on line #%d: %s", l.line, string(val))
+			}
+
 			// after hitting a newline, we know that the heredoc marker
 			// is the characters after the two << and the newline.
 			// we reset the val because the heredoc is syntax we don't
diff --git a/caddyconfig/caddyfile/testdata/clusterfuzz-testcase-minimized-fuzz-format-5806400649363456 b/caddyconfig/caddyfile/testdata/clusterfuzz-testcase-minimized-fuzz-format-5806400649363456
new file mode 100644
index 0000000000000000000000000000000000000000..94b70919c4b59df0f1fa3740aa6f20577ac3d74a
GIT binary patch
literal 139348
zcmeI*%Wd005CBk}7j7XX1mJ$OyEL|woP2f(>cv5t^d$!cBxQ?m93Te+LFD%igXNGj
z<TSt;BYp{CjQnkh{bzW-8zUVaN64o&a}H}_J#U#cUheKP`*V7!4P%s3xHP)7zP8$$
zq+Rp<d21N|@QS7O(tV76Ud|5y0000000000000000000000000000000000000000
z00000000000000000000z|9I_jDA{T-o-U@voiw#000000000000000z$fwj>FLKO
z85IBk000000000000000000000N{mRG6Dbq000000000000000003|k?r&lW004jw
z7s43*w8XrNTV{*p6h;{R^<pVFhv&O7(&6!Kc{*G(`}6)4yXGH04gdfE0002Mf6Deq
z000000000000000000000B(ZqkpKVy@47B~{1@9J_nRa~TGv;Wp5|U+o6pOql{MGT
zVY!HHiY3OLOPxxcQ;sdi+FPD-i^tweoQ^GR%PCXOm)foC+ZC99u>&)gDfN_Vozpbu
uUTQ8i=T_>}N{+4e6k|EIwg2y%GG8A!t`B_ey~fg}I+wZjxDGcR!r>R!zR#He

literal 0
HcmV?d00001