wsd: wopiAccessCheck, remove unused CheckStatus, hook NotHttpSuccess

Signed-off-by: Méven Car <[email protected]> Change-Id: Ic022614625bfa3aa0a5b819fda1adcf50c7465d1
CollaboraOnline · Jan 2, 2025 · 45ae2e2 · 45ae2e2
1 parent c0c8909
commit 45ae2e2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/wsd/ClientRequestDispatcher.cpp b/wsd/ClientRequestDispatcher.cpp
@@ -1108,10 +1108,8 @@ STATE_ENUM(CheckStatus,
     NotHttpSuccess,
     HostNotFound,
     WopiHostNotAllowed,
-    HostUnReachable,
     UnspecifiedError,
     ConnectionAborted,
-    ConnectionRefused,
     CertificateValidation,
     SSLHandshakeFail,
     MissingSsl,
@@ -1289,15 +1287,17 @@ bool ClientRequestDispatcher::handleWopiAccessCheckRequest(const Poco::Net::HTTP
     {
         LOG_TRC("finishHandler ");
 
-        CheckStatus status = CheckStatus::Ok;
         const auto lastErrno = errno;
 
-        const auto httpResponse = probeSession->response();
-        const auto responseState = httpResponse->state();
+        const std::shared_ptr<http::Response> httpResponse = probeSession->response();
+        const http::Response::State responseState = httpResponse->state();
+        const http::StatusCode statusCode = httpResponse->statusCode();
         LOG_DBG("Wopi Access Check: got response state: " << responseState << " "
-                                            << ", response status code: " <<httpResponse->statusCode() << " "
+                                            << ", response status code: " << statusCode << " "
                                             << ", last errno: " << lastErrno);
 
+        CheckStatus status = statusCode == http::StatusCode::OK ? CheckStatus::Ok: CheckStatus::NotHttpSuccess;
+
         if (responseState != http::Response::State::Complete)
         {
             // are TLS errors here ?