Explorar o código

AMBARI-4835. Custom property names with asterisk are invalid keys. (Mikhail Bayuk via alexantonenko)

Alex Antonenko %!s(int64=11) %!d(string=hai) anos
pai
achega
e6ba88fb0a
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      ambari-web/app/messages.js
  2. 2 2
      ambari-web/app/utils/validator.js

+ 1 - 1
ambari-web/app/messages.js

@@ -694,7 +694,7 @@ Em.I18n.translations = {
   'form.item.placeholders.typePassword':'Type password',
 
   'form.validator.invalidIp':'Please enter valid ip address',
-  'form.validator.configKey':'Invalid Key. Only alphanumerics, hyphens, underscores, and periods are allowed.',
+  'form.validator.configKey':'Invalid Key. Only alphanumerics, hyphens, underscores, asterisks and periods are allowed.',
 
   'admin.advanced.caution':'This section is for advanced user only.<br/>Proceed with caution.',
   'admin.advanced.button.uninstallIncludingData':'Uninstall cluster including all data.',

+ 2 - 2
ambari-web/app/utils/validator.js

@@ -126,7 +126,7 @@ module.exports = {
    * @return {Boolean}
    */
   isValidConfigKey: function(value) {
-    var configKeyRegex = /^[0-9a-z_\-\.]+$/i;
+    var configKeyRegex = /^[0-9a-z_\-\.\*]+$/i;
     return configKeyRegex.test(value);
   },
 
@@ -143,4 +143,4 @@ module.exports = {
         return false;
     }
 }
-};
+};