openharmony/bundlemanager_bundle_framework
1
0
Fork 0
mirror of https://gitee.com/openharmony/bundlemanager_bundle_framework synced 2024-11-23 07:09:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!4599 修复在所有用户下安装应用失败

Browse Source 
Merge pull request !4599 from shilei91/shilei
This commit is contained in:
openharmony_ci 2023-08-21 15:42:37 +00:00 committed by Gitee
commit ba4135d8d8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/bundlemgr/include/base_bundle_installer.h
View File

@ -643,6 +643,8 @@ private:
std::map<std::string, std::string> signatureFileMap_;
std::vector<DataGroupInfo> createGroupDirs_;
std::vector<std::string> removeGroupDirs_;
std::vector<std::string> bundlePaths_;
std::unordered_map<std::string, std::string> signatureFileTmpMap_;
DISALLOW_COPY_AND_MOVE(BaseBundleInstaller);

31
services/bundlemgr/src/base_bundle_installer.cpp
View File

@ -129,6 +129,10 @@ BaseBundleInstaller::BaseBundleInstaller()
BaseBundleInstaller::~BaseBundleInstaller()
{
bundlePaths_.clear();
BundleUtil::DeleteTempDirs(toDeleteTempHapPath_);
toDeleteTempHapPath_.clear();
signatureFileTmpMap_.clear();
APP_LOGI("base bundle installer instance is destroyed");
}
@ -815,7 +819,6 @@ ErrCode BaseBundleInstaller::ProcessBundleInstall(const std::vector<std::string>
UpdateInstallerState(InstallerState::INSTALL_BUNDLE_CHECKED); // ---- 5%
// copy the haps to the dir which cannot be accessed from caller
ScopeGuard securityTempHapPathsGuard([this] { BundleUtil::DeleteTempDirs(toDeleteTempHapPath_); });
result = CopyHapsToSecurityDir(installParam, bundlePaths);
CHECK_RESULT(result, "copy file failed %{public}d");
@ -3456,7 +3459,6 @@ void BaseBundleInstaller::ResetInstallProperties()
accessTokenId_ = 0;
sysEventInfo_.Reset();
moduleName_.clear();
toDeleteTempHapPath_.clear();
verifyCodeParams_.clear();
otaInstall_ = false;
signatureFileMap_.clear();
@ -3854,6 +3856,11 @@ ErrCode BaseBundleInstaller::CopyHapsToSecurityDir(const InstallParam &installPa
APP_LOGD("no need to copy preInstallApp to secure dir");
return ERR_OK;
}
if (!bundlePaths_.empty()) {
bundlePaths = bundlePaths_;
APP_LOGD("using the existed hap files in security dir");
return ERR_OK;
}
for (size_t index = 0; index < bundlePaths.size(); ++index) {
if (!BundleUtil::CheckSystemSize(bundlePaths[index], APP_INSTALL_PATH)) {
APP_LOGE("install bundle(%{public}s) failed due to insufficient disk memory", bundlePaths[index].c_str());
@ -3865,9 +3872,12 @@ ErrCode BaseBundleInstaller::CopyHapsToSecurityDir(const InstallParam &installPa
APP_LOGE("copy file %{public}s to security dir failed", bundlePaths[index].c_str());
return ERR_APPEXECFWK_INSTALL_COPY_HAP_FAILED;
}
BundleUtil::DeleteDir(bundlePaths[index]);
if (bundlePaths[index].find(Constants::STREAM_INSTALL_PATH) != std::string::npos) {
BundleUtil::DeleteDir(bundlePaths[index]);
}
bundlePaths[index] = destination;
}
bundlePaths_ = bundlePaths;
return ERR_OK;
}
@ -3897,7 +3907,11 @@ ErrCode BaseBundleInstaller::FindSignatureFileDir(const std::string &moduleName,
moduleName.c_str());
return ERR_OK;
}
if (signatureFileTmpMap_.find(moduleName) != signatureFileTmpMap_.end()) {
signatureFileDir = signatureFileTmpMap_.at(moduleName);
APP_LOGD("signature file of %{public}s is existed in temp map", moduleName.c_str());
return ERR_OK;
}
auto iterator = verifyCodeParams_.find(moduleName);
if (iterator == verifyCodeParams_.end()) {
APP_LOGE("no signature file dir exist of module %{public}s", moduleName.c_str());
@ -3905,7 +3919,7 @@ ErrCode BaseBundleInstaller::FindSignatureFileDir(const std::string &moduleName,
}
signatureFileDir = verifyCodeParams_.at(moduleName);
// check signature file suffix
// check validity of the signature file
auto ret = bundleInstallChecker_->CheckSignatureFileDir(signatureFileDir);
if (ret != ERR_OK) {
APP_LOGE("checkout signature file dir %{public}s failed", signatureFileDir.c_str());
@ -3923,8 +3937,11 @@ ErrCode BaseBundleInstaller::FindSignatureFileDir(const std::string &moduleName,
APP_LOGE("copy file %{public}s to security dir failed", signatureFileDir.c_str());
return ERR_APPEXECFWK_INSTALL_COPY_HAP_FAILED;
}
BundleUtil::DeleteDir(signatureFileDir);
if (signatureFileDir.find(Constants::SIGNATURE_FILE_PATH) != std::string::npos) {
BundleUtil::DeleteDir(signatureFileDir);
}
signatureFileDir = destinationStr;
signatureFileTmpMap_.emplace(moduleName, destinationStr);
APP_LOGD("signatureFileDir is %{public}s", signatureFileDir.c_str());
return ERR_OK;
}
@ -4122,7 +4139,7 @@ void BaseBundleInstaller::RemoveTempSoDir(const std::string &tempSoDir)
APP_LOGW("invalid tempSoDir %{public}s", tempSoDir.c_str());
return;
}
auto thirdPos = tempSoDir.find(Constants::PATH_SEPARATOR, secondPos);
auto thirdPos = tempSoDir.find(Constants::PATH_SEPARATOR, secondPos + 1);
if (thirdPos == std::string::npos) {
InstalldClient::GetInstance()->RemoveDir(tempSoDir);
return;

28
test/systemtest/common/bms/bms_install_system_test/bms_install_hap_so_test.cpp
View File

@ -280,8 +280,9 @@ std::string BmsInstallHapSoTest::InstallBundle(
installParam.installFlag = InstallFlag::NORMAL;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(THIRD_BUNDLE_PATH + hapFile, installParam, statusReceiver);
EXPECT_TRUE(installResult);
std::vector<std::string> pathVec { THIRD_BUNDLE_PATH + hapFile };
auto installResult = installerProxy->StreamInstall(pathVec, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultMsg();
}
@ -295,8 +296,8 @@ std::string BmsInstallHapSoTest::InstallBundles(
installParam.installFlag = InstallFlag::NORMAL;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(hapPaths, installParam, statusReceiver);
EXPECT_TRUE(installResult);
auto installResult = installerProxy->StreamInstall(hapPaths, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultMsg();
}
@ -325,8 +326,9 @@ std::string BmsInstallHapSoTest::InstallPathBundle(
installParam.installFlag = InstallFlag::NORMAL;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(path, installParam, statusReceiver);
EXPECT_TRUE(installResult);
std::vector<std::string> pathVec { path };
auto installResult = installerProxy->StreamInstall(pathVec, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultMsg();
}
@ -351,8 +353,9 @@ std::string BmsInstallHapSoTest::UpdateInstall(
installParam.installFlag = InstallFlag::REPLACE_EXISTING;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(THIRD_BUNDLE_PATH + hapFile, installParam, statusReceiver);
EXPECT_TRUE(installResult);
std::vector<std::string> pathVec { THIRD_BUNDLE_PATH + hapFile };
auto installResult = installerProxy->StreamInstall(pathVec, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultMsg();
}
@ -366,8 +369,8 @@ std::string BmsInstallHapSoTest::UpdateInstalls(
installParam.installFlag = InstallFlag::REPLACE_EXISTING;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(hapPaths, installParam, statusReceiver);
EXPECT_TRUE(installResult);
auto installResult = installerProxy->StreamInstall(hapPaths, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultMsg();
}
@ -381,8 +384,9 @@ std::string BmsInstallHapSoTest::UpdateInstallPath(
installParam.installFlag = InstallFlag::REPLACE_EXISTING;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(path, installParam, statusReceiver);
EXPECT_TRUE(installResult);
std::vector<std::string> pathVec { path };
auto installResult = installerProxy->StreamInstall(pathVec, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultMsg();
}

4
test/systemtest/common/bms/bms_overlay_install_test/bms_overlay_internal_install_test.cpp
View File

@ -225,8 +225,8 @@ ErrCode BmsOverlayInternalInstallTest::InstallOverlayBundle(const std::vector<st
installParam.installFlag = InstallFlag::REPLACE_EXISTING;
sptr<StatusReceiverImpl> statusReceiver(new (std::nothrow) StatusReceiverImpl());
EXPECT_NE(statusReceiver, nullptr);
bool installResult = installerProxy->Install(bundleFilePaths, installParam, statusReceiver);
EXPECT_TRUE(installResult);
auto installResult = installerProxy->StreamInstall(bundleFilePaths, installParam, statusReceiver);
EXPECT_EQ(installResult, ERR_OK);
return statusReceiver->GetResultCode();
}