diff options
author | Alexander Tkachev | 2016-07-07 15:01:07 +0600 |
---|---|---|
committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
commit | 4d88f51de9583d9fcdebe8fc5e90fed61416fe96 (patch) | |
tree | de0cec7ad28cb587faf784a4b4bbe478b38492a8 /backends/networking/sdl_net/localwebserver.cpp | |
parent | 89a1a549822dee5b18d799cd9b8e5a58190aa49d (diff) | |
download | scummvm-rg350-4d88f51de9583d9fcdebe8fc5e90fed61416fe96.tar.gz scummvm-rg350-4d88f51de9583d9fcdebe8fc5e90fed61416fe96.tar.bz2 scummvm-rg350-4d88f51de9583d9fcdebe8fc5e90fed61416fe96.zip |
CLOUD: Add query parameters URL encoding
In local webserver's links.
Fixed URL decoding to understand '+', by the way. Firefox sends these
instead of spaces and "%2B" instead of '+'.
Diffstat (limited to 'backends/networking/sdl_net/localwebserver.cpp')
-rw-r--r-- | backends/networking/sdl_net/localwebserver.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp index cc3f67e208..2880c67d2b 100644 --- a/backends/networking/sdl_net/localwebserver.cpp +++ b/backends/networking/sdl_net/localwebserver.cpp @@ -301,6 +301,11 @@ Common::String LocalWebserver::urlDecode(Common::String value) { Common::String result = ""; uint32 size = value.size(); for (uint32 i = 0; i < size; ++i) { + if (value[i] == '+') { + result += ' '; + continue; + } + if (value[i] == '%' && i+2 < size) { int d1 = hexDigit(value[i+1]); int d2 = hexDigit(value[i+2]); @@ -316,4 +321,36 @@ Common::String LocalWebserver::urlDecode(Common::String value) { return result; } +namespace { +bool isQueryUnreserved(char c) { + return ( + ('0' <= c && c <= '9') || + ('A' <= c && c <= 'Z') || + ('a' <= c && c <= 'z') || + c == '-' || c == '_' || c == '.' || c == '!' || + c == '~' || c == '*' || c == '\'' || c == '(' || c == ')' + ); +} +} + +Common::String LocalWebserver::urlEncodeQueryParameterValue(Common::String value) { + //OK chars = alphanum | "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" + //reserved for query are ";", "/", "?", ":", "@", "&", "=", "+", "," + //that means these must be encoded too or otherwise they could malform the query + Common::String result = ""; + char hexChar[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; + for (uint32 i = 0; i < value.size(); ++i) { + char c = value[i]; + if (isQueryUnreserved(c)) + result += c; + else { + result += '%'; + result += hexChar[(c >> 4) & 0xF]; + result += hexChar[c & 0xF]; + } + } + return result; +} + + } // End of namespace Networking |