SERVER-98593 Add a fallback error code for when we get SSL_ERROR_SYSCALL without an associated error (#30759)

GitOrigin-RevId: 59fa9c2b8778e7fdf14f204701432413128e67dc

Author: adamtron

src/mongo/util/net/ssl/detail/impl/engine_openssl.ipp

@@ -2,7 +2,7 @@
 // ssl/detail/impl/engine.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2019 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -190,12 +190,16 @@ engine::want engine::perform(int (engine::*op)(void*, std::size_t),
 
     if (ssl_error == SSL_ERROR_SSL) {
         ec = asio::error_code(sys_error, asio::error::get_ssl_category());
-        return want_nothing;
+        return pending_output_after > pending_output_before ? want_output : want_nothing;
     }
 
     if (ssl_error == SSL_ERROR_SYSCALL) {
-        ec = asio::error_code(sys_error, asio::error::get_system_category());
-        return want_nothing;
+        if (sys_error == 0) {
+            ec = asio::ssl::error::unspecified_system_error;
+        } else {
+            ec = asio::error_code(sys_error, asio::error::get_ssl_category());
+        }
+        return pending_output_after > pending_output_before ? want_output : want_nothing;
     }
 
     if (result > 0 && bytes_transferred)
@@ -210,12 +214,15 @@ engine::want engine::perform(int (engine::*op)(void*, std::size_t),
     } else if (ssl_error == SSL_ERROR_WANT_READ) {
         ec = asio::error_code();
         return want_input_and_retry;
-    } else if (::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) {
+    } else if (ssl_error == SSL_ERROR_ZERO_RETURN) {
         ec = asio::error::eof;
         return want_nothing;
-    } else {
+    } else if (ssl_error == SSL_ERROR_NONE) {
         ec = asio::error_code();
         return want_nothing;
+    } else {
+        ec = asio::ssl::error::unexpected_result;
+        return want_nothing;
     }
 }
 

src/mongo/util/net/ssl/error.hpp

@@ -43,15 +43,27 @@ namespace error {
 enum stream_errors {
 #if defined(GENERATING_DOCUMENTATION)
     /// The underlying stream closed before the ssl stream gracefully shut down.
-    stream_truncated,
-    no_renegotiation
-#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) && !defined(OPENSSL_IS_BORINGSSL) && \
+    stream_truncated = 0,
+
+    /// The underlying SSL library returned a system error without providing
+    /// further information.
+    unspecified_system_error = 1,
+
+    /// The underlying SSL library generated an unexpected result from a function
+    /// call.
+    unexpected_result = 2,
+    no_renegotiation = 8,
+#else  // defined(GENERATING_DOCUMENTATION)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) && !defined(OPENSSL_IS_BORINGSSL) && \
     MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_OPENSSL
-    stream_truncated = ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ)
+    stream_truncated = ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ),
 #else
     stream_truncated = 1,
-    no_renegotiation
+    no_renegotiation = 8,
 #endif
+    unspecified_system_error = 2,
+    unexpected_result = 3
+#endif  // defined(GENERATING_DOCUMENTATION)
 };
 
 extern ASIO_DECL const asio::error_category& get_stream_category();

src/mongo/util/net/ssl/impl/error.ipp

@@ -91,6 +91,10 @@ public:
         switch (value) {
             case stream_truncated:
                 return "stream truncated";
+            case unspecified_system_error:
+                return "unspecified system error";
+            case unexpected_result:
+                return "unexpected result";
             default:
                 return "asio.ssl.stream error";
         }