mirror of
https://github.com/git/git.git
synced 2024-05-19 18:46:09 +02:00
c03859a665
With the added checks for invalid URLs in credentials, any locally modified store files which might have empty lines or even comments were reported[1] failing to parse as valid credentials. Instead of doing a hard check for credentials, do a soft one and therefore avoid the reported fatal error. While at it add tests for all known corruptions that are currently ignored to keep track of them and avoid the risk of regressions. [1] https://stackoverflow.com/a/61420852/5005936 Reported-by: Dirk <dirk@ed4u.de> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Junio C Hamano <gitster@pobox.com> Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
213 lines
5.5 KiB
Bash
Executable File
213 lines
5.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='credential-store tests'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-credential.sh
|
|
|
|
helper_test store
|
|
|
|
test_expect_success 'when xdg file does not exist, xdg file not created' '
|
|
test_path_is_missing "$HOME/.config/git/credentials" &&
|
|
test -s "$HOME/.git-credentials"
|
|
'
|
|
|
|
test_expect_success 'setup xdg file' '
|
|
rm -f "$HOME/.git-credentials" &&
|
|
mkdir -p "$HOME/.config/git" &&
|
|
>"$HOME/.config/git/credentials"
|
|
'
|
|
|
|
helper_test store
|
|
|
|
test_expect_success 'when xdg file exists, home file not created' '
|
|
test -s "$HOME/.config/git/credentials" &&
|
|
test_path_is_missing "$HOME/.git-credentials"
|
|
'
|
|
|
|
test_expect_success 'setup custom xdg file' '
|
|
rm -f "$HOME/.git-credentials" &&
|
|
rm -f "$HOME/.config/git/credentials" &&
|
|
mkdir -p "$HOME/xdg/git" &&
|
|
>"$HOME/xdg/git/credentials"
|
|
'
|
|
|
|
XDG_CONFIG_HOME="$HOME/xdg"
|
|
export XDG_CONFIG_HOME
|
|
helper_test store
|
|
unset XDG_CONFIG_HOME
|
|
|
|
test_expect_success 'if custom xdg file exists, home and xdg files not created' '
|
|
test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
|
|
test -s "$HOME/xdg/git/credentials" &&
|
|
test_path_is_missing "$HOME/.git-credentials" &&
|
|
test_path_is_missing "$HOME/.config/git/credentials"
|
|
'
|
|
|
|
test_expect_success 'get: use home file if both home and xdg files have matches' '
|
|
echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
|
|
mkdir -p "$HOME/.config/git" &&
|
|
echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
|
|
check fill store <<-\EOF
|
|
protocol=https
|
|
host=example.com
|
|
--
|
|
protocol=https
|
|
host=example.com
|
|
username=home-user
|
|
password=home-pass
|
|
--
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'get: use xdg file if home file has no matches' '
|
|
>"$HOME/.git-credentials" &&
|
|
mkdir -p "$HOME/.config/git" &&
|
|
echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
|
|
check fill store <<-\EOF
|
|
protocol=https
|
|
host=example.com
|
|
--
|
|
protocol=https
|
|
host=example.com
|
|
username=xdg-user
|
|
password=xdg-pass
|
|
--
|
|
EOF
|
|
'
|
|
|
|
test_expect_success POSIXPERM,SANITY 'get: use xdg file if home file is unreadable' '
|
|
echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
|
|
chmod -r "$HOME/.git-credentials" &&
|
|
mkdir -p "$HOME/.config/git" &&
|
|
echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
|
|
check fill store <<-\EOF
|
|
protocol=https
|
|
host=example.com
|
|
--
|
|
protocol=https
|
|
host=example.com
|
|
username=xdg-user
|
|
password=xdg-pass
|
|
--
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'store: if both xdg and home files exist, only store in home file' '
|
|
>"$HOME/.git-credentials" &&
|
|
mkdir -p "$HOME/.config/git" &&
|
|
>"$HOME/.config/git/credentials" &&
|
|
check approve store <<-\EOF &&
|
|
protocol=https
|
|
host=example.com
|
|
username=store-user
|
|
password=store-pass
|
|
EOF
|
|
echo "https://store-user:store-pass@example.com" >expected &&
|
|
test_cmp expected "$HOME/.git-credentials" &&
|
|
test_must_be_empty "$HOME/.config/git/credentials"
|
|
'
|
|
|
|
test_expect_success 'erase: erase matching credentials from both xdg and home files' '
|
|
echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
|
|
mkdir -p "$HOME/.config/git" &&
|
|
echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
|
|
check reject store <<-\EOF &&
|
|
protocol=https
|
|
host=example.com
|
|
EOF
|
|
test_must_be_empty "$HOME/.git-credentials" &&
|
|
test_must_be_empty "$HOME/.config/git/credentials"
|
|
'
|
|
|
|
invalid_credential_test() {
|
|
test_expect_success "get: ignore credentials without $1 as invalid" '
|
|
echo "$2" >"$HOME/.git-credentials" &&
|
|
check fill store <<-\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
|
|
'
|
|
}
|
|
|
|
invalid_credential_test "scheme" ://user:pass@example.com
|
|
invalid_credential_test "valid host/path" https://user:pass@
|
|
invalid_credential_test "username/password" https://pass@example.com
|
|
|
|
test_expect_success 'get: credentials with DOS line endings are invalid' '
|
|
printf "https://user:pass@example.com\r\n" >"$HOME/.git-credentials" &&
|
|
check fill store <<-\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 'get: credentials with path and DOS line endings are valid' '
|
|
printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
|
|
check fill store <<-\EOF
|
|
url=https://example.com/repo.git
|
|
--
|
|
protocol=https
|
|
host=example.com
|
|
username=user
|
|
password=pass
|
|
--
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'get: credentials with DOS line endings are invalid if path is relevant' '
|
|
printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
|
|
test_config credential.useHttpPath true &&
|
|
check fill store <<-\EOF
|
|
url=https://example.com/repo.git
|
|
--
|
|
protocol=https
|
|
host=example.com
|
|
path=repo.git
|
|
username=askpass-username
|
|
password=askpass-password
|
|
--
|
|
askpass: Username for '\''https://example.com/repo.git'\'':
|
|
askpass: Password for '\''https://askpass-username@example.com/repo.git'\'':
|
|
--
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'get: store file can contain empty/bogus lines' '
|
|
echo "" >"$HOME/.git-credentials" &&
|
|
q_to_tab <<-\CREDENTIAL >>"$HOME/.git-credentials" &&
|
|
#comment
|
|
Q
|
|
https://user:pass@example.com
|
|
CREDENTIAL
|
|
check fill store <<-\EOF
|
|
protocol=https
|
|
host=example.com
|
|
--
|
|
protocol=https
|
|
host=example.com
|
|
username=user
|
|
password=pass
|
|
--
|
|
EOF
|
|
'
|
|
|
|
test_done
|