Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize (Fix build work 2)

Browse Source
This commit is contained in:
MC~蛟龙 2024-07-11 21:44:51 +08:00
parent 20f0bb1984
commit db1535d75e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
project/module-mail/src/main/java/fr/xephi/authme/mail/SendMailSsl.java
View File

@ -6,11 +6,11 @@ import fr.xephi.authme.logger.LogLevel;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.CommonSettings; import fr.xephi.authme.settings.properties.CommonSettings;
import fr.xephi.authme.settings.properties.EmailSettings; import fr.xephi.authme.settings.properties.EmailSettings;
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.util.StringUtils; import fr.xephi.authme.util.StringUtils;
import org.apache.commons.mail.EmailConstants; import org.apache.commons.mail.EmailConstants;
import org.apache.commons.mail.EmailException; import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.HtmlEmail; import org.apache.commons.mail.HtmlEmail;
import org.jetbrains.annotations.NotNull;
import javax.activation.CommandMap; import javax.activation.CommandMap;
import javax.activation.MailcapCommandMap; import javax.activation.MailcapCommandMap;
@ -123,14 +123,7 @@ public class SendMailSsl {
if (Security.getProvider("Google OAuth2 Provider") == null) { if (Security.getProvider("Google OAuth2 Provider") == null) {
Security.addProvider(new OAuth2Provider()); Security.addProvider(new OAuth2Provider());
} }
Properties mailProperties = email.getMailSession().getProperties(); Properties mailProperties = getProperties(email, oAuth2Token);
mailProperties.setProperty("mail.smtp.ssl.enable", "true");
mailProperties.setProperty("mail.smtp.auth.mechanisms", "XOAUTH2");
mailProperties.setProperty("mail.smtp.sasl.enable", "true");
mailProperties.setProperty("mail.smtp.sasl.mechanisms", "XOAUTH2");
mailProperties.setProperty("mail.smtp.auth.login.disable", "true");
mailProperties.setProperty("mail.smtp.auth.plain.disable", "true");
mailProperties.setProperty(OAuth2SaslClientFactory.OAUTH_TOKEN_PROP, oAuth2Token);
email.setMailSession(Session.getInstance(mailProperties)); email.setMailSession(Session.getInstance(mailProperties));
} else { } else {
email.setStartTLSEnabled(true); email.setStartTLSEnabled(true);
@ -153,4 +146,16 @@ public class SendMailSsl {
email.setSSLCheckServerIdentity(true); email.setSSLCheckServerIdentity(true);
} }
} }
private static @NotNull Properties getProperties(HtmlEmail email, String oAuth2Token) throws EmailException {
Properties mailProperties = email.getMailSession().getProperties();
mailProperties.setProperty("mail.smtp.ssl.enable", "true");
mailProperties.setProperty("mail.smtp.auth.mechanisms", "XOAUTH2");
mailProperties.setProperty("mail.smtp.sasl.enable", "true");
mailProperties.setProperty("mail.smtp.sasl.mechanisms", "XOAUTH2");
mailProperties.setProperty("mail.smtp.auth.login.disable", "true");
mailProperties.setProperty("mail.smtp.auth.plain.disable", "true");
mailProperties.setProperty(OAuth2SaslClientFactory.OAUTH_TOKEN_PROP, oAuth2Token);
return mailProperties;
}
} }