ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow spaces in passwords 

* Separate/identical fixes for incoming, outgoing, exchange
* Unit tests
* Some protocols will fail anyway (e.g. POP3)

TODO: Some sort of warning (master only - won't backport that)
Bug: 2981433

Change-Id: I82984e5912fc7fcb88e747815d0fe33cb36605e7
This commit is contained in:
Andrew Stadler 2010-09-24 16:36:36 -07:00
parent a1758ebc25
commit fb4333b3a5
8 changed files with 142 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
View File

@ -336,7 +336,7 @@ public class AccountSetupExchangeFragment extends AccountServerBaseFragment
* a problem with the user input.
* @return a URI built from the account setup fields
*/
private URI getUri() throws URISyntaxException {
/* package */ URI getUri() throws URISyntaxException {
boolean sslRequired = mSslSecurityView.isChecked();
boolean trustCertificates = mTrustCertificatesView.isChecked();
String scheme = (sslRequired)
@ -349,7 +349,7 @@ public class AccountSetupExchangeFragment extends AccountServerBaseFragment
userName = userName.substring(1);
}
mCacheLoginCredential = userName;
String userInfo = userName + ":" + mPasswordView.getText().toString().trim();
String userInfo = userName + ":" + mPasswordView.getText();
String host = mServerView.getText().toString().trim();
String path = null;

2
src/com/android/email/activity/setup/AccountSetupIncoming.java
View File

@ -33,7 +33,7 @@ import android.os.Bundle;
public class AccountSetupIncoming extends AccountSetupActivity
implements AccountSetupIncomingFragment.Callback {
private AccountSetupIncomingFragment mFragment;
/* package */ AccountSetupIncomingFragment mFragment;
/* package */ boolean mNextButtonEnabled;
public static void actionIncomingSettings(Activity fromActivity, int mode, Account account) {

4
src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
View File

@ -414,7 +414,7 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment {
* a problem with the user input.
* @return a URI built from the account setup fields
*/
private URI getUri() throws URISyntaxException {
/* package */ URI getUri() throws URISyntaxException {
int securityType = (Integer)((SpinnerOption)mSecurityTypeView.getSelectedItem()).value;
String path = null;
if (mAccountSchemes[securityType].startsWith("imap")) {
@ -424,7 +424,7 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment {
mCacheLoginCredential = userName;
URI uri = new URI(
mAccountSchemes[securityType],
userName + ":" + mPasswordView.getText().toString().trim(),
userName + ":" + mPasswordView.getText(),
mServerView.getText().toString().trim(),
Integer.parseInt(mPortView.getText().toString().trim()),
path, // path

2
src/com/android/email/activity/setup/AccountSetupOutgoing.java
View File

@ -33,7 +33,7 @@ import android.os.Bundle;
public class AccountSetupOutgoing extends Activity
implements AccountSetupOutgoingFragment.Callback {
private AccountSetupOutgoingFragment mFragment;
/* package */ AccountSetupOutgoingFragment mFragment;
/* package */ boolean mNextButtonEnabled;
public static void actionOutgoingSettings(Activity fromActivity, int mode, Account account) {

5
src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
View File

@ -353,12 +353,11 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
* a problem with the user input.
* @return a URI built from the account setup fields
*/
private URI getUri() throws URISyntaxException {
/* package */ URI getUri() throws URISyntaxException {
int securityType = (Integer)((SpinnerOption)mSecurityTypeView.getSelectedItem()).value;
String userInfo = null;
if (mRequireLoginView.isChecked()) {
userInfo = mUsernameView.getText().toString().trim() + ":"
+ mPasswordView.getText().toString().trim();
userInfo = mUsernameView.getText().toString().trim() + ":" + mPasswordView.getText();
}
URI uri = new URI(
SMTP_SCHEMES[securityType],

44
tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
View File

@ -30,6 +30,9 @@ import android.view.View;
import android.widget.CheckBox;
import android.widget.EditText;
import java.net.URI;
import java.net.URISyntaxException;
/**
* Tests of the basic UI logic in the Account Setup Incoming (IMAP / POP3) screen.
* You can run this entire test case with:
@ -40,7 +43,9 @@ public class AccountSetupExchangeTests extends
ActivityInstrumentationTestCase2<AccountSetupExchange> {
//EXCHANGE-REMOVE-SECTION-START
private AccountSetupExchange mActivity;
private AccountSetupExchangeFragment mFragment;
private EditText mServerView;
private EditText mPasswordView;
private CheckBox mSslRequiredCheckbox;
private CheckBox mTrustAllCertificatesCheckbox;
//EXCHANGE-REMOVE-SECTION-END
@ -125,6 +130,43 @@ public class AccountSetupExchangeTests extends
assertFalse(mActivity.mNextButtonEnabled);
}
/**
* Test to confirm that passwords with leading or trailing spaces are accepted verbatim.
*/
@UiThreadTest
public void testPasswordNoTrim() throws URISyntaxException {
getActivityAndFields();
// Clear the password - should disable
checkPassword(null, false);
// Various combinations of spaces should be OK
checkPassword(" leading", true);
checkPassword("trailing ", true);
checkPassword("em bedded", true);
checkPassword(" ", true);
}
/**
* Check password field for a given password. Should be called in UI thread. Confirms that
* the password has not been trimmed.
*
* @param password the password to test with
* @param expectNext true if expected that this password will enable the "next" button
*/
private void checkPassword(String password, boolean expectNext) throws URISyntaxException {
mPasswordView.setText(password);
if (expectNext) {
assertTrue(mActivity.mNextButtonEnabled);
URI uri = mFragment.getUri();
String actualUserInfo = uri.getUserInfo();
String actualPassword = actualUserInfo.split(":", 2)[1];
assertEquals(password, actualPassword);
} else {
assertFalse(mActivity.mNextButtonEnabled);
}
}
/**
* Test aspects of loadSettings()
*
@ -176,7 +218,9 @@ public class AccountSetupExchangeTests extends
*/
private void getActivityAndFields() {
mActivity = getActivity();
mFragment = mActivity.mFragment;
mServerView = (EditText) mActivity.findViewById(R.id.account_server);
mPasswordView = (EditText) mActivity.findViewById(R.id.account_password);
mSslRequiredCheckbox = (CheckBox) mActivity.findViewById(R.id.account_ssl);
mTrustAllCertificatesCheckbox =
(CheckBox) mActivity.findViewById(R.id.account_trust_certificates);

46
tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
View File

@ -25,6 +25,9 @@ import android.test.UiThreadTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.widget.EditText;
import java.net.URI;
import java.net.URISyntaxException;
/**
* Tests of the basic UI logic in the Account Setup Incoming (IMAP / POP3) screen.
* You can run this entire test case with:
@ -35,7 +38,9 @@ public class AccountSetupIncomingTests extends
ActivityInstrumentationTestCase2<AccountSetupIncoming> {
private AccountSetupIncoming mActivity;
private AccountSetupIncomingFragment mFragment;
private EditText mServerView;
private EditText mPasswordView;
public AccountSetupIncomingTests() {
super(AccountSetupIncoming.class);
@ -122,7 +127,44 @@ public class AccountSetupIncomingTests extends
mServerView.setText("serv$er.com");
assertFalse(mActivity.mNextButtonEnabled);
}
/**
* Test to confirm that passwords with leading or trailing spaces are accepted verbatim.
*/
@UiThreadTest
public void testPasswordNoTrim() throws URISyntaxException {
getActivityAndFields();
// Clear the password - should disable
checkPassword(null, false);
// Various combinations of spaces should be OK
checkPassword(" leading", true);
checkPassword("trailing ", true);
checkPassword("em bedded", true);
checkPassword(" ", true);
}
/**
* Check password field for a given password. Should be called in UI thread. Confirms that
* the password has not been trimmed.
*
* @param password the password to test with
* @param expectNext true if expected that this password will enable the "next" button
*/
private void checkPassword(String password, boolean expectNext) throws URISyntaxException {
mPasswordView.setText(password);
if (expectNext) {
assertTrue(mActivity.mNextButtonEnabled);
URI uri = mFragment.getUri();
String actualUserInfo = uri.getUserInfo();
String actualPassword = actualUserInfo.split(":", 2)[1];
assertEquals(password, actualPassword);
} else {
assertFalse(mActivity.mNextButtonEnabled);
}
}
/**
* TODO: A series of tests to explore the logic around security models & ports
* TODO: A series of tests exploring differences between IMAP and POP3
@ -133,7 +175,9 @@ public class AccountSetupIncomingTests extends
*/
private void getActivityAndFields() {
mActivity = getActivity();
mFragment = mActivity.mFragment;
mServerView = (EditText) mActivity.findViewById(R.id.account_server);
mPasswordView = (EditText) mActivity.findViewById(R.id.account_password);
}
/**

46
tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
View File

@ -25,6 +25,9 @@ import android.test.UiThreadTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.widget.EditText;
import java.net.URI;
import java.net.URISyntaxException;
/**
* Tests of the basic UI logic in the Account Setup Outgoing (SMTP) screen.
* You can run this entire test case with:
@ -35,7 +38,9 @@ public class AccountSetupOutgoingTests extends
ActivityInstrumentationTestCase2<AccountSetupOutgoing> {
private AccountSetupOutgoing mActivity;
private AccountSetupOutgoingFragment mFragment;
private EditText mServerView;
private EditText mPasswordView;
public AccountSetupOutgoingTests() {
super(AccountSetupOutgoing.class);
@ -120,7 +125,44 @@ public class AccountSetupOutgoingTests extends
mServerView.setText("serv$er.com");
assertFalse(mActivity.mNextButtonEnabled);
}
/**
* Test to confirm that passwords with leading or trailing spaces are accepted verbatim.
*/
@UiThreadTest
public void testPasswordNoTrim() throws URISyntaxException {
getActivityAndFields();
// Clear the password - should disable
checkPassword(null, false);
// Various combinations of spaces should be OK
checkPassword(" leading", true);
checkPassword("trailing ", true);
checkPassword("em bedded", true);
checkPassword(" ", true);
}
/**
* Check password field for a given password. Should be called in UI thread. Confirms that
* the password has not been trimmed.
*
* @param password the password to test with
* @param expectNext true if expected that this password will enable the "next" button
*/
private void checkPassword(String password, boolean expectNext) throws URISyntaxException {
mPasswordView.setText(password);
if (expectNext) {
assertTrue(mActivity.mNextButtonEnabled);
URI uri = mFragment.getUri();
String actualUserInfo = uri.getUserInfo();
String actualPassword = actualUserInfo.split(":", 2)[1];
assertEquals(password, actualPassword);
} else {
assertFalse(mActivity.mNextButtonEnabled);
}
}
/**
* TODO: A series of tests to explore the logic around security models & ports
*/
@ -130,7 +172,9 @@ public class AccountSetupOutgoingTests extends
*/
private void getActivityAndFields() {
mActivity = getActivity();
mFragment = mActivity.mFragment;
mServerView = (EditText) mActivity.findViewById(R.id.account_server);
mPasswordView = (EditText) mActivity.findViewById(R.id.account_password);
}
/**