X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=41aa3198990f1f56bffd0af4006346cc29559cfe;hb=177fa873af21febda3d3552e5eea36e37a0be793;hp=a32b0c468d023f74e48d841e92c8f18b897a2178;hpb=e9628d0da14a4a046b04ac6c20675432168dcc4a;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index a32b0c46..41aa3198 100644 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -2,7 +2,6 @@ # Utility functions # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup -# $Id: utils.py,v 1.73 2005-03-18 05:24:38 troup Exp $ ################################################################################ @@ -23,7 +22,7 @@ ################################################################################ import codecs, commands, email.Header, os, pwd, re, select, socket, shutil, \ - string, sys, tempfile, traceback + sys, tempfile, traceback import apt_pkg import database @@ -43,6 +42,8 @@ re_taint_free = re.compile(r"^[-+~/\.\w]+$") re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>") +re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$") + changes_parse_error_exc = "Can't parse line in .changes file" invalid_dsc_format_exc = "Invalid .dsc file" nk_format_exc = "Unknown Format: in .changes file" @@ -98,14 +99,6 @@ def our_raw_input(prompt=""): ################################################################################ -def str_isnum (s): - for c in s: - if c not in string.digits: - return 0 - return 1 - -################################################################################ - def extract_component_from_section(section): component = "" @@ -232,6 +225,14 @@ The rules for (signing_rules == 1)-mode are: changes_in.close() changes["filecontents"] = "".join(lines) + if changes.has_key("source"): + # Strip the source version in brackets from the source field, + # put it in the "source-version" field instead. + srcver = re_srchasver.search(changes["source"]) + if srcver: + changes["source"] = srcver.group(1) + changes["source-version"] = srcver.group(2) + if error: raise changes_parse_error_exc, error @@ -617,7 +618,7 @@ argument: orig_filename = filename if filename.endswith(".dak"): - filename = filename[:-6]+".changes" + filename = filename[:-4]+".changes" if not filename.endswith(".changes"): error = "invalid file type; not a changes file" @@ -865,10 +866,88 @@ def gpgv_get_status_output(cmd, status_read, status_write): return output, status, exit_status -############################################################ +################################################################################ + +def process_gpgv_output(status): + # Process the status-fd output + keywords = {} + internal_error = "" + for line in status.split('\n'): + line = line.strip() + if line == "": + continue + split = line.split() + if len(split) < 2: + internal_error += "gpgv status line is malformed (< 2 atoms) ['%s'].\n" % (line) + continue + (gnupg, keyword) = split[:2] + if gnupg != "[GNUPG:]": + internal_error += "gpgv status line is malformed (incorrect prefix '%s').\n" % (gnupg) + continue + args = split[2:] + if keywords.has_key(keyword) and keyword not in [ "NODATA", "SIGEXPIRED", "KEYEXPIRED" ]: + internal_error += "found duplicate status token ('%s').\n" % (keyword) + continue + else: + keywords[keyword] = args + + return (keywords, internal_error) +################################################################################ + +def retrieve_key (filename, keyserver=None, keyring=None): + """Retrieve the key that signed 'filename' from 'keyserver' and +add it to 'keyring'. Returns nothing on success, or an error message +on error.""" + + # Defaults for keyserver and keyring + if not keyserver: + keyserver = Cnf["Dinstall::KeyServer"] + if not keyring: + keyring = Cnf.ValueList("Dinstall::GPGKeyring")[0] + + # Ensure the filename contains no shell meta-characters or other badness + if not re_taint_free.match(filename): + return "%s: tainted filename" % (filename) -def check_signature (sig_filename, reject, data_filename="", keyrings=None): + # Invoke gpgv on the file + status_read, status_write = os.pipe(); + cmd = "gpgv --status-fd %s --keyring /dev/null %s" % (status_write, filename) + (_, status, _) = gpgv_get_status_output(cmd, status_read, status_write) + + # Process the status-fd output + (keywords, internal_error) = process_gpgv_output(status) + if internal_error: + return internal_error + + if not keywords.has_key("NO_PUBKEY"): + return "didn't find expected NO_PUBKEY in gpgv status-fd output" + + fingerprint = keywords["NO_PUBKEY"][0] + # XXX - gpg sucks. You can't use --secret-keyring=/dev/null as + # it'll try to create a lockfile in /dev. A better solution might + # be a tempfile or something. + cmd = "gpg --no-default-keyring --secret-keyring=%s --no-options" \ + % (Cnf["Dinstall::SigningKeyring"]) + cmd += " --keyring %s --keyserver %s --recv-key %s" \ + % (keyring, keyserver, fingerprint) + (result, output) = commands.getstatusoutput(cmd) + if (result != 0): + return "'%s' failed with exit code %s" % (cmd, result) + + return "" + +################################################################################ + +def gpg_keyring_args(keyrings=None): + if not keyrings: + keyrings = Cnf.ValueList("Dinstall::GPGKeyring") + + return " ".join(["--keyring %s" % x for x in keyrings]) + +################################################################################ + +def check_signature (sig_filename, reject, data_filename="", keyrings=None, autofetch=None): """Check the signature of a file and return the fingerprint if the signature is valid or 'None' if it's not. The first argument is the filename whose signature should be checked. The second argument is a @@ -878,8 +957,9 @@ the second is an optional prefix string. It's possible for reject() to be called more than once during an invocation of check_signature(). The third argument is optional and is the name of the files the detached signature applies to. The fourth argument is optional and is -a *list* of keyrings to use. -""" +a *list* of keyrings to use. 'autofetch' can either be None, True or +False. If None, the default behaviour specified in the config will be +used.""" # Ensure the filename contains no shell meta-characters or other badness if not re_taint_free.match(sig_filename): @@ -891,38 +971,27 @@ a *list* of keyrings to use. return None if not keyrings: - keyrings = (Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"]) + keyrings = Cnf.ValueList("Dinstall::GPGKeyring") + + # Autofetch the signing key if that's enabled + if autofetch == None: + autofetch = Cnf.get("Dinstall::KeyAutoFetch") + if autofetch: + error_msg = retrieve_key(sig_filename) + if error_msg: + reject(error_msg) + return None # Build the command line status_read, status_write = os.pipe(); - cmd = "gpgv --status-fd %s" % (status_write) - for keyring in keyrings: - cmd += " --keyring %s" % (keyring) - cmd += " %s %s" % (sig_filename, data_filename) + cmd = "gpgv --status-fd %s %s %s %s" % ( + status_write, gpg_keyring_args(keyrings), sig_filename, data_filename) + # Invoke gpgv on the file (output, status, exit_status) = gpgv_get_status_output(cmd, status_read, status_write) # Process the status-fd output - keywords = {} - bad = internal_error = "" - for line in status.split('\n'): - line = line.strip() - if line == "": - continue - split = line.split() - if len(split) < 2: - internal_error += "gpgv status line is malformed (< 2 atoms) ['%s'].\n" % (line) - continue - (gnupg, keyword) = split[:2] - if gnupg != "[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" and keyword != "SIGEXPIRED"): - internal_error += "found duplicate status token ('%s').\n" % (keyword) - continue - else: - keywords[keyword] = args + (keywords, internal_error) = process_gpgv_output(status) # If we failed to parse the status-fd output, let's just whine and bail now if internal_error: @@ -931,10 +1000,8 @@ a *list* of keyrings to use. reject("Please report the above errors to the Archive maintainers by replying to this mail.", "") return None + bad = "" # Now check for obviously bad things in the processed output - if keywords.has_key("SIGEXPIRED"): - reject("The key used to sign %s has expired." % (sig_filename)) - bad = 1 if keywords.has_key("KEYREVOKED"): reject("The key used to sign %s has been revoked." % (sig_filename)) bad = 1 @@ -956,6 +1023,9 @@ a *list* of keyrings to use. if keywords.has_key("NODATA"): reject("no signature found in %s." % (sig_filename)) bad = 1 + if keywords.has_key("KEYEXPIRED") and not keywords.has_key("GOODSIG"): + reject("The key (0x%s) used to sign %s has expired." % (key, sig_filename)) + bad = 1 if bad: return None