mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: web: Fix race between nginx activation and anonip.

Browse source 
* gnu/services/web.scm (anonip-shepherd-service): Recreate the input file when
it's not a FIFO.

Fixes: <https://issues.guix.gnu.org/59181>
Change-Id: I8ba87f9fc48ecfd515e34bdee9e2949a2a559f9c
This commit is contained in:
Maxim Cournoyer 2024-11-01 21:08:12 +09:00
parent a007045b7c
commit 49375f83fc
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gnu/services/web.scm
View file

@ -1496,40 +1496,35 @@ (define (anonip-shepherd-service config)
"Anonimyze the given log file location with anonip.")
(start
#~(lambda ()
(define (spawn)
(fork+exec-command
(append
(list #$(file-append (anonip-configuration-anonip config)
"/bin/anonip")
(string-append "--input=" #$input)
(string-append "--output=" #$output))
(if #$(anonip-configuration-skip-private? config)
'("--skip-private") (list))
'#$(optional anonip-configuration-column "--column")
'#$(optional anonip-configuration-ipv4mask "--ipv4mask")
'#$(optional anonip-configuration-ipv6mask "--ipv6mask")
'#$(optional anonip-configuration-increment "--increment")
'#$(optional anonip-configuration-replacement
"--replacement")
'#$(optional anonip-configuration-delimiter "--delimiter")
'#$(optional anonip-configuration-regex "--regex"))
;; Run in a UTF-8 locale
#:environment-variables
(list (string-append "GUIX_LOCPATH="
#$(libc-utf8-locales-for-target)
"/lib/locale")
"LC_ALL=en_US.utf8")))
;; Always attempt to recreate the named pipe, as activation scripts
;; such as that of nginx may have created plain files in its place
;; (see: https://issues.guix.gnu.org/59181).
(false-if-exception (delete-file #$input))
(mknod #$input 'fifo #o600 0)
(let ((stat (stat #$input #f)))
(cond ((not stat)
(mknod #$input 'fifo #o600 0)
(spawn))
((eq? 'fifo (stat:type stat))
(spawn))
(else
(format #t "'~a' is not a FIFO; bailing out~%"
#$input)
#f)))))
(fork+exec-command
(append
(list #$(file-append (anonip-configuration-anonip config)
"/bin/anonip")
(string-append "--input=" #$input)
(string-append "--output=" #$output))
(if #$(anonip-configuration-debug? config)
'("--debug") (list))
(if #$(anonip-configuration-skip-private? config)
'("--skip-private") (list))
'#$(optional anonip-configuration-column "--column")
'#$(optional anonip-configuration-ipv4mask "--ipv4mask")
'#$(optional anonip-configuration-ipv6mask "--ipv6mask")
'#$(optional anonip-configuration-increment "--increment")
'#$(optional anonip-configuration-replacement "--replacement")
'#$(optional anonip-configuration-delimiter "--delimiter")
'#$(optional anonip-configuration-regex "--regex"))
;; Run in a UTF-8 locale
#:environment-variables
(list (string-append "GUIX_LOCPATH="
#$(libc-utf8-locales-for-target)
"/lib/locale")
"LC_ALL=en_US.utf8"))))
(stop #~(make-kill-destructor))))))
(define anonip-service-type