PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add menu options for not specifying a EAP CA cert and User cert

Browse Source 
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.

Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.

BUG: 26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
This commit is contained in:
Samuel Tan
2016-01-21 18:12:53 -08:00
parent fffc5936b9
commit f827c929dd
3 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -116,9 +116,13 @@ public class WifiConfigController implements TextWatcher,
private TextView mPasswordView;
private String mUnspecifiedCertString;
private static final int UNSPECIFIED_CERT_INDEX = 0;
private String mMultipleCertSetString;
private static final int MULTIPLE_CERT_SET_INDEX = 1;
private static final int UNSPECIFIED_CERT_INDEX = 0;
private static final int NO_CERT_INDEX = 1;
private static final int MULTIPLE_CERT_SET_INDEX = 2;
private String mDoNotProvideEapUserCertString;
private String mDoNotValidateEapServerString;
private Spinner mSecuritySpinner;
private Spinner mEapMethodSpinner;
@@ -183,6 +187,11 @@ public class WifiConfigController implements TextWatcher,
mUnspecifiedCertString = mContext.getString(R.string.wifi_unspecified);
mMultipleCertSetString = mContext.getString(R.string.wifi_multiple_cert_added);
mDoNotProvideEapUserCertString =
mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
mDoNotValidateEapServerString =
mContext.getString(R.string.wifi_do_not_validate_eap_server);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
@@ -488,7 +497,10 @@ public class WifiConfigController implements TextWatcher,
break;
}
String caCert = (String) mEapCaCertSpinner.getSelectedItem();
if (caCert.equals(mUnspecifiedCertString)) {
if (caCert.equals(mUnspecifiedCertString)
|| caCert.equals(mDoNotValidateEapServerString)) {
// Note: |caCert| should not be able to take the value |unspecifiedCert|,
// since we prevent such configurations from being saved.
config.enterpriseConfig.setCaCertificateAliases(null);
} else if (caCert.equals(mMultipleCertSetString)) {
if (mAccessPoint != null) {
@@ -496,14 +508,20 @@ public class WifiConfigController implements TextWatcher,
Log.e(TAG, "Multiple certs can only be set when editing saved network");
}
config.enterpriseConfig.setCaCertificateAliases(
mAccessPoint.getConfig().enterpriseConfig.getCaCertificateAliases());
mAccessPoint.getConfig().enterpriseConfig
.getCaCertificateAliases());
}
} else {
config.enterpriseConfig.setCaCertificateAliases(new String[] {caCert});
}
String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
if (clientCert.equals(mUnspecifiedCertString)) clientCert = "";
if (clientCert.equals(mUnspecifiedCertString)
|| clientCert.equals(mDoNotProvideEapUserCertString)) {
// Note: |clientCert| should not be able to take the value |unspecifiedCert|,
// since we prevent such configurations from being saved.
clientCert = "";
}
config.enterpriseConfig.setClientCertificateAlias(clientCert);
if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) {
config.enterpriseConfig.setIdentity("");
@@ -713,8 +731,10 @@ public class WifiConfigController implements TextWatcher,
mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
loadCertificates(mEapCaCertSpinner, Credentials.CA_CERTIFICATE, false);
loadCertificates(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY, false);
loadCertificates(mEapCaCertSpinner, Credentials.CA_CERTIFICATE, false,
mDoNotValidateEapServerString);
loadCertificates(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY, false,
mDoNotProvideEapUserCertString);
// Modifying an existing network
if (mAccessPoint != null && mAccessPoint.isSaved()) {
@@ -752,7 +772,7 @@ public class WifiConfigController implements TextWatcher,
} else {
// Reload the cert spinner with an extra "multiple certificates added" item
loadCertificates(mEapCaCertSpinner,
Credentials.CA_CERTIFICATE, true);
Credentials.CA_CERTIFICATE, true, mDoNotValidateEapServerString);
mEapCaCertSpinner.setSelection(MULTIPLE_CERT_SET_INDEX);
}
setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());
@@ -986,13 +1006,15 @@ public class WifiConfigController implements TextWatcher,
}
}
private void loadCertificates(Spinner spinner, String prefix, boolean showMultipleCerts) {
private void loadCertificates(
Spinner spinner, String prefix, boolean showMultipleCerts, String noCertificateString) {
final Context context = mConfigUi.getContext();
ArrayList<String> certs = new ArrayList<String>();
certs.add(mUnspecifiedCertString);
certs.add(UNSPECIFIED_CERT_INDEX, mUnspecifiedCertString);
certs.add(NO_CERT_INDEX, noCertificateString);
if (showMultipleCerts) {
certs.add(mMultipleCertSetString);
certs.add(MULTIPLE_CERT_SET_INDEX, mMultipleCertSetString);
}
certs.addAll(
Arrays.asList(KeyStore.getInstance().list(prefix, android.os.Process.WIFI_UID)));