Skip to content
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

Fix IndexDefect in httpclient and fix parsing of multiline headers #19262

Closed
wants to merge 5 commits into from
Closed

Fix IndexDefect in httpclient and fix parsing of multiline headers #19262

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efe2a4f
Fix #19261
Dec 17, 2021
80bdfce
No need for mgetOrPut
Dec 17, 2021
227cf4f
Follow the casing for headers, error out on index out of bounds
Dec 17, 2021
f67ed12
Ignore non-header lines like browsers do
Dec 24, 2021
b38c21a
Merge branch 'devel' into fix-headers
Jun 30, 2023
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
21 changes: 15 additions & 6 deletions lib/pure/httpclient.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ proc parseResponse(client: HttpClient | AsyncHttpClient,
var parsedStatus = false
var linei = 0
var fullyRead = false
var prevHeader = ""
var line = ""
result.headers = newHttpHeaders()
while true:
Expand Down Expand Up @@ -840,13 +841,21 @@ proc parseResponse(client: HttpClient | AsyncHttpClient,
else:
# Parse headers
var name = ""
var le = parseUntil(line, name, ':', linei)
if le <= 0: httpError("invalid headers")
inc(linei, le)
if line[linei] != ':': httpError("invalid headers")
inc(linei) # Skip :
var leadingSpaces = skipWhitespace(line, linei)
if leadingSpaces == 0:
var le = parseUntil(line, name, ':', linei)
if le <= 0 or le >= line.len: httpError("invalid headers")
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

le >= line.len makes httpclient a little more stricter regarding random lines it finds in the response - basically, if the response is like:

Header-One: value
Header-Two: value
somerandomname

httpclient will error out on somerandomname. Chromium and Firefox don't error out on that and just skip the line - should we follow them or throw an error?

prevHeader = name
inc(linei, le)
if line[linei] != ':': httpError("invalid headers")
inc(linei) # Skip :
result.headers.add(name, line[linei .. ^1].strip())
# If there are spaces before the header name, it's actually a value
# that should be appended to the previous header, see bug #19261
# Also, if there was no header before this, we just ignore the line
elif prevHeader != "":
result.headers.table[result.headers.toCaseInsensitive(prevHeader)][^1].add line.strip()
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We know that prevHeader is already in the table because we check if it's empty or not.


result.headers.add(name, line[linei .. ^1].strip())
if result.headers.len > headerLimit:
httpError("too many headers")

Expand Down
2 changes: 1 addition & 1 deletion lib/pure/httpcore.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func toTitleCase(s: string): string =
result[i] = if upper: toUpperAscii(s[i]) else: toLowerAscii(s[i])
upper = s[i] == '-'

func toCaseInsensitive(headers: HttpHeaders, s: string): string {.inline.} =
func toCaseInsensitive*(headers: HttpHeaders, s: string): string {.inline.} =
return if headers.isTitleCase: toTitleCase(s) else: toLowerAscii(s)

func newHttpHeaders*(titleCase=false): HttpHeaders =
Expand Down