[Update] 创建用户自定义邮件内容 (#2703)

* [Update] 增加创建用户自定义邮件内容功能

* [Update] 优化自定义创建用户邮件功能

* [Update] 修改自定义邮件内容的小图标icon

* [Update] 发送邮件引入样式，避免不同浏览器不显示邮件格式问题

* [Update] 优化创建用户自定义邮件内容

* [Update] 修改翻译

* [Update] 优化邮件内容的变量名

* [Update]优化自定义邮件内容

* [Update] 修改小问题

apps/jumpserver/settings.py

@@ -357,6 +357,12 @@ EMAIL_USE_SSL = False
 EMAIL_USE_TLS = False
 EMAIL_SUBJECT_PREFIX = '[JMS] '
 
+#Email custom content
+EMAIL_CUSTOM_USER_CREATED_SUBJECT = ''
+EMAIL_CUSTOM_USER_CREATED_HONORIFIC = ''
+EMAIL_CUSTOM_USER_CREATED_BODY = ''
+EMAIL_CUSTOM_USER_CREATED_SIGNATURE = ''
+
 REST_FRAMEWORK = {
     # Use Django's standard `django.contrib.auth` permissions,
     # or allow read-only access for unauthenticated users.

apps/settings/forms.py

@@ -242,3 +242,26 @@ class SecuritySettingForm(BaseForm):
                     'and resets must contain special characters')
     )
 
+
+class EmailContentSettingForm(BaseForm):
+    EMAIL_CUSTOM_USER_CREATED_SUBJECT = forms.CharField(
+        max_length=1024,  required=False, label=_("Create user email subject"),
+        help_text=_("Tips: When creating a user, send the subject of the email"
+                    " (eg:Create account successfully)")
+    )
+    EMAIL_CUSTOM_USER_CREATED_HONORIFIC = forms.CharField(
+        max_length=1024, required=False, label=_("Create user honorific"),
+        help_text=_("Tips: When creating a user, send the honorific of the "
+                    "email (eg:Hello)")
+    )
+    EMAIL_CUSTOM_USER_CREATED_BODY = forms.CharField(
+        max_length=4096, required=False, widget=forms.Textarea(),
+        label=_('Create user email content'),
+        help_text=_('Tips:When creating a user, send the content of the email')
+    )
+    EMAIL_CUSTOM_USER_CREATED_SIGNATURE = forms.CharField(
+        max_length=512, required=False, label=_("Signature"),
+        help_text=_("Tips: Email signature (eg:jumpserver)")
+    )
+
+

apps/settings/templates/settings/basic_setting.html

@@ -17,6 +17,9 @@
                             <li>
                                 <a href="{% url 'settings:email-setting' %}"  class="text-center"><i class="fa fa-envelope"></i> {% trans 'Email setting' %} </a>
                             </li>
+                            <li>
+                                <a href="{% url 'settings:email-content-setting' %}"  class="text-center"><i class="fa fa-file-text"></i> {% trans 'Email content setting' %} </a>
+                            </li>
                             <li>
                                 <a href="{% url 'settings:ldap-setting' %}" class="text-center"><i class="fa fa-archive"></i> {% trans 'LDAP setting' %} </a>
                             </li>

apps/settings/templates/settings/email_content_setting.html

+{% extends 'base.html' %}
+{% load static %}
+{% load bootstrap3 %}
+{% load i18n %}
+{% load common_tags %}
+
+{% block content %}
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="panel-options">
+                        <ul class="nav nav-tabs">
+                            <li>
+                                <a href="{% url 'settings:basic-setting' %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Basic setting' %}</a>
+                            </li>
+                            <li>
+                                <a href="{% url 'settings:email-setting' %}"  class="text-center"><i class="fa fa-envelope"></i> {% trans 'Email setting' %} </a>
+                            </li>
+                            <li class="active">
+                                <a href="{% url 'settings:email-content-setting' %}"  class="text-center"><i class="fa fa-file-text"></i> {% trans 'Email content setting' %} </a>
+                            </li>
+                            <li>
+                                <a href="{% url 'settings:ldap-setting' %}" class="text-center"><i class="fa fa-archive"></i> {% trans 'LDAP setting' %} </a>
+                            </li>
+                            <li>
+                                <a href="{% url 'settings:terminal-setting' %}" class="text-center"><i class="fa fa-hdd-o"></i> {% trans 'Terminal setting' %} </a>
+                            </li>
+                            <li>
+                                <a href="{% url 'settings:security-setting' %}" class="text-center"><i class="fa fa-lock"></i> {% trans 'Security setting' %} </a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div class="col-sm-12" style="padding-left:0">
+                                <div class="ibox-content" style="border-width: 0;padding-top: 40px;">
+                                    <form action="" method="post" class="form-horizontal">
+                                    {% if form.non_field_errors %}
+                                         <div class="alert alert-danger">
+                                             {{ form.non_field_errors }}
+                                         </div>
+                                    {% endif %}
+                                    {% csrf_token %}
+
+                                    <h3>{% trans "Create User setting" %}</h3>
+                                    {% bootstrap_field form.EMAIL_CUSTOM_USER_CREATED_SUBJECT layout="horizontal" %}
+                                    {% bootstrap_field form.EMAIL_CUSTOM_USER_CREATED_HONORIFIC layout="horizontal" %}
+                                    {% bootstrap_field form.EMAIL_CUSTOM_USER_CREATED_BODY layout="horizontal" %}
+                                    {% bootstrap_field form.EMAIL_CUSTOM_USER_CREATED_SIGNATURE layout="horizontal" %}
+                                    <div class="hr-line-dashed"></div>
+
+                                    <div class="form-group">
+                                        <div class="col-sm-4 col-sm-offset-2">
+                                            <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
+                                            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
+                                        </div>
+                                    </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
+{% block custom_foot_js %}
+<script>
+</script>
+{% endblock %}

apps/settings/templates/settings/email_setting.html

@@ -17,6 +17,9 @@
                             <li class="active">
                                 <a href="{% url 'settings:email-setting' %}"  class="text-center"><i class="fa fa-envelope"></i> {% trans 'Email setting' %} </a>
                             </li>
+                            <li>
+                                <a href="{% url 'settings:email-content-setting' %}"  class="text-center"><i class="fa fa-file-text"></i> {% trans 'Email content setting' %} </a>
+                            </li>
                             <li>
                                 <a href="{% url 'settings:ldap-setting' %}" class="text-center"><i class="fa fa-archive"></i> {% trans 'LDAP setting' %} </a>
                             </li>

apps/settings/templates/settings/ldap_setting.html

@@ -17,6 +17,9 @@
                             <li>
                                 <a href="{% url 'settings:email-setting' %}"  class="text-center"><i class="fa fa-envelope"></i> {% trans 'Email setting' %} </a>
                             </li>
+                            <li>
+                                <a href="{% url 'settings:email-content-setting' %}"  class="text-center"><i class="fa fa-file-text"></i> {% trans 'Email content setting' %} </a>
+                            </li>
                             <li class="active">
                                 <a href="{% url 'settings:ldap-setting' %}" class="text-center"><i class="fa fa-archive"></i> {% trans 'LDAP setting' %} </a>
                             </li>

apps/settings/templates/settings/security_setting.html

@@ -16,6 +16,9 @@
                             </li>
                             <li>
                                 <a href="{% url 'settings:email-setting' %}"  class="text-center"><i class="fa fa-envelope"></i> {% trans 'Email setting' %} </a>
+                            </li>
+                             <li>
+                                <a href="{% url 'settings:email-content-setting' %}"  class="text-center"><i class="fa fa-file-text"></i> {% trans 'Email content setting' %} </a>
                             </li>
                             <li>
                                 <a href="{% url 'settings:ldap-setting' %}" class="text-center"><i class="fa fa-archive"></i> {% trans 'LDAP setting' %} </a>

apps/settings/templates/settings/terminal_setting.html

@@ -18,6 +18,9 @@
                             <li>
                                 <a href="{% url 'settings:email-setting' %}" class="text-center"><i
                                         class="fa fa-envelope"></i> {% trans 'Email setting' %} </a>
+                            </li>
+                             <li>
+                                <a href="{% url 'settings:email-content-setting' %}"  class="text-center"><i class="fa fa-file-text"></i> {% trans 'Email content setting' %} </a>
                             </li>
                             <li>
                                 <a href="{% url 'settings:ldap-setting' %}" class="text-center"><i

apps/settings/urls/view_urls.py

@@ -9,6 +9,7 @@ app_name = 'common'
 urlpatterns = [
     url(r'^$', views.BasicSettingView.as_view(), name='basic-setting'),
     url(r'^email/$', views.EmailSettingView.as_view(), name='email-setting'),
+    url(r'^email-content/$', views.EmailContentSettingView.as_view(), name='email-content-setting'),
     url(r'^ldap/$', views.LDAPSettingView.as_view(), name='ldap-setting'),
     url(r'^terminal/$', views.TerminalSettingView.as_view(), name='terminal-setting'),
     url(r'^terminal/replay-storage/create$', views.ReplayStorageCreateView.as_view(), name='replay-storage-create'),

apps/settings/views.py

@@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _
 from common.permissions import SuperUserRequiredMixin
 from common import utils
 from .forms import EmailSettingForm, LDAPSettingForm, BasicSettingForm, \
-    TerminalSettingForm, SecuritySettingForm
+    TerminalSettingForm, SecuritySettingForm, EmailContentSettingForm
 
 
 class BasicSettingView(SuperUserRequiredMixin, TemplateView):
@@ -166,3 +166,29 @@ class SecuritySettingView(SuperUserRequiredMixin, TemplateView):
             context = self.get_context_data()
             context.update({"form": form})
             return render(request, self.template_name, context)
+
+
+class EmailContentSettingView(SuperUserRequiredMixin, TemplateView):
+    template_name = "settings/email_content_setting.html"
+    form_class = EmailContentSettingForm
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'app': _('Settings'),
+            'action': _('Email content setting'),
+            'form': self.form_class(),
+        }
+        kwargs.update(context)
+        return super().get_context_data(**kwargs)
+
+    def post(self, request):
+        form = self.form_class(request.POST)
+        if form.is_valid():
+            form.save()
+            msg = _("Update setting successfully")
+            messages.success(request, msg)
+            return redirect('settings:email-content-setting')
+        else:
+            context = self.get_context_data()
+            context.update({"form": form})
+            return render(request, self.template_name, context)

apps/users/utils.py

@@ -34,29 +34,24 @@ class AdminUserRequiredMixin(UserPassesTestMixin):
         return True
 
 
-def send_user_created_mail(user):
-    subject = _('Create account successfully')
-    recipient_list = [user.email]
-    message = _("""
-    Hello %(name)s:
-    </br>
-    Your account has been created successfully
-    </br>
-    Username: %(username)s
-    </br>
+def construct_user_created_email_body(user):
+    default_body = _("""
+        <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+        <p style="text-indent:2em;">
+            <span>
+                Username: %(username)s.
+            </span>
+            <span>
                 <a href="%(rest_password_url)s?token=%(rest_password_token)s">click here to set your password</a>
-    </br>
+            </span>    
+            <span>
                 This link is valid for 1 hour. After it expires, <a href="%(forget_password_url)s?email=%(email)s">request new one</a>
-
-    </br>
-    ---
-
-    </br>
+            </span> 
+            <span>
                 <a href="%(login_url)s">Login direct</a>
-
-    </br>
+            </span>
+        </p>
         """) % {
-        'name': user.name,
         'username': user.username,
         'rest_password_url': reverse('users:reset-password', external=True),
         'rest_password_token': user.generate_reset_token(),
@@ -64,6 +59,32 @@ def send_user_created_mail(user):
         'email': user.email,
         'login_url': reverse('authentication:login', external=True),
     }
+
+    if settings.EMAIL_CUSTOM_USER_CREATED_BODY:
+        custom_body = '<p style="text-indent:2em">' + settings.EMAIL_CUSTOM_USER_CREATED_BODY + '</p>'
+    else:
+        custom_body = ''
+    body = custom_body + default_body
+    return body
+
+
+def send_user_created_mail(user):
+    recipient_list = [user.email]
+    subject = _('Create account successfully')
+    if settings.EMAIL_CUSTOM_USER_CREATED_SUBJECT:
+        subject = settings.EMAIL_CUSTOM_USER_CREATED_SUBJECT
+
+    honorific = '<p>' + _('Hello %(name)s') % {'name': user.name} + ':</p>'
+    if settings.EMAIL_CUSTOM_USER_CREATED_HONORIFIC:
+        honorific = '<p>' + settings.EMAIL_CUSTOM_USER_CREATED_HONORIFIC + ':</p>'
+
+    body = construct_user_created_email_body(user)
+
+    signature = '<p style="float:right">jumpserver</p>'
+    if settings.EMAIL_CUSTOM_USER_CREATED_SIGNATURE:
+        signature = '<p style="float:right">' + settings.EMAIL_CUSTOM_USER_CREATED_SIGNATURE + '</p>'
+
+    message = honorific + body + signature
     if settings.DEBUG:
         try:
             print(message)