summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-09-24 15:12:46 -0700
committerelijah <elijah@riseup.net>2015-09-24 15:12:46 -0700
commit023d62631eff760237dd7493d9fded1c9d8bfc95 (patch)
treeeeaa63ec1910b59777b575c0bcd5e0bd520e5bc6
parent14bcd5b08e3059e44e90f080c29fc6e8054cf193 (diff)
add spf to compile zone, closes #5925
-rw-r--r--lib/leap_cli/commands/compile.rb66
1 files changed, 48 insertions, 18 deletions
diff --git a/lib/leap_cli/commands/compile.rb b/lib/leap_cli/commands/compile.rb
index 8f6c7769..c388e5c3 100644
--- a/lib/leap_cli/commands/compile.rb
+++ b/lib/leap_cli/commands/compile.rb
@@ -265,56 +265,86 @@ remove this directory if you don't use it.
# serial is any number less than 2^32 (4294967296)
#
def compile_zone_file
- provider = manager.env('default').provider
+ provider = manager.env('default').provider
hosts_seen = {}
- f = $stdout
- f.puts ZONE_HEADER % {:domain => provider.domain, :ns => provider.domain, :contact => provider.contacts.default.first.sub('@','.')}
- max_width = manager.nodes.values.inject(0) {|max, node| [max, relative_hostname(node.domain.full, provider).length].max }
- put_line = lambda do |host, line|
- host = '@' if host == ''
- f.puts("%-#{max_width}s %s" % [host, line])
- end
+ lines = []
+
+ #
+ # header
+ #
+ lines << ZONE_HEADER % {:domain => provider.domain, :ns => provider.domain, :contact => provider.contacts.default.first.sub('@','.')}
- f.puts ORIGIN_HEADER
+ #
+ # common records
+ #
+ lines << ORIGIN_HEADER
# 'A' records for primary domain
manager.nodes[:environment => '!local'].each_node do |node|
if node.dns['aliases'] && node.dns.aliases.include?(provider.domain)
- put_line.call "", "IN A #{node.ip_address}"
+ lines << ["@", "IN A #{node.ip_address}"]
end
end
-
# NS records
if provider['dns'] && provider.dns['nameservers']
provider.dns.nameservers.each do |ns|
- put_line.call "", "IN NS #{ns}."
+ lines << ["@", "IN NS #{ns}."]
end
end
- # all other records
+ # environment records
manager.environment_names.each do |env|
next if env == 'local'
nodes = manager.nodes[:environment => env]
next unless nodes.any?
- f.puts ENV_HEADER % (env.nil? ? 'default' : env)
+ spf = nil
+ lines << ENV_HEADER % (env.nil? ? 'default' : env)
nodes.each_node do |node|
if node.dns.public
- hostname = relative_hostname(node.domain.full, provider)
- put_line.call relative_hostname(node.domain.full, provider), "IN A #{node.ip_address}"
+ lines << [relative_hostname(node.domain.full, provider), "IN A #{node.ip_address}"]
end
if node.dns['aliases']
node.dns.aliases.each do |host_alias|
if host_alias != node.domain.full && host_alias != provider.domain
- put_line.call relative_hostname(host_alias, provider), "IN A #{node.ip_address}"
+ lines << [relative_hostname(host_alias, provider), "IN A #{node.ip_address}"]
end
end
end
if node.services.include? 'mx'
- put_line.call relative_hostname(node.domain.full_suffix, provider), "IN MX 10 #{relative_hostname(node.domain.full, provider)}"
+ mx_domain = relative_hostname(node.domain.full_suffix, provider)
+ lines << [mx_domain, "IN MX 10 #{relative_hostname(node.domain.full, provider)}"]
+ spf ||= [mx_domain, spf_record(node)]
end
end
+ lines << spf if spf
+ end
+
+ # print the lines
+ max_width = lines.inject(0) {|max, line| line.is_a?(Array) ? [max, line[0].length].max : max}
+ lines.each do |host, line|
+ if line.nil?
+ puts(host)
+ else
+ host = '@' if host == ''
+ puts("%-#{max_width}s %s" % [host, line])
+ end
end
end
+ #
+ # allow mail from any mx node, plus the webapp nodes.
+ #
+ # TODO: ipv6
+ #
+ def spf_record(node)
+ ips = node.nodes_like_me['services' => 'webapp'].values.collect {|n|
+ "ip4:" + n.ip_address
+ }
+ # TXT strings may not be longer than 255 characters, although
+ # you can chain multiple strings together.
+ strings = "v=spf1 MX #{ips.join(' ')} -all".scan(/.{1,255}/).join('" "')
+ %(IN TXT "#{strings}")
+ end
+
ENV_HEADER = %[
;;
;; ENVIRONMENT %s