mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-11-24 02:25:28 +00:00
b1afd554fc
Before switching to the new MagiskHide implementation (APK inotify), logcat parsing provides us lots of information to target a process. We were targeting components so that apps with multi-processes can still be hidden properly. After switching to the new implementation, our granularity is limited to the UID of the process. This is especially dangerous since Android allow apps signed with the same signature to share UIDs, and many system apps utilize this for elevated permissions for some services. This commit introduces process name matching. We could not blanketly target an UID, so the workaround is to verify its process name before unmounting. The tricky thing is that any app developer is allowed to name the process of its component to whatever they want; there is no 'one rule to catch them all' to target a specific package. As a result, Magisk Manager is updated to scan through all components of all apps, and show different processes of the same app, each as a separate hide target in the list. The hide target database also has to be updated accordingly. Each hide target is now a <package name, process name> pair. The magiskhide CLI and Magisk Manager is updated to support this new target format.
139 lines
3.0 KiB
C++
139 lines
3.0 KiB
C++
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <pthread.h>
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <magisk.h>
|
|
#include <daemon.h>
|
|
#include <flags.h>
|
|
|
|
#include "magiskhide.h"
|
|
|
|
bool hide_enabled = false;
|
|
|
|
[[noreturn]] static void usage(char *arg0) {
|
|
fprintf(stderr,
|
|
FULL_VER(MagiskHide) "\n\n"
|
|
"Usage: %s [--option [arguments...] ]\n\n"
|
|
"Options:\n"
|
|
" --status Return the status of magiskhide\n"
|
|
" --enable Start magiskhide\n"
|
|
" --disable Stop magiskhide\n"
|
|
" --add PKG [PROC] Add a new target to the hide list\n"
|
|
" --rm PKG [PROC] Remove from the hide list\n"
|
|
" --ls List the current hide list\n"
|
|
, arg0);
|
|
exit(1);
|
|
}
|
|
|
|
void magiskhide_handler(int client) {
|
|
int req = read_int(client);
|
|
int res = DAEMON_ERROR;
|
|
|
|
switch (req) {
|
|
case STOP_MAGISKHIDE:
|
|
case ADD_HIDELIST:
|
|
case RM_HIDELIST:
|
|
case LS_HIDELIST:
|
|
if (!hide_enabled) {
|
|
write_int(client, HIDE_NOT_ENABLED);
|
|
close(client);
|
|
return;
|
|
}
|
|
}
|
|
|
|
switch (req) {
|
|
case LAUNCH_MAGISKHIDE:
|
|
launch_magiskhide(client);
|
|
return;
|
|
case STOP_MAGISKHIDE:
|
|
res = stop_magiskhide();
|
|
break;
|
|
case ADD_HIDELIST:
|
|
res = add_list(client);
|
|
break;
|
|
case RM_HIDELIST:
|
|
res = rm_list(client);
|
|
break;
|
|
case LS_HIDELIST:
|
|
ls_list(client);
|
|
client = -1;
|
|
break;
|
|
case HIDE_STATUS:
|
|
res = hide_enabled ? HIDE_IS_ENABLED : HIDE_NOT_ENABLED;
|
|
break;
|
|
}
|
|
|
|
write_int(client, res);
|
|
close(client);
|
|
}
|
|
|
|
int magiskhide_main(int argc, char *argv[]) {
|
|
if (argc < 2)
|
|
usage(argv[0]);
|
|
|
|
int req;
|
|
if (strcmp(argv[1], "--enable") == 0)
|
|
req = LAUNCH_MAGISKHIDE;
|
|
else if (strcmp(argv[1], "--disable") == 0)
|
|
req = STOP_MAGISKHIDE;
|
|
else if (strcmp(argv[1], "--add") == 0 && argc > 2)
|
|
req = ADD_HIDELIST;
|
|
else if (strcmp(argv[1], "--rm") == 0 && argc > 2)
|
|
req = RM_HIDELIST;
|
|
else if (strcmp(argv[1], "--ls") == 0)
|
|
req = LS_HIDELIST;
|
|
else if (strcmp(argv[1], "--status") == 0)
|
|
req = HIDE_STATUS;
|
|
else
|
|
usage(argv[0]);
|
|
|
|
// Send request
|
|
int fd = connect_daemon();
|
|
write_int(fd, MAGISKHIDE);
|
|
write_int(fd, req);
|
|
if (req == ADD_HIDELIST || req == RM_HIDELIST) {
|
|
write_string(fd, argv[2]);
|
|
write_string(fd, argv[3] ? argv[3] : "");
|
|
}
|
|
if (req == LS_HIDELIST)
|
|
send_fd(fd, STDOUT_FILENO);
|
|
|
|
// Get response
|
|
int code = read_int(fd);
|
|
switch (code) {
|
|
case DAEMON_SUCCESS:
|
|
break;
|
|
case HIDE_NOT_ENABLED:
|
|
fprintf(stderr, "MagiskHide is not enabled\n");
|
|
break;
|
|
case HIDE_IS_ENABLED:
|
|
fprintf(stderr, "MagiskHide is enabled\n");
|
|
break;
|
|
case HIDE_ITEM_EXIST:
|
|
fprintf(stderr, "Target already exists in hide list\n");
|
|
break;
|
|
case HIDE_ITEM_NOT_EXIST:
|
|
fprintf(stderr, "Target does not exist in hide list\n");
|
|
break;
|
|
case HIDE_NO_NS:
|
|
fprintf(stderr, "Your kernel doesn't support mount namespace\n");
|
|
break;
|
|
|
|
/* Errors */
|
|
case ROOT_REQUIRED:
|
|
fprintf(stderr, "Root is required for this operation\n");
|
|
break;
|
|
case DAEMON_ERROR:
|
|
default:
|
|
fprintf(stderr, "Daemon error\n");
|
|
return DAEMON_ERROR;
|
|
}
|
|
|
|
return req == HIDE_STATUS ? (code == HIDE_IS_ENABLED ? 0 : 1) : code != DAEMON_SUCCESS;
|
|
}
|