diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-03-21 09:27:25 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-06-26 23:31:15 +0200 |
| commit | e250df1a623fd08f8a5afe2d94bd29a35e872725 (patch) | |
| tree | d6d67c193573f1ebe681226edfed747cb5f5451f /test | |
| parent | f78fb67f4b6a5673e497ba1aeb19568581173909 (diff) | |
| download | apt-e250df1a623fd08f8a5afe2d94bd29a35e872725.tar.gz | |
Show permission error if ProxyAutoDetect cmd can't be executed
As the proxy commands are not executed as root, a user can run into
permission errors (s)he isn't expecting – as our switching is an
implementation detail – so the error message in that case should really
be better than a generic "error code 100" sending the user in the wrong
direction as that implies the command was executed, but errored out.
Closes: 857885
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-helper | 2 | ||||
| -rwxr-xr-x | test/integration/test-bug-717891-abolute-uris-for-proxies | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper index a936243ec..fda28968f 100755 --- a/test/integration/test-apt-helper +++ b/test/integration/test-apt-helper @@ -94,6 +94,8 @@ test_apt_helper_detect_proxy() { W: ProxyAutoDetect command returned an empty line" apthelper auto-detect-proxy http://example.com/ setupproxydetect 'http' 'echo DIRECT' testsuccessequal "Using proxy 'DIRECT' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/ + chmod -x "${TMPWORKINGDIRECTORY}/apt-proxy-detect" + testfailureequal "E: ProxyAutoDetect command '${TMPWORKINGDIRECTORY}/apt-proxy-detect' can not be executed! - access (13: Permission denied)" apthelper auto-detect-proxy http://example.com/ msgmsg "apt-helper $CONFNAME" 'http proxy' setupproxydetect 'http' 'echo "http://some-proxy"' diff --git a/test/integration/test-bug-717891-abolute-uris-for-proxies b/test/integration/test-bug-717891-abolute-uris-for-proxies index 323322283..5f1b7546c 100755 --- a/test/integration/test-bug-717891-abolute-uris-for-proxies +++ b/test/integration/test-bug-717891-abolute-uris-for-proxies @@ -46,3 +46,8 @@ The following NEW packages will be installed: 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst unrelated (0.5~squeeze1 unstable [all]) Conf unrelated (0.5~squeeze1 unstable [all])' aptget install unrelated -s + +chmod 444 "${TMPWORKINGDIRECTORY}/apt-proxy-detect" +msgtest 'Check that non-executable proxy commands result in' 'permission error' +testfailure --nomsg aptget update +testsuccess grep 'can not be executed' rootdir/tmp/testfailure.output |