wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-24 09:27:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

ported from mozilla: Bug 1538409 - implement oAuth authentication for POP accounts r=benc a=mkmelin (f6219b04be)

Browse source
This commit is contained in:
roytam1 2024-09-21 18:23:52 +08:00
commit 08feac8e97
6 changed files with 212 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mailnews/base/prefs/content/am-server.js
View file

@ -30,10 +30,12 @@ function onInit(aPageId, aServerId)
if (serverType == "imap")
setupImapDeleteUI(aServerId);
// TLS Cert (External) and OAuth2 are only supported on IMAP.
#ifdef MOZ_MAILNEWS_OAUTH2
document.getElementById("authMethod-oauth2").hidden = (serverType != "imap");
// OAuth2 are only supported on IMAP and POP.
document.getElementById("authMethod-oauth2").hidden =
serverType != "imap" && serverType != "pop3";
#endif
// TLS Cert (External) and OAuth2 are only supported on IMAP.
document.getElementById("authMethod-external").hidden = (serverType != "imap");
// "STARTTLS, if available" is vulnerable to MITM attacks so we shouldn't

15
mailnews/base/prefs/content/am-smtp.js
View file

@ -5,6 +5,9 @@
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource:///modules/mailServices.js");
#ifdef MOZ_MAILNEWS_OAUTH2
Components.utils.import("resource:///modules/OAuth2Providers.js");
#endif
var gSmtpServerListWindow =
{
@ -155,9 +158,19 @@ var gSmtpServerListWindow =
Components.utils.reportError("Warning: unknown value for smtpserver... authMethod: " +
aServer.authMethod);
}
if (authStr)
if (authStr) {
#ifdef MOZ_MAILNEWS_OAUTH2
let details = OAuth2Providers.getHostnameDetails(aServer.hostname);
if (!details) {
document
.getElementById("authMethod-oauth2")
.toggleAttribute("disabled", true);
}
#endif
document.getElementById("authMethodValue").value =
this.mBundle.getString(authStr);
}
},
refreshServerList: function(aServerKeyToSelect, aFocusList)

4
mailnews/base/util/OAuth2Providers.jsm
View file

@ -13,16 +13,20 @@ var {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
var kHostnames = new Map([
["imap.googlemail.com", ["accounts.google.com", "https://mail.google.com/"]],
["smtp.googlemail.com", ["accounts.google.com", "https://mail.google.com/"]],
["pop.googlemail.com", ["accounts.google.com", "https://mail.google.com/"]],
["imap.gmail.com", ["accounts.google.com", "https://mail.google.com/"]],
["smtp.gmail.com", ["accounts.google.com", "https://mail.google.com/"]],
["pop.gmail.com", ["accounts.google.com", "https://mail.google.com/"]],
["imap.mail.ru", ["o2.mail.ru", "mail.imap"]],
["smtp.mail.ru", ["o2.mail.ru", "mail.imap"]],
["imap.mail.yahoo.com", ["login.yahoo.com", "mail-w"]],
["pop.mail.yahoo.com", ["login.yahoo.com", "mail-w"]],
["smtp.mail.yahoo.com", ["login.yahoo.com", "mail-w"]],
["imap.aol.com", ["login.aol.com", "mail-w"]],
["pop.aol.com", ["login.aol.com", "mail-w"]],
["smtp.aol.com", ["login.aol.com", "mail-w"]],
["outlook.office365.com", [