mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
net.http.chunked: return !string
on decode (#18928)
This commit is contained in:
parent
8b4c3fa1d1
commit
36d45c6d14
@ -46,13 +46,16 @@ fn (mut s ChunkScanner) skip_crlf() {
|
|||||||
s.pos += 2
|
s.pos += 2
|
||||||
}
|
}
|
||||||
|
|
||||||
fn (mut s ChunkScanner) read_chunk(chunksize u32) string {
|
fn (mut s ChunkScanner) read_chunk(chunksize u32) !string {
|
||||||
startpos := s.pos
|
startpos := s.pos
|
||||||
s.pos += int(chunksize)
|
s.pos += int(chunksize)
|
||||||
|
if s.pos > s.text.len {
|
||||||
|
return error('invalid chunksize')
|
||||||
|
}
|
||||||
return s.text[startpos..s.pos]
|
return s.text[startpos..s.pos]
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn decode(text string) string {
|
pub fn decode(text string) !string {
|
||||||
mut sb := strings.new_builder(100)
|
mut sb := strings.new_builder(100)
|
||||||
mut cscanner := ChunkScanner{
|
mut cscanner := ChunkScanner{
|
||||||
pos: 0
|
pos: 0
|
||||||
@ -64,7 +67,8 @@ pub fn decode(text string) string {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
cscanner.skip_crlf()
|
cscanner.skip_crlf()
|
||||||
sb.write_string(cscanner.read_chunk(csize))
|
ch := cscanner.read_chunk(csize)!
|
||||||
|
sb.write_string(ch)
|
||||||
cscanner.skip_crlf()
|
cscanner.skip_crlf()
|
||||||
}
|
}
|
||||||
cscanner.skip_crlf()
|
cscanner.skip_crlf()
|
||||||
|
16
vlib/net/http/chunked/dechunk_test.v
Normal file
16
vlib/net/http/chunked/dechunk_test.v
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
module chunked
|
||||||
|
|
||||||
|
fn test_invalid_chunk() {
|
||||||
|
mut is_failure := false
|
||||||
|
|
||||||
|
decode('eee') or { is_failure = true }
|
||||||
|
|
||||||
|
assert is_failure
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test_valid_chunk() {
|
||||||
|
chunks := '4\r\nWiki\r\n7\r\npedia i\r\nB\r\nn \r\nchunks.\r\n0\r\n\r\n'
|
||||||
|
str := decode(chunks) or { panic('uh oh') }
|
||||||
|
|
||||||
|
assert str == 'Wikipedia in \r\nchunks.'
|
||||||
|
}
|
@ -42,7 +42,7 @@ pub fn parse_response(resp string) !Response {
|
|||||||
header := parse_headers(resp.substr(start_idx, end_idx))!
|
header := parse_headers(resp.substr(start_idx, end_idx))!
|
||||||
mut body := resp.substr(end_idx, resp.len)
|
mut body := resp.substr(end_idx, resp.len)
|
||||||
if header.get(.transfer_encoding) or { '' } == 'chunked' {
|
if header.get(.transfer_encoding) or { '' } == 'chunked' {
|
||||||
body = chunked.decode(body)
|
body = chunked.decode(body)!
|
||||||
}
|
}
|
||||||
return Response{
|
return Response{
|
||||||
http_version: version
|
http_version: version
|
||||||
|
Loading…
Reference in New Issue
Block a user