From 8173eff78b88953ae530ee99860b0543affebd1e Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 22 May 2024 13:56:56 -0400 Subject: [PATCH] Make SSL_select_next_proto more robust to invalid calls. SSL_select_next_proto has some fairly complex preconditions: - The peer and supported list must be valid protocol lists - The supported list must not be empty. The peer list may be empty due to one of NPN's edge cases. In the context of how this function is meant to be used, these are reasonable preconditions. The caller should not serialize its own list wrong, and it makes no sense to try to negotiate a protocol when you don't support any protocols. In particular, it complicates NPN's weird "opportunistic" protocol. However, the preconditions are unchecked and a bit subtle. Violating them will result in memory errors. Bad syntax on the protocol lists is mostly not a concern (you should encode your own list correctly and the library checks the peer's list), but the second rule is somewhat of a mess in practice: Despite having the same precondition in reality, OpenSSL did not document this. Their documentation implies things which are impossible without this precondition, but they forgot to actually write down the precondition. There's an added complexity that OpenSSL never updated the parameter names to match the role reversal between ALPN and NPN. There are thus a few cases where a buggy caller may pass an empty "supported" list. - An NPN client called SSL_select_next_proto despite not actually supporting any NPN protocols. - An NPN client called SSL_select_next_proto, flipped the parameters, and the server advertised no protocols. - An ALPN server called SSL_select_next_proto, passed its own list in as the second parameter, despite not actually supporting any ALPN protocols. In these scenarios, the "opportunistic" protocol returned in the OPENSSL_NPN_NO_OVERLAP case will be out of bounds. If the caller discards it, this does not matter. If the caller returns it through the NPN or ALPN selection callback, they have a problem. ALPN servers are expected to discard it, though some may be buggy. NPN clients may implement either behavior. Older versions of some callers have exhibited variations on the above mistakes, so empirically folks don't always get it right. OpenSSL's wrong documentation also does not help matters. Instead, have SSL_select_next_proto just check these preconditions. That is not a performance-sensitive function and these preconditions are easy to check. While I'm here, rewrite it with CBS so it is much more straightforwardly correct. What to return when the preconditions fail is tricky, but we need to output *some* protocol, so we output the empty protocol. This, per the previous test and doc fixes, is actually fine in NPN, so one of the above buggy callers is not retroactively made OK. But it is not fine in ALPN, so we still need to document that callers need to avoid this state. To that end, revamp the documentation a bit. Thanks to Joe Birr-Pixton for reporting this! Fixed: 735 Change-Id: I4378a082385e7334e6abaa6705e6b15d6843f6c5 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/69028 Reviewed-by: Bob Beck Commit-Queue: David Benjamin (cherry picked from commit c1d9ac02514a138129872a036e3f8a1074dcb8bd) --- include/openssl/ssl.h | 52 ++++++++++++++++++++++++++++---------- ssl/extensions.cc | 17 ++++++++----- ssl/internal.h | 5 ++++ ssl/ssl_lib.cc | 59 +++++++++++++++++++++++++++---------------- ssl/ssl_test.cc | 37 ++++++++++++++++++++++++++- 5 files changed, 127 insertions(+), 43 deletions(-) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 82e1da8e4b..8e047f826e 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2764,7 +2764,8 @@ OPENSSL_EXPORT int SSL_set_alpn_protos(SSL *ssl, const uint8_t *protos, // SSL_CTX_set_alpn_select_cb sets a callback function on |ctx| that is called // during ClientHello processing in order to select an ALPN protocol from the -// client's list of offered protocols. +// client's list of offered protocols. |SSL_select_next_proto| is an optional +// utility function which may be useful in implementing this callback. // // The callback is passed a wire-format (i.e. a series of non-empty, 8-bit // length-prefixed strings) ALPN protocol list in |in|. To select a protocol, @@ -2928,7 +2929,8 @@ OPENSSL_EXPORT void SSL_CTX_set_next_protos_advertised_cb( // set to point to the selected protocol (which may be within |in|). The length // of the protocol name must be written into |*out_len|. The server's advertised // protocols are provided in |in| and |in_len|. The callback can assume that -// |in| is syntactically valid. +// |in| is syntactically valid. |SSL_select_next_proto| is an optional utility +// function which may be useful in implementing this callback. // // The client must select a protocol. It is fatal to the connection if this // callback returns a value other than |SSL_TLSEXT_ERR_OK|. @@ -2950,21 +2952,45 @@ OPENSSL_EXPORT void SSL_get0_next_proto_negotiated(const SSL *ssl, const uint8_t **out_data, unsigned *out_len); -// SSL_select_next_proto implements the standard protocol selection. It is -// expected that this function is called from the callback set by +// SSL_select_next_proto implements the standard protocol selection for either +// ALPN servers or NPN clients. It is expected that this function is called from +// the callback set by |SSL_CTX_set_alpn_select_cb| or // |SSL_CTX_set_next_proto_select_cb|. // -// |peer| and |supported| must be vectors of 8-bit, length-prefixed byte strings -// containing the peer and locally-configured protocols, respectively. The -// length byte itself is not included in the length. A byte string of length 0 -// is invalid. No byte string may be truncated. |supported| is assumed to be -// non-empty. -// -// This function finds the first protocol in |peer| which is also in -// |supported|. If one was found, it sets |*out| and |*out_len| to point to it -// and returns |OPENSSL_NPN_NEGOTIATED|. Otherwise, it returns +// |peer| and |supported| contain the peer and locally-configured protocols, +// respectively. This function finds the first protocol in |peer| which is also +// in |supported|. If one was found, it sets |*out| and |*out_len| to point to +// it and returns |OPENSSL_NPN_NEGOTIATED|. Otherwise, it returns // |OPENSSL_NPN_NO_OVERLAP| and sets |*out| and |*out_len| to the first // supported protocol. +// +// In ALPN, the server should only select protocols among those that the client +// offered. Thus, if this function returns |OPENSSL_NPN_NO_OVERLAP|, the caller +// should ignore |*out| and return |SSL_TLSEXT_ERR_ALERT_FATAL| from +// |SSL_CTX_set_alpn_select_cb|'s callback to indicate there was no match. +// +// In NPN, the client may either select one of the server's protocols, or an +// "opportunistic" protocol as described in Section 6 of +// draft-agl-tls-nextprotoneg-03. When this function returns +// |OPENSSL_NPN_NO_OVERLAP|, |*out| implicitly selects the first supported +// protocol for use as the opportunistic protocol. The caller may use it, +// ignore it and select a different opportunistic protocol, or ignore it and +// select no protocol (empty string). +// +// |peer| and |supported| must be vectors of 8-bit, length-prefixed byte +// strings. The length byte itself is not included in the length. A byte string +// of length 0 is invalid. No byte string may be truncated. |supported| must be +// non-empty; a caller that supports no ALPN/NPN protocols should skip +// negotiating the extension, rather than calling this function. If any of these +// preconditions do not hold, this function will return |OPENSSL_NPN_NO_OVERLAP| +// and set |*out| and |*out_len| to an empty buffer for robustness, but callers +// are not recommended to rely on this. An empty buffer is not a valid output +// for |SSL_CTX_set_alpn_select_cb|'s callback. +// +// WARNING: |*out| and |*out_len| may alias either |peer| or |supported| and may +// not be used after one of those buffers is modified or released. Additionally, +// this function is not const-correct for compatibility reasons. Although |*out| +// is a non-const pointer, callers may not modify the buffer though |*out|. OPENSSL_EXPORT int SSL_select_next_proto(uint8_t **out, uint8_t *out_len, const uint8_t *peer, unsigned peer_len, const uint8_t *supported, diff --git a/ssl/extensions.cc b/ssl/extensions.cc index 6fec445844..4e0b07f3bf 100644 --- a/ssl/extensions.cc +++ b/ssl/extensions.cc @@ -1522,16 +1522,19 @@ bool ssl_is_alpn_protocol_allowed(const SSL_HANDSHAKE *hs, } // Check that the protocol name is one of the ones we advertised. - CBS client_protocol_name_list = - MakeConstSpan(hs->config->alpn_client_proto_list), - client_protocol_name; - while (CBS_len(&client_protocol_name_list) > 0) { - if (!CBS_get_u8_length_prefixed(&client_protocol_name_list, - &client_protocol_name)) { + return ssl_alpn_list_contains_protocol(hs->config->alpn_client_proto_list, + protocol); +} + +bool ssl_alpn_list_contains_protocol(Span list, + Span protocol) { + CBS cbs = list, candidate; + while (CBS_len(&cbs) > 0) { + if (!CBS_get_u8_length_prefixed(&cbs, &candidate)) { return false; } - if (client_protocol_name == protocol) { + if (candidate == protocol) { return true; } } diff --git a/ssl/internal.h b/ssl/internal.h index b984fcb60f..19f7f17227 100644 --- a/ssl/internal.h +++ b/ssl/internal.h @@ -2203,6 +2203,11 @@ bool ssl_is_valid_alpn_list(Span in); bool ssl_is_alpn_protocol_allowed(const SSL_HANDSHAKE *hs, Span protocol); +// ssl_alpn_list_contains_protocol returns whether |list|, a serialized ALPN +// protocol list, contains |protocol|. +bool ssl_alpn_list_contains_protocol(Span list, + Span protocol); + // ssl_negotiate_alpn negotiates the ALPN extension, if applicable. It returns // true on successful negotiation or if nothing was negotiated. It returns false // and sets |*out_alert| to an alert on error. diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc index 03864e1ea0..27017bf4bd 100644 --- a/ssl/ssl_lib.cc +++ b/ssl/ssl_lib.cc @@ -2133,34 +2133,49 @@ int SSL_CTX_set_tlsext_servername_arg(SSL_CTX *ctx, void *arg) { int SSL_select_next_proto(uint8_t **out, uint8_t *out_len, const uint8_t *peer, unsigned peer_len, const uint8_t *supported, unsigned supported_len) { - const uint8_t *result; - int status; + *out = nullptr; + *out_len = 0; + + // Both |peer| and |supported| must be valid protocol lists, but |peer| may be + // empty in NPN. + auto peer_span = MakeConstSpan(peer, peer_len); + auto supported_span = MakeConstSpan(supported, supported_len); + if ((!peer_span.empty() && !ssl_is_valid_alpn_list(peer_span)) || + !ssl_is_valid_alpn_list(supported_span)) { + return OPENSSL_NPN_NO_OVERLAP; + } // For each protocol in peer preference order, see if we support it. - for (unsigned i = 0; i < peer_len;) { - for (unsigned j = 0; j < supported_len;) { - if (peer[i] == supported[j] && - OPENSSL_memcmp(&peer[i + 1], &supported[j + 1], peer[i]) == 0) { - // We found a match - result = &peer[i]; - status = OPENSSL_NPN_NEGOTIATED; - goto found; - } - j += supported[j]; - j++; + CBS cbs = peer_span, proto; + while (CBS_len(&cbs) != 0) { + if (!CBS_get_u8_length_prefixed(&cbs, &proto) || CBS_len(&proto) == 0) { + return OPENSSL_NPN_NO_OVERLAP; + } + + if (ssl_alpn_list_contains_protocol(MakeConstSpan(supported, supported_len), + proto)) { + // This function is not const-correct for compatibility with existing + // callers. + *out = const_cast(CBS_data(&proto)); + // A u8 length prefix will fit in |uint8_t|. + *out_len = static_cast(CBS_len(&proto)); + return OPENSSL_NPN_NEGOTIATED; } - i += peer[i]; - i++; } - // There's no overlap between our protocols and the peer's list. - result = supported; - status = OPENSSL_NPN_NO_OVERLAP; + // There's no overlap between our protocols and the peer's list. In ALPN, the + // caller is expected to fail the connection with no_application_protocol. In + // NPN, the caller is expected to opportunistically select the first protocol. + // See draft-agl-tls-nextprotoneg-04, section 6. + cbs = supported_span; + if (!CBS_get_u8_length_prefixed(&cbs, &proto) || CBS_len(&proto) == 0) { + return OPENSSL_NPN_NO_OVERLAP; + } -found: - *out = (uint8_t *)result + 1; - *out_len = result[0]; - return status; + // See above. + *out = const_cast(CBS_data(&proto)); + *out_len = static_cast(CBS_len(&proto)); + return OPENSSL_NPN_NO_OVERLAP; } void SSL_get0_next_proto_negotiated(const SSL *ssl, const uint8_t **out_data, diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc index ee14a5ac4b..c6f05498c1 100644 --- a/ssl/ssl_test.cc +++ b/ssl/ssl_test.cc @@ -4780,17 +4780,52 @@ TEST(SSLTest, SelectNextProto) { (const uint8_t *)"\3ccc\2bb\1a", 9)); EXPECT_EQ(Bytes("a"), Bytes(result, result_len)); - // If there is no overlap, return the first local protocol. + // If there is no overlap, opportunistically select the first local protocol. + // ALPN callers should ignore this, but NPN callers may use this per + // draft-agl-tls-nextprotoneg-03, section 6. EXPECT_EQ(OPENSSL_NPN_NO_OVERLAP, SSL_select_next_proto(&result, &result_len, (const uint8_t *)"\1a\2bb\3ccc", 9, (const uint8_t *)"\1x\2yy\3zzz", 9)); EXPECT_EQ(Bytes("x"), Bytes(result, result_len)); + // The peer preference order may be empty in NPN. This should be treated as no + // overlap and continue to select an opportunistic protocol. EXPECT_EQ(OPENSSL_NPN_NO_OVERLAP, SSL_select_next_proto(&result, &result_len, nullptr, 0, (const uint8_t *)"\1x\2yy\3zzz", 9)); EXPECT_EQ(Bytes("x"), Bytes(result, result_len)); + + // Although calling this function with no local protocols is a caller error, + // it should cleanly return an empty protocol. + EXPECT_EQ( + OPENSSL_NPN_NO_OVERLAP, + SSL_select_next_proto(&result, &result_len, + (const uint8_t *)"\1a\2bb\3ccc", 9, nullptr, 0)); + EXPECT_EQ(Bytes(""), Bytes(result, result_len)); + + // Syntax errors are similarly caller errors. + EXPECT_EQ( + OPENSSL_NPN_NO_OVERLAP, + SSL_select_next_proto(&result, &result_len, (const uint8_t *)"\4aaa", 4, + (const uint8_t *)"\1a\2bb\3ccc", 9)); + EXPECT_EQ(Bytes(""), Bytes(result, result_len)); + EXPECT_EQ(OPENSSL_NPN_NO_OVERLAP, + SSL_select_next_proto(&result, &result_len, + (const uint8_t *)"\1a\2bb\3ccc", 9, + (const uint8_t *)"\4aaa", 4)); + EXPECT_EQ(Bytes(""), Bytes(result, result_len)); + + // Protocols in protocol lists may not be empty. + EXPECT_EQ(OPENSSL_NPN_NO_OVERLAP, + SSL_select_next_proto(&result, &result_len, + (const uint8_t *)"\0\2bb\3ccc", 8, + (const uint8_t *)"\1a\2bb\3ccc", 9)); + EXPECT_EQ(OPENSSL_NPN_NO_OVERLAP, + SSL_select_next_proto(&result, &result_len, + (const uint8_t *)"\1a\2bb\3ccc", 9, + (const uint8_t *)"\0\2bb\3ccc", 8)); + EXPECT_EQ(Bytes(""), Bytes(result, result_len)); } TEST(SSLTest, SealRecord) {