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

Allow an already added target to be replaced in repository.add_target()

Browse source 
Fix for issue #319
This commit is contained in:
Vladimir Diaz 2016-11-10 14:39:37 -05:00
parent 4e97985587
commit a98f2b676e
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
tuf/repository_tool.py
View file

@ -1869,7 +1869,9 @@ def add_target(self, filepath, custom=None):
Targets object.
This method does not actually create 'filepath' on the file system.
'filepath' must already exist on the file system.
'filepath' must already exist on the file system. If 'filepath'
has already been added, it will be replaced with any new file
or 'custom' information.
>>>
>>>
@ -1877,21 +1879,22 @@ def add_target(self, filepath, custom=None):
<Arguments>
filepath:
The path of the target file. It must be located in the repository's
targets directory.
The path of the target file. It must exist in the repository's targets
directory.
custom:
An optional object providing additional information about the file.
<Exceptions>
tuf.ssl_commons.exceptions.FormatError, if 'filepath' is improperly formatted.
tuf.ssl_commons.exceptions.FormatError, if 'filepath' is improperly
formatted.
tuf.ssl_commons.exceptions.Error, if 'filepath' is not found under the repository's targets
directory.
tuf.ssl_commons.exceptions.Error, if 'filepath' is not found under the
repository's targets directory.
<Side Effects>
Adds 'filepath' to this role's list of targets. This role's
'tuf.roledb.py' is also updated.
'tuf.roledb.py' entry is also updated.
<Returns>
None.
@ -1899,8 +1902,8 @@ def add_target(self, filepath, custom=None):
# Does 'filepath' have the correct format?
# Ensure the arguments have the appropriate number of objects and object
# types, and that all dict keys are properly named.
# Raise 'tuf.ssl_commons.exceptions.FormatError' if there is a mismatch.
# types, and that all dict keys are properly named. Raise
# 'tuf.ssl_commons.exceptions.FormatError' if there is a mismatch.
tuf.ssl_crypto.formats.PATH_SCHEMA.check_match(filepath)
if custom is None:
custom = {}
@ -1912,26 +1915,36 @@ def add_target(self, filepath, custom=None):
# Ensure 'filepath' is found under the repository's targets directory.
if not filepath.startswith(self._targets_directory):
raise tuf.ssl_commons.exceptions.Error(repr(filepath) + ' is not under the Repository\'s'
' targets directory: ' + repr(self._targets_directory))
raise tuf.ssl_commons.exceptions.Error(repr(filepath) + ' does not exist'
' under the repository\'s targets directory:'
' ' + repr(self._targets_directory))
# Add 'filepath' (i.e., relative to the targets directory) to the role's
# list of targets. 'filepath' will be verified as an allowed path according
# to this Targets parent role when write() is called. Not verifying
# 'filepath' here allows freedom to add targets and parent restrictions
# in any order, and minimize the number of times these checks are performed.
# list of targets. 'filepath' will not be verified as an allowed path
# according to some delegating role. Not verifying 'filepath' here allows
# freedom to add targets and parent restrictions in any order, minimize the
# number of times these checks are performed, and allow any role to
# delegate trust of packages to this Targes role.
if os.path.isfile(filepath):
# Update the role's 'tuf.roledb.py' entry and avoid duplicates.
targets_directory_length = len(self._targets_directory)
roleinfo = tuf.roledb.get_roleinfo(self._rolename)
relative_path = filepath[targets_directory_length:]
if relative_path not in roleinfo['paths']:
logger.debug('Adding new target: ' + repr(relative_path))
roleinfo['paths'].update({relative_path: custom})
else:
logger.debug('Replacing target: ' + repr(relative_path))
roleinfo['paths'].update({relative_path: custom})
tuf.roledb.update_roleinfo(self._rolename, roleinfo)
else:
raise tuf.ssl_commons.exceptions.Error(repr(filepath) + ' is not a valid file.')
raise tuf.ssl_commons.exceptions.Error(repr(filepath) + ' is not'
' a valid file.')