This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch ranger-2.6 in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 9a11223d45a5beb83a8fc91ef207ff0eb3525cb1 Author: justusrk <[email protected]> AuthorDate: Tue Sep 10 21:56:07 2024 +0530 RANGER-3880: updated dba_script.py to set useSSL flag (#173) (cherry picked from commit 7757ea669c82e5a52af726366979034343b930d7) --- kms/scripts/dba_script.py | 3 +++ security-admin/scripts/dba_script.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/kms/scripts/dba_script.py b/kms/scripts/dba_script.py index 544c1201b..7e7b4e1ce 100755 --- a/kms/scripts/dba_script.py +++ b/kms/scripts/dba_script.py @@ -162,6 +162,9 @@ class MysqlConf(BaseDB): db_ssl_cert_param=" -Djavax.net.ssl.trustStore=%s -Djavax.net.ssl.trustStorePassword=%s " %(self.javax_net_ssl_trustStore,self.javax_net_ssl_trustStorePassword) else: db_ssl_cert_param=" -Djavax.net.ssl.keyStore=%s -Djavax.net.ssl.keyStorePassword=%s -Djavax.net.ssl.trustStore=%s -Djavax.net.ssl.trustStorePassword=%s " %(self.javax_net_ssl_keyStore,self.javax_net_ssl_keyStorePassword,self.javax_net_ssl_trustStore,self.javax_net_ssl_trustStorePassword) + else: + if "useSSL" not in db_name: + db_ssl_param="?useSSL=false" if is_unix: jisql_cmd = "%s %s -cp %s:%s/jisql/lib/* org.apache.util.sql.Jisql -driver mysqlconj -cstring jdbc:mysql://%s/%s%s -u %s -p '%s' -noheader -trim -c \;" %(self.JAVA_BIN,db_ssl_cert_param,self.SQL_CONNECTOR_JAR,path,self.host,db_name,db_ssl_param,user,password) elif os_name == "WINDOWS": diff --git a/security-admin/scripts/dba_script.py b/security-admin/scripts/dba_script.py index 0ba396944..5f96ef26d 100644 --- a/security-admin/scripts/dba_script.py +++ b/security-admin/scripts/dba_script.py @@ -189,6 +189,9 @@ class MysqlConf(BaseDB): db_ssl_cert_param=" -Djavax.net.ssl.trustStore=%s -Djavax.net.ssl.trustStorePassword=%s " %(self.javax_net_ssl_trustStore,self.javax_net_ssl_trustStorePassword) else: db_ssl_cert_param=" -Djavax.net.ssl.keyStore=%s -Djavax.net.ssl.keyStorePassword=%s -Djavax.net.ssl.trustStore=%s -Djavax.net.ssl.trustStorePassword=%s " %(self.javax_net_ssl_keyStore,self.javax_net_ssl_keyStorePassword,self.javax_net_ssl_trustStore,self.javax_net_ssl_trustStorePassword) + else: + if "useSSL" not in db_name: + db_ssl_param="?useSSL=false" if is_unix: jisql_cmd = "%s %s -cp %s:%s/jisql/lib/* org.apache.util.sql.Jisql -driver mysqlconj -cstring jdbc:mysql://%s/%s%s -u %s -p '%s' -noheader -trim -c \;" %(self.JAVA_BIN,db_ssl_cert_param,self.SQL_CONNECTOR_JAR,path,self.host,db_name,db_ssl_param,user,password) elif os_name == "WINDOWS":
