From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: scratch/package-security bcde5f8 2/2: Support expiration of metadata by package archives Date: Wed, 25 Nov 2020 20:01:12 -0500 Message-ID: References: <20201121234313.32698.75403@vcs0.savannah.gnu.org> <20201121234315.1991F209DE@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12411"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Stefan Kangas To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Nov 26 02:02:37 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ki5gD-00037U-2w for ged-emacs-devel@m.gmane-mx.org; Thu, 26 Nov 2020 02:02:37 +0100 Original-Received: from localhost ([::1]:44586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ki5gC-0001uB-2H for ged-emacs-devel@m.gmane-mx.org; Wed, 25 Nov 2020 20:02:36 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki5f2-0001Sl-6w for emacs-devel@gnu.org; Wed, 25 Nov 2020 20:01:24 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:61392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki5ey-00060v-FV for emacs-devel@gnu.org; Wed, 25 Nov 2020 20:01:23 -0500 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id CBF2C10022E; Wed, 25 Nov 2020 20:01:18 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id ED51F1001CB; Wed, 25 Nov 2020 20:01:12 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1606352472; bh=SOYYG2DqJ9FIoGvUxfFZ8B8LFtBKCxXFqCRfuvLX8vk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=Ukdzps3ZBqlVvypBZm58KWHpPGlQ7TNBOHeghl+6JySqoyHME0EDyle46xvINsWca GJ+Dxul7WTOwV85tixMy0Uh9i0M0uchEdOIXOPxwczikWKc3edg/fdJ3mbF+c8+nHu W1MOAUQgB0beAk308GNxRUFEodkU9DqckqIFmuoZoTp6p2VGdg47GqrooBc5dw5mJS gJMc8D8yIZ6ufPXgl+Uk8LjCcrmTyq5TP+XzVk+4xUc7PkArYhaNeSsiTHhLI4ev7S PUv+8KuDp5cW0KCRwsWqpH5Mktj9jQenK7fmPRk3g+j8w4wthdi41EeZEgzrS6LRB4 lSARB2SV9oqSA== Original-Received: from alfajor (69-165-136-52.dsl.teksavvy.com [69.165.136.52]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id BC966120325; Wed, 25 Nov 2020 20:01:12 -0500 (EST) In-Reply-To: <20201121234315.1991F209DE@vcs0.savannah.gnu.org> (Stefan Kangas's message of "Sat, 21 Nov 2020 18:43:14 -0500 (EST)") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259817 Archived-At: > @@ -449,6 +458,7 @@ synchronously." > (define-error 'bad-size "Package size mismatch" 'package-error) > (define-error 'bad-signature "Failed to verify signature" 'package-error) > (define-error 'bad-checksum "Failed to verify checksum" 'package-error) > +(define-error 'bad-timestamp "Failed to verify timestamp" 'package-error) Hmm, these errors should all have a `package-` prefix. > > ;;; `package-desc' object definition > @@ -1812,6 +1822,100 @@ Once it's empty, run `package--post-download-archives-hook'." > (message "Package refresh done") > (run-hooks 'package--post-download-archives-hook))) > > +(defun package--parse-header-from-buffer (header name) > + "Find and return \"archive-contents\" HEADER for archive NAME. > +This function assumes that the current buffer contains the > +\"archive-contents\" file. > + > +A valid header looks like: \";; HEADER: \" > + > +Where is a valid ISO-8601 (RFC 3339) date. If there > +is such a line but is invalid, show a warning and > +return nil. If there is no valid header, return nil." > + (save-excursion > + (goto-char (point-min)) > + (when (re-search-forward (concat "^;; " header ": *\\(.+?\\) *$") nil t) > + (condition-case-unless-debug nil > + (encode-time (iso8601-parse (match-string 1))) > + (lwarn '(package timestamp) > + (list (format "Malformed timestamp for archive `%s': `%s'" > + name (match-string 1)))))))) Hmm... I think you forgot the `error` in this `condition-case-unless-debug` (i.e. the way you wrote it, it will catch all `lwarn` errors). > +(defun package--parse-valid-until-from-buffer (name) > + "Find and return \"Valid-Until\" header for archive NAME." > + (package--parse-header-from-buffer "Valid-Until" name)) It would be easier for the ELPA archives is to use a "validity duration" header, since it could then be constant. Other that that, LGTM, [ BTW, to mitigate against replay attacks in the absence of timestamps, we could compare the last `archive-content` with the new one and make sure that none of the packages's version got smaller. ] Stefan