openharmony/filemanagement_storage_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_storage_service synced 2024-11-27 01:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!741 userid check

Browse Source 
Merge pull request !741 from tl/master
This commit is contained in:
openharmony_ci 2024-01-12 10:51:17 +00:00 committed by Gitee
commit df8296b8d8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/storage_daemon/include/user/user_manager.h
View File

@ -47,6 +47,7 @@ private:
int32_t DestroyEl1Dir(int32_t userId);
int32_t SetElDirFscryptPolicy(int32_t userId, const std::string &level,
const std::vector<FileList> &list);
int32_t CheckUserIdRange(int32_t userId);
DISALLOW_COPY_AND_MOVE(UserManager);

36
services/storage_daemon/user/src/user_manager.cpp
View File

@ -57,6 +57,11 @@ int32_t UserManager::StartUser(int32_t userId)
{
LOGI("start user %{public}d", userId);
std::lock_guard<std::mutex> lock(mutex_);
int32_t err = CheckUserIdRange(userId);
if (err != E_OK) {
LOGE("UserManager::StartUser userId %{public}d out of range", userId);
return err;
}
return MountManager::GetInstance()->MountByUser(userId);
}
@ -64,6 +69,11 @@ int32_t UserManager::StopUser(int32_t userId)
{
LOGI("stop user %{public}d", userId);
std::lock_guard<std::mutex> lock(mutex_);
int32_t err = CheckUserIdRange(userId);
if (err != E_OK) {
LOGE("UserManager::StopUser userId %{public}d out of range", userId);
return err;
}
return MountManager::GetInstance()->UmountByUser(userId);
}
@ -71,8 +81,11 @@ int32_t UserManager::PrepareUserDirs(int32_t userId, uint32_t flags)
{
LOGI("prepare user dirs for %{public}d, flags %{public}u", userId, flags);
std::lock_guard<std::mutex> lock(mutex_);
int32_t err = E_OK;
int32_t err = CheckUserIdRange(userId);
if (err != E_OK) {
LOGE("UserManager::PrepareUserDirs userId %{public}d out of range", userId);
return err;
}
if (flags & IStorageDaemon::CRYPTO_FLAG_EL1) {
err = PrepareDirsFromIdAndLevel(userId, EL1);
if (err != E_OK) {
@ -129,9 +142,12 @@ int32_t UserManager::DestroyUserDirs(int32_t userId, uint32_t flags)
{
LOGI("destroy user dirs for %{public}d, flags %{public}u", userId, flags);
std::lock_guard<std::mutex> lock(mutex_);
int32_t err = CheckUserIdRange(userId);
if (err != E_OK) {
LOGE("UserManager::DestroyUserDirs userId %{public}d out of range", userId);
return err;
}
int32_t ret = E_OK;
int32_t err;
if (flags & IStorageDaemon::CRYPTO_FLAG_EL1) {
err = DestroyDirsFromIdAndLevel(userId, EL1);
ret = (err != E_OK) ? err : ret;
@ -139,7 +155,6 @@ int32_t UserManager::DestroyUserDirs(int32_t userId, uint32_t flags)
err = DestroyEl1BundleDir(userId);
ret = (err != E_OK) ? err : ret;
}
if (flags & IStorageDaemon::CRYPTO_FLAG_EL2) {
err = DestroyDirsFromIdAndLevel(userId, EL2);
ret = (err != E_OK) ? err : ret;
@ -159,12 +174,10 @@ int32_t UserManager::DestroyUserDirs(int32_t userId, uint32_t flags)
err = DestroyEl1Dir(userId);
ret = (err != E_OK) ? err : ret;
}
if (flags & IStorageDaemon::CRYPTO_FLAG_EL3) {
err = DestroyDirsFromIdAndLevel(userId, EL3);
ret = (err != E_OK) ? err : ret;
}
if (flags & IStorageDaemon::CRYPTO_FLAG_EL4) {
err = DestroyDirsFromIdAndLevel(userId, EL4);
ret = (err != E_OK) ? err : ret;
@ -345,5 +358,14 @@ int32_t UserManager::DestroyEl1Dir(int32_t userId)
return E_OK;
}
int32_t UserManager::CheckUserIdRange(int32_t userId)
{
if (userId > StorageService::MAX_USER_ID) {
LOGE("MultiUserManagerService: userId:%{public}d is out of range", userId);
return E_USERID_RANGE;
}
return E_OK;
}
} // namespace StorageDaemon
} // namespace OHOS