moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix IMAP uri decode when user/pw contains ':'

This commit is contained in:
Jan Berkel 2014-12-21 11:52:05 +01:00
parent 7752f42db6
commit 8194c20ffe
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
View File

@ -159,11 +159,10 @@ public class ImapStore extends RemoteStore {
port = imapUri.getPort();
}
if (imapUri.getUserInfo() != null) {
String userinfo = imapUri.getUserInfo();
String[] userInfoParts = userinfo.split(":");
if (userinfo.endsWith(":")) {
final String userInfo = imapUri.getRawUserInfo();
if (userInfo != null) {
String[] userInfoParts = userInfo.split(":");
if (userInfo.endsWith(":")) {
// Password is empty. This can only happen after an account was imported.
authenticationType = AuthType.valueOf(userInfoParts[0]);
username = decodeUtf8(userInfoParts[1]);

9
tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
View File

@ -78,6 +78,15 @@ public class ImapStoreUriTest {
assertNull(settings.getExtra().get("pathPrefix"));
}
@Test public void testDecodeStoreUriWithColonsInUsernameAndPassword() {
String uri = "imap://PLAIN:a%3Auser:password%3Ahas%3Acolons@foo.com:993";
ServerSettings settings = RemoteStore.decodeStoreUri(uri);
assertEquals(AuthType.PLAIN, settings.authenticationType);
assertEquals("a:user", settings.username);
assertEquals("password:has:colons", settings.password);
assertEquals("foo.com", settings.host);
assertEquals(993, settings.port);
}
@Test public void testCreateStoreUriImapPrefix() {
Map<String, String> extra = new HashMap<String, String>();