X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=a094788fbada0fe97c153fe93bcfd714bd3b095b;hb=d9822f04453a1b62ca0aa66e2efeea35f654778f;hp=a32b0c468d023f74e48d841e92c8f18b897a2178;hpb=7df9c3b974bcd1c3bc40d29d154f6b86b6454ddd;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index a32b0c46..a094788f 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 @@ -42,6 +41,12 @@ re_multi_line_field = re.compile(r"^\s(.*)") re_taint_free = re.compile(r"^[-+~/\.\w]+$") re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>") +re_gpg_uid = re.compile('^uid.*<([^>]*)>') + +re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$") +re_verwithext = re.compile(r"^(\d+)(?:\.(\d+))(?:\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" @@ -57,6 +62,9 @@ tried_too_hard_exc = "Tried too hard to find a free filename." default_config = "/etc/dak/dak.conf" default_apt_config = "/etc/dak/apt.conf" +alias_cache = None +key_uid_email_cache = {} + ################################################################################ class Error(Exception): @@ -78,7 +86,7 @@ class ParseMaintError(Error): def open_file(filename, mode='r'): try: - f = open(filename, mode) + f = open(filename, mode) except IOError: raise cant_open_exc, filename return f @@ -98,30 +106,11 @@ 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 = "" if section.find('/') != -1: component = section.split('/')[0] - if component.lower() == "non-us" and section.find('/') != -1: - s = component + '/' + section.split('/')[1] - if Cnf.has_key("Component::%s" % s): # Avoid e.g. non-US/libs - component = s - - if section.lower() == "non-us": - component = "non-US/main" - - # non-US prefix is case insensitive - if component.lower()[:6] == "non-us": - component = "non-US"+component[6:] # Expand default component if component == "": @@ -129,8 +118,6 @@ def extract_component_from_section(section): component = section else: component = "main" - elif component == "non-US": - component = "non-US/main" return (section, component) @@ -164,7 +151,7 @@ The rules for (signing_rules == 1)-mode are: lines = changes_in.readlines() if not lines: - raise changes_parse_error_exc, "[Empty changes file]" + raise changes_parse_error_exc, "[Empty changes file]" # Reindex by line number so we can easily verify the format of # .dsc files... @@ -210,7 +197,7 @@ The rules for (signing_rules == 1)-mode are: if slf: field = slf.groups()[0].lower() changes[field] = slf.groups()[1] - first = 1 + first = 1 continue if line == " .": changes[field] += '\n' @@ -222,9 +209,9 @@ The rules for (signing_rules == 1)-mode are: if first == 1 and changes[field] != "": changes[field] += '\n' first = 0 - changes[field] += mlf.groups()[0] + '\n' + changes[field] += mlf.groups()[0] + '\n' continue - error += line + error += line if signing_rules == 1 and inside_signature: raise invalid_dsc_format_exc, index @@ -232,8 +219,16 @@ 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 + raise changes_parse_error_exc, error return changes @@ -241,31 +236,48 @@ The rules for (signing_rules == 1)-mode are: # Dropped support for 1.4 and ``buggy dchanges 3.4'' (?!) compared to di.pl -def build_file_list(changes, is_a_dsc=0): +def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"): files = {} # Make sure we have a Files: field to parse... - if not changes.has_key("files"): - raise no_files_exc + if not changes.has_key(field): + raise no_files_exc # Make sure we recognise the format of the Files: field - format = changes.get("format", "") - if format != "": - format = float(format) - if not is_a_dsc and (format < 1.5 or format > 2.0): - raise nk_format_exc, format + format = re_verwithext.search(changes.get("format", "0.0")) + if not format: + raise nk_format_exc, "%s" % (changes.get("format","0.0")) + + format = format.groups() + if format[1] == None: + format = int(float(format[0])), 0, format[2] + else: + format = int(format[0]), int(format[1]), format[2] + if format[2] == None: + format = format[:2] + + if is_a_dsc: + if format != (1,0): + raise nk_format_exc, "%s" % (changes.get("format","0.0")) + else: + if (format < (1,5) or format > (1,8)): + raise nk_format_exc, "%s" % (changes.get("format","0.0")) + if field != "files" and format < (1,8): + raise nk_format_exc, "%s" % (changes.get("format","0.0")) + + includes_section = (not is_a_dsc) and field == "files" # Parse each entry/line: - for i in changes["files"].split('\n'): + for i in changes[field].split('\n'): if not i: break s = i.split() section = priority = "" try: - if is_a_dsc: - (md5, size, name) = s - else: + if includes_section: (md5, size, section, priority, name) = s + else: + (md5, size, name) = s except ValueError: raise changes_parse_error_exc, i @@ -276,8 +288,9 @@ def build_file_list(changes, is_a_dsc=0): (section, component) = extract_component_from_section(section) - files[name] = Dict(md5sum=md5, size=size, section=section, + files[name] = Dict(size=size, section=section, priority=priority, component=component) + files[name][hashname] = md5 return files @@ -364,48 +377,46 @@ switched to 'email (name)' format.""" # sendmail wrapper, takes _either_ a message string or a file as arguments def send_mail (message, filename=""): - # If we've been passed a string dump it into a temporary file - if message: - filename = tempfile.mktemp() - fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700) - os.write (fd, message) - os.close (fd) - - # Invoke sendmail - (result, output) = commands.getstatusoutput("%s < %s" % (Cnf["Dinstall::SendmailCommand"], filename)) - if (result != 0): - raise sendmail_failed_exc, output - - # Clean up any temporary files - if message: - os.unlink (filename) + # If we've been passed a string dump it into a temporary file + if message: + filename = tempfile.mktemp() + fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700) + os.write (fd, message) + os.close (fd) + + # Invoke sendmail + (result, output) = commands.getstatusoutput("%s < %s" % (Cnf["Dinstall::SendmailCommand"], filename)) + if (result != 0): + raise sendmail_failed_exc, output + + # Clean up any temporary files + if message: + os.unlink (filename) ################################################################################ def poolify (source, component): if component: - component += '/' - # FIXME: this is nasty - component = component.lower().replace("non-us/", "non-US/") + component += '/' if source[:3] == "lib": - return component + source[:4] + '/' + source + '/' + return component + source[:4] + '/' + source + '/' else: - return component + source[:1] + '/' + source + '/' + return component + source[:1] + '/' + source + '/' ################################################################################ def move (src, dest, overwrite = 0, perms = 0664): if os.path.exists(dest) and os.path.isdir(dest): - dest_dir = dest + dest_dir = dest else: - dest_dir = os.path.dirname(dest) + dest_dir = os.path.dirname(dest) if not os.path.exists(dest_dir): - umask = os.umask(00000) - os.makedirs(dest_dir, 02775) - os.umask(umask) + umask = os.umask(00000) + os.makedirs(dest_dir, 02775) + os.umask(umask) #print "Moving %s to %s..." % (src, dest) if os.path.exists(dest) and os.path.isdir(dest): - dest += '/' + os.path.basename(src) + dest += '/' + os.path.basename(src) # Don't overwrite unless forced to if os.path.exists(dest): if not overwrite: @@ -419,16 +430,16 @@ def move (src, dest, overwrite = 0, perms = 0664): def copy (src, dest, overwrite = 0, perms = 0664): if os.path.exists(dest) and os.path.isdir(dest): - dest_dir = dest + dest_dir = dest else: - dest_dir = os.path.dirname(dest) + dest_dir = os.path.dirname(dest) if not os.path.exists(dest_dir): - umask = os.umask(00000) - os.makedirs(dest_dir, 02775) - os.umask(umask) + umask = os.umask(00000) + os.makedirs(dest_dir, 02775) + os.umask(umask) #print "Copying %s to %s..." % (src, dest) if os.path.exists(dest) and os.path.isdir(dest): - dest += '/' + os.path.basename(src) + dest += '/' + os.path.basename(src) # Don't overwrite unless forced to if os.path.exists(dest): if not overwrite: @@ -445,23 +456,31 @@ def where_am_i (): res = socket.gethostbyaddr(socket.gethostname()) database_hostname = Cnf.get("Config::" + res[0] + "::DatabaseHostname") if database_hostname: - return database_hostname + return database_hostname else: return res[0] def which_conf_file (): res = socket.gethostbyaddr(socket.gethostname()) if Cnf.get("Config::" + res[0] + "::DakConfig"): - return Cnf["Config::" + res[0] + "::DakConfig"] + return Cnf["Config::" + res[0] + "::DakConfig"] else: - return default_config + return default_config def which_apt_conf_file (): res = socket.gethostbyaddr(socket.gethostname()) if Cnf.get("Config::" + res[0] + "::AptConfig"): - return Cnf["Config::" + res[0] + "::AptConfig"] + return Cnf["Config::" + res[0] + "::AptConfig"] else: - return default_apt_config + return default_apt_config + +def which_alias_file(): + hostname = socket.gethostbyaddr(socket.gethostname())[0] + aliasfn = '/var/lib/misc/'+hostname+'/forward-alias' + if os.path.exists(aliasfn): + return aliasfn + else: + return None ################################################################################ @@ -617,7 +636,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" @@ -647,9 +666,9 @@ def real_arch(arch): ################################################################################ def join_with_commas_and(list): - if len(list) == 0: return "nothing" - if len(list) == 1: return list[0] - return ", ".join(list[:-1]) + " and " + list[-1] + if len(list) == 0: return "nothing" + if len(list) == 1: return list[0] + return ", ".join(list[:-1]) + " and " + list[-1] ################################################################################ @@ -667,7 +686,7 @@ def pp_deps (deps): ################################################################################ def get_conf(): - return Cnf + return Cnf ################################################################################ @@ -865,10 +884,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 +975,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 +989,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) + status_read, status_write = os.pipe(); + 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 +1018,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 +1041,12 @@ 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"): + args = keywords["KEYEXPIRED"] + if len(args) >= 1: + key = args[0] + reject("The key (0x%s) used to sign %s has expired." % (key, sig_filename)) + bad = 1 if bad: return None @@ -990,7 +1081,7 @@ a *list* of keyrings to use. # Finally ensure there's not something we don't recognise known_keywords = Dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="", SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="", - NODATA="") + NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="") for keyword in keywords.keys(): if not known_keywords.has_key(keyword): @@ -1004,6 +1095,25 @@ a *list* of keyrings to use. ################################################################################ +def gpg_get_key_addresses(fingerprint): + """retreive email addresses from gpg key uids for a given fingerprint""" + addresses = key_uid_email_cache.get(fingerprint) + if addresses != None: + return addresses + addresses = set() + cmd = "gpg --no-default-keyring %s --fingerprint %s" \ + % (gpg_keyring_args(), fingerprint) + (result, output) = commands.getstatusoutput(cmd) + if result == 0: + for l in output.split('\n'): + m = re_gpg_uid.match(l) + if m: + addresses.add(m.group(1)) + key_uid_email_cache[fingerprint] = addresses + return addresses + +################################################################################ + # Inspired(tm) by http://www.zopelabs.com/cookbook/1022242603 def wrap(paragraph, max_length, prefix=""): @@ -1071,12 +1181,27 @@ If 'dotprefix' is non-null, the filename will be prefixed with a '.'.""" ################################################################################ +# checks if the user part of the email is listed in the alias file + +def is_email_alias(email): + global alias_cache + if alias_cache == None: + aliasfn = which_alias_file() + alias_cache = set() + if aliasfn: + for l in open(aliasfn): + alias_cache.add(l.split(':')[0]) + uid = email.split('@')[0] + return uid in alias_cache + +################################################################################ + apt_pkg.init() Cnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(Cnf,default_config) if which_conf_file() != default_config: - apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) + apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) ################################################################################