support HTTP/2 and HTTP/3 (#774)

alecthomas · Mar 25, 2023 · 4f02bc5 · 4f02bc5
1 parent 357f0cb
commit 4f02bc5
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 4 deletions.
diff --git a/lexers/http.go b/lexers/http.go
@@ -22,8 +22,8 @@ var HTTP = Register(httpBodyContentTypeLexer(MustNewLexer(
 func httpRules() Rules {
 	return Rules{
 		"root": {
-			{`(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH|CONNECT)( +)([^ ]+)( +)(HTTP)(/)([12]\.[01])(\r?\n|\Z)`, ByGroups(NameFunction, Text, NameNamespace, Text, KeywordReserved, Operator, LiteralNumber, Text), Push("headers")},
-			{`(HTTP)(/)([12]\.[01])( +)(\d{3})( +)([^\r\n]+)(\r?\n|\Z)`, ByGroups(KeywordReserved, Operator, LiteralNumber, Text, LiteralNumber, Text, NameException, Text), Push("headers")},
+			{`(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH|CONNECT)( +)([^ ]+)( +)(HTTP)(/)([123](?:\.[01])?)(\r?\n|\Z)`, ByGroups(NameFunction, Text, NameNamespace, Text, KeywordReserved, Operator, LiteralNumber, Text), Push("headers")},
+			{`(HTTP)(/)([123](?:\.[01])?)( +)(\d{3})( +)([^\r\n]+)(\r?\n|\Z)`, ByGroups(KeywordReserved, Operator, LiteralNumber, Text, LiteralNumber, Text, NameException, Text), Push("headers")},
 		},
 		"headers": {
 			{`([^\s:]+)( *)(:)( *)([^\r\n]+)(\r?\n|\Z)`, EmitterFunc(httpHeaderBlock), nil},

diff --git a/lexers/testdata/http.2.0.actual b/lexers/testdata/http.2.0.actual
@@ -0,0 +1,5 @@
+GET /foo HTTP/2.0
+Content-Type: application/json
+User-Agent: foo
+
+{"hello": "world"}
diff --git a/lexers/testdata/http.2.0.expected b/lexers/testdata/http.2.0.expected
@@ -0,0 +1,27 @@
+[
+  {"type":"NameFunction","value":"GET"},
+  {"type":"Text","value":" "},
+  {"type":"NameNamespace","value":"/foo"},
+  {"type":"Text","value":" "},
+  {"type":"KeywordReserved","value":"HTTP"},
+  {"type":"Operator","value":"/"},
+  {"type":"LiteralNumber","value":"2.0"},
+  {"type":"Text","value":"\n"},
+  {"type":"Name","value":"Content-Type"},
+  {"type":"Operator","value":":"},
+  {"type":"Text","value":" "},
+  {"type":"Literal","value":"application/json"},
+  {"type":"Text","value":"\n"},
+  {"type":"Name","value":"User-Agent"},
+  {"type":"Operator","value":":"},
+  {"type":"Text","value":" "},
+  {"type":"Literal","value":"foo"},
+  {"type":"Text","value":"\n\n"},
+  {"type":"Punctuation","value":"{"},
+  {"type":"NameTag","value":"\"hello\""},
+  {"type":"Punctuation","value":":"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralStringDouble","value":"\"world\""},
+  {"type":"Punctuation","value":"}"},
+  {"type":"Text","value":"\n"}
+]
diff --git a/lexers/testdata/http.2.actual b/lexers/testdata/http.2.actual
@@ -1,4 +1,4 @@
-GET /foo HTTP/2.0
+GET /foo HTTP/2
 Content-Type: application/json
 User-Agent: foo
 

diff --git a/lexers/testdata/http.2.expected b/lexers/testdata/http.2.expected
@@ -5,7 +5,7 @@
   {"type":"Text","value":" "},
   {"type":"KeywordReserved","value":"HTTP"},
   {"type":"Operator","value":"/"},
-  {"type":"LiteralNumber","value":"2.0"},
+  {"type":"LiteralNumber","value":"2"},
   {"type":"Text","value":"\n"},
   {"type":"Name","value":"Content-Type"},
   {"type":"Operator","value":":"},

diff --git a/lexers/testdata/http.3.actual b/lexers/testdata/http.3.actual
@@ -0,0 +1,5 @@
+GET /foo HTTP/3
+Content-Type: application/json
+User-Agent: foo
+
+{"hello": "world"}
diff --git a/lexers/testdata/http.3.expected b/lexers/testdata/http.3.expected
@@ -0,0 +1,27 @@
+[
+  {"type":"NameFunction","value":"GET"},
+  {"type":"Text","value":" "},
+  {"type":"NameNamespace","value":"/foo"},
+  {"type":"Text","value":" "},
+  {"type":"KeywordReserved","value":"HTTP"},
+  {"type":"Operator","value":"/"},
+  {"type":"LiteralNumber","value":"3"},
+  {"type":"Text","value":"\n"},
+  {"type":"Name","value":"Content-Type"},
+  {"type":"Operator","value":":"},
+  {"type":"Text","value":" "},
+  {"type":"Literal","value":"application/json"},
+  {"type":"Text","value":"\n"},
+  {"type":"Name","value":"User-Agent"},
+  {"type":"Operator","value":":"},
+  {"type":"Text","value":" "},
+  {"type":"Literal","value":"foo"},
+  {"type":"Text","value":"\n\n"},
+  {"type":"Punctuation","value":"{"},
+  {"type":"NameTag","value":"\"hello\""},
+  {"type":"Punctuation","value":":"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralStringDouble","value":"\"world\""},
+  {"type":"Punctuation","value":"}"},
+  {"type":"Text","value":"\n"}
+]