Merge remote-tracking branch 'origin/wl11231' into wl11451-jdbc

Author: rsomla1

devapi/tests/session-t.cc

@@ -306,6 +306,8 @@ TEST_F(Sess, auth_method)
 {
   SKIP_IF_NO_XPLUGIN;
 
+  USE_NATIVE_PWD;
+
   auto check_user = [](mysqlx::Session &sess)
   {
     SqlResult res = sess.sql("SELECT CURRENT_USER()").execute();
@@ -418,6 +420,8 @@ TEST_F(Sess, ssl_session)
 
   SKIP_IF_NO_XPLUGIN;
 
+  USE_NATIVE_PWD;
+
   //Test if ssl is enabled using cipher
   auto check_ssl_impl = [](mysqlx::Session &sess, bool enable, int line)
   {
@@ -705,6 +709,8 @@ TEST_F(Sess, ipv6)
 
   SKIP_IF_NO_XPLUGIN;
 
+  USE_NATIVE_PWD;
+
   {
     mysqlx::Session sess(SessionOption::HOST, "::1",
                           SessionOption::PORT, get_port(),

testing/test.h

@@ -216,6 +216,8 @@ class Xplugin : public ::testing::Test
     }
 
   }
+
+  friend class Use_native_pwd;
 };
 
 
@@ -228,7 +230,34 @@ class Xplugin::Session : public mysqlx::Session
   {}
 };
 
-}} // cdk::test
+
+class Use_native_pwd
+{
+  Xplugin& m_xplugin;
+  const char* m_user;
+  const char* m_password;
+
+public:
+  Use_native_pwd(Xplugin &xplugin)
+    : m_xplugin(xplugin)
+  {
+    m_xplugin.sql("CREATE USER unsecure_root IDENTIFIED WITH 'mysql_native_password';");
+    m_xplugin.sql("grant all on *.* to unsecure_root;");
+    m_user = m_xplugin.m_user;
+    m_password = m_xplugin.m_password;
+    m_xplugin.m_user = "unsecure_root";
+    m_password = NULL;
+  }
+
+  ~Use_native_pwd()
+  {
+    m_xplugin.sql("DROP USER unsecure_root");
+    m_xplugin.m_user = m_user;
+    m_xplugin.m_password = m_password;
+  }
+};
+
+}} // mysql::test
 
 
 #define SKIP_IF_NO_XPLUGIN  \
@@ -260,3 +289,6 @@ class Xplugin::Session : public mysqlx::Session
   } while(false)
 
 #endif
+
+#define USE_NATIVE_PWD  \
+  mysqlx::test::Use_native_pwd __dummy_user__(*this)

xapi/tests/test.h

@@ -290,6 +290,31 @@ class xapi : public ::testing::Test
 public:
   mysqlx_session_t *get_session() { return m_sess; }
 
+  friend class use_native_pwd;
+};
+
+
+class use_native_pwd
+{
+  xapi& m_xapi;
+  const char* m_user;
+
+public:
+  use_native_pwd(xapi &xapi_obj)
+    : m_xapi(xapi_obj)
+  {
+    m_xapi.authenticate();
+    m_xapi.exec_sql("CREATE USER unsecure_root IDENTIFIED WITH 'mysql_native_password';");
+    m_xapi.exec_sql("grant all on *.* to unsecure_root;");
+    m_user = m_xapi.m_xplugin_usr;
+    m_xapi.m_xplugin_usr = "unsecure_root";
+  }
+
+  ~use_native_pwd()
+  {
+    m_xapi.exec_sql("DROP USER unsecure_root");
+    m_xapi.m_xplugin_usr = m_user;
+  }
 };
 
 
@@ -312,6 +337,11 @@ class xapi : public ::testing::Test
     return; \
   }
 
+#define USE_NATIVE_PWD  \
+  use_native_pwd __dummy_user__(*this)
+
+
+
 class xapi_bugs : public xapi
 {};
 

xapi/tests/xapi-t.cc

@@ -327,6 +327,8 @@ TEST_F(xapi, conn_string_test)
 {
   SKIP_IF_NO_XPLUGIN
 
+  USE_NATIVE_PWD;
+
   unsigned short port = 0;
   char conn_error[MYSQLX_MAX_ERROR_LEN] = { 0 };
   std::string  conn_str_basic;
@@ -754,6 +756,8 @@ TEST_F(xapi, auth_method)
 {
   SKIP_IF_NO_XPLUGIN
 
+  USE_NATIVE_PWD;
+
   char conn_error[MYSQLX_MAX_ERROR_LEN] = { 0 };
   int conn_err_code = 0;
   mysqlx_session_t *local_sess = NULL;
@@ -931,6 +935,8 @@ TEST_F(xapi, conn_options_test)
 {
   SKIP_IF_NO_XPLUGIN
 
+  USE_NATIVE_PWD;
+
   unsigned int port2 = 0;
   unsigned int ssl_enable = 0;
   char conn_error[MYSQLX_MAX_ERROR_LEN] = { 0 };