[Update] 邮件设置添加配置项：发送账号 (#2795)

apps/common/tasks.py

@@ -24,7 +24,8 @@ def send_mail_async(*args, **kwargs):
     if len(args) == 3:
         args = list(args)
         args[0] = settings.EMAIL_SUBJECT_PREFIX + args[0]
-        args.insert(2, settings.EMAIL_HOST_USER)
+        email_from = settings.EMAIL_FROM or settings.EMAIL_HOST_USER
+        args.insert(2, email_from)
         args = tuple(args)
 
     try:

apps/jumpserver/settings.py

@@ -353,6 +353,7 @@ EMAIL_HOST = 'smtp.jumpserver.org'
 EMAIL_PORT = 25
 EMAIL_HOST_USER = 'noreply@jumpserver.org'
 EMAIL_HOST_PASSWORD = ''
+EMAIL_FROM = ''
 EMAIL_USE_SSL = False
 EMAIL_USE_TLS = False
 EMAIL_SUBJECT_PREFIX = '[JMS] '

apps/settings/api.py

@@ -30,6 +30,7 @@ class MailTestingAPI(APIView):
     def post(self, request):
         serializer = self.serializer_class(data=request.data)
         if serializer.is_valid():
+            email_from = serializer.validated_data["EMAIL_FROM"]
             email_host_user = serializer.validated_data["EMAIL_HOST_USER"]
             for k, v in serializer.validated_data.items():
                 if k.startswith('EMAIL'):
@@ -37,7 +38,8 @@ class MailTestingAPI(APIView):
             try:
                 subject = "Test"
                 message = "Test smtp setting"
-                send_mail(subject, message,  email_host_user, [email_host_user])
+                email_from = email_from or email_host_user
+                send_mail(subject, message,  email_from, [email_host_user])
             except Exception as e:
                 return Response({"error": str(e)}, status=401)
 

apps/settings/forms.py

@@ -80,7 +80,14 @@ class EmailSettingForm(BaseForm):
     )
     EMAIL_HOST_PASSWORD = FormEncryptCharField(
         max_length=1024, label=_("SMTP password"), widget=forms.PasswordInput,
-        required=False, help_text=_("Some provider use token except password")
+        required=False,
+        help_text=_("Tips: Some provider use token except password")
+    )
+    EMAIL_FROM = forms.CharField(
+        max_length=128, label=_("Send user"), initial='', required=False,
+        help_text=_(
+            "Tips: Send mail account, default SMTP account as the send account"
+        )
     )
     EMAIL_USE_SSL = forms.BooleanField(
         label=_("Use SSL"), initial=False, required=False,

apps/settings/serializers.py

@@ -6,6 +6,7 @@ class MailTestSerializer(serializers.Serializer):
     EMAIL_PORT = serializers.IntegerField(default=25)
     EMAIL_HOST_USER = serializers.CharField(max_length=1024)
     EMAIL_HOST_PASSWORD = serializers.CharField()
+    EMAIL_FROM = serializers.CharField(required=False, allow_blank=True)
     EMAIL_USE_SSL = serializers.BooleanField(default=False)
     EMAIL_USE_TLS = serializers.BooleanField(default=False)