AMBARI-3009. Trim and/or validate config parameter values to prevent failures due to extra spaces. (Andrii Babiichuk via yusaku)

ambari-web/app/controllers/main/admin/security/add/addSecurity_controller.js

@@ -90,11 +90,7 @@ App.AddSecurityController = App.WizardController.extend({
     var serviceConfigProperties = [];
     stepController.get('stepConfigs').forEach(function (_content) {
       _content.get('configs').forEach(function (_configProperties) {
-        var displayType = _configProperties.get('displayType');
-        if (displayType === 'directories' || displayType === 'directory') {
-          var value = _configProperties.get('value').trim().split(/\s+/g).join(',');
-          _configProperties.set('value', value);
-        }
+        _configProperties.set('value', App.config.trimProperty(_configProperties,true));
         var overrides = _configProperties.get('overrides');
         var overridesArray = [];
         if(overrides!=null){

ambari-web/app/controllers/main/service/info/configs.js

@@ -872,11 +872,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
   saveGlobalConfigs: function (configs) {
     var globalConfigs = this.get('globalConfigs');
     configs.filterProperty('id', 'puppet var').forEach(function (uiConfigProperty) {
-      var displayType = uiConfigProperty.get('displayType');
-      if (displayType == 'directories' || displayType === 'directory') {
-        var value = uiConfigProperty.get('value').replace(/,/g,' ').trim().split(/\s+/g).join(',');
-        uiConfigProperty.set('value', value);
-      }
+      uiConfigProperty.set('value', App.config.trimProperty(uiConfigProperty),true);
       if (globalConfigs.someProperty('name', uiConfigProperty.name)) {
         var modelGlobalConfig = globalConfigs.findProperty('name', uiConfigProperty.name);
         modelGlobalConfig.value = uiConfigProperty.value;

ambari-web/app/controllers/wizard/step8_controller.js

@@ -89,11 +89,7 @@ App.WizardStep8Controller = Em.Controller.extend({
    */
   formatDirectories: function(){
     this.get('content.serviceConfigProperties').forEach(function(_configProperty){
-      var displayType = _configProperty.displayType;
-      if (displayType === 'directories' || displayType === 'directory') {
-        var value = _configProperty.value.trim().split(/\s+/g).join(',');
-        _configProperty.value = value;
-      }
+        _configProperty.value = App.config.trimProperty(_configProperty,false);
     });
   },
 

ambari-web/app/data/HDP2/global_properties.js

@@ -1233,7 +1233,7 @@ module.exports =
       "description": "Database user name to use to connect to the database",
       "defaultValue": "hive",
       "isReconfigurable": true,
-      "displayType": "user",
+      "displayType": "host",
       "isOverridable": false,
       "isVisible": true,
       "domain": "global",
@@ -1566,7 +1566,7 @@ module.exports =
       "defaultValue": "oozie",
       "isReconfigurable": true,
       "isOverridable": false,
-      "displayType": "user",
+      "displayType": "host",
       "isVisible": true,
       //"domain": "global",
       "serviceName": "OOZIE",

ambari-web/app/messages.js

@@ -199,6 +199,8 @@ Em.I18n.translations = {
   'graphs.timeRange.year': 'Last 1 year',
 
   'users.userName.validationFail': 'Only lowercase letters and numbers are allowed; must start with a letter',
+  'host.spacesValidation': 'Can\'t contain whitespaces',
+  'host.trimspacesValidation': 'Can\'t contain leading or trailing whitespaces',
 
   'services.nagios.description':'Nagios Monitoring and Alerting system',
   'services.ganglia.description':'Ganglia Metrics Collection system',

ambari-web/app/models/service_config.js

@@ -543,6 +543,29 @@ App.ServiceConfigProperty = Ember.Object.extend({
             isError = true;
           }
           break;
+        case 'host':
+          var hiveOozieHostNames = ['hive_hostname','hive_existing_mysql_host','hive_existing_oracle_host','hive_ambari_host',
+          'oozie_hostname','oozie_existing_mysql_host','oozie_existing_oracle_host','oozie_ambari_host']
+          if(hiveOozieHostNames.contains(this.get('name'))) {
+            if (validator.hasSpaces(value)) {
+              this.set('errorMessage', Em.I18n.t('host.spacesValidation'));
+              isError = true;
+            }
+          } else {
+            if (validator.isNotTrimmed(value)) {
+              this.set('errorMessage', Em.I18n.t('host.trimspacesValidation'));
+              isError = true;
+            }
+          }
+          break;
+        case 'advanced':
+          if(this.get('name')=='hive_jdbc_connection_url' || this.get('name')=='oozie_jdbc_connection_url') {
+            if (validator.isNotTrimmed(value)) {
+              this.set('errorMessage', Em.I18n.t('host.trimspacesValidation'));
+              isError = true;
+            }
+          }
+          break;
         case 'password':
           // retypedPassword is set by the retypePasswordView child view of App.ServiceConfigPasswordField
           if (value !== this.get('retypedPassword')) {

ambari-web/app/utils/config.js

@@ -857,6 +857,39 @@ App.config = Em.Object.create({
     }
     console.log('ERROR: textarea config - ' + complexConfigName + ' is missing');
     return configs;
+  },
+
+  /**
+   * trim trailing spaces for all properties.
+   * trim both trailing and leading spaces for host displayType and hive/oozie datebases url.
+   * for directory or directories displayType format string for further using.
+   * for password and values with spaces only do nothing.
+   * @param property
+   * @returns {*}
+   */
+  trimProperty: function(property, isEmberObject){
+    var displayType = (isEmberObject) ? property.get('displayType') : property.displayType;
+    var value = (isEmberObject) ? property.get('value') : property.value;
+    var rez;
+    switch (displayType){
+      case 'directories':
+      case 'directory':
+        rez = value.trim().split(/\s+/g).join(',');
+        break;
+      case 'host':
+        rez = value.trim();
+        break;
+      case 'advanced':
+        if(this.get('name')=='hive_jdbc_connection_url' || this.get('name')=='oozie_jdbc_connection_url') {
+          rez = value.trim();
+        }
+        break;
+      case 'password':
+        break;
+      default:
+        rez = value.toString().replace(/(\s+$)/g, '');
+    }
+    return (rez == '') ? value : rez;
   }
 
 });

ambari-web/app/utils/validator.js

@@ -76,6 +76,15 @@ module.exports = {
     return regex.test(value);
   },
 
+  hasSpaces: function(value) {
+    var regex = /(\s+)/;
+    return regex.test(value);
+  },
+
+  isNotTrimmed: function(value) {
+    var regex = /(^\s+|\s+$)/;
+    return regex.test(value);
+  },
   /**
    * validate domain name with port
    * @param value