LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "Partially enforce permission when calling getNetworkInfoForUid""

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-10 12:13:56 +00:00
committed by Gerrit Code Review
parent 2a892d2eb8 d0cf7784dc
commit 016269fbb8
2 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1606,9 +1606,9 @@ public class ConnectivityServiceTest {
mMockVpn = new MockVpn(userId);
}
private void mockUidNetworkingBlocked(int uid) {
private void mockUidNetworkingBlocked() {
doAnswer(i -> isUidBlocked(mBlockedReasons, i.getArgument(1))
).when(mNetworkPolicyManager).isUidNetworkingBlocked(eq(uid), anyBoolean());
).when(mNetworkPolicyManager).isUidNetworkingBlocked(anyInt(), anyBoolean());
}
private boolean isUidBlocked(int blockedReasons, boolean meteredNetwork) {
@@ -9122,7 +9122,7 @@ public class ConnectivityServiceTest {
final DetailedBlockedStatusCallback detailedCallback = new DetailedBlockedStatusCallback();
mCm.registerNetworkCallback(cellRequest, detailedCallback);
mockUidNetworkingBlocked(Process.myUid());
mockUidNetworkingBlocked();
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(true);
@@ -9237,7 +9237,7 @@ public class ConnectivityServiceTest {
public void testNetworkBlockedStatusBeforeAndAfterConnect() throws Exception {
final TestNetworkCallback defaultCallback = new TestNetworkCallback();
mCm.registerDefaultNetworkCallback(defaultCallback);
mockUidNetworkingBlocked(Process.myUid());
mockUidNetworkingBlocked();
// No Networkcallbacks invoked before any network is active.
setBlockedReasonChanged(BLOCKED_REASON_BATTERY_SAVER);
@@ -17043,43 +17043,4 @@ public class ConnectivityServiceTest {
verify(mTetheringManager).getTetherableWifiRegexs();
});
}
@Test
public void testGetNetworkInfoForUid() throws Exception {
// Setup and verify getNetworkInfoForUid cannot be called without Network Stack permission,
// when querying NetworkInfo for other uid.
verifyNoNetwork();
mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
mServiceContext.setPermission(NETWORK_STACK, PERMISSION_DENIED);
mServiceContext.setPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
PERMISSION_DENIED);
final int otherUid = Process.myUid() + 1;
assertNull(mCm.getActiveNetwork());
assertNull(mCm.getNetworkInfoForUid(mCm.getActiveNetwork(),
Process.myUid(), false /* ignoreBlocked */));
assertThrows(SecurityException.class, () -> mCm.getNetworkInfoForUid(
mCm.getActiveNetwork(), otherUid, false /* ignoreBlocked */));
withPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, () ->
assertNull(mCm.getNetworkInfoForUid(mCm.getActiveNetwork(),
otherUid, false /* ignoreBlocked */)));
// Bringing up validated wifi and verify again. Make the other uid be blocked,
// verify the method returns result accordingly.
mWiFiNetworkAgent.connect(true);
setBlockedReasonChanged(BLOCKED_REASON_BATTERY_SAVER);
mockUidNetworkingBlocked(otherUid);
withPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, () ->
verifyActiveNetwork(TRANSPORT_WIFI));
checkNetworkInfo(mCm.getNetworkInfoForUid(mCm.getActiveNetwork(),
Process.myUid(), false /* ignoreBlocked */), TYPE_WIFI, DetailedState.CONNECTED);
assertThrows(SecurityException.class, () -> mCm.getNetworkInfoForUid(
mCm.getActiveNetwork(), otherUid, false /* ignoreBlocked */));
withPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, () ->
checkNetworkInfo(mCm.getNetworkInfoForUid(mCm.getActiveNetwork(),
otherUid, false /* ignoreBlocked */), TYPE_WIFI, DetailedState.BLOCKED));
withPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, () ->
checkNetworkInfo(mCm.getNetworkInfoForUid(mCm.getActiveNetwork(),
otherUid, true /* ignoreBlocked */), TYPE_WIFI, DetailedState.CONNECTED));
}
}