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

Disable configuring EAP-TLS without user certificate.

Browse Source 
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.

Also:
- change the wording of the default option for
  EAP CA and user certificates from "(unspecified)" to
  "Please select", to make it obvious that a choice
  needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.

BUG: 26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
This commit is contained in:
Samuel Tan
2016-01-21 14:59:53 -08:00
parent 802d22e159
commit fffc5936b9
2 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1636,7 +1636,7 @@
<!-- Hint for unchanged fields --> <!-- Hint for unchanged fields -->
<string name="wifi_unchanged">(unchanged)</string> <string name="wifi_unchanged">(unchanged)</string>
<!-- Hint for unspecified fields --> <!-- Hint for unspecified fields -->
<string name="wifi_unspecified">(unspecified)</string> <string name="wifi_unspecified">Please select</string>
<!-- Hint for multiple certificates being added to the configuration --> <!-- Hint for multiple certificates being added to the configuration -->
<string name="wifi_multiple_cert_added">(Multiple certificates added)</string> <string name="wifi_multiple_cert_added">(Multiple certificates added)</string>
<!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and

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

@@ -105,9 +105,9 @@ public class WifiConfigController implements TextWatcher,
public static final int WIFI_PEAP_PHASE2_GTC = 2; public static final int WIFI_PEAP_PHASE2_GTC = 2;
/* Phase2 methods supported by PEAP are limited */ /* Phase2 methods supported by PEAP are limited */
private final ArrayAdapter<String> PHASE2_PEAP_ADAPTER; private final ArrayAdapter<String> mPhase2PeapAdapter;
/* Full list of phase2 methods */ /* Full list of phase2 methods */
private final ArrayAdapter<String> PHASE2_FULL_ADAPTER; private final ArrayAdapter<String> mPhase2FullAdapter;
private final Handler mTextViewChangedHandler; private final Handler mTextViewChangedHandler;
@@ -115,16 +115,16 @@ public class WifiConfigController implements TextWatcher,
private int mAccessPointSecurity; private int mAccessPointSecurity;
private TextView mPasswordView; private TextView mPasswordView;
private String unspecifiedCert = "unspecified"; private String mUnspecifiedCertString;
private static final int unspecifiedCertIndex = 0; private static final int UNSPECIFIED_CERT_INDEX = 0;
private String multipleCertSet = "multipleCert"; private String mMultipleCertSetString;
private static final int multipleCertSetIndex = 1; private static final int MULTIPLE_CERT_SET_INDEX = 1;
private Spinner mSecuritySpinner; private Spinner mSecuritySpinner;
private Spinner mEapMethodSpinner; private Spinner mEapMethodSpinner;
private Spinner mEapCaCertSpinner; private Spinner mEapCaCertSpinner;
private Spinner mPhase2Spinner; private Spinner mPhase2Spinner;
// Associated with mPhase2Spinner, one of PHASE2_FULL_ADAPTER or PHASE2_PEAP_ADAPTER // Associated with mPhase2Spinner, one of mPhase2FullAdapter or mPhase2PeapAdapter
private ArrayAdapter<String> mPhase2Adapter; private ArrayAdapter<String> mPhase2Adapter;
private Spinner mEapUserCertSpinner; private Spinner mEapUserCertSpinner;
private TextView mEapIdentityView; private TextView mEapIdentityView;
@@ -171,18 +171,18 @@ public class WifiConfigController implements TextWatcher,
final Resources res = mContext.getResources(); final Resources res = mContext.getResources();
mLevels = res.getStringArray(R.array.wifi_signal); mLevels = res.getStringArray(R.array.wifi_signal);
PHASE2_PEAP_ADAPTER = new ArrayAdapter<String>( mPhase2PeapAdapter = new ArrayAdapter<String>(
mContext, android.R.layout.simple_spinner_item, mContext, android.R.layout.simple_spinner_item,
res.getStringArray(R.array.wifi_peap_phase2_entries)); res.getStringArray(R.array.wifi_peap_phase2_entries));
PHASE2_PEAP_ADAPTER.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); mPhase2PeapAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
PHASE2_FULL_ADAPTER = new ArrayAdapter<String>( mPhase2FullAdapter = new ArrayAdapter<String>(
mContext, android.R.layout.simple_spinner_item, mContext, android.R.layout.simple_spinner_item,
res.getStringArray(R.array.wifi_phase2_entries)); res.getStringArray(R.array.wifi_phase2_entries));
PHASE2_FULL_ADAPTER.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); mPhase2FullAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
unspecifiedCert = mContext.getString(R.string.wifi_unspecified); mUnspecifiedCertString = mContext.getString(R.string.wifi_unspecified);
multipleCertSet = mContext.getString(R.string.wifi_multiple_cert_added); mMultipleCertSetString = mContext.getString(R.string.wifi_multiple_cert_added);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings); mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this); mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings); mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
@@ -204,7 +204,6 @@ public class WifiConfigController implements TextWatcher,
((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox)) ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))
.setOnCheckedChangeListener(this); .setOnCheckedChangeListener(this);
mConfigUi.setSubmitButton(res.getString(R.string.wifi_save)); mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
} else { } else {
mConfigUi.setTitle(mAccessPoint.getSsid()); mConfigUi.setTitle(mAccessPoint.getSsid());
@@ -242,8 +241,9 @@ public class WifiConfigController implements TextWatcher,
mProxySettingsSpinner.setSelection(PROXY_NONE); mProxySettingsSpinner.setSelection(PROXY_NONE);
} }
if (config != null && config.isPasspoint()) { if (config != null && config.isPasspoint()) {
addRow(group, R.string.passpoint_label, String.format( addRow(group, R.string.passpoint_label,
mContext.getString(R.string.passpoint_content), config.providerFriendlyName)); String.format(mContext.getString(R.string.passpoint_content),
config.providerFriendlyName));
} }
} }
@@ -372,22 +372,29 @@ public class WifiConfigController implements TextWatcher,
boolean enabled = false; boolean enabled = false;
boolean passwordInvalid = false; boolean passwordInvalid = false;
if (mPasswordView != null && if (mPasswordView != null
((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) || && ((mAccessPointSecurity == AccessPoint.SECURITY_WEP
(mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8))) { && mPasswordView.length() == 0)
|| (mAccessPointSecurity == AccessPoint.SECURITY_PSK
&& mPasswordView.length() < 8))) {
passwordInvalid = true; passwordInvalid = true;
} }
if ((mSsidView != null && mSsidView.length() == 0) || if ((mSsidView != null && mSsidView.length() == 0)
((mAccessPoint == null || !mAccessPoint.isSaved()) && || ((mAccessPoint == null || !mAccessPoint.isSaved()) && passwordInvalid)) {
passwordInvalid)) {
enabled = false; enabled = false;
} else { } else {
enabled = ipAndProxyFieldsAreValid(); enabled = ipAndProxyFieldsAreValid();
} }
if (mEapCaCertSpinner != null && if (mEapCaCertSpinner != null
mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE && && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE
((String)mEapCaCertSpinner.getSelectedItem()).equals(unspecifiedCert)) { && ((String) mEapCaCertSpinner.getSelectedItem()).equals(mUnspecifiedCertString)) {
enabled = false;
}
if (mEapUserCertSpinner != null
&& mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
&& ((String) mEapUserCertSpinner.getSelectedItem())
.equals(mUnspecifiedCertString)) {
enabled = false; enabled = false;
} }
return enabled; return enabled;
@@ -427,8 +434,8 @@ public class WifiConfigController implements TextWatcher,
int length = mPasswordView.length(); int length = mPasswordView.length();
String password = mPasswordView.getText().toString(); String password = mPasswordView.getText().toString();
// WEP-40, WEP-104, and 256-bit WEP (WEP-232?) // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
if ((length == 10 || length == 26 || length == 58) && if ((length == 10 || length == 26 || length == 58)
password.matches("[0-9A-Fa-f]*")) { && password.matches("[0-9A-Fa-f]*")) {
config.wepKeys[0] = password; config.wepKeys[0] = password;
} else { } else {
config.wepKeys[0] = '"' + password + '"'; config.wepKeys[0] = '"' + password + '"';
@@ -458,7 +465,7 @@ public class WifiConfigController implements TextWatcher,
switch (eapMethod) { switch (eapMethod) {
case Eap.PEAP: case Eap.PEAP:
// PEAP supports limited phase2 values // PEAP supports limited phase2 values
// Map the index from the PHASE2_PEAP_ADAPTER to the one used // Map the index from the mPhase2PeapAdapter to the one used
// by the API which has the full list of PEAP methods. // by the API which has the full list of PEAP methods.
switch(phase2Method) { switch(phase2Method) {
case WIFI_PEAP_PHASE2_NONE: case WIFI_PEAP_PHASE2_NONE:
@@ -476,14 +483,14 @@ public class WifiConfigController implements TextWatcher,
} }
break; break;
default: default:
// The default index from PHASE2_FULL_ADAPTER maps to the API // The default index from mPhase2FullAdapter maps to the API
config.enterpriseConfig.setPhase2Method(phase2Method); config.enterpriseConfig.setPhase2Method(phase2Method);
break; break;
} }
String caCert = (String) mEapCaCertSpinner.getSelectedItem(); String caCert = (String) mEapCaCertSpinner.getSelectedItem();
if (caCert.equals(unspecifiedCert)) { if (caCert.equals(mUnspecifiedCertString)) {
config.enterpriseConfig.setCaCertificateAliases(null); config.enterpriseConfig.setCaCertificateAliases(null);
} else if (caCert.equals(multipleCertSet)) { } else if (caCert.equals(mMultipleCertSetString)) {
if (mAccessPoint != null) { if (mAccessPoint != null) {
if (!mAccessPoint.isSaved()) { if (!mAccessPoint.isSaved()) {
Log.e(TAG, "Multiple certs can only be set when editing saved network"); Log.e(TAG, "Multiple certs can only be set when editing saved network");
@@ -496,7 +503,7 @@ public class WifiConfigController implements TextWatcher,
} }
String clientCert = (String) mEapUserCertSpinner.getSelectedItem(); String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
if (clientCert.equals(unspecifiedCert)) clientCert = ""; if (clientCert.equals(mUnspecifiedCertString)) clientCert = "";
config.enterpriseConfig.setClientCertificateAlias(clientCert); config.enterpriseConfig.setClientCertificateAlias(clientCert);
if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) { if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) {
config.enterpriseConfig.setIdentity(""); config.enterpriseConfig.setIdentity("");
@@ -533,9 +540,11 @@ public class WifiConfigController implements TextWatcher,
} }
private boolean ipAndProxyFieldsAreValid() { private boolean ipAndProxyFieldsAreValid() {
mIpAssignment = (mIpSettingsSpinner != null && mIpAssignment =
mIpSettingsSpinner.getSelectedItemPosition() == STATIC_IP) ? (mIpSettingsSpinner != null
IpAssignment.STATIC : IpAssignment.DHCP; && mIpSettingsSpinner.getSelectedItemPosition() == STATIC_IP)
? IpAssignment.STATIC
: IpAssignment.DHCP;
if (mIpAssignment == IpAssignment.STATIC) { if (mIpAssignment == IpAssignment.STATIC) {
mStaticIpConfiguration = new StaticIpConfiguration(); mStaticIpConfiguration = new StaticIpConfiguration();
@@ -700,6 +709,7 @@ public class WifiConfigController implements TextWatcher,
mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert); mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
mEapCaCertSpinner.setOnItemSelectedListener(this); mEapCaCertSpinner.setOnItemSelectedListener(this);
mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert); mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert);
mEapUserCertSpinner.setOnItemSelectedListener(this);
mEapIdentityView = (TextView) mView.findViewById(R.id.identity); mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous); mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
@@ -736,14 +746,14 @@ public class WifiConfigController implements TextWatcher,
} }
String[] caCerts = enterpriseConfig.getCaCertificateAliases(); String[] caCerts = enterpriseConfig.getCaCertificateAliases();
if (caCerts == null) { if (caCerts == null) {
setSelection(mEapCaCertSpinner, unspecifiedCert); setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
} else if (caCerts.length == 1) { } else if (caCerts.length == 1) {
setSelection(mEapCaCertSpinner, caCerts[0]); setSelection(mEapCaCertSpinner, caCerts[0]);
} else { } else {
// Reload the cert spinner with an extra "multiple certificates added" item // Reload the cert spinner with an extra "multiple certificates added" item
loadCertificates(mEapCaCertSpinner, loadCertificates(mEapCaCertSpinner,
Credentials.CA_CERTIFICATE, true); Credentials.CA_CERTIFICATE, true);
mEapCaCertSpinner.setSelection(multipleCertSetIndex); mEapCaCertSpinner.setSelection(MULTIPLE_CERT_SET_INDEX);
} }
setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias()); setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());
mEapIdentityView.setText(enterpriseConfig.getIdentity()); mEapIdentityView.setText(enterpriseConfig.getIdentity());
@@ -804,8 +814,8 @@ public class WifiConfigController implements TextWatcher,
break; break;
case WIFI_EAP_METHOD_PEAP: case WIFI_EAP_METHOD_PEAP:
// Reset adapter if needed // Reset adapter if needed
if (mPhase2Adapter != PHASE2_PEAP_ADAPTER) { if (mPhase2Adapter != mPhase2PeapAdapter) {
mPhase2Adapter = PHASE2_PEAP_ADAPTER; mPhase2Adapter = mPhase2PeapAdapter;
mPhase2Spinner.setAdapter(mPhase2Adapter); mPhase2Spinner.setAdapter(mPhase2Adapter);
} }
mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE); mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
@@ -814,8 +824,8 @@ public class WifiConfigController implements TextWatcher,
break; break;
case WIFI_EAP_METHOD_TTLS: case WIFI_EAP_METHOD_TTLS:
// Reset adapter if needed // Reset adapter if needed
if (mPhase2Adapter != PHASE2_FULL_ADAPTER) { if (mPhase2Adapter != mPhase2FullAdapter) {
mPhase2Adapter = PHASE2_FULL_ADAPTER; mPhase2Adapter = mPhase2FullAdapter;
mPhase2Spinner.setAdapter(mPhase2Adapter); mPhase2Spinner.setAdapter(mPhase2Adapter);
} }
mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE); mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
@@ -847,12 +857,12 @@ public class WifiConfigController implements TextWatcher,
private void setCaCertInvisible() { private void setCaCertInvisible() {
mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE); mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
mEapCaCertSpinner.setSelection(unspecifiedCertIndex); mEapCaCertSpinner.setSelection(UNSPECIFIED_CERT_INDEX);
} }
private void setUserCertInvisible() { private void setUserCertInvisible() {
mView.findViewById(R.id.l_user_cert).setVisibility(View.GONE); mView.findViewById(R.id.l_user_cert).setVisibility(View.GONE);
mEapUserCertSpinner.setSelection(unspecifiedCertIndex); mEapUserCertSpinner.setSelection(UNSPECIFIED_CERT_INDEX);
} }
private void setAnonymousIdentInvisible() { private void setAnonymousIdentInvisible() {
@@ -980,9 +990,9 @@ public class WifiConfigController implements TextWatcher,
final Context context = mConfigUi.getContext(); final Context context = mConfigUi.getContext();
ArrayList<String> certs = new ArrayList<String>(); ArrayList<String> certs = new ArrayList<String>();
certs.add(unspecifiedCert); certs.add(mUnspecifiedCertString);
if (showMultipleCerts) { if (showMultipleCerts) {
certs.add(multipleCertSet); certs.add(mMultipleCertSetString);
} }
certs.addAll( certs.addAll(
Arrays.asList(KeyStore.getInstance().list(prefix, android.os.Process.WIFI_UID))); Arrays.asList(KeyStore.getInstance().list(prefix, android.os.Process.WIFI_UID)));
@@ -1056,10 +1066,9 @@ public class WifiConfigController implements TextWatcher,
public void onCheckedChanged(CompoundButton view, boolean isChecked) { public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (view.getId() == R.id.show_password) { if (view.getId() == R.id.show_password) {
int pos = mPasswordView.getSelectionEnd(); int pos = mPasswordView.getSelectionEnd();
mPasswordView.setInputType( mPasswordView.setInputType(InputType.TYPE_CLASS_TEXT
InputType.TYPE_CLASS_TEXT | (isChecked ? | (isChecked ? InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : : InputType.TYPE_TEXT_VARIATION_PASSWORD));
InputType.TYPE_TEXT_VARIATION_PASSWORD));
if (pos >= 0) { if (pos >= 0) {
((EditText) mPasswordView).setSelection(pos); ((EditText) mPasswordView).setSelection(pos);
} }
@@ -1097,11 +1106,10 @@ public class WifiConfigController implements TextWatcher,
*/ */
public void updatePassword() { public void updatePassword() {
TextView passwdView = (TextView) mView.findViewById(R.id.password); TextView passwdView = (TextView) mView.findViewById(R.id.password);
passwdView.setInputType( passwdView.setInputType(InputType.TYPE_CLASS_TEXT
InputType.TYPE_CLASS_TEXT | | (((CheckBox) mView.findViewById(R.id.show_password)).isChecked()
(((CheckBox) mView.findViewById(R.id.show_password)).isChecked() ? ? InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : : InputType.TYPE_TEXT_VARIATION_PASSWORD));
InputType.TYPE_TEXT_VARIATION_PASSWORD));
} }
public AccessPoint getAccessPoint() { public AccessPoint getAccessPoint() {