forked from AdAway/AdAway
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request AdAway#861 from PerfectSlayer/master
Add generic systemless support
- Loading branch information
Showing
7 changed files
with
615 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
220 changes: 42 additions & 178 deletions
220
AdAway/src/main/java/org/adaway/util/SystemlessUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,206 +1,70 @@ | ||
| package org.adaway.util; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| import org.adaway.util.systemless.AbstractSystemlessMode; | ||
| import org.adaway.util.systemless.NotSupportedSystemlessMode; | ||
| import org.adaway.util.systemless.SuperSuSystemlessMode; | ||
| import org.adaway.util.systemless.SuperUserSystemlessMode; | ||
| import org.sufficientlysecure.rootcommands.Shell; | ||
| import org.sufficientlysecure.rootcommands.Toolbox; | ||
| import org.sufficientlysecure.rootcommands.command.SimpleCommand; | ||
|
|
||
| import java.io.BufferedWriter; | ||
| import java.io.File; | ||
| import java.io.FileWriter; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * This class provides methods to check, install and remove systemless script. | ||
| * | ||
| * @author Bruce BUJON (bruce.bujon(at)gmail(dot)com) | ||
| */ | ||
| public class SystemlessUtils { | ||
|
|
||
| /** | ||
| * Check if the systemless mode is supported. | ||
| * | ||
| * @param shell The shell used to check. | ||
| * @return <code>true</code> if the systemless mode is supported, <code>false</code> otherwise. | ||
| * The cached systemless mode. | ||
| */ | ||
| public static boolean isSystemlessModeSupported(Shell shell) { | ||
| try { | ||
| // Check if SuperSU systemless root is installed | ||
| Toolbox toolbox = new Toolbox(shell); | ||
| return toolbox.fileExists("/su/bin/su"); | ||
| } catch (Exception exception) { | ||
| Log.e(Constants.TAG, "Error while checking if systemless mode is supported.", exception); | ||
| return false; | ||
| } | ||
| } | ||
| private static AbstractSystemlessMode systemlessMode; | ||
|
|
||
| /** | ||
| * Check if systemless mode is enabled. | ||
| * Get the systemless mode. | ||
| * | ||
| * @param shell The root shell used to check. | ||
| * @return The systemless mode installation status (<code>true</code> if enabled, | ||
| * <code>false</code> otherwise). | ||
| * @return The systemless mode. | ||
| */ | ||
| public static boolean isSystemlessModeEnabled(Shell shell) { | ||
| try { | ||
| // Look for mount point of system hosts file | ||
| SimpleCommand command = new SimpleCommand("mount | grep " + Constants.ANDROID_SYSTEM_ETC_HOSTS); | ||
| shell.add(command).waitForFinish(); | ||
| return command.getExitCode() == 0; | ||
| } catch (Exception exception) { | ||
| Log.e(Constants.TAG, "Error while checking if systemless mode is installed.", exception); | ||
| // Consider systemless mode is not installed if script could not be checked | ||
| return false; | ||
| public static AbstractSystemlessMode getSystemlessMode() { | ||
| // Check cached systemless mode | ||
| if (SystemlessUtils.systemlessMode != null) { | ||
| return SystemlessUtils.systemlessMode; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Install systemless script.<br> | ||
| * Create and execute<code>/su/su.d/0000adaway.script</code> file to mount hosts file to | ||
| * <code>/su/etc/hosts</code> location and ensure mounted hosts file is present.<br> | ||
| * Require SuperSU >= 2.56. | ||
| * | ||
| * @param context The application context (current activity). | ||
| * @param shell The current root shell to install script. | ||
| * @return The script installation status (<code>true</code> if the systemless script is installed, | ||
| * <code>false</code> otherwise). | ||
| */ | ||
| public static boolean enableSystemlessMode(Context context, Shell shell) { | ||
| // Declare shell | ||
| Shell shell = null; | ||
| try { | ||
| // Start shell | ||
| shell = Shell.startShell(); | ||
| Toolbox toolbox = new Toolbox(shell); | ||
| // Ensure mounted hosts file exists | ||
| if (!toolbox.fileExists(Constants.ANDROID_SU_ETC_HOSTS)) { | ||
| // Copy current hosts file to mounted host file | ||
| toolbox.copyFile(Constants.ANDROID_SYSTEM_ETC_HOSTS, Constants.ANDROID_SU_ETC_HOSTS, false, true); | ||
| } | ||
| // Check if systemless mode is already enabled | ||
| if (SystemlessUtils.isSystemlessModeEnabled(shell)) { | ||
| return true; | ||
| } | ||
| /* | ||
| * Install systemless script by writing content to a temporary file, copying to su hook location then running it. | ||
| */ | ||
| // Create temp file | ||
| File cacheDir = context.getCacheDir(); | ||
| File tempFile = File.createTempFile(Constants.TAG, ".script", cacheDir); | ||
| // Write script content to temp file | ||
| BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile)); | ||
| writer.write("mount -o bind " + Constants.ANDROID_SU_ETC_HOSTS + " " + Constants.ANDROID_SYSTEM_ETC_HOSTS + ";"); | ||
| writer.newLine(); | ||
| writer.close(); | ||
| // Copy temp file to /su partition | ||
| if (!toolbox.copyFile(tempFile.getAbsolutePath(), Constants.ANDROID_SYSTEMLESS_SCRIPT, false, false)) { | ||
| Log.w(Constants.TAG, "Could not copy the systemless script to " + Constants.ANDROID_SYSTEMLESS_SCRIPT + "."); | ||
| return false; | ||
| } | ||
| // Apply script permissions | ||
| if (!toolbox.setFilePermissions(Constants.ANDROID_SYSTEMLESS_SCRIPT, "755")) { | ||
| Log.w(Constants.TAG, "Could not set systemless script rights."); | ||
| return false; | ||
| } | ||
| // Remove temp file | ||
| if (!tempFile.delete()) { | ||
| Log.i(Constants.TAG, "Could not delete the temporary script file."); | ||
| } | ||
| // Execute script | ||
| SimpleCommand command = new SimpleCommand(Constants.ANDROID_SYSTEMLESS_SCRIPT); | ||
| shell.add(command).waitForFinish(); | ||
| if (command.getExitCode() != 0) { | ||
| Log.w(Constants.TAG, "Could not execute the systemless script."); | ||
| return false; | ||
| } | ||
| // Check if installation is successful | ||
| if (!SystemlessUtils.isSystemlessModeEnabled(shell)) { | ||
| Log.w(Constants.TAG, "Systemless mode installation was successful but systemless is not working."); | ||
| return false; | ||
| // Check if ChainFire's SuperSU systemless root is installed | ||
| if (toolbox.fileExists("/su/bin/su")) { | ||
| SystemlessUtils.systemlessMode = new SuperSuSystemlessMode(); | ||
| } else { | ||
| // Check if phh's SuperUser su bind is installed | ||
| SimpleCommand command = new SimpleCommand("su -v | grep subind"); | ||
| shell.add(command).waitForFinish(); | ||
| if (command.getExitCode() == 0) { | ||
| SystemlessUtils.systemlessMode = new SuperUserSystemlessMode(); | ||
| } else { | ||
| // Otherwise not supported systemless mode | ||
| SystemlessUtils.systemlessMode = new NotSupportedSystemlessMode(); | ||
| } | ||
| } | ||
| // Systemless mode is installed and working | ||
| return true; | ||
| } catch (Exception exception) { | ||
| Log.e(Constants.TAG, "Error while enabling systemless mode.", exception); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Remove systemless script.<br> | ||
| * Remove <code>/su/su.d/0000adaway.script</code> and mounted hosts files. | ||
| * | ||
| * @param shell The current root shell to install script. | ||
| * @return The script removal status (<code>true</code> if the systemless script is removed, | ||
| * <code>false</code> otherwise). | ||
| */ | ||
| public static boolean disableSystemlessMode(Shell shell) { | ||
| try { | ||
| // Check if systemless mode is enabled | ||
| if (!SystemlessUtils.isSystemlessModeEnabled(shell)) { | ||
| return true; | ||
| } | ||
| // Remove systemless script | ||
| SimpleCommand removeScriptCommand = | ||
| new SimpleCommand(Constants.COMMAND_RM + " " + Constants.ANDROID_SYSTEMLESS_SCRIPT); | ||
| shell.add(removeScriptCommand).waitForFinish(); | ||
| if (removeScriptCommand.getExitCode() != 0) { | ||
| Log.w(Constants.TAG, "Couldn't remove systemless script."); | ||
| return false; | ||
| Log.e(Constants.TAG, "Error while getting systemless mode.", exception); | ||
| SystemlessUtils.systemlessMode = new NotSupportedSystemlessMode(); | ||
| } finally { | ||
| // Close shell | ||
| if (shell != null) { | ||
| try { | ||
| shell.close(); | ||
| } catch (IOException exception) { | ||
| Log.d(Constants.TAG, "Error while closing shell.", exception); | ||
| } | ||
| } | ||
| // Try to umount hosts file (resource must be used: it requires reboot) | ||
| SimpleCommand umountCommand = | ||
| new SimpleCommand("umount " + Constants.ANDROID_SYSTEM_ETC_HOSTS); | ||
| shell.add(umountCommand).waitForFinish(); | ||
| // Remove mounted hosts file | ||
| SimpleCommand removeMountedHostsCommand = | ||
| new SimpleCommand(Constants.COMMAND_RM + " " + Constants.ANDROID_SU_ETC_HOSTS); | ||
| shell.add(removeMountedHostsCommand).waitForFinish(); | ||
| return true; | ||
| } catch (Exception exception) { | ||
| Log.e(Constants.TAG, "Error while disabling systemless mode.", exception); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This class provides systemless mode statuses (support and activation). | ||
| * | ||
| * @author Bruce BUJON (bruce.bujon(at)gmail(dot)com) | ||
| */ | ||
| public static class SystemlessModeStatus { | ||
| /** | ||
| * The systemless mode support status (<code>true</code> if supported, <code>false</code> otherwise). | ||
| */ | ||
| private final boolean supported; | ||
| /** | ||
| * The systemless mode activation status (<code>true</code> if enabled, <code>false</code> otherwise). | ||
| */ | ||
| private final boolean enabled; | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * | ||
| * @param supported The systemless mode support status (<code>true</code> if supported, <code>false</code> otherwise). | ||
| * @param enabled The systemless mode activation status (<code>true</code> if enabled, <code>false</code> otherwise). | ||
| */ | ||
| public SystemlessModeStatus(boolean supported, boolean enabled) { | ||
| this.supported = supported; | ||
| this.enabled = enabled; | ||
| } | ||
|
|
||
| /** | ||
| * Get the systemless mode support status. | ||
| * | ||
| * @return The systemless mode support status (<code>true</code> if supported, <code>false</code> otherwise). | ||
| */ | ||
| public boolean isSupported() { | ||
| return this.supported; | ||
| } | ||
|
|
||
| /** | ||
| * Get the systemless mode activation status. | ||
| * | ||
| * @return The systemless mode activation status (<code>true</code> if enabled, <code>false</code> otherwise). | ||
| */ | ||
| public boolean isEnabled() { | ||
| return this.enabled; | ||
| } | ||
| // Return found systemless mode | ||
| return SystemlessUtils.systemlessMode; | ||
| } | ||
| } |
Oops, something went wrong.