mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

http: fix redirect for servers returning lowercase 'location:' header

Browse Source
This commit is contained in:
Louis Schmieder 2020-06-07 23:01:20 +02:00 committed by GitHub
parent 8c8df66986
commit 2cad6db9f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vlib/net/http/http.v
View File

@ -41,7 +41,8 @@ pub mut:
pub struct Response { pub struct Response {
pub: pub:
text string text string
headers map[string]string headers map[string]string // original response headers, 'Set-Cookie' or 'set-Cookie', etc.
lheaders map[string]string // same as headers, but with normalized lowercased keys, like 'set-cookie'
cookies map[string]string cookies map[string]string
status_code int status_code int
} }
@ -228,7 +229,7 @@ pub fn (req &Request) do() ?Response {
break break
} }
// follow any redirects // follow any redirects
mut redirect_url := resp.headers['Location'] mut redirect_url := resp.lheaders['location']
if redirect_url.len > 0 && redirect_url[0] == `/` { if redirect_url.len > 0 && redirect_url[0] == `/` {
url.set_path(redirect_url) or { url.set_path(redirect_url) or {
return error('http.request.do: invalid path in redirect: "$redirect_url"') return error('http.request.do: invalid path in redirect: "$redirect_url"')
@ -278,6 +279,7 @@ fn (req &Request) method_and_url_to_response(method string, url urllib.URL) ?Res
fn parse_response(resp string) Response { fn parse_response(resp string) Response {
// TODO: Header data type // TODO: Header data type
mut headers := map[string]string{} mut headers := map[string]string{}
mut lheaders := map[string]string{}
// TODO: Cookie data type // TODO: Cookie data type
mut cookies := map[string]string{} mut cookies := map[string]string{}
first_header := resp.all_before('\n') first_header := resp.all_before('\n')
@ -309,20 +311,25 @@ fn parse_response(resp string) Response {
// if h.contains('Content-Type') { // if h.contains('Content-Type') {
// continue // continue
// } // }
key := h[..pos]
mut key := h[..pos]
lkey := key.to_lower()
val := h[pos + 2..] val := h[pos + 2..]
if key == 'Set-Cookie' { if lkey == 'set-cookie' {
parts := val.trim_space().split('=') parts := val.trim_space().split('=')
cookies[parts[0]] = parts[1] cookies[parts[0]] = parts[1]
} }
headers[key] = val.trim_space() tval := val.trim_space()
headers[key] = tval
lheaders[lkey] = tval
} }
if headers['Transfer-Encoding'] == 'chunked' || headers['Content-Length'] == '' { if lheaders['transfer-encoding'] == 'chunked' || lheaders['content-length'] == '' {
text = chunked.decode(text) text = chunked.decode(text)
} }
return Response{ return Response{
status_code: status_code status_code: status_code
headers: headers headers: headers
lheaders: lheaders
cookies: cookies cookies: cookies
text: text text: text
} }