Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

archive: use verify_file_checksums()

Browse Source 
This reduces duplicate verification steps, and results in logging
error from the verification function if there is a size mismatch,
instead of the silent verification failure that was present in case
neither sha checksum was provided.

Signed-off-by: Dan Streetman <ddstreet@canonical.com>
This commit is contained in:
Dan Streetman 2020-07-21 15:01:16 -04:00
parent e5a42b1ba1
commit 61f0023c37
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ubuntutools/archive.py
View File

@ -48,7 +48,7 @@ from ubuntutools.lp.lpapicache import (Launchpad, Distribution, PersonTeam,
from ubuntutools.lp.udtexceptions import (PackageNotFoundException, from ubuntutools.lp.udtexceptions import (PackageNotFoundException,
SeriesNotFoundException, SeriesNotFoundException,
InvalidDistroValueError) InvalidDistroValueError)
from ubuntutools.misc import (download, verify_file_checksum) from ubuntutools.misc import (download, verify_file_checksum, verify_file_checksums)
from ubuntutools.version import Version from ubuntutools.version import Version
import logging import logging
@ -355,16 +355,17 @@ class SourcePackage(object):
else: else:
Logger.warning('Signature on %s could not be verified' % self.dsc_name) Logger.warning('Signature on %s could not be verified' % self.dsc_name)
def _verify_file(self, pathname, dscverify=False, sha1sum=False, sha256sum=False, size=0): def _verify_file(self, pathname, dscverify=False, sha1sum=None, sha256sum=None, size=0):
if not os.path.exists(pathname): if not os.path.exists(pathname):
return False return False
if size and size != os.path.getsize(pathname):
return False
if dscverify and not self.dsc.verify_file(pathname): if dscverify and not self.dsc.verify_file(pathname):
return False return False
if sha1sum and not verify_file_checksum(pathname, 'SHA1', sha1sum, size): checksums = {}
return False if sha1sum:
if sha256sum and not verify_file_checksum(pathname, 'SHA256', sha256sum, size): checksums['SHA1'] = sha1sum
if sha256sum:
checksums['SHA256'] = sha256sum
if not verify_file_checksums(pathname, checksums, size):
return False return False
return True return True