F #3064: add datasores clusters encrypted attrs (#3722)

include/ClusterPool.h

@@ -26,7 +26,9 @@ using namespace std;
 class ClusterPool : public PoolSQL
 {
 public:
-    ClusterPool(SqlDB * db, const VectorAttribute * vnc_conf);
+    ClusterPool(SqlDB * db,
+                const VectorAttribute * vnc_conf,
+                vector<const SingleAttribute *>& encrypted_attrs);
 
     ~ClusterPool(){};
 

include/ClusterTemplate.h

@@ -31,8 +31,33 @@ public:
         Template(false,'=',"TEMPLATE"){};
 
     ~ClusterTemplate(){};
-};
 
+    ClusterTemplate(ClusterTemplate& ct):Template(ct){};
+
+    // -------------------------------------------------------------------------
+    // Encrypted attributes interface implementation
+    // -------------------------------------------------------------------------
+    virtual void encrypt(const std::string& one_key)
+    {
+        Template::encrypt(one_key, encrypted);
+    }
+
+    virtual void decrypt(const std::string& one_key)
+    {
+        Template::decrypt(one_key, encrypted);
+    }
+
+    static void parse_encrypted(vector<const SingleAttribute *>& ea)
+    {
+        Template::parse_encrypted(ea, encrypted);
+    }
+
+private:
+    /**
+     *  Encrypted attribute list for ClusterTemplates
+     */
+    static std::map<std::string, std::set<std::string> > encrypted;
+};
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 

include/DatastorePool.h

@@ -26,7 +26,9 @@ using namespace std;
 class DatastorePool : public PoolSQL
 {
 public:
-    DatastorePool(SqlDB * db, const vector<const SingleAttribute *>& _inherit_attrs);
+    DatastorePool(SqlDB * db,
+                  const vector<const SingleAttribute *>& _inherit_attrs,
+                  vector<const SingleAttribute *>& encrypted_attrs);
 
     ~DatastorePool(){};
 

include/DatastoreTemplate.h

@@ -31,6 +31,32 @@ public:
         Template(false,'=',"TEMPLATE"){};
 
     ~DatastoreTemplate(){};
+
+    DatastoreTemplate(DatastoreTemplate& dt):Template(dt){};
+
+    // -------------------------------------------------------------------------
+    // Encrypted attributes interface implementation
+    // -------------------------------------------------------------------------
+    virtual void encrypt(const std::string& one_key)
+    {
+        Template::encrypt(one_key, encrypted);
+    }
+
+    virtual void decrypt(const std::string& one_key)
+    {
+        Template::decrypt(one_key, encrypted);
+    }
+
+    static void parse_encrypted(vector<const SingleAttribute *>& ea)
+    {
+        Template::parse_encrypted(ea, encrypted);
+    }
+
+private:
+    /**
+     *  Encrypted attribute list for DatastoreTemlpates
+     */
+    static std::map<std::string, std::set<std::string> > encrypted;
 };
 
 /* -------------------------------------------------------------------------- */

share/etc/oned.conf

@@ -1072,6 +1072,10 @@ HOST_ENCRYPTED_ATTR = "VCENTER_PASSWORD"
 HOST_ENCRYPTED_ATTR = "NSX_PASSWORD"
 HOST_ENCRYPTED_ATTR = "ONE_PASSWORD"
 
+# CLUSTER_ENCRYPTED_ATTR = "PROVISION/PACKET_TOKEN"
+
+# DATASTORE_ENCRYPTED_ATTR = "PROVISION/PACKET_TOKEN"
+
 # VM_ENCRYPTED_ATTR = "PACKET_TOKEN
 # VM_ENCRYPTED_ATTR = "PROVISION/PACKET_TOKEN
 

src/cluster/ClusterPool.cc

@@ -17,6 +17,7 @@
 #include "ClusterPool.h"
 #include "Nebula.h"
 #include "NebulaLog.h"
+#include "ClusterTemplate.h"
 
 #include <stdexcept>
 
@@ -35,7 +36,9 @@ const int    ClusterPool::DEFAULT_CLUSTER_ID   = 0;
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-ClusterPool::ClusterPool(SqlDB * db, const VectorAttribute * _vnc_conf):
+ClusterPool::ClusterPool(SqlDB * db,
+                         const VectorAttribute * _vnc_conf,
+                         vector<const SingleAttribute *>& encrypted_attrs):
     PoolSQL(db, Cluster::table), vnc_conf(_vnc_conf)
 {
     ostringstream oss;
@@ -76,6 +79,9 @@ ClusterPool::ClusterPool(SqlDB * db, const VectorAttribute * _vnc_conf):
         set_lastOID(99);
     }
 
+    // Parse encrypted attributes
+    ClusterTemplate::parse_encrypted(encrypted_attrs);
+
     return;
 
 error_bootstrap:

src/cluster/ClusterTemplate.cc

@@ -0,0 +1,22 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
+/* not use this file except in compliance with the License. You may obtain    */
+/* a copy of the License at                                                   */
+/*                                                                            */
+/* http://www.apache.org/licenses/LICENSE-2.0                                 */
+/*                                                                            */
+/* Unless required by applicable law or agreed to in writing, software        */
+/* distributed under the License is distributed on an "AS IS" BASIS,          */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   */
+/* See the License for the specific language governing permissions and        */
+/* limitations under the License.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "ClusterTemplate.h"
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+std::map<std::string, std::set<std::string> > ClusterTemplate::encrypted;

src/cluster/SConstruct

@@ -23,7 +23,8 @@ lib_name='nebula_cluster'
 # Sources to generate the library
 source_files=[
     'ClusterPool.cc',
-    'Cluster.cc'
+    'Cluster.cc',
+    'ClusterTemplate.cc'
 ]
 
 # Build library

src/datastore/DatastorePool.cc

@@ -17,6 +17,7 @@
 #include "DatastorePool.h"
 #include "Nebula.h"
 #include "NebulaLog.h"
+#include "DatastoreTemplate.h"
 
 #include <stdexcept>
 
@@ -40,7 +41,8 @@ const int    DatastorePool::FILE_DS_ID   = 2;
 
 DatastorePool::DatastorePool(
         SqlDB * db,
-        const vector<const SingleAttribute *>& _inherit_attrs) :
+        const vector<const SingleAttribute *>& _inherit_attrs,
+        vector<const SingleAttribute *>& encrypted_attrs) :
     PoolSQL(db, Datastore::table)
 
 {
@@ -163,6 +165,9 @@ DatastorePool::DatastorePool(
         set_lastOID(99);
     }
 
+    // Parse encrypted attributes
+    DatastoreTemplate::parse_encrypted(encrypted_attrs);
+
     return;
 
 error_bootstrap:

src/datastore/DatastoreTemplate.cc

@@ -0,0 +1,22 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
+/* not use this file except in compliance with the License. You may obtain    */
+/* a copy of the License at                                                   */
+/*                                                                            */
+/* http://www.apache.org/licenses/LICENSE-2.0                                 */
+/*                                                                            */
+/* Unless required by applicable law or agreed to in writing, software        */
+/* distributed under the License is distributed on an "AS IS" BASIS,          */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   */
+/* See the License for the specific language governing permissions and        */
+/* limitations under the License.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "DatastoreTemplate.h"
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+std::map<std::string, std::set<std::string> > DatastoreTemplate::encrypted;

src/datastore/SConstruct

@@ -23,7 +23,8 @@ lib_name='nebula_datastore'
 # Sources to generate the library
 source_files=[
     'DatastorePool.cc',
-    'Datastore.cc'
+    'Datastore.cc',
+    'DatastoreTemplate.cc'
 ]
 
 # Build library

src/host/HostTemplate.cc

@@ -20,4 +20,3 @@
 /* -------------------------------------------------------------------------- */
 
 std::map<std::string, std::set<std::string> > HostTemplate::encrypted;
-

src/nebula/Nebula.cc

@@ -532,10 +532,13 @@ void Nebula::start(bool bootstrap_only)
     {
         /* -------------------------- Cluster Pool -------------------------- */
         const VectorAttribute * vnc_conf;
+        vector<const SingleAttribute *> cluster_encrypted_attrs;
+
+        nebula_configuration->get("CLUSTER_ENCRYPTED_ATTR", cluster_encrypted_attrs);
 
         vnc_conf = nebula_configuration->get("VNC_PORTS");
 
-        clpool = new ClusterPool(logdb, vnc_conf);
+        clpool = new ClusterPool(logdb, vnc_conf, cluster_encrypted_attrs);
 
         /* --------------------- VirtualMachine Pool ------------------------ */
         vector<const SingleAttribute *> vm_restricted_attrs;
@@ -645,6 +648,7 @@ void Nebula::start(bool bootstrap_only)
         vector<const SingleAttribute *> img_restricted_attrs;
         vector<const SingleAttribute *> inherit_image_attrs;
         vector<const SingleAttribute *> inherit_ds_attrs;
+        vector<const SingleAttribute *> ds_encrypted_attrs;
 
         nebula_configuration->get("DEFAULT_IMAGE_TYPE", image_type);
         nebula_configuration->get("DEFAULT_DEVICE_PREFIX", device_prefix);
@@ -659,7 +663,9 @@ void Nebula::start(bool bootstrap_only)
 
         nebula_configuration->get("INHERIT_DATASTORE_ATTR", inherit_ds_attrs);
 
-        dspool = new DatastorePool(logdb, inherit_ds_attrs);
+        nebula_configuration->get("DATASTORE_ENCRYPTED_ATTR", ds_encrypted_attrs);
+
+        dspool = new DatastorePool(logdb, inherit_ds_attrs, ds_encrypted_attrs);
 
         /* ----- Document, Zone, VDC, VMTemplate, SG and Makerket Pools ----- */
         docpool  = new DocumentPool(logdb);