zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-05 04:07:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix error generation in dnskeys

Browse source
This commit is contained in:
Alex Sherman 2021-05-05 16:49:04 +05:00
parent 89afe0bdf2
commit d4dc39bf22
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/dnskey.rb
View file

@ -60,19 +60,19 @@ class Dnskey < ApplicationRecord
def validate_algorithm
return if alg.blank?
return if ALGORITHMS.include?(alg.to_s)
errors.add(:alg, :invalid, values: ALGORITHMS.join(', '))
errors.add(:alg, :invalid, values: "Valid algorithms are: #{ALGORITHMS.join(', ')}")
end
def validate_protocol
return if protocol.blank?
return if PROTOCOLS.include?(protocol.to_s)
errors.add(:protocol, :invalid, values: PROTOCOLS.join(', '))
errors.add(:protocol, :invalid, values: "Valid protocols are: #{PROTOCOLS.join(', ')}")
end
def validate_flags
return if flags.blank?
return if FLAGS.include?(flags.to_s)
errors.add(:flags, :invalid, values: FLAGS.join(', '))
errors.add(:flags, :invalid, values: "Valid flags are: #{FLAGS.join(', ')}")
end
def generate_digest

18
test/models/dnskey_test.rb
View file

@ -15,29 +15,29 @@ class DnskeyTest < ActiveSupport::TestCase
dns.protocol = 3
dns.alg = 8
dns.public_key = @dnskey
assert dns.save
end
def test_invalid_algrorithm
dns = Dnskey.new
dns.alg = 666
errors = dns.validate_algorithm
assert_equal errors, ['Valid algorithms are: 3, 5, 6, 7, 8, 10, 13, 14']
errors = dns.validate_algorithm.options[:values]
assert_equal errors, 'Valid algorithms are: 3, 5, 6, 7, 8, 10, 13, 14'
end
def test_invalid_protocol
dns = Dnskey.new
dns.protocol = 666
errors = dns.validate_protocol
assert_equal errors, ['Valid protocols are: 3']
errors = dns.validate_protocol.options[:values]
assert_equal errors, 'Valid protocols are: 3'
end
def test_invalid_flags
dns = Dnskey.new
dns.flags = 666
errors = dns.validate_flags
assert_equal errors, ['Valid flags are: 0, 256, 257']
errors = dns.validate_flags.options[:values]
assert_equal errors, 'Valid flags are: 0, 256, 257'
end
def test_ds_digest_type_one
@ -49,10 +49,10 @@ class DnskeyTest < ActiveSupport::TestCase
dns.protocol = 3
dns.alg = 8
dns.public_key = @dnskey
assert dns.save
assert_equal dns.ds_digest_type, 1
assert_equal dns.ds_digest, '640D173A44D9AF2856FBE282EE64CE11A76DBB84'
end
end
end