Defer mesh gateway WAN federation to the gateway change

hieradata/country/au/region/drw1/infra/storage/consul.yaml

@@ -2,6 +2,6 @@
 profiles::consul::server::bootstrap_count: 3
 profiles::consul::server::raft_multiplier: 10
 profiles::consul::server::primary_datacenter: 'au-syd1'
-profiles::consul::server::join_remote_regions: true
+profiles::consul::server::join_remote_regions: false
 profiles::consul::server::remote_regions:
   - syd1

hieradata/country/au/region/syd1/infra/storage/consul.yaml

@@ -2,6 +2,6 @@
 profiles::consul::server::bootstrap_count: 3
 profiles::consul::server::raft_multiplier: 10
 profiles::consul::server::primary_datacenter: 'au-syd1'
-profiles::consul::server::join_remote_regions: true
+profiles::consul::server::join_remote_regions: false
 profiles::consul::server::remote_regions:
   - drw1

hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml

@@ -1,2 +0,0 @@
----
-profiles::postfix::gateway::myhostname: 'mta2.edge.unkin.net'

hieradata/nodes/ausyd2nxvm2130.main.unkin.net.yaml

@@ -1,2 +0,0 @@
----
-profiles::postfix::gateway::myhostname: 'mta1.edge.unkin.net'

hieradata/os/AlmaLinux/all_releases.yaml

@@ -147,16 +147,6 @@ profiles::yum::global::repos:
     baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/postgresql/common/redhat/rhel-%{facts.os.release.major}-%{facts.os.architecture}
     gpgkey: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/postgresql/keys/PGDG-RPM-GPG-KEY-RHEL
 
-  # Rspamd repositories
-  rspamd:
-    ensure: absent
-    name: rspamd
-    descr: rspamd repository
-    target: /etc/yum.repos.d/rspamd.repo
-    baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/rspamd/rpm-stable/centos-%{facts.os.release.major}/%{facts.os.architecture}
-    gpgkey: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/rspamd/rpm/rspamd.asc
-    mirrorlist: absent
-
   # Ceph repositories
   ceph:
     ensure: absent

hieradata/roles/infra/mail/gateway.yaml

@@ -1,94 +1,26 @@
 ---
-lookup_options:
-  ssh::server::options:
-    merge:
-      strategy: deep
 
-hiera_include:
-  - redis
-
-# no consul datacentre at the edge, so nothing to register or scrape via consul
-profiles::consul::client::enable: false
-exporters::node_exporter::enable: false
-
-# ssh only from the vpc and the lab over the vpn route
-ssh::server::options:
-  AllowUsers: '*@10.0.0.0/8 *@172.16.0.0/12 *@192.168.0.0/16 *@198.18.0.0/16'
-
-# local caching resolver for postfix and rspamd, forwarding to the lab resolver over the vpn route
-dnsmasq::no_resolv: true
-dnsmasq::cache_size: 10000
-dnsmasq::servers:
-  - 198.18.200.7
-profiles::dns::base::nameservers:
-  - 127.0.0.1
-
-profiles::yum::global::repos:
-  rspamd:
-    ensure: present
-
-# local redis for rspamd bayes and history; bayes tokens carry a ttl so volatile-ttl can evict
-redis::maxmemory: '128mb'
-redis::maxmemory_policy: 'volatile-ttl'
-
-# local rspamd, deterministic checks only; module defaults cover spf/dkim/dmarc/arc/rbl/phishing/mime_types/fuzzy_check
-profiles::rspamd::edge::rules:
-  edge.cf: 'https://git.unkin.net/unkin/rspamd-rules/raw/branch/main/edge.cf'
-profiles::rspamd::edge::local_d:
-  worker-proxy.inc: |
-    bind_socket = "127.0.0.1:11332";
-    milter = yes;
-    timeout = 120s;
-    count = 1;
-    upstream "local" {
-      default = yes;
-      self_scan = yes;
-    }
-  worker-normal.inc: |
-    enabled = false;
-  redis.conf: |
-    servers = "127.0.0.1:6379";
-  actions.conf: |
-    reject = 13;
-    add_header = 6;
-    rewrite_subject = null;
-    greylist = null;
-  greylist.conf: |
-    enabled = false;
-  gpt.conf: |
-    enabled = false;
-  classifier-bayes.conf: |
-    backend = "redis";
-    expire = 8640000;
-    autolearn {
-      spam_threshold = 6.0;
-      ham_threshold = -0.5;
-      check_balance = true;
-    }
-  spamassassin.conf: |
-    ruleset = "/etc/rspamd/rules/*.cf";
-    alpha = 0.1;
-  settings.conf: |
-    smarthost_outbound {
-      priority = high;
-      ip = "103.216.191.185";
-      want_spam = yes;
-    }
+# additional altnames
+profiles::pki::vault::alt_names:
+  - in-mta.main.unkin.net
 
 # base postfix configuration (passed to postfix class)
 postfix::relayhost: 'direct'
-postfix::myorigin: 'unkin.net'
+postfix::myorigin: 'main.unkin.net'
 postfix::mydestination: 'blank'
-postfix::mynetworks: '127.0.0.0/8 [::1]/128 103.216.191.185/32'
+postfix::mynetworks: '127.0.0.0/8 [::1]/128'
 postfix::mta: true
 postfix::manage_aliases: true
 
+# profile parameters for customization
+profiles::postfix::gateway::myhostname: 'in-mta.main.unkin.net'
+
 # postfix map content (templates)
 profiles::postfix::gateway::relay_recipients_maps:
-  '@unkin.net': 'OK'
+  '@main.unkin.net': 'OK'
 
 profiles::postfix::gateway::relay_domains_maps:
-  'unkin.net': 'OK'
+  'main.unkin.net': 'OK'
 
 profiles::postfix::gateway::postscreen_access_maps:
   '127.0.0.1/32': 'permit'
@@ -100,24 +32,21 @@ profiles::postfix::gateway::helo_access_maps:
   'unknown': 'REJECT'
   'localhost': 'REJECT You are not localhost'
 
-profiles::postfix::gateway::smtp_tls_policy_maps:
-  '[mail-in.main.unkin.net]:25': 'secure match=hostname'
-
 # postfix transports
 postfix::transports:
-  'unkin.net':
+  'main.unkin.net':
     ensure: present
     destination: 'relay'
-    nexthop: '[mail-in.main.unkin.net]:25'
+    nexthop: 'mail-in.main.unkin.net:25'
 
 # postfix virtuals
 postfix::virtuals:
   'root':
     ensure: present
-    destination: 'ben@unkin.net'
+    destination: 'ben@main.unkin.net'
   'postmaster':
     ensure: present
-    destination: 'ben@unkin.net'
+    destination: 'ben@main.unkin.net'
   'abuse':
     ensure: present
-    destination: 'ben@unkin.net'
+    destination: 'ben@main.unkin.net'

hieradata/roles/infra/storage/consul.yaml

@@ -13,9 +13,19 @@ profiles::consul::server::addresses:
   grpc_tls: "%{::networking.ip}"
 profiles::consul::server::ports:
   grpc: 8502
+  grpc_tls: 8503
   dns: 8600
   http: 8500
   https: -1
+profiles::consul::server::tls:
+  defaults:
+    ca_file: /etc/pki/ca-trust/source/anchors/vaultcaroot.pem
+    cert_file: /etc/pki/tls/vault/full_chain.crt
+    key_file: /etc/pki/tls/vault/private.key
+  internal_rpc:
+    verify_incoming: false
+    verify_outgoing: false
+    verify_server_hostname: false
 profiles::consul::server::acl:
   enabled: true
   default_policy: 'deny'

site/profiles/manifests/consul/client.pp

@@ -12,94 +12,91 @@ class profiles::consul::client (
   Array[Hash]          $node_rules         = [],
   Hash                 $ports              = {},
   Stdlib::IP::Address  $host_addr          = $facts['networking']['ip'],
-  Boolean              $enable             = true,
 ) {
 
-  if $enable {
-    if $facts['enc_role'] != $members_role {
+  if $facts['enc_role'] != $members_role {
 
-      # set a datacentre/cluster name
-      $consul_cluster = "${::facts['country']}-${::facts['region']}"
+    # set a datacentre/cluster name
+    $consul_cluster = "${::facts['country']}-${::facts['region']}"
 
-      # if lookup is enabled, find all the hosts in the specified role and create the servers_array
-      if $members_lookup {
+    # if lookup is enabled, find all the hosts in the specified role and create the servers_array
+    if $members_lookup {
 
-        # check that the role is also set
-        unless !($members_role == undef) {
-          fail("members_role must be provided for ${title} when members_lookup is True")
-        }
-
-        # if it is, find hosts, sort them so they dont cause changes every run
-        $servers_array = sort(puppetdb_query(
-          "facts[certname] {
-            name = 'enc_role' and value = '${members_role}' and
-            certname in facts[certname] { name = 'region' and value = '${::facts['region']}' }
-          }"
-        ).map |$fact| { $fact['certname'] })
-
-      # else use provided array from params
-      }else{
-        $servers_array = $consul_servers
+      # check that the role is also set
+      unless !($members_role == undef) {
+        fail("members_role must be provided for ${title} when members_lookup is True")
       }
 
-      # deploy the consul agent
-      class { 'consul':
-        config_hash => {
-          'data_dir'             => $data_dir,
-          'datacenter'           => $consul_cluster,
-          'log_level'            => 'INFO',
-          'node_name'            => $facts['networking']['fqdn'],
-          'retry_join'           => $servers_array,
-          'bind_addr'            => $host_addr,
-          'advertise_addr'       => $host_addr,
-          'enable_script_checks' => true,
-          'ports'                => $ports,
-          'acl'                  => {
-            tokens => {
-              default => fqdn_uuid("${facts['networking']['fqdn']}-${secret_id_salt}")
-            }
+      # if it is, find hosts, sort them so they dont cause changes every run
+      $servers_array = sort(puppetdb_query(
+        "facts[certname] {
+          name = 'enc_role' and value = '${members_role}' and
+          certname in facts[certname] { name = 'region' and value = '${::facts['region']}' }
+        }"
+      ).map |$fact| { $fact['certname'] })
+
+    # else use provided array from params
+    }else{
+      $servers_array = $consul_servers
+    }
+
+    # deploy the consul agent
+    class { 'consul':
+      config_hash => {
+        'data_dir'             => $data_dir,
+        'datacenter'           => $consul_cluster,
+        'log_level'            => 'INFO',
+        'node_name'            => $facts['networking']['fqdn'],
+        'retry_join'           => $servers_array,
+        'bind_addr'            => $host_addr,
+        'advertise_addr'       => $host_addr,
+        'enable_script_checks' => true,
+        'ports'                => $ports,
+        'acl'                  => {
+          tokens => {
+            default => fqdn_uuid("${facts['networking']['fqdn']}-${secret_id_salt}")
           }
-        },
-      }
+        }
+      },
     }
+  }
 
-    # Create ACL policy that allows nodes to update themselves and read others
-    consul_policy { $facts['networking']['hostname']:
-      description   => "${facts['networking']['fqdn']} puppet-generated-policy",
-      rules         => $node_rules,
-      acl_api_token => $consul_api_token,
-      hostname      => $consul_hostname,
-      protocol      => $consul_protocol,
-      port          => $consul_port,
-    }
+  # Create ACL policy that allows nodes to update themselves and read others
+  consul_policy { $facts['networking']['hostname']:
+    description   => "${facts['networking']['fqdn']} puppet-generated-policy",
+    rules         => $node_rules,
+    acl_api_token => $consul_api_token,
+    hostname      => $consul_hostname,
+    protocol      => $consul_protocol,
+    port          => $consul_port,
+  }
 
-    consul_token { $facts['networking']['hostname']:
-      accessor_id      => fqdn_uuid($facts['networking']['fqdn']),
-      description      => "${facts['networking']['fqdn']} puppet-generated-token",
-      policies_by_name => [$facts['networking']['hostname']],
-      acl_api_token    => $consul_api_token,
-      secret_id        => fqdn_uuid("${facts['networking']['fqdn']}-${secret_id_salt}"),
-      hostname         => $consul_hostname,
-      protocol         => $consul_protocol,
-      port             => $consul_port,
+  consul_token { $facts['networking']['hostname']:
+    accessor_id      => fqdn_uuid($facts['networking']['fqdn']),
+    description      => "${facts['networking']['fqdn']} puppet-generated-token",
+    policies_by_name => [$facts['networking']['hostname']],
+    acl_api_token    => $consul_api_token,
+    secret_id        => fqdn_uuid("${facts['networking']['fqdn']}-${secret_id_salt}"),
+    hostname         => $consul_hostname,
+    protocol         => $consul_protocol,
+    port             => $consul_port,
 
-    }
+  }
 
-    # ensure the consul token is saved for the root user
-    file {'/root/.config/consul_node_token':
-      ensure  => file,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0600',
-      content => Sensitive(fqdn_uuid("${facts['networking']['fqdn']}-${secret_id_salt}")),
-      require => File['/root/.config'],
-    }
+  # ensure the consul token is saved for the root user
+  file {'/root/.config/consul_node_token':
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0600',
+    content => Sensitive(fqdn_uuid("${facts['networking']['fqdn']}-${secret_id_salt}")),
+    require => File['/root/.config'],
+  }
 
-    # cleanup /usr/local/bin/consul which was created by url install method
-    if $facts['os']['family'] == 'RedHat' {
-      file {'/usr/local/bin/consul':
-        ensure => absent,
-      }
+  # cleanup /usr/local/bin/consul which was created by url install method
+  if $facts['os']['family'] == 'RedHat' {
+    file {'/usr/local/bin/consul':
+      ensure => absent,
     }
   }
 }

site/profiles/manifests/consul/server.pp

@@ -11,6 +11,7 @@ class profiles::consul::server (
   Hash      $acl = {},
   Hash      $ports = {},
   Hash      $addresses = {},
+  Hash      $tls = {},
   Boolean   $members_lookup     = false,
   String    $members_role       = undef,
   Array     $consul_servers     = [],
@@ -112,6 +113,8 @@ class profiles::consul::server (
           'acl'                  => $acl,
           'ports'                => $ports,
           'addresses'            => $addresses,
+          'tls'                  => $tls,
+          'auto_reload_config'   => true,
           'disable_remote_exec'  => $disable_remote_exec,
           'disable_update_check' => $disable_update_check,
           'domain'               => $domain,

site/profiles/manifests/postfix/gateway.pp

@@ -3,7 +3,8 @@ class profiles::postfix::gateway (
   Stdlib::Absolutepath $tls_key_file  = '/etc/pki/tls/vault/certificate.pem',
   Stdlib::Absolutepath $tls_ca_file   = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
   String $myhostname                  = $trusted['certname'],
-  String $message_size_limit          = '52428800',
+  String $message_size_limit          = '133169152',
+  String $mailbox_size_limit          = '133169152',
   String $local_transport             = 'error:No local mail delivery',
   Boolean $enable_postscreen          = true,
   Array[String] $alias_maps           = [
@@ -11,12 +12,12 @@ class profiles::postfix::gateway (
     'hash:/etc/postfix/aliases',
   ],
   Array[String] $postscreen_dnsbl_sites = [
-    'zen.spamhaus.org=127.0.0.[2..11]*3',
-    'b.barracudacentral.org=127.0.0.2*2',
-    'bl.mailspike.net=127.0.0.2*1',
-    'psbl.surriel.com=127.0.0.2*1',
-    'bl.spameatingmonkey.net=127.0.0.2*2',
-    'bl.spamcop.net=127.0.0.2',
+    'zen.spamhaus.org*3',
+    'b.barracudacentral.org=127.0.0.[2..11]*2',
+    'bl.spameatingmonkey.net*2',
+    'bl.spamcop.net',
+    'dnsbl.sorbs.net',
+    'swl.spamhaus.org*-4',
     'list.dnswl.org=127.[0..255].[0..255].0*-2',
     'list.dnswl.org=127.[0..255].[0..255].1*-4',
     'list.dnswl.org=127.[0..255].[0..255].[2..3]*-6',
@@ -24,6 +25,7 @@ class profiles::postfix::gateway (
   Array[String] $smtpd_client_restrictions = [
     'permit_sasl_authenticated',
     'permit_mynetworks',
+    'reject_rbl_client zen.spamhaus.org',
   ],
   Array[String] $smtpd_sender_restrictions = [
     'permit_sasl_authenticated',
@@ -45,7 +47,6 @@ class profiles::postfix::gateway (
     'permit_mynetworks',
     'reject_unauth_destination',
   ],
-  String $smtpd_milters = 'inet:127.0.0.1:11332',
   Hash[String, String] $smtp_tls_policy_maps = {},
   Hash[String, String] $sender_canonical_maps = {},
   Hash[String, String] $sender_access_maps = {},
@@ -72,7 +73,7 @@ class profiles::postfix::gateway (
         'value' => 'permit_mynetworks, cidr:/etc/postfix/postscreen_access'
       },
       'postscreen_blacklist_action' => {
-        'value' => 'drop'
+        'value' => 'enforce'
       },
       'postscreen_cache_map' => {
         'value' => 'btree:$data_directory/postscreen_cache'
@@ -86,10 +87,6 @@ class profiles::postfix::gateway (
       'postscreen_dnsbl_threshold' => {
         'value' => '2'
       },
-      # el9 ships postfix 3.5, before the allowlist rename
-      'postscreen_dnsbl_whitelist_threshold' => {
-        'value' => '-1'
-      },
       'postscreen_greet_action' => {
         'value' => 'enforce'
       },
@@ -111,6 +108,9 @@ class profiles::postfix::gateway (
     'alias_database' => {
       'value' => $alias_maps_string
     },
+    'default_destination_recipient_limit' => {
+      'value' => '1'
+    },
     'disable_vrfy_command' => {
       'value' => 'yes'
     },
@@ -129,6 +129,9 @@ class profiles::postfix::gateway (
     'local_transport' => {
       'value' => $local_transport
     },
+    'mailbox_size_limit' => {
+      'value' => $mailbox_size_limit
+    },
     'message_size_limit' => {
       'value' => $message_size_limit
     },
@@ -138,20 +141,8 @@ class profiles::postfix::gateway (
     'non_smtpd_milters' => {
       'ensure' => 'blank'
     },
-    'milter_connect_timeout' => {
-      'value' => '10s'
-    },
-    'milter_content_timeout' => {
-      'value' => '60s'
-    },
-    'milter_default_action' => {
-      'value' => 'tempfail'
-    },
-    'milter_mail_macros' => {
-      'value' => 'i {mail_addr} {client_addr} {client_name} {auth_authen}'
-    },
-    'milter_protocol' => {
-      'value' => '6'
+    'qmqpd_authorized_clients' => {
+      'value' => '127.0.0.1 [::1]'
     },
     'recipient_canonical_maps' => {
       'value' => 'hash:/etc/postfix/recipient_canonical'
@@ -186,7 +177,7 @@ class profiles::postfix::gateway (
     'smtp_tls_session_cache_database' => {
       'value' => 'btree:/var/lib/postfix/smtp_tls_session_cache'
     },
-    'smtp_send_xforward_command' => {
+    'smtp_use_tls' => {
       'value' => 'yes'
     },
     'smtpd_banner' => {
@@ -220,7 +211,7 @@ class profiles::postfix::gateway (
       'value' => 'check_helo_access hash:/etc/postfix/helo_access, reject_invalid_hostname'
     },
     'smtpd_milters' => {
-      'value' => $smtpd_milters
+      'value' => 'inet:127.0.0.1:33333'
     },
     'smtpd_recipient_restrictions' => {
       'value' => join($smtpd_recipient_restrictions, ', ')
@@ -264,10 +255,13 @@ class profiles::postfix::gateway (
     'smtpd_tls_session_cache_timeout' => {
       'value' => '3600s'
     },
+    'smtpd_use_tls' => {
+      'value' => 'yes'
+    },
     'tls_medium_cipherlist' => {
       'value' => join([
         'ECDSA+AESGCM:ECDH+AESGCM:DH+AESGCM:ECDSA+AES:ECDH+AES:DH+AES',
-        'RSA+AESGCM:RSA+AES:!aNULL:!MD5:!DSS:!3DES'
+        'ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS'
       ], ':')
     },
     'tls_preempt_cipherlist' => {

site/profiles/manifests/rspamd/edge.pp

@@ -1,51 +0,0 @@
-# local rspamd milter for the mail edge gateways
-# - local_d: /etc/rspamd/local.d file name => content
-# - rules: /etc/rspamd/rules file name => url, re-fetched every puppet run
-class profiles::rspamd::edge (
-  Hash[String, String]           $local_d = {},
-  Hash[String, Stdlib::HTTPSUrl] $rules   = {},
-) {
-
-  package { 'rspamd':
-    ensure => installed,
-  }
-
-  $local_d.each |$name, $content| {
-    file { "/etc/rspamd/local.d/${name}":
-      ensure  => file,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      content => $content,
-      require => Package['rspamd'],
-      notify  => Service['rspamd'],
-    }
-  }
-
-  file { '/etc/rspamd/rules':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-    require => Package['rspamd'],
-  }
-
-  $rules.each |$name, $url| {
-    file { "/etc/rspamd/rules/${name}":
-      ensure => file,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0644',
-      source => $url,
-      notify => Service['rspamd'],
-    }
-  }
-
-  # reload keeps the milter answering while config changes apply
-  service { 'rspamd':
-    ensure  => running,
-    enable  => true,
-    restart => '/usr/bin/systemctl reload rspamd',
-    require => Package['rspamd'],
-  }
-}

site/roles/manifests/infra/mail/gateway.pp

@@ -6,11 +6,6 @@ class roles::infra::mail::gateway {
   }else{
     include profiles::defaults
     include profiles::base
-    include dnsmasq
-    include profiles::rspamd::edge
     include profiles::postfix::gateway
-
-    # resolv.conf points at dnsmasq, so it must be running first
-    Class['dnsmasq'] -> Class['profiles::dns::resolvconf']
   }
 }