issue-2732: correct issues

ydb-platform · Dec 25, 2024 · 6774585 · 6774585
1 parent 7e848ee
commit 6774585
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_change_agent_state.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_change_agent_state.cpp
@@ -96,8 +96,7 @@ void TChangeAgentStateActor::Notify(
                          << "&AgentID=" << AgentID,
         alertLevel);
 
-    auto response =
-        std::make_unique<NMon::TEvRemoteHttpInfoRes>(std::move(out.Str()));
+    auto response = std::make_unique<NMon::TEvRemoteHttpInfoRes>(out.Str());
     NCloud::Reply(ctx, *RequestInfo, std::move(response));
 }
 
@@ -190,7 +189,12 @@ void TDiskRegistryActor::HandleHttpInfo_ChangeAgentState(
         return;
     }
 
-    if (newState == NProto::EAgentState::AGENT_STATE_UNAVAILABLE) {
+    static const THashSet<NProto::EAgentState> NewStateWhiteList = {
+        NProto::EAgentState::AGENT_STATE_ONLINE,
+        NProto::EAgentState::AGENT_STATE_WARNING,
+    };
+
+    if (!NewStateWhiteList.contains(newState)) {
         RejectHttpRequest(ctx, *requestInfo, "Invalid new state");
         return;
     }

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_change_device_state.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_change_device_state.cpp
@@ -97,8 +97,7 @@ void TChangeDeviceStateActor::Notify(
                          << "&DeviceUUID=" << DeviceUUID,
         alertLevel);
 
-    auto response =
-        std::make_unique<NMon::TEvRemoteHttpInfoRes>(std::move(out.Str()));
+    auto response = std::make_unique<NMon::TEvRemoteHttpInfoRes>(out.Str());
     NCloud::Reply(ctx, *RequestInfo, std::move(response));
 }
 
@@ -192,7 +191,12 @@ void TDiskRegistryActor::HandleHttpInfo_ChangeDeviseState(
         return;
     }
 
-    if (newState == NProto::EDeviceState::DEVICE_STATE_ERROR) {
+    static const THashSet<NProto::EDeviceState> NewStateWhiteList = {
+        NProto::EDeviceState::DEVICE_STATE_ONLINE,
+        NProto::EDeviceState::DEVICE_STATE_WARNING,
+    };
+
+    if (!NewStateWhiteList.contains(newState)) {
         RejectHttpRequest(ctx, *requestInfo, "Invalid new state");
         return;
     }