msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

OAuth configure

Browse Source
pull/170/head
M66B 6 years ago
parent 0737a88ea2
commit 0bd87ead2e
2 changed files with 223 additions and 144 deletions
Show Stats Download Patch File Download Diff File

307
app/src/main/java/eu/faircode/email/ActivitySetup.java
Unescape View File

@ -136,6 +136,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
private static final int KEY_ITERATIONS = 65536; private static final int KEY_ITERATIONS = 65536;
private static final int KEY_LENGTH = 256; private static final int KEY_LENGTH = 256;
private static final int OAUTH_TIMEOUT = 20 * 1000; // milliseconds
static final int REQUEST_PERMISSION = 1; static final int REQUEST_PERMISSION = 1;
static final int REQUEST_SOUND = 2; static final int REQUEST_SOUND = 2;
static final int REQUEST_EXPORT = 3; static final int REQUEST_EXPORT = 3;
@ -147,7 +149,6 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
static final String ACTION_QUICK_GMAIL = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_GMAIL"; static final String ACTION_QUICK_GMAIL = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_GMAIL";
static final String ACTION_QUICK_OAUTH = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_OAUTH"; static final String ACTION_QUICK_OAUTH = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_OAUTH";
static final String ACTION_QUICK_OUTLOOK = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_OUTLOOK";
static final String ACTION_QUICK_SETUP = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_SETUP"; static final String ACTION_QUICK_SETUP = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_SETUP";
static final String ACTION_VIEW_ACCOUNTS = BuildConfig.APPLICATION_ID + ".ACTION_VIEW_ACCOUNTS"; static final String ACTION_VIEW_ACCOUNTS = BuildConfig.APPLICATION_ID + ".ACTION_VIEW_ACCOUNTS";
static final String ACTION_VIEW_IDENTITIES = BuildConfig.APPLICATION_ID + ".ACTION_VIEW_IDENTITIES"; static final String ACTION_VIEW_IDENTITIES = BuildConfig.APPLICATION_ID + ".ACTION_VIEW_IDENTITIES";
@ -1197,6 +1198,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
.setState(provider.name) .setState(provider.name)
.build(); .build();
Log.i("OAuth request provider=" + provider.name);
Intent authIntent = getAuthorizationService().getAuthorizationRequestIntent(authRequest); Intent authIntent = getAuthorizationService().getAuthorizationRequestIntent(authRequest);
startActivityForResult(authIntent, REQUEST_OAUTH); startActivityForResult(authIntent, REQUEST_OAUTH);
@ -1215,9 +1217,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
if (auth == null) if (auth == null)
throw AuthorizationException.fromIntent(data); throw AuthorizationException.fromIntent(data);
for (EmailProvider provider : EmailProvider.loadProfiles(this)) for (final EmailProvider provider : EmailProvider.loadProfiles(this))
if (provider.name.equals(auth.state)) { if (provider.name.equals(auth.state)) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
final AuthState authState = AuthState.jsonDeserialize(prefs.getString("oauth." + provider.name, null)); final AuthState authState = AuthState.jsonDeserialize(prefs.getString("oauth." + provider.name, null));
authState.update(auth, null); authState.update(auth, null);
@ -1228,6 +1229,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
clientAuth = NoClientAuthentication.INSTANCE; clientAuth = NoClientAuthentication.INSTANCE;
else else
clientAuth = new ClientSecretPost(provider.oauth.clientSecret); clientAuth = new ClientSecretPost(provider.oauth.clientSecret);
Log.i("OAuth get token provider=" + provider.name);
getAuthorizationService().performTokenRequest( getAuthorizationService().performTokenRequest(
auth.createTokenExchangeRequest(), auth.createTokenExchangeRequest(),
clientAuth, clientAuth,
@ -1238,28 +1241,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
if (access == null) if (access == null)
throw error; throw error;
Log.i("OAuth got token provider=" + provider.name);
authState.update(access, null); authState.update(access, null);
onOAuthorized(provider.name, access.accessToken, authState);
Log.i("OAuth token provider=" + provider.name);
if ("Gmail".equals(provider.name)) {
} else if ("Outlook/Office365".equals(provider.name)) {
authState.performActionWithFreshTokens(getAuthorizationService(), new AuthState.AuthStateAction() {
@Override
public void execute(String accessToken, String idToken, AuthorizationException error) {
try {
if (error != null)
throw error;
onOutlook(accessToken, idToken);
} catch (Throwable ex) {
Log.unexpectedError(getSupportFragmentManager(), ex);
}
}
});
} else
throw new IllegalArgumentException("Unknown action provider=" + provider.name);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.unexpectedError(getSupportFragmentManager(), ex); Log.unexpectedError(getSupportFragmentManager(), ex);
} }
@ -1275,156 +1259,201 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
} }
} }
private void onOutlook(String accessToken, String idToken) { private void onOAuthorized(String name, String accessToken, AuthState state) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("name", name);
args.putString("token", accessToken); args.putString("token", accessToken);
args.putString("state", state.jsonSerializeString());
new SimpleTask<JSONObject>() { new SimpleTask<Void>() {
@Override @Override
protected JSONObject onExecute(Context context, Bundle args) throws Throwable { protected Void onExecute(Context context, Bundle args) throws Throwable {
String name = args.getString("name");
String token = args.getString("token"); String token = args.getString("token");
String state = args.getString("state");
String emailAddress = null;
String displayName = null;
if ("Gmail".equals(name)) {
// https://developers.google.com/gmail/api/v1/reference/users/getProfile
URL url = new URL("https://www.googleapis.com/gmail/v1/users/me/settings/sendAs");
Log.i("Fetching " + url);
HttpURLConnection request = (HttpURLConnection) url.openConnection();
request.setReadTimeout(OAUTH_TIMEOUT);
request.setConnectTimeout(OAUTH_TIMEOUT);
request.setRequestMethod("GET");
request.setDoInput(true);
request.setRequestProperty("Authorization", "Bearer " + token);
request.setRequestProperty("Accept", "application/json");
request.connect();
try {
String json = Helper.readStream(request.getInputStream(), StandardCharsets.UTF_8.name());
Log.i("Response=" + json);
JSONObject data = new JSONObject(json);
String altDisplayName = null;
JSONArray sendAs = (JSONArray) data.get("sendAs");
for (int i = 0; i < sendAs.length(); i++) {
JSONObject send = (JSONObject) sendAs.get(i);
if (send.optBoolean("isPrimary")) {
emailAddress = send.getString("sendAsEmail");
displayName = send.getString("displayName");
}
if (TextUtils.isEmpty(altDisplayName))
altDisplayName = send.getString("sendAsEmail");
}
// https://docs.microsoft.com/en-us/graph/api/user-get?view=graph-rest-1.0&tabs=http#http-request } finally {
URL url = new URL("https://graph.microsoft.com/v1.0/me" + request.disconnect();
"?$select=displayName,otherMails"); }
Log.i("MSGraph fetching " + url); } else if ("Outlook/Office365".equals(name)) {
// https://docs.microsoft.com/en-us/graph/api/user-get?view=graph-rest-1.0&tabs=http#http-request
HttpURLConnection request = (HttpURLConnection) url.openConnection(); URL url = new URL("https://graph.microsoft.com/v1.0/me?$select=displayName,otherMails");
request.setReadTimeout(15 * 1000); Log.i("Fetching " + url);
request.setConnectTimeout(15 * 1000);
request.setRequestMethod("GET"); HttpURLConnection request = (HttpURLConnection) url.openConnection();
request.setDoInput(true); request.setReadTimeout(OAUTH_TIMEOUT);
request.setRequestProperty("Authorization", "Bearer " + token); request.setConnectTimeout(OAUTH_TIMEOUT);
request.setRequestProperty("Content-Type", "application/json"); request.setRequestMethod("GET");
request.connect(); request.setDoInput(true);
request.setRequestProperty("Authorization", "Bearer " + token);
request.setRequestProperty("Content-Type", "application/json");
request.connect();
try {
String json = Helper.readStream(request.getInputStream(), StandardCharsets.UTF_8.name());
Log.i("Response=" + json);
JSONObject data = new JSONObject(json);
JSONArray otherMails = data.getJSONArray("otherMails");
emailAddress = (String) otherMails.get(0);
displayName = data.getString("displayName");
} finally {
request.disconnect();
}
} else
throw new IllegalArgumentException("Unknown provider=" + name);
try { if (TextUtils.isEmpty(emailAddress))
Log.i("MSGraph getting response"); throw new IllegalArgumentException("email address missing");
String json = Helper.readStream(request.getInputStream(), StandardCharsets.UTF_8.name()); if (TextUtils.isEmpty(displayName))
return new JSONObject(json); displayName = emailAddress;
} finally {
request.disconnect();
}
}
@Override Log.i("OAuth email=" + emailAddress + " name=" + displayName);
protected void onExecuted(Bundle args, JSONObject data) {
Log.i("MSGraph " + data);
try { for (EmailProvider provider : EmailProvider.loadProfiles(context))
JSONArray otherMails = data.getJSONArray("otherMails"); if (provider.name.equals(name)) {
args.putString("displayName", data.getString("displayName")); List<EntityFolder> folders;
args.putString("email", (String) otherMails.get(0));
new SimpleTask<Void>() { Log.i("OAuth checking IMAP provider=" + provider.name);
@Override String aprotocol = provider.imap.starttls ? "imap" : "imaps";
protected Void onExecute(Context context, Bundle args) throws Throwable { try (MailService iservice = new MailService(context, aprotocol, null, false, true, true)) {
String token = args.getString("token"); iservice.connect(provider.imap.host, provider.imap.port, MailService.AUTH_TYPE_OAUTH, emailAddress, state, null);
String email = args.getString("email");
String displayName = args.getString("displayName");
List<EntityFolder> folders; folders = iservice.getFolders();
// https://msdn.microsoft.com/en-us/windows/desktop/dn440163 if (folders == null)
String host = "imap-mail.outlook.com"; throw new IllegalArgumentException(context.getString(R.string.title_setup_no_system_folders));
int port = 993; }
boolean starttls = false;
String user = email;
String password = token;
try (MailService iservice = new MailService(context, "imaps", null, false, true, true)) {
iservice.connect(host, port, MailService.AUTH_TYPE_OUTLOOK, user, password, null);
folders = iservice.getFolders(); Log.i("OAuth checking SMTP provider=" + provider.name);
String iprotocol = provider.smtp.starttls ? "smtp" : "smtps";
try (MailService iservice = new MailService(context, iprotocol, null, false, true, true)) {
iservice.connect(provider.smtp.host, provider.smtp.port, MailService.AUTH_TYPE_OAUTH, emailAddress, state, null);
}
DB db = DB.getInstance(context); Log.i("OAuth passed provider=" + provider.name);
try {
db.beginTransaction();
EntityAccount primary = db.account().getPrimaryAccount(); DB db = DB.getInstance(context);
try {
db.beginTransaction();
// Create account EntityAccount primary = db.account().getPrimaryAccount();
EntityAccount account = new EntityAccount();
account.host = host; // Create account
account.starttls = starttls; EntityAccount account = new EntityAccount();
account.port = port;
account.auth_type = MailService.AUTH_TYPE_OUTLOOK;
account.user = user;
account.password = password;
account.name = "OutLook"; account.host = provider.imap.host;
account.starttls = provider.imap.starttls;
account.port = provider.imap.port;
account.auth_type = MailService.AUTH_TYPE_OAUTH;
account.user = emailAddress;
account.password = state;
account.synchronize = true; account.name = provider.name;
account.primary = (primary == null);
account.created = new Date().getTime(); account.synchronize = true;
account.last_connected = account.created; account.primary = (primary == null);
account.id = db.account().insertAccount(account); account.created = new Date().getTime();
args.putLong("account", account.id); account.last_connected = account.created;
EntityLog.log(context, "OutLook account=" + account.name);
// Create folders account.id = db.account().insertAccount(account);
for (EntityFolder folder : folders) { args.putLong("account", account.id);
folder.account = account.id; EntityLog.log(context, "OAuth account=" + account.name);
folder.id = db.folder().insertFolder(folder);
EntityLog.log(context, "OutLook folder=" + folder.name + " type=" + folder.type);
}
// Set swipe left/right folder // Create folders
for (EntityFolder folder : folders) for (EntityFolder folder : folders) {
if (EntityFolder.TRASH.equals(folder.type)) folder.account = account.id;
account.swipe_left = folder.id; folder.id = db.folder().insertFolder(folder);
else if (EntityFolder.ARCHIVE.equals(folder.type)) EntityLog.log(context, "OAuth folder=" + folder.name + " type=" + folder.type);
account.swipe_right = folder.id;
db.account().updateAccount(account);
// Create identity
EntityIdentity identity = new EntityIdentity();
identity.name = displayName;
identity.email = user;
identity.account = account.id;
identity.host = "smtp-mail.outlook.com";
identity.starttls = true;
identity.port = 587;
identity.auth_type = MailService.AUTH_TYPE_OUTLOOK;
identity.user = user;
identity.password = password;
identity.synchronize = true;
identity.primary = true;
identity.id = db.identity().insertIdentity(identity);
args.putLong("identity", identity.id);
EntityLog.log(context, "Gmail identity=" + identity.name + " email=" + identity.email);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
} }
return null; // Set swipe left/right folder
} for (EntityFolder folder : folders)
if (EntityFolder.TRASH.equals(folder.type))
account.swipe_left = folder.id;
else if (EntityFolder.ARCHIVE.equals(folder.type))
account.swipe_right = folder.id;
@Override db.account().updateAccount(account);
protected void onException(Bundle args, Throwable ex) {
// Create identity
EntityIdentity identity = new EntityIdentity();
identity.name = name;
identity.email = displayName;
identity.account = account.id;
identity.host = provider.smtp.host;
identity.starttls = provider.smtp.starttls;
identity.port = provider.smtp.port;
identity.auth_type = MailService.AUTH_TYPE_GMAIL;
identity.user = emailAddress;
identity.password = state;
identity.synchronize = true;
identity.primary = true;
identity.id = db.identity().insertIdentity(identity);
args.putLong("identity", identity.id);
EntityLog.log(context, "OAuth identity=" + identity.name + " email=" + identity.email);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
} }
}.execute(ActivitySetup.this, args, "outlook:account");
} catch (JSONException ex) { ServiceSynchronize.eval(context, "OAuth");
Log.e(ex); }
}
return null;
}
@Override
protected void onExecuted(Bundle args, Void data) {
FragmentReview fragment = new FragmentReview();
fragment.setArguments(args);
fragment.show(getSupportFragmentManager(), "oauth:review");
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getSupportFragmentManager(), ex); Log.unexpectedError(getSupportFragmentManager(), ex);
} }
}.execute(ActivitySetup.this, args, "graph:profile"); }.execute(ActivitySetup.this, args, "oauth:configure");
} }
private void onViewQuickSetup(Intent intent) { private void onViewQuickSetup(Intent intent) {

60
app/src/main/java/eu/faircode/email/MailService.java
Unescape View File

@ -14,6 +14,10 @@ import com.sun.mail.imap.IMAPStore;
import com.sun.mail.smtp.SMTPTransport; import com.sun.mail.smtp.SMTPTransport;
import com.sun.mail.util.MailConnectException; import com.sun.mail.util.MailConnectException;
import net.openid.appauth.AuthState;
import net.openid.appauth.AuthorizationException;
import net.openid.appauth.AuthorizationService;
import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.asn1.x509.GeneralName;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -41,6 +45,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Semaphore;
import javax.mail.AuthenticationFailedException; import javax.mail.AuthenticationFailedException;
import javax.mail.Folder; import javax.mail.Folder;
@ -72,7 +77,7 @@ public class MailService implements AutoCloseable {
static final int AUTH_TYPE_PASSWORD = 1; static final int AUTH_TYPE_PASSWORD = 1;
static final int AUTH_TYPE_GMAIL = 2; static final int AUTH_TYPE_GMAIL = 2;
static final int AUTH_TYPE_OUTLOOK = 3; static final int AUTH_TYPE_OAUTH = 3;
private final static int CHECK_TIMEOUT = 15 * 1000; // milliseconds private final static int CHECK_TIMEOUT = 15 * 1000; // milliseconds
private final static int CONNECT_TIMEOUT = 20 * 1000; // milliseconds private final static int CONNECT_TIMEOUT = 20 * 1000; // milliseconds
@ -227,15 +232,21 @@ public class MailService implements AutoCloseable {
} }
try { try {
if (auth == AUTH_TYPE_GMAIL || auth == AUTH_TYPE_OUTLOOK) if (auth == AUTH_TYPE_GMAIL || auth == AUTH_TYPE_OAUTH)
properties.put("mail." + protocol + ".auth.mechanisms", "XOAUTH2"); properties.put("mail." + protocol + ".auth.mechanisms", "XOAUTH2");
//if (BuildConfig.DEBUG) //if (BuildConfig.DEBUG)
// throw new MailConnectException( // throw new MailConnectException(
// new SocketConnectException("Debug", new Exception("Test"), host, port, 0)); // new SocketConnectException("Debug", new Exception("Test"), host, port, 0));
_connect(context, host, port, user, password, factory); if (auth == AUTH_TYPE_OAUTH) {
return null; AuthState authState = OAuthRefresh(context, password);
_connect(context, host, port, user, authState.getAccessToken(), factory);
return authState.jsonSerializeString();
} else {
_connect(context, host, port, user, password, factory);
return null;
}
} catch (AuthenticationFailedException ex) { } catch (AuthenticationFailedException ex) {
// Refresh token // Refresh token
if (auth == AUTH_TYPE_GMAIL) if (auth == AUTH_TYPE_GMAIL)
@ -260,7 +271,11 @@ public class MailService implements AutoCloseable {
Log.e(ex1); Log.e(ex1);
throw new AuthenticationFailedException(ex.getMessage(), ex1); throw new AuthenticationFailedException(ex.getMessage(), ex1);
} }
else else if (auth == AUTH_TYPE_OAUTH) {
AuthState authState = OAuthRefresh(context, password);
_connect(context, host, port, user, authState.getAccessToken(), factory);
return authState.jsonSerializeString();
} else
throw ex; throw ex;
} catch (MailConnectException ex) { } catch (MailConnectException ex) {
try { try {
@ -358,6 +373,41 @@ public class MailService implements AutoCloseable {
} }
} }
private static class ErrorHolder {
AuthorizationException error;
}
static AuthState OAuthRefresh(Context context, String json) throws MessagingException {
try {
AuthState authState = AuthState.jsonDeserialize(json);
Semaphore semaphore = new Semaphore(0);
ErrorHolder holder = new ErrorHolder();
Log.i("OAuth refresh");
AuthorizationService authService = new AuthorizationService(context);
authState.performActionWithFreshTokens(authService, new AuthState.AuthStateAction() {
@Override
public void execute(String accessToken, String idToken, AuthorizationException error) {
if (error != null)
holder.error = error;
semaphore.release();
}
});
semaphore.acquire();
Log.i("OAuth refreshed");
if (holder.error != null)
throw holder.error;
return authState;
} catch (Exception ex) {
throw new MessagingException("OAuth refresh", ex);
}
}
static String getAuthTokenType(String type) { static String getAuthTokenType(String type) {
// https://developers.google.com/gmail/imap/xoauth2-protocol // https://developers.google.com/gmail/imap/xoauth2-protocol
if ("com.google".equals(type)) if ("com.google".equals(type))

Write Preview
Loading…
Cancel
Save