Merge pull request #22 from gfish/support-caa

Support caa

CHANGELOG.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Added
 - Added an LetsEncrypt guide to the README, including the scripts to communicate with LetsEncrypt.
+- Added support for CAA-records, https://blog.qualys.com/product-tech/2017/03/13/caa-mandated-by-cabrowser-forum
 
 ## [1.0.2] - 2019-05-11
 ### Fixed

Gemfile.lock

@@ -29,11 +29,12 @@ GEM
     hashdiff (1.0.1)
     jmespath (1.6.1)
     method_source (1.0.0)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.5)
     rake (12.3.3)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -51,7 +52,7 @@ GEM
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+    simplecov-html (0.12.3)
     vcr (3.0.3)
     webmock (2.3.2)
       addressable (>= 2.3.6)
@@ -62,13 +63,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry (~> 0.12)
+  pry (~> 0.14.2)
   rake (~> 12.3)
+  rexml (~> 3.2)
   rspec (~> 3.8)
   simplecov (~> 0.16)
   sprinkle_dns!
   vcr (~> 3.0)
   webmock (~> 2.3)
 
 BUNDLED WITH
-   1.17.2
+   2.4.10

lib/sprinkle_dns/hosted_zone_alias.rb

@@ -83,7 +83,7 @@ def to_s
     private
 
     def valid_record_types
-      ['SOA','A','TXT','NS','CNAME','MX','NAPTR','PTR','SRV','SPF','AAAA']
+      ['SOA','A','TXT','NS','CNAME','MX','NAPTR','PTR','SRV','SPF','AAAA', 'CAA']
     end
 
   end

lib/sprinkle_dns/hosted_zone_entry.rb

@@ -90,7 +90,7 @@ def to_s
     private
 
     def valid_record_types
-      ['SOA','A','TXT','NS','CNAME','MX','NAPTR','PTR','SRV','SPF','AAAA']
+      ['SOA','A','TXT','NS','CNAME','MX','NAPTR','PTR','SRV','SPF','AAAA', 'CAA']
     end
 
   end

lib/sprinkle_dns/providers/mock_client.rb

@@ -9,8 +9,6 @@ def initialize(hosted_zones = [])
     end
 
     def fetch_hosted_zones(filter: [])
-      hosted_zones = []
-
       if filter.empty?
         return []
       end

spec/spec_helper.rb

@@ -24,6 +24,7 @@
 SimpleCov.start
 
 require 'vcr'
+require 'pry'
 
 require './spec/support/entry_helpers'
 

spec/unit/caa_record.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe "CAA-records" do
+  it 'should allow for CAA records' do
+    hz = SprinkleDNS::HostedZone.new('colourful.com.')
+    e1 = SprinkleDNS::HostedZoneEntry.new('A', 'colourful.com.', Array.wrap('80.80.80.80'), 3600, hz.name)
+    e1.persisted!
+    hz.resource_record_sets << e1
+
+    client = SprinkleDNS::MockClient.new([hz])
+    sdns = SprinkleDNS::Client.new(client, dry_run: false, delete: true, force: true)
+
+    sdns.entry('A', 'colourful.com', '80.80.80.80', 3600)
+    sdns.entry('CAA', 'colourful.com', '0 issue "letsencrypt.org"', 3600)
+
+    existing_hosted_zones, _ = sdns.sprinkle!
+
+    shz = client.fetch_hosted_zones(filter: [hz.name]).first
+
+    rrs = shz.resource_record_sets.select{|rrs| rrs.type == 'CAA' && rrs.name == 'colourful.com.'}.first
+    expect(rrs.ttl).to eq 3600
+    expect(rrs.value).to eq ['0 issue "letsencrypt.org"']
+  end
+end

spec/unit/sprinkle_dns_spec.rb

@@ -269,7 +269,7 @@
 
   context 'record validation' do
     it 'should only allow valid string records' do
-      valid_records = ['SOA','A','TXT','NS','CNAME','MX','NAPTR','PTR','SRV','SPF','AAAA']
+      valid_records = ['SOA','A','TXT','NS','CNAME','MX','NAPTR','PTR','SRV','SPF','AAAA', 'CAA']
 
       valid_records.each do |record_type|
         r53c = SprinkleDNS::Route53Client.new('1','2')
@@ -280,7 +280,7 @@
     end
 
     it 'should not allow symbols for records' do
-      invalid_records = [:SOA, :A, :TXT, :NS, :CNAME, :MX, :NAPTR, :PTR, :SRV, :SPF, :AAAA]
+      invalid_records = [:SOA, :A, :TXT, :NS, :CNAME, :MX, :NAPTR, :PTR, :SRV, :SPF, :AAAA, :CAA]
 
       invalid_records.each do |record_type|
         r53c = SprinkleDNS::Route53Client.new('1','2')

sprinkle_dns.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec", '~> 3.8'
   gem.add_development_dependency "simplecov", '~> 0.16'
-  gem.add_development_dependency "pry", '~> 0.12'
+  gem.add_development_dependency "pry", '~> 0.14.2'
   gem.add_development_dependency "rake", '~> 12.3'
   gem.add_development_dependency "vcr", '~> 3.0'
   gem.add_development_dependency "webmock", '~> 2.3'
+  gem.add_development_dependency "rexml", '~> 3.2'
 end