# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.22 2002-06-08 00:17:57 troup Exp $
+# $Id: jennifer,v 1.30 2003-01-02 18:11:53 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
################################################################################
-import FCNTL, errno, fcntl, gzip, os, re, select, shutil, stat, string, sys, time, traceback;
+import FCNTL, errno, fcntl, gzip, os, re, select, shutil, stat, sys, time, traceback;
import apt_inst, apt_pkg;
import db_access, katie, logging, utils;
################################################################################
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.22 $";
+jennifer_version = "$Revision: 1.30 $";
Cnf = None;
Options = None;
changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
Options = Cnf.SubTree("Dinstall::Options")
+ if Options["Help"]:
+ usage();
+ elif Options["Version"]:
+ print "jennifer %s" % (jennifer_version);
+ sys.exit(0);
+
Katie = katie.Katie(Cnf);
changes = Katie.pkg.changes;
return changes_files;
-#########################################################################################
+################################################################################
def usage (exit_code=0):
print """Usage: dinstall [OPTION]... [CHANGES]...
-V, --version display the version number and exit"""
sys.exit(exit_code)
-#########################################################################################
+################################################################################
# Our very own version of commands.getouputstatus(), hacked to support
# gpgv's status fd.
if len(r) > 0:
more_data.append(fd);
if fd == c2pwrite or fd == errin:
- output = output + r;
+ output += r;
elif fd == status_read:
- status = status + r;
+ status += r;
else:
utils.fubar("Unexpected file descriptor [%s] returned from select\n" % (fd));
if not more_data:
return output, status, exit_status;
-#########################################################################################
+################################################################################
def Dict(**dict): return dict
def reject (str, prefix="Rejected: "):
global reject_message;
if str:
- reject_message = reject_message + prefix + str + "\n";
+ reject_message += prefix + str + "\n";
-#########################################################################################
+################################################################################
def check_signature (filename):
if not utils.re_taint_free.match(os.path.basename(filename)):
# Process the status-fd output
keywords = {};
bad = internal_error = "";
- for line in string.split(status, '\n'):
- line = string.strip(line);
+ for line in status.split('\n'):
+ line = line.strip();
if line == "":
continue;
- split = string.split(line);
+ split = line.split();
if len(split) < 2:
- internal_error = internal_error + "gpgv status line is malformed (< 2 atoms) ['%s'].\n" % (line);
+ internal_error += "gpgv status line is malformed (< 2 atoms) ['%s'].\n" % (line);
continue;
(gnupg, keyword) = split[:2];
if gnupg != "[GNUPG:]":
- internal_error = internal_error + "gpgv status line is malformed (incorrect prefix '%s').\n" % (gnupg);
+ internal_error += "gpgv status line is malformed (incorrect prefix '%s').\n" % (gnupg);
continue;
args = split[2:];
if keywords.has_key(keyword) and keyword != "NODATA":
- internal_error = internal_error + "found duplicate status token ('%s').\n" % (keyword);
+ internal_error += "found duplicate status token ('%s').\n" % (keyword);
continue;
else:
keywords[keyword] = args;
# Next check gpgv exited with a zero return code
if exit_status:
reject("gpgv failed while checking %s." % (filename));
- if string.strip(status):
+ if status.strip():
reject(utils.prefix_multi_line_string(status, " [GPG status-fd output:] "), "");
else:
reject(utils.prefix_multi_line_string(output, " [GPG output:] "), "");
for keyword in keywords.keys():
if not known_keywords.has_key(keyword):
- reject("found unknown status token '%s' from gpgv with args '%s' in %s." % (keyword, repr(keywords[keyword]), filename));
+ reject("found unknown status token '%s' from gpgv with args '%r' in %s." % (keyword, keywords[keyword], filename));
bad = 1;
if bad:
raise;
in_holding[base_filename] = "";
- return dest;
################################################################################
os.chdir(Cnf["Dir::Queue::Holding"]);
for file in in_holding.keys():
if os.path.exists(file):
- if string.find(file, '/') != -1:
+ if file.find('/') != -1:
utils.fubar("WTF? clean_holding() got a file ('%s') with / in it!" % (file));
else:
os.unlink(file);
if o != "":
del changes[i]
changes[i] = {}
- for j in string.split(o):
+ for j in o.split():
changes[i][j] = 1
# Fix the Maintainer: field to be RFC822 compatible
# Handle suite mappings
for map in Cnf.ValueList("SuiteMappings"):
- args = string.split(map);
+ args = map.split();
type = args[0];
if type == "map" or type == "silent-map":
(source, dest) = args[1:3];
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));
if not changes["architecture"].has_key(architecture):
reject("%s: control file lists arch as `%s', which isn't in changes file." % (file, architecture));
+ # Sanity-check the Depends field
+ depends = control.Find("Depends");
+ if depends == '':
+ reject("%s: Depends field is empty." % (file));
+
# Check the section & priority match those given in the .changes (non-fatal)
if control.Find("Section") != None and files[file]["section"] != "" and files[file]["section"] != control.Find("Section"):
reject("%s control file lists section as `%s', but changes file has `%s'." % (file, control.Find("Section", ""), files[file]["section"]), "Warning: ");
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":
+ if file.endswith(".udeb"):
files[file]["dbtype"] = "udeb";
- elif file[-4:] == ".deb":
+ elif file.endswith(".deb"):
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 = ""
- if string.find(source, "(") != -1:
+ if source.find("(") != -1:
m = utils.re_extract_src_version.match(source)
source = m.group(1)
source_version = m.group(2)
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:
# Handle component mappings
for map in Cnf.ValueList("ComponentMappings"):
- (source, dest) = string.split(map);
+ (source, dest) = map.split();
if files[file]["component"] == source:
files[file]["original component"] = source;
files[file]["component"] = dest;
continue;
# Validate the priority
- if string.find(files[file]["priority"],'/') != -1:
+ if files[file]["priority"].find('/') != -1:
reject("file '%s' has invalid priority '%s' [contains '/']." % (file, files[file]["priority"]));
# Determine the location
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.
if changes["urgency"] not in Cnf.ValueList("Urgency::Valid"):
reject("%s is not a valid urgency; it will be treated as %s by testing." % (changes["urgency"], Cnf["Urgency::Default"]), "Warning: ");
changes["urgency"] = Cnf["Urgency::Default"];
- changes["urgency"] = string.lower(changes["urgency"]);
+ changes["urgency"] = changes["urgency"].lower();
################################################################################
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));
################################################################################
if Options["No-Action"] or Options["Automatic"]:
answer = 'S'
- if string.find(reject_message, "Rejected") != -1:
+ if reject_message.find("Rejected") != -1:
if upload_too_new():
print "SKIP (too new)\n" + reject_message,;
prompt = "[S]kip, Quit ?";
if Options["Automatic"]:
answer = 'R';
elif new:
- print "NEW to %s\n%s%s" % (string.join(changes["distribution"].keys(), ", "), reject_message, summary),;
+ print "NEW to %s\n%s%s" % (", ".join(changes["distribution"].keys()), reject_message, summary),;
prompt = "[N]ew, Skip, Quit ?";
if Options["Automatic"]:
answer = 'N';
if Options["Automatic"]:
answer = 'A';
- while string.find(prompt, answer) == -1:
+ while prompt.find(answer) == -1:
answer = utils.our_raw_input(prompt);
m = katie.re_default_answer.match(prompt);
if answer == "":
answer = m.group(1);
- answer = string.upper(answer[:1]);
+ answer = answer[:1].upper();
if answer == 'R':
os.chdir (pkg.directory);
while reprocess:
check_distributions();
check_files();
- check_md5sums();
check_dsc();
check_diff();
+ check_md5sums();
check_urgency();
check_timestamps();
Katie.update_subst(reject_message);
changes_files = init();
- if Options["Help"]:
- usage();
-
- if Options["Version"]:
- print "jennifer %s" % (jennifer_version);
- sys.exit(0);
-
# -n/--dry-run invalidates some other options which would involve things happening
if Options["No-Action"]:
Options["Automatic"] = "";
# Ensure all the arguments we were given are .changes files
for file in changes_files:
- if file[-8:] != ".changes":
+ if not file.endswith(".changes"):
utils.warn("Ignoring '%s' because it's not a .changes file." % (file));
changes_files.remove(file);
projects / dak.git / blobdiff