This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0c03cd4880 AMBARI-25296: alert_ldap_password for Hive service check
does not allow single-quotes (#3403)
0c03cd4880 is described below
commit 0c03cd48804ca698188bb0b0cdec313883a53c6d
Author: Zhiguo Wu <wuzhi...@apache.org>
AuthorDate: Sun Oct 16 01:42:40 2022 +0800
AMBARI-25296: alert_ldap_password for Hive service check does not allow
single-quotes (#3403)
---
.../resource_management/libraries/functions/hive_check.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
index 9c61cab9eb..fa3eb7e00a 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
@@ -22,6 +22,7 @@ from resource_management.core import global_lock
from resource_management.core.resources import Execute
from resource_management.libraries.functions import format
from resource_management.core.signal_utils import TerminateStrategy
+from resource_management.core.shell import quote_bash_args
def check_thrift_port_sasl(address, port, hive_auth="NOSASL", key=None,
kinitcmd=None, smokeuser='ambari-qa',
@@ -51,10 +52,13 @@ def check_thrift_port_sasl(address, port,
hive_auth="NOSASL", key=None, kinitcmd
if hive_auth == "NOSASL":
beeline_url.append('auth=noSasl')
- credential_str = ""
+ credential_str = "-n {hive_user}"
+
# append username and password for LDAP
if hive_auth == "LDAP":
- credential_str = "-n '{ldap_username}' -p '{ldap_password!p}'"
+ # password might contain special characters that need to be escaped
+ quoted_ldap_password = quote_bash_args(ldap_password)
+ credential_str = "-n {ldap_username} -p {quoted_ldap_password!p}"
# append url according to ssl configuration
if ssl and ssl_keystore is not None and ssl_password is not None:
@@ -74,9 +78,9 @@ def check_thrift_port_sasl(address, port, hive_auth="NOSASL",
key=None, kinitcmd
# -n the user to connect as (ignored when using the hive principal in the
URL, can be different from the user running the beeline command)
# -e ';' executes a SQL commmand of NOOP
- cmd = ("beeline -n %s -u '%s' %s -e ';' 2>&1 | awk '{print}' | grep -i " + \
+ cmd = ("beeline -u '%s' %s -e ';' 2>&1 | awk '{print}' | grep -i " + \
"-e 'Connected to:' -e 'Transaction isolation:' -e 'inactive HS2
instance; use service discovery'") % \
- (format(hive_user), format(";".join(beeline_url)),
format(credential_str))
+ (format(";".join(beeline_url)), format(credential_str))
Execute(cmd,
user=smokeuser,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
