diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index 678dda4b92bb331d0ef558b968f28cc42f2ea11c..df530fd9accab9f6636b6dc32a313fb4177e1f15 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -42,6 +42,7 @@ namespace OHOS { namespace FileManagement { namespace ModuleFileIO { using namespace AppFileService::ModuleFileUri; +namespace fs = std::filesystem; const std::string FILE_PREFIX_NAME = "file://"; const std::string NETWORK_PARA = "?networkid="; const string PROCEDURE_COPY_NAME = "FileFSCopy"; @@ -249,6 +250,21 @@ static void Deleter(struct NameList *arg) free(arg->namelist); } +std::string removeDots(const std::string& path) { + fs::path p(path); + fs::path realPath; + for (const auto& component : p) { + if (component == ".") { + continue; + } else if (component == "..") { + realPath = realPath.parent_path(); + } else { + realPath /= component; + } + } + return realPath.string(); +} + uint64_t Copy::GetDirSize(std::shared_ptr infos, std::string path) { unique_ptr pNameList = { new (nothrow) struct NameList, Deleter }; @@ -322,8 +338,9 @@ int Copy::CopyDirFunc(const string &src, const string &dest, std::shared_ptr infos, std::shared_ptr callback) { - if (infos->srcPath == infos->destPath) { - HILOGE("The src and dest are the same."); + infos->destPath = removeDots(infos->destPath); + if (infos->destPath.find(infos->srcPath) != std::string::npos) { + HILOGE(The src directory is the subdirectory of dest); return EINVAL; } if (IsFile(infos->srcPath)) {