openharmony/accesscontrol_sandbox_manager
1
0
Fork 0
mirror of https://github.com/openharmony/accesscontrol_sandbox_manager.git synced 2026-08-25 11:39:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Unlink symlink before delete sandbox

Browse Source 
Co-Authored-By: Agent
Signed-off-by: xjx <xuejingxuan@huawei.com>
This commit is contained in:
gcw_vVJz6kSm
2026-08-06 10:24:16 +08:00
parent 0ee5682613
commit bb3d6fdffa
1 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/claw_sandbox/src/sandbox_manager.cpp
+43 -30
View File
@@ -370,6 +370,48 @@ int SandboxManager::Initialize(SandboxConfig config, const CmdInfo &cmdInfo)
return SANDBOX_SUCCESS;
}
static int RemoveSandboxDirTree(const std::string &sandboxPath)
{
struct stat st;
if (lstat(sandboxPath.c_str(), &st) != 0) {
if (errno == ENOENT) {
std::cerr << "Error: Sandbox directory does not exist: " << sandboxPath << std::endl;
SANDBOX_LOGE("Sandbox directory does not exist: %{public}s", sandboxPath.c_str());
return SANDBOX_ERR_PATH_INVALID;
}
std::cerr << "Error: Failed to stat sandbox directory " << sandboxPath <<
": " << strerror(errno) << std::endl;
SANDBOX_LOGE("Failed to stat sandbox directory %{public}s: %{public}s",
sandboxPath.c_str(), strerror(errno));
return SANDBOX_ERR_GENERIC;
}
if (!S_ISDIR(st.st_mode)) {
std::cerr << "Error: Sandbox path is not a directory: " << sandboxPath << std::endl;
SANDBOX_LOGE("Sandbox path is not a directory: %{public}s", sandboxPath.c_str());
return SANDBOX_ERR_PATH_INVALID;
}
// Unlink all symlinks under the sandbox directory before remove_all.
std::error_code ec;
for (std::filesystem::recursive_directory_iterator it(sandboxPath,
std::filesystem::directory_options::skip_permission_denied, ec), end;
!ec && it != end; it.increment(ec)) {
if (it->is_symlink(ec) && !ec) {
unlink(it->path().c_str());
}
}
std::filesystem::remove_all(sandboxPath, ec);
if (ec) {
std::cerr << "Error: remove_all " << sandboxPath << " failed: " << ec.message() << std::endl;
SANDBOX_LOGE("remove_all %{public}s failed: %{public}s", sandboxPath.c_str(), ec.message().c_str());
return SANDBOX_ERR_GENERIC;
}
SANDBOX_LOGD("Deleted sandbox directory %{public}s", sandboxPath.c_str());
return SANDBOX_SUCCESS;
}
int SandboxManager::DeleteSandboxDir()
{
if (!initialized_) {
@@ -395,36 +437,7 @@ int SandboxManager::DeleteSandboxDir()
}
std::string sandboxPath = std::string(SANDBOX_BASE_DIR) + "/" + config_.name;
struct stat st;
if (lstat(sandboxPath.c_str(), &st) != 0) {
if (errno == ENOENT) {
std::cerr << "Error: Sandbox directory does not exist: " << sandboxPath << std::endl;
SANDBOX_LOGE("Sandbox directory does not exist: %{public}s", sandboxPath.c_str());
return SANDBOX_ERR_PATH_INVALID;
}
std::cerr << "Error: Failed to stat sandbox directory " << sandboxPath
<< ": " << strerror(errno) << std::endl;
SANDBOX_LOGE("Failed to stat sandbox directory %{public}s: %{public}s",
sandboxPath.c_str(), strerror(errno));
return SANDBOX_ERR_GENERIC;
}
if (!S_ISDIR(st.st_mode)) {
std::cerr << "Error: Sandbox path is not a directory: " << sandboxPath << std::endl;
SANDBOX_LOGE("Sandbox path is not a directory: %{public}s", sandboxPath.c_str());
return SANDBOX_ERR_PATH_INVALID;
}
std::error_code ec;
std::filesystem::remove_all(sandboxPath, ec);
if (ec) {
std::cerr << "Error: remove_all " << sandboxPath << " failed: " << ec.message() << std::endl;
SANDBOX_LOGE("remove_all %{public}s failed: %{public}s", sandboxPath.c_str(), ec.message().c_str());
return SANDBOX_ERR_GENERIC;
}
SANDBOX_LOGD("Deleted sandbox directory %{public}s", sandboxPath.c_str());
return SANDBOX_SUCCESS;
return RemoveSandboxDirTree(sandboxPath);
}
int SandboxManager::Execute()