PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine permission check process of 2-pane deep link

Browse Source 
- Check the deep link activity instance before rediercting to the
  internal activity for the managed profile invocation so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
This commit is contained in:
Jason Chiu
2023-03-23 15:30:19 +08:00
parent d1d2374b89
commit 5310c40640
2 changed files with 142 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
View File

@@ -20,8 +20,13 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -30,6 +35,8 @@ import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.view.View;
import android.view.Window;
@@ -215,29 +222,89 @@ public class SettingsHomepageActivityTest {
}
@Test
@Config(shadows = {ShadowPasswordUtils.class})
public void getInitialReferrer_differentPackage_returnCurrentReferrer() {
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
String referrer = "com.abc";
doReturn(referrer).when(activity).getCurrentReferrer();
assertEquals(activity.getInitialReferrer(), referrer);
}
@Test
public void getInitialReferrer_noReferrerExtra_returnCurrentReferrer() {
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
String referrer = activity.getPackageName();
doReturn(referrer).when(activity).getCurrentReferrer();
assertEquals(activity.getInitialReferrer(), referrer);
}
@Test
public void getInitialReferrer_hasReferrerExtra_returnGivenReferrer() {
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
doReturn(activity.getPackageName()).when(activity).getCurrentReferrer();
String referrer = "com.abc";
activity.setIntent(new Intent().putExtra(SettingsHomepageActivity.EXTRA_INITIAL_REFERRER,
referrer));
assertEquals(activity.getInitialReferrer(), referrer);
}
@Test
public void getCurrentReferrer_hasReferrerExtra_shouldNotEqual() {
String referrer = "com.abc";
Uri uri = new Uri.Builder().scheme("android-app").authority(referrer).build();
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
activity.setIntent(new Intent().putExtra(Intent.EXTRA_REFERRER, uri));
assertNotEquals(activity.getCurrentReferrer(), referrer);
}
@Test
public void getCurrentReferrer_hasReferrerNameExtra_shouldNotEqual() {
String referrer = "com.abc";
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
activity.setIntent(new Intent().putExtra(Intent.EXTRA_REFERRER_NAME, referrer));
assertNotEquals(activity.getCurrentReferrer(), referrer);
}
@Test
public void isCallingAppPermitted_emptyPermission_returnTrue() {
SettingsHomepageActivity homepageActivity = spy(new SettingsHomepageActivity());
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
doReturn(PackageManager.PERMISSION_DENIED).when(activity)
.checkPermission(anyString(), anyInt(), anyInt());
assertTrue(homepageActivity.isCallingAppPermitted(""));
assertTrue(activity.isCallingAppPermitted("", 1000));
}
@Test
@Config(shadows = {ShadowPasswordUtils.class})
public void isCallingAppPermitted_noGrantedPermission_returnFalse() {
SettingsHomepageActivity homepageActivity = spy(new SettingsHomepageActivity());
public void isCallingAppPermitted_notGrantedPermission_returnFalse() {
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
doReturn(PackageManager.PERMISSION_DENIED).when(activity)
.checkPermission(anyString(), anyInt(), anyInt());
assertFalse(homepageActivity.isCallingAppPermitted("android.permission.TEST"));
assertFalse(activity.isCallingAppPermitted("android.permission.TEST", 1000));
}
@Test
@Config(shadows = {ShadowPasswordUtils.class})
public void isCallingAppPermitted_grantedPermission_returnTrue() {
SettingsHomepageActivity homepageActivity = spy(new SettingsHomepageActivity());
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
String permission = "android.permission.TEST";
ShadowPasswordUtils.addGrantedPermission(permission);
doReturn(PackageManager.PERMISSION_DENIED).when(activity)
.checkPermission(anyString(), anyInt(), anyInt());
doReturn(PackageManager.PERMISSION_GRANTED).when(activity)
.checkPermission(eq(permission), anyInt(), eq(1000));
assertTrue(homepageActivity.isCallingAppPermitted(permission));
assertTrue(activity.isCallingAppPermitted(permission, 1000));
}
@Implements(SuggestionFeatureProviderImpl.class)