Added all SWID tables and example regids

diff --git a/src/libimcv/imv/data.sql b/src/libimcv/imv/data.sql
index dfc8b27ca4b641f98afa8fce114079836893cb0d..79ff8b97d2b15f2248fff7bdb486f96301482419 100644 (file)
--- a/src/libimcv/imv/data.sql
+++ b/src/libimcv/imv/data.sql
@@ -1126,139 +1126,64 @@ INSERT INTO enforcements (      /* 17 */
   21, 13, 60
 );
 
-/* regids */
+/* swid_entities */
 
-INSERT INTO regids (                   /*  1 */
-  name
-) VALUES (
- 'regid.1986-12.com.adobe'
-);
-
-INSERT INTO regids (                   /*  2 */
-  name
-) VALUES (
- 'regid.1991-06.com.microsoft'
-);
-
-INSERT INTO regids (                   /*  3 */
-  name
-) VALUES (
- 'regid.2004-05.com.ubuntu'
-);
-
-INSERT INTO regids (                   /*  4 */
-  name
-) VALUES (
- 'regid.1995-04.org.apache'
-);
-
-INSERT INTO regids (                   /*  5 */
-  name
-) VALUES (
- 'regid.1999-03.org.debian'
-);
-
-INSERT INTO regids (                   /*  6 */
-  name
-) VALUES (
- 'regid.1994-04.org.isc'
-);
-
-INSERT INTO regids (                   /*  7 */
-  name
-) VALUES (
- 'regid.1998-12.org.openssl'
-);
-
-INSERT INTO regids (                   /*  8 */
-  name
-) VALUES (
- 'regid.1998-01.org.samba'
-);
-
-INSERT INTO regids (                   /*  9 */
-  name
-) VALUES (
- 'regid.2002-08.org.sqlite'
-);
-
-INSERT INTO regids (                   /* 10 */
-  name
-) VALUES (
- 'regid.2004-03.org.strongswan'
-);
-
-/* Tags */
-
-INSERT INTO tags (
-  regid, unique_sw_id
-) VALUES (
-  2, 'Windows-8-Pro'
-);
-
-INSERT INTO tags (
-  regid, unique_sw_id
-) VALUES (
-  5, 'apache-2-2-22-13'
-);
-
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO "swid_entities" (          /*  1 */
+  "name", "regid"
 ) VALUES (
-  5, 'bind-9-8-4-dfsg'
+  'strongSwan Project', 'regid.2004-03.org.strongswan'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  2 */
+  "name", "regid"
 ) VALUES (
-  5, 'libsqlite-3-7-13-1'
+  'Adobe Systems Inc.', 'regid.1986-12.com.adobe'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  3 */
+  "name", "regid"
 ) VALUES (
-  5, 'libssl-1-0-1e-2'
+  'Microsoft Corporation', 'regid.1991-06.com.microsoft'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  4 */
+  "name", "regid"
 ) VALUES (
-  5, 'libssl-dev-1-0-1e-2'
+  'Ubuntu Project', 'regid.2004-05.com.ubuntu'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  5 */
+  "name", "regid"
 ) VALUES (
-  5, 'libssl-doc-1-0-1e-2'
+  'Apache Software Foundation', 'regid.1995-04.org.apache'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  6 */
+  "name", "regid"
 ) VALUES (
-  5, 'openssl-1-0-1e-2'
+  'Debian Project', 'regid.1999-03.org.debian'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  7 */
+  "name", "regid"
 ) VALUES (
-  5, 'smbclient-3-6-6-6'
+  'Internet Systems Consortium', 'regid.1994-04.org.isc'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  8 */
+  "name", "regid"
 ) VALUES (
-  5, 'sqlite-3-7-13-1'
+  'OpenSSL Project', 'regid.1998-12.org.openssl'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /*  9 */
+  "name", "regid"
 ) VALUES (
-  10, 'strongSwan-5-1-1'
+  'Samba Project', 'regid.1998-01.org.samba'
 );
 
-INSERT INTO tags (
-  regid, unique_sw_id
+INSERT INTO swid_entities (                    /* 10 */
+  "name", "regid"
 ) VALUES (
-  10, 'strongSwan-5-1-2'
+  'SQLite Project', 'regid.2002-08.org.sqlite'
 );
-

diff --git a/src/libimcv/imv/tables.sql b/src/libimcv/imv/tables.sql
index f27825b44f82f2b11d9163e2aa384ff44d756bb4..fe32e7e7b03639959f00cb8144e99d8b3db9c3ae 100644 (file)
--- a/src/libimcv/imv/tables.sql
+++ b/src/libimcv/imv/tables.sql
@@ -207,25 +207,83 @@ CREATE TABLE identities (
   UNIQUE (type, value)
 );
 
-DROP TABLE IF EXISTS regids;
-CREATE TABLE regids (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  name TEXT NOT NULL
+DROP TABLE IF EXISTS "swid_entities"
+CREATE TABLE "swid_entities" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "name" VARCHAR(255) NOT NULL,
+  "regid" VARCHAR(255) NOT NULL
 );
-DROP INDEX IF EXISTS regids_name;
-CREATE INDEX regids_name ON regids (
-  name
+DROP INDEX IF EXISTS "swid_entities_name";
+DROP INDEX IF EXISTS "swid_entities_regid";
+CREATE INDEX "swid_entities_name" ON "swid_entities" (
+  "name"
+);
+CREATE INDEX "swid_entities_regid" ON "swid_entities" (
+  "regid"
 );
 
-DROP TABLE IF EXISTS tags;
-CREATE TABLE tags (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  regid INTEGER NOT NULL REFERENCES regids(id),
-  unique_sw_id TEXT NOT NULL,
-  value TEXT
+DROP TABLE IF EXISTS "swid_entityroles";
+CREATE TABLE "swid_entityroles" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "tag_id" INTEGER NOT NULL REFERENCES "swid_tags" ("id"),
+  "entity_id" INTEGER NOT NULL,
+  "role" SMALLINT UNSIGNED NOT NULL
+);
+DROP INDEX if EXISTS "swid_entityroles_tag_id";
+DROP INDEX IF EXISTS "swid_entityroles_tag_entity_id";
+CREATE INDEX "swid_entityroles_tag_id" ON "swid_entityroles" (
+  "tag_id"
 );
-DROP INDEX IF EXISTS tags_name;
-CREATE INDEX tags_unique_sw_id ON tags (
-  unique_sw_id
+CREATE INDEX "swid_entityroles_entity_id" ON "swid_entityroles" (
+  "entity_id"
+);
+
+DROP TABLE IF EXISTS "swid_tags";
+CREATE TABLE "swid_tags" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "package_name" VARCHAR(255) NOT NULL,
+  "version" VARCHAR(255) NOT NULL,
+  "unique_id" VARCHAR(255) NOT NULL,
+  "swid_xml" TEXT NOT NULL,
+  "software_id" VARCHAR(255) NOT NULL
+);
+DROP INDEX if EXISTS "swid_tags_unique_id";
+DROP INDEX IF EXISTS "swid_tags_package_name";
+CREATE INDEX "swid_tags_unique_id" ON "swid_tags" (
+  "unique_id"
+);
+CREATE INDEX "swid_tags_package_name" ON "swid_tags" (
+  "package_name"
 );
 
+DROP TABLE IF EXISTS "swid_tags_files";
+CREATE TABLE "swid_tags_files" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "tag_id" INTEGER NOT NULL,
+  "file_id" INTEGER NOT NULL REFERENCES "files" ("id"),
+  UNIQUE ("tag_id", "file_id")
+);
+DROP INDEX IF EXISTS "swid_tags_files_file_id";
+DROP INDEX IF EXISTS "swid_tags_files_tag_id";
+CREATE INDEX "swid_tags_files_file_id" ON "swid_tags_files" (
+  "file_id"
+);
+CREATE INDEX "swid_tags_files_tag_id" ON "swid_tags_files" (
+  "tag_id"
+);
+
+DROP TABLE IF EXISTS "swid_tags_sessions";
+CREATE TABLE "swid_tags_sessions" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "tag_id" INTEGER NOT NULL,
+  "session_id" INTEGER NOT NULL REFERENCES "sessions" ("id"),
+  UNIQUE ("tag_id", "session_id")
+);
+DROP INDEX IF EXISTS "swid_tags_sessions_tag_id";
+DROP INDEX IF EXISTS "swid_tags_sessions_session_id";
+CREATE INDEX "swid_tags_sessions_tag_id" ON "swid_tags_sessions" (
+  "tag_id"
+);
+CREATE INDEX "swid_tags_sessions_session_id" ON "swid_tags_sessions" (
+"session_id"
+);