From: zimoun <zimon.toutoune@gmail.com>
To: 55673@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#55673] [PATCH v2] cache: Catch valid integer for 'last-expiry-cleanup'.
Date: Fri, 27 May 2022 17:46:52 +0200 [thread overview]
Message-ID: <20220527154652.700549-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20220527082519.501697-1-zimon.toutoune@gmail.com>
Fixes <http://issues.guix.gnu.org/55638>.
* guix/cache.scm (maybe-remove-expired-cache-entries)[last-expiry-date]: Check
if the date is a valid integer.
* tests/cache.scm: Test it.
---
guix/cache.scm | 16 ++++++++++++----
tests/cache.scm | 22 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/guix/cache.scm b/guix/cache.scm
index 51009809bd..13f9e4a439 100644
--- a/guix/cache.scm
+++ b/guix/cache.scm
@@ -20,6 +20,7 @@ (define-module (guix cache)
#:use-module (srfi srfi-19)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
+ #:use-module ((ice-9 textual-ports) #:select (get-string-all))
#:export (obsolete?
delete-file*
file-expiration-time
@@ -91,10 +92,17 @@ (define expiry-file
(string-append cache "/last-expiry-cleanup"))
(define last-expiry-date
- (catch 'system-error
- (lambda ()
- (call-with-input-file expiry-file read))
- (const 0)))
+ (let ((value (catch 'system-error
+ (lambda ()
+ (call-with-input-file expiry-file get-string-all))
+ (const "0"))))
+ (catch #t ; Handle value out of range (e.g., 1234567890 -> 12E4567890)
+ (lambda ()
+ ;; Handle empty or corrupted 'expiry-file' when 'write' below is
+ ;; interrupted before being complete (e.g., SIGINT with C-c) or when
+ ;; the filesystem crashes.
+ (or (string->number value) 0))
+ (const 0))))
(when (obsolete? last-expiry-date now cleanup-period)
(remove-expired-cache-entries (cache-entries cache)
diff --git a/tests/cache.scm b/tests/cache.scm
index 80b44d69aa..bd6fd64a22 100644
--- a/tests/cache.scm
+++ b/tests/cache.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -74,6 +75,27 @@ (define-syntax-rule (test-cache-cleanup cache exp ...)
(lambda (port)
(display 0 port)))))
+(test-equal "maybe-remove-expired-cache-entries, empty cache"
+ '("a" "b" "c")
+ (test-cache-cleanup cache
+ (call-with-output-file (string-append cache "/last-expiry-cleanup")
+ (lambda (port)
+ (display "" port)))))
+
+(test-equal "maybe-remove-expired-cache-entries, corrupted cache"
+ '("a" "b" "c")
+ (test-cache-cleanup cache
+ (call-with-output-file (string-append cache "/last-expiry-cleanup")
+ (lambda (port)
+ (display "1\"34657890" port)))))
+
+(test-equal "maybe-remove-expired-cache-entries, corrupted cache of out range"
+ '("a" "b" "c")
+ (test-cache-cleanup cache
+ (call-with-output-file (string-append cache "/last-expiry-cleanup")
+ (lambda (port)
+ (display "12E4567890" port)))))
+
(test-end "cache")
;;; Local Variables:
base-commit: 38bf6c7d0cb588e8d4546db7d2e0bae2ec25183d
--
2.36.0
next prev parent reply other threads:[~2022-05-27 16:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 8:25 [bug#55673] [PATCH] cache: Catch valid integer for 'last-expiry-cleanup' zimoun
2022-05-27 9:54 ` Maxime Devos
2022-05-27 10:28 ` zimoun
2022-05-27 11:12 ` Maxime Devos
2022-05-27 11:39 ` zimoun
2022-05-27 11:49 ` Maxime Devos
2022-05-27 12:40 ` zimoun
2022-05-27 13:04 ` Maxime Devos
2022-05-27 13:23 ` zimoun
2022-05-27 13:30 ` zimoun
2022-05-27 14:02 ` Maxime Devos
2022-05-27 16:19 ` zimoun
2022-05-27 17:23 ` Maxime Devos
2022-05-27 11:17 ` Maxime Devos
2022-05-27 11:24 ` zimoun
2022-05-27 11:40 ` Maxime Devos
2022-05-27 15:46 ` zimoun [this message]
2022-05-27 17:29 ` [bug#55673] [PATCH v2] " Maxime Devos
2022-05-30 13:09 ` zimoun
2022-05-30 13:07 ` [bug#55673] [PATCH v3] cache: Catch invalid 'last-expiry-cleanup' zimoun
2022-06-04 10:11 ` bug#55673: [PATCH] cache: Catch valid integer for 'last-expiry-cleanup' Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220527154652.700549-1-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=55673@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.