-
Notifications
You must be signed in to change notification settings - Fork 1.6k
[SSH] Update error message for OpenSSH version incompatility #9777
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
Closed
vthiebaut10
wants to merge
1
commit into
Azure:main
from
vthiebaut10:vthiebaut/update_incompatibility_error_message
Closed
Changes from all commits
Commits
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
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 |
|---|---|---|
|
|
@@ -251,14 +251,16 @@ def _check_for_known_errors(error_message, delete_cert, log_lines): | |
| (local_major > 8 or (local_major == 8 and local_minor >= 8)): | ||
| logger.warning("The OpenSSH server version in the target VM %d.%d is too old. " | ||
| "Version incompatible with OpenSSH client version %d.%d. " | ||
| "Refer to https://bugzilla.mindrot.org/show_bug.cgi?id=3351 for more information.", | ||
| "Refer to \"Potentially-incompatible changes\" in " | ||
| "https://www.openssh.org/txt/release-8.8 for more information.", | ||
| remote_major, remote_minor, local_major, local_minor) | ||
|
|
||
| elif (local_major < 7 or (local_major == 7 and local_minor < 8)) and \ | ||
| (remote_major > 8 or (remote_major == 8 and remote_minor >= 8)): | ||
| logger.warning("The OpenSSH client version %d.%d is too old. " | ||
| "Version incompatible with OpenSSH server version %d.%d in the target VM. " | ||
| "Refer to https://bugzilla.mindrot.org/show_bug.cgi?id=3351 for more information.", | ||
| "Refer to \"Potentially-incompatible changes\" in " | ||
| "https://www.openssh.org/txt/release-8.8 for more information.", | ||
| local_major, local_minor, remote_major, remote_minor) | ||
|
Comment on lines
260
to
264
|
||
|
|
||
| regex = ("{\"level\":\"fatal\",\"msg\":\"sshproxy: error copying information from the connection: " | ||
|
|
||
Oops, something went wrong.
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.
The same reference text/URL is duplicated across both warnings. To reduce drift and make future updates easier, store the reference (section text + URL) in a single constant (or local variable) and reuse it in both logger.warning calls.