Add additional fields to VpnProfile for profile-based IKEv2/IPsec VPNs
This commit adds the fields required to support IKEv2/IPsec VPNs. Other fields will be reused where possible. Bug: 143221465 Test: Compiles, new tests written for parcel/unparcel, encode/decode Change-Id: I4c0e8fb934e75548424a15bbfb35c2ea9a3a57bc
This commit is contained in:
185
tests/net/java/com/android/internal/net/VpnProfileTest.java
Normal file
185
tests/net/java/com/android/internal/net/VpnProfileTest.java
Normal file
@@ -0,0 +1,185 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.internal.net;
|
||||||
|
|
||||||
|
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertFalse;
|
||||||
|
import static org.junit.Assert.assertNotEquals;
|
||||||
|
import static org.junit.Assert.assertNull;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.junit.Assert.fail;
|
||||||
|
|
||||||
|
import android.net.IpSecAlgorithm;
|
||||||
|
|
||||||
|
import androidx.test.filters.SmallTest;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.junit.runners.JUnit4;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/** Unit tests for {@link VpnProfile}. */
|
||||||
|
@SmallTest
|
||||||
|
@RunWith(JUnit4.class)
|
||||||
|
public class VpnProfileTest {
|
||||||
|
private static final String DUMMY_PROFILE_KEY = "Test";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDefaults() throws Exception {
|
||||||
|
final VpnProfile p = new VpnProfile(DUMMY_PROFILE_KEY);
|
||||||
|
|
||||||
|
assertEquals(DUMMY_PROFILE_KEY, p.key);
|
||||||
|
assertEquals("", p.name);
|
||||||
|
assertEquals(VpnProfile.TYPE_PPTP, p.type);
|
||||||
|
assertEquals("", p.server);
|
||||||
|
assertEquals("", p.username);
|
||||||
|
assertEquals("", p.password);
|
||||||
|
assertEquals("", p.dnsServers);
|
||||||
|
assertEquals("", p.searchDomains);
|
||||||
|
assertEquals("", p.routes);
|
||||||
|
assertTrue(p.mppe);
|
||||||
|
assertEquals("", p.l2tpSecret);
|
||||||
|
assertEquals("", p.ipsecIdentifier);
|
||||||
|
assertEquals("", p.ipsecSecret);
|
||||||
|
assertEquals("", p.ipsecUserCert);
|
||||||
|
assertEquals("", p.ipsecCaCert);
|
||||||
|
assertEquals("", p.ipsecServerCert);
|
||||||
|
assertEquals(null, p.proxy);
|
||||||
|
assertTrue(p.getAllowedAlgorithms() != null && p.getAllowedAlgorithms().isEmpty());
|
||||||
|
assertFalse(p.isBypassable);
|
||||||
|
assertFalse(p.isMetered);
|
||||||
|
assertEquals(1400, p.maxMtu);
|
||||||
|
assertFalse(p.areAuthParamsInline);
|
||||||
|
}
|
||||||
|
|
||||||
|
private VpnProfile getSampleIkev2Profile(String key) {
|
||||||
|
final VpnProfile p = new VpnProfile(key);
|
||||||
|
|
||||||
|
p.name = "foo";
|
||||||
|
p.type = VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS;
|
||||||
|
p.server = "bar";
|
||||||
|
p.username = "baz";
|
||||||
|
p.password = "qux";
|
||||||
|
p.dnsServers = "8.8.8.8";
|
||||||
|
p.searchDomains = "";
|
||||||
|
p.routes = "0.0.0.0/0";
|
||||||
|
p.mppe = false;
|
||||||
|
p.l2tpSecret = "";
|
||||||
|
p.ipsecIdentifier = "quux";
|
||||||
|
p.ipsecSecret = "quuz";
|
||||||
|
p.ipsecUserCert = "corge";
|
||||||
|
p.ipsecCaCert = "grault";
|
||||||
|
p.ipsecServerCert = "garply";
|
||||||
|
p.proxy = null;
|
||||||
|
p.setAllowedAlgorithms(
|
||||||
|
Arrays.asList(
|
||||||
|
IpSecAlgorithm.AUTH_CRYPT_AES_GCM,
|
||||||
|
IpSecAlgorithm.AUTH_HMAC_SHA512,
|
||||||
|
IpSecAlgorithm.CRYPT_AES_CBC));
|
||||||
|
p.isBypassable = true;
|
||||||
|
p.isMetered = true;
|
||||||
|
p.maxMtu = 1350;
|
||||||
|
p.areAuthParamsInline = true;
|
||||||
|
|
||||||
|
// Not saved, but also not compared.
|
||||||
|
p.saveLogin = true;
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEquals() {
|
||||||
|
assertEquals(
|
||||||
|
getSampleIkev2Profile(DUMMY_PROFILE_KEY), getSampleIkev2Profile(DUMMY_PROFILE_KEY));
|
||||||
|
|
||||||
|
final VpnProfile modified = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
modified.maxMtu--;
|
||||||
|
assertNotEquals(getSampleIkev2Profile(DUMMY_PROFILE_KEY), modified);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testParcelUnparcel() {
|
||||||
|
assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 22);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetInvalidAlgorithmValueDelimiter() {
|
||||||
|
final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
|
||||||
|
try {
|
||||||
|
profile.setAllowedAlgorithms(
|
||||||
|
Arrays.asList("test" + VpnProfile.VALUE_DELIMITER + "test"));
|
||||||
|
fail("Expected failure due to value separator in algorithm name");
|
||||||
|
} catch (IllegalArgumentException expected) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetInvalidAlgorithmListDelimiter() {
|
||||||
|
final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
|
||||||
|
try {
|
||||||
|
profile.setAllowedAlgorithms(
|
||||||
|
Arrays.asList("test" + VpnProfile.LIST_DELIMITER + "test"));
|
||||||
|
fail("Expected failure due to value separator in algorithm name");
|
||||||
|
} catch (IllegalArgumentException expected) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEncodeDecode() {
|
||||||
|
final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
final VpnProfile decoded = VpnProfile.decode(DUMMY_PROFILE_KEY, profile.encode());
|
||||||
|
assertEquals(profile, decoded);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEncodeDecodeTooManyValues() {
|
||||||
|
final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
final byte[] tooManyValues =
|
||||||
|
(new String(profile.encode()) + VpnProfile.VALUE_DELIMITER + "invalid").getBytes();
|
||||||
|
|
||||||
|
assertNull(VpnProfile.decode(DUMMY_PROFILE_KEY, tooManyValues));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEncodeDecodeInvalidNumberOfValues() {
|
||||||
|
final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
final String encoded = new String(profile.encode());
|
||||||
|
final byte[] tooFewValues =
|
||||||
|
encoded.substring(0, encoded.lastIndexOf(VpnProfile.VALUE_DELIMITER)).getBytes();
|
||||||
|
|
||||||
|
assertNull(VpnProfile.decode(DUMMY_PROFILE_KEY, tooFewValues));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEncodeDecodeLoginsNotSaved() {
|
||||||
|
final VpnProfile profile = getSampleIkev2Profile(DUMMY_PROFILE_KEY);
|
||||||
|
profile.saveLogin = false;
|
||||||
|
|
||||||
|
final VpnProfile decoded = VpnProfile.decode(DUMMY_PROFILE_KEY, profile.encode());
|
||||||
|
assertNotEquals(profile, decoded);
|
||||||
|
|
||||||
|
// Add the username/password back, everything else must be equal.
|
||||||
|
decoded.username = profile.username;
|
||||||
|
decoded.password = profile.password;
|
||||||
|
assertEquals(profile, decoded);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user