Repository: ambari Updated Branches: refs/heads/trunk 1c4cca322 -> a8bbcc776
AMBARI-11004. HBase&Hive services display passwords in plain text in Ambari 2.1 (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8bbcc77 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8bbcc77 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8bbcc77 Branch: refs/heads/trunk Commit: a8bbcc7766696b4e5cc241a83b158cc1b790ec2c Parents: 1c4cca3 Author: Aleksandr Kovalenko <[email protected]> Authored: Thu May 14 14:36:27 2015 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu May 14 14:36:27 2015 +0300 ---------------------------------------------------------------------- .../0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml | 5 ++++- .../RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml | 3 ++- .../HBASE/configuration/ranger-hbase-plugin-properties.xml | 5 ++++- .../HDFS/configuration/ranger-hdfs-plugin-properties.xml | 5 ++++- .../HIVE/configuration/ranger-hive-plugin-properties.xml | 5 ++++- .../STORM/configuration/ranger-storm-plugin-properties.xml | 5 ++++- .../YARN/configuration/ranger-yarn-plugin-properties.xml | 3 +++ ambari-web/app/data/HDP2.2/site_properties.js | 5 +++++ 8 files changed, 30 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml index 50ea052..9f58e92 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml @@ -144,6 +144,7 @@ <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -156,6 +157,7 @@ <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -192,13 +194,14 @@ <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> <description>Audit database password</description> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> - <description>Audit database password</description> + <description>Audit database hostname</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml index 57ad221..fee9014 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml @@ -92,6 +92,7 @@ <property> <name>KMS_MASTER_KEY_PASSWD</name> <value>Str0ngPassw0rd</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -266,4 +267,4 @@ <description></description> </property> -</configuration> \ No newline at end of file +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml index f60d06f..89faba4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml @@ -138,6 +138,7 @@ <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -150,6 +151,7 @@ <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -192,13 +194,14 @@ <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> <description>Audit database password</description> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> - <description>Audit database password</description> + <description>Audit database hostname</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml index de82356..6115ef7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml @@ -142,6 +142,7 @@ <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -154,6 +155,7 @@ <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -191,13 +193,14 @@ <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> <description>Audit database password</description> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> - <description>Audit database password</description> + <description>Audit database hostname</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml index f893020..4ea10b5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml @@ -144,6 +144,7 @@ <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -156,6 +157,7 @@ <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -198,13 +200,14 @@ <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> <description>Audit database password</description> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> - <description>Audit database password</description> + <description>Audit database hostname</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml index 512a455..767976e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml @@ -138,6 +138,7 @@ <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -150,6 +151,7 @@ <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -186,13 +188,14 @@ <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> <description>Audit database password</description> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> - <description>Audit database password</description> + <description>Audit database hostname</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml index 7fa47d9..b75bcea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml @@ -65,6 +65,7 @@ <property> <name>XAAUDIT.DB.PASSWORD</name> <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -217,6 +218,7 @@ <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> <description></description> </property> @@ -229,6 +231,7 @@ <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <value>changeit</value> + <property-type>PASSWORD</property-type> <description></description> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8bbcc77/ambari-web/app/data/HDP2.2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js index a698b60..976fe21 100644 --- a/ambari-web/app/data/HDP2.2/site_properties.js +++ b/ambari-web/app/data/HDP2.2/site_properties.js @@ -150,6 +150,7 @@ hdp22properties.push( "id": "site property", "name": "REPOSITORY_CONFIG_PASSWORD", "displayName": "Ranger repository config password", + "displayType": "password", "filename": "ranger-hdfs-plugin-properties.xml", "category": "Advanced ranger-hdfs-plugin-properties", "serviceName": "HDFS" @@ -207,6 +208,7 @@ hdp22properties.push( "id": "site property", "name": "REPOSITORY_CONFIG_PASSWORD", "displayName": "Ranger repository config password", + "displayType": "password", "filename": "ranger-hive-plugin-properties.xml", "category": "Advanced ranger-hive-plugin-properties", "serviceName": "HIVE" @@ -274,6 +276,7 @@ hdp22properties.push( "id": "site property", "name": "REPOSITORY_CONFIG_PASSWORD", "displayName": "Ranger repository config password", + "displayType": "password", "filename": "ranger-hbase-plugin-properties.xml", "category": "Advanced ranger-hbase-plugin-properties", "serviceName": "HBASE" @@ -341,6 +344,7 @@ hdp22properties.push( "id": "site property", "name": "REPOSITORY_CONFIG_PASSWORD", "displayName": "Ranger repository config password", + "displayType": "password", "filename": "ranger-storm-plugin-properties.xml", "category": "Advanced ranger-storm-plugin-properties", "serviceName": "STORM" @@ -398,6 +402,7 @@ hdp22properties.push( "id": "site property", "name": "REPOSITORY_CONFIG_PASSWORD", "displayName": "Ranger repository config password", + "displayType": "password", "filename": "ranger-knox-plugin-properties.xml", "category": "Advanced ranger-knox-plugin-properties", "serviceName": "KNOX"
