The Unified and Autonomous Development Platform
fix: Mail Notification Failed: SecurityManager Not Available in Async Context (OD-2699)
Robin Shen87f9936e85a3
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.javaindex ac5e5980e6..8c74b9ecf9 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java@@ -197,6 +197,7 @@ public class DefaultMailService implements MailService, Serializable {@Nullable String senderName, @Nullable String references) {transactionService.runAfterCommit(() -> executorService.execute(() -> {try {+ SecurityUtils.bindAsSystem();sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress,senderName, references);} catch (Exception e) {diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 412a5a3f21..8280305973 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -620,9 +620,12 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static Runnable inheritSubject(Runnable task) {- Subject subject = SecurityUtils.getSubject();+ Subject subject = ThreadContext.getSubject();return () -> {- ThreadContext.bind(subject);+ if (subject != null)+ ThreadContext.bind(subject);+ else+ ThreadContext.unbindSubject();task.run();};}