Merge pull request #2453 from internetee/enable-trimming-dnskey

Enable trimming for dnskey and email values

app/models/dnskey.rb

@@ -80,6 +80,10 @@ class Dnskey < ApplicationRecord
     errors.add(:flags, :invalid, values: "Valid flags are: #{FLAGS.join(', ')}")
   end
 
+  def public_key=(value)
+    super(value&.strip&.delete(' '))
+  end
+
   def generate_digest
     return unless flags == 257 || flags == 256 # require ZoneFlag, but optional SecureEntryPoint
 

test/models/contact_test.rb

@@ -313,6 +313,14 @@ class ContactTest < ActiveJob::TestCase
     assert_equal domain.whois_record.try(:json).try(:[], 'registrant'), @contact.name
   end
 
+  def test_remove_email_whitespaces
+    contact = valid_contact
+    contact.email = '  test@test.test   '
+    contact.save
+
+    assert_equal contact.email, 'test@test.test'
+  end
+
   private
 
   def make_contact_free_of_domains_where_it_acts_as_a_registrant(contact)

test/models/dnskey_test.rb

@@ -55,4 +55,18 @@ class DnskeyTest < ActiveSupport::TestCase
     assert_equal dns.ds_digest_type, 1
     assert_equal dns.ds_digest, '640D173A44D9AF2856FBE282EE64CE11A76DBB84'
   end
+
+  def test_remove_public_key_whitespaces
+    dnskey = "  AwEAAddt 2AkLfYGKgiEZ    B5SmIF8Evr jxNMH6HtxWEA4RJ9Ao6LCWheg8 \n "
+
+    dns = Dnskey.new
+    dns.domain_id = @domain.id
+    dns.flags = 257
+    dns.protocol = 3
+    dns.alg = 8
+    dns.public_key = dnskey
+    dns.save
+
+    assert_equal dns.public_key, @dnskey
+  end
 end