Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ea3472 authored by Eric Biggers's avatar Eric Biggers
Browse files

RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets 

When RescueParty detects that a system process is crashing frequently,
it tries to recover in various ways, such as by resetting all settings.
Unfortunately, this included resetting the secure_frp_mode setting,
which is the means by which the system keeps track of whether the
Factory Reset Protection (FRP) challenge has been passed yet.  With this
setting reset, some FRP restrictions went away and it became possible to
bypass FRP by setting a new lockscreen credential.

Fix this by excluding secure_frp_mode from resets.

Note: currently this bug isn't reproducible on 'main' due to ag/23727749
disabling much of RescueParty, but that is a temporary change.

Bug: 253043065
Test: With ag/23727749 reverted and with my fix to prevent
      com.android.settings from crashing *not* applied, tried repeatedly
      setting lockscreen credential while in FRP mode, using the
      smartlock setup activity launched by intent via adb.  Verified
      that although RescueParty is still triggered after 5 attempts,
      secure_frp_mode is no longer reset (its value remains "1").
Test: Verified that secure_frp_mode still gets changed from 1 to 0 when
      FRP is passed legitimately.
Test: atest com.android.providers.settings.SettingsProviderTest
Test: atest android.provider.SettingsProviderTest
Change-Id: Id95ed43b9cc2208090064392bcd5dc012710af93
(cherry picked from commit 9890dd7f)
(changed Global.SECURE_FRP_MODE to Secure.SECURE_FRP_MODE,
 needed because this setting was moved in U)
(removed static keyword from shouldExcludeSettingFromReset(),
 needed for compatibility with Java 15 and earlier)
Merged-In: Id95ed43b9cc2208090064392bcd5dc012710af93
parent 306f04b9

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+13 −4
Original line number Diff line number Diff line
@@ -3075,6 +3075,15 @@ public class SettingsProvider extends ContentProvider { 
            return settingsState.getSettingLocked(name);

        }



        private boolean shouldExcludeSettingFromReset(Setting setting, String prefix) {

            // If a prefix was specified, exclude settings whose names don't start with it.

            if (prefix != null && !setting.getName().startsWith(prefix)) {

                return true;

            }

            // Never reset SECURE_FRP_MODE, as it could be abused to bypass FRP via RescueParty.

            return Secure.SECURE_FRP_MODE.equals(setting.getName());

        }



        public void resetSettingsLocked(int type, int userId, String packageName, int mode,

                String tag) {

            resetSettingsLocked(type, userId, packageName, mode, tag, /*prefix=*/
@@ -3097,7 +3106,7 @@ public class SettingsProvider extends ContentProvider { 
                        Setting setting = settingsState.getSettingLocked(name);

                        if (packageName.equals(setting.getPackageName())) {

                            if ((tag != null && !tag.equals(setting.getTag()))

                                    || (prefix != null && !setting.getName().startsWith(prefix))) {

                                    || shouldExcludeSettingFromReset(setting, prefix)) {

                                continue;

                            }

                            if (settingsState.resetSettingLocked(name)) {
@@ -3117,7 +3126,7 @@ public class SettingsProvider extends ContentProvider { 
                        Setting setting = settingsState.getSettingLocked(name);

                        if (!SettingsState.isSystemPackage(getContext(),

                                setting.getPackageName())) {

                            if (prefix != null && !setting.getName().startsWith(prefix)) {

                            if (shouldExcludeSettingFromReset(setting, prefix)) {

                                continue;

                            }

                            if (settingsState.resetSettingLocked(name)) {
@@ -3137,7 +3146,7 @@ public class SettingsProvider extends ContentProvider { 
                        Setting setting = settingsState.getSettingLocked(name);

                        if (!SettingsState.isSystemPackage(getContext(),

                                setting.getPackageName())) {

                            if (prefix != null && !setting.getName().startsWith(prefix)) {

                            if (shouldExcludeSettingFromReset(setting, prefix)) {

                                continue;

                            }

                            if (setting.isDefaultFromSystem()) {
@@ -3160,7 +3169,7 @@ public class SettingsProvider extends ContentProvider { 
                    for (String name : settingsState.getSettingNamesLocked()) {

                        Setting setting = settingsState.getSettingLocked(name);

                        boolean someSettingChanged = false;

                        if (prefix != null && !setting.getName().startsWith(prefix)) {

                        if (shouldExcludeSettingFromReset(setting, prefix)) {

                            continue;

                        }

                        if (setting.isDefaultFromSystem()) {

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java

+25 −0
Original line number Diff line number Diff line
@@ -466,6 +466,31 @@ public class SettingsProviderTest extends BaseSettingsProviderTest { 
        }

    }



    // To prevent FRP bypasses, the SECURE_FRP_MODE setting should not be reset when all other

    // settings are reset.  But it should still be possible to explicitly set its value.

    @Test

    public void testSecureFrpModeSettingCannotBeReset() throws Exception {

        final String name = Settings.Secure.SECURE_FRP_MODE;

        final String origValue = getSetting(SETTING_TYPE_GLOBAL, name);

        setSettingViaShell(SETTING_TYPE_GLOBAL, name, "1", false);

        try {

            assertEquals("1", getSetting(SETTING_TYPE_GLOBAL, name));

            for (int type : new int[] { SETTING_TYPE_GLOBAL, SETTING_TYPE_SECURE }) {

                resetSettingsViaShell(type, Settings.RESET_MODE_UNTRUSTED_DEFAULTS);

                resetSettingsViaShell(type, Settings.RESET_MODE_UNTRUSTED_CHANGES);

                resetSettingsViaShell(type, Settings.RESET_MODE_TRUSTED_DEFAULTS);

            }

            // The value should still be "1".  It should not have been reset to null.

            assertEquals("1", getSetting(SETTING_TYPE_GLOBAL, name));

            // It should still be possible to explicitly set the value to "0".

            setSettingViaShell(SETTING_TYPE_GLOBAL, name, "0", false);

            assertEquals("0", getSetting(SETTING_TYPE_GLOBAL, name));

        } finally {

            setSettingViaShell(SETTING_TYPE_GLOBAL, name, origValue, false);

            assertEquals(origValue, getSetting(SETTING_TYPE_GLOBAL, name));

        }

    }



    private void doTestQueryStringInBracketsViaProviderApiForType(int type) {

        // Make sure we have a clean slate.

        deleteStringViaProviderApi(type, FAKE_SETTING_NAME);