Fixes #10479 - prevent validation error on host creation when domain …

…contains capital letters

app/models/domain.rb

@@ -26,7 +26,7 @@ class Domain < ActiveRecord::Base
 
   accepts_nested_attributes_for :domain_parameters, :allow_destroy => true
   include ParameterValidators
-  validates :name, :presence => true, :uniqueness => true
+  validates :name, :presence => true, :uniqueness => { :case_sensitive => false }
   validates :fullname, :uniqueness => true, :allow_blank => true, :allow_nil => true
 
   scoped_search :on => [:name, :fullname], :complete_value => true

app/models/nic/base.rb

@@ -110,7 +110,7 @@ def name=(*args)
     end
 
     def shortname
-      domain.nil? ? name : name.to_s.chomp("." + domain.name)
+      domain.nil? ? name : name.sub(/\.#{Regexp.escape domain.name}/i, '')
     end
 
     def validated?

app/models/nic/interface.rb

@@ -77,21 +77,21 @@ def normalize_name
       # no hostname was given or a domain was selected, since this is before validation we need to ignore
       # it and let the validations to produce an error
       return if name.empty?
-      if domain.nil? && name.match(/\./) && !changed_attributes['domain_id'].present?
+      if domain.nil? && name.include?('.') && !changed_attributes['domain_id'].present?
         # try to assign the domain automatically based on our existing domains from the host FQDN
-        self.domain = Domain.all.select{|d| name.match(/#{d.name}\Z/)}.first rescue nil
+        self.domain = Domain.all.detect{|d| name.match(/#{d.name}\Z/i)}
       elsif persisted? && changed_attributes['domain_id'].present?
         # if we've just updated the domain name, strip off the old one
         old_domain = Domain.find(changed_attributes["domain_id"])
         # Remove the old domain, until fqdn will be set as the full name
-        self.name.chomp!("." + old_domain.to_s)
+        self.name.sub!(/\.#{Regexp.escape old_domain.name}/i, '')
       end
       # name should be fqdn
       self.name = fqdn
       # A managed host we should know the domain for; and the shortname shouldn't include a period
       # This only applies for unattended=true, as otherwise the name field includes the domain
       errors.add(:name, _("must not include periods")) if ( host && host.managed? && managed? && shortname.include?(".") && SETTINGS[:unattended] )
-      self.name = Net::Validations.normalize_hostname(name) if self.name.present?
+      self.name = Net::Validations.normalize_hostname(name)
     end
   end
 end

test/unit/nics/managed_test.rb

@@ -43,6 +43,14 @@ class ManagedTest < ActiveSupport::TestCase
     assert_nil nic.domain
   end
 
+  test "#normalize_hostname accepts domain even if it contains capital letters" do
+    domain = FactoryGirl.create(:domain, :name => "CAPITAL.com")
+    nic = setup_primary_nic_with_name(" Host.#{domain.name}", :domain => nil)
+    nic.send(:normalize_name)
+    assert_equal "host.#{domain.name.downcase}", nic.name
+    assert_equal domain, nic.domain
+  end
+
   test "#normalize_hostname keeps domain nil if it can't find such domain based on name" do
     nic = setup_primary_nic_with_name(" Host", :domain => nil)
     nic.send(:normalize_name)