ssh: reject source-address critical option on host certificates - #367
Open
waterWang wants to merge 1 commit into
Open
ssh: reject source-address critical option on host certificates#367waterWang wants to merge 1 commit into
waterWang wants to merge 1 commit into
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes golang/go#80872
Problem
x/crypto/ssh clients will accept a host certificate containing a
source-addresscritical option, which OpenSSH rejects. Thesource-addressoption should only apply to user certificates, not host certificates.Root cause
In
certs.go,CheckCert()unconditionally skips thesource-addresscritical option with the comment "sourceAddressCriticalOption will be enforced by serverAuthenticate", regardless of whether the certificate is a user or host certificate.For user certificates this is correct — the server-side authentication dispatch loop enforces the source-address restriction. But for host certificates,
source-addressis an unsupported critical option that should be rejected.Fix
Check
cert.CertTypein the critical options loop: ifsource-addressappears on aHostCert, return an error instead of skipping it. User certificates continue to skip it as before, preserving the existing server-side enforcement path.Changes
ssh/certs.go: addHostCerttype check forsource-addresscritical option