vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

net.urllib: allow `urllib.parse_query("format=%l")`

pull/9541/head
Delyan Angelov 2021-03-30 20:14:10 +03:00
parent 683eaad66f
commit dcab79146b
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/net/urllib/urllib.v
View File

@ -53,8 +53,9 @@ fn should_escape(c byte, mode EncodingMode) bool {
// we could possibly allow, and parse will reject them if we // we could possibly allow, and parse will reject them if we
// escape them (because hosts can`t use %-encoding for // escape them (because hosts can`t use %-encoding for
// ASCII bytes). // ASCII bytes).
if if c in [`!`, `$`, `&`, `\\`, `(`, `)`, `*`, `+`, `,`, `;`, `=`, `:`, `[`, `]`, `<`, `>`,
c in [`!`, `$`, `&`, `\\`, `(`, `)`, `*`, `+`, `,`, `;`, `=`, `:`, `[`, `]`, `<`, `>`, `"`] { `"`,
] {
return false return false
} }
} }
@ -158,6 +159,11 @@ fn unescape(s_ string, mode EncodingMode) ?string {
} }
n++ n++
if i + 2 >= s.len || !ishex(s[i + 1]) || !ishex(s[i + 2]) { if i + 2 >= s.len || !ishex(s[i + 1]) || !ishex(s[i + 2]) {
if mode == .encode_query_component && i + 1 < s.len {
s = s[..i] + '%25' + s[(i + 1)..]
i += 4 // skip the %25 and the next character
continue
}
s = s[i..] s = s[i..]
if s.len > 3 { if s.len > 3 {
s = s[..3] s = s[..3]
@ -789,7 +795,7 @@ pub fn parse_query(query string) ?Values {
// but any errors will be silent // but any errors will be silent
fn parse_query_silent(query string) Values { fn parse_query_silent(query string) Values {
mut m := new_values() mut m := new_values()
parse_query_values(mut m, query) or { } parse_query_values(mut m, query) or {}
return m return m
} }

29
vlib/net/urllib/urllib_test.v
View File

@ -1,7 +1,6 @@
// Copyright (c) 2019-2021 Alexander Medvednikov. All rights reserved. // Copyright (c) 2019-2021 Alexander Medvednikov. All rights reserved.
// Use of this source code is governed by an MIT license // Use of this source code is governed by an MIT license
// that can be found in the LICENSE file. // that can be found in the LICENSE file.
import net.urllib import net.urllib
fn test_net_urllib() { fn test_net_urllib() {
@ -13,18 +12,14 @@ fn test_net_urllib() {
assert false assert false
return return
} }
assert u.scheme == 'https' && assert u.scheme == 'https' && u.hostname() == 'www.mydomain.com' && u.port() == '8080'
u.hostname() == 'www.mydomain.com' && && u.path == '/som/url' && u.fragment == 'testfragment' && u.user.username == 'joe'
u.port() == '8080' && && u.user.password == 'pass'
u.path == '/som/url' &&
u.fragment == 'testfragment' &&
u.user.username == 'joe' &&
u.user.password == 'pass'
} }
fn test_str() { fn test_str() {
url := urllib.parse("https://en.wikipedia.org/wiki/Brazil_(1985_film)") or { url := urllib.parse('https://en.wikipedia.org/wiki/Brazil_(1985_film)') or {
panic("unable to parse URL") panic('unable to parse URL')
} }
assert url.str() == 'https://en.wikipedia.org/wiki/Brazil_(1985_film)' assert url.str() == 'https://en.wikipedia.org/wiki/Brazil_(1985_film)'
} }
@ -33,6 +28,18 @@ fn test_escape_unescape() {
original := 'те ст: т\\%' original := 'те ст: т\\%'
escaped := urllib.query_escape(original) escaped := urllib.query_escape(original)
assert escaped == '%D1%82%D0%B5+%D1%81%D1%82%3A+%D1%82%5C%25' assert escaped == '%D1%82%D0%B5+%D1%81%D1%82%3A+%D1%82%5C%25'
unescaped := urllib.query_unescape(escaped) or { assert false return } unescaped := urllib.query_unescape(escaped) or {
assert false
return
}
assert unescaped == original assert unescaped == original
} }
fn test_parse_query() ? {
q1 := urllib.parse_query('format=%22%25l%3A+%25c+%25t%22') ?
q2 := urllib.parse_query('format="%l:+%c+%t"') ?
// dump(q1)
// dump(q2)
assert q1.data['format'].data == ['"%l: %c %t"']
assert q2.data['format'].data == ['"%l: %c %t"']
}