Page MenuHomeGRNET
Files F1299785

No OneTemporary
Actions

File Metadata

Created
Wed, Nov 19, 1:23 AM

View Options

diff --git a/app/models/naptr.rb b/app/models/naptr.rb
new file mode 100644
index 0000000..e72fe60
--- /dev/null
+++ b/app/models/naptr.rb
@@ -0,0 +1,3 @@
+class NAPTR < Record
+ validates :content, presence: true
+end
diff --git a/app/models/record.rb b/app/models/record.rb
index 29ffe94..a02cb3b 100644
--- a/app/models/record.rb
+++ b/app/models/record.rb
@@ -1,144 +1,144 @@
require 'ipaddr'
require_dependency 'drop_privileges_validator'
class Record < ActiveRecord::Base
belongs_to :domain
# Powerdns inserts empty records on slave zones,
# we want to hide them
#
# http://mailman.powerdns.com/pipermail/pdns-users/2013-December/010389.html
default_scope { where.not(type: nil) }
def self.record_types
[
'A', 'AAAA', 'CNAME',
'MX',
'TXT', 'SPF', 'SRV', 'SSHFP',
'SOA', 'NS',
- 'PTR',
+ 'PTR', 'NAPTR'
]
end
def self.forward_records
record_types - ['SOA', 'PTR']
end
def self.reverse_records
- ['PTR', 'CNAME', 'TXT', 'NS']
+ ['PTR', 'CNAME', 'TXT', 'NS', 'NAPTR']
end
def self.allowed_record_types
record_types - WebDNS.settings[:prohibit_records_types]
end
validates :name, presence: true
validates :type, inclusion: { in: record_types }
# http://mark.lindsey.name/2009/03/never-use-dns-ttl-of-zero-0.html
validates_numericality_of :ttl,
allow_nil: true, # Default pdns TTL
only_integer: true,
greater_than: 0,
less_than_or_equal_to: 2_147_483_647
# Don't allow the following actions on drop privileges mode
validate :no_touching_for_slave_zones, if: -> { domain.slave? }
validates_drop_privileges :type,
message: 'You cannot touch that record!',
unless: -> { Record.allowed_record_types.include?(type) }
validates_drop_privileges :name,
message: 'You cannot touch top level NS records!',
if: -> { type == 'NS' && domain_record? }
before_validation :guess_reverse_name
before_validation :set_name
after_save :update_zone_serial
after_destroy :update_zone_serial
def short
return '' if name == domain.name
return '' if name.blank?
File.basename(name, ".#{domain.name}")
end
def domain_record?
name.blank? || name == domain.name
end
def editable?(by = :user)
return false if domain.slave?
case by
when :user
return false unless Record.allowed_record_types.include?(type)
return false if type == 'NS' && domain_record?
end
true
end
def supports_prio?
false
end
# Create record specific urls for all record types
#
# Overrides default rails STI
def self.model_name
return super if self == Record
Record.model_name
end
def to_dns
[name, ttl, 'IN', type, supports_prio? ? prio : nil, content].compact.join(' ')
end
def to_short_dns
[name, 'IN', type].join(' ')
end
private
# Validations
def no_touching_for_slave_zones
# Allow automatic SOA creation for slave zones
# powerdns needs a valid serial to compare it with master
return if type == 'SOA' && validation_context == :create
errors.add(:type, 'This is a slave zone!')
end
# Hooks
def guess_reverse_name
return if not type == 'PTR'
return if not domain.reverse?
return if name.blank?
reverse = IPAddr.new(name).reverse
self.name = reverse if reverse.end_with?(domain.name)
rescue IPAddr::InvalidAddressError # rubycop:disable HandleExceptions
end
# Powerdns expects full domain names
def set_name
self.name = domain.name if name.blank?
self.name = "#{name}.#{domain.name}" if not name.end_with?(domain.name)
end
def remove_terminating_dot
self.content = content.gsub(/\.+\Z/, '')
end
def update_zone_serial
# SOA records handle serial themselves
return true if type == 'SOA'
domain.soa.bump_serial!
end
end
diff --git a/test/factories/naptr.rb b/test/factories/naptr.rb
new file mode 100644
index 0000000..2046435
--- /dev/null
+++ b/test/factories/naptr.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+ factory :naptr, class: 'NAPTR' do
+ domain
+ name ''
+ content '100 10 "S" "SIP+D2U" "!^.*$!sip:customer-service@example.com!" _sip._udp.example.com'
+ end
+end
diff --git a/test/models/naptr_test.rb b/test/models/naptr_test.rb
new file mode 100644
index 0000000..9529a7d
--- /dev/null
+++ b/test/models/naptr_test.rb
@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class NAPTRTest < ActiveSupport::TestCase
+ test 'saves' do
+ rec = build(:naptr)
+ rec.valid?
+
+ assert_empty rec.errors
+ assert rec.save
+ end
+end

Event Timeline