record_store 8.0.10 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcaa697157000cc1bf04fd72aee445d2ecd8b8b34352eb99d8e5544903c92146
-  data.tar.gz: 453b90bf06d3555904e3d60177979a09cdaca5370a63aa5634fc3322f8527ea2
+  metadata.gz: ce291e6fbcef26df114b7bbf86e5e2ebd21bfdccf8734f5a9c68976ef92bdf2b
+  data.tar.gz: 2138a7322d533f1de25e2bd7dc69a5046acfda2f352520a64cbccf209f8a7b35
 SHA512:
-  metadata.gz: 1386094b965dc6309249f816dc509fcfb6810e5dc2ae3601709a3ccddfb9a6ab1e6315cc8e5b5ac62c0edc09ad02cdfa428d2a593df8c5975bd6d35929254235
-  data.tar.gz: b927d38959ed6496c65e6fcb98525b9a189c96621b159ece23ec06b382b6df87c9b5b78da996d2fbe6524cad03c95e8d0cb6376b4627bf83c0be6c17a7d0c441
+  metadata.gz: ec4b883bb2bde7c4803ddd623a4ff95866a7d0505e1493f76af61abd6d904f2f81f40791a7902bbb380def97e82320cc0d1c57ba54fe02d87c726f41e6cb7f51
+  data.tar.gz: 5f2e9b36f150961bbb40df71c3aa917e8572d509ecb28aa547b75442adacba8c2f3cc7d642469a0b63402b09334d747c7bdf3245b264b233dae37daea22fc96c

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
         ruby: [ 3.2, 3.3, 3.4 ]
     name: Test Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: Install dependencies
         run: |
           sudo apt-get update && sudo apt-get install build-essential libcurl4-openssl-dev

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 9.0.0
+- Only load implicit record templates by plain file name from directly inside `implicit_records_templates_path`. Template names containing path separators, `.` or `..`, and symlinks that resolve outside that directory now raise an error. Zone definitions that referenced templates this way must move them into the templates directory and use the plain file name.
+
+## 8.0.11
+- Modified Zone#fetch_authority to handle SOA answer sections from authoritative servers
+
 ## 8.0.10
 - Fix Cloudflare provider to skip empty changesets
 - Add TXT record denormalization for DNSimple provider

data/README.md

@@ -135,6 +135,8 @@ Record Store supports injecting implicit records into a zone based on templates.
 
 Templates can help reduce zone file bloat where instead of defining many generic literals within the zone file for a given criteria zone record, these generic records can be implicitly injected into the `Zone` at the time of initialization based on information provided within the template.
 
+Zone definitions reference templates by plain file name (for example `implicit_records_templates: [acme-challenge.yml.erb]`), and only files directly inside `implicit_records_templates_path` can be loaded. Names containing path separators, `.` or `..`, and symlinks that resolve outside that directory are rejected. Templates are rendered as ERB, so treat the templates directory as code: restrict who can change it to people you would trust to change Record Store itself.
+
 ----
 
 # Development

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '8.0.10'.freeze
+  VERSION = '9.0.0'.freeze
 end

data/lib/record_store/zone/config/implicit_record_template.rb

@@ -25,6 +25,8 @@ module RecordStore
       end
 
       class ImplicitRecordTemplate
+        class InvalidTemplateFilename < ArgumentError; end
+
         class << self
           def from_file(filename:)
             filepath = template_filepath_for(filename: filename)
@@ -43,8 +45,26 @@ module RecordStore
 
           private
 
+          # Templates are rendered as ERB, so only files directly inside the
+          # configured templates directory may be loaded. Zone definitions name a
+          # template by its plain file name; anything that could resolve elsewhere
+          # (path separators, `.`/`..`, or a symlink out of the directory) is rejected.
           def template_filepath_for(filename:)
-            "#{RecordStore.implicit_records_templates_path}/#{filename}"
+            name = filename.to_s
+            base = Pathname.new(RecordStore.implicit_records_templates_path).realpath
+
+            if name.empty? || name == '.' || name == '..' || name != File.basename(name)
+              raise InvalidTemplateFilename,
+                "implicit record template #{filename.inspect} must be a plain file name in #{base}"
+            end
+
+            path = base.join(name).realpath
+            unless path.dirname == base
+              raise InvalidTemplateFilename,
+                "implicit record template #{filename.inspect} resolves outside #{base}"
+            end
+
+            path.to_s
           end
         end
 

data/lib/record_store/zone.rb

@@ -80,7 +80,7 @@ module RecordStore
 
     def initialize(name:, records: [], config: {}, abstract_syntax_trees: {})
       @name = Record.ensure_ends_with_dot(name)
-      @config = RecordStore::Zone::Config.new(**config.deep_symbolize_keys)
+      @config = build_config(config)
       @records = build_records(records)
       @abstract_syntax_trees = abstract_syntax_trees
     end
@@ -143,6 +143,12 @@ module RecordStore
 
     def fetch_authority(nameserver = ROOT_SERVERS.sample)
       authority = fetch_soa(nameserver) do |reply, _name|
+        # If we get a valid SOA answer, the nameserver is authoritative, so fetch NS records directly
+        if reply.answer.any? && reply.answer.first[0].to_s == unrooted_name
+          break fetch_ns_records(nameserver)
+        end
+
+        # For NXDOMAIN or referral responses, continue with authority section
         break if reply.answer.any?
 
         raise "No authority found (#{name})" if reply.authority.none?
@@ -151,7 +157,16 @@ module RecordStore
       end
 
       # candidate DNS name is returned instead when NXDomain or other error
-      return if unrooted_name.casecmp?(Array(authority).first.to_s)
+      # In this case, query the parent domain's NS records
+      if authority.is_a?(Array) && authority.first.is_a?(Resolv::DNS::Name) &&
+          unrooted_name.casecmp?(authority.first.to_s)
+        # Extract parent domain from unrooted_name (e.g., "sub.example.com" -> "example.com")
+        parts = unrooted_name.split('.')
+        return if parts.length <= 1 # No parent domain available (TLD)
+
+        parent_domain = parts[1..-1].join('.') + '.'
+        return fetch_ns_records_for_domain(parent_domain, nameserver)
+      end
 
       authority
     end
@@ -164,6 +179,21 @@ module RecordStore
       end
     end
 
+    def fetch_ns_records(nameserver)
+      fetch_ns_records_for_domain(name, nameserver)
+    end
+
+    def fetch_ns_records_for_domain(domain, nameserver)
+      Resolv::DNS.open(nameserver: nameserver) do |resolv|
+        resources = resolv.getresources(domain, Resolv::DNS::Resource::IN::NS)
+        return nil if resources.empty?
+
+        resources.map.with_index do |ns, index|
+          Record::NS.new(ttl: ns.ttl, fqdn: domain, nsdname: ns.name.to_s, record_id: index)
+        end
+      end
+    end
+
     def resolve_authority(authority)
       nameservers = authority.map { |a| a.last.name.to_s }
 
@@ -194,6 +224,12 @@ module RecordStore
       end
     end
 
+    def build_config(config)
+      RecordStore::Zone::Config.new(**config.deep_symbolize_keys)
+    rescue Config::ImplicitRecordTemplate::InvalidTemplateFilename => e
+      raise e.exception("zone #{unrooted_name}: #{e.message}")
+    end
+
     def build_records(records)
       all_records = records.map { |record| Record.build_from_yaml_definition(record) }
 

data/record_store.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activemodel', '>= 4.2'
   spec.add_runtime_dependency 'activesupport', '>= 4.2'
+  spec.add_runtime_dependency 'csv'
   spec.add_runtime_dependency 'ejson'
   spec.add_runtime_dependency 'thor', '>= 1.4.0'
 
-  spec.add_runtime_dependency 'dnsimple', '>= 4.4', '< 11.2'
+  spec.add_runtime_dependency 'dnsimple', '>= 4.4', '< 12.3'
   spec.add_runtime_dependency 'fog-dynect', '>= 0.4', '< 0.6'
   spec.add_runtime_dependency 'fog-json'
   spec.add_runtime_dependency 'fog-xml'
@@ -46,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop', '~> 1.81.1'
+  spec.add_development_dependency 'rubocop', '~> 1.88.0'
   spec.add_development_dependency 'rubocop-shopify', '~> 2.15.1'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 8.0.10
+  version: 9.0.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ejson
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +89,7 @@ dependencies:
         version: '4.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +99,7 @@ dependencies:
         version: '4.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: fog-dynect
   requirement: !ruby/object:Gem::Requirement
@@ -298,14 +312,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.81.1
+        version: 1.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.81.1
+        version: 1.88.0
 - !ruby/object:Gem::Dependency
   name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
@@ -447,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Manage DNS using git
 test_files: []