me/guix
Archived
1
0
Fork 0
Code Activity

locate: Do not return the system database when it is too old.

Browse source 
Fixes a bug whereby ‘guix locate’ would pick the system database, then
decide it’s too old, try to update it, and fail because it’s not
writable by unprivileged users.

Fixes <https://issues.guix.gnu.org/66612>.

* guix/scripts/locate.scm (file-age): New procedure.
(suitable-database): Add ‘age-update-threshold’ parameter and honor it.
(guix-locate): Remove ‘file-age’.  Pass ‘age-update-threshold’ to the
‘database’ option.

Reported-by: Matt Wette <matt.wette@gmail.com>
This commit is contained in:
Ludovic Courtès 2023-10-18 18:17:36 +02:00
parent 1076f32111
commit d0fed2f4df
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
guix/scripts/locate.scm
View file

@ -196,10 +196,15 @@ SELECT version FROM SchemaVersion ORDER BY version DESC LIMIT 1;"
;; System-wide database file name. ;; System-wide database file name.
(string-append %localstatedir "/cache/guix/locate/db.sqlite")) (string-append %localstatedir "/cache/guix/locate/db.sqlite"))
(define (suitable-database create?) (define (file-age stat)
"Return the age of the file denoted by STAT in seconds."
(- (current-time) (stat:mtime stat)))
(define (suitable-database create? age-update-threshold)
"Return a suitable database file. When CREATE? is true, the returned "Return a suitable database file. When CREATE? is true, the returned
database will be opened for writing; otherwise, return the most recent one, database will be opened for writing; otherwise, return the most recent one,
user or system." user or system. Do not return the system database if it is older than
AGE-UPDATE-THRESHOLD seconds."
(if (zero? (getuid)) (if (zero? (getuid))
system-database-file system-database-file
(if create? (if create?
@ -207,10 +212,13 @@ user or system."
(let ((system (stat system-database-file #f)) (let ((system (stat system-database-file #f))
(user (stat user-database-file #f))) (user (stat user-database-file #f)))
(if user (if user
(if (and system (> (stat:mtime system) (stat:mtime user))) (if (and system
(> (stat:mtime system) (stat:mtime user))
(< (file-age system) age-update-threshold))
system-database-file system-database-file
user-database-file) user-database-file)
(if system (if (and system
(< (file-age system) age-update-threshold))
system-database-file system-database-file
user-database-file)))))) user-database-file))))))
@ -595,10 +603,6 @@ Locate FILE and return the list of packages that contain it.\n"))
;; database. ;; database.
(* 9 30 (* 24 60 60))) (* 9 30 (* 24 60 60)))
(define (file-age stat)
;; Return true if TIME denotes an "old" time.
(- (current-time) (stat:mtime stat)))
(with-error-handling (with-error-handling
(let* ((opts (parse-command-line args %options (let* ((opts (parse-command-line args %options
(list %default-options) (list %default-options)
@ -610,7 +614,7 @@ Locate FILE and return the list of packages that contain it.\n"))
(clear? (assoc-ref opts 'clear?)) (clear? (assoc-ref opts 'clear?))
(update? (assoc-ref opts 'update?)) (update? (assoc-ref opts 'update?))
(glob? (assoc-ref opts 'glob?)) (glob? (assoc-ref opts 'glob?))
(database ((assoc-ref opts 'database) update?)) (database ((assoc-ref opts 'database) update? age-update-threshold))
(method (assoc-ref opts 'method)) (method (assoc-ref opts 'method))
(files (reverse (filter-map (match-lambda (files (reverse (filter-map (match-lambda
(('argument . arg) arg) (('argument . arg) arg)