t5516: move plaintext-password tests from t5601 and t5516

Commit 6dcbdc0d66 (remote: create fetch.credentialsInUrl config, 2022-06-06) added tests for our handling of passwords in URLs. Since the obvious URL to be affected is git-over-http, the tests use http. However they don't set up a test server; they just try to access https://localhost, assuming it will fail (because the nothing is listening there). This causes some possible problems: - There might be a web server running on localhost, and we do not actually want to connect to that. - The DNS resolver, or the local firewall, might take a substantial amount of time (or forever, whichever comes first) to fail to connect, slowing down the tests cases unnecessarily. - Since there's no server, our tests for "allow" and "warn" still expect the clone/fetch/push operations to fail, even though in the real world we'd expect these to succeed. We scrape stderr to see what happened, but it's not as robust as a more realistic test. Let's instead move these to t5551, which is all about testing http and where we have a real server. That eliminates any issues with contacting a strange URL, and lets the "allow" and "warn" tests confirm that the operation actually succeeds. It's not quite a verbatim move for a few reasons: - we can drop the LIBCURL dependency; it's already part of lib-httpd.sh - we'll use HTTPD_URL_USER_PASS, etc, instead of our fake URL. To avoid repetition, we'll add a few extra variables. - the "https://username:@localhost" test uses a funny URL that lib-httpd.sh doesn't provide. We'll similarly construct it in a variable. Note that we're hard-coding the lib-httpd username here, but t5551 already does that everywhere. - for the "domain:port" test, the URL provided by lib-httpd is fine, since our test server will always be on an exotic port. But we'll confirm in the test that this is so. - since our message-matching is done via grep, I simplified it to use a regex, rather than trying to massage lib-httpd's variables. Arguably this makes it more readable, too, while retaining the bits we care about: the fatal/warning distinction, the "uses plaintext" message, and the fact that the password was redacted. - we'll use the /auth/ path for the repo, which shows that we are indeed making use of the auth information when needed. - we'll also use /smart/; most of these tests could be done via /dumb/ in t5550, but setting up pushes there requires extra effort and dependencies. The smart protocol is what most everyone is using these days anyway. This patch is my own, but I stole the analysis and a few bits of the commit message from a patch by Johannes Schindelin. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com>

Jeff King committed Oct 31, 2022 at 22:26 UTC 762521e8a5a6948501d56d51da3f70df4f3dfdbe
3 files changed +77 -54
t/t5516-fetch-push.sh
-31
@@ -1853,37 +1853,6 @@ test_expect_success 'refuse to push a hidden ref, and make sure do not pollute t
1853 test_dir_is_empty testrepo/.git/objects/pack
1854 '
1855
1856 -test_expect_success LIBCURL 'fetch warns or fails when using username:password' '
1857 - message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
1858 - test_must_fail git -c transfer.credentialsInUrl=allow fetch https://username:password@localhost 2>err &&
1859 - ! grep "$message" err &&
1860 -
1861 - test_must_fail git -c transfer.credentialsInUrl=warn fetch https://username:password@localhost 2>err &&
1862 - grep "warning: $message" err >warnings &&
1863 - test_line_count = 3 warnings &&
1864 -
1865 - test_must_fail git -c transfer.credentialsInUrl=die fetch https://username:password@localhost 2>err &&
1866 - grep "fatal: $message" err >warnings &&
1867 - test_line_count = 1 warnings &&
1868 -
1869 - test_must_fail git -c transfer.credentialsInUrl=die fetch https://username:@localhost 2>err &&
1870 - grep "fatal: $message" err >warnings &&
1871 - test_line_count = 1 warnings
1872 -'
1873 -
1874 -
1875 -test_expect_success LIBCURL 'push warns or fails when using username:password' '
1876 - message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
1877 - test_must_fail git -c transfer.credentialsInUrl=allow push https://username:password@localhost 2>err &&
1878 - ! grep "$message" err &&
1879 -
1880 - test_must_fail git -c transfer.credentialsInUrl=warn push https://username:password@localhost 2>err &&
1881 - grep "warning: $message" err >warnings &&
1882 - test_must_fail git -c transfer.credentialsInUrl=die push https://username:password@localhost 2>err &&
1883 - grep "fatal: $message" err >warnings &&
1884 - test_line_count = 1 warnings
1885 -'
1886 -
1856 test_expect_success 'push with config push.useBitmaps' '
1857 mk_test testrepo heads/main &&
1858 git checkout main &&
t/t5551-http-fetch-smart.sh
+77
@@ -580,4 +580,81 @@ test_expect_success 'passing hostname resolution information works' '
580 git -c "http.curloptResolve=$BOGUS_HOST:$LIB_HTTPD_PORT:127.0.0.1" ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null
581 '
582
583 +# here user%40host is the URL-encoded version of user@host,
584 +# which is our intentionally-odd username to catch parsing errors
585 +url_user=$HTTPD_URL_USER/auth/smart/repo.git
586 +url_userpass=$HTTPD_URL_USER_PASS/auth/smart/repo.git
587 +url_userblank=$HTTPD_PROTO://user%40host:@$HTTPD_DEST/auth/smart/repo.git
588 +message="URL .*:<redacted>@.* uses plaintext credentials"
589 +
590 +test_expect_success 'clone warns or fails when using username:password' '
591 + test_when_finished "rm -rf attempt*" &&
592 +
593 + git -c transfer.credentialsInUrl=allow \
594 + clone $url_userpass attempt1 2>err &&
595 + ! grep "$message" err &&
596 +
597 + git -c transfer.credentialsInUrl=warn \
598 + clone $url_userpass attempt2 2>err &&
599 + grep "warning: $message" err >warnings &&
600 + test_line_count = 2 warnings &&
601 +
602 + test_must_fail git -c transfer.credentialsInUrl=die \
603 + clone $url_userpass attempt3 2>err &&
604 + grep "fatal: $message" err >warnings &&
605 + test_line_count = 1 warnings &&
606 +
607 + test_must_fail git -c transfer.credentialsInUrl=die \
608 + clone $url_userblank attempt4 2>err &&
609 + grep "fatal: $message" err >warnings &&
610 + test_line_count = 1 warnings
611 +'
612 +
613 +test_expect_success 'clone does not detect username:password when it is https://username@domain:port/' '
614 + test_when_finished "rm -rf attempt1" &&
615 +
616 + # we are relying on lib-httpd for url construction, so document our
617 + # assumptions
618 + case "$HTTPD_URL_USER" in
619 + *:[0-9]*) : ok ;;
620 + *) BUG "httpd url does not have port: $HTTPD_URL_USER"
621 + esac &&
622 +
623 + git -c transfer.credentialsInUrl=warn clone $url_user attempt1 2>err &&
624 + ! grep "uses plaintext credentials" err
625 +'
626 +
627 +test_expect_success 'fetch warns or fails when using username:password' '
628 + git -c transfer.credentialsInUrl=allow fetch $url_userpass 2>err &&
629 + ! grep "$message" err &&
630 +
631 + git -c transfer.credentialsInUrl=warn fetch $url_userpass 2>err &&
632 + grep "warning: $message" err >warnings &&
633 + test_line_count = 3 warnings &&
634 +
635 + test_must_fail git -c transfer.credentialsInUrl=die \
636 + fetch $url_userpass 2>err &&
637 + grep "fatal: $message" err >warnings &&
638 + test_line_count = 1 warnings &&
639 +
640 + test_must_fail git -c transfer.credentialsInUrl=die \
641 + fetch $url_userblank 2>err &&
642 + grep "fatal: $message" err >warnings &&
643 + test_line_count = 1 warnings
644 +'
645 +
646 +
647 +test_expect_success 'push warns or fails when using username:password' '
648 + git -c transfer.credentialsInUrl=allow push $url_userpass 2>err &&
649 + ! grep "$message" err &&
650 +
651 + git -c transfer.credentialsInUrl=warn push $url_userpass 2>err &&
652 + grep "warning: $message" err >warnings &&
653 +
654 + test_must_fail git -c transfer.credentialsInUrl=die \
655 + push $url_userpass 2>err &&
656 + grep "fatal: $message" err >warnings &&
657 + test_line_count = 1 warnings
658 +'
659 +
660 test_done
t/t5601-clone.sh
-23
@@ -71,29 +71,6 @@ test_expect_success 'clone respects GIT_WORK_TREE' '
71
72 '
73
74 -test_expect_success LIBCURL 'clone warns or fails when using username:password' '
75 - message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
76 - test_must_fail git -c transfer.credentialsInUrl=allow clone https://username:password@localhost attempt1 2>err &&
77 - ! grep "$message" err &&
78 -
79 - test_must_fail git -c transfer.credentialsInUrl=warn clone https://username:password@localhost attempt2 2>err &&
80 - grep "warning: $message" err >warnings &&
81 - test_line_count = 2 warnings &&
82 -
83 - test_must_fail git -c transfer.credentialsInUrl=die clone https://username:password@localhost attempt3 2>err &&
84 - grep "fatal: $message" err >warnings &&
85 - test_line_count = 1 warnings &&
86 -
87 - test_must_fail git -c transfer.credentialsInUrl=die clone https://username:@localhost attempt3 2>err &&
88 - grep "fatal: $message" err >warnings &&
89 - test_line_count = 1 warnings
90 -'
91 -
92 -test_expect_success LIBCURL 'clone does not detect username:password when it is https://username@domain:port/' '
93 - test_must_fail git -c transfer.credentialsInUrl=warn clone https://username@localhost:8080 attempt3 2>err &&
94 - ! grep "uses plaintext credentials" err
95 -'
96 -
74 test_expect_success 'clone from hooks' '
75
76 test_create_repo r0 &&