-
Notifications
You must be signed in to change notification settings - Fork 165
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
Implement IP address validation #260
base: main
Are you sure you want to change the base?
Conversation
As a consumer, an example on rustls prior to this PR we have: fn verify_server_cert(...) -> Result<ServerCertVerified, Error> {
...
cert.verify_is_valid_for_dns_name(dns_name.0.as_ref())
.map_err(pki_error)
.map(|_| ServerCertVerified::assertion())
} With this change, this can be changed to: fn verify_server_cert(...) -> Result<ServerCertVerified, Error> {
...
cert.verify_is_valid_for_dns_name_or_ip(Into::<webpki::DnsNameOrIpRef>::into(server_name))
.map_err(pki_error)
.map(|_| ServerCertVerified::assertion())
} This ensures that if |
98183ce
to
54bc1e2
Compare
This would be a great addition! |
54bc1e2
to
22c6184
Compare
7c31c0d
to
c530946
Compare
I agree, I have had to use OpenSSL instead of rustls because of this. I am interested to see the feedback on this PR. |
I need this right now |
Please, let's keep the discussion on this PR to the point. Brian has already done a lot of work pointing to some hints on how this could be implemented. This feature was not in sight for the initial set of responsibilities of webpki, and it comes with some friction. Besides, it also comes with a huge responsibility because once introduced this means that consumers expect for it to be maintained and stable over time. Let's not put more pressure on core library/crates authors, please. I'm sure he got notified and that he will eventually provide feedback on the PR. We know there is some people interested in this feature, but signaling that on new comments that reach the author is not productive and is not helping in introducing this in the project. Also, I'm sorry if the PR itself is also putting pressure on the crate author, I just wanted to implement the feature after looking at the previous opened PR's by Brian himself and propose something that would not be invasive for current users and hopefully future-proof. |
ed20f1f
to
98e0827
Compare
I think a useful addition to this PR would be std-feature-gated construction of |
98e0827
to
ec674f8
Compare
@ctz: Just updated the PR with the conversion from |
ec674f8
to
53a0215
Compare
Hey guys, so what's blocking the merge of this PR? What are the next steps? Is there anything that needs to be changed? |
From my side this is ready to go. |
@ereslibre there is now a fork in the rustls org. Would you be interested in resubmitting your changes there so we can review it? We will consider publishing the next version of rustls with a dependency on our forked rustls-webpki. |
53a0215
to
e9c8e20
Compare
Well, not quite. Updated now and synced with rustls/webpki@main...rustls:webpki:feat-ip-address |
e9c8e20
to
100d575
Compare
Introduce `IpAddressRef`, `DnsNameOrIpRef` and the owned type `IpAddress`. Introduce a new public function `verify_is_valid_for_dns_name_or_ip` that validates a given host name or IP address against a certificate. IP addresses are only compared against Subject Alternative Names. It's possible to convert the already existing types `DnsNameRef` and `IpAddressRef` into a `DnsNameOrIpRef` for better ergonomics when calling to `verify_cert_dns_name_or_ip`. The behavior of `verify_cert_dns_name` has not been altered, and works in the same way as it has done until now, so that if `webpki` gets bumped as a dependency, it won't start accepting certificates that would have been rejected until now without notice. Neither `IpAddressRef`, `DnsNameOrIpRef` nor `IpAddress` can be instantiated directly. They must be instantiated through the `try_from_ascii` and `try_from_ascii_str` public functions. This ensures that instances of these types are correct by construction. IPv6 addresses are only validated and supported in their uncompressed form. Signed-off-by: Rafael Fernández López <[email protected]>
current_textual_octet is [u8; 3] but it was indexed by an unbounded count of octets if they matched 1..9.
rfc5952 says both are allowed.
Seems better to convert from ascii to radix-10 at the time that is known, rather than doing that validation twice (and skipping a digit as an error handling strategy).
100d575
to
61cd0b2
Compare
@ereslibre I actually meant for you to resubmit this as a PR against that repository. Would you be able to do that? |
@djc I can do that without any issue, but I see that rustls/webpki#5 is already open. I synced this PR with that. Do you want me to still open a PR despite rustls/webpki#5 is already submitted? |
Ah, sorry, missed that! Should cover everything then. |
Seems like the author doesn't have any github activity this year. Did he give up? |
Any update on this? |
The rustls project has forked the repo and we are integrating the changes on their fork, that will be consumed by rustls itself. The work related to this is going on at rustls/webpki#5 and rustls/webpki#14 |
This is now implemented in rustls/webpki, as described in rustls/rustls#184. rustls 0.21.0 will allow to validate IP addresses in certificate SANs. I will update this PR with many of the relevant changes and fixes pointed out by the rustls community and that got merged into https://github.com/rustls/webpki. |
Fixes: #54
Introduce
IpAddressRef
,DnsNameOrIpRef
and the owned typeIpAddress
.Introduce a new public function
verify_is_valid_for_dns_name_or_ip
that validates a given host name or IP address against a
certificate. IP addresses are only compared against Subject
Alternative Names.
It's possible to convert the already existing types
DnsNameRef
andIpAddressRef
into aDnsNameOrIpRef
for better ergonomics whencalling to
verify_cert_dns_name_or_ip
.The behavior of
verify_cert_dns_name
has not been altered, and worksin the same way as it has done until now, so that if
webpki
getsbumped as a dependency, it won't start accepting certificates that
would have been rejected until now without notice.
Neither
IpAddressRef
,DnsNameOrIpRef
norIpAddress
can beinstantiated directly. They must be instantiated through the
try_from_ascii
andtry_from_ascii_str
public functions. Thisensures that instances of these types are correct by construction.
IPv6 addresses are only validated and supported in their uncompressed
form.