Improved log messages for AdmissionWebhook request failures

Author: Keukhan

src/projects/modules/access_control/access_controller.cpp

@@ -196,12 +196,25 @@ std::tuple<AccessController::VerificationResult, std::shared_ptr<const Admission
 		[&request_info](const ov::String &control_server_url_address,
 						const std::shared_ptr<const ov::SocketAddress> &client_address,
 						const std::shared_ptr<const AdmissionWebhooks> &admission_webhooks) {
-			logti("AdmissionWebhooks queried %s whether client %s could access %s. (Result : %s Elapsed : %u ms)",
-				  control_server_url_address.CStr(),
-				  client_address->ToString(false).CStr(),
-				  request_info->GetRequestedUrl()->ToUrlString().CStr(),
-				  (admission_webhooks->GetErrCode() == AdmissionWebhooks::ErrCode::ALLOWED) ? "Allow" : "Reject",
-				  admission_webhooks->GetElapsedTime());
+			if (admission_webhooks->GetErrCode() == AdmissionWebhooks::ErrCode::ALLOWED ||
+				admission_webhooks->GetErrCode() == AdmissionWebhooks::ErrCode::DENIED)
+			{
+				logti("AdmissionWebhook queried %s for client %s accessing %s (Result: %s, Elapsed: %u ms)",
+					  control_server_url_address.CStr(),
+					  client_address->ToString(false).CStr(),
+					  request_info->GetRequestedUrl()->ToUrlString().CStr(),
+					  admission_webhooks->GetErrCodeString().CStr(),
+					  admission_webhooks->GetElapsedTime());
+			}
+			else 
+			{
+				logtw("Failed to query AdmissionWebhook %s for client %s accessing %s (Result: %s, Elapsed: %u ms)",
+					  control_server_url_address.CStr(),
+					  client_address->ToString(false).CStr(),
+					  request_info->GetRequestedUrl()->ToUrlString().CStr(),
+					  admission_webhooks->GetErrCodeString().CStr(),
+					  admission_webhooks->GetElapsedTime());
+			}
 		});
 }
 
@@ -229,12 +242,25 @@ std::tuple<AccessController::VerificationResult, std::shared_ptr<const Admission
 		[&request_info](const ov::String &control_server_url_address,
 						const std::shared_ptr<const ov::SocketAddress> &client_address,
 						const std::shared_ptr<const AdmissionWebhooks> &admission_webhooks) {
-			logti("AdmissionWebhooks notified %s that client %s has closed the connection to %s. (Response : %s Elapsed : %u ms)",
-				  control_server_url_address.CStr(),
-				  client_address->ToString(false).CStr(),
-				  request_info->GetRequestedUrl()->ToUrlString().CStr(),
-				  (admission_webhooks->GetErrCode() == AdmissionWebhooks::ErrCode::ALLOWED) ? "Allow" : "Reject",
-				  admission_webhooks->GetElapsedTime());
+			if (admission_webhooks->GetErrCode() == AdmissionWebhooks::ErrCode::ALLOWED ||
+				admission_webhooks->GetErrCode() == AdmissionWebhooks::ErrCode::DENIED)
+			{
+				logti("AdmissionWebhook notified %s that client %s closed the connection to %s (Result: %s, Elapsed: %u ms)",
+					  control_server_url_address.CStr(),
+					  client_address->ToString(false).CStr(),
+					  request_info->GetRequestedUrl()->ToUrlString().CStr(),
+					  admission_webhooks->GetErrCodeString().CStr(),
+					  admission_webhooks->GetElapsedTime());
+			}
+			else 
+			{
+				logtw("Failed to notify AdmissionWebhook %s that client %s closed the connection to %s (Result: %s, Elapsed: %u ms)",
+					  control_server_url_address.CStr(),
+					  client_address->ToString(false).CStr(),
+					  request_info->GetRequestedUrl()->ToUrlString().CStr(),
+					  admission_webhooks->GetErrCodeString().CStr(),
+					  admission_webhooks->GetElapsedTime());
+			}
 		});
 }
 

src/projects/modules/access_control/admission_webhooks/admission_webhooks.cpp

@@ -47,6 +47,25 @@ AdmissionWebhooks::ErrCode AdmissionWebhooks::GetErrCode() const
 	return _err_code;
 }
 
+ov::String AdmissionWebhooks::GetErrCodeString() const
+{
+	switch (_err_code)
+	{
+	case ErrCode::ALLOWED:
+		return "Allowed";
+	case ErrCode::DENIED:
+		return "Denied";
+	case ErrCode::INVALID_DATA_FORMAT:
+		return "InvalidDataFormat";
+	case ErrCode::INVALID_STATUS_CODE:
+		return "InvalidStatusCode";
+	case ErrCode::INTERNAL_ERROR:
+		return "InternalError";
+	default:
+		return "Unknown";
+	}
+}
+
 ov::String AdmissionWebhooks::GetErrReason() const
 {
 	return _err_reason;

src/projects/modules/access_control/admission_webhooks/admission_webhooks.h

@@ -54,6 +54,7 @@ class AdmissionWebhooks
 													const Status::Code status);
 
 	ErrCode GetErrCode() const;
+	ov::String GetErrCodeString() const;
 	ov::String GetErrReason() const;
 	std::shared_ptr<ov::Url> GetNewURL() const;
 	uint64_t GetLifetime() const;