1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

http: chunked decoding support

This commit is contained in:
Delyan Angelov 2019-08-07 04:57:47 +03:00 committed by Alexander Medvednikov
parent 6bde860043
commit 7607b00952
3 changed files with 71 additions and 1 deletions

View File

@ -0,0 +1,63 @@
module chunked
import strings
// See: https://en.wikipedia.org/wiki/Chunked_transfer_encoding
///////////////////////////////////////////////////////////////
// The chunk size is transferred as a hexadecimal number
// followed by \r\n as a line separator,
// followed by a chunk of data of the given size.
// The end is marked with a chunk with size 0.
struct ChunkScanner {
mut:
pos int
text string
}
fn (s mut ChunkScanner) read_chunk_size() int {
mut n := 0
for {
if s.pos >= s.text.len { break }
c := s.text[s.pos]
if !c.is_hex_digit() { break }
n = n << 4
n += int(unhex(c))
s.pos++
}
return n
}
fn unhex(c byte) byte {
if `0` <= c && c <= `9` { return c - `0` }
else if `a` <= c && c <= `f` { return c - `a` + 10 }
else if `A` <= c && c <= `F` { return c - `A` + 10 }
return 0
}
fn (s mut ChunkScanner) skip_crlf() {
s.pos += 2
}
fn (s mut ChunkScanner) read_chunk(chunksize int) string {
startpos := s.pos
s.pos += chunksize
return s.text.substr(startpos, s.pos)
}
pub fn decode(text string) string {
mut sb := strings.new_builder(100)
mut cscanner := ChunkScanner {
pos: 0
text: text
}
for {
csize := cscanner.read_chunk_size()
if 0 == csize { break }
cscanner.skip_crlf()
sb.write( cscanner.read_chunk(csize) )
cscanner.skip_crlf()
}
cscanner.skip_crlf()
return sb.str()
}

View File

@ -5,6 +5,7 @@
module http module http
import net.urllib import net.urllib
import http.chunked
struct Request { struct Request {
pub: pub:
@ -142,6 +143,9 @@ pub fn (req &Request) do() Response {
val := h.right(pos + 2) val := h.right(pos + 2)
headers[key] = val.trim_space() headers[key] = val.trim_space()
} }
if headers['Transfer-Encoding'] == 'chunked' {
text = chunked.decode( text )
}
return Response { return Response {
status_code: status_code status_code: status_code
headers: headers headers: headers

View File

@ -19,6 +19,9 @@ fn init_module() {
$if mac { $if mac {
C.SSL_library_init() C.SSL_library_init()
} }
$if linux {
C.SSL_library_init()
}
//C.SSL_load_error_strings() //C.SSL_load_error_strings()
//C.OPENSSL_config(0) //C.OPENSSL_config(0)
} }