From 6795de0408c9162a3d392b946a09d9e2d7f4f9c4 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Thu, 20 Apr 2017 11:41:15 +0200 Subject: libimcv: SWID tag generation and discovery --- src/libimcv/plugins/imc_swid/.gitignore | 2 +- src/libimcv/plugins/imc_swid/Makefile.am | 9 ++- ...gid.1999-03.org.debian_apache-2-2-22-13.swidtag | 30 -------- ...egid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag | 30 -------- ...d.1999-03.org.debian_libsqlite-3-7-13-1.swidtag | 30 -------- ...egid.1999-03.org.debian_libssl-1-0-1e-2.swidtag | 30 -------- ....1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag | 30 -------- ...gid.1999-03.org.debian_openssl-1-0-1e-2.swidtag | 30 -------- ...egid.1999-03.org.debian_sqlite-3-7-13-1.swidtag | 30 -------- ...id.2004-03.org.strongswan_strongSwan.swidtag.in | 12 ---- .../imc_swid/strongswan.org_strongSwan.swidtag.in | 12 ++++ src/libimcv/swid/swid_inventory.c | 82 ++++++++-------------- 12 files changed, 48 insertions(+), 279 deletions(-) delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag delete mode 100644 src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in create mode 100644 src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in (limited to 'src') diff --git a/src/libimcv/plugins/imc_swid/.gitignore b/src/libimcv/plugins/imc_swid/.gitignore index 448ad2f2a..59e5e9977 100644 --- a/src/libimcv/plugins/imc_swid/.gitignore +++ b/src/libimcv/plugins/imc_swid/.gitignore @@ -1 +1 @@ -regid.2004-03.org.strongswan*.swidtag +strongswan.org_*.swidtag diff --git a/src/libimcv/plugins/imc_swid/Makefile.am b/src/libimcv/plugins/imc_swid/Makefile.am index c1cdb988a..6cb929eee 100644 --- a/src/libimcv/plugins/imc_swid/Makefile.am +++ b/src/libimcv/plugins/imc_swid/Makefile.am @@ -1,14 +1,13 @@ -regid = regid.2004-03.org.strongswan +regid = strongswan.org unique_sw_id = strongSwan-$(PACKAGE_VERSION_MAJOR)-$(PACKAGE_VERSION_MINOR)-$(PACKAGE_VERSION_BUILD)$(PACKAGE_VERSION_REVIEW) swid_tag = $(regid)_$(unique_sw_id).swidtag -swiddir = $(prefix)/share/$(regid) -swid_DATA = $(swid_tag) -ipsec_DATA = $(swid_tag) +swiddir = $(pkgdatadir)/swidtag +dist_swid_DATA = $(swid_tag) EXTRA_DIST = $(regid)_strongSwan.swidtag.in CLEANFILES = $(regid)_strongSwan*.swidtag -$(swid_tag) : regid.2004-03.org.strongswan_strongSwan.swidtag.in +$(swid_tag) : $(regid)_strongSwan.swidtag.in $(AM_V_GEN) \ sed \ -e "s:@VERSION_MAJOR@:$(PACKAGE_VERSION_MAJOR):" \ diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag deleted file mode 100644 index 82e16d2d0..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - apache2 - - 2.2-22-13 - - 2 - 2 - 22 - 13 - - - - Apache Software Foundation - regid.1995-04.org.apache - - - Debian Project - regid.1999-03.org.debian - - - apache-2-2-22-13 - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag deleted file mode 100644 index 9e856eb24..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - bind9 - - 9-8-4-dfsg - - 9 - 8 - 4 - dfsg - - - - Internet Systems Consortium - regid.1994-04.org.isc - - - Debian Project - regid.1999-03.org.debian - - - bind-9-8-4-dfsg - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag deleted file mode 100644 index 765026326..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - libsqlite3 - - 3.7.13-1 - - 3 - 7 - 13 - 1 - - - - SQLite Project - regid.2002-08.org.sqlite - - - Debian Project - regid.1999-03.org.debian - - - libsqlite-3-7-13-1 - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag deleted file mode 100644 index 5a31c572b..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - libssl1.0.0 - - 1.0.1e-2 - - 1 - 0 - 1e - 2 - - - - OpenSSL Project - regid.1998-12.org.openssl - - - Debian Project - regid.1999-03.org.debian - - - libssl-1-0-1e-2 - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag deleted file mode 100644 index cc6888b8d..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - libssl-dev - - 1.0.1e-2 - - 1 - 0 - 1e - 2 - - - - OpenSSL Project - regid.1998-12.org.openssl - - - Debian Project - regid.1999-03.org.debian - - - libssl-dev-1-0-1e-2 - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag deleted file mode 100644 index af0a60d9e..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - openssl - - 1.0.1e-2 - - 1 - 0 - 1e - 2 - - - - OpenSSL Project - regid.1998-12.org.openssl - - - Debian Project - regid.1999-03.org.debian - - - openssl-1-0-1e-2 - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag deleted file mode 100644 index 43d0fdce3..000000000 --- a/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag +++ /dev/null @@ -1,30 +0,0 @@ - - - true - sqlite3 - - 3.7.13-1 - - 3 - 7 - 13 - 1 - - - - SQLite Project - regid.2002-08.org.sqlite - - - Debian Project - regid.1999-03.org.debian - - - sqlite-3-7-13-1 - regid.1999-03.org.debian - - - Debian Project - regid.1999-03.org.debian - - diff --git a/src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in b/src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in deleted file mode 100644 index 8b7b50fdf..000000000 --- a/src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in b/src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in new file mode 100644 index 000000000..4935feab5 --- /dev/null +++ b/src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in @@ -0,0 +1,12 @@ + + + + + diff --git a/src/libimcv/swid/swid_inventory.c b/src/libimcv/swid/swid_inventory.c index a49286954..7b05e8393 100644 --- a/src/libimcv/swid/swid_inventory.c +++ b/src/libimcv/swid/swid_inventory.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 Andreas Steffen + * Copyright (C) 2013-2017 Andreas Steffen * HSR Hochschule fuer Technik Rapperswil * * This program is free software; you can redistribute it and/or modify it @@ -237,7 +237,7 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator, } static bool collect_tags(private_swid_inventory_t *this, char *pathname, - swid_inventory_t *targets) + swid_inventory_t *targets, bool is_swidtag_dir) { char *rel_name, *abs_name; struct stat st; @@ -251,72 +251,49 @@ static bool collect_tags(private_swid_inventory_t *this, char *pathname, pathname, strerror(errno)); return FALSE; } - DBG2(DBG_IMC, "entering %s", pathname); + if (is_swidtag_dir) + { + DBG2(DBG_IMC, "entering %s", pathname); + } while (enumerator->enumerate(enumerator, &rel_name, &abs_name, &st)) { - char * start, *stop; + char *separator, *suffix; chunk_t tag_creator; chunk_t unique_sw_id = chunk_empty, tag_file_path = chunk_empty; - if (!strstr(rel_name, "regid.")) - { - continue; - } if (S_ISDIR(st.st_mode)) { - /* In case of a targeted request */ - if (targets->get_count(targets)) - { - enumerator_t *target_enumerator; - swid_tag_id_t *tag_id; - bool match = FALSE; - - target_enumerator = targets->create_enumerator(targets); - while (target_enumerator->enumerate(target_enumerator, &tag_id)) - { - if (chunk_equals(tag_id->get_tag_creator(tag_id), - chunk_from_str(rel_name))) - { - match = TRUE; - break; - } - } - target_enumerator->destroy(target_enumerator); - - if (!match) - { - continue; - } - } - - if (!collect_tags(this, abs_name, targets)) + if (!collect_tags(this, abs_name, targets, is_swidtag_dir || + streq(rel_name, "swidtag"))) { goto end; } continue; } + if (!is_swidtag_dir) + { + continue; + } - /* parse the regid filename into its components */ - start = rel_name; - stop = strchr(start, '_'); - if (!stop) + /* found a swidtag file? */ + suffix = strstr(rel_name, ".swidtag"); + if (!suffix) { - DBG1(DBG_IMC, " %s", rel_name); - DBG1(DBG_IMC, " '_' separator not found"); - goto end; + continue; } - tag_creator = chunk_create(start, stop-start); - start = stop + 1; - stop = strstr(start, ".swidtag"); - if (!stop) + /* parse the swidtag filename into its components */ + separator = strchr(rel_name, '_'); + if (!separator) { DBG1(DBG_IMC, " %s", rel_name); - DBG1(DBG_IMC, " swidtag postfix not found"); + DBG1(DBG_IMC, " '_' separator not found"); goto end; } - unique_sw_id = chunk_create(start, stop-start); + tag_creator = chunk_create(rel_name, separator-rel_name); + + unique_sw_id = chunk_create(separator+1, suffix-separator-1); tag_file_path = chunk_from_str(abs_name); /* In case of a targeted request */ @@ -334,7 +311,7 @@ static bool collect_tags(private_swid_inventory_t *this, char *pathname, target_tag_creator = tag_id->get_tag_creator(tag_id); if (chunk_equals(target_unique_sw_id, unique_sw_id) && - chunk_equals(target_tag_creator, tag_creator)) + chunk_equals(target_tag_creator, tag_creator)) { match = TRUE; break; @@ -358,7 +335,7 @@ static bool collect_tags(private_swid_inventory_t *this, char *pathname, if (!xml_tag) { DBG1(DBG_IMC, " opening '%s' failed: %s", abs_name, - strerror(errno)); + strerror(errno)); goto end; } @@ -378,7 +355,10 @@ static bool collect_tags(private_swid_inventory_t *this, char *pathname, end: enumerator->destroy(enumerator); - DBG2(DBG_IMC, "leaving %s", pathname); + if (is_swidtag_dir) + { + DBG2(DBG_IMC, "leaving %s", pathname); + } return success; } @@ -396,7 +376,7 @@ METHOD(swid_inventory_t, collect, bool, * Collect swidtag files by iteratively entering all directories in * the tree under the "directory" path. */ - return collect_tags(this, directory, targets); + return collect_tags(this, directory, targets, FALSE); } METHOD(swid_inventory_t, add, void, -- cgit v1.2.3