From 134b8056444d8f417c0eb4163809f9659ffc3317 Mon Sep 17 00:00:00 2001
From: Francis Lavoie <lavofr@gmail.com>
Date: Wed, 23 Mar 2022 14:34:13 -0400
Subject: caddyfile: Prevent bad block opening tokens (#4655)

* caddyfile: Prevent bad block opening tokens

* Clarifying comments
---
 caddyconfig/caddyfile/parse.go | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'caddyconfig/caddyfile/parse.go')

diff --git a/caddyconfig/caddyfile/parse.go b/caddyconfig/caddyfile/parse.go
index 1e694f9..b463238 100755
--- a/caddyconfig/caddyfile/parse.go
+++ b/caddyconfig/caddyfile/parse.go
@@ -494,6 +494,13 @@ func (p *parser) directive() error {
 	for p.Next() {
 		if p.Val() == "{" {
 			p.nesting++
+			if !p.isNextOnNewLine() && p.Token().wasQuoted == 0 {
+				return p.Err("Unexpected next token after '{' on same line")
+			}
+		} else if p.Val() == "{}" {
+			if p.isNextOnNewLine() && p.Token().wasQuoted == 0 {
+				return p.Err("Unexpected '{}' at end of line")
+			}
 		} else if p.isNewLine() && p.nesting == 0 {
 			p.cursor-- // read too far
 			break
-- 
cgit v1.2.3