From bb0a5ff22d76dcb484e299478658e5126d5283cd Mon Sep 17 00:00:00 2001 From: Didgeridoohan Date: Sat, 30 Jun 2018 22:32:49 -0700 Subject: [PATCH] v2.3.1-v19 part 4 --- README.md | 27 +++++++++++++++++++++++---- config.sh | 40 +++++++++++++++++++++++----------------- module.prop | 4 ++-- 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 1ea2a48..78b141b 100644 --- a/README.md +++ b/README.md @@ -63,11 +63,11 @@ Google Nexus 6=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys ### I still can't pass the ctsProfile check If you've picked a certified fingerprint from the provided list, or you're using a fingerprint that you know is certified but still can't pass the ctsProfile check, try one or more of the following: -- First, do you pass basicIntegrity? If you don't, there's something else going on that this module can't help you with. Take a look under "Miscellaneous MagiskHide issues" below. +- First, do you pass basicIntegrity? If you don't, there's something else going on that this module can't help you with. Take a look under ["Miscellaneous MagiskHide issues"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#miscellaneous-magiskhide-issues) below. - Go into the script options and move the execution of the boot script to post-fs-data. See ["Boot stage"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#boot-stage) below. - Try a different fingerprint (pick one from the provided list). - Some ROMs will just not be able to pass the ctsProfile check, if they contain signs of a rooted/modified device that Magisk can't hide. Check in your ROM thread or with the creator/developer. -- You might have remnants of previous tampering on your device. A clean install of your system may be required. +- You might have remnants of previous modifications that trigger SafetyNet on your device. A clean install of your system may be required. - If you can't get things working, and want help, make sure to provide logs and details. See ["Logs, etc"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#logs-etc) below. @@ -143,6 +143,14 @@ But first: have you tried turning it off and on again? Toggling MagiskHide off a ## Issues, support, etc If you have questions, suggestions or are experiencing some kind of issue, visit the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228) @ XDA. +### I can't pass the ctsProfile check +See ["I still can't pass the ctsProfile check"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#i-still-cant-pass-the-ctsprofile-check) above. + +Also see ["Props don't seem to set properly"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#props-dont-seem-to-set-properly) below. + +### I can't pass the basicIntegrity check +This module can only really help with the ctsProfile check, by spoofing the device fingerprint. If you can't pass basicIntegrity, there's probably something else going on with your device. See ["Miscellaneous MagiskHide issues"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#miscellaneous-magiskhide-issues) above. + ### Props don't seem to set properly If it seems like props you're trying to set with the module don't get set properly (ctsProfile still doesn't pass, custom props don't work, etc), go into the script options and change the execution of the boot script to post-fs-data. See ["Boot stage"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#boot-stage) above. @@ -154,9 +162,11 @@ Place a file named `reset_mhpc` in /cache (or /data/cache on A/B devices) and re It is possible to use this in combination with the configuration file described above to keep device fingerprint or any other settings intact past the reset. Just make sure to remove any custom props that might have been causing issues from the configuration file. ### Logs, etc -In case of issues, please provide the logs by running the `props` script and selecting the "Collect logs" option (or running the `props` script with the -l command, use -h for details). All the relevant logs, together with the Magisk logs, the stock build.prop file and current prop values will be packaged into a file that'll be stored in the root of your internal storage, ready for attaching to a post in the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228), together with a detailed description of your problem. +In case of issues, please provide the logs by running the `props` script and selecting the "Collect logs" option (or running the `props` script with the -l command, use -h for details). All the relevant logs, together with the Magisk logs, the stock build.prop file and current prop values will be packaged into a file that'll be stored in the root of the device's internal storage, ready for attaching to a post in the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228), together with a detailed description of your problem. -The logs are also stored in /cache (or /data/cache for A/B devices), and the Magisk log and any files starting with "propsconf" would be useful for troubleshooting (if you don't use the "Collect logs" option mentioned above. Providing the output from terminal might also be useful. +The logs will also automatically be saved to the root of the device's internal storage if there's an issue with the module scripts. + +If you can't run the `props` script for some reason, the logs are also stored in /cache (or /data/cache for A/B devices). The Magisk log and any files starting with "propsconf" would be useful for troubleshooting (if you don't use the "Collect logs" option mentioned above). Providing the output from terminal might also be useful. If you have the latest beta release of Magisk installed, the "magisk_debug.log" is also useful. If there's no new beta released, there's always a beta version of the latest stable Magisk release (the only difference is the more verbose logging), so that you can collect the debug log. @@ -171,6 +181,13 @@ If you have the latest beta release of Magisk installed, the "magisk_debug.log" ## Changelog +### v2.3.1 +- Fixed permissions for the settings boot script when using the reset option. +- Fixed log collecting. +- Added automatic log collecting when there's an issue with the boot scripts. +- Some updates to the documentation, mainly regarding troubleshooting issues. +- Miscellaneous improvements and fixes. + ### v2.3.0 - Added a function for removing props. See the documentation for details. - Added a function to collect and package the logs and relevant troubleshooting files for easy uploading. @@ -346,3 +363,5 @@ If you have the latest beta release of Magisk installed, the "magisk_debug.log" - ZTE Axon 7 (7.1.1) - ZTE Nubia Z17 (7.1.1) - Zuk Z2 Pro (7.0) +.1.1) +- Zuk Z2 Pro (7.0) diff --git a/config.sh b/config.sh index 5963438..fe6db1b 100644 --- a/config.sh +++ b/config.sh @@ -85,13 +85,16 @@ set_permissions() { # set_perm $MODPATH/system/lib/libart.so 0 0 0644 # The following is default permissions, DO NOT remove - set_perm_recursive $MODPATH 0 0 0755 0644 + set_perm_recursive $MODPATH 0 0 0755 0644 >> $INSTLOG # Permissions for the props file - set_perm $MODPATH/system/$BIN/props 0 0 0777 + set_perm $MODPATH/system/$BIN/props 0 0 0777 >> $INSTLOG + # Permissions for boot scripts + set_perm $LATEFILE 0 0 0755 >> $INSTLOG + set_perm $POSTFILE 0 0 0755 >> $INSTLOG # Busybox permissions if [ -f "$MODPATH/busybox" ]; then - set_perm $MODPATH/busybox 0 0 0755 + set_perm $MODPATH/busybox 0 0 0755 >> $INSTLOG fi } @@ -212,12 +215,11 @@ script_placement() { FILEV=0 fi log_print "- Installing scripts" - cp -afv $INSTALLER/common/util_functions.sh $MODPATH/util_functions.sh >> $INSTLOG - cp -afv $INSTALLER/common/prints.sh $MODPATH/prints.sh >> $INSTLOG - cp -afv $UPDATEPOSTFILE $MODPATH/propsconf_post >> $INSTLOG - cp -afv $UPDATEPOSTFILE $POSTFILE >> $INSTLOG - chmod -v 755 $POSTFILE >> $INSTLOG - cp -afv $UPDATELATEFILE $MODPATH/propsconf_late >> $INSTLOG + cp -af $INSTALLER/common/util_functions.sh $MODPATH/util_functions.sh >> $INSTLOG + cp -af $INSTALLER/common/prints.sh $MODPATH/prints.sh >> $INSTLOG + cp -af $UPDATEPOSTFILE $MODPATH/propsconf_post >> $INSTLOG + cp -af $UPDATEPOSTFILE $POSTFILE >> $INSTLOG + cp -af $UPDATELATEFILE $MODPATH/propsconf_late >> $INSTLOG if [ "$UPDATEV" -gt "$FILEV" ]; then if [ "$FILEV" == 0 ]; then log_print "- Placing settings script" @@ -260,12 +262,10 @@ script_placement() { done fi log_handler "Setting up late_start settings script." - cp -afv $UPDATELATEFILE $LATEFILE >> $INSTLOG - chmod -v 755 $LATEFILE >> $INSTLOG + cp -af $UPDATELATEFILE $LATEFILE >> $INSTLOG elif [ "$UPDATEV" -lt "$FILEV" ]; then log_print "- Settings cleared (script downgraded)" - cp -afv $UPDATELATEFILE $LATEFILE >> $INSTLOG - chmod -v 755 $LATEFILE >> $INSTLOG + cp -af $UPDATELATEFILE $LATEFILE >> $INSTLOG else log_print "- Module settings preserved" fi @@ -326,7 +326,7 @@ bin_check() { BIN=bin fi log_handler "Using /system/$BIN." - mv -f $MODPATH/system/binpath $MODPATH/system/$BIN + mv -f $MODPATH/system/binpath $MODPATH/system/$BIN >> $INSTLOG } # Magisk installation check @@ -354,7 +354,7 @@ check_bb() { log_handler "Current/installed busybox - v${BBCURR}/v${BBV}." if [ "$BBCURR" == "$BBV" ]; then log_handler "Backing up current busybox." - cp -afv $IMGPATH/$MODID/busybox $CACHELOC/busybox_post >> $INSTLOG + cp -af $IMGPATH/$MODID/busybox $CACHELOC/busybox_post >> $INSTLOG fi fi } @@ -363,7 +363,7 @@ check_bb() { download_bb() { if [ -f "$CACHELOC/busybox_post" ]; then log_handler "Restoring current busybox." - mv -fv $CACHELOC/busybox_post $MODPATH/busybox >> $INSTLOG + mv -f $CACHELOC/busybox_post $MODPATH/busybox >> $INSTLOG elif [ "$BOOTMODE" == "true" ]; then # Testing connection log_print "- Testing connection" @@ -374,8 +374,13 @@ download_bb() { if [ "$CNTTEST" == "true" ]; then log_print "- Downloading busybox" wget -T 5 -O $MODPATH/busybox $BBWWWPATH 2>> $INSTLOG + if [ -f "$MODPATH/busybox" ]; then + log_print "- Busybox downloaded" + else + log_print "! No busybox downloaded!" + fi else - log_print "- No connection" + log_print "! No connection!" fi elif [ "$BOOTMODE" == "false" ]; then log_handler "Recovery installation, can't download busybox." @@ -402,3 +407,4 @@ script_install() { placeholder_update $LATEFILE IMGPATH IMG_PLACEHOLDER "$BIMGPATH" placeholder_update $MODPATH/system/$BIN/props IMGPATH IMG_PLACEHOLDER "$BIMGPATH" } + diff --git a/module.prop b/module.prop index 3e1c793..6230390 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v2.3.0-v19 -versionCode=16 +version=v2.3.1-v19 +versionCode=17 author=Didgeridoohan description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Edit prop files for better root hiding. Set/reset prop values set by MagiskHide. Change any prop values easily. minMagisk=1500