me
/
guix
Archived
1
0
Fork 0

machine: ssh: Check for potential system downgrades.

This is a followup to 8e31736b0a.

* guix/scripts/system/reconfigure.scm (check-forward-update): Add
 #:current-channels.  Use it instead of OLD.
* gnu/services.scm (sexp->system-provenance): New procedure.
(system-provenance): Use it.
* gnu/machine/ssh.scm (<machine-ssh-configuration>)[allow-downgrades?]:
New field.
(machine-check-forward-update): New procedure.
(check-deployment-sanity)[assertions]: Call it.
* doc/guix.texi (Invoking guix deploy): Document 'allow-downgrades?'
field.
master
Ludovic Courtès 2020-07-27 11:03:14 +02:00
parent 9296a2e511
commit a396dd01bc
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
4 changed files with 69 additions and 20 deletions

View File

@ -29033,6 +29033,16 @@ When @code{host-key} is @code{#f}, the server is authenticated against
the @file{~/.ssh/known_hosts} file, just like the OpenSSH @command{ssh} the @file{~/.ssh/known_hosts} file, just like the OpenSSH @command{ssh}
client does. client does.
@item @code{allow-downgrades?} (default: @code{#f})
Whether to allow potential downgrades.
Like @command{guix system reconfigure}, @command{guix deploy} compares
the channel commits currently deployed on the remote host (as returned
by @command{guix system describe}) to those currently in use (as
returned by @command{guix describe}) to determine whether commits
currently in use are descendants of those deployed. When this is not
the case and @code{allow-downgrades?} is false, it raises an error.
This ensures you do not accidentally downgrade remote machines.
@end table @end table
@end deftp @end deftp

View File

@ -24,6 +24,7 @@
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:use-module (gnu system uuid) #:use-module (gnu system uuid)
#:use-module ((gnu services) #:select (sexp->system-provenance))
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix i18n) #:use-module (guix i18n)
@ -55,6 +56,7 @@
machine-ssh-configuration-host-name machine-ssh-configuration-host-name
machine-ssh-configuration-build-locally? machine-ssh-configuration-build-locally?
machine-ssh-configuration-authorize? machine-ssh-configuration-authorize?
machine-ssh-configuration-allow-downgrades?
machine-ssh-configuration-port machine-ssh-configuration-port
machine-ssh-configuration-user machine-ssh-configuration-user
machine-ssh-configuration-host-key machine-ssh-configuration-host-key
@ -83,6 +85,8 @@
(default #t)) (default #t))
(authorize? machine-ssh-configuration-authorize? ; boolean (authorize? machine-ssh-configuration-authorize? ; boolean
(default #t)) (default #t))
(allow-downgrades? machine-ssh-configuration-allow-downgrades? ; boolean
(default #f))
(port machine-ssh-configuration-port ; integer (port machine-ssh-configuration-port ; integer
(default 22)) (default 22))
(user machine-ssh-configuration-user ; string (user machine-ssh-configuration-user ; string
@ -271,6 +275,27 @@ not available in the initrd."
(map missing-modules file-systems)) (map missing-modules file-systems))
(define* (machine-check-forward-update machine)
"Check whether we are making a forward update for MACHINE. Depending on its
'allow-upgrades?' field, raise an error or display a warning if we are
potentially downgrading it."
(define config
(machine-configuration machine))
(define validate-reconfigure
(if (machine-ssh-configuration-allow-downgrades? config)
warn-about-backward-reconfigure
ensure-forward-reconfigure))
(remote-let ((provenance #~(call-with-input-file
"/run/current-system/provenance"
read)))
(define channels
(sexp->system-provenance provenance))
(check-forward-update validate-reconfigure
#:current-channels channels)))
(define (machine-check-building-for-appropriate-system machine) (define (machine-check-building-for-appropriate-system machine)
"Raise a '&message' error condition if MACHINE is configured to be built "Raise a '&message' error condition if MACHINE is configured to be built
locally and the 'system' field does not match the '%current-system' reported locally and the 'system' field does not match the '%current-system' reported
@ -289,7 +314,8 @@ by MACHINE."
'system' declaration would fail." 'system' declaration would fail."
(define assertions (define assertions
(append (machine-check-file-system-availability machine) (append (machine-check-file-system-availability machine)
(machine-check-initrd-modules machine))) (machine-check-initrd-modules machine)
(list (machine-check-forward-update machine))))
(define aggregate-exp (define aggregate-exp
;; Gather all the expressions so that a single round-trip is enough to ;; Gather all the expressions so that a single round-trip is enough to
@ -491,3 +517,7 @@ connection to the host.")))
for environment of type '~a'") for environment of type '~a'")
config config
environment))))) environment)))))
;; Local Variables:
;; eval: (put 'remote-let 'scheme-indent-function 1)
;; End:

View File

@ -89,6 +89,7 @@
system-service-type system-service-type
provenance-service-type provenance-service-type
sexp->system-provenance
system-provenance system-provenance
boot-service-type boot-service-type
cleanup-service-type cleanup-service-type
@ -488,15 +489,11 @@ channels in use and CONFIG-FILE, if it is true."
itself: the channels used when building the system, and its configuration itself: the channels used when building the system, and its configuration
file, when available."))) file, when available.")))
(define (system-provenance system) (define (sexp->system-provenance sexp)
"Given SYSTEM, the file name of a system generation, return two values: the "Parse SEXP, an s-expression read from /run/current-system/provenance or
list of channels SYSTEM is built from, and its configuration file. If that similar, and return two values: the list of channels listed therein, and the
information is missing, return the empty list (for channels) and possibly OS configuration file or #f."
#false (for the configuration file)." (match sexp
(catch 'system-error
(lambda ()
(match (call-with-input-file (string-append system "/provenance")
read)
(('provenance ('version 0) (('provenance ('version 0)
('channels channels ...) ('channels channels ...)
('configuration-file config-file)) ('configuration-file config-file))
@ -504,6 +501,17 @@ information is missing, return the empty list (for channels) and possibly
config-file)) config-file))
(_ (_
(values '() #f)))) (values '() #f))))
(define (system-provenance system)
"Given SYSTEM, the file name of a system generation, return two values: the
list of channels SYSTEM is built from, and its configuration file. If that
information is missing, return the empty list (for channels) and possibly
#false (for the configuration file)."
(catch 'system-error
(lambda ()
(sexp->system-provenance
(call-with-input-file (string-append system "/provenance")
read)))
(lambda _ (lambda _
(values '() #f)))) (values '() #f))))

View File

@ -339,24 +339,25 @@ to commits of channels in NEW."
old)) old))
(define* (check-forward-update #:optional (define* (check-forward-update #:optional
(validate-reconfigure ensure-forward-reconfigure)) (validate-reconfigure
ensure-forward-reconfigure)
#:key
(current-channels
(system-provenance "/run/current-system")))
"Call VALIDATE-RECONFIGURE passing it, for each channel, the channel, the "Call VALIDATE-RECONFIGURE passing it, for each channel, the channel, the
currently-deployed commit (as returned by 'guix system describe') and the currently-deployed commit (from CURRENT-CHANNELS, which is as returned by
target commit (as returned by 'guix describe')." 'guix system describe' by default) and the target commit (as returned by 'guix
;; TODO: Make that functionality available to 'guix deploy'. describe')."
(define new (define new
(or (and=> (current-profile) profile-channels) (or (and=> (current-profile) profile-channels)
'())) '()))
(define old (when (null? current-channels)
(system-provenance "/run/current-system")) (warning (G_ "cannot determine provenance for current system~%")))
(when (null? old)
(warning (G_ "cannot determine provenance for /run/current-system~%")))
(when (and (null? new) (not (getenv "GUIX_UNINSTALLED"))) (when (and (null? new) (not (getenv "GUIX_UNINSTALLED")))
(warning (G_ "cannot determine provenance of ~a~%") %guix-package-name)) (warning (G_ "cannot determine provenance of ~a~%") %guix-package-name))
(for-each (match-lambda (for-each (match-lambda
((channel old new relation) ((channel old new relation)
(validate-reconfigure channel old new relation))) (validate-reconfigure channel old new relation)))
(channel-relations old new))) (channel-relations current-channels new)))