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

Merge "Merge "VpnTest: test getConnectionOwnerUid API" am: ee991403a1 am: 7efa354f0c" into pi-dev-plus-aosp

Browse Source 
am: 8e7f2ebdc6

Change-Id: Iae344439463a8d57ab4c0a18f186ae1877637eb5
This commit is contained in:
Jeffrey Vander Stoep
2018-09-21 15:46:06 -07:00
committed by android-build-merger
parent 64c0abef0f 29e7b8ad82
commit 77636d2212
2 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View File

@@ -16,6 +16,7 @@
package com.android.cts.net.hostside;
import static android.os.Process.INVALID_UID;
import static android.system.OsConstants.*;
import android.content.Intent;
@@ -36,6 +37,7 @@ import android.support.test.uiautomator.UiScrollable;
import android.support.test.uiautomator.UiSelector;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;
import android.system.StructPollfd;
import android.test.InstrumentationTestCase;
import android.test.MoreAsserts;
@@ -353,7 +355,7 @@ public class VpnTest extends InstrumentationTestCase {
MoreAsserts.assertEquals(data, read);
}
private static void checkTcpReflection(String to, String expectedFrom) throws IOException {
private void checkTcpReflection(String to, String expectedFrom) throws IOException {
// Exercise TCP over the VPN by "connecting to ourselves". We open a server socket and a
// client socket, and connect the client socket to a remote host, with the port of the
// server socket. The PacketReflector reflects the packets, changing the source addresses
@@ -391,7 +393,8 @@ public class VpnTest extends InstrumentationTestCase {
// Accept the connection on the server side.
listen.setSoTimeout(SOCKET_TIMEOUT_MS);
server = listen.accept();
checkConnectionOwnerUidTcp(client);
checkConnectionOwnerUidTcp(server);
// Check that the source and peer addresses are as expected.
assertEquals(expectedFrom, client.getLocalAddress().getHostAddress());
assertEquals(expectedFrom, server.getLocalAddress().getHostAddress());
@@ -424,7 +427,23 @@ public class VpnTest extends InstrumentationTestCase {
}
}
private static void checkUdpEcho(String to, String expectedFrom) throws IOException {
private void checkConnectionOwnerUidUdp(DatagramSocket s, boolean expectSuccess) {
final int expectedUid = expectSuccess ? Process.myUid() : INVALID_UID;
InetSocketAddress loc = new InetSocketAddress(s.getLocalAddress(), s.getLocalPort());
InetSocketAddress rem = new InetSocketAddress(s.getInetAddress(), s.getPort());
int uid = mCM.getConnectionOwnerUid(OsConstants.IPPROTO_UDP, loc, rem);
assertEquals(expectedUid, uid);
}
private void checkConnectionOwnerUidTcp(Socket s) {
final int expectedUid = Process.myUid();
InetSocketAddress loc = new InetSocketAddress(s.getLocalAddress(), s.getLocalPort());
InetSocketAddress rem = new InetSocketAddress(s.getInetAddress(), s.getPort());
int uid = mCM.getConnectionOwnerUid(OsConstants.IPPROTO_TCP, loc, rem);
assertEquals(expectedUid, uid);
}
private void checkUdpEcho(String to, String expectedFrom) throws IOException {
DatagramSocket s;
InetAddress address = InetAddress.getByName(to);
if (address instanceof Inet6Address) { // http://b/18094870
@@ -448,6 +467,7 @@ public class VpnTest extends InstrumentationTestCase {
try {
if (expectedFrom != null) {
s.send(p);
checkConnectionOwnerUidUdp(s, true);
s.receive(p);
MoreAsserts.assertEquals(data, p.getData());
} else {
@@ -455,7 +475,9 @@ public class VpnTest extends InstrumentationTestCase {
s.send(p);
s.receive(p);
fail("Received unexpected reply");
} catch(IOException expected) {}
} catch (IOException expected) {
checkConnectionOwnerUidUdp(s, false);
}
}
} finally {
s.close();
@@ -580,4 +602,23 @@ public class VpnTest extends InstrumentationTestCase {
checkNoTrafficOnVpn();
}
public void testGetConnectionOwnerUidSecurity() throws Exception {
if (!supportedHardware()) return;
DatagramSocket s;
InetAddress address = InetAddress.getByName("localhost");
s = new DatagramSocket();
s.setSoTimeout(SOCKET_TIMEOUT_MS);
s.connect(address, 7);
InetSocketAddress loc = new InetSocketAddress(s.getLocalAddress(), s.getLocalPort());
InetSocketAddress rem = new InetSocketAddress(s.getInetAddress(), s.getPort());
try {
int uid = mCM.getConnectionOwnerUid(OsConstants.IPPROTO_TCP, loc, rem);
fail("Only an active VPN app may call this API.");
} catch (SecurityException expected) {
return;
}
}
}

4
tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java
View File

@@ -44,4 +44,8 @@ public class HostsideVpnTests extends HostsideNetworkTestCase {
public void testAppDisallowed() throws Exception {
runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testAppDisallowed");
}
public void testGetConnectionOwnerUidSecurity() throws Exception {
runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testGetConnectionOwnerUidSecurity");
}
}