Elgato_dark/python-tuf
1
0
Fork 0
mirror of https://github.com/theupdateframework/python-tuf synced 2026-05-24 10:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #909 from lukpueh/add-target-hash-function

Browse source 
Move repository_lib.get_taget_hash back from sslib to tuf
This commit is contained in:
lukpueh 2019-09-05 16:09:07 +02:00 committed by GitHub
commit bafebeee6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tuf/repository_lib.py
View file

@ -49,6 +49,7 @@
import tuf.settings
import securesystemslib
import securesystemslib.hash
import securesystemslib.interface
import iso8601
import six
@ -1174,6 +1175,8 @@ def get_metadata_versioninfo(rolename, repository_name):
# TODO: Is this function needed? It does not seem used, also the same
# function exists as private method in updater.Updater._get_target_hash.
def get_target_hash(target_filepath):
"""
<Purpose>
@ -1198,9 +1201,20 @@ def get_target_hash(target_filepath):
<Returns>
The hash of 'target_filepath'.
"""
return securesystemslib.util.get_target_hash(target_filepath)
"""
securesystemslib.formats.RELPATH_SCHEMA.check_match(target_filepath)
# Calculate the hash of the filepath to determine which bin to find the
# target. The client currently assumes the repository uses
# 'tuf.settings.DEFAULT_HASH_ALGORITHM' to generate hashes and 'utf-8'.
digest_object = securesystemslib.hash.digest(
tuf.settings.DEFAULT_HASH_ALGORITHM)
encoded_target_filepath = target_filepath.encode('utf-8')
digest_object.update(encoded_target_filepath)
target_filepath_hash = digest_object.hexdigest()
return target_filepath_hash

5
tuf/settings.py
View file

@ -97,8 +97,9 @@
# A setting for the instances where a default hashing algorithm is needed.
# This setting is currently used to calculate the path hash prefixes of hashed
# bin delegations. The other instances (e.g., digest of files) that require a
# hashing algorithm rely on settings in the securesystemslib external library.
# bin delegations, and digests of targets filepaths. The other instances
# (e.g., digest of files) that require a hashing algorithm rely on settings in
# the securesystemslib external library.
DEFAULT_HASH_ALGORITHM = 'sha256'
# The client's update procedure (contained within a while-loop) can potentially