From d9267a275daeb2378996c52a1a454a07b89e8b33 Mon Sep 17 00:00:00 2001
From: Philip Guyton <philip@yewtreeapps.com>
Date: Tue, 4 Jan 2022 17:23:49 +0000
Subject: [PATCH 1/2] Sender issues re notification emails #2339

Adds 3 additional entries to /etc/postfix/generic of the form:

@hostname.dnsdomain sender
@localhost sender
@localhost.localdomain sender

In order that the receiving email server is able to validate the from
and sender against existing emails addresses. Avoiding the problematic
from root@localhost.

## Includes:
- Adding a trivial dnsdomainname wrapper - system/osi.py:getdnsdomain().
- Cosmetic text fix on form settings test. I.e. 'Submit' not 'Save'.
---
 .../static/storageadmin/js/templates/email/email.jst   |  2 +-
 src/rockstor/storageadmin/views/email_client.py        | 10 ++++++++--
 src/rockstor/system/osi.py                             |  6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/email/email.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/email/email.jst
index 0cf7fa9a5..0da025505 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/templates/email/email.jst
+++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/email/email.jst
@@ -100,7 +100,7 @@
     </div>
   </form>
   <div class="alert alert-success auth-results" id="auth_success" style="display: none;">
-  <strong>SMTP Authentication was successful</strong> Save your settings
+  <strong>SMTP Authentication was successful</strong> Submit your settings
   </div>
   <div class="alert alert-danger auth-results" id="auth_failed" style="display: none;">
   <strong>SMTP Authentication failed!</strong> Please update your settings before saving.
diff --git a/src/rockstor/storageadmin/views/email_client.py b/src/rockstor/storageadmin/views/email_client.py
index b16b0f45b..1ca2ef8c8 100644
--- a/src/rockstor/storageadmin/views/email_client.py
+++ b/src/rockstor/storageadmin/views/email_client.py
@@ -27,7 +27,7 @@
 from storageadmin.serializers import EmailClientSerializer
 from storageadmin.util import handle_exception
 import rest_framework_custom as rfc
-from system.osi import run_command, gethostname, replace_line_if_found
+from system.osi import run_command, gethostname, replace_line_if_found, getdnsdomain
 from shutil import move
 from tempfile import mkstemp
 from system.services import systemctl
@@ -157,11 +157,17 @@ def update_generic(sender, revert=False):
     :return:
     """
     hostname = gethostname()
+    dnsdomain = getdnsdomain()
     with open(GENERIC, "w") as fo:
         if not revert:
             fo.write("@{} {}\n".format(hostname, sender))
             fo.write("@{}.localdomain {}\n".format(hostname, sender))
-            # todo need an entry here to add @<hostname>.<domain>
+            # add @<hostname>.<domain>
+            fo.write("@{}.{} {}\n".format(hostname, dnsdomain, sender))
+            # Add fall through entries for when the sending agent uses localhost.
+            # This avoids some bounce scenarios when sender/from is root@localhost
+            fo.write("@localhost {}\n".format(sender))
+            fo.write("@localhost.localdomain {}\n".format(sender))
     # Set file to r-- --- --- (400) via stat constants.
     os.chmod(GENERIC, stat.S_IRUSR)
     run_command([POSTMAP, GENERIC])
diff --git a/src/rockstor/system/osi.py b/src/rockstor/system/osi.py
index c33da6440..52bce97ec 100644
--- a/src/rockstor/system/osi.py
+++ b/src/rockstor/system/osi.py
@@ -41,6 +41,7 @@
 CHATTR = "/usr/bin/chattr"
 DD = "/usr/bin/dd"
 DEFAULT_MNT_DIR = "/mnt2/"
+DNSDOMAIN = "/usr/bin/dnsdomainname"
 EXPORTFS = "/usr/sbin/exportfs"
 GRUBBY = "/usr/sbin/grubby"
 HDPARM = "/usr/sbin/hdparm"
@@ -880,6 +881,11 @@ def gethostname():
     return o[0]
 
 
+def getdnsdomain():
+    o, e, rc = run_command([DNSDOMAIN])
+    return o[0]
+
+
 def is_share_mounted(sname, mnt_prefix=DEFAULT_MNT_DIR):
     mnt_pt = mnt_prefix + sname
     return mount_status(mnt_pt, RETURN_BOOLEAN)

From 08863cbcab19caa525e1ba93e973e94409e37d09 Mon Sep 17 00:00:00 2001
From: Philip Guyton <philip@yewtreeapps.com>
Date: Thu, 6 Jan 2022 13:20:09 +0000
Subject: [PATCH 2/2] if no dnsdomain log accordingly and skip associated
 generic entry #2339

## Includes:
- Additional log entry on master.cf new config entry.
- New TODO: for reverting ipv4 enforcement in our postfix config.
- Comment typo.
---
 src/rockstor/storageadmin/views/email_client.py | 9 ++++++---
 src/rockstor/system/osi.py                      | 7 ++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/rockstor/storageadmin/views/email_client.py b/src/rockstor/storageadmin/views/email_client.py
index 1ca2ef8c8..fee26c4cb 100644
--- a/src/rockstor/storageadmin/views/email_client.py
+++ b/src/rockstor/storageadmin/views/email_client.py
@@ -81,6 +81,7 @@ def rockstor_postfix_config(fo, smtp_server, port, revert):
     fo.write("smtp_sasl_tls_security_options = noanonymous\n")
     fo.write("smtp_generic_maps = lmdb:/etc/postfix/generic\n")
     fo.write("{}\n".format(FOOTER))
+    logger.info("master.cf: adding new configuration")
 
 
 def update_master():
@@ -162,8 +163,9 @@ def update_generic(sender, revert=False):
         if not revert:
             fo.write("@{} {}\n".format(hostname, sender))
             fo.write("@{}.localdomain {}\n".format(hostname, sender))
-            # add @<hostname>.<domain>
-            fo.write("@{}.{} {}\n".format(hostname, dnsdomain, sender))
+            # add @<hostname>.<domain> if we can get a dnsdomain:
+            if dnsdomain != "":
+                fo.write("@{}.{} {}\n".format(hostname, dnsdomain, sender))
             # Add fall through entries for when the sending agent uses localhost.
             # This avoids some bounce scenarios when sender/from is root@localhost
             fo.write("@localhost {}\n".format(sender))
@@ -200,6 +202,7 @@ def update_postfix(smtp_server, port, revert=False):
                 # "inet_protocols = ipv4" as our NetworkManager is ipv4 only.
                 # Or if we find duplicates of our to-be-installed settings;
                 if len(line) > 0 and line[0] is not "#":
+                    # TODO: Revert ipv4 only once network config is ipv6 aware.
                     if re.match("inet_protocols = all", line) is not None:
                         tfo.write("inet_protocols = ipv4\n")
                         continue
@@ -305,7 +308,7 @@ def delete(self, request):
         update_postfix("", "", revert=True)
         disable_sysconfig_mail()
         update_master()  # Not needed as no revert but preserves consistency
-        # Restart ensures sevice is running, even if not running previously.
+        # Restart ensures service is running, even if not running previously.
         systemctl("postfix", "restart")
         EmailClient.objects.all().delete()
         return Response()
diff --git a/src/rockstor/system/osi.py b/src/rockstor/system/osi.py
index 52bce97ec..a5643dbfb 100644
--- a/src/rockstor/system/osi.py
+++ b/src/rockstor/system/osi.py
@@ -882,7 +882,12 @@ def gethostname():
 
 
 def getdnsdomain():
-    o, e, rc = run_command([DNSDOMAIN])
+    o, e, rc = run_command([DNSDOMAIN], throw=False, log=True)
+    if rc != 0:
+        logger.info(
+            "Check your network domain configuration. See above error for details."
+        )
+        return ""
     return o[0]