From 179d2773cb73b19572d29d28d759854e09dc11a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=99=9F=E9=92=B0?= Date: Wed, 6 Nov 2024 16:48:20 +0800 Subject: [PATCH] =?UTF-8?q?000=E6=9D=83=E9=99=90=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张晟钰 --- .../native/backup_ext/include/ext_extension.h | 6 +-- .../native/backup_ext/include/tar_file.h | 3 ++ .../native/backup_ext/src/ext_extension.cpp | 29 +++++++++++- frameworks/native/backup_ext/src/tar_file.cpp | 44 ++++++++++++------- 4 files changed, 62 insertions(+), 20 deletions(-) diff --git a/frameworks/native/backup_ext/include/ext_extension.h b/frameworks/native/backup_ext/include/ext_extension.h index e18a11f0b..9a097f5ca 100644 --- a/frameworks/native/backup_ext/include/ext_extension.h +++ b/frameworks/native/backup_ext/include/ext_extension.h @@ -185,9 +185,9 @@ private: void AsyncTaskDoIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd); void AsyncTaskOnIncrementalBackup(); int DoIncrementalBackupTask(UniqueFd incrementalFd, UniqueFd manifestFd); - ErrCode IncrementalBigFileReady(const TarMap &pkgInfo, const vector &bigInfos, + ErrCode IncrementalBigFileReady(TarMap &pkgInfo, const vector &bigInfos, sptr proxy); - ErrCode BigFileReady(const TarMap &bigFileInfo, sptr proxy); + ErrCode BigFileReady(TarMap &bigFileInfo, sptr proxy); void WaitToSendFd(std::chrono::system_clock::time_point &startTime, int &fdSendNum); void RefreshTimeInfo(std::chrono::system_clock::time_point &startTime, int &fdSendNum); void IncrementalPacket(const vector &infos, TarMap &tar, sptr proxy); @@ -291,7 +291,7 @@ private: sptr proxy); ErrCode IncrementalAllFileReady(const TarMap &pkgInfo, const vector &srcFiles, sptr proxy); - + void ClearNoPermissionFiles(TarMap &pkgInfo, vector &noPermissionFiles); private: std::shared_mutex lock_; std::shared_ptr extension_; diff --git a/frameworks/native/backup_ext/include/tar_file.h b/frameworks/native/backup_ext/include/tar_file.h index 2d19e241e..27c798966 100644 --- a/frameworks/native/backup_ext/include/tar_file.h +++ b/frameworks/native/backup_ext/include/tar_file.h @@ -56,6 +56,7 @@ const char AREGTYPE = '\0'; // regular file const char SYMTYPE = '2'; // reserved const char DIRTYPE = '5'; // directory const char GNUTYPE_LONGNAME = 'L'; +const int ERR_NO_PERMISSION = 13; } // namespace // 512 bytes @@ -215,6 +216,8 @@ private: */ bool I2OcsConvert(const struct stat &st, TarHeader &hdr, std::string &fileName); + bool ToAddFile(std::string &path, int &err); + private: uint32_t fileCount_ {0}; TarMap tarMap_ {}; diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index 135e081f1..7f5a72508 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -478,13 +478,27 @@ static ErrCode IndexFileReady(const TarMap &pkgInfo, sptr proxy) return ret; } -ErrCode BackupExtExtension::BigFileReady(const TarMap &bigFileInfo, sptr proxy) +void BackupExtExtension::ClearNoPermissionFiles(TarMap &pkgInfo, vector &noPermissionFiles) +{ + HILOGI("start ClearNoPermissionFiles;"); + for (const auto &item : noPermissionFiles) { + auto it = pkgInfo.find(item); + if (it != pkgInfo.end()) { + HILOGI("noPermissionFile, don't need to backup, path = %{public}s", + GetAnonyString(std::get<0>(it->second)).c_str()); + pkgInfo.erase(it); + } + } +} + +ErrCode BackupExtExtension::BigFileReady(TarMap &bigFileInfo, sptr proxy) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); HILOGI("BigFileReady Begin: bigFileInfo file size is: %{public}zu", bigFileInfo.size()); ErrCode ret {ERR_OK}; auto startTime = std::chrono::system_clock::now(); int fdNum = 0; + vector noPermissionFiles; for (auto &item : bigFileInfo) { WaitToSendFd(startTime, fdNum); int32_t errCode = ERR_OK; @@ -497,6 +511,10 @@ ErrCode BackupExtExtension::BigFileReady(const TarMap &bigFileInfo, sptrAppFileReady(item.first, std::move(fd), errCode); if (SUCCEEDED(ret)) { @@ -507,6 +525,7 @@ ErrCode BackupExtExtension::BigFileReady(const TarMap &bigFileInfo, sptr &bigInfos, sptr proxy) { ErrCode ret {ERR_OK}; HILOGI("IncrementalBigFileReady Begin, pkgInfo size:%{public}zu", pkgInfo.size()); auto startTime = std::chrono::system_clock::now(); int fdNum = 0; + vector noPermissionFiles; for (auto &item : pkgInfo) { if (item.first.empty()) { continue; @@ -1968,6 +1988,10 @@ ErrCode BackupExtExtension::IncrementalBigFileReady(const TarMap &pkgInfo, HILOGE("IncrementalBigFileReady open file failed, file name is %{public}s, err = %{public}d", GetAnonyString(path).c_str(), errno); errCode = errno; + if (errCode == ERR_NO_PERMISSION) { + noPermissionFiles.emplace_back(item.first.c_str()); + continue; + } } vector bigInfo; for (const auto &tempFile : bigInfos) { @@ -1989,6 +2013,7 @@ ErrCode BackupExtExtension::IncrementalBigFileReady(const TarMap &pkgInfo, fdNum += BConstants::FILE_AND_MANIFEST_FD_COUNT; RefreshTimeInfo(startTime, fdNum); } + ClearNoPermissionFiles(pkgInfo, noPermissionFiles); HILOGI("IncrementalBigFileReady End"); return ret; } diff --git a/frameworks/native/backup_ext/src/tar_file.cpp b/frameworks/native/backup_ext/src/tar_file.cpp index e340e9b49..162d6760e 100644 --- a/frameworks/native/backup_ext/src/tar_file.cpp +++ b/frameworks/native/backup_ext/src/tar_file.cpp @@ -101,39 +101,53 @@ bool TarFile::Packet(const vector &srcFiles, const string &tarFileName, return true; } -bool TarFile::TraversalFile(string &filePath, int &err) +bool TarFile::ToAddFile(std::string &path, int &err) { - if (access(filePath.c_str(), F_OK) != 0) { - err = errno; - HILOGE("File path does not exists, err = %{public}d", errno); - AuditLog auditLog = {false, "access file failed", "ADD", "", 1, "FAILED", "TraversalFile", - "Packet File", GetAnonyPath(filePath)}; - HiAudit::GetInstance(false).Write(auditLog); - return false; - } - struct stat curFileStat {}; auto ret = memset_s(&curFileStat, sizeof(curFileStat), 0, sizeof(curFileStat)); if (ret != EOK) { HILOGE("Failed to call memset_s, err = %{public}d", ret); return false; } - if (lstat(filePath.c_str(), &curFileStat) != 0) { + if (lstat(path.c_str(), &curFileStat) != 0) { err = errno; HILOGE("Failed to lstat, err = %{public}d", errno); AuditLog auditLog = {false, "lstat file failed", "ADD", "", 1, "FAILED", "TraversalFile", - "Packet File", GetAnonyPath(filePath)}; + "Packet File", GetAnonyPath(path)}; HiAudit::GetInstance(false).Write(auditLog); return false; } - if (!AddFile(filePath, curFileStat, err)) { - HILOGE("Failed to add file to tar package, file path is:%{public}s", GetAnonyPath(filePath).c_str()); + if (!AddFile(path, curFileStat, err)) { + HILOGE("Failed to add file to tar package, file path is:%{public}s", GetAnonyPath(path).c_str()); AuditLog auditLog = {false, "AddFile failed", "ADD", "", 1, "FAILED", "TraversalFile", - "Packet File", GetAnonyPath(filePath)}; + "Packet File", GetAnonyPath(path)}; HiAudit::GetInstance(false).Write(auditLog); return false; } + return true; +} +bool TarFile::TraversalFile(string &filePath, int &err) +{ + if (access(filePath.c_str(), F_OK) != 0) { + err = errno; + HILOGE("File path does not exists, err = %{public}d", errno); + AuditLog auditLog = {false, "access file failed", "ADD", "", 1, "FAILED", "TraversalFile", + "Packet File", GetAnonyPath(filePath)}; + HiAudit::GetInstance(false).Write(auditLog); + return false; + } + int fd = open(filePath.c_str(), O_RDONLY); + if (fd < 0 && errno == ERR_NO_PERMISSION) { + HILOGI("noPermissionFlie, don't need to backup, path = %{public}s, err = %{public}d", + GetAnonyString(filePath).c_str(), errno); + return true; + } else if (fd > 0) { + close(fd); + } + if (!ToAddFile(filePath, err)) { + return false; + } if (isReset_) { return true; } -- Gitee