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

!2034 适配账号注销动画

Browse Source 
Merge pull request !2034 from Jasonye/master
This commit is contained in:
openharmony_ci 2024-10-31 12:51:38 +00:00 committed by Gitee
commit eb1fbbb0fe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 112 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
interfaces/innerkits/common/include/account_error_no.h
View File

@ -230,6 +230,11 @@ enum {
ERR_OSACCOUNT_SERVICE_GET_DATA_FROM_GLOBAL_CONSTRAINTS_FILE_EMPTY,
ERR_OSACCOUNT_SERVICE_GET_DATA_FROM_SPECIFIC_CONSTRAINTS_FILE_EMPTY,
ERR_OSACCOUNT_SERVICE_STORAGE_PREPARE_ADD_USER_FAILED,
//ANIMATION
ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_POLL_ERROR,
ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_TIMEOUT,
ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_UNEXPECTED_EVENT,
ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_READ_ERROR,
};
// Error code for ACCOUNT_IAM_KIT

6
services/accountmgr/accountmgr.cfg
View File

@ -37,11 +37,13 @@
"ohos.permission.INTERNET",
"ohos.permission.ACCESS_CERT_MANAGER",
"ohos.permission.MANAGE_LOCAL_ACCOUNTS",
"ohos.permission.MANAGE_SECURE_SETTINGS"
"ohos.permission.MANAGE_SECURE_SETTINGS",
"ohos.permission.CAPTURE_SCREEN"
],
"permission_acls" : [
"ohos.permission.ENFORCE_USER_IDM",
"ohos.permission.STORAGE_MANAGER_CRYPT"
"ohos.permission.STORAGE_MANAGER_CRYPT",
"ohos.permission.CAPTURE_SCREEN"
],
"critical" : [1, 4, 240],
"uid" : "account",

3
services/accountmgr/include/osaccount/iinner_os_account_manager.h
View File

@ -130,6 +130,9 @@ private:
void RestartActiveAccount();
void CreateBaseAdminAccount();
void CreateBaseStandardAccount();
void ExecuteDeactivationAnimation(int32_t pipeFd, const OsAccountInfo &osAccountInfo);
ErrCode WaitForAnimationReady(int32_t pipeFd);
void LaunchDeactivationAnimation(const OsAccountInfo &osAccountInfo);
ErrCode PrepareRemoveOsAccount(OsAccountInfo &osAccountInfo, bool isCleanGarbage = false);
ErrCode RemoveOsAccountOperate(const int id, OsAccountInfo &osAccountInfo, bool isCleanGarbage = false);
ErrCode DeactivateOsAccountById(const int id);

100
services/accountmgr/src/osaccount/inner_os_account_manager.cpp
View File

@ -16,6 +16,9 @@
#include "account_event_provider.h"
#include <chrono>
#include <dlfcn.h>
#include <poll.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <unistd.h>
#include "account_constants.h"
#include "account_info.h"
@ -52,6 +55,7 @@ namespace {
const std::string CONSTRAINT_CREATE_ACCOUNT_DIRECTLY = "constraint.os.account.create.directly";
const std::string ACCOUNT_READY_EVENT = "bootevent.account.ready";
const std::string PARAM_LOGIN_NAME_MAX = "persist.account.login_name_max";
constexpr const char DEACTIVATION_ANIMATION_PATH[] = "/system/bin/deactivation_animation";
const std::string SPECIAL_CHARACTER_ARRAY = "<>|\":*?/\\";
const std::vector<std::string> SHORT_NAME_CANNOT_BE_NAME_ARRAY = {".", ".."};
constexpr int32_t TOKEN_NATIVE = 1;
@ -62,6 +66,11 @@ constexpr int32_t DELAY_FOR_REMOVING_FOREGROUND_OS_ACCOUNT = 1500;
#ifdef ENABLE_MULTIPLE_ACTIVE_ACCOUNTS
constexpr int32_t DELAY_FOR_DEACTIVATE_OS_ACCOUNT = 3000;
#endif
constexpr int32_t MAX_WAIT_ANIMATION_MSG_BUFFER = 256;
constexpr int32_t MAX_WAIT_ANIMATION_READY_TIMEOUT = 1000;
constexpr int32_t PIPE_FD_COUNT = 2;
constexpr int32_t PIPE_READ_END = 0;
constexpr int32_t PIPE_WRITE_END = 1;
}
IInnerOsAccountManager::IInnerOsAccountManager() : subscribeManager_(OsAccountSubscribeManager::GetInstance()),
@ -1719,6 +1728,93 @@ ErrCode IInnerOsAccountManager::ActivateOsAccount
return ERR_OK;
}
void IInnerOsAccountManager::ExecuteDeactivationAnimation(int32_t pipeFd, const OsAccountInfo &osAccountInfo)
{
std::string pipeFdStr = std::to_string(pipeFd);
std::string displayIdStr = std::to_string(osAccountInfo.GetDisplayId());
char *const args[] = {const_cast<char *>(DEACTIVATION_ANIMATION_PATH),
const_cast<char *>(displayIdStr.c_str()), const_cast<char *>(pipeFdStr.c_str()), nullptr};
if (execv(DEACTIVATION_ANIMATION_PATH, args) == -1) {
ACCOUNT_LOGE("Failed to execv animation: %{public}s", strerror(errno));
ReportOsAccountOperationFail(osAccountInfo.GetLocalId(), "deactivate", errno,
"Failed to launch deactivation animation, execv error");
close(pipeFd);
exit(EXIT_FAILURE);
}
}
ErrCode IInnerOsAccountManager::WaitForAnimationReady(int32_t pipeFd)
{
char buf[MAX_WAIT_ANIMATION_MSG_BUFFER];
struct pollfd fds[1];
fds[0].fd = pipeFd;
fds[0].events = POLLIN;
int ret = poll(fds, 1, MAX_WAIT_ANIMATION_READY_TIMEOUT);
if (ret < 0) {
ACCOUNT_LOGE("Error in poll: %{public}s", strerror(errno));
close(pipeFd);
return ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_POLL_ERROR;
}
if (ret == 0) {
ACCOUNT_LOGE("Timeout waiting for message from child process.");
close(pipeFd);
return ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_TIMEOUT;
}
if (!(fds[0].revents & POLLIN)) {
ACCOUNT_LOGE("Unexpected event in poll: %{public}d", fds[0].revents);
close(pipeFd);
return ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_UNEXPECTED_EVENT;
}
ssize_t bytesRead = read(pipeFd, buf, sizeof(buf));
if (bytesRead <= 0) {
ACCOUNT_LOGE("Error reading from pipe: %{public}s", strerror(errno));
close(pipeFd);
return ERR_OSACCOUNT_SERVICE_INNER_ANIMATION_READ_ERROR;
}
buf[bytesRead] = '\0';
ACCOUNT_LOGI("Received message from child process: %{public}s", buf);
close(pipeFd);
return ERR_OK;
}
void IInnerOsAccountManager::LaunchDeactivationAnimation(const OsAccountInfo &osAccountInfo)
{
int32_t localId = osAccountInfo.GetLocalId();
ACCOUNT_LOGI("Start launching deactivation animation for account: %{public}d", localId);
struct stat buffer;
if (stat(DEACTIVATION_ANIMATION_PATH, &buffer) != 0) {
ACCOUNT_LOGW("Animation launch file does not exist: %{public}s, %{public}s,",
DEACTIVATION_ANIMATION_PATH, strerror(errno));
return;
}
int pipeFd[PIPE_FD_COUNT];
if (pipe(pipeFd) == -1) {
ACCOUNT_LOGE("Failed to create pipe: %{public}s", strerror(errno));
ReportOsAccountOperationFail(localId, "deactivate", errno,
"Failed to launch deactivation animation, create pipe error");
return;
}
pid_t pid = fork();
if (pid == 0) {
close(pipeFd[PIPE_READ_END]);
ExecuteDeactivationAnimation(pipeFd[PIPE_WRITE_END], osAccountInfo);
} else if (pid > 0) {
close(pipeFd[PIPE_WRITE_END]);
ErrCode ret = WaitForAnimationReady(pipeFd[PIPE_READ_END]);
ReportOsAccountOperationFail(localId, "deactivate", ret,
"Failed to launch deactivation animation, wait msg error");
} else {
ACCOUNT_LOGE("Failed to fork deactivation animation process: %{public}s", strerror(errno));
ReportOsAccountOperationFail(localId, "deactivate", errno,
"Failed to launch deactivation animation, fork error");
close(pipeFd[PIPE_READ_END]);
close(pipeFd[PIPE_WRITE_END]);
}
}
ErrCode IInnerOsAccountManager::DeactivateOsAccount(const int id, bool isStopStorage)
{
if (!CheckAndAddLocalIdOperating(id)) {
@ -1749,6 +1845,10 @@ ErrCode IInnerOsAccountManager::DeactivateOsAccount(const int id, bool isStopSto
osAccountInfo, OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_USER_STOPPING, Constants::OPERATION_STOP);
subscribeManager_.Publish(id, OS_ACCOUNT_SUBSCRIBE_TYPE::STOPPING);
if (osAccountInfo.GetIsForeground()) {
LaunchDeactivationAnimation(osAccountInfo);
}
errCode = SendMsgForAccountDeactivate(osAccountInfo, isStopStorage);
if (errCode != ERR_OK) {
RemoveLocalIdToOperating(id);