Merge pull request #623 from mhaskel/FM-2111

Fix issues introduced in puppetlabs/puppetlabs-mysql#612

Author: hunner

lib/puppet/type/mysql_grant.rb

@@ -64,10 +64,10 @@ def initialize(*args)
       # If at least one special char is used, string must be quoted
 
       # http://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions/8057827#8057827
-      if matches = /^(['`"])((?!\1).)+\1@([\w%\.:]+)$/.match(value)
+      if matches = /^(['`"])((?!\1).)*\1@([\w%\.:\-]+)/.match(value)
         user_part = matches[2]
         host_part = matches[3]
-      elsif matches = /^([0-9a-zA-Z$_]+)@([\w%\.:]+)$/.match(value)
+      elsif matches = /^([0-9a-zA-Z$_]*)@([\w%\.:\-]+)/.match(value)
         user_part = matches[1]
         host_part = matches[2]
       elsif matches = /^(?:(?!['`"]).*)([^0-9a-zA-Z$_]).*@.+$/.match(value)

lib/puppet/type/mysql_user.rb

@@ -13,10 +13,10 @@
       # If at least one special char is used, string must be quoted
 
       # http://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions/8057827#8057827
-      if matches = /^(['`"])((?:(?!\1).)+)\1@([\w%\.:]+)$/.match(value)
+      if matches = /^(['`"])((?:(?!\1).)*)\1@([\w%\.:\-]+)/.match(value)
         user_part = matches[2]
         host_part = matches[3]
-      elsif matches = /^([0-9a-zA-Z$_]+)@([\w%\.:]+)$/.match(value)
+      elsif matches = /^([0-9a-zA-Z$_]*)@([\w%\.:\-]+)/.match(value)
         user_part = matches[1]
         host_part = matches[2]
       elsif matches = /^(?:(?!['`"]).*)([^0-9a-zA-Z$_]).*@.+$/.match(value)
@@ -30,7 +30,7 @@
     end
 
     munge do |value|
-      matches = /^((['`"]?).+\2)@([\w%\.:]+)$/.match(value)
+      matches = /^((['`"]?).*\2)@([\w%\.:\-]+)/.match(value)
       "#{matches[1]}@#{matches[3].downcase}"
     end
   end