Skip to content

fix unbounded memory consumption vulnerability #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkaho merged 3 commits into from
Jul 18, 2022
Merged

fix unbounded memory consumption vulnerability #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72a6fa7
reject request based on file size
helenamariano Jun 10, 2022
e092cdc
wrap readers in io.LimitedReader
Jul 17, 2022
47bf1d7
move maxBytes to limit.go
Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func ConvertDocx(r io.Reader) (string, map[string]string, error) {
size = si.Size()
ra = f
} else {
b, err := ioutil.ReadAll(r)
b, err := ioutil.ReadAll(io.LimitReader(r, maxBytes))
if err != nil {
return "", nil, nil
}
Expand Down
3 changes: 3 additions & 0 deletions limit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package docconv

const maxBytes = 20 << 20 // 20MB
2 changes: 1 addition & 1 deletion odt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func ConvertODT(r io.Reader) (string, map[string]string, error) {
meta := make(map[string]string)
var textBody string

b, err := ioutil.ReadAll(r)
b, err := ioutil.ReadAll(io.LimitReader(r, maxBytes))
if err != nil {
return "", nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func ConvertPages(r io.Reader) (string, map[string]string, error) {
meta := make(map[string]string)
var textBody string

b, err := ioutil.ReadAll(r)
b, err := ioutil.ReadAll(io.LimitReader(r, maxBytes))
if err != nil {
return "", nil, fmt.Errorf("error reading data: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions xml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func ConvertXML(r io.Reader) (string, map[string]string, error) {
func XMLToText(r io.Reader, breaks []string, skip []string, strict bool) (string, error) {
var result string

dec := xml.NewDecoder(r)
dec := xml.NewDecoder(io.LimitReader(r, maxBytes))
dec.Strict = strict
for {
t, err := dec.Token()
Expand Down Expand Up @@ -76,7 +76,7 @@ func XMLToText(r io.Reader, breaks []string, skip []string, strict bool) (string
// XMLToMap converts XML to a nested string map.
func XMLToMap(r io.Reader) (map[string]string, error) {
m := make(map[string]string)
dec := xml.NewDecoder(r)
dec := xml.NewDecoder(io.LimitReader(r, maxBytes))
var tagName string
for {
t, err := dec.Token()
Expand Down