Added measurement and metadata columns to files table

Added "/etc/tnc_config" file record for metadata request
Modified files table entries with measurement flag set

2 files changed, 88 insertions, 43 deletions

diff --git a/src/libimcv/plugins/imv_attestation/data.sql b/src/libimcv/plugins/imv_attestation/data.sql
index 60620dd45..2cc34fdd2 100644
--- a/src/libimcv/plugins/imv_attestation/data.sql
+++ b/src/libimcv/plugins/imv_attestation/data.sql
@@ -39,129 +39,135 @@ INSERT INTO products (
 /* Files */
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/lib/i386-linux-gnu/libdl.so.2'
+  0, '/lib/i386-linux-gnu/libdl.so.2', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/lib/x86_64-linux-gnu/libdl.so.2'
+  0, '/lib/x86_64-linux-gnu/libdl.so.2', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/lib/libdl.so.2'
+  0, '/lib/libdl.so.2', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/sbin/iptables'
+  0, '/sbin/iptables', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/lib/libxtables.so.5'
+  0, '/lib/libxtables.so.5', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/lib/libxtables.so.2'
+  0, '/lib/libxtables.so.2', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  1, '/lib/xtables/'
+  1, '/lib/xtables/', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_udp.so'
+  0, 'libxt_udp.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_tcp.so'
+  0, 'libxt_tcp.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_esp.so'
+  0, 'libxt_esp.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_policy.so'
+  0, 'libxt_policy.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_conntrack.so'
+  0, 'libxt_conntrack.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libipt_SNAT.so'
+  0, 'libipt_SNAT.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libipt_DNAT.so'
+  0, 'libipt_DNAT.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libipt_MASQUERADE.so'
+  0, 'libipt_MASQUERADE.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libipt_LOG.so'
+  0, 'libipt_LOG.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, '/sbin/ip6tables'
+  0, '/sbin/ip6tables', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libip6t_LOG.so'
+  0, 'libip6t_LOG.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_mark.so'
+  0, 'libxt_mark.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  0, 'libxt_MARK.so'
+  0, 'libxt_MARK.so', 1
 );
 
 INSERT INTO files (
-  type, path
+  type, path, measurement
  ) VALUES (
-  1, '/lib/iptables'
+  1, '/lib/iptables', 1
+);
+
+INSERT INTO files (
+  type, path, metadata
+ ) VALUES (
+  0, '/etc/tnc_config', 1
 );
 
 /* Product-File */
@@ -199,6 +205,12 @@ INSERT INTO product_file (
 INSERT INTO product_file (
   product, file
 ) VALUES (
+  1, 22
+);
+
+INSERT INTO product_file (
+  product, file
+) VALUES (
   2, 2
 );
 
@@ -223,6 +235,12 @@ INSERT INTO product_file (
 INSERT INTO product_file (
   product, file
 ) VALUES (
+  2, 22
+);
+
+INSERT INTO product_file (
+  product, file
+) VALUES (
   3, 3
 );
 
@@ -235,6 +253,12 @@ INSERT INTO product_file (
 INSERT INTO product_file (
   product, file
 ) VALUES (
+  3, 22
+);
+
+INSERT INTO product_file (
+  product, file
+) VALUES (
   4, 3
 );
 
@@ -259,6 +283,13 @@ INSERT INTO product_file (
 INSERT INTO product_file (
   product, file
 ) VALUES (
+  4, 22
+);
+
+
+INSERT INTO product_file (
+  product, file
+) VALUES (
   5, 3
 );
 
@@ -283,6 +314,12 @@ INSERT INTO product_file (
 INSERT INTO product_file (
   product, file
 ) VALUES (
+  5, 22
+);
+
+INSERT INTO product_file (
+  product, file
+) VALUES (
   6, 3
 );
 
@@ -304,6 +341,12 @@ INSERT INTO product_file (
   6, 21
 );
 
+INSERT INTO product_file (
+  product, file
+) VALUES (
+  6, 22
+);
+
 /* File Hashes */
 
 INSERT INTO file_hashes (
diff --git a/src/libimcv/plugins/imv_attestation/tables.sql b/src/libimcv/plugins/imv_attestation/tables.sql
index 8cc0e5588..f6ef2b81e 100644
--- a/src/libimcv/plugins/imv_attestation/tables.sql
+++ b/src/libimcv/plugins/imv_attestation/tables.sql
@@ -4,7 +4,9 @@ DROP TABLE IF EXISTS files;
 CREATE TABLE files (
   id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
   type INTEGER NOT NULL,
-  path TEXT NOT NULL
+  path TEXT NOT NULL,
+  measurement INTEGER DEFAULT 0,
+  metadata INTEGER DEFAULT 0
 );
 
 DROP TABLE IF EXISTS products;