Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ocsp: add OCSP field in WifiEnterpriseConfig"

Browse Source
This commit is contained in:
Jimmy Chen
2019-09-06 16:15:04 +00:00
committed by Android (Google) Code Review
parent 8d098c28c6 7938515152
commit aa62e30c8d
2 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -15,6 +15,7 @@
*/
package android.net.wifi;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
@@ -23,6 +24,8 @@ import android.security.Credentials;
import android.text.TextUtils;
import android.util.Log;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
@@ -111,6 +114,48 @@ public class WifiEnterpriseConfig implements Parcelable {
/** @hide */
public static final String CA_CERT_ALIAS_DELIMITER = " ";
/**
* Do not use OCSP stapling (TLS certificate status extension)
* @hide
*/
public static final int OCSP_NONE = 0;
/**
* Try to use OCSP stapling, but not require response
* @hide
*/
public static final int OCSP_REQUEST_CERT_STATUS = 1;
/**
* Require valid OCSP stapling response
* @hide
*/
public static final int OCSP_REQUIRE_CERT_STATUS = 2;
/**
* Require valid OCSP stapling response for all not-trusted certificates in the server
* certificate chain
* @hide
*/
public static final int OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS = 3;
/** @hide */
@IntDef(prefix = {"OCSP_"}, value = {
OCSP_NONE,
OCSP_REQUEST_CERT_STATUS,
OCSP_REQUIRE_CERT_STATUS,
OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS
})
@Retention(RetentionPolicy.SOURCE)
public @interface Ocsp {
}
/**
* Whether to use/require OCSP (Online Certificate Status Protocol) to check server certificate.
* @hide
*/
private @Ocsp int mOcsp = OCSP_NONE;
// Fields to copy verbatim from wpa_supplicant.
private static final String[] SUPPLICANT_CONFIG_KEYS = new String[] {
IDENTITY_KEY,
@@ -185,6 +230,7 @@ public class WifiEnterpriseConfig implements Parcelable {
mPhase2Method = source.mPhase2Method;
mIsAppInstalledDeviceKeyAndCert = source.mIsAppInstalledDeviceKeyAndCert;
mIsAppInstalledCaCert = source.mIsAppInstalledCaCert;
mOcsp = source.mOcsp;
}
/**
@@ -230,6 +276,7 @@ public class WifiEnterpriseConfig implements Parcelable {
ParcelUtil.writeCertificates(dest, mClientCertificateChain);
dest.writeBoolean(mIsAppInstalledDeviceKeyAndCert);
dest.writeBoolean(mIsAppInstalledCaCert);
dest.writeInt(mOcsp);
}
public static final @android.annotation.NonNull Creator<WifiEnterpriseConfig> CREATOR =
@@ -251,6 +298,7 @@ public class WifiEnterpriseConfig implements Parcelable {
enterpriseConfig.mClientCertificateChain = ParcelUtil.readCertificates(in);
enterpriseConfig.mIsAppInstalledDeviceKeyAndCert = in.readBoolean();
enterpriseConfig.mIsAppInstalledCaCert = in.readBoolean();
enterpriseConfig.mOcsp = in.readInt();
return enterpriseConfig;
}
@@ -1141,6 +1189,7 @@ public class WifiEnterpriseConfig implements Parcelable {
if (mPhase2Method > 0 && mPhase2Method < Phase2.strings.length) {
sb.append("phase2_method: ").append(Phase2.strings[mPhase2Method]).append("\n");
}
sb.append(" ocsp: ").append(mOcsp).append("\n");
return sb.toString();
}
@@ -1190,4 +1239,28 @@ public class WifiEnterpriseConfig implements Parcelable {
public boolean isAppInstalledCaCert() {
return mIsAppInstalledCaCert;
}
/**
* Set the ocsp type.
* @param ocsp is one {@link ##OCSP_NONE}, {@link #OCSP_REQUEST_CERT_STATUS},
* {@link #OCSP_REQUIRE_CERT_STATUS} or
* {@link #OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS}
* @hide
*/
public void setOcsp(@Ocsp int ocsp) {
if (ocsp >= OCSP_NONE && ocsp <= OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS) {
mOcsp = ocsp;
} else {
throw new IllegalArgumentException("Invalid OCSP type.");
}
}
/**
* Get the ocsp type.
* @return ocsp type
* @hide
*/
public @Ocsp int getOcsp() {
return mOcsp;
}
}

34
wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
View File

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import android.net.wifi.WifiEnterpriseConfig.Eap;
import android.net.wifi.WifiEnterpriseConfig.Phase2;
@@ -343,11 +344,13 @@ public class WifiEnterpriseConfigTest {
enterpriseConfig.setPassword("*");
enterpriseConfig.setEapMethod(Eap.TTLS);
enterpriseConfig.setPhase2Method(Phase2.GTC);
enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_REQUIRE_CERT_STATUS);
mEnterpriseConfig = new WifiEnterpriseConfig();
mEnterpriseConfig.copyFromExternal(enterpriseConfig, "*");
assertEquals("TTLS", getSupplicantEapMethod());
assertEquals("\"autheap=GTC\"", getSupplicantPhase2Method());
assertNotEquals("*", mEnterpriseConfig.getPassword());
assertEquals(enterpriseConfig.getOcsp(), mEnterpriseConfig.getOcsp());
}
/** Verfies that parceling a WifiEnterpriseConfig preseves method information. */
@@ -487,4 +490,35 @@ public class WifiEnterpriseConfigTest {
assertFalse(mEnterpriseConfig.isAppInstalledDeviceKeyAndCert());
assertTrue(mEnterpriseConfig.isAppInstalledCaCert());
}
/** Verifies that OCSP value is set correctly. */
@Test
public void testOcspSetGet() throws Exception {
WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
assertEquals(WifiEnterpriseConfig.OCSP_NONE, enterpriseConfig.getOcsp());
enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_REQUIRE_CERT_STATUS);
assertEquals(WifiEnterpriseConfig.OCSP_REQUIRE_CERT_STATUS, enterpriseConfig.getOcsp());
enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_REQUEST_CERT_STATUS);
assertEquals(WifiEnterpriseConfig.OCSP_REQUEST_CERT_STATUS, enterpriseConfig.getOcsp());
enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS);
assertEquals(WifiEnterpriseConfig.OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS,
enterpriseConfig.getOcsp());
}
/** Verifies that an exception is thrown when invalid OCSP is set. */
@Test
public void testInvalidOcspValue() {
WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
try {
enterpriseConfig.setOcsp(-1);
fail("Should raise an IllegalArgumentException here.");
} catch (IllegalArgumentException e) {
// expected exception.
}
}
}