BUG#35696649 ADD TLS SUPPORT FOR REMAINING TESTS AND TOOLS

Adds TLS support for ndb tests and test tools that do not use
yet Ndb_cluster_connection from test-wide NDBT_Context.

Change-Id: If403f21d17c245875370cad57a289ed8072ceef4

Author: rubikshift

storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.cpp

@@ -820,6 +820,7 @@ NdbApiTwsDriver::initConnection() {
     cout << "creating cluster connection ..." << flush;
     assert(!mgmdConnect.empty());
     mgmd = new Ndb_cluster_connection(mgmdConnect.c_str());
+    mgmd->configure_tls(opt_tls_search_path, opt_mgm_tls);
     cout << " [ok]" << endl; // no useful mgmd->string conversion
 
     // connect to cluster management node (ndb_mgmd)

storage/ndb/test/crund/src/cpp/NdbapiAB.cpp

@@ -265,6 +265,7 @@ NdbapiAB::init() {
     cout << "creating cluster connection ..." << flush;
     assert(!mgmdConnect.empty());
     mgmd = new Ndb_cluster_connection(mgmdConnect.c_str());
+    mgmd->configure_tls(opt_tls_search_path, opt_mgm_tls);
     cout << " [ok: mgmd@" << mgmdConnect << "]" << endl;
 }
 

storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.cpp

@@ -761,6 +761,7 @@ NdbapiTwsDriver::initConnection() {
     cout << "creating cluster connection ..." << flush;
     assert(!mgmdConnect.empty());
     mgmd = new Ndb_cluster_connection(mgmdConnect.c_str());
+    mgmd->configure_tls(opt_tls_search_path, opt_mgm_tls);
     cout << " [ok: mgmd@" << mgmdConnect << "]" << endl;
 
     // connect to cluster management node (ndb_mgmd)

storage/ndb/test/include/NDBT.hpp

@@ -32,6 +32,10 @@
  *
  */
 
+// ndb_opts.h contains declaration of opt_tls_search_path and opt_mgm_tls
+// including this file will help to enable TLS support in test programs
+#include <ndb_opts.h>
+
 #include "NDBT_ReturnCodes.h"
 
 #ifdef __cplusplus

storage/ndb/test/include/NdbMgmd.hpp

@@ -42,6 +42,7 @@
 #include <InputStream.hpp>
 
 #include "NdbSleep.h"
+#include "util/TlsKeyManager.hpp"
 
 class NdbMgmd {
   BaseString m_connect_str;
@@ -148,14 +149,20 @@ class NdbMgmd {
   }
 
   bool connect(const char* connect_string = NULL,
-               int num_retries = 12, int retry_delay_in_seconds = 5) {
+               int num_retries = 12, int retry_delay_in_seconds = 5, bool use_tls=true) {
     require(m_handle == NULL);
+
+    TlsKeyManager tlsKeyManager;
+    extern const char* opt_tls_search_path;
+    extern unsigned long long opt_mgm_tls;
+
     m_handle= ndb_mgm_create_handle();
     if (!m_handle){
       error("connect: ndb_mgm_create_handle failed");
       return false;
     }
 
+
     if (ndb_mgm_set_connectstring(m_handle,
                                   connect_string ?
                                   connect_string : getConnectString()) != 0){
@@ -169,7 +176,16 @@ class NdbMgmd {
       return false;
     }
 
-    if (ndb_mgm_connect(m_handle,num_retries,retry_delay_in_seconds,0) != 0){
+    int connect_status = -1;
+    if(use_tls) {
+      tlsKeyManager.init_mgm_client(opt_tls_search_path);
+      ndb_mgm_set_ssl_ctx(m_handle, tlsKeyManager.ctx());
+      connect_status = ndb_mgm_connect_tls(m_handle,num_retries,retry_delay_in_seconds,0,opt_mgm_tls);
+    } else {
+      connect_status = ndb_mgm_connect(m_handle,num_retries,retry_delay_in_seconds,0);
+    }
+
+    if (connect_status != 0){
       error("connect: ndb_mgm_connect failed");
       return false;
     }

storage/ndb/test/include/NdbRestarter.hpp

@@ -29,6 +29,7 @@
 #include "mgmcommon/NdbMgm.hpp"
 #include <Vector.hpp>
 #include <BaseString.hpp>
+#include "util/TlsKeyManager.hpp"
 
 #define NDBT_NO_NODE_GROUP_ID (int(-256))
 
@@ -143,7 +144,8 @@ class NdbRestarter {
    */
   Vector<Vector<int> > splitNodes();
 
-  NdbMgmHandle handle;  
+  NdbMgmHandle handle;
+  TlsKeyManager tlsKeyManager;
 
   enum NodeSelector
   {

storage/ndb/test/include/NdbTest.hpp

@@ -33,6 +33,10 @@
  *
  */
 
+// ndb_opts.h contains declaration of opt_tls_search_path and opt_mgm_tls
+// including this file will help to enable TLS support in test programs
+#include <ndb_opts.h>
+
 #include "NDBT_ReturnCodes.h"
 
 #ifdef __cplusplus

storage/ndb/test/ndbapi/bank/bankCreator.cpp

@@ -57,6 +57,7 @@ int main(int argc, const char** argv){
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/bank/bankMakeGL.cpp

@@ -53,6 +53,7 @@ int main(int argc, const char** argv){
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp

@@ -53,6 +53,7 @@ int main(int argc, const char** argv){
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/bank/bankTimer.cpp

@@ -56,6 +56,7 @@ int main(int argc, const char** argv){
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp

@@ -56,6 +56,7 @@ int main(int argc, const char** argv){
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp

@@ -54,6 +54,7 @@ int main(int argc, const char** argv){
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/bench/userInterface.cpp

@@ -554,6 +554,7 @@ UserHandle*
 userDbConnect(uint32 createDb, const char *dbName)
 {
   Ndb_cluster_connection *con= new Ndb_cluster_connection();
+  con->configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con->connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;

storage/ndb/test/ndbapi/create_all_tabs.cpp

@@ -57,6 +57,7 @@ int main(int argc, const char** argv){
 
   // Connect to Ndb
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/create_tab.cpp

@@ -115,6 +115,7 @@ int main(int argc, const char** argv){
 
     // Connect to Ndb
     Ndb_cluster_connection con(_connectstr);
+    con.configure_tls(opt_tls_search_path, opt_mgm_tls);
     if(con.connect(12, 5, 1) != 0)
     {
       return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/drop_all_tabs.cpp

@@ -50,6 +50,7 @@ int main(int argc, const char** argv){
 
   // Connect to Ndb
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/flexAsynch.cpp

@@ -351,6 +351,7 @@ int main(int argc, char** argv)
   for (int i = 0; i < tConnections; i++)
   {
     g_cluster_connection[i] = new Ndb_cluster_connection();
+    g_cluster_connection[i]->configure_tls(opt_tls_search_path, opt_mgm_tls);
     ndbout_c("CPU for this connection: %u", receiveCPUArray[i]);
   }
   for (int i = 0; i < tConnections; i++)

storage/ndb/test/ndbapi/flexBench.cpp

@@ -340,6 +340,7 @@ int main(int argc, char** argv)
   NdbThread_SetConcurrencyLevel(tNoOfThreads + 2);
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/flexHammer.cpp

@@ -65,7 +65,6 @@ Revision history:
 #include <NdbTick.h>
 #include <NdbOut.hpp>
 #include <NdbTimer.hpp>
-#include <NdbTick.h>
 #include <NdbTest.hpp>
 #include <NDBT_Error.hpp>
 #include <NdbSchemaCon.hpp>
@@ -233,6 +232,7 @@ int main(int argc, char** argv)
   }
   // Create and init Ndb object
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/flexTT.cpp

@@ -244,6 +244,7 @@ int main(int argc, char** argv)
   setTableNames();
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/slow_select.cpp

@@ -28,6 +28,7 @@
 #include <NdbApi.hpp>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
+#include <ndb_opts.h>
 
 struct
 S_Scan {
@@ -69,6 +70,7 @@ main(void){
   ndb_init();
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return 1;

storage/ndb/test/ndbapi/testBitfield.cpp

@@ -68,6 +68,9 @@ main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_ndb_connectstring, opt_ndb_nodeid);
+  extern const char* opt_tls_search_path;
+  extern unsigned long long opt_mgm_tls;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1))
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/testBlobs.cpp

@@ -6327,6 +6327,7 @@ int main(int argc, char** argv)
   }
   ndbout << cmdline << endl;
   g_ncc = new Ndb_cluster_connection();
+  g_ncc->configure_tls(opt_tls_search_path, opt_mgm_tls);
   if (g_ncc->connect(30) != 0 || testmain() == -1 || testperf() == -1) {
     ndbout << "line " << __LINE__ << " FAIL loop=" << g_loop << endl;
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/testDataBuffers.cpp

@@ -628,6 +628,7 @@ int main(int argc, char** argv)
     unsigned ok = true;
 
     Ndb_cluster_connection con;
+    con.configure_tls(opt_tls_search_path, opt_mgm_tls);
     if(con.connect(12, 5, 1))
     {
       return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/testDeadlock.cpp

@@ -513,6 +513,7 @@ int main(int argc, char** argv)
   }
 
   Ndb_cluster_connection con;
+  con.configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/test/ndbapi/testIndex.cpp

@@ -35,6 +35,7 @@
 #include <NdbSqlUtil.hpp>
 #include <BlockNumbers.h>
 #include "portlib/NdbSleep.h"
+#include "util/TlsKeyManager.hpp"
 
 #define CHECK(b) if (!(b)) { \
   g_err << "ERR: "<< step->getName() \
@@ -2687,6 +2688,9 @@ runBug56829(NDBT_Context* ctx, NDBT_Step* step)
   const int rows = ctx->getNumRecords();
   const char* mgm = 0;//XXX ctx->getRemoteMgm();
 
+  TlsKeyManager tlsKeyManager;
+  tlsKeyManager.init_mgm_client(opt_tls_search_path);
+
   char tabname[100];
   strcpy(tabname, tab.getName());
   char indname[100];
@@ -2711,7 +2715,8 @@ runBug56829(NDBT_Context* ctx, NDBT_Step* step)
     {
       CHECK2((h = ndb_mgm_create_handle()) != 0, "mgm: failed to create handle");
       CHECK2(ndb_mgm_set_connectstring(h, mgm) == 0, ndb_mgm_get_latest_error_msg(h));
-      CHECK2(ndb_mgm_connect(h, 0, 0, 0) == 0, ndb_mgm_get_latest_error_msg(h));
+      ndb_mgm_set_ssl_ctx(h, tlsKeyManager.ctx());
+      CHECK2(ndb_mgm_connect_tls(h, 0, 0, 0, opt_mgm_tls) == 0, ndb_mgm_get_latest_error_msg(h));
       g_info << "mgm: connected to " << (mgm ? mgm : "default") << endl;
 
       // make bitmask of DB nodes

storage/ndb/test/ndbapi/testIndexStat.cpp

@@ -2144,6 +2144,7 @@ doconnect()
 {
   g_ncc = new Ndb_cluster_connection();
   require(g_ncc != 0);
+  g_ncc->configure_tls(opt_tls_search_path, opt_mgm_tls);
   chkdb(g_ncc->connect(30) == 0);
   g_ndb = new Ndb(g_ncc, "TEST_DB");
   require(g_ndb != 0);

storage/ndb/test/ndbapi/testLcp.cpp

@@ -271,6 +271,7 @@ static int parse_args(int argc, char** argv)
 static int connect_ndb()
 {
   g_cluster_connection = new Ndb_cluster_connection();
+  g_cluster_connection->configure_tls(opt_tls_search_path, opt_mgm_tls);
   if(g_cluster_connection->connect(12, 5, 1) != 0)
   {
     return 1;