config: removed GetTlsPskByFullyQualifiedResourceNameCb from tls conf…

…igurations
bareos · Sep 20, 2018 · b6003f4 · b6003f4
1 parent e1007a1
commit b6003f4
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 75 deletions.
diff --git a/core/src/console/console_conf.cc b/core/src/console/console_conf.cc
@@ -114,16 +114,6 @@ static ResourceTable resources[] = {
    { NULL, NULL, 0 }
 };
 
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
-{
-//   char *fq_name_buffer = bstrdup(fq_name_);
-//   UnbashSpaces(fq_name_buffer);
-//   std::string fq_name(fq_name_buffer);
-//   free(fq_name_buffer);
-
-   return false;
-}
-
 } /* namespace console */
 
 using namespace console;

diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
@@ -3780,36 +3780,9 @@ static void PrintConfigCb(ResourceItem *items, int i, PoolMem &cfg_str, bool hid
    }
 }
 
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
-{
-   char *fq_name_buffer = bstrdup(fq_name_);
-   UnbashSpaces(fq_name_buffer);
-   std::string fq_name(fq_name_buffer);
-   free(fq_name_buffer);
-
-   const std::string ua("*UserAgent*");
-
-   bool success = false;
-   if (fq_name == ua) {
-      psk_return_value = me->password.value;
-      success = true;
-   } else {
-      ConsoleResource *res = reinterpret_cast<ConsoleResource*>(my_config->GetResWithName(R_CONSOLE, fq_name.c_str()));
-      if(res) {
-         psk_return_value = res->password.value;
-         success = true;
-      }
-   }
-   return success;
-}
-
 static void ConfigReadyCallback(ConfigurationParser &my_config)
 {
-  DirectorResource *resource = reinterpret_cast<DirectorResource*>(my_config.GetNextRes(R_DIRECTOR, NULL));
-  TlsResource *tls = dynamic_cast<TlsResource*>(resource);
-  if (tls) {
-    tls->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = GetTlsPskByFullyQualifiedResourceName;
-  }
+
 }
 
 ConfigurationParser *InitDirConfig(const char *configfile, int exit_code)

diff --git a/core/src/dird/dird_conf.h b/core/src/dird/dird_conf.h
@@ -663,7 +663,6 @@ extern "C" char *job_code_callback_director(JobControlRecord *jcr, const char*);
 const char *get_configure_usage_string();
 void DestroyConfigureUsageString();
 bool PopulateDefs();
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value);
 
 } /* namespace directordaemon */
 #endif // BAREOS_DIRD_DIRD_CONF_H_
diff --git a/core/src/filed/filed_conf.cc b/core/src/filed/filed_conf.cc
@@ -251,20 +251,9 @@ static void ParseConfigCb(LEX *lc, ResourceItem *item, int index, int pass)
    }
 }
 
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
-{
-//   char *fq_name_buffer = bstrdup(fq_name_);
-//   UnbashSpaces(fq_name_buffer);
-//   std::string fq_name(fq_name_buffer);
-//   free(fq_name_buffer);
-
-   return false;
-}
-
 static void ConfigReadyCallback(ConfigurationParser &my_config)
 {
-  ClientResource *client_resource = (ClientResource *)my_config.GetNextRes(R_CLIENT, NULL);
-  client_resource->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = GetTlsPskByFullyQualifiedResourceName;
+
 }
 
 ConfigurationParser *InitFdConfig(const char *configfile, int exit_code)

diff --git a/core/src/filed/filed_conf.h b/core/src/filed/filed_conf.h
@@ -125,7 +125,6 @@ union UnionOfResources {
 
 ConfigurationParser *InitFdConfig(const char *configfile, int exit_code);
 bool PrintConfigSchemaJson(PoolMem &buffer);
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value);
 
 } /* namespace filedaemon */
 #endif /* BAREOS_FILED_FILED_CONF_H_ */
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -495,7 +495,7 @@ bool BareosSocket::ParameterizeAndInitTlsConnection(TlsResource *tls_configurati
 
   if (tls_configuration->tls_psk.enable) {
     if (initiated_by_remote) {
-      tls_conn->SetTlsPskServerContext(tls_configuration->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb);
+      //tls_conn->SetTlsPskServerContext(tls_configuration->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb);
     } else {
       const PskCredentials psk_cred(identity, password);
       tls_conn->SetTlsPskClientContext(psk_cred);

diff --git a/core/src/lib/tls.h b/core/src/lib/tls.h
@@ -29,6 +29,7 @@
 
 #include <bareos.h>
 #include "lib/tls_conf_psk.h"
+#include "tls_conf_psk_callback.h"
 
 class BareosSocket;
 class JobControlRecord;

diff --git a/core/src/lib/tls_conf_psk.h b/core/src/lib/tls_conf_psk.h
@@ -24,17 +24,14 @@
 
 #include "lib/tls_psk_credentials.h"
 #include "lib/tls_conf_base.h"
-#include "lib/tls_conf_psk_callback.h"
 
 #include <bareos.h>
 
 class DLL_IMP_EXP TlsConfigPsk : public TlsConfigBase {
  public:
   char *cipherlist; /* TLS Cipher List */
 
-  GetTlsPskByFullyQualifiedResourceNameCb_t GetTlsPskByFullyQualifiedResourceNameCb;
-
-  TlsConfigPsk() : TlsConfigBase(), cipherlist(nullptr), GetTlsPskByFullyQualifiedResourceNameCb(nullptr)
+  TlsConfigPsk() : TlsConfigBase(), cipherlist(nullptr)
   {
   }
   ~TlsConfigPsk();

diff --git a/core/src/lib/tls_openssl.h b/core/src/lib/tls_openssl.h
@@ -21,7 +21,7 @@
 #ifndef BAREOS_LIB_TLS_OPENSSL_H_
 #define BAREOS_LIB_TLS_OPENSSL_H_
 
-#include "tls_conf_psk_callback.h"
+#include "lib/tls.h"
 
 #include <bareos.h>
 #include <memory>

diff --git a/core/src/lib/unittests/create_resource.cc b/core/src/lib/unittests/create_resource.cc
@@ -67,7 +67,6 @@ directordaemon::ConsoleResource *CreateAndInitializeNewConsoleResource()
 {
   directordaemon::ConsoleResource *cons = new (directordaemon::ConsoleResource);
   cons->tls_psk.enable = false;
-  cons->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = directordaemon::GetTlsPskByFullyQualifiedResourceName;
   cons->tls_cert.certfile = new (std::string)(CERTDIR "/console.bareos.org-cert.pem");
   cons->tls_cert.keyfile = new (std::string)(CERTDIR "/console.bareos.org-key.pem");
   cons->tls_cert.CaCertfile = new (std::string)(CERTDIR "/bareos-ca.pem");
@@ -86,7 +85,6 @@ directordaemon::StorageResource *CreateAndInitializeNewStorageResource()
   store->address = (char *)HOST;
   store->SDport = htons(BSOCK_TEST_PORT_NUMBER);
   store->tls_psk.enable = false;
-  store->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = directordaemon::GetTlsPskByFullyQualifiedResourceName;
   store->tls_cert.certfile = new (std::string)(CERTDIR "/bareos-dir.bareos.org-cert.pem");
   store->tls_cert.keyfile = new (std::string)(CERTDIR "/bareos-dir.bareos.org-key.pem");
   store->tls_cert.CaCertfile = new (std::string)(CERTDIR "/bareos-ca.pem");
@@ -101,7 +99,6 @@ directordaemon::DirectorResource *CreateAndInitializeNewDirectorResource()
 {
   directordaemon::DirectorResource *dir = new (directordaemon::DirectorResource);
   dir->tls_psk.enable = false;
-  dir->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = directordaemon::GetTlsPskByFullyQualifiedResourceName;
   dir->tls_cert.certfile = new (std::string)(CERTDIR "/bareos-dir.bareos.org-cert.pem");
   dir->tls_cert.keyfile = new (std::string)(CERTDIR "/bareos-dir.bareos.org-key.pem");
   dir->tls_cert.CaCertfile = new (std::string)(CERTDIR "/bareos-ca.pem");
@@ -121,7 +118,6 @@ storagedaemon::DirectorResource *CreateAndInitializeNewDirectorResource()
 {
   storagedaemon::DirectorResource *dir = new (storagedaemon::DirectorResource);
   dir->tls_psk.enable = false;
-  dir->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = storagedaemon::GetTlsPskByFullyQualifiedResourceName;
   dir->tls_cert.certfile = new (std::string)(CERTDIR "/bareos-dir.bareos.org-cert.pem");
   dir->tls_cert.keyfile = new (std::string)(CERTDIR "/bareos-dir.bareos.org-key.pem");
   dir->tls_cert.CaCertfile = new (std::string)(CERTDIR "/bareos-ca.pem");

diff --git a/core/src/stored/stored_conf.cc b/core/src/stored/stored_conf.cc
@@ -496,20 +496,8 @@ static void ParseConfigCb(LEX *lc, ResourceItem *item, int index, int pass)
    }
 }
 
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
-{
-//   char *fq_name_buffer = bstrdup(fq_name_);
-//   UnbashSpaces(fq_name_buffer);
-//   std::string fq_name(fq_name_buffer);
-//   free(fq_name_buffer);
-
-   return false;
-}
-
 static void ConfigReadyCallback(ConfigurationParser &my_config)
 {
-  StorageResource *client_resource = (StorageResource *)my_config.GetNextRes(R_STORAGE, NULL);
-  client_resource->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = GetTlsPskByFullyQualifiedResourceName;
 }
 
 ConfigurationParser *InitSdConfig(const char *configfile, int exit_code)

diff --git a/core/src/stored/stored_conf.h b/core/src/stored/stored_conf.h
@@ -203,7 +203,6 @@ union UnionOfResources {
 
 ConfigurationParser *InitSdConfig(const char *configfile, int exit_code);
 bool PrintConfigSchemaJson(PoolMem &buffer);
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value);
 
 } /* namespace storagedaemon */
 #endif /* BAREOS_STORED_STORED_CONF_H_ */