From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b --- third_party/git/t/lib-credential.sh | 307 ------------------------------------ 1 file changed, 307 deletions(-) delete mode 100644 third_party/git/t/lib-credential.sh (limited to 'third_party/git/t/lib-credential.sh') diff --git a/third_party/git/t/lib-credential.sh b/third_party/git/t/lib-credential.sh deleted file mode 100644 index dea2cbef5172..000000000000 --- a/third_party/git/t/lib-credential.sh +++ /dev/null @@ -1,307 +0,0 @@ -# Shell library for testing credential handling including helpers. See t0302 -# for an example of testing a specific helper. - -# Try a set of credential helpers; the expected stdin, -# stdout and stderr should be provided on stdin, -# separated by "--". -check() { - credential_opts= - credential_cmd=$1 - shift - for arg in "$@"; do - credential_opts="$credential_opts -c credential.helper='$arg'" - done - read_chunk >stdin && - read_chunk >expect-stdout && - read_chunk >expect-stderr && - if ! eval "git $credential_opts credential $credential_cmd stdout 2>stderr"; then - echo "git credential failed with code $?" && - cat stderr && - false - fi && - test_cmp expect-stdout stdout && - test_i18ncmp expect-stderr stderr -} - -read_chunk() { - while read line; do - case "$line" in - --) break ;; - *) echo "$line" ;; - esac - done -} - -# Clear any residual data from previous tests. We only -# need this when testing third-party helpers which read and -# write outside of our trash-directory sandbox. -# -# Don't bother checking for success here, as it is -# outside the scope of tests and represents a best effort to -# clean up after ourselves. -helper_test_clean() { - reject $1 https example.com store-user - reject $1 https example.com user1 - reject $1 https example.com user2 - reject $1 http path.tld user - reject $1 https timeout.tld user - reject $1 https sso.tld -} - -reject() { - ( - echo protocol=$2 - echo host=$3 - echo username=$4 - ) | git -c credential.helper=$1 credential reject -} - -helper_test() { - HELPER=$1 - - test_expect_success "helper ($HELPER) has no existing data" ' - check fill $HELPER <<-\EOF - protocol=https - host=example.com - -- - protocol=https - host=example.com - username=askpass-username - password=askpass-password - -- - askpass: Username for '\''https://example.com'\'': - askpass: Password for '\''https://askpass-username@example.com'\'': - EOF - ' - - test_expect_success "helper ($HELPER) stores password" ' - check approve $HELPER <<-\EOF - protocol=https - host=example.com - username=store-user - password=store-pass - EOF - ' - - test_expect_success "helper ($HELPER) can retrieve password" ' - check fill $HELPER <<-\EOF - protocol=https - host=example.com - -- - protocol=https - host=example.com - username=store-user - password=store-pass - -- - EOF - ' - - test_expect_success "helper ($HELPER) requires matching protocol" ' - check fill $HELPER <<-\EOF - protocol=http - host=example.com - -- - protocol=http - host=example.com - username=askpass-username - password=askpass-password - -- - askpass: Username for '\''http://example.com'\'': - askpass: Password for '\''http://askpass-username@example.com'\'': - EOF - ' - - test_expect_success "helper ($HELPER) requires matching host" ' - check fill $HELPER <<-\EOF - protocol=https - host=other.tld - -- - protocol=https - host=other.tld - username=askpass-username - password=askpass-password - -- - askpass: Username for '\''https://other.tld'\'': - askpass: Password for '\''https://askpass-username@other.tld'\'': - EOF - ' - - test_expect_success "helper ($HELPER) requires matching username" ' - check fill $HELPER <<-\EOF - protocol=https - host=example.com - username=other - -- - protocol=https - host=example.com - username=other - password=askpass-password - -- - askpass: Password for '\''https://other@example.com'\'': - EOF - ' - - test_expect_success "helper ($HELPER) requires matching path" ' - test_config credential.usehttppath true && - check approve $HELPER <<-\EOF && - protocol=http - host=path.tld - path=foo.git - username=user - password=pass - EOF - check fill $HELPER <<-\EOF - protocol=http - host=path.tld - path=bar.git - -- - protocol=http - host=path.tld - path=bar.git - username=askpass-username - password=askpass-password - -- - askpass: Username for '\''http://path.tld/bar.git'\'': - askpass: Password for '\''http://askpass-username@path.tld/bar.git'\'': - EOF - ' - - test_expect_success "helper ($HELPER) can forget host" ' - check reject $HELPER <<-\EOF && - protocol=https - host=example.com - EOF - check fill $HELPER <<-\EOF - protocol=https - host=example.com - -- - protocol=https - host=example.com - username=askpass-username - password=askpass-password - -- - askpass: Username for '\''https://example.com'\'': - askpass: Password for '\''https://askpass-username@example.com'\'': - EOF - ' - - test_expect_success "helper ($HELPER) can store multiple users" ' - check approve $HELPER <<-\EOF && - protocol=https - host=example.com - username=user1 - password=pass1 - EOF - check approve $HELPER <<-\EOF && - protocol=https - host=example.com - username=user2 - password=pass2 - EOF - check fill $HELPER <<-\EOF && - protocol=https - host=example.com - username=user1 - -- - protocol=https - host=example.com - username=user1 - password=pass1 - EOF - check fill $HELPER <<-\EOF - protocol=https - host=example.com - username=user2 - -- - protocol=https - host=example.com - username=user2 - password=pass2 - EOF - ' - - test_expect_success "helper ($HELPER) can forget user" ' - check reject $HELPER <<-\EOF && - protocol=https - host=example.com - username=user1 - EOF - check fill $HELPER <<-\EOF - protocol=https - host=example.com - username=user1 - -- - protocol=https - host=example.com - username=user1 - password=askpass-password - -- - askpass: Password for '\''https://user1@example.com'\'': - EOF - ' - - test_expect_success "helper ($HELPER) remembers other user" ' - check fill $HELPER <<-\EOF - protocol=https - host=example.com - username=user2 - -- - protocol=https - host=example.com - username=user2 - password=pass2 - EOF - ' - - test_expect_success "helper ($HELPER) can store empty username" ' - check approve $HELPER <<-\EOF && - protocol=https - host=sso.tld - username= - password= - EOF - check fill $HELPER <<-\EOF - protocol=https - host=sso.tld - -- - protocol=https - host=sso.tld - username= - password= - EOF - ' -} - -helper_test_timeout() { - HELPER="$*" - - test_expect_success "helper ($HELPER) times out" ' - check approve "$HELPER" <<-\EOF && - protocol=https - host=timeout.tld - username=user - password=pass - EOF - sleep 2 && - check fill "$HELPER" <<-\EOF - protocol=https - host=timeout.tld - -- - protocol=https - host=timeout.tld - username=askpass-username - password=askpass-password - -- - askpass: Username for '\''https://timeout.tld'\'': - askpass: Password for '\''https://askpass-username@timeout.tld'\'': - EOF - ' -} - -write_script askpass <<\EOF -echo >&2 askpass: $* -what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z) -echo "askpass-$what" -EOF -GIT_ASKPASS="$PWD/askpass" -export GIT_ASKPASS -- cgit 1.4.1