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

Add AppOps Checks for MANAGE_IPSEC_TUNNELS

Browse Source 
Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.

Bug: 66955045
Test: runtest frameworks-net
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4
This commit is contained in:
Nathan Harold
2018-03-15 18:06:06 -07:00
parent a9a759bea0
commit 68a7edf1cb
2 changed files with 92 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/net/java/android/net/IpSecManagerTest.java
View File

@@ -30,6 +30,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.test.mock.MockContext;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.system.Os; import android.system.Os;
@@ -69,11 +70,17 @@ public class IpSecManagerTest {
private IpSecService mMockIpSecService; private IpSecService mMockIpSecService;
private IpSecManager mIpSecManager; private IpSecManager mIpSecManager;
private MockContext mMockContext = new MockContext() {
@Override
public String getOpPackageName() {
return "fooPackage";
}
};
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mMockIpSecService = mock(IpSecService.class); mMockIpSecService = mock(IpSecService.class);
mIpSecManager = new IpSecManager(mMockIpSecService); mIpSecManager = new IpSecManager(mMockContext, mMockIpSecService);
} }
/* /*
@@ -227,7 +234,7 @@ public class IpSecManagerTest {
new IpSecTunnelInterfaceResponse(IpSecManager.Status.OK, resourceId, intfName); new IpSecTunnelInterfaceResponse(IpSecManager.Status.OK, resourceId, intfName);
when(mMockIpSecService.createTunnelInterface( when(mMockIpSecService.createTunnelInterface(
eq(VTI_LOCAL_ADDRESS.getHostAddress()), eq(GOOGLE_DNS_4.getHostAddress()), eq(VTI_LOCAL_ADDRESS.getHostAddress()), eq(GOOGLE_DNS_4.getHostAddress()),
anyObject(), anyObject())) anyObject(), anyObject(), anyString()))
.thenReturn(dummyResponse); .thenReturn(dummyResponse);
IpSecManager.IpSecTunnelInterface tunnelIntf = mIpSecManager.createIpSecTunnelInterface( IpSecManager.IpSecTunnelInterface tunnelIntf = mIpSecManager.createIpSecTunnelInterface(
@@ -245,7 +252,7 @@ public class IpSecManagerTest {
assertEquals(VTI_INTF_NAME, tunnelIntf.getInterfaceName()); assertEquals(VTI_INTF_NAME, tunnelIntf.getInterfaceName());
tunnelIntf.close(); tunnelIntf.close();
verify(mMockIpSecService).deleteTunnelInterface(eq(DUMMY_RESOURCE_ID)); verify(mMockIpSecService).deleteTunnelInterface(eq(DUMMY_RESOURCE_ID), anyString());
} }
@Test @Test
@@ -255,10 +262,12 @@ public class IpSecManagerTest {
tunnelIntf.addAddress(VTI_INNER_ADDRESS); tunnelIntf.addAddress(VTI_INNER_ADDRESS);
verify(mMockIpSecService) verify(mMockIpSecService)
.addAddressToTunnelInterface(eq(DUMMY_RESOURCE_ID), eq(VTI_INNER_ADDRESS)); .addAddressToTunnelInterface(
eq(DUMMY_RESOURCE_ID), eq(VTI_INNER_ADDRESS), anyString());
tunnelIntf.removeAddress(VTI_INNER_ADDRESS); tunnelIntf.removeAddress(VTI_INNER_ADDRESS);
verify(mMockIpSecService) verify(mMockIpSecService)
.addAddressToTunnelInterface(eq(DUMMY_RESOURCE_ID), eq(VTI_INNER_ADDRESS)); .addAddressToTunnelInterface(
eq(DUMMY_RESOURCE_ID), eq(VTI_INNER_ADDRESS), anyString());
} }
} }

110
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -27,6 +27,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.AppOpsManager;
import android.content.Context; import android.content.Context;
import android.net.INetd; import android.net.INetd;
import android.net.IpSecAlgorithm; import android.net.IpSecAlgorithm;
@@ -40,6 +41,7 @@ import android.net.Network;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.os.Binder; import android.os.Binder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.test.mock.MockContext;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import android.system.Os; import android.system.Os;
@@ -92,7 +94,28 @@ public class IpSecServiceParameterizedTest {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F
}; };
Context mMockContext; AppOpsManager mMockAppOps = mock(AppOpsManager.class);
MockContext mMockContext = new MockContext() {
@Override
public Object getSystemService(String name) {
switch(name) {
case Context.APP_OPS_SERVICE:
return mMockAppOps;
default:
return null;
}
}
@Override
public void enforceCallingOrSelfPermission(String permission, String message) {
if (permission == android.Manifest.permission.MANAGE_IPSEC_TUNNELS) {
return;
}
throw new SecurityException("Unavailable permission requested");
}
};
INetd mMockNetd; INetd mMockNetd;
IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig;
IpSecService mIpSecService; IpSecService mIpSecService;
@@ -114,13 +137,22 @@ public class IpSecServiceParameterizedTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mMockContext = mock(Context.class);
mMockNetd = mock(INetd.class); mMockNetd = mock(INetd.class);
mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class);
mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig); mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig);
// Injecting mock netd // Injecting mock netd
when(mMockIpSecSrvConfig.getNetdInstance()).thenReturn(mMockNetd); when(mMockIpSecSrvConfig.getNetdInstance()).thenReturn(mMockNetd);
// A package granted the AppOp for MANAGE_IPSEC_TUNNELS will be MODE_ALLOWED.
when(mMockAppOps.noteOp(anyInt(), anyInt(), eq("blessedPackage")))
.thenReturn(AppOpsManager.MODE_ALLOWED);
// A system package will not be granted the app op, so this should fall back to
// a permissions check, which should pass.
when(mMockAppOps.noteOp(anyInt(), anyInt(), eq("systemPackage")))
.thenReturn(AppOpsManager.MODE_DEFAULT);
// A mismatch between the package name and the UID will return MODE_IGNORED.
when(mMockAppOps.noteOp(anyInt(), anyInt(), eq("badPackage")))
.thenReturn(AppOpsManager.MODE_IGNORED);
} }
@Test @Test
@@ -232,7 +264,7 @@ public class IpSecServiceParameterizedTest {
addAuthAndCryptToIpSecConfig(ipSecConfig); addAuthAndCryptToIpSecConfig(ipSecConfig);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
assertEquals(IpSecManager.Status.OK, createTransformResp.status); assertEquals(IpSecManager.Status.OK, createTransformResp.status);
verify(mMockNetd) verify(mMockNetd)
@@ -267,7 +299,7 @@ public class IpSecServiceParameterizedTest {
ipSecConfig.setAuthenticatedEncryption(AEAD_ALGO); ipSecConfig.setAuthenticatedEncryption(AEAD_ALGO);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
assertEquals(IpSecManager.Status.OK, createTransformResp.status); assertEquals(IpSecManager.Status.OK, createTransformResp.status);
verify(mMockNetd) verify(mMockNetd)
@@ -301,12 +333,12 @@ public class IpSecServiceParameterizedTest {
addAuthAndCryptToIpSecConfig(ipSecConfig); addAuthAndCryptToIpSecConfig(ipSecConfig);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
assertEquals(IpSecManager.Status.OK, createTransformResp.status); assertEquals(IpSecManager.Status.OK, createTransformResp.status);
// Attempting to create transform a second time with the same SPIs should throw an error... // Attempting to create transform a second time with the same SPIs should throw an error...
try { try {
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
fail("IpSecService should have thrown an error for reuse of SPI"); fail("IpSecService should have thrown an error for reuse of SPI");
} catch (IllegalStateException expected) { } catch (IllegalStateException expected) {
} }
@@ -314,7 +346,7 @@ public class IpSecServiceParameterizedTest {
// ... even if the transform is deleted // ... even if the transform is deleted
mIpSecService.deleteTransform(createTransformResp.resourceId); mIpSecService.deleteTransform(createTransformResp.resourceId);
try { try {
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
fail("IpSecService should have thrown an error for reuse of SPI"); fail("IpSecService should have thrown an error for reuse of SPI");
} catch (IllegalStateException expected) { } catch (IllegalStateException expected) {
} }
@@ -327,7 +359,7 @@ public class IpSecServiceParameterizedTest {
addAuthAndCryptToIpSecConfig(ipSecConfig); addAuthAndCryptToIpSecConfig(ipSecConfig);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid());
assertEquals(1, userRecord.mSpiQuotaTracker.mCurrent); assertEquals(1, userRecord.mSpiQuotaTracker.mCurrent);
@@ -351,7 +383,7 @@ public class IpSecServiceParameterizedTest {
addAuthAndCryptToIpSecConfig(ipSecConfig); addAuthAndCryptToIpSecConfig(ipSecConfig);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
mIpSecService.deleteTransform(createTransformResp.resourceId); mIpSecService.deleteTransform(createTransformResp.resourceId);
verify(mMockNetd, times(1)) verify(mMockNetd, times(1))
@@ -398,7 +430,7 @@ public class IpSecServiceParameterizedTest {
addAuthAndCryptToIpSecConfig(ipSecConfig); addAuthAndCryptToIpSecConfig(ipSecConfig);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid());
@@ -435,7 +467,7 @@ public class IpSecServiceParameterizedTest {
addAuthAndCryptToIpSecConfig(ipSecConfig); addAuthAndCryptToIpSecConfig(ipSecConfig);
IpSecTransformResponse createTransformResp = IpSecTransformResponse createTransformResp =
mIpSecService.createTransform(ipSecConfig, new Binder()); mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");
ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket()); ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());
int resourceId = createTransformResp.resourceId; int resourceId = createTransformResp.resourceId;
@@ -460,10 +492,10 @@ public class IpSecServiceParameterizedTest {
} }
private IpSecTunnelInterfaceResponse createAndValidateTunnel( private IpSecTunnelInterfaceResponse createAndValidateTunnel(
String localAddr, String remoteAddr) { String localAddr, String remoteAddr, String pkgName) {
IpSecTunnelInterfaceResponse createTunnelResp = IpSecTunnelInterfaceResponse createTunnelResp =
mIpSecService.createTunnelInterface( mIpSecService.createTunnelInterface(
mSourceAddr, mDestinationAddr, fakeNetwork, new Binder()); mSourceAddr, mDestinationAddr, fakeNetwork, new Binder(), pkgName);
assertNotNull(createTunnelResp); assertNotNull(createTunnelResp);
assertEquals(IpSecManager.Status.OK, createTunnelResp.status); assertEquals(IpSecManager.Status.OK, createTunnelResp.status);
@@ -473,7 +505,7 @@ public class IpSecServiceParameterizedTest {
@Test @Test
public void testCreateTunnelInterface() throws Exception { public void testCreateTunnelInterface() throws Exception {
IpSecTunnelInterfaceResponse createTunnelResp = IpSecTunnelInterfaceResponse createTunnelResp =
createAndValidateTunnel(mSourceAddr, mDestinationAddr); createAndValidateTunnel(mSourceAddr, mDestinationAddr, "blessedPackage");
// Check that we have stored the tracking object, and retrieve it // Check that we have stored the tracking object, and retrieve it
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
@@ -495,12 +527,12 @@ public class IpSecServiceParameterizedTest {
@Test @Test
public void testDeleteTunnelInterface() throws Exception { public void testDeleteTunnelInterface() throws Exception {
IpSecTunnelInterfaceResponse createTunnelResp = IpSecTunnelInterfaceResponse createTunnelResp =
createAndValidateTunnel(mSourceAddr, mDestinationAddr); createAndValidateTunnel(mSourceAddr, mDestinationAddr, "blessedPackage");
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid());
mIpSecService.deleteTunnelInterface(createTunnelResp.resourceId); mIpSecService.deleteTunnelInterface(createTunnelResp.resourceId, "blessedPackage");
// Verify quota and RefcountedResource objects cleaned up // Verify quota and RefcountedResource objects cleaned up
assertEquals(0, userRecord.mTunnelQuotaTracker.mCurrent); assertEquals(0, userRecord.mTunnelQuotaTracker.mCurrent);
@@ -516,7 +548,7 @@ public class IpSecServiceParameterizedTest {
@Test @Test
public void testTunnelInterfaceBinderDeath() throws Exception { public void testTunnelInterfaceBinderDeath() throws Exception {
IpSecTunnelInterfaceResponse createTunnelResp = IpSecTunnelInterfaceResponse createTunnelResp =
createAndValidateTunnel(mSourceAddr, mDestinationAddr); createAndValidateTunnel(mSourceAddr, mDestinationAddr, "blessedPackage");
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid());
@@ -539,22 +571,34 @@ public class IpSecServiceParameterizedTest {
@Test @Test
public void testAddRemoveAddressFromTunnelInterface() throws Exception { public void testAddRemoveAddressFromTunnelInterface() throws Exception {
IpSecTunnelInterfaceResponse createTunnelResp = for (String pkgName : new String[]{"blessedPackage", "systemPackage"}) {
createAndValidateTunnel(mSourceAddr, mDestinationAddr); IpSecTunnelInterfaceResponse createTunnelResp =
createAndValidateTunnel(mSourceAddr, mDestinationAddr, pkgName);
mIpSecService.addAddressToTunnelInterface(
createTunnelResp.resourceId, mLocalInnerAddress, pkgName);
verify(mMockNetd, times(1))
.interfaceAddAddress(
eq(createTunnelResp.interfaceName),
eq(mLocalInnerAddress.getAddress().getHostAddress()),
eq(mLocalInnerAddress.getPrefixLength()));
mIpSecService.removeAddressFromTunnelInterface(
createTunnelResp.resourceId, mLocalInnerAddress, pkgName);
verify(mMockNetd, times(1))
.interfaceDelAddress(
eq(createTunnelResp.interfaceName),
eq(mLocalInnerAddress.getAddress().getHostAddress()),
eq(mLocalInnerAddress.getPrefixLength()));
mIpSecService.deleteTunnelInterface(createTunnelResp.resourceId, pkgName);
}
}
mIpSecService.addAddressToTunnelInterface(createTunnelResp.resourceId, mLocalInnerAddress); @Test
verify(mMockNetd) public void testAddTunnelFailsForBadPackageName() throws Exception {
.interfaceAddAddress( try {
eq(createTunnelResp.interfaceName), IpSecTunnelInterfaceResponse createTunnelResp =
eq(mLocalInnerAddress.getAddress().getHostAddress()), createAndValidateTunnel(mSourceAddr, mDestinationAddr, "badPackage");
eq(mLocalInnerAddress.getPrefixLength())); fail("Expected a SecurityException for badPackage.");
} catch (SecurityException expected) {
mIpSecService.removeAddressFromTunnelInterface( }
createTunnelResp.resourceId, mLocalInnerAddress);
verify(mMockNetd)
.interfaceDelAddress(
eq(createTunnelResp.interfaceName),
eq(mLocalInnerAddress.getAddress().getHostAddress()),
eq(mLocalInnerAddress.getPrefixLength()));
} }
} }