Fixed empty path bug (#913)

* Removed / from list of disallowed first tokens Fixes #414 * Changed functionality to allow / * Formatting change
grpc-ecosystem · Mar 27, 2019 · 01b57e6 · 01b57e6
1 parent 20f268a
commit 01b57e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/protoc-gen-grpc-gateway/httprule/parse.go b/protoc-gen-grpc-gateway/httprule/parse.go
@@ -232,7 +232,7 @@ func (p *parser) accept(term termType) (string, error) {
 	t := p.tokens[0]
 	switch term {
 	case "/", "*", "**", ".", "=", "{", "}":
-		if t != string(term) {
+		if t != string(term) && t != "/" {
 			return "", fmt.Errorf("expected %q but got %q", term, t)
 		}
 	case typeEOF:

diff --git a/protoc-gen-grpc-gateway/httprule/parse_test.go b/protoc-gen-grpc-gateway/httprule/parse_test.go
@@ -113,6 +113,12 @@ func TestParseSegments(t *testing.T) {
 				literal("v1"),
 			},
 		},
+		{
+			tokens: []string{"/", eof},
+			want: []segment{
+				wildcard{},
+			},
+		},
 		{
 			tokens: []string{"-._~!$&'()*+,;=:@", eof},
 			want: []segment{
@@ -247,7 +253,7 @@ func TestParseSegmentsWithErrors(t *testing.T) {
 	}{
 		{
 			// double slash
-			tokens: []string{"/", eof},
+			tokens: []string{"//", eof},
 		},
 		{
 			// invalid literal