Skip to content

Commit

Permalink
language: reject excessively large Accept-Language strings
Browse files Browse the repository at this point in the history
The BCP 47 tag parser has quadratic time complexity due to inherent
aspects of its design. Since the parser is, by design, exposed to
untrusted user input, this can be leveraged to force a program to
consume significant time parsing Accept-Language headers.

The parser cannot be easily rewritten to fix this behavior for
various reasons. Instead the solution implemented in this CL is to
limit the total complexity of tags passed into ParseAcceptLanguage
by limiting the number of dashes in the string to 1000. This should
be more than enough for the majority of real world use cases, where
the number of tags being sent is likely to be in the single digits.

Thanks to the OSS-Fuzz project for discovering this issue and to Adam
Korczynski (ADA Logics) for writing the fuzz case and for reporting the
issue.

Fixes CVE-2022-32149
Fixes golang/go#56152

Change-Id: I7bda1d84cee2b945039c203f26869d58ee9374ae
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1565112
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Tatiana Bradley <tatianabradley@google.com>
Reviewed-on: https://go-review.googlesource.com/c/text/+/442235
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Roland Shoemaker <roland@golang.org>
Run-TryBot: Roland Shoemaker <roland@golang.org>
  • Loading branch information
rolandshoemaker authored and gopherbot committed Oct 11, 2022
1 parent 23407e7 commit 434eadc
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
5 changes: 5 additions & 0 deletions language/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ func update(b *language.Builder, part ...interface{}) (err error) {
}

var errInvalidWeight = errors.New("ParseAcceptLanguage: invalid weight")
var errTagListTooLarge = errors.New("tag list exceeds max length")

// ParseAcceptLanguage parses the contents of an Accept-Language header as
// defined in http://www.ietf.org/rfc/rfc2616.txt and returns a list of Tags and
Expand All @@ -164,6 +165,10 @@ func ParseAcceptLanguage(s string) (tag []Tag, q []float32, err error) {
}
}()

if strings.Count(s, "-") > 1000 {
return nil, nil, errTagListTooLarge
}

var entry string
for s != "" {
if entry, s = split(s, ','); entry == "" {
Expand Down
13 changes: 13 additions & 0 deletions language/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -394,3 +394,16 @@ func TestParseAcceptLanguage(t *testing.T) {
}
}
}

func TestParseAcceptLanguageTooBig(t *testing.T) {
s := strings.Repeat("en-x-a-", 333)
_, _, err := ParseAcceptLanguage(s)
if err != language.ErrSyntax {
t.Errorf("ParseAcceptLanguage() unexpected error: got %v, want %v", err, language.ErrSyntax)
}
s += "en-x-a"
_, _, err = ParseAcceptLanguage(s)
if err != errTagListTooLarge {
t.Errorf("ParseAcceptLanguage() unexpected error: got %v, want %v", err, errTagListTooLarge)
}
}

0 comments on commit 434eadc

Please sign in to comment.