OrcLib: Temporary: add UtilDeleteTemporaryDirectory

Added for Flashback.
DFIR-ORC · Nov 9, 2020 · ee6c571 · ee6c571
1 parent b65d734
commit ee6c571
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/OrcLib/Temporary.cpp b/src/OrcLib/Temporary.cpp
@@ -604,6 +604,27 @@ HRESULT ORCLIB_API Orc::UtilDeleteTemporaryFile(LPCWSTR pszPath)
     return S_OK;
 }
 
+HRESULT ORCLIB_API Orc::UtilDeleteTemporaryDirectory(const std::filesystem::path& path)
+{
+    for (auto& p : std::filesystem::directory_iterator(path))
+    {
+        if (auto hr = UtilDeleteTemporaryFile(p.path()); FAILED(hr))
+            Log::Error(L"Failed to delete temp file {} (hr:{:#010x})", p.path(), hr);
+    }
+
+    if (!RemoveDirectory(path.c_str()))
+    {
+        Log::Error(L"Failed to delete temp dir {} (hr:{:#010x})", path, HRESULT_FROM_WIN32(GetLastError()));
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
+    return S_OK;
+}
+
+HRESULT ORCLIB_API Orc::UtilDeleteTemporaryFile(const std::filesystem::path& path)
+{
+    return UtilDeleteTemporaryFile(path.c_str());
+}
+
 HRESULT ORCLIB_API Orc::UtilDeleteTemporaryFile(__in LPCWSTR pszPath, DWORD dwMaxRetries)
 {
     HRESULT hr = E_FAIL;

diff --git a/src/OrcLib/Temporary.h b/src/OrcLib/Temporary.h
@@ -51,6 +51,9 @@ HRESULT ORCLIB_API UtilGetPath(__in PCWSTR pwzDir, __in PCWSTR pwzDesiredName, _
 BOOL ORCLIB_API UtilPathIsDirectory(__in PCWSTR pwszPath);
 
 HRESULT ORCLIB_API UtilDeleteTemporaryFile(LPCWSTR pszPath);
+HRESULT ORCLIB_API UtilDeleteTemporaryFile(const std::filesystem::path& path);
+
+HRESULT ORCLIB_API UtilDeleteTemporaryDirectory(const std::filesystem::path& path);
 
 static constexpr auto DELETION_RETRIES = 50;