8000 Pass hostkey & port to host verify callback by fxcoudert · Pull Request #6503 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
Skip to content

Pass hostkey & port to host verify callback #6503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 24, 2023
Merged

Pass hostkey & port to host verify callback #6503

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2bdef6
net: parse urls or scp style paths in the same function
Feb 24, 2023
f68b40c
Pass hostkey & port to host verify callback
fxcoudert Feb 24, 2023
43e84e2
tests: validate host and port for ssh tests when non-standard
Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
tests: validate host and port for ssh tests when non-standard
  • Loading branch information
@ethomson
Edward Thomson authored and ethomson committed Feb 24, 2023
commit 43e84e246cc716ac51a276945b5b112b21d802d1
12 changes: 11 additions & 1 deletion tests/libgit2/online/clone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,10 +787,19 @@ static int ssh_certificate_check(git_cert *cert, int valid, const char *host, vo
{
git_cert_hostkey *key;
git_oid expected = GIT_OID_SHA1_ZERO, actual = GIT_OID_SHA1_ZERO;
git_str expected_host = GIT_STR_INIT;
git_net_url parsed_url = GIT_NET_URL_INIT;

GIT_UNUSED(valid);
GIT_UNUSED(payload);

cl_git_pass(git_net_url_parse_standard_or_scp(&parsed_url, _remote_url));
cl_git_pass(git_str_printf(&expected_host, "%s%s%s",
parsed_url.host,
git_net_url_is_default_port(&parsed_url) ? "" : ":",
git_net_url_is_default_port(&parsed_url) ? "" : parsed_url.port));
cl_assert_equal_s(expected_host.ptr, host);

cl_assert(_remote_ssh_fingerprint);

cl_git_pass(git_oid__fromstrp(&expected, _remote_ssh_fingerprint, GIT_OID_SHA1));
Expand All @@ -812,7 +821,8 @@ static int ssh_certificate_check(git_cert *cert, int valid, const char *host, vo

cl_assert(!memcmp(&expected, &actual, 20));

cl_assert_equal_s("localhost", host);
git_net_url_dispose(&parsed_url);
git_str_dispose(&expected_host);

return GIT_EUSER;
}
Expand Down
0