ConfigLMM 0.4.0 → 0.5.0

data/Plugins/Apps/Postfix/Postfix.lmm.rb

@@ -1,4 +1,6 @@
 
+require 'addressable/idna'
+
 module ConfigLMM
     module LMM
         class Postfix < Framework::Plugin
@@ -7,203 +9,279 @@ module ConfigLMM
             MASTER_FILE = 'master.cf'
             MAIN_FILE = 'main.cf'
             TRANSPORT_FILE = 'transport'
+            PASSWORD_FILE = 'sasl_passwd'
 
             def actionPostfixDeploy(id, target, activeState, context, options)
-                plugins[:Linux].ensurePackages([PACKAGE_NAME, 'CyrusSASL'], target['Location'])
-                plugins[:Linux].ensureServiceAutoStart(SERVICE_NAME, target['Location'])
-
-                activeState['Instance'] = target['Instance']
-                activeState['AlternativePort'] = target['AlternativePort']
-                deploySettings(target, target['Location'], options)
+                self.withConnection(target['Location'], target) do |connection|
+                    Linux.withConnection(connection) do |linuxConnection|
+                        linuxConnection.ensurePackages([PACKAGE_NAME, 'CyrusSASL'], options)
+                        linuxConnection.ensureServiceAutoStart(SERVICE_NAME, options)
 
-                plugins[:Linux].startService(SERVICE_NAME, target['Location'])
+                        deploySettings(target, linuxConnection, context, options)
+                        deployAccounts(target, linuxConnection, context, options)
 
-                activeState['Status'] = State::STATUS_DEPLOYED
+                        linuxConnection.restartService(SERVICE_NAME, options)
+                    end
+                end
             end
 
-            def deploySettings(target, location, options)
+            def deploySettings(target, linuxConnection, context, options)
                 postfixDirName = 'postfix'
                 postfixDirName = 'postfix-' + target['Instance'] if target['Instance']
                 postfixDir = '/etc/' + postfixDirName + '/'
-                if location && location != '@me'
-                    self.class.sshStart(location) do |ssh|
-                        if target['Instance']
-                            self.class.sshExec!(ssh, "postmulti -e init")
-                            self.class.sshExec!(ssh, "postmulti -I #{postfixDirName} -e create", true)
-                            self.class.sshExec!(ssh, "sed -i 's|^master_service_disable|#master_service_disable|' #{postfixDir + MAIN_FILE}")
-                        end
-                        self.class.sshExec!(ssh, "sed -i 's|^tlsmgr|#tlsmgr|' #{postfixDir + MASTER_FILE}")
-                        if target.key?('SMTP')
-                            if !target['SMTP'] || target['SMTP'] == 'unix'
-                                self.class.sshExec!(ssh, "sed -i 's|^smtp|#smtp|' #{postfixDir + MASTER_FILE}")
-                            end
-                        end
-                        updateRemoteFile(ssh, postfixDir + MASTER_FILE, options, true) do |fileLines|
-                            if target['AlternativePort']
-                                fileLines << "#{target['AlternativePort']}      inet  n       -       n       -       -       smtpd\n"
-                                fileLines << "tlsmgr    unix  -       -       n       1000?   1       tlsmgr\n"
-                            else
-                                if !target.key?('Submission') || (target.key?('Submission') && target['Submission'])
-                                    fileLines << "submissions     inet  n       -       n       -       -       smtpd\n"
-                                    fileLines << "    -o syslog_name=postfix/submissions\n"
-                                    fileLines << "    -o smtpd_tls_wrappermode=yes\n"
-                                    fileLines << "    -o smtpd_tls_security_level=encrypt\n"
-                                    fileLines << "    -o smtpd_sasl_auth_enable=yes\n"
-                                    fileLines << "    -o cleanup_service_name=header_cleanup\n"
-                                    fileLines << "header_cleanup unix n   -       -       -       0       cleanup\n"
-                                    fileLines << "    -o header_checks=regexp:/etc/postfix/header_cleanup\n"
-
-                                    self.class.sshExec!(ssh, "echo '/^Received:/ IGNORE' > /etc/postfix/header_cleanup")
-                                    self.class.sshExec!(ssh, "echo '/^User-Agent:/ IGNORE' >> /etc/postfix/header_cleanup")
-                                end
-                                fileLines << "tlsmgr    unix  -       -       n       1000?   1       tlsmgr\n"
-                                if target['SMTP'] == 'unix'
-                                    fileLines << "smtp      unix  -       -       n       -       -       smtp\n"
-                                end
-                            end
-                            fileLines
-                        end
 
-                        domain = target['Domain']
-                        domain = self.class.sshExec!(ssh, "hostname --fqdn").strip unless domain
-                        command = "sed -i 's|^myhostname = .*|myhostname = #{domain}|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^#myhostname = virtual.domain.tld|myhostname = #{domain}|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-
-                        # Fix config bug
-                        command = "sed -i 's|^alias_maps = :/etc/aliases|alias_maps = lmdb:/etc/aliases|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^canonical_maps = :/etc/postfix/canonical|canonical_maps = lmdb:/etc/postfix/canonical|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^relocated_maps = :/etc/postfix/relocated|relocated_maps = lmdb:/etc/postfix/relocated|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^sender_canonical_maps = :/etc/postfix/sender_canonical|sender_canonical_maps = lmdb:/etc/postfix/sender_canonical|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^transport_maps = :/etc/postfix/transport|transport_maps = lmdb:/etc/postfix/transport|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^smtpd_sender_restrictions = :/etc/postfix/access|smtpd_sender_restrictions = lmdb:/etc/postfix/access|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^virtual_alias_maps = :/etc/postfix/virtual|virtual_alias_maps = lmdb:/etc/postfix/virtual|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^relay_domains = $mydestination :/etc/postfix/relay|relay_domains = $mydestination lmdb:/etc/postfix/relay|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^relay_recipient_maps = :/etc/postfix/relay_recipients|relay_recipient_maps = lmdb:/etc/postfix/relay_recipients|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-                        command = "sed -i 's|^virtual_mailbox_maps =.*|virtual_mailbox_maps = lmdb:/etc/postfix/mailboxes|' #{postfixDir + MAIN_FILE}"
-                        self.class.sshExec!(ssh, command)
-
-
-                        if target['AlternativePort']
-                            Framework::LinuxApp.firewallAddPort("#{target['AlternativePort']}/tcp", ssh)
-                        else
-                            Framework::LinuxApp.firewallAddService('smtp', ssh)
-                        end
-                        Framework::LinuxApp.firewallAddService('smtps', ssh)
-
-                        ssh.scp.upload!(__dir__ + '/smtpd.conf', '/etc/sasl2/smtpd.conf')
-                        self.class.sshExec!(ssh, "touch /etc/sasldb2")
-                        self.class.sshExec!(ssh, "chown postfix:postfix /etc/sasldb2")
-                        self.class.sshExec!(ssh, "touch #{postfixDir}access")
-                        self.class.sshExec!(ssh, "postmap #{postfixDir}access")
-                        self.class.sshExec!(ssh, "touch #{postfixDir}sender_login")
-                        self.class.sshExec!(ssh, "postmap #{postfixDir}sender_login")
-
-                        certDir = Framework::LinuxApp.createCertificateOverSSH(ssh)
-                        target['Settings'] ||= []
-                        target['Settings']['smtpd_sender_login_maps'] = "lmdb:#{postfixDir}sender_login" unless target['Settings']['smtpd_sender_login_maps']
-                        target['Settings']['smtpd_sender_restrictions'] = "reject_sender_login_mismatch, lmdb:#{postfixDir}access" unless target['Settings']['smtpd_sender_restrictions']
-                        target['Settings']['smtp_tls_security_level'] = 'may' unless target['Settings']['smtp_tls_security_level']
-                        target['Settings']['smtpd_tls_mandatory_protocols'] = '>=TLSv1.2' unless target['Settings']['smtpd_tls_mandatory_protocols']
-                        target['Settings']['smtpd_tls_auth_only'] = 'yes' unless target['Settings']['smtpd_tls_auth_only']
-                        target['Settings']['smtpd_tls_security_level'] = 'may' unless target['Settings']['smtpd_tls_security_level']
-                        target['Settings']['smtpd_tls_cert_file'] = certDir + 'fullchain.pem' unless target['Settings']['smtpd_tls_cert_file']
-                        target['Settings']['smtpd_tls_key_file'] = certDir + 'privkey.pem' unless target['Settings']['smtpd_tls_key_file']
-                        target['Settings']['tls_preempt_cipherlist'] = 'yes' unless target['Settings']['tls_preempt_cipherlist']
-                        target['Settings']['tls_ssl_options'] = 'NO_RENEGOTIATION' unless target['Settings']['tls_ssl_options']
-
-
-                        target['Settings'].each do |name, value|
-                            command = "sed -i 's|^#{name} =.*|##{name} = #{value}|' #{postfixDir + MAIN_FILE}"
-                            self.class.sshExec!(ssh, command)
-                        end
-                        updateRemoteFile(ssh, postfixDir + MAIN_FILE, options) do |fileLines|
-                            target['Settings'].each do |name, value|
-                                value = 'yes' if value == true
-                                value = 'no' if value == false
-                                fileLines << "#{name} = #{value}\n"
-                            end
-                            fileLines
-                        end
+                if target['Instance']
+                    linuxConnection.exec("postmulti -e init", false, options)
+                    linuxConnection.exec("postmulti -I #{postfixDirName} -e create", true, options)
+                    linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^master_service_disable', '#master_service_disable', options)
+                end
 
-                        if target['ForwardDovecot']
-                            command = "sed -i 's|^#virtual_transport =.*|virtual_transport = lmtp:unix:/run/dovecot/lmtp|' #{postfixDir + MAIN_FILE}"
-                            self.class.sshExec!(ssh, command)
-                        end
+                linuxConnection.fileReplace("#{postfixDir + MASTER_FILE}", '^tlsmgr', '#tlsmgr', options)
+                if target.key?('SMTP')
+                    if !target['SMTP'] || target['SMTP'] == 'unix'
+                        linuxConnection.fileReplace("#{postfixDir + MASTER_FILE}", '^smtp', '#smtp', options)
+                    end
+                end
 
-                        if target['ForwardAll']
-                            command = "sed -i 's|^transport_maps =.*|transport_maps = lmdb:#{postfixDir}transport|' #{postfixDir + MAIN_FILE}"
-                            self.class.sshExec!(ssh, command)
-                            updateRemoteFile(ssh, postfixDir + TRANSPORT_FILE, options, true) do |fileLines|
-                                hostname, port = target['ForwardAll'].split(':')
-                                hostname = '[' + hostname + ']'
-                                line = '* smtp:' + hostname
-                                line += ':' + port if port
-                                fileLines << line + "\n"
-                            end
-                            self.class.sshExec!(ssh, "postmap #{postfixDir + TRANSPORT_FILE}")
+                linuxConnection.updateFile(postfixDir + MASTER_FILE, options, true) do |fileLines|
+                    if target['AlternativePort']
+                        fileLines << "#{target['AlternativePort']}      inet  n       -       n       -       -       smtpd\n"
+                        fileLines << "tlsmgr    unix  -       -       n       1000?   1       tlsmgr\n"
+                    else
+                        fileLines << "tlsmgr    unix  -       -       n       1000?   1       tlsmgr\n"
+                        if target['SMTP'] == 'unix'
+                            fileLines << "smtp      unix  -       -       n       -       -       smtp\n"
                         end
+                    end
+                    if target['Submission']
+                        fileLines << "submissions     inet  n       -       n       -       -       smtpd\n"
+                        fileLines << "    -o syslog_name=postfix/submissions\n"
+                        fileLines << "    -o smtpd_tls_wrappermode=yes\n"
+                        fileLines << "    -o smtpd_tls_security_level=encrypt\n"
+                        fileLines << "    -o smtpd_sasl_auth_enable=yes\n"
+                        fileLines << "    -o smtpd_client_restrictions=permit_sasl_authenticated,reject\n"
+                        fileLines << "    -o smtpd_sender_restrictions=reject_sender_login_mismatch,lmdb:#{postfixDir}access\n"
+                        fileLines << "    -o cleanup_service_name=header_cleanup\n"
+                        fileLines << "header_cleanup unix n   -       -       -       0       cleanup\n"
+                        fileLines << "    -o header_checks=regexp:/etc/postfix/header_cleanup\n"
 
-                        if target['Instance']
-                            self.class.sshExec!(ssh, "postmulti -i #{postfixDirName} -e enable")
-                            self.class.sshExec!(ssh, "postmulti -i #{postfixDirName} -p start", true)
-                        end
+                        linuxConnection.fileWrite("/etc/postfix/header_cleanup", '/^Received:/ IGNORE', options)
+                        linuxConnection.fileAppend("/etc/postfix/header_cleanup", '/^User-Agent:/ IGNORE', options)
                     end
+                    fileLines
+                end
+
+                domain = target['Domain']
+                domain = linuxConnection.exec("hostname --fqdn", false, { **options, 'dry' => false }).strip unless domain
+
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^myhostname = .*', "myhostname = #{domain}", options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^#myhostname = virtual.domain.tld', "myhostname = #{domain}", options)
+
+                # Fix config bug
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^alias_maps = :/etc/aliases', 'alias_maps = lmdb:/etc/aliases', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^canonical_maps = :/etc/postfix/canonical', 'canonical_maps = lmdb:/etc/postfix/canonical', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^relocated_maps = :/etc/postfix/relocated', 'relocated_maps = lmdb:/etc/postfix/relocated', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^sender_canonical_maps = :/etc/postfix/sender_canonical', 'sender_canonical_maps = lmdb:/etc/postfix/sender_canonical', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^transport_maps = :/etc/postfix/transport', 'transport_maps = lmdb:/etc/postfix/transport', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^smtpd_sender_restrictions = :/etc/postfix/access', 'smtpd_sender_restrictions = lmdb:/etc/postfix/access', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^virtual_alias_maps = :/etc/postfix/virtual', 'virtual_alias_maps = lmdb:/etc/postfix/virtual', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^relay_domains = $mydestination :/etc/postfix/relay', 'relay_domains = $mydestination lmdb:/etc/postfix/relay', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^relay_recipient_maps = :/etc/postfix/relay_recipients', 'relay_recipient_maps = lmdb:/etc/postfix/relay_recipients', options)
+                linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^virtual_mailbox_maps =.*', 'virtual_mailbox_maps = lmdb:/etc/postfix/mailboxes', options)
+
+                if target['AlternativePort']
+                    linuxConnection.firewallAddPort("#{target['AlternativePort']}/tcp", options)
                 else
-                    if target['AlternativePort']
-                        updateLocalFile(postfixDir + MASTER_FILE, options, true) do |fileLines|
-                            fileLines << "#{target['AlternativePort']}      inet  n       -       n       -       -       smtpd\n"
+                    linuxConnection.firewallAddService('smtp', options)
+                end
+                linuxConnection.firewallAddService('smtps', options)
+
+                linuxConnection.createDirs(options, '/etc/sasl2')
+                linuxConnection.upload(__dir__ + '/smtpd.conf', '/etc/sasl2/smtpd.conf', options)
+                linuxConnection.ensureFile('/etc/sasldb2', options)
+                linuxConnection.setUserGroup('/etc/sasldb2', 'postfix', 'postfix', options)
+                linuxConnection.ensureFile("#{postfixDir}access", options)
+                linuxConnection.exec("postmap lmdb:#{postfixDir}access", false, options)
+                linuxConnection.ensureFile("#{postfixDir}sender_login", options)
+                linuxConnection.exec("postmap lmdb:#{postfixDir}sender_login", false, options)
+                linuxConnection.ensureFile("/etc/postfix/#{PASSWORD_FILE}", options)
+
+                if !target['Aliases'].to_h.empty?
+                    if !linuxConnection.filePresent?('/etc/aliases', options)
+                        linuxConnection.exec('cp /etc/postfix/aliases /etc/', false, options)
+                        linuxConnection.rm("/etc/postfix/aliases", false, options[:dry])
+                    end
+                    target['Aliases'].each do |name, destination|
+                        linuxConnection.fileReplace('/etc/aliases', '^'+name + ':', '#' + name + ':', options)
+                    end
+                    linuxConnection.updateFile('/etc/aliases', options, true) do |fileLines|
+                        target['Aliases'].each do |name, destination|
+                            fileLines << "#{(name.to_s + ':').ljust(16)}#{self.class.punnycodeEMail(destination)}\n"
+                        end
+                        fileLines
+                    end
+                    linuxConnection.exec('postalias lmdb:/etc/aliases', false, options)
+                end
+
+                certDir = linuxConnection.createWildecardCertificate(options)
+                target['Settings'] ||= {}
+                target['Settings']['alias_maps'] = 'lmdb:/etc/aliases'
+                target['Settings']['default_database_type'] = 'lmdb'
+                target['Settings']['smtp_tls_security_level'] = 'may' unless target['Settings']['smtp_tls_security_level']
+                target['Settings']['smtp_sasl_password_maps'] = 'lmdb:/etc/postfix/' + PASSWORD_FILE
+                target['Settings']['smtp_sasl_security_options'] = 'noanonymous'
+                target['Settings']['smtpd_sender_login_maps'] = "lmdb:#{postfixDir}sender_login" unless target['Settings']['smtpd_sender_login_maps']
+                target['Settings']['smtpd_sender_restrictions'] = "lmdb:#{postfixDir}access" unless target['Settings']['smtpd_sender_restrictions']
+                target['Settings']['smtpd_tls_mandatory_protocols'] = '>=TLSv1.2' unless target['Settings']['smtpd_tls_mandatory_protocols']
+                target['Settings']['smtpd_tls_auth_only'] = 'yes' unless target['Settings']['smtpd_tls_auth_only']
+                target['Settings']['smtpd_tls_security_level'] = 'may' unless target['Settings']['smtpd_tls_security_level']
+                target['Settings']['smtpd_tls_cert_file'] = certDir + 'fullchain.pem' unless target['Settings']['smtpd_tls_cert_file']
+                target['Settings']['smtpd_tls_key_file'] = certDir + 'privkey.pem' unless target['Settings']['smtpd_tls_key_file']
+                target['Settings']['tls_preempt_cipherlist'] = 'yes' unless target['Settings']['tls_preempt_cipherlist']
+                target['Settings']['tls_ssl_options'] = 'NO_RENEGOTIATION' unless target['Settings']['tls_ssl_options']
+
+                if target['Relay']
+                    port = target['Relay']['Port'].to_s
+                    port = '587' if port.empty?
+                    target['Settings']['relayhost'] = "#{target['Relay']['Host']}:#{port}" unless target['Settings']['relayhost']
+                    target['Settings']['smtp_sasl_auth_enable'] = 'yes'
+                    if port == '465'
+                        target['Settings']['smtp_tls_security_level'] = 'encrypt'
+                        target['Settings']['smtp_tls_wrappermode'] = 'yes'
+                    end
+                    if target['Relay']['SecretId']
+                        username = target['Relay']['Username'].to_s
+                        password = context.secrets.load(target['Relay']['SecretId'], username.upcase + '_PASSWORD')
+                        linuxConnection.updateFile('/etc/postfix/' + PASSWORD_FILE, options) do |fileLines|
+                            fileLines << "#{target['Settings']['relayhost']}   #{username}:#{password}\n"
                         end
                     end
-                    if target['Settings']
-                        target['Settings'].each do |name, value|
-                            `sed -i 's|^#{name} =.*|#{name} = #{value}|' #{postfixDir + MAIN_FILE}`
+                end
+                linuxConnection.exec("postmap lmdb:/etc/postfix/#{PASSWORD_FILE}", false, options)
+
+                target['Settings'].each do |name, value|
+                    linuxConnection.fileReplace(postfixDir + MAIN_FILE, "^#{name}[[:blank:]]*=[[:blank:]]*", "##{name} = ", options)
+                end
+                linuxConnection.updateFile(postfixDir + MAIN_FILE, options) do |fileLines|
+                    target['Settings'].each do |name, value|
+                        value = 'yes' if value == true
+                        value = 'no' if value == false
+                        fileLines << "#{name} = #{value}\n"
+                    end
+                    fileLines
+                end
+
+                if target['ForwardDovecot']
+                    linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^#virtual_transport =.*', 'virtual_transport = lmtp:unix:/run/dovecot/lmtp', options)
+                end
+
+                if target['ForwardAll']
+                    linuxConnection.fileReplace(postfixDir + MAIN_FILE, '^transport_maps =.*', "transport_maps = lmdb:#{postfixDir}transport", options)
+
+                    linuxConnection.updateFile(postfixDir + TRANSPORT_FILE, options, true) do |fileLines|
+                        hostname, port = target['ForwardAll'].split(':')
+                        hostname = '[' + hostname + ']'
+                        line = '* smtp:' + hostname
+                        line += ':' + port if port
+                        fileLines << line + "\n"
+                    end
+                    linuxConnection.exec("postmap lmdb:#{postfixDir + TRANSPORT_FILE}", false, options)
+                end
+
+                if target['Instance']
+                    linuxConnection.exec("postmulti -i #{postfixDirName} -e enable", false, options)
+                    linuxConnection.exec("postmulti -i #{postfixDirName} -p start", true, options)
+                end
+            end
+
+            def deployAccounts(target, linuxConnection, context, options)
+                if target['Accounts']
+                    postfixDirName = 'postfix'
+                    postfixDirName = 'postfix-' + target['Instance'] if target['Instance']
+                    postfixDir = '/etc/' + postfixDirName + '/'
+
+                    linuxConnection.ensureFile("#{postfixDir}sender_login", { **options, 'dry' => false })
+                    linuxConnection.download("#{postfixDir}sender_login", options['output'], { **options, 'dry' => false })
+                    senderLoginFile = options['output'] + '/sender_login'
+                    accountData = File.read(senderLoginFile)
+                    addAccounts = []
+                    accountPasswords = linuxConnection.exec('sasldblistusers2', false, { **options, 'dry' => false })
+                    target['Accounts'].each do |account, emails|
+                        accountLine = "#{account} #{account}"
+                        if !accountData.include?(accountLine)
+                            addAccounts << accountLine
+                        end
+                        if !accountPasswords.include?(account + ':')
+                            passwordName = account.upcase + '_PASSWORD'
+                            password = context.secrets.load(target['SecretId'], passwordName)
+                            if password.nil?
+                                password = SecureRandom.urlsafe_base64(20)
+                                context.secrets.store(target['SecretId'], passwordName, password) unless options['dry']
+                            end
+                            linuxConnection.exec("echo '#{password}' | saslpasswd2 -p #{account}", false, { **options, hide: true })
+                        end
+                        if emails.is_a?(String)
+                            accountLine = "#{emails} #{account}"
+                            if !accountData.include?(accountLine)
+                                addAccounts << accountLine
+                            end
+                        elsif emails.is_a?(Array)
+                            emails.each do |email|
+                                accountLine = "#{email} #{account}"
+                                if !accountData.include?(accountLine)
+                                    addAccounts << accountLine
+                                end
+                            end
                         end
                     end
-                    if target['ForwardAll']
-                        updateLocalFile(postfixDir + TRANSPORT_FILE, options, true) do |fileLines|
-                            fileLines << '* smtp:[' + target['ForwardAll'] + "]\n"
+                    if !addAccounts.empty?
+                        addAccounts.each do |accountLine|
+                            accountData << "\n" + accountLine
                         end
-                        `postmap #{postfixDir + TRANSPORT_FILE}`
+                        accountData << "\n"
+                        File.write(senderLoginFile, accountData)
+                        linuxConnection.upload(senderLoginFile, "#{postfixDir}sender_login", options)
+                        linuxConnection.exec("postmap lmdb:#{postfixDir}sender_login", false, options)
                     end
                 end
             end
 
             def cleanup(configs, state, context, options)
-                cleanupType(:Postfix, configs, state, context, options) do |item, id, state, context, options, ssh|
-                    instances = self.class.exec('postmulti -l | wc -l', ssh, true).strip.to_i
-                    if instances <= 1
-                        Framework::LinuxApp.stopService(SERVICE_NAME, ssh, options[:dry])
-                        Framework::LinuxApp.firewallRemoveService('smtps', ssh, options[:dry])
-                        if item['AlternativePort']
-                            Framework::LinuxApp.firewallRemovePort("#{item['AlternativePort']}/tcp", ssh, options[:dry])
-                        else
-                            Framework::LinuxApp.firewallRemoveService('smtp', ssh, options[:dry])
-                        end
-                        Framework::LinuxApp.removePackage(PACKAGE_NAME, ssh, options[:dry])
+                cleanupType(:Postfix, configs, state, context, options) do |item, id, state, context, options, connection|
+                    Linux.withConnection(connection) do |linuxConnection|
+                        instances = linuxConnection.exec('postmulti -l | wc -l', true).strip.to_i
+                        if instances <= 1
+                            linuxConnection.stopService(SERVICE_NAME, options)
+                            linuxConnection.firewallRemoveService('smtps', options)
+                            if item['AlternativePort']
+                                linuxConnection.firewallRemovePort("#{item['AlternativePort']}/tcp", options)
+                            else
+                                linuxConnection.firewallRemoveService('smtp', options)
+                            end
+                            linuxConnection.removePackage(PACKAGE_NAME, options)
 
-                        state.item(id)['Status'] = State::STATUS_DELETED unless options[:dry]
+                            state.item(id)['Status'] = State::STATUS_DELETED unless options[:dry]
 
-                        if options[:destroy]
-                            rm('/etc/postfix', options[:dry], ssh)
+                            if options[:destroy]
+                                linuxConnection.rm('/etc/postfix', options[:dry])
 
-                            state.item(id)['Status'] = State::STATUS_DESTROYED unless options[:dry]
+                                state.item(id)['Status'] = State::STATUS_DESTROYED unless options[:dry]
+                            end
+                        else
+                            prompt.say('Postfix multiple instance cleanup not implemented!', :color => :red)
                         end
-                    else
-                        prompt.say('Postfix multiple instance cleanup not implemented!', :color => :red)
                     end
                 end
             end
+
+            def self.punnycodeEMail(email)
+                emailLocal, emailDomain = email.to_s.split('@')
+                if emailLocal && emailDomain && emailLocal.ascii_only? && !emailDomain.ascii_only?
+                    email = emailLocal + '@' + Addressable::IDNA.to_ascii(emailDomain)
+                end
+                email
+            end
+
         end
 
     end

data/Plugins/Apps/PostgreSQL/Connection.rb

@@ -0,0 +1,97 @@
+
+module ConfigLMM
+    module LMM
+        class PostgreSQLConnection
+
+            attr_reader :connection
+
+            def initialize(connection, settings)
+                @connection = connection
+                @settings = settings
+                @pgsqlDir = nil
+            end
+
+            def exec(sql, db, allowFailure = false, queryOptions = [], options = {})
+                db = 'postgres' unless db
+                cmd = "psql #{queryOptions.join(' ')} --dbname=#{db} --command=#{sql.shellescape}"
+                if options[:hide]
+                    cmd = ' ' + cmd
+                end
+                connection.exec(cmd, allowFailure, options)
+            end
+
+            def createUser(user, password = nil, options = {})
+                connection.exec("createuser #{user.shellescape}", true)
+                if !password.nil?
+                    sql = " ALTER USER #{user} WITH PASSWORD '#{LinuxShell.escapeSingleQuotes(password)}'"
+                    exec(sql, nil, false, [], { **options, hide: true })
+                end
+            end
+
+            def createDB(db, owner = nil, options = {})
+                ownerSQL = owner ? "--owner=#{owner.shellescape}" : ''
+                connection.exec("createdb --locale=C --template=template0 #{ownerSQL} #{db.shellescape}", true, options)
+            end
+
+            def createUserAndDB(user, password, options = {})
+                createUser(user, password, options)
+                createDB(user, user, options)
+            end
+
+            def dropUserAndDB(user, options = {})
+                connection.exec("dropdb #{user.shellescape}", true, options)
+                connection.exec("dropuser #{user.shellescape}", true, options)
+            end
+
+            def grantReplication(user, options = {})
+                 exec("ALTER USER #{user} REPLICATION", nil, false, [], options)
+                 exec("GRANT pg_read_all_data TO #{user}", nil, false, [], options)
+            end
+
+            def createExtensions(db, extensions, options)
+                extensions.each do |extension|
+                    exec("CREATE EXTENSION #{extension}", db, true, [], options)
+                end
+            end
+
+            def importSQL(owner, db, sqlFile, options = {})
+                cmd = "psql #{db} < #{sqlFile}"
+                output = connection.exec(cmd, false, options)
+                raise output if output.include?('ERROR:') && !output.include?('already exists')
+            end
+
+            def updateOwner(db, owner, options = {})
+                sql = "SELECT tablename FROM pg_tables WHERE NOT schemaname IN ('pg_catalog', 'information_schema')"
+                tables = self.exec(sql, db, false, ['--csv', '--tuples-only']).strip.lines
+                tables.each do |table|
+                    self.exec("ALTER TABLE public.#{table} OWNER TO #{owner};", db, false, [], options)
+                end
+
+                sql = "SELECT sequence_name FROM information_schema.sequences WHERE NOT sequence_schema IN ('pg_catalog', 'information_schema')"
+                sequences = self.exec(sql, db, false, ['--csv', '--tuples-only']).strip.lines
+                sequences.each do |sequence|
+                    self.exec("ALTER SEQUENCE public.#{sequence} OWNER TO #{owner};", db, false, [], options)
+                end
+
+                sql = "SELECT table_name FROM information_schema.views WHERE NOT table_schema IN ('pg_catalog', 'information_schema')"
+                views = self.exec(sql, db, false, ['--csv', '--tuples-only']).strip.lines
+                views.each do |view|
+                    self.exec("ALTER VIEW public.#{view} OWNER TO #{owner};", db, false, [], options)
+                end
+            end
+
+            def pgsqlDir
+                return @pgsqlDir if @pgsqlDir
+                distroID = connection.distroID
+                if distroID == 'opensuse-leap'
+                    @pgsqlDir = '/var/lib/pgsql/'
+                elsif distroID == 'arch'
+                    @pgsqlDir = '/var/lib/postgres/'
+                else
+                    raise Framework::PluginProcessError.new("Unsupported Linux Distro: #{distroID}!")
+                end
+                @pgsqlDir
+            end
+        end
+    end
+end