From 0c972717d058dbc214a687f64f2f0e5b83c8b37b Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 18 Feb 2020 21:22:39 +0000 Subject: [PATCH] Remove root from snapshot In PR #40 aginst the specification "root.json" has been removed from the meta dictionary in "snapshot.json". Update generate_snapshot_metadata() to no longer add an entry for root.json to root.json Signed-off-by: Joshua Lock --- tuf/repository_lib.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tuf/repository_lib.py b/tuf/repository_lib.py index 11c5173d..965e9d70 100755 --- a/tuf/repository_lib.py +++ b/tuf/repository_lib.py @@ -121,11 +121,10 @@ def _generate_and_write_metadata(rolename, metadata_filename, elif rolename == 'snapshot': - root_filename = ROOT_FILENAME[:-len(METADATA_EXTENSION)] targets_filename = TARGETS_FILENAME[:-len(METADATA_EXTENSION)] metadata = generate_snapshot_metadata(metadata_directory, - roleinfo['version'], roleinfo['expires'], root_filename, - targets_filename, consistent_snapshot, repository_name) + roleinfo['version'], roleinfo['expires'], targets_filename, + consistent_snapshot, repository_name) _log_warning_if_expires_soon(SNAPSHOT_FILENAME, roleinfo['expires'], @@ -1356,8 +1355,7 @@ def generate_targets_metadata(targets_directory, target_files, version, def generate_snapshot_metadata(metadata_directory, version, expiration_date, - root_filename, targets_filename, consistent_snapshot=False, - repository_name='default'): + targets_filename, consistent_snapshot=False, repository_name='default'): """ Create the snapshot metadata. The minimum metadata must exist (i.e., @@ -1379,10 +1377,6 @@ def generate_snapshot_metadata(metadata_directory, version, expiration_date, The expiration date of the metadata file. Conformant to 'securesystemslib.formats.ISO8601_DATETIME_SCHEMA'. - root_filename: - The filename of the top-level root role. The hash and file size of this - file is listed in the snapshot role. - targets_filename: The filename of the top-level targets role. The hash and file size of this file is listed in the snapshot role. @@ -1417,7 +1411,6 @@ def generate_snapshot_metadata(metadata_directory, version, expiration_date, securesystemslib.formats.PATH_SCHEMA.check_match(metadata_directory) tuf.formats.METADATAVERSION_SCHEMA.check_match(version) securesystemslib.formats.ISO8601_DATETIME_SCHEMA.check_match(expiration_date) - securesystemslib.formats.PATH_SCHEMA.check_match(root_filename) securesystemslib.formats.PATH_SCHEMA.check_match(targets_filename) securesystemslib.formats.BOOLEAN_SCHEMA.check_match(consistent_snapshot) securesystemslib.formats.NAME_SCHEMA.check_match(repository_name) @@ -1427,8 +1420,6 @@ def generate_snapshot_metadata(metadata_directory, version, expiration_date, # Snapshot's 'fileinfodict' shall contain the version number of Root, # Targets, and all delegated roles fo the repository. fileinfodict = {} - fileinfodict[ROOT_FILENAME] = get_metadata_versioninfo(root_filename, - repository_name) fileinfodict[TARGETS_FILENAME] = get_metadata_versioninfo(targets_filename, repository_name)