diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2020-07-08 17:51:40 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2020-12-18 19:02:05 +0100 |
| commit | 97be873d782c5e9aaa8b4f4f4e6e18805d0fa51c (patch) | |
| tree | e04d92ccbba4e17b1e6b8655df0de8defed98bcb /test/integration/framework | |
| parent | ece7f5bb0afee0994a4fb4380e756ce725fe67a9 (diff) | |
Proper URI encoding for config requests to our test webserver
Our http method encodes the URI again which results in the double
encoding we have unwrap in the webserver (we did already, but we skip
the filename handling now which does the first decode).
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/framework b/test/integration/framework index e30fa066c..20173da23 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1327,14 +1327,13 @@ webserverconfig() { local DOWNLOG="${TMPWORKINGDIRECTORY}/rootdir/tmp/download-testfile.log" local STATUS="${TMPWORKINGDIRECTORY}/downloaded/webserverconfig.status" rm -f "$STATUS" "$DOWNLOG" - # very very basic URI encoding local URI if [ -n "$2" ]; then msgtest "Set webserver config option '${1}' to" "$2" - URI="${WEBSERVER}/_config/set/$(echo "${1}" | sed -e 's/\//%2f/g')/$(echo "${2}" | sed -e 's/\//%2f/g')" + URI="${WEBSERVER}/_config/set/$(apthelper quote-string "${1}" '/?#')/$(apthelper quote-string "${2}" '/?#')" else msgtest 'Clear webserver config option' "${1}" - URI="${WEBSERVER}/_config/clear/$(echo "${1}" | sed -e 's/\//%2f/g')" + URI="${WEBSERVER}/_config/clear/$(apthelper quote-string "${1}" '/?#')" fi if downloadfile "$URI" "$STATUS" > "$DOWNLOG"; then msgpass |