Merge pull request #852 from baemyung/1060-catchup-bug-fixes

1060: Catching up a few bug fixes
ibm-openbmc · Mar 15, 2024 · b5d73b0 · b5d73b0
2 parents 54c3869 + 0115b6d
commit b5d73b0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/http/http_client.hpp b/http/http_client.hpp
@@ -380,6 +380,16 @@ class ConnectionInfo : public std::enable_shared_from_this<ConnectionInfo>
         unsigned int respCode = parser->get().result_int();
         BMCWEB_LOG_DEBUG << "recvMessage() Header Response Code: " << respCode;
 
+        // Handle the case of stream_truncated.  Some servers close the ssl
+        // connection uncleanly, so check to see if we got a full response
+        // before we handle this as an error.
+        if (!parser->is_done())
+        {
+            state = ConnState::recvFailed;
+            waitAndRetry();
+            return;
+        }
+
         // Make sure the received response code is valid as defined by
         // the associated retry policy
         if (connPolicy->invalidResp(respCode))
@@ -499,12 +509,13 @@ class ConnectionInfo : public std::enable_shared_from_this<ConnectionInfo>
         // Let's close the connection and restart from resolve.
         shutdownConn(true);
     }
+
     void restartConnection()
     {
         BMCWEB_LOG_DEBUG << host << ":" << std::to_string(port)
                          << ", id: " << std::to_string(connId)
                          << " restartConnection ";
-        conn = makeConnection(ioc, sslConn.has_value());
+        initializeConnection(sslConn.has_value());
         doResolve();
     }
     void shutdownConn(bool retry)
@@ -612,11 +623,11 @@ class ConnectionInfo : public std::enable_shared_from_this<ConnectionInfo>
             return;
         }
     }
-    std::unique_ptr<boost::asio::ip::tcp::socket>
-        makeConnection(boost::asio::io_context& iocIn, bool useSsl)
+
+    void initializeConnection(bool ssl)
     {
-        auto newconn = std::make_unique<boost::asio::ip::tcp::socket>(iocIn);
-        if (useSsl)
+        conn = std::make_unique<boost::asio::ip::tcp::socket>(ioc);
+        if (ssl)
         {
             /* std::optional<boost::asio::ssl::context> sslCtx =
                 ensuressl::getSSLClientContext();
@@ -636,10 +647,9 @@ class ConnectionInfo : public std::enable_shared_from_this<ConnectionInfo>
             } */
             boost::asio::ssl::context sslCtx{
                 boost::asio::ssl::context::tlsv13_client};
-            sslConn.emplace(*newconn.get(), sslCtx);
+            sslConn.emplace(*conn.get(), sslCtx);
             setCipherSuiteTLSext();
         }
-        return newconn;
     }
 
   public:
@@ -650,9 +660,10 @@ class ConnectionInfo : public std::enable_shared_from_this<ConnectionInfo>
         unsigned int connIdIn) :
         subId(idIn),
         connPolicy(connPolicyIn), host(destIPIn), port(destPortIn),
-        connId(connIdIn), ioc(iocIn), conn(makeConnection(iocIn, useSSL)),
-        timer(iocIn)
-    {}
+        connId(connIdIn), ioc(iocIn), timer(iocIn)
+    {
+        initializeConnection(useSSL);
+    }
 };
 
 class ConnectionPool : public std::enable_shared_from_this<ConnectionPool>

diff --git a/http/http_response.hpp b/http/http_response.hpp
@@ -153,7 +153,7 @@ struct Response
     {
         BMCWEB_LOG_DEBUG << this << " Clearing response containers";
         stringResponse.emplace(response_type{});
-        jsonValue.clear();
+        jsonValue = nullptr;
         completed = false;
         expectedHash = std::nullopt;
     }
@@ -244,7 +244,7 @@ struct Response
         addHeader(boost::beast::http::field::etag, hexVal);
         if (expectedHash && hexVal == *expectedHash)
         {
-            jsonValue.clear();
+            jsonValue = nullptr;
             result(boost::beast::http::status::not_modified);
         }
     }

diff --git a/http/websocket.hpp b/http/websocket.hpp
@@ -187,6 +187,11 @@ class ConnectionImpl : public Connection
                        [weak(weak_from_this()), onDone{std::move(onDone)}](
                            const boost::beast::error_code& ec, size_t) {
             std::shared_ptr<Connection> self = weak.lock();
+            if (!self)
+            {
+                BMCWEB_LOG_ERROR << "Connection went away";
+                return;
+            }
 
             // Call the done handler regardless of whether we
             // errored, but before we close things out

diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
@@ -349,7 +349,6 @@ inline void
         if (ec)
         {
             BMCWEB_LOG_ERROR << ec;
-            asyncResp->res.jsonValue.clear();
             messages::internalError(asyncResp->res);
             return;
         }