Skip to content

Refactor to use changed format metadata to key #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2020
Merged

Refactor to use changed format metadata to key #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71016d7
Refactor to use changed format metadata to key
MVrachev Jul 7, 2020
7a828ea
Bump securesyslib to 0.16.0 in setup.py
MVrachev Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
'iso8601>=0.1.12',
'requests>=2.19.1',
'six>=1.11.0',
'securesystemslib>=0.15.0'
'securesystemslib>=0.16.0'
],
tests_require = [
'mock; python_version < "3.3"'
Expand Down
3 changes: 2 additions & 1 deletion tuf/client/updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,8 @@ def _import_delegations(self, parent_role):
# We specify the keyid to ensure that it's the correct keyid
# for the key.
try:
key, _ = securesystemslib.keys.format_metadata_to_key(keyinfo, keyid)
key, _ = securesystemslib.keys.format_metadata_to_key(keyinfo, keyid,
keyid_hash_algorithms=keyinfo['keyid_hash_algorithms'])

tuf.keydb.add_key(key, repository_name=self.repository_name)

Expand Down
3 changes: 2 additions & 1 deletion tuf/keydb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ def create_keydb_from_root_metadata(root_metadata, repository_name='default'):
# format_metadata_to_key() uses the provided keyid as the default keyid.
# All other keyids returned are ignored.

key_dict, _ = securesystemslib.keys.format_metadata_to_key(key_metadata, keyid)
key_dict, _ = securesystemslib.keys.format_metadata_to_key(key_metadata,
keyid, keyid_hash_algorithms=key_metadata['keyid_hash_algorithms'])

# Make sure to update key_dict['keyid'] to use one of the other valid
# keyids, otherwise add_key() will have no reference to it.
Expand Down
3 changes: 2 additions & 1 deletion tuf/repository_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,8 @@ def _load_top_level_metadata(repository, top_level_filenames, repository_name):
for keyid, key_metadata in six.iteritems(targets_metadata['delegations']['keys']):

# Use the keyid found in the delegation
key_object, _ = securesystemslib.keys.format_metadata_to_key(key_metadata, keyid)
key_object, _ = securesystemslib.keys.format_metadata_to_key(key_metadata,
keyid, keyid_hash_algorithms=key_metadata['keyid_hash_algorithms'])

# Add 'key_object' to the list of recognized keys. Keys may be shared,
# so do not raise an exception if 'key_object' has already been loaded.
Expand Down
8 changes: 2 additions & 6 deletions tuf/repository_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3187,12 +3187,8 @@ def load_repository(repository_directory, repository_name='default',
# The repo may have used hashing algorithms for the generated keyids
# that doesn't match the client's set of hash algorithms. Make sure
# to only used the repo's selected hashing algorithms.
hash_algorithms = securesystemslib.settings.HASH_ALGORITHMS
securesystemslib.settings.HASH_ALGORITHMS = \
key_metadata['keyid_hash_algorithms']
key_object, keyids = \
securesystemslib.keys.format_metadata_to_key(key_metadata)
securesystemslib.settings.HASH_ALGORITHMS = hash_algorithms
key_object, keyids = securesystemslib.keys.format_metadata_to_key(key_metadata,
keyid_hash_algorithms=key_metadata['keyid_hash_algorithms'])
try:
for keyid in keyids: # pragma: no branch
key_object['keyid'] = keyid
Expand Down