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

Fix mistaken argument to method and reduce logger messages

Browse source 
The argument to metadata_object.move() should have been the uncompressed filename.  metadata_object was saving the uncompressed version of targets but naming them as if it was compressed.  Modified a few logger calls to reduce the number of messages.
This commit is contained in:
vladdd 2013-08-11 17:47:37 -04:00
parent 113cff4791
commit 38b9cd8cb6
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tuf/client/updater.py
View file

@ -631,6 +631,7 @@ def _update_metadata(self, metadata_role, fileinfo=None, compression=None):
# Construct the metadata filename as expected by the download/mirror modules.
metadata_filename = metadata_role + '.txt'
uncompressed_metadata_filename = metadata_filename
# The 'release' or Targets metadata may be compressed. Add the appropriate
# extension to 'metadata_filename'.
@ -661,6 +662,7 @@ def _update_metadata(self, metadata_role, fileinfo=None, compression=None):
# 'tuf.formats.SIGNABLE_SCHEMA'.
metadata_file_object = None
metadata_signable = None
compressed_file_object = None
for mirror_url in get_mirrors('meta', metadata_filename.encode("utf-8"), self.mirrors):
try:
metadata_file_object = download_file(mirror_url, file_hashes,
@ -669,6 +671,8 @@ def _update_metadata(self, metadata_role, fileinfo=None, compression=None):
logger.warn('Download failed from '+mirror_url+'.')
continue
if compression:
compressed_file_object = tuf.util.TempFile()
shutil.copyfileobj(metadata_file_object, compressed_file_object)
metadata_file_object.decompress_temp_file_object(compression)
# Read and load the downloaded file.
@ -747,7 +751,14 @@ def _update_metadata(self, metadata_role, fileinfo=None, compression=None):
# Next, move the verified updated metadata file to the 'current' directory.
# Note that the 'move' method comes from tuf.util's TempFile class.
# 'metadata_file_object' is an instance of tuf.util.TempFile.
metadata_file_object.move(current_filepath)
if compression == 'gzip':
current_uncompressed_filepath = os.path.join(self.metadata_directory['current'],
uncompressed_metadata_filename)
current_uncompressed_filepath = os.path.abspath(current_uncompressed_filepath)
metadata_file_object.move(current_uncompressed_filepath)
compressed_file_object.move(current_filepath)
else:
metadata_file_object.move(current_filepath)
# Extract the metadata object so we can store it to the metadata store.
# 'current_metadata_object' set to 'None' if there is not an object
@ -756,7 +767,7 @@ def _update_metadata(self, metadata_role, fileinfo=None, compression=None):
current_metadata_object = self.metadata['current'].get(metadata_role)
# Finally, update the metadata and fileinfo stores.
logger.debug('Updated '+current_filepath+'.')
logger.debug('Updated '+repr(current_filepath)+'.')
self.metadata['previous'][metadata_role] = current_metadata_object
self.metadata['current'][metadata_role] = updated_metadata_object
self._update_fileinfo(metadata_filename)
@ -843,7 +854,6 @@ def _update_metadata_if_changed(self, metadata_role, referenced_metadata='releas
# metadata available on the repository, including any that may be in
# compressed form.
compression = None
gzip_metadata_filename = metadata_filename + '.gz'
# Extract the new fileinfo of the uncompressed version of 'metadata_role'.
new_fileinfo = self.metadata['current'][referenced_metadata] \
@ -855,11 +865,13 @@ def _update_metadata_if_changed(self, metadata_role, referenced_metadata='releas
# should always be 'release'. 'release.txt' specifies all roles
# provided by a repository, including their file sizes and hashes.
if metadata_role == 'release' or metadata_role.startswith('targets'):
gzip_metadata_filename = metadata_filename + '.gz'
if gzip_metadata_filename in self.metadata['current'] \
[referenced_metadata]['meta']:
compression = 'gzip'
new_fileinfo = self.metadata['current'][referenced_metadata] \
['meta'][gzip_metadata_filename]
metadata_filename = gzip_metadata_filename
else:
message = 'Compressed version of '+repr(metadata_filename)+\
' not available.'
@ -870,7 +882,7 @@ def _update_metadata_if_changed(self, metadata_role, referenced_metadata='releas
if not self._fileinfo_has_changed(metadata_filename, new_fileinfo):
return
logger.info('Metadata '+repr(metadata_filename)+' has changed.')
logger.debug('Metadata '+repr(metadata_filename)+' has changed.')
try:
self._update_metadata(metadata_role, fileinfo=new_fileinfo,
@ -1046,7 +1058,7 @@ def _fileinfo_has_changed(self, metadata_filename, new_fileinfo):
dict conforms to 'tuf.formats.FILEINFO_SCHEMA' and has
the form:
{'length': 23423
'hashes': {'sha256': /dfbc32343..}}
'hashes': {'sha256': adfbc32343..}}
<Exceptions>
None.
@ -1104,7 +1116,7 @@ def _update_fileinfo(self, metadata_filename):
<Purpose>
Update the 'self.fileinfo' entry for the metadata belonging to
'metadata_filename'. If the 'current' metadata for 'metadata_filename'
cannot be loaded, set the its fileinfo' to 'None' to signal that
cannot be loaded, set its fileinfo' to 'None' to signal that
it is not in the 'self.fileinfo' AND it also doesn't exist locally.
<Arguments>
@ -1117,7 +1129,7 @@ def _update_fileinfo(self, metadata_filename):
<Side Effects>
The file details of 'metadata_filename' is calculated and
stored to the 'self.fileinfo' store.
stored in 'self.fileinfo'.
<Returns>
None.
@ -1645,11 +1657,11 @@ def _preorder_depth_first_walk(self, target_filepath):
if child_role_name is None:
logger.debug('Skipping child role '+repr(child_role_name))
else:
logger.info('Adding child role '+repr(child_role_name))
logger.debug('Adding child role '+repr(child_role_name))
role_names.append(child_role_name)
else:
logger.info('Found target in current role '+repr(role_name))
logger.debug('Found target in current role '+repr(role_name))
return target
@ -1689,10 +1701,11 @@ def _get_target_from_targets_role(self, role_name, targets, target_filepath):
target = None
# Does the current role name have our target?
logger.info('Asking role '+role_name+' about target '+target_filepath)
logger.debug('Asking role '+repr(role_name)+' about target '+\
repr(target_filepath))
for filepath, fileinfo in targets.iteritems():
if filepath == target_filepath:
logger.info('Found target '+target_filepath+' in role '+role_name)
logger.debug('Found target '+target_filepath+' in role '+role_name)
target = {'filepath': filepath, 'fileinfo': fileinfo}
break
else:
@ -1757,7 +1770,7 @@ def _visit_child_role(self, child_role, target_filepath):
target_filepath_hash = self._get_target_hash(target_filepath)
if target_filepath_hash.startswith(child_role_path_hash_prefix):
logger.info('Child role '+repr(child_role_name)+' has target '+
logger.debug('Child role '+repr(child_role_name)+' has target '+
repr(target_filepath))
child_role_is_relevant = True
else:
@ -1774,7 +1787,7 @@ def _visit_child_role(self, child_role, target_filepath):
prefix = os.path.commonprefix([target_filepath, child_role_path])
if prefix == child_role_path:
logger.info('Child role '+repr(child_role_name)+' has target '+
logger.debug('Child role '+repr(child_role_name)+' has target '+
repr(target_filepath))
child_role_is_relevant = True
else:

4
tuf/hash.py
View file

@ -50,7 +50,7 @@
from Crypto.Hash import SHA512
_supported_libraries.append('pycrypto')
except ImportError:
logger.warn('Pycrypto hash algorithms could not be imported. '
logger.debug('Pycrypto hash algorithms could not be imported. '
'Supported libraries: '+str(_SUPPORTED_LIB_LIST))
pass
@ -61,7 +61,7 @@
import hashlib
_supported_libraries.append('hashlib')
except ImportError:
logger.warn('Hashlib could not be imported. '
logger.debug('Hashlib could not be imported. '
'Supported libraries: '+str(_SUPPORTED_LIB_LIST))
pass