X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jennifer;h=1df7e7a815e0a11411e9fb80701cd5401f7fd571;hb=d30d79f610c44d44f70862f4ae0ddcdca640a7c7;hp=563a97314118c7bc8adb9e32f4f992810bc6b578;hpb=7373e8d22c233a23fdbb339ac6653b7b20c2638c;p=dak.git diff --git a/jennifer b/jennifer index 563a9731..1df7e7a8 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002 James Troup -# $Id: jennifer,v 1.18 2002-05-14 15:35:22 troup Exp $ +# $Id: jennifer,v 1.26 2002-07-14 18:19:25 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,12 +38,14 @@ from types import *; ################################################################################ re_bad_diff = re.compile("^[\-\+][\-\+][\-\+] /dev/null"); -re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$"); +re_is_changes = re.compile(r"(.+?)_(.+?)_(.+?)\.changes$"); +re_valid_version = re.compile(r"^([0-9]+:)?[0-9A-Za-z\.\-\+:]+$"); +re_valid_pkg_name = re.compile(r"^[\dA-Za-z][\dA-Za-z\+\-\.]+$"); ################################################################################ # Globals -jennifer_version = "$Revision: 1.18 $"; +jennifer_version = "$Revision: 1.26 $"; Cnf = None; Options = None; @@ -311,7 +313,7 @@ def copy_to_holding(filename): try: shutil.copy(filename, dest); except IOError, e: - # In either case (ENOENT or EPERM) we want to remove the + # In either case (ENOENT or EACCES) we want to remove the # O_CREAT | O_EXCLed ghost file, so add the file to the list # of 'in holding' even if it's not the real file. if errno.errorcode[e.errno] == 'ENOENT': @@ -355,7 +357,7 @@ def check_changes(): # Parse the .changes field into a dictionary try: - changes.update(utils.parse_changes(filename, 0)); + changes.update(utils.parse_changes(filename)); except utils.cant_open_exc: reject("can't read changes file '%s'." % (filename)); return 0; @@ -365,7 +367,7 @@ def check_changes(): # Parse the Files field from the .changes into another dictionary try: - files.update(utils.build_file_list(changes, "")); + files.update(utils.build_file_list(changes)); except utils.changes_parse_error_exc, line: reject("error parsing changes file '%s', can't grok: %s." % (filename, line)); except utils.nk_format_exc, format: @@ -419,30 +421,30 @@ def check_distributions(): "Check and map the Distribution field of a .changes file." # Handle suite mappings - if Cnf.has_key("SuiteMappings"): - for map in Cnf.ValueList("SuiteMappings"): - args = string.split(map); - type = args[0]; - if type == "map": - (source, dest) = args[1:3]; - if changes["distribution"].has_key(source): - del changes["distribution"][source] - changes["distribution"][dest] = 1; + for map in Cnf.ValueList("SuiteMappings"): + args = string.split(map); + type = args[0]; + if type == "map" or type == "silent-map": + (source, dest) = args[1:3]; + if changes["distribution"].has_key(source): + del changes["distribution"][source] + changes["distribution"][dest] = 1; + if type != "silent-map": reject("Mapping %s to %s." % (source, dest),""); - elif type == "map-unreleased": - (source, dest) = args[1:3]; - if changes["distribution"].has_key(source): - for arch in changes["architecture"].keys(): - if arch not in Cnf.ValueList("Suite::%s::Architectures" % (source)): - reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),""); - del changes["distribution"][source]; - changes["distribution"][dest] = 1; - break; - elif type == "ignore": - suite = args[1]; - if changes["distribution"].has_key(suite): - del changes["distribution"][suite]; - reject("Ignoring %s as a target suite." % (suite), "Warning: "); + elif type == "map-unreleased": + (source, dest) = args[1:3]; + if changes["distribution"].has_key(source): + for arch in changes["architecture"].keys(): + if arch not in Cnf.ValueList("Suite::%s::Architectures" % (source)): + reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),""); + del changes["distribution"][source]; + changes["distribution"][dest] = 1; + break; + elif type == "ignore": + suite = args[1]; + if changes["distribution"].has_key(suite): + del changes["distribution"][suite]; + reject("Ignoring %s as a target suite." % (suite), "Warning: "); # Ensure there is (still) a target distribution if changes["distribution"].keys() == []: @@ -514,14 +516,26 @@ def check_files(): for field in [ "Package", "Architecture", "Version" ]: if control.Find(field) == None: reject("%s: No %s field in control." % (file, field)); + # Can't continue + continue; # Ensure the package name matches the one give in the .changes if not changes["binary"].has_key(control.Find("Package", "")): reject("%s: control file lists name as `%s', which isn't in changes file." % (file, control.Find("Package", ""))); + # Validate the package field + package = control.Find("Package"); + if not re_valid_pkg_name.match(package): + reject("%s: invalid package name '%s'." % (file, package)); + + # Validate the version field + version = control.Find("Version"); + if not re_valid_version.match(version): + reject("%s: invalid version number '%s'." % (file, version)); + # Ensure the architecture of the .deb is one we know about. default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable") - architecture = control.Find("Architecture", ""); + architecture = control.Find("Architecture"); if architecture not in Cnf.ValueList("Suite::%s::Architectures" % (default_suite)): reject("Unknown architecture '%s'." % (architecture)); @@ -536,9 +550,9 @@ def check_files(): if control.Find("Priority") != None and files[file]["priority"] != "" and files[file]["priority"] != control.Find("Priority"): reject("%s control file lists priority as `%s', but changes file has `%s'." % (file, control.Find("Priority", ""), files[file]["priority"]),"Warning: "); - files[file]["package"] = control.Find("Package"); + files[file]["package"] = package; files[file]["architecture"] = architecture; - files[file]["version"] = control.Find("Version"); + files[file]["version"] = version; files[file]["maintainer"] = control.Find("Maintainer", ""); if file[-5:] == ".udeb": files[file]["dbtype"] = "udeb"; @@ -546,9 +560,7 @@ def check_files(): files[file]["dbtype"] = "deb"; else: reject("%s is neither a .deb or a .udeb." % (file)); - files[file]["source"] = control.Find("Source", ""); - if files[file]["source"] == "": - files[file]["source"] = files[file]["package"]; + files[file]["source"] = control.Find("Source", files[file]["package"]); # Get the source version source = files[file]["source"]; source_version = "" @@ -567,7 +579,7 @@ def check_files(): file_package = m.group(1); if files[file]["package"] != file_package: reject("%s: package part of filename (%s) does not match package name in the %s (%s)." % (file, file_package, files[file]["dbtype"], files[file]["package"])); - epochless_version = utils.re_no_epoch.sub('', control.Find("Version", "")) + epochless_version = utils.re_no_epoch.sub('', control.Find("Version")); # version file_version = m.group(2); if epochless_version != file_version: @@ -638,8 +650,14 @@ def check_files(): for suite in changes["distribution"].keys(): # Skip byhand if files[file].has_key("byhand"): - continue + continue; + # Handle component mappings + for map in Cnf.ValueList("ComponentMappings"): + (source, dest) = string.split(map); + if files[file]["component"] == source: + files[file]["original component"] = source; + files[file]["component"] = dest; # Ensure the component is valid for the target suite if Cnf.has_key("Suite:%s::Components" % (suite)) and \ files[file]["component"] not in Cnf.ValueList("Suite::%s::Components" % (suite)): @@ -713,7 +731,7 @@ def check_dsc (): if files[file]["type"] == "dsc": # Parse the .dsc file try: - dsc.update(utils.parse_changes(file, 1)); + dsc.update(utils.parse_changes(file, dsc_whitespace_rules=1)); except utils.cant_open_exc: # if not -n copy_to_holding() will have done this for us... if Options["No-Action"]: @@ -724,7 +742,7 @@ def check_dsc (): reject("syntax error in .dsc file '%s', line %s." % (file, line)); # Build up the file list of files mentioned by the .dsc try: - dsc_files.update(utils.build_file_list(dsc, 1)); + dsc_files.update(utils.build_file_list(dsc, is_a_dsc=1)); except utils.no_files_exc: reject("no Files: field in .dsc file."); continue; @@ -737,6 +755,12 @@ def check_dsc (): if not dsc.has_key(i): reject("Missing field `%s' in dsc file." % (i)); + # Validate the source and version fields + if dsc.has_key("source") and not re_valid_pkg_name.match(dsc["source"]): + reject("%s: invalid source name '%s'." % (file, dsc["source"])); + if dsc.has_key("version") and not re_valid_version.match(dsc["version"]): + reject("%s: invalid version number '%s'." % (file, dsc["version"])); + # The dpkg maintainer from hell strikes again! Bumping the # version number of the .dsc breaks extraction by stable's # dpkg-source. @@ -818,17 +842,41 @@ def check_md5sums (): try: file_handle = utils.open_file(file); except utils.cant_open_exc: - pass; - else: - if apt_pkg.md5sum(file_handle) != files[file]["md5sum"]: - reject("md5sum check failed for %s." % (file)); - file_handle.close(); + continue; + + # Check md5sum + if apt_pkg.md5sum(file_handle) != files[file]["md5sum"]: + reject("%s: md5sum check failed." % (file)); + file_handle.close(); + # Check size + actual_size = os.stat(file)[stat.ST_SIZE]; + size = int(files[file]["size"]); + if size != actual_size: + reject("%s: actual file size (%s) does not match size (%s) in .changes" + % (file, actual_size, size)); + + for file in dsc_files.keys(): + try: + file_handle = utils.open_file(file); + except utils.cant_open_exc: + continue; + + # Check md5sum + if apt_pkg.md5sum(file_handle) != dsc_files[file]["md5sum"]: + reject("%s: md5sum check failed." % (file)); + file_handle.close(); + # Check size + actual_size = os.stat(file)[stat.ST_SIZE]; + size = int(dsc_files[file]["size"]); + if size != actual_size: + reject("%s: actual file size (%s) does not match size (%s) in .dsc" + % (file, actual_size, size)); ################################################################################ # Sanity check the time stamps of files inside debs. # [Files in the near future cause ugly warnings and extreme time -# travel can causes errors on extraction] +# travel can cause errors on extraction] def check_timestamps(): class Tar: @@ -1079,9 +1127,9 @@ def process_it (changes_file): while reprocess: check_distributions(); check_files(); - check_md5sums(); check_dsc(); check_diff(); + check_md5sums(); check_urgency(); check_timestamps(); Katie.update_subst(reject_message);