civodul pushed a commit to branch master
in repository guix.
commit 6c0e7b266523a2cc381c76392c830a237d9e41a9
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sun Jun 25 23:31:11 2023 +0200
services: Validate 'provision' field of <shepherd-service>.
Fixes <https://issues.guix.gnu.org/63979>.
* gnu/services/shepherd.scm (validate-provision): New procedure.
(<shepherd-service>)[provision]: Use it.
Co-authored-by: Bruno Victal <[email protected]>
---
gnu/services/shepherd.scm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index de40454f7d..e9d3a631c2 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -27,8 +27,9 @@
#:use-module (guix store)
#:use-module (guix records)
#:use-module (guix packages)
- #:use-module (guix derivations) ;imported-modules, etc.
#:use-module (guix utils)
+ #:use-module ((guix diagnostics)
+ #:select (define-with-syntax-properties formatted-message))
#:use-module (gnu services)
#:use-module (gnu services herd)
#:use-module (gnu packages admin)
@@ -186,12 +187,25 @@ DEFAULT is given, use it as the service's default value."
((guix build utils) #:hide (delete))
(guix build syscalls)))
+(define-with-syntax-properties (validate-provision (provision properties))
+ (match provision
+ (((? symbol?) ..1) provision)
+ (_
+ (raise
+ (make-compound-condition
+ (condition
+ (&error-location
+ (location (source-properties->location properties))))
+ (formatted-message
+ (G_ "'provision' must be a non-empty list of symbols")))))))
+
(define-record-type* <shepherd-service>
shepherd-service make-shepherd-service
shepherd-service?
(documentation shepherd-service-documentation ;string
(default "[No documentation.]"))
- (provision shepherd-service-provision) ;list of symbols
+ (provision shepherd-service-provision ;list of symbols
+ (sanitize validate-provision))
(requirement shepherd-service-requirement ;list of symbols
(default '()))
(one-shot? shepherd-service-one-shot? ;Boolean
