X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=a6469e27f4dfdd8f90fb1c245851867259ef4e1e;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=a35084620a9c3ac214572e66ee9cf230b5977649;hpb=907deca03b25dc8ce65c89062ff3d7ca7a358976;p=dak.git diff --git a/dak/new_security_install.py b/dak/new_security_install.py index a3508462..a6469e27 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -20,10 +20,13 @@ ################################################################################ -import daklib.queue, daklib.logging, daklib.utils, daklib.database +from daklib import queue +from daklib import logging +from daklib import utils +from daklib import database import apt_pkg, os, sys, pwd, time, re, commands -re_taint_free = re.compile(r"^['/;\-\+\.\s\w]+$"); +re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$"); Cnf = None Options = None @@ -37,13 +40,14 @@ srcverarches = {} def init(): global Cnf, Upload, Options, Logger - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Cnf["Dinstall::Options::No-Mail"] = "y" Arguments = [('h', "help", "Security-Install::Options::Help"), ('a', "automatic", "Security-Install::Options::Automatic"), ('n', "no-action", "Security-Install::Options::No-Action"), ('s', "sudo", "Security-Install::Options::Sudo"), (' ', "no-upload", "Security-Install::Options::No-Upload"), + ('u', "fg-upload", "Security-Install::Options::Foreground-Upload"), (' ', "drop-advisory", "Security-Install::Options::Drop-Advisory"), ('A', "approve", "Security-Install::Options::Approve"), ('R', "reject", "Security-Install::Options::Reject"), @@ -68,11 +72,13 @@ def init(): sys.exit(0) if len(arguments) == 0: - daklib.utils.fubar("Process what?") + utils.fubar("Process what?") - Upload = daklib.queue.Upload(Cnf) + Upload = queue.Upload(Cnf) + if Options["No-Action"]: + Options["Sudo"] = "" if not Options["Sudo"] and not Options["No-Action"]: - Logger = Upload.Logger = daklib.logging.Logger(Cnf, "new-security-install") + Logger = Upload.Logger = logging.Logger(Cnf, "new-security-install") return arguments @@ -94,9 +100,9 @@ def load_args(arguments): changesfiles = {} for a in arguments: if "/" in a: - daklib.utils.fubar("can only deal with files in the current directory") + utils.fubar("can only deal with files in the current directory") if not a.endswith(".changes"): - daklib.utils.fubar("not a .changes file: %s" % (a)) + utils.fubar("not a .changes file: %s" % (a)) Upload.init_vars() Upload.pkg.changes_file = a Upload.update_vars() @@ -108,7 +114,7 @@ def load_args(arguments): adv_ids = adv_ids.keys() if len(adv_ids) > 1: - daklib.utils.fubar("multiple advisories selected: %s" % (", ".join(adv_ids))) + utils.fubar("multiple advisories selected: %s" % (", ".join(adv_ids))) if adv_ids == []: advisory = None else: @@ -131,7 +137,7 @@ def load_adv_changes(): continue if c not in changes: changes.append(c) - srcver = "%s %s" % (Upload.pkg.changes["source"], + srcver = "%s %s" % (Upload.pkg.changes["source"], Upload.pkg.changes["version"]) srcverarches.setdefault(srcver, {}) for arch in Upload.pkg.changes["architecture"].keys(): @@ -168,9 +174,9 @@ def prompt(opts, default): a = default while a not in v: - a = daklib.utils.our_raw_input(p) + default + a = utils.our_raw_input(p) + default a = a[:1].upper() - + return v[a] def add_changes(extras): @@ -189,7 +195,7 @@ def add_changes(extras): def yes_no(prompt): if Options["Automatic"]: return True while 1: - answer = daklib.utils.our_raw_input(prompt + " ").lower() + answer = utils.our_raw_input(prompt + " ").lower() if answer in "yn": return answer == "y" print "Invalid answer; please try again." @@ -197,9 +203,92 @@ def yes_no(prompt): def do_upload(): if Options["No-Upload"]: print "Not uploading as requested" - return + elif Options["Foreground-Upload"]: + actually_upload(changes) + else: + child = os.fork() + if child == 0: + actually_upload(changes) + os._exit(0) + print "Uploading in the background" + +def actually_upload(changes_files): + file_list = "" + suites = {} + component_mapping = {} + for component in Cnf.SubTree("Security-Install::ComponentMappings").List(): + component_mapping[component] = Cnf["Security-Install::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 + components = {} + upload_uris = {} + file_list = [] + Upload.init_vars() + # Parse the .dak file for the .changes file + Upload.pkg.changes_file = changes_file + Upload.update_vars() + files = Upload.pkg.files + changes = Upload.pkg.changes + dsc = Upload.pkg.dsc + # Build the file list for this .changes file + for file in files.keys(): + poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"], + utils.poolify(changes["source"], files[file]["component"]), + file) + file_list.append(poolname) + orig_component = files[file].get("original component", files[file]["component"]) + components[orig_component] = "" + # Determine the upload uri for this .changes file + for component in components.keys(): + upload_uri = component_mapping.get(component) + if upload_uri: + upload_uris[upload_uri] = "" + 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, ", ".join(components.keys()))) + elif num_upload_uris > 1: + utils.fubar("%s: more than one upload URI (%s) from components (%s)." + % (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) + # Update the changes list for the upload uri + if not changesfiles.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] = "" + # 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"]] = "" + + for uri in uploads.keys(): + 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)) - print "Would upload to ftp-master" # XXX + 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() def generate_advisory(template): global changes, advisory @@ -208,7 +297,7 @@ def generate_advisory(template): updated_pkgs = {}; # updated_pkgs[distro][arch][file] = {path,md5,size} for arg in changes: - arg = daklib.utils.validate_changes_file_arg(arg) + arg = utils.validate_changes_file_arg(arg) Upload.pkg.changes_file = arg Upload.init_vars() Upload.update_vars() @@ -229,7 +318,7 @@ def generate_advisory(template): md5 = files[file]["md5sum"] size = files[file]["size"] poolname = Cnf["Dir::PoolRoot"] + \ - daklib.utils.poolify(src, files[file]["component"]) + utils.poolify(src, files[file]["component"]) if arch == "source" and file.endswith(".dsc"): dscpoolname = poolname for suite in suites: @@ -273,7 +362,7 @@ def generate_advisory(template): Subst["__BCC__"] = "Bcc: %s" % (Cnf["Dinstall::Bcc"]) adv = "" - archive = Cnf["Archive::%s::PrimaryMirror" % (daklib.utils.where_am_i())] + archive = Cnf["Archive::%s::PrimaryMirror" % (utils.where_am_i())] for suite in updated_pkgs.keys(): ver = Cnf["Suite::%s::Version" % suite] if ver != "": ver += " " @@ -289,7 +378,7 @@ def generate_advisory(template): arches.sort() adv += "%s updates are available for %s.\n\n" % ( - suite.capitalize(), daklib.utils.join_with_commas_and(arches)) + suite.capitalize(), utils.join_with_commas_and(arches)) for a in ["source", "all"] + arches: if not updated_pkgs[suite].has_key(a): @@ -314,20 +403,19 @@ def generate_advisory(template): Subst["__ADVISORY_TEXT__"] = adv - adv = daklib.utils.TemplateSubst(Subst, template) + adv = utils.TemplateSubst(Subst, template) return adv - def spawn(command): if not re_taint_free.match(command): - daklib.utils.fubar("Invalid character in \"%s\"." % (command)) + utils.fubar("Invalid character in \"%s\"." % (command)) if Options["No-Action"]: print "[%s]" % (command) else: (result, output) = commands.getstatusoutput(command) if (result != 0): - daklib.utils.fubar("Invocation of '%s' failed:\n%s\n" % (command, output), result) + utils.fubar("Invocation of '%s' failed:\n%s\n" % (command, output), result) ##################### ! ! ! N O T E ! ! ! ##################### @@ -340,9 +428,9 @@ def spawn(command): def sudo(arg, fn, exit): if Options["Sudo"]: if advisory == None: - daklib.utils.fubar("Must set advisory name") - os.spawnl(os.P_WAIT, "/usr/bin/sudo", "/usr/bin/sudo", "-u", "dak", "-H", - "/usr/local/bin/dak new-security-install", "-"+arg, "--", advisory) + utils.fubar("Must set advisory name") + os.spawnl(os.P_WAIT, "/usr/bin/sudo", "/usr/bin/sudo", "-u", "dak", "-H", + "/usr/local/bin/dak", "new-security-install", "-"+arg, "--", advisory) else: fn() if exit: @@ -370,7 +458,7 @@ def _do_Approve(): print "Updating file lists for apt-ftparchive..." spawn("dak make-suite-file-list") print "Updating Packages and Sources files..." - spawn("apt-ftparchive generate %s" % (daklib.utils.which_apt_conf_file())) + spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file())) print "Updating Release files..." spawn("dak generate-releases") print "Triggering security mirrors..." @@ -384,11 +472,11 @@ def _do_Approve(): def do_Disembargo(): sudo("D", _do_Disembargo, True) def _do_Disembargo(): if os.getcwd() != Cnf["Dir::Queue::Embargoed"].rstrip("/"): - daklib.utils.fubar("Can only disembargo from %s" % Cnf["Dir::Queue::Embargoed"]) + utils.fubar("Can only disembargo from %s" % Cnf["Dir::Queue::Embargoed"]) dest = Cnf["Dir::Queue::Unembargoed"] - emb_q = daklib.database.get_or_set_queue_id("embargoed") - une_q = daklib.database.get_or_set_queue_id("unembargoed") + emb_q = database.get_or_set_queue_id("embargoed") + une_q = database.get_or_set_queue_id("unembargoed") for c in changes: print "Disembargoing %s" % (c) @@ -418,14 +506,14 @@ def _do_Disembargo(): Upload.projectB.query("COMMIT WORK") for file in Upload.pkg.files.keys(): - daklib.utils.copy(file, os.path.join(dest, file)) + utils.copy(file, os.path.join(dest, file)) os.unlink(file) for c in changes: - daklib.utils.copy(c, os.path.join(dest, c)) + utils.copy(c, os.path.join(dest, c)) os.unlink(c) - k = c[:8] + ".dak" - daklib.utils.copy(k, os.path.join(dest, k)) + k = c[:-8] + ".dak" + utils.copy(k, os.path.join(dest, k)) os.unlink(k) def do_Reject(): sudo("R", _do_Reject, True) @@ -450,14 +538,14 @@ def _do_Reject(): aborted = Upload.do_reject() if not aborted: - os.unlink(c[:-8]+".katie") + os.unlink(c[:-8]+".dak") for f in files: Upload.projectB.query( "DELETE FROM queue_build WHERE filename = '%s'" % (f)) os.unlink(f) print "Updating buildd information..." - spawn("/org/security.debian.org/katie/cron.buildd-security") + spawn("/org/security.debian.org/dak/config/debian-security/cron.buildd") adv_file = "./advisory.%s" % (advisory) if os.path.exists(adv_file): @@ -475,11 +563,11 @@ def do_DropAdvisory(): def do_Edit(): adv_file = "./advisory.%s" % (advisory) if not os.path.exists(adv_file): - daklib.utils.copy(Cnf["Dir::Templates"]+"/security-install.advisory", adv_file) + utils.copy(Cnf["Dir::Templates"]+"/security-install.advisory", adv_file) editor = os.environ.get("EDITOR", "vi") result = os.system("%s %s" % (editor, adv_file)) if result != 0: - daklib.utils.fubar("%s invocation failed for %s." % (editor, adv_file)) + utils.fubar("%s invocation failed for %s." % (editor, adv_file)) def do_Show(): adv_file = "./advisory.%s" % (advisory) @@ -515,10 +603,10 @@ def main(): add_changes(extras) if not advisory: - daklib.utils.fubar("Must specify an advisory id") + utils.fubar("Must specify an advisory id") if not changes: - daklib.utils.fubar("No changes specified") + utils.fubar("No changes specified") if Options["Approve"]: advisory_info() @@ -543,7 +631,7 @@ def main(): if os.getcwd() == Cnf["Dir::Queue::Embargoed"].rstrip("/"): opts.append("Disembargo") opts += ["Show advisory", "Reject", "Quit"] - + advisory_info() what = prompt(opts, default) @@ -560,7 +648,7 @@ def main(): elif what == "Reject": do_Reject() else: - daklib.utils.fubar("Impossible answer '%s', wtf?" % (what)) + utils.fubar("Impossible answer '%s', wtf?" % (what)) ################################################################################