Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
ef9948a9
Commit
ef9948a9
authored
Feb 01, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move MagiskHide initialization to Magisk Manager
parent
298f0940
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
76 additions
and
34 deletions
+76
-34
flash_script.sh
scripts/flash_script.sh
+2
-2
magic_mask.sh
scripts/magic_mask.sh
+0
-23
add
zip_static/common/magiskhide/add
+7
-5
disable
zip_static/common/magiskhide/disable
+22
-0
enable
zip_static/common/magiskhide/enable
+39
-0
rm
zip_static/common/magiskhide/rm
+6
-4
No files found.
scripts/flash_script.sh
View file @
ef9948a9
...
@@ -526,8 +526,8 @@ else
...
@@ -526,8 +526,8 @@ else
rm
verity_key 2>/dev/null
rm
verity_key 2>/dev/null
fi
fi
# sepolicy patches
#
minimal
sepolicy patches
LD_LIBRARY_PATH
=
$SYSTEMLIB
$BINDIR
/sepolicy-inject
--m
agisk
-P
sepolicy
LD_LIBRARY_PATH
=
$SYSTEMLIB
$BINDIR
/sepolicy-inject
--m
inimal
-P
sepolicy
# Add new items
# Add new items
mkdir
-p
magisk 2>/dev/null
mkdir
-p
magisk 2>/dev/null
...
...
scripts/magic_mask.sh
View file @
ef9948a9
...
@@ -488,29 +488,6 @@ case $1 in
...
@@ -488,29 +488,6 @@ case $1 in
MAGISK_VERSION_STUB
MAGISK_VERSION_STUB
log_print
"** Magisk late_start service mode running..."
log_print
"** Magisk late_start service mode running..."
run_scripts service
run_scripts service
# Magisk Hide
if
[
-f
$COREDIR
/magiskhide/enable
]
;
then
log_print
"* Removing tampered read-only system props"
VERIFYBOOT
=
`
getprop ro.boot.verifiedbootstate
`
FLASHLOCKED
=
`
getprop ro.boot.flash.locked
`
VERITYMODE
=
`
getprop ro.boot.veritymode
`
[
!
-z
"
$VERIFYBOOT
"
-a
"
$VERIFYBOOT
"
!=
"green"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.verifiedbootstate green
`
"
[
!
-z
"
$FLASHLOCKED
"
-a
"
$FLASHLOCKED
"
!=
"1"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.flash.locked 1
`
"
[
!
-z
"
$VERITYMODE
"
-a
"
$VERITYMODE
"
!=
"enforcing"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.veritymode enforcing
`
"
mktouch
$COREDIR
/magiskhide/hidelist
chmod
-R
755
$COREDIR
/magiskhide
# Add Safety Net preset
$COREDIR
/magiskhide/add com.google.android.gms.unstable
log_print
"* Starting Magisk Hide"
/data/magisk/magiskhide
--daemon
fi
;;
;;
esac
esac
zip_static/common/magiskhide/add
View file @
ef9948a9
#!/system/bin/sh
#!/system/bin/sh
HIDELIST
=
/magisk/.core/magiskhide/hidelist
HIDELIST
=
/magisk/.core/magiskhide/hidelist
PROCESS
=
$1
if
[
!
-z
"
$1
"
]
;
then
if
[
!
-z
"
$PROCESS
"
]
;
then
if
[
$(
grep
-c
"^
$1
$"
$HIDELIST
)
-eq
"0"
]
;
then
if
[
`
grep
-c
"^
$PROCESS
$"
$HIDELIST
`
-eq
"0"
]
;
then
echo
"
$1
"
>>
$HIDELIST
echo
"
$PROCESS
"
>>
$HIDELIST
set
`
/data/busybox/ps
-o
pid,args |
grep
"
$1
"
|
grep
-v
"grep"
`
set
--
kill
"
$1
"
set
`
/data/busybox/ps
-o
pid,args |
grep
"
$PROCESS
"
|
grep
-v
grep
`
>
/dev/null
[
!
-z
"
$1
"
]
&&
kill
"
$1
"
fi
fi
fi
fi
zip_static/common/magiskhide/disable
0 → 100644
View file @
ef9948a9
#!/system/bin/sh
MODDIR
=
/magisk/.core/magiskhide
LOGFILE
=
/cache/magisk.log
log_print
()
{
echo
"MagiskHide:
$1
"
echo
"MagiskHide:
$1
"
>>
$LOGFILE
log
-p
i
-t
Magisk
"MagiskHide:
$1
"
}
log_print
"Stopping MagiskHide daemon"
set
--
set
`
/data/busybox/ps
-o
pid,args |
grep
"magiskhide"
|
grep
-v
grep
|
head
-1
`
>
/dev/null
[
!
-z
"
$1
"
]
&&
kill
"
$1
"
while
read
PROCESS
;
do
log_print
"Killing
$PROCESS
"
set
--
set
`
/data/busybox/ps
-o
pid,args |
grep
"
$PROCESS
"
|
grep
-v
grep
`
>
/dev/null
[
!
-z
"
$1
"
]
&&
kill
"
$1
"
done
<
$MODDIR
/hidelist
zip_static/common/magiskhide/enable
0 → 100644
View file @
ef9948a9
#!/system/bin/sh
MODDIR
=
/magisk/.core/magiskhide
BINPATH
=
/data/magisk
LOGFILE
=
/cache/magisk.log
log_print
()
{
echo
"MagiskHide:
$1
"
echo
"MagiskHide:
$1
"
>>
$LOGFILE
log
-p
i
-t
Magisk
"MagiskHide:
$1
"
}
log_print
"Removing tampered read-only system props"
VERIFYBOOT
=
`
getprop ro.boot.verifiedbootstate
`
FLASHLOCKED
=
`
getprop ro.boot.flash.locked
`
VERITYMODE
=
`
getprop ro.boot.veritymode
`
[
!
-z
"
$VERIFYBOOT
"
-a
"
$VERIFYBOOT
"
!=
"green"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.verifiedbootstate green
`
"
[
!
-z
"
$FLASHLOCKED
"
-a
"
$FLASHLOCKED
"
!=
"1"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.flash.locked 1
`
"
[
!
-z
"
$VERITYMODE
"
-a
"
$VERITYMODE
"
!=
"enforcing"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.veritymode enforcing
`
"
touch
$MODDIR
/hidelist
chmod
-R
755
$MODDIR
# Add Safety Net preset
$MODDIR
/add com.google.android.gms.unstable
while
read
PROCESS
;
do
log_print
"Killing
$PROCESS
"
set
--
set
`
/data/busybox/ps
-o
pid,args |
grep
"
$PROCESS
"
|
grep
-v
grep
`
>
/dev/null
[
!
-z
"
$1
"
]
&&
kill
"
$1
"
done
<
$MODDIR
/hidelist
log_print
"Starting MagiskHide daemon"
$MODDIR
/magiskhide
--daemon
zip_static/common/magiskhide/rm
View file @
ef9948a9
#!/system/bin/sh
#!/system/bin/sh
HIDELIST
=
/magisk/.core/magiskhide/hidelist
HIDELIST
=
/magisk/.core/magiskhide/hidelist
PROCESS
=
$1
if
[
!
-z
"
$
1
"
]
;
then
if
[
!
-z
"
$
PROCESS
"
]
;
then
cp
-af
$HIDELIST
$HIDELIST
.tmp
cp
-af
$HIDELIST
$HIDELIST
.tmp
cat
$HIDELIST
.tmp |
grep
-v
"^
$
1
$"
>
$HIDELIST
cat
$HIDELIST
.tmp |
grep
-v
"^
$
PROCESS
$"
>
$HIDELIST
rm
-f
$HIDELIST
.tmp
rm
-f
$HIDELIST
.tmp
set
`
/data/busybox/ps
-o
pid,args |
grep
"
$1
"
|
grep
-v
"grep"
`
set
--
kill
"
$1
"
set
`
/data/busybox/ps
-o
pid,args |
grep
"
$PROCESS
"
|
grep
-v
grep
`
>
/dev/null
[
!
-z
"
$1
"
]
&&
kill
"
$1
"
fi
fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment