X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=amber;h=4f1832adee18e517459ecc154182c4a19e0a8828;hb=924f122e42b40b043c7393ad4c9d523c5baacbb1;hp=725be2ef4e50ea6689225abea2ca76740f8e4d2b;hpb=07054afe0ae4bbd3359eea296804fd4f7401a2a6;p=dak.git diff --git a/amber b/amber index 725be2ef..4f1832ad 100755 --- a/amber +++ b/amber @@ -1,8 +1,8 @@ #!/usr/bin/env python # Wrapper for Debian Security team -# Copyright (C) 2002 James Troup -# $Id: amber,v 1.3 2002-06-08 00:15:53 troup Exp $ +# Copyright (C) 2002, 2003, 2004 James Troup +# $Id: amber,v 1.11 2005-11-26 07:52:06 ajt 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 @@ -31,7 +31,7 @@ ################################################################################ -import commands, pwd, os, string, sys, time; +import commands, os, pwd, re, sys, time; import apt_pkg; import katie, utils; @@ -41,6 +41,8 @@ Cnf = None; Options = None; Katie = None; +re_taint_free = re.compile(r"^['/;\-\+\.\s\w]+$"); + ################################################################################ def usage (exit_code=0): @@ -62,6 +64,9 @@ def do_upload(changes_files): for component in Cnf.SubTree("Amber::ComponentMappings").List(): component_mapping[component] = Cnf["Amber::ComponentMappings::%s" % (component)]; uploads = {}; # uploads[uri] = file_list; + changesfiles = {}; # changesfiles[uri] = file_list; + package_list = {} # package_list[source_name][version]; + changes_files.sort(utils.changes_compare); for changes_file in changes_files: changes_file = utils.validate_changes_file_arg(changes_file); # Reset variables @@ -74,6 +79,14 @@ def do_upload(changes_files): Katie.update_vars(); files = Katie.pkg.files; changes = Katie.pkg.changes; + dsc = Katie.pkg.dsc; + # We have the changes, now return if its amd64, to not upload them to ftp-master + if changes["architecture"].has_key("amd64"): + print "Not uploading amd64 part to ftp-master\n"; + continue + if changes["distribution"].has_key("oldstable-security"): + print "Not uploading oldstable-security changes to ftp-master\n"; + continue # Build the file list for this .changes file for file in files.keys(): poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"], @@ -82,7 +95,6 @@ def do_upload(changes_files): file_list.append(poolname); orig_component = files[file].get("original component", files[file]["component"]); components[orig_component] = ""; - file_list.append(changes_file); # Determine the upload uri for this .changes file for component in components.keys(): upload_uri = component_mapping.get(component); @@ -91,23 +103,29 @@ def do_upload(changes_files): num_upload_uris = len(upload_uris.keys()); if num_upload_uris == 0: utils.fubar("%s: No valid upload URI found from components (%s)." - % (changes_file, string.join(components.keys(), ", "))); + % (changes_file, ", ".join(components.keys()))); elif num_upload_uris > 1: utils.fubar("%s: more than one upload URI (%s) from components (%s)." - % (changes_file, string.join(upload_uris.keys(), ", "), - string.join(components.keys(), ", "))); + % (changes_file, ", ".join(upload_uris.keys()), + ", ".join(components.keys()))); upload_uri = upload_uris.keys()[0]; # Update the file list for the upload uri if not uploads.has_key(upload_uri): uploads[upload_uri] = []; uploads[upload_uri].extend(file_list); - # Remember the suites + # Update the changes list for the upload uri + if not changes.has_key(upload_uri): + changesfiles[upload_uri] = []; + changesfiles[upload_uri].append(changes_file); + # Remember the suites and source name/version for suite in changes["distribution"].keys(): suites[suite] = ""; - - if len(suites.keys()) == 1 and suites.has_key("oldstable"): - print "Advisory only for 'oldstable'; not uploading elsewhere."; - return; + # Remember the source name and version + if changes["architecture"].has_key("source") and \ + changes["distribution"].has_key("testing"): + if not package_list.has_key(dsc["source"]): + package_list[dsc["source"]] = {}; + package_list[dsc["source"]][dsc["version"]] = ""; if not Options["No-Action"]: answer = yes_no("Upload to files to main archive (Y/n)?"); @@ -115,24 +133,23 @@ def do_upload(changes_files): return; for uri in uploads.keys(): - (host, path) = string.split(uri, ":"); - file_list = string.join(uploads[uri]); + uploads[uri].extend(changesfiles[uri]); + (host, path) = uri.split(":"); + file_list = " ".join(uploads[uri]); print "Uploading files to %s..." % (host); spawn("lftp -c 'open %s; cd %s; put %s'" % (host, path, file_list)); - return file_list; - -################################################################################ - -# Next two functions originally written by aj and NIHishly merged into -# amber by me. - -def join_with_commas_and(list): - if len(list) == 0: return "nothing"; - if len(list) == 1: return list[0]; - return string.join(list[:-1], ", ") + " and " + list[-1]; + if not Options["No-Action"]: + filename = "%s/testing-processed" % (Cnf["Dir::Log"]); + file = utils.open_file(filename, 'a'); + for source in package_list.keys(): + for version in package_list[source].keys(): + file.write(" ".join([source, version])+'\n'); + file.close(); ###################################################################### +# This function was originally written by aj and NIHishly merged into +# amber by me. def make_advisory(advisory_nr, changes_files): adv_packages = []; @@ -146,7 +163,7 @@ def make_advisory(advisory_nr, changes_files): src = Katie.pkg.changes["source"]; if src not in adv_packages: - adv_packages = adv_packages + [src]; + adv_packages += [src]; suites = Katie.pkg.changes["distribution"].keys(); for suite in suites: @@ -160,7 +177,7 @@ def make_advisory(advisory_nr, changes_files): size = files[file]["size"]; poolname = Cnf["Dir::PoolRoot"] + \ utils.poolify(src, files[file]["component"]); - if arch == "source" and file[-4:] == ".dsc": + if arch == "source" and file.endswith(".dsc"): dscpoolname = poolname; for suite in suites: if not updated_pkgs[suite].has_key(arch): @@ -187,25 +204,29 @@ def make_advisory(advisory_nr, changes_files): "poolname": dscpoolname }; if os.environ.has_key("SUDO_UID"): - whoami = string.atol(os.environ["SUDO_UID"]); + whoami = long(os.environ["SUDO_UID"]); else: whoami = os.getuid(); whoamifull = pwd.getpwuid(whoami); - username = string.split(whoamifull[4], ",")[0]; + username = whoamifull[4].split(",")[0]; Subst = { "__ADVISORY__": advisory_nr, "__WHOAMI__": username, "__DATE__": time.strftime("%B %d, %Y", time.gmtime(time.time())), - "__PACKAGE__": string.join(adv_packages,", ") - }; + "__PACKAGE__": ", ".join(adv_packages), + "__KATIE_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] + }; + + if Cnf.has_key("Dinstall::Bcc"): + Subst["__BCC__"] = "Bcc: %s" % (Cnf["Dinstall::Bcc"]); adv = ""; archive = Cnf["Archive::%s::PrimaryMirror" % (utils.where_am_i())]; for suite in updated_pkgs.keys(): suite_header = "%s %s (%s)" % (Cnf["Dinstall::MyDistribution"], Cnf["Suite::%s::Version" % suite], suite); - adv = adv + "%s\n%s\n\n" % (suite_header, "-"*len(suite_header)); + adv += "%s\n%s\n\n" % (suite_header, "-"*len(suite_header)); arches = Cnf.ValueList("Suite::%s::Architectures" % suite); if "source" in arches: @@ -214,35 +235,35 @@ def make_advisory(advisory_nr, changes_files): arches.remove("all"); arches.sort(); - adv = adv + " %s was released for %s.\n\n" % ( - string.capitalize(suite), join_with_commas_and(arches)); + adv += " %s was released for %s.\n\n" % ( + suite.capitalize(), utils.join_with_commas_and(arches)); for a in ["source", "all"] + arches: if not updated_pkgs[suite].has_key(a): continue; if a == "source": - adv = adv + " Source archives:\n\n"; + adv += " Source archives:\n\n"; elif a == "all": - adv = adv + " Architecture independent packages:\n\n"; + adv += " Architecture independent packages:\n\n"; else: - adv = adv + " %s architecture (%s)\n\n" % (a, + adv += " %s architecture (%s)\n\n" % (a, Cnf["Architectures::%s" % a]); for file in updated_pkgs[suite][a].keys(): - adv = adv + " http://%s/%s%s\n" % ( + adv += " http://%s/%s%s\n" % ( archive, updated_pkgs[suite][a][file]["poolname"], file); - adv = adv + " Size/MD5 checksum: %8s %s\n" % ( + adv += " Size/MD5 checksum: %8s %s\n" % ( updated_pkgs[suite][a][file]["size"], updated_pkgs[suite][a][file]["md5"]); - adv = adv + "\n"; - adv = string.rstrip(adv); + adv += "\n"; + adv = adv.rstrip(); Subst["__ADVISORY_TEXT__"] = adv; adv = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/amber.advisory"); if not Options["No-Action"]: - utils.send_mail (adv, ""); + utils.send_mail (adv); else: print "[]"; @@ -272,7 +293,7 @@ def init(): advisory_number = arguments[0]; changes_files = arguments[1:]; - if advisory_number[-8:] == ".changes": + if advisory_number.endswith(".changes"): utils.warn("first argument must be the advisory number."); usage(1); for file in changes_files: @@ -283,7 +304,7 @@ def init(): def yes_no(prompt): while 1: - answer = string.lower(utils.our_raw_input(prompt+" ")); + answer = utils.our_raw_input(prompt+" ").lower(); if answer == "y" or answer == "n": break; else: @@ -293,6 +314,9 @@ def yes_no(prompt): ###################################################################### def spawn(command): + if not re_taint_free.match(command): + utils.fubar("Invalid character in \"%s\"." % (command)); + if Options["No-Action"]: print "[%s]" % (command); else: @@ -316,7 +340,7 @@ def main(): os.chdir(Cnf["Dir::Queue::Accepted"]); print "Installing packages into the archive..."; - spawn("%s/katie -pa %s" % (Cnf["Dir::Katie"], string.join(changes_files))); + spawn("%s/kelly -pa %s" % (Cnf["Dir::Katie"], " ".join(changes_files))); os.chdir(Cnf["Dir::Katie"]); print "Updating file lists for apt-ftparchive..."; spawn("./jenna"); @@ -332,6 +356,9 @@ def main(): print "Generating template advisory..."; make_advisory(advisory_number, changes_files); + # Trigger security mirrors + spawn("sudo -u archvsync /home/archvsync/signal_security"); + do_upload(changes_files); ################################################################################