Integrate secondary SMTP and move secondary SMTP enable check to Advanced Settings

Merged secondary SMTP code from the previous branch into the latest devel branch.
Added SMTP check and moved it from Notifications to Advanced Settings

Author: msmannan00

backend/globaleaks/handlers/admin/operation.py

@@ -161,21 +161,29 @@ def disable_user_permission_file_upload(session, tid, user_session):
     user_session.permissions['can_upload_files'] = False
 
 
-def db_reset_smtp_settings(session, tid):
+def db_reset_smtp_settings(session, tid, use_smtp2=False):
     config = ConfigFactory(session, tid)
-    config.set_val('smtp_server', 'mail.globaleaks.org')
-    config.set_val('smtp_port', 587)
-    config.set_val('smtp_username', 'globaleaks')
-    config.set_val('smtp_password', 'globaleaks')
-    config.set_val('smtp_source_email', 'notifications@globaleaks.org')
-    config.set_val('smtp_security', 'TLS')
-    config.set_val('smtp_authentication', True)
 
+    if use_smtp2:
+        config.set_val('smtp2_server', 'mail.globaleaks.org')
+        config.set_val('smtp2_port', 587)
+        config.set_val('smtp2_username', 'globaleaks')
+        config.set_val('smtp2_password', 'globaleaks')
+        config.set_val('smtp2_source_email', 'notifications@globaleaks.org')
+        config.set_val('smtp2_security', 'TLS')
+        config.set_val('smtp2_authentication', True)
+    else:
+        config.set_val('smtp_server', 'mail.globaleaks.org')
+        config.set_val('smtp_port', 587)
+        config.set_val('smtp_username', 'globaleaks')
+        config.set_val('smtp_password', 'globaleaks')
+        config.set_val('smtp_source_email', 'notifications@globaleaks.org')
+        config.set_val('smtp_security', 'TLS')
+        config.set_val('smtp_authentication', True)
 
 @transact
-def reset_smtp_settings(session, tid):
-    return db_reset_smtp_settings(session, tid)
-
+def reset_smtp_settings(session, tid, use_smtp2):
+    return db_reset_smtp_settings(session, tid, use_smtp2)
 
 @transact
 def reset_templates(session, tid):
@@ -271,7 +279,8 @@ def enable_encryption(self, req_args, *args, **kwargs):
         return enable_encryption(self.request.tid)
 
     def reset_smtp_settings(self, req_args, *args, **kwargs):
-        return reset_smtp_settings(self.request.tid)
+        use_smtp2 = req_args.get('smtp2', False)
+        return reset_smtp_settings(self.request.tid, use_smtp2=use_smtp2)
 
     def disable_2fa(self, req_args, *args, **kwargs):
         return disable_2fa(self.request.tid, self.session.user_id, req_args['value'])
@@ -339,7 +348,9 @@ def test_mail(self, req_args, *args, **kwargs):
 
         subject, body = Templating().get_mail_subject_and_body(data)
 
-        yield self.state.sendmail(tid, user['mail_address'], subject, body)
+        use_smtp2 = req_args.get('smtp2', False)
+        mail_address = req_args.get('to_mail_address', '')
+        yield self.state.sendmail(tid, mail_address, subject, body, use_smtp2=use_smtp2)
 
     def toggle_escrow(self, req_args, *args, **kwargs):
         return toggle_escrow(self.request.tid, self.session)

backend/globaleaks/models/config_desc.py

@@ -28,6 +28,13 @@ class Int(Item):
 class Bool(Item):
     _type = bool
 
+class List(Item):
+    _type = list
+
+    def __init__(self, *args, **kwargs):
+        if 'default' not in kwargs:
+            kwargs['default'] = []
+        Item.__init__(self, *args, **kwargs)
 
 ConfigDescriptor = {
     'acme': Bool(default=False),
@@ -108,14 +115,16 @@ class Bool(Item):
     'smtp_server': Unicode(default='mail.globaleaks.org'),
     'smtp_source_email': Unicode(default='notifications@globaleaks.org'),
     'smtp_username': Unicode(default='globaleaks'),
-    'smtp2_password': Unicode(default=''),
+    'smtp2_password': Unicode(default='globaleaks'),
     'smtp2_port': Int(default=587),
-    'smtp2_security': Unicode(default=''),
-    'smtp2_authentication': Bool(default=False),
-    'smtp2_server': Unicode(default=''),
+    'smtp2_security': Unicode(default='TLS'),
+    'smtp2_authentication': Bool(default=True),
+    'smtp2_server': Unicode(default='mail.globaleaks.org'),
     'smtp2_enabled': Bool(default=False),
-    'smtp2_source_email': Unicode(default=''),
-    'smtp2_username': Unicode(default=''),
+    'smtp2_template_types': List(default=[]),
+    'smtp2_failover': Bool(default=False),
+    'smtp2_source_email': Unicode(default='notifications@globaleaks.org'),
+    'smtp2_username': Unicode(default='globaleaks'),
     'subdomain': Unicode(default=''),
     'threshold_free_disk_megabytes_high': Int(default=200),
     'threshold_free_disk_megabytes_low': Int(default=1000),
@@ -211,6 +220,7 @@ class Bool(Item):
         'signup_tos1_enable',
         'signup_tos2_enable',
         'simplified_login',
+        'smtp2_enabled',
         'subdomain',
         'threshold_free_disk_megabytes_high',
         'threshold_free_disk_megabytes_low',
@@ -278,6 +288,7 @@ class Bool(Item):
         'signup_tos1_enable',
         'signup_tos2_enable',
         'simplified_login',
+        'smtp2_enabled',
         'subdomain',
         'threshold_free_disk_megabytes_high',
         'threshold_free_disk_megabytes_low',
@@ -362,10 +373,11 @@ class Bool(Item):
         'smtp2_port',
         'smtp2_security',
         'smtp2_server',
-        'smtp2_enabled',
+        'smtp2_template_types',
         'smtp2_source_email',
         'smtp2_username',
-        'smtp2_authentication'
+        'smtp2_authentication',
+        'smtp2_failover'
     ],
     'public_node': [
         'adminonly',

backend/globaleaks/rest/requests.py

@@ -246,6 +246,7 @@ def get_multilang_request_format(request_format, localized_strings):
     'adminonly': bool,
     'custom_support_url': url_regexp_or_empty,
     'pgp': bool,
+    'smtp2_enabled': bool,
     'user_privacy_policy_text': str,
     'user_privacy_policy_url': str
 }
@@ -276,6 +277,15 @@ def get_multilang_request_format(request_format, localized_strings):
     'smtp_username': str,
     'smtp_password': str,
     'smtp_source_email': email_regexp,
+    'smtp2_template_types': [str],
+    'smtp2_server': str,
+    'smtp2_port': int,
+    'smtp2_security': str,  # 'TLS' or 'SSL' only
+    'smtp2_authentication': bool,
+    'smtp2_username': str,
+    'smtp2_password': str,
+    'smtp2_source_email': email_regexp,
+    'smtp2_failover': bool,
     'enable_admin_notification_emails': bool,
     'enable_analyst_notification_emails': bool,
     'enable_custodian_notification_emails': bool,

backend/globaleaks/state.py

@@ -196,28 +196,50 @@ def reset_minutely(self):
         self.exceptions.clear()
         self.exceptions_email_count = 0
 
-    def sendmail(self, tid, to_address, subject, body):
+    def sendmail(self, tid, to_address, subject, body, use_smtp2=False):
         if self.settings.disable_notifications:
             return succeed(True)
-
+    
         if self.tenants[tid].cache.mode != 'default':
             tid = 1
-
-        return sendmail(tid,
-                        self.tenants[tid].cache.notification.smtp_server,
-                        self.tenants[tid].cache.notification.smtp_port,
-                        self.tenants[tid].cache.notification.smtp_security,
-                        self.tenants[tid].cache.notification.smtp_authentication,
-                        self.tenants[tid].cache.notification.smtp_username,
-                        self.tenants[tid].cache.notification.smtp_password,
-                        self.tenants[tid].cache.name,
-                        self.tenants[tid].cache.notification.smtp_source_email,
-                        to_address,
-                        self.tenants[tid].cache.name + ' - ' + subject,
-                        body,
-                        self.tenants[1].cache.anonymize_outgoing_connections,
-                        self.settings.socks_port)
-
+    
+        notification = self.tenants[tid].cache.notification
+        smtp2_enabled = getattr(self.tenants[tid].cache, "smtp2_enabled", False)
+
+        if smtp2_enabled and use_smtp2:
+            smtp_server = notification.smtp2_server
+            smtp_port = notification.smtp2_port
+            smtp_security = notification.smtp2_security
+            smtp_authentication = notification.smtp2_authentication
+            smtp_username = notification.smtp2_username
+            smtp_password = notification.smtp2_password
+            smtp_source_email = notification.smtp2_source_email
+        else:
+            smtp_server = notification.smtp_server
+            smtp_port = notification.smtp_port
+            smtp_security = notification.smtp_security
+            smtp_authentication = notification.smtp_authentication
+            smtp_username = notification.smtp_username
+            smtp_password = notification.smtp_password
+            smtp_source_email = notification.smtp_source_email
+       
+        return sendmail(
+            tid,
+            smtp_server,
+            smtp_port,
+            smtp_security,
+            smtp_authentication,
+            smtp_username,
+            smtp_password,
+            self.tenants[tid].cache.name,
+            smtp_source_email,
+            to_address,
+            self.tenants[tid].cache.name + ' - ' + subject,
+            body,
+            self.tenants[1].cache.anonymize_outgoing_connections,
+            self.settings.socks_port
+        )
+        
     def schedule_support_email(self, tid, text):
         subject = "Support request"
         delivery_list = set.union(set(self.tenants[1].cache.notification.admin_list),

client/app/src/models/resolvers/node-resolver-model.ts

@@ -29,6 +29,7 @@ export class nodeResolverModel {
   signup_tos1_enable: boolean;
   signup_tos2_enable: boolean;
   simplified_login: boolean;
+  smtp2_enabled: boolean;
   subdomain: string;
   threshold_free_disk_megabytes_high: number;
   threshold_free_disk_megabytes_low: number;

client/app/src/models/resolvers/notification-resolver-model.ts

@@ -10,6 +10,15 @@ export class notificationResolverModel {
   smtp_server: string;
   smtp_source_email: string;
   smtp_username: string;
+  smtp2_template_types: any;
+  smtp2_failover: boolean
+  smtp2_authentication: boolean;
+  smtp2_password: string;
+  smtp2_port: number;
+  smtp2_security: string;
+  smtp2_server: string;
+  smtp2_source_email: string;
+  smtp2_username: string;
   tip_expiration_threshold: number;
   account_activation_mail_template: string;
   account_activation_mail_title: string;

client/app/src/models/resolvers/rtips-resolver-model.ts

@@ -2,6 +2,7 @@ import {Data} from "@app/models/receiver/receiver-tip-data";
 
 export interface rtipResolverModel {
   submissionStatusStr: string;
+  reportModificationStr: string;
   context_name: string;
   context?: any;
   id: string;