Skip to content

Commit

Permalink
fix: Prevent panic when parsing empty documents (#389)
Browse files Browse the repository at this point in the history
The ParseDocument functions were returning the first element of the content slice unconditionally, which panicked if the given document bytes were empty. Check if the slice has some elements and return an error if it's empty instead.
  • Loading branch information
twz123 committed May 26, 2023
1 parent a5c9e9c commit dd1001c
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 0 deletions.
25 changes: 25 additions & 0 deletions discovery/discovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,28 @@ func TestParseDocument(t *testing.T) {
t.Errorf("unexpected value for Title: %s (expected %s)", d.Title, title)
}
}

func TestParseDocument_Empty(t *testing.T) {
for _, test := range []struct {
name string
data []byte
}{
{"nil", nil},
{"zero_bytes", []byte{}},
{"whitespace", []byte(" ")},
} {
t.Run(test.name, func(t *testing.T) {
d, err := ParseDocument(test.data)

t.Log(err)
if err == nil {
t.Error("expected error")
} else if want, got := "document has no content", err.Error(); want != got {
t.Errorf("unexpected error: %q (expected %q)", got, want)
}
if d != nil {
t.Error("expected document to be nil")
}
})
}
}
7 changes: 7 additions & 0 deletions discovery/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package discovery_v1

import (
"errors"

"github.com/google/gnostic/compiler"
)

Expand All @@ -29,6 +31,11 @@ func ParseDocument(b []byte) (*Document, error) {
if err != nil {
return nil, err
}

if len(info.Content) < 1 {
return nil, errors.New("document has no content")
}

root := info.Content[0]
return NewDocument(root, compiler.NewContext("$root", root, nil))
}
7 changes: 7 additions & 0 deletions openapiv2/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package openapi_v2

import (
"errors"

"gopkg.in/yaml.v3"

"github.com/google/gnostic/compiler"
Expand All @@ -26,6 +28,11 @@ func ParseDocument(b []byte) (*Document, error) {
if err != nil {
return nil, err
}

if len(info.Content) < 1 {
return nil, errors.New("document has no content")
}

root := info.Content[0]
return NewDocument(root, compiler.NewContextWithExtensions("$root", root, nil, nil))
}
Expand Down
42 changes: 42 additions & 0 deletions openapiv2/document_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright 2023 Google LLC. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package openapi_v2

import "testing"

func TestParseDocument_Empty(t *testing.T) {
for _, test := range []struct {
name string
data []byte
}{
{"nil", nil},
{"zero_bytes", []byte{}},
{"whitespace", []byte(" ")},
} {
t.Run(test.name, func(t *testing.T) {
d, err := ParseDocument(test.data)

t.Log(err)
if err == nil {
t.Error("expected error")
} else if want, got := "document has no content", err.Error(); want != got {
t.Errorf("unexpected error: %q (expected %q)", got, want)
}
if d != nil {
t.Error("expected document to be nil")
}
})
}
}
7 changes: 7 additions & 0 deletions openapiv3/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package openapi_v3

import (
"errors"

"gopkg.in/yaml.v3"

"github.com/google/gnostic/compiler"
Expand All @@ -26,6 +28,11 @@ func ParseDocument(b []byte) (*Document, error) {
if err != nil {
return nil, err
}

if len(info.Content) < 1 {
return nil, errors.New("document has no content")
}

root := info.Content[0]
return NewDocument(root, compiler.NewContextWithExtensions("$root", root, nil, nil))
}
Expand Down
25 changes: 25 additions & 0 deletions openapiv3/openapiv3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,28 @@ func TestParseDocument(t *testing.T) {
t.Errorf("unexpected value for Title: %s (expected %s)", d.Info.Title, title)
}
}

func TestParseDocument_Empty(t *testing.T) {
for _, test := range []struct {
name string
data []byte
}{
{"nil", nil},
{"zero_bytes", []byte{}},
{"whitespace", []byte(" ")},
} {
t.Run(test.name, func(t *testing.T) {
d, err := ParseDocument(test.data)

t.Log(err)
if err == nil {
t.Error("expected error")
} else if want, got := "document has no content", err.Error(); want != got {
t.Errorf("unexpected error: %q (expected %q)", got, want)
}
if d != nil {
t.Error("expected document to be nil")
}
})
}
}

0 comments on commit dd1001c

Please sign in to comment.