record_store 8.0.4 → 8.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077fdafcb637ff49252d1e8aba5af4803cc4c458dee23465354ca77df48b9f7f
-  data.tar.gz: 4fe82c6141e811289c9cdd7d978e53d68693a3e22a564b846252a585ec25115b
+  metadata.gz: 0ea2231f371be0d7bc9f308ccaec17a1b27c410cea7972a8e3e3f7a066ba9042
+  data.tar.gz: dbd3fd8c7622660afd23443245c0a350a0bdec1ad2d26bd15951e8db182df751
 SHA512:
-  metadata.gz: 8c82a2c86d3ed27449b231695bd3edfba7b5d9b0c2e21f64c11cf52af89ad76e6c2364eb957022fc7743e90ecd3818c46c409f0332234ea16a41ea7e5c935ca6
-  data.tar.gz: 4d144671d258a63f11e8684efe80f2119a9bcc2a4a3786253eba28ba8adf1a648fc0439c2b22ef8d0b508cc52c4453c1300e7a74d4ffce23088e0fdfcb1c6248
+  metadata.gz: ca85b2b49dd23799a9ab95cc60e2e0575b55dc07defb9f6c0b039ff2ef02e5c55b20a7d092aebefedf727e33dd02ca3f2b34ffa5dd758e5d8050b902672caad9
+  data.tar.gz: 7435df6101ac759bbf5b980aeb3eaf9b33c8fb4eaf02bccd087c60b74ebae600162fc53a9dc8ecb5eb812e9aa1f50aa37c1f2e91b7fbf3d2fdef9950de1270ce

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 8.0.6
+- Fix quotes around Cloudflare TXT records
+
+## 8.0.5
+- Add IPv6 PTR record validation
+
 ## 8.0.4
 - Normalize (compress) addresses in A and AAAA records
 

data/lib/record_store/provider/cloudflare/client.rb

@@ -11,35 +11,30 @@ module Cloudflare
 
     def get(endpoint, params = {})
       uri = build_uri(endpoint, params)
-
       response = request(:get, uri)
       Cloudflare::Response.new(response)
     end
 
     def post(endpoint, body = nil)
       uri = build_uri(endpoint)
-
       response = request(:post, uri, body: body)
       Cloudflare::Response.new(response)
     end
 
     def put(endpoint, body = nil)
       uri = build_uri(endpoint)
-
       response = request(:put, uri, body: body)
       Cloudflare::Response.new(response)
     end
 
     def patch(endpoint, body = nil)
       uri = build_uri(endpoint)
-
       response = request(:patch, uri, body: body)
       Cloudflare::Response.new(response)
     end
 
     def delete(endpoint)
       uri = build_uri(endpoint)
-
       response = request(:delete, uri)
       Cloudflare::Response.new(response)
     end
@@ -72,6 +67,12 @@ module Cloudflare
         rescue StandardError => e
           raise "HTTP error: #{e.message}"
         end
+
+        if response.code.to_i >= 300
+          raise RecordStore::Provider::Error,
+            "HTTP response code: #{response.code} - #{response.message}; #{response.body}"
+        end
+
         response
       end
     end

data/lib/record_store/provider/cloudflare.rb

@@ -128,7 +128,7 @@ module RecordStore
           api_body[:content] = record.exchange
           api_body[:priority] = record.preference
         when Record::TXT, Record::SPF
-          api_body[:content] = record.txtdata.gsub('\;', ';')
+          api_body[:content] = Record.quote(record.txtdata.gsub('\;', ';'))
         when Record::CAA
           api_body[:data] = record.rdata
         when Record::SRV
@@ -166,7 +166,8 @@ module RecordStore
             record.merge!(cname: api_response['content'])
           end
         when 'TXT'
-          record.merge!(txtdata: Record.unescape(api_response['content']).gsub(';', '\;'))
+          content = Record.unquote(api_response['content'])
+          record.merge!(txtdata: content.gsub(';', '\;'))
         when 'MX'
           record.merge!(preference: api_response['priority'], exchange: api_response['content'])
         when 'PTR'

data/lib/record_store/record/ptr.rb

@@ -2,11 +2,19 @@ module RecordStore
   class Record::PTR < Record
     attr_accessor :ptrdname
 
-    OCTET_LABEL_SEQUENCE_REGEX = /\A(?:([0-9]|[1-9][0-9]|[1-9][0-9][0-9])\.){1,4}/
-    IN_ADDR_ARPA_SUFFIX_REGEX = /in-addr\.arpa\.\z/
-    FQDN_FORMAT_REGEX = Regexp.new(OCTET_LABEL_SEQUENCE_REGEX.source + IN_ADDR_ARPA_SUFFIX_REGEX.source)
+    # IPv4: 1-3 digits (0-255) followed by dots, 1-4 times
+    IPV4_LABEL_SEQUENCE_REGEX = /\A(?:([0-9]|[1-9][0-9]|[1-9][0-9][0-9])\.){1,4}/
 
-    validates_format_of :fqdn, with: FQDN_FORMAT_REGEX
+    # IPv6: single hex digit followed by dots, exactly 32 times
+    IPV6_LABEL_SEQUENCE_REGEX = /\A(?:[0-9a-f]\.){32}/i
+
+    IN_ADDR_ARPA_SUFFIX_REGEX = /(in-addr|ip6)\.arpa\.\z/
+
+    # Combine with suffix for full validation
+    IPV4_FORMAT_REGEX = Regexp.new(IPV4_LABEL_SEQUENCE_REGEX.source + 'in-addr\.arpa\.\z')
+    IPV6_FORMAT_REGEX = Regexp.new(IPV6_LABEL_SEQUENCE_REGEX.source + 'ip6\.arpa\.\z')
+
+    validates_format_of :fqdn, with: Regexp.union(IPV4_FORMAT_REGEX, IPV6_FORMAT_REGEX)
 
     validate :validate_fqdn_octets_in_range
     validate :validate_fqdn_is_in_addr_arpa_subzone
@@ -26,9 +34,20 @@ module RecordStore
     end
 
     def validate_fqdn_octets_in_range
-      OCTET_LABEL_SEQUENCE_REGEX.match(fqdn) do |m|
-        unless m.captures.all? { |o| o.to_d.between?(0, 255) }
-          errors.add(:fqdn, 'octet labels must be within the range 0-255')
+      if fqdn.end_with?('in-addr.arpa.')
+        # IPv4 validation: each octet must be 0-255
+        IPV4_LABEL_SEQUENCE_REGEX.match(fqdn) do |m|
+          unless m.captures.all? { |o| o.to_i.between?(0, 255) }
+            errors.add(:fqdn, 'IPv4 octet labels must be within the range 0-255')
+          end
+        end
+      elsif fqdn.end_with?('ip6.arpa.')
+        # IPv6 validation: each nibble must be a valid hex digit
+        IPV6_LABEL_SEQUENCE_REGEX.match(fqdn) do |m|
+          nibbles = m[0].split('.').reject(&:empty?)
+          unless nibbles.all? { |n| n.match?(/\A[0-9a-f]\z/i) }
+            errors.add(:fqdn, 'IPv6 labels must be single hexadecimal digits (0-9, a-f)')
+          end
         end
       end
     end

data/lib/record_store/record/txt.rb

@@ -22,7 +22,7 @@ module RecordStore
 
     def escaped_semicolons
       if txtdata =~ /([^\\]|\A);/
-        errors.add(:txtdata, 'has unescaped semicolons (See RFC 1035).')
+        errors.add(:txtdata, 'has unescaped semicolons, which begins comment portion of record per RFC 1035.')
       end
     end
   end

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '8.0.4'.freeze
+  VERSION = '8.0.6'.freeze
 end

data/record_store.gemspec

@@ -46,7 +46,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.67.0'
+  spec.add_development_dependency 'rubocop', '~> 1.69.0'
   spec.add_development_dependency 'rubocop-shopify', '~> 2.15.1'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 8.0.4
+  version: 8.0.6
 platform: ruby
 authors:
 - Willem van Bergen
 - Emil Stolarsky
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -305,14 +304,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.67.0
+        version: 1.69.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.67.0
+        version: 1.69.0
 - !ruby/object:Gem::Dependency
   name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
@@ -440,7 +439,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -455,8 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Manage DNS using git
 test_files: []