Skip to content
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

Jump to bottom

Add partial support for SSH known hosts markers #11635

Merged
merged 7 commits into from
Feb 1, 2023
Merged

Add partial support for SSH known hosts markers #11635

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift click to select a range
fc2cb00
Add partial support for SSH known hosts markers
hds Jan 27, 2023
605506a
Fix format
hds Jan 27, 2023
a871a90
Apply suggestions from code review
hds Jan 30, 2023
26e08ab
Fix host file checking to not return success until all lines have bee…
hds Jan 31, 2023
3cecc8e
Merge branch 'ssh-known-hosts-markers' of github.com:hds/cargo into s…
hds Jan 31, 2023
7a6ff7f
cargo fmt
hds Jan 31, 2023
0acf2bf
avoid recording incorrect host key has changed errors
hds Jan 31, 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
Next Next commit
cargo fmt
  • Loading branch information
@hds
hds committed Jan 31, 2023
commit 7a6ff7f068acde98230d712637e934c58fc84805
9 changes: 7 additions & 2 deletions src/cargo/sources/git/known_hosts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 867,12 @@ mod tests {
SshHostKeyType::Ed255219,
&khs[0].key,
) {
Err(KnownHostError::HostKeyRevoked { hostname, remote_host_key, location, .. }) => {
Err(KnownHostError::HostKeyRevoked {
hostname,
remote_host_key,
location,
..
}) => {
assert_eq!("example.com", hostname);
assert_eq!(
"AAAAC3NzaC1lZDI1NTE5AAAAIKVYJpa0yUGaNk0NXQTPWa0tHjqRpx 7hl2diReH6DtR",
Expand All @@ -877,7 882,7 @@ mod tests {
location,
KnownHostLocation::File { lineno: 4, .. }
));
},
}
_ => panic!("Expected host key to be reject with error HostKeyRevoked."),
}
}
Expand Down