-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Pass hostkey & port to host verify callback
Co-authored-by: Stefan Karpinski <stefan@karpinski.org>
- Loading branch information
commit f68b40c0af9c7c5c2c8740fe4a8fbcba367e0087
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -651,6 +651,8 @@ static int check_against_known_hosts( | |
return ret; | ||
} | ||
|
||
#define SSH_DEFAULT_PORT 22 | ||
|
||
/* | ||
* Perform the check for the session's certificate against known hosts if | ||
* possible and then ask the user if they have a callback. | ||
|
@@ -748,23 +750,29 @@ static int check_certificate( | |
if (check_cb != NULL) { | ||
git_cert_hostkey *cert_ptr = &cert; | ||
git_error_state previous_error = {0}; | ||
const char *host_ptr = host; | ||
git_str host_and_port = GIT_STR_INIT; | ||
|
||
if (port != SSH_DEFAULT_PORT) { | ||
git_str_printf(&host_and_port, "%s:%d", host, port); | ||
host_ptr = host_and_port.ptr; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should use our
|
||
|
||
git_error_state_capture(&previous_error, error); | ||
error = check_cb((git_cert *) cert_ptr, cert_valid, host, check_cb_payload); | ||
error = check_cb((git_cert *) cert_ptr, cert_valid, host_ptr, check_cb_payload); | ||
if (error == GIT_PASSTHROUGH) { | ||
error = git_error_state_restore(&previous_error); | ||
} else if (error < 0 && !git_error_last()) { | ||
git_error_set(GIT_ERROR_NET, "unknown remote host key"); | ||
} | ||
|
||
git_error_state_free(&previous_error); | ||
git_str_dispose(&host_and_port); | ||
} | ||
|
||
return error; | ||
} | ||
|
||
#define SSH_DEFAULT_PORT "22" | ||
|
||
static int _git_ssh_setup_conn( | ||
ssh_subtransport *t, | ||
const char *url, | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_git_ssh_setup_conn sets port to -1 to indicate default but here it is compared to SSH_DEFAULT_PORT that is defined as 22.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does. But
git_net_url_parse
and friends should enforce that the port is a number, and set them to the default if the port number is omitted. So theport = -1
should never be reached. As a result, I changed thestrtol
failure to an actual error. Good catch, thanks!