mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-21 23:32:51 +00:00
Code Issues Releases Wiki Activity

Added fallback to classic LOGIN

Browse source
This commit is contained in:
M66B 2020-07-14 20:24:02 +02:00
parent f2eccd4eda
commit 8f05b1ad2e
3 changed files with 182 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/java/com/sun/mail/imap/IMAPStore.java
View file

@ -887,18 +887,27 @@ public class IMAPStore extends Store
continue;
}
if (m.equals("PLAIN"))
p.authplain(authzid, user, password);
else if (m.equals("LOGIN"))
p.authlogin(user, password);
else if (m.equals("NTLM"))
p.authntlm(authzid, user, password);
else if (m.equals("XOAUTH2"))
p.authoauth2(user, password);
else {
logger.log(Level.FINE, "no authenticator for mechanism {0}", m);
continue;
}
try {
if (m.equals("PLAIN"))
p.authplain(authzid, user, password);
else if (m.equals("LOGIN"))
p.authlogin(user, password);
else if (m.equals("NTLM"))
p.authntlm(authzid, user, password);
else if (m.equals("XOAUTH2"))
p.authoauth2(user, password);
else {
logger.log(Level.FINE, "no authenticator for mechanism {0}", m);
continue;
}
} catch (ProtocolException ex) {
if (m.equals("PLAIN") || m.equals("LOGIN")) {
eu.faircode.email.Log.w(ex);
eu.faircode.email.Log.i("Falling back to classic LOGIN");
p.authclassic(user, password);
} else
throw ex;
}
return;
}

53
app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
View file

@ -627,6 +627,59 @@ public class IMAPProtocol extends Protocol {
authenticated = true;
}
public synchronized void authclassic(String u, String p)
throws ProtocolException {
List<Response> v = new ArrayList<>();
String tag = null;
Response r = null;
boolean done = false;
try {
if (noauthdebug && isTracing()) {
logger.fine("LOGIN command trace suppressed");
suspendTracing();
}
try {
Argument arg = new Argument();
arg.writeNString(u);
arg.writeNString(p);
tag = writeCommand("LOGIN", arg);
} catch (Exception ex) {
r = Response.byeResponse(ex);
done = true;
}
while (!done) {
try {
r = readResponse();
if (r.isTagged() && r.getTag().equals(tag))
done = true;
else if (r.isBYE()) // outta here
done = true;
} catch (Exception ioex) {
r = Response.byeResponse(ioex);
done = true;
}
v.add(r);
}
} finally {
resumeTracing();
}
Response[] responses = v.toArray(new Response[v.size()]);
handleCapabilityResponse(responses);
notifyResponseHandlers(responses);
if (noauthdebug && isTracing())
logger.fine("LOGIN command result: " + r);
handleLoginResult(r);
setCapabilities(r);
authenticated = true;
}
/**
* The AUTHENTICATE command with AUTH=PLAIN authentication scheme.

108
patches/Scarlet.patch Normal file
View file

@ -0,0 +1,108 @@
diff --git a/app/src/main/java/com/sun/mail/imap/IMAPStore.java b/app/src/main/java/com/sun/mail/imap/IMAPStore.java
index 929e82d33..cc9b7cca9 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPStore.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPStore.java
@@ -887,18 +887,27 @@ public class IMAPStore extends Store
continue;
}
- if (m.equals("PLAIN"))
- p.authplain(authzid, user, password);
- else if (m.equals("LOGIN"))
- p.authlogin(user, password);
- else if (m.equals("NTLM"))
- p.authntlm(authzid, user, password);
- else if (m.equals("XOAUTH2"))
- p.authoauth2(user, password);
- else {
- logger.log(Level.FINE, "no authenticator for mechanism {0}", m);
- continue;
- }
+ try {
+ if (m.equals("PLAIN"))
+ p.authplain(authzid, user, password);
+ else if (m.equals("LOGIN"))
+ p.authlogin(user, password);
+ else if (m.equals("NTLM"))
+ p.authntlm(authzid, user, password);
+ else if (m.equals("XOAUTH2"))
+ p.authoauth2(user, password);
+ else {
+ logger.log(Level.FINE, "no authenticator for mechanism {0}", m);
+ continue;
+ }
+ } catch (ProtocolException ex) {
+ if (m.equals("PLAIN") || m.equals("LOGIN")) {
+ eu.faircode.email.Log.w(ex);
+ eu.faircode.email.Log.i("Falling back to classic LOGIN");
+ p.authclassic(user, password);
+ } else
+ throw ex;
+ }
return;
}
diff --git a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
index a8a88b6c0..ff300bbfd 100644
--- a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
+++ b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
@@ -627,6 +627,59 @@ public class IMAPProtocol extends Protocol {
authenticated = true;
}
+ public synchronized void authclassic(String u, String p)
+ throws ProtocolException {
+ List<Response> v = new ArrayList<>();
+ String tag = null;
+ Response r = null;
+ boolean done = false;
+
+ try {
+
+ if (noauthdebug && isTracing()) {
+ logger.fine("LOGIN command trace suppressed");
+ suspendTracing();
+ }
+
+ try {
+ Argument arg = new Argument();
+ arg.writeNString(u);
+ arg.writeNString(p);
+ tag = writeCommand("LOGIN", arg);
+ } catch (Exception ex) {
+ r = Response.byeResponse(ex);
+ done = true;
+ }
+
+ while (!done) {
+ try {
+ r = readResponse();
+ if (r.isTagged() && r.getTag().equals(tag))
+ done = true;
+ else if (r.isBYE()) // outta here
+ done = true;
+ } catch (Exception ioex) {
+ r = Response.byeResponse(ioex);
+ done = true;
+ }
+ v.add(r);
+ }
+
+ } finally {
+ resumeTracing();
+ }
+
+ Response[] responses = v.toArray(new Response[v.size()]);
+
+ handleCapabilityResponse(responses);
+ notifyResponseHandlers(responses);
+
+ if (noauthdebug && isTracing())
+ logger.fine("LOGIN command result: " + r);
+ handleLoginResult(r);
+ setCapabilities(r);
+ authenticated = true;
+ }
/**
* The AUTHENTICATE command with AUTH=PLAIN authentication scheme.