Merge pull request #935 from appwrite/feat-disable-SMTP

Feat disable SMTP by Default

CHANGES.md

@@ -9,6 +9,7 @@
 - Added option for Redis authentication
 - Force adding a security email on setup
 - Better error logs on appwrite cretificates worker## Upgrades
+- SMTP is now disabled by default, no dummy SMTP is included in setup
 
 ## Upgrades
 

Dockerfile

@@ -90,8 +90,11 @@ ENV _APP_SERVER=swoole \
     _APP_INFLUXDB_PORT=8086 \
     _APP_STATSD_HOST=telegraf \
     _APP_STATSD_PORT=8125 \
-    _APP_SMTP_HOST=smtp \
-    _APP_SMTP_PORT=25 \
+    _APP_SMTP_HOST= \
+    _APP_SMTP_PORT= \
+    _APP_SMTP_SECURE= \
+    _APP_SMTP_USERNAME= \
+    _APP_SMTP_PASSWORD= \
     _APP_FUNCTIONS_TIMEOUT=900 \
     _APP_FUNCTIONS_CONTAINERS=10 \
     _APP_FUNCTIONS_CPUS=1 \
@@ -106,9 +109,6 @@ ENV _APP_SERVER=swoole \
     # 1 Day = 86400 s
     _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
     _APP_MAINTENANCE_INTERVAL=86400
-#ENV _APP_SMTP_SECURE ''
-#ENV _APP_SMTP_USERNAME ''
-#ENV _APP_SMTP_PASSWORD ''
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

app/config/variables.php

@@ -255,17 +255,17 @@ return [
         'variables' => [
             [
                 'name' => '_APP_SMTP_HOST',
-                'description' => 'SMTP server host name address. Default value is: \'smtp\'. Pass an empty string to disable all mail sending from the server.',
+                'description' => 'SMTP server host name address. Use an empty string to disable all mail sending from the server. The default value for this variable is an empty string',
                 'introduction' => '',
-                'default' => 'smtp',
+                'default' => '',
                 'required' => false,
                 'question' => '',
             ],
             [
                 'name' => '_APP_SMTP_PORT',
-                'description' => 'SMTP server TCP port. Default value is: \'25\'.',
+                'description' => 'SMTP server TCP port. Empty by default.',
                 'introduction' => '',
-                'default' => '25',
+                'default' => '',
                 'required' => false,
                 'question' => '',
             ],

app/controllers/web/console.php

@@ -144,6 +144,7 @@ App::get('/console/settings')
         $page
             ->setParam('customDomainsEnabled', ($target->isKnown() && !$target->isTest()))
             ->setParam('customDomainsTarget', $target->get())
+            ->setParam('smtpEnabled', (!empty(App::getEnv('_APP_SMTP_HOST'))))
         ;
 
         $layout

app/views/console/settings/index.phtml

@@ -2,6 +2,7 @@
 
 $customDomainsEnabled = $this->getParam('customDomainsEnabled', false);
 $customDomainsTarget = $this->getParam('customDomainsTarget', false);
+$smtpEnabled = $this->getParam('smtpEnabled', false);
 
 ?>
 <div class="cover">
@@ -506,10 +507,16 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                 <option data-ls-attrs="value={{role.type}}" data-ls-bind="{{role.label}}"></option>
                             </select>
 
+                            <?php if(!$smtpEnabled): ?>
+                            <div class="box note padding-tiny warning margin-bottom text-align-center">
+                                <i class="icon-warning"></i> SMTP connection is disabled. <a href="https://appwrite.io/docs/email-delivery" target="_blank" rel="noopener">Learn more <i class="icon-link-ext"></i></a>
+                            </div>
+                            <?php endif; ?>
+
                             <hr />
 
                             <div class="clear">
-                                <button>Send Invite</button>
+                                <button<?php if(!$smtpEnabled): ?> disabled<?php endif; ?>>Send Invite</button>
                                 &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
                             </div>
                         </form>

app/views/install/compose.phtml

@@ -276,7 +276,6 @@ services:
       - appwrite
     depends_on:
       - redis
-      - smtp
     environment:
       - _APP_ENV
       - _APP_SYSTEM_EMAIL_NAME
@@ -343,16 +342,6 @@ services:
       - MYSQL_PASSWORD=${_APP_DB_PASS}
     command: 'mysqld --innodb-flush-method=fsync'
 
-  smtp:
-    image: appwrite/smtp:1.0.1
-    container_name: appwrite-smtp
-    restart: unless-stopped
-    networks:
-        - appwrite
-    environment:
-        - MAILNAME=appwrite
-        - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16
-
   redis:
     image: redis:6.0-alpine3.12
     container_name: appwrite-redis

public/styles/comps/box.less

@@ -7,6 +7,14 @@
   display: block;
   border-bottom: none;
 
+  &.padding-tiny {
+    padding: 5px;
+  }
+
+  &.padding-xs {
+    padding: 10px;
+  }
+
   &.padding-small {
     padding: 15px;
   }
@@ -53,7 +61,7 @@
   }
 
   &.warning {
-    background: var(--config-color-success);
+    background: var(--config-color-warning);
     color: #2d2d2d;
 
     button,

public/styles/comps/modal.less

@@ -53,6 +53,14 @@
     }
   }
 
+  &.padding-tiny {
+    padding: 5px;
+  }
+
+  &.padding-xs {
+    padding: 10px;
+  }
+  
   &.padding-small {
     padding: 15px;
   }

public/styles/themes.less

@@ -27,7 +27,7 @@
     --config-color-fade-super: #f1f3f5;
     --config-color-danger: #f53d3d;
     --config-color-success: #1bbf61;
-    --config-color-warning: #ffed4d;
+    --config-color-warning: #fffbdd;
     --config-color-info: #386fd2;
     --config-border-color: #f3f3f3;
     --config-border-fade: #e0e3e4;