X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fupload.py;h=2cc70743baba35a3f7ca21da660ee48d225946cd;hb=f52fdad1294f588eb467002d6ee2344b824254da;hp=ec120a7bdbdd9964d2b3fbfd7304ea567ad4a184;hpb=206fb80997ed8e3aa8ee317d454a3fb9470b7ffc;p=dak.git diff --git a/daklib/upload.py b/daklib/upload.py index ec120a7b..2cc70743 100644 --- a/daklib/upload.py +++ b/daklib/upload.py @@ -23,6 +23,7 @@ It provides methods to access the included binary and source packages. import apt_inst import apt_pkg +import errno import os import re @@ -30,16 +31,19 @@ from daklib.gpg import SignedFile from daklib.regexes import * import daklib.packagelist -class InvalidChangesException(Exception): +class UploadException(Exception): pass -class InvalidBinaryException(Exception): +class InvalidChangesException(UploadException): pass -class InvalidSourceException(Exception): +class InvalidBinaryException(UploadException): pass -class InvalidHashException(Exception): +class InvalidSourceException(UploadException): + pass + +class InvalidHashException(UploadException): def __init__(self, filename, hash_name, expected, actual): self.filename = filename self.hash_name = hash_name @@ -50,16 +54,22 @@ class InvalidHashException(Exception): "According to the control file the {0} hash should be {2},\n" "but {1} has {3}.\n" "\n" - "If you did not include {1} in you upload, a different version\n" + "If you did not include {1} in your upload, a different version\n" "might already be known to the archive software.") \ .format(self.hash_name, self.filename, self.expected, self.actual) -class InvalidFilenameException(Exception): +class InvalidFilenameException(UploadException): def __init__(self, filename): self.filename = filename def __str__(self): return "Invalid filename '{0}'.".format(self.filename) +class FileDoesNotExist(UploadException): + def __init__(self, filename): + self.filename = filename + def __str__(self): + return "Refers to non-existing file '{0}'".format(self.filename) + class HashedFile(object): """file with checksums """ @@ -121,8 +131,8 @@ class HashedFile(object): @return: C{HashedFile} object for the given file """ path = os.path.join(directory, filename) - size = os.stat(path).st_size with open(path, 'r') as fh: + size = os.fstat(fh.fileno()).st_size hashes = apt_pkg.Hashes(fh) return cls(filename, size, hashes.md5, hashes.sha1, hashes.sha256, section, priority) @@ -137,14 +147,22 @@ class HashedFile(object): @raise InvalidHashException: hash mismatch """ path = os.path.join(directory, self.filename) + try: + with open(path) as fh: + self.check_fh(fh) + except IOError as e: + if e.errno == errno.ENOENT: + raise FileDoesNotExist(self.filename) + raise + + def check_fh(self, fh): + size = os.fstat(fh.fileno()).st_size + fh.seek(0) + hashes = apt_pkg.Hashes(fh) - size = os.stat(path).st_size if size != self.size: raise InvalidHashException(self.filename, 'size', self.size, size) - with open(path) as fh: - hashes = apt_pkg.Hashes(fh) - if hashes.md5 != self.md5sum: raise InvalidHashException(self.filename, 'md5sum', self.md5sum, hashes.md5) @@ -154,7 +172,7 @@ class HashedFile(object): if hashes.sha256 != self.sha256sum: raise InvalidHashException(self.filename, 'sha256sum', self.sha256sum, hashes.sha256) -def parse_file_list(control, has_priority_and_section): +def parse_file_list(control, has_priority_and_section, safe_file_regexp = re_file_safe, fields = ('Files', 'Checksums-Sha1', 'Checksums-Sha256')): """Parse Files and Checksums-* fields @type control: dict-like @@ -171,7 +189,7 @@ def parse_file_list(control, has_priority_and_section): """ entries = {} - for line in control.get("Files", "").split('\n'): + for line in control.get(fields[0], "").split('\n'): if len(line) == 0: continue @@ -184,26 +202,26 @@ def parse_file_list(control, has_priority_and_section): entries[filename] = entry - for line in control.get("Checksums-Sha1", "").split('\n'): + for line in control.get(fields[1], "").split('\n'): if len(line) == 0: continue (sha1sum, size, filename) = line.split() entry = entries.get(filename, None) if entry is None: - raise InvalidChangesException('{0} is listed in Checksums-Sha1, but not in Files.'.format(filename)) + raise InvalidChangesException('{0} is listed in {1}, but not in {2}.'.format(filename, fields[1], fields[0])) if entry is not None and entry.get('size', None) != long(size): - raise InvalidChangesException('Size for {0} in Files and Checksum-Sha1 fields differ.'.format(filename)) + raise InvalidChangesException('Size for {0} in {1} and {2} fields differ.'.format(filename, fields[0], fields[1])) entry['sha1sum'] = sha1sum - for line in control.get("Checksums-Sha256", "").split('\n'): + for line in control.get(fields[2], "").split('\n'): if len(line) == 0: continue (sha256sum, size, filename) = line.split() entry = entries.get(filename, None) if entry is None: - raise InvalidChangesException('{0} is listed in Checksums-Sha256, but not in Files.'.format(filename)) + raise InvalidChangesException('{0} is listed in {1}, but not in {2}.'.format(filename, fields[2], fields[0])) if entry is not None and entry.get('size', None) != long(size): - raise InvalidChangesException('Size for {0} in Files and Checksum-Sha256 fields differ.'.format(filename)) + raise InvalidChangesException('Size for {0} in {1} and {2} fields differ.'.format(filename, fields[0], fields[2])) entry['sha256sum'] = sha256sum files = {} @@ -217,7 +235,7 @@ def parse_file_list(control, has_priority_and_section): raise InvalidChangesException('No sha1sum for {0}.'.format(filename)) if 'sha256sum' not in entry: raise InvalidChangesException('No sha256sum for {0}.'.format(filename)) - if not re_file_safe.match(filename): + if safe_file_regexp is not None and not safe_file_regexp.match(filename): raise InvalidChangesException("{0}: References file with unsafe filename {1}.".format(self.filename, filename)) f = files[filename] = HashedFile(**entry)