TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-02 18:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify get manager app info logic

Browse Source
This commit is contained in:
topjohnwu
2021-09-17 02:07:32 -07:00
parent 82f303e1c6
commit 7b25e74418
7 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/su/connect.cpp
View File

@@ -106,7 +106,7 @@ static void exec_cmd(const char *action, vector<Extra> &data,
// First try content provider call method
if (mode >= CONTENT_PROVIDER) {
sprintf(target, "content://%s.provider", info->str[SU_MANAGER].data());
sprintf(target, "content://%s.provider", info->mgr_pkg.data());
vector<const char *> args{ CALL_PROVIDER };
for (auto &e : data) {
e.add_bind(args);
@@ -137,7 +137,7 @@ static void exec_cmd(const char *action, vector<Extra> &data,
if (mode >= PKG_ACTIVITY) {
// Then try start activity without component name
strcpy(target, info->str[SU_MANAGER].data());
strcpy(target, info->mgr_pkg.data());
exec_command_sync(exec);
if (check_no_error(exec.fd))
return;
@@ -145,7 +145,7 @@ static void exec_cmd(const char *action, vector<Extra> &data,
// Finally, fallback to start activity with component name
args[4] = "-n";
sprintf(target, "%s/.ui.surequest.SuRequestActivity", info->str[SU_MANAGER].data());
sprintf(target, "%s/.ui.surequest.SuRequestActivity", info->mgr_pkg.data());
exec.fd = -2;
exec.fork = fork_dont_care;
exec_command(exec);

2
native/jni/su/su.hpp
View File

@@ -20,8 +20,8 @@ public:
/* These should be guarded with internal lock */
db_settings cfg;
db_strings str;
su_access access;
std::string mgr_pkg;
struct stat mgr_st;
/* This should be guarded with global cache lock */

11
native/jni/su/su_daemon.cpp
View File

@@ -47,18 +47,17 @@ void su_info::refresh() {
static void database_check(const shared_ptr<su_info> &info) {
int uid = info->uid;
get_db_settings(info->cfg);
get_db_strings(info->str);
// Check multiuser settings
switch (info->cfg[SU_MULTIUSER_MODE]) {
case MULTIUSER_MODE_OWNER_ONLY:
if (info->uid / 100000) {
if (to_user_id(uid) != 0) {
uid = -1;
info->access = NO_SU_ACCESS;
}
break;
case MULTIUSER_MODE_OWNER_MANAGED:
uid = info->uid % 100000;
uid = to_app_id(uid);
break;
case MULTIUSER_MODE_USER:
default:
@@ -70,7 +69,7 @@ static void database_check(const shared_ptr<su_info> &info) {
// We need to check our manager
if (info->access.log || info->access.notify)
validate_manager(info->str[SU_MANAGER], uid / 100000, &info->mgr_st);
get_manager(to_user_id(uid), &info->mgr_pkg, &info->mgr_st);
}
static shared_ptr<su_info> get_su_info(unsigned uid) {
@@ -93,7 +92,7 @@ static shared_ptr<su_info> get_su_info(unsigned uid) {
database_check(info);
// If it's root or the manager, allow it silently
if (info->uid == UID_ROOT || (info->uid % 100000) == (info->mgr_st.st_uid % 100000)) {
if (info->uid == UID_ROOT || to_app_id(info->uid) == to_app_id(info->mgr_st.st_uid)) {
info->access = SILENT_SU_ACCESS;
return info;
}
@@ -125,7 +124,7 @@ static shared_ptr<su_info> get_su_info(unsigned uid) {
return info;
// If still not determined, check if manager exists
if (info->str[SU_MANAGER].empty()) {
if (info->mgr_pkg.empty()) {
info->access = NO_SU_ACCESS;
return info;
}