/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2023-02-07 23:03:33 UTC
  • mto: This revision was merged to the branch mainline in revision 408.
  • Revision ID: teddy@recompile.se-20230207230333-5halrp7943pgb3w1
Server: Bug fix: Stagger checker runs when creating clients

* mandos (Client.enable()): Do not set self.expires here; move it to
  "init_checker".
  (Client.init_checker()): Take new "randomize_start" argument.  If
  True, randomize delay before starting checker.  Also, do not start
  checker right now, but instead extend expire time so that the
  scheduled checker always has time to run.
  (Checker.start_checker): Take new "start_was_randomized" argument.
  If True, reset scheduled checker runs to be 'interval' apart,
  instead of using the initial delay.  (Bug fix)
  (main): On startup, pass argument randomize_start=True to
  client.init_checker() when initizlizing checkers for all enabled
  clients.

Reported-by: Louis Charreau <Louis.Charreau@vadesecure.com>
Suggested-by: Louis Charreau <Louis.Charreau@vadesecure.com>
Fixes: 1200 ("Server: Stagger checker runs when creating clients")

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
29
29
 
30
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
32
FORTIFY:=-D_FORTIFY_SOURCE=3 -fstack-protector-all -fPIC
33
33
LINK_FORTIFY_LD:=-z relro -z now
34
34
LINK_FORTIFY:=
35
35
 
41
41
#COVERAGE=--coverage
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
44
45
htmldir:=man
45
 
version:=1.8.5
 
46
version:=1.8.15
46
47
SED:=sed
 
48
PKG_CONFIG?=pkg-config
47
49
 
48
50
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
51
        || getent passwd nobody || echo 65534)))
50
52
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
51
53
        || getent group nogroup || echo 65534)))
52
54
 
 
55
LINUXVERSION:=$(shell uname --kernel-release)
 
56
 
53
57
## Use these settings for a traditional /usr/local install
54
58
# PREFIX:=$(DESTDIR)/usr/local
55
59
# CONFDIR:=$(DESTDIR)/etc/mandos
71
75
STATEDIR:=$(DESTDIR)/var/lib/mandos
72
76
LIBDIR:=$(shell \
73
77
        for d in \
74
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
78
        "/usr/lib/`dpkg-architecture \
 
79
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
75
80
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
76
81
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
77
82
                        echo "$(DESTDIR)$$d"; \
80
85
        done)
81
86
##
82
87
 
83
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
84
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
89
                        --variable=systemdsystemunitdir)
 
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
85
94
 
86
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
87
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
88
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
89
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
90
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
91
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
 
99
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
 
100
        || gpgme-config --cflags; getconf LFS_CFLAGS)
 
101
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
 
102
        || gpgme-config --libs; getconf LFS_LIBS; \
92
103
        getconf LFS_LDFLAGS)
93
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
94
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
95
 
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
96
 
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
 
104
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
105
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
106
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
107
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
97
108
 
98
109
# Do not change these two
99
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
100
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
110
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
111
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
101
112
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
102
113
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
103
114
 
147
158
 
148
159
objects:=$(addsuffix .o,$(CPROGS))
149
160
 
 
161
.PHONY: all
150
162
all: $(PROGS) mandos.lsm
151
163
 
 
164
.PHONY: doc
152
165
doc: $(DOCS)
153
166
 
 
167
.PHONY: html
154
168
html: $(htmldocs)
155
169
 
156
170
%.5: %.xml common.ent legalnotice.xml
273
287
                $@)
274
288
 
275
289
# Need to add the GnuTLS, Avahi and GPGME libraries
276
 
plugins.d/mandos-client: plugins.d/mandos-client.c
277
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
278
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
279
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
280
 
                ) $(LDLIBS) -o $@
 
290
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
 
291
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
292
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
 
293
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
281
294
 
282
295
# Need to add the libnl-route library
283
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
284
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
285
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
296
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
297
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
286
298
 
287
299
# Need to add the GLib and pthread libraries
288
 
dracut-module/password-agent: dracut-module/password-agent.c
289
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
290
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
291
 
 
292
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
293
 
        check run-client run-server install install-html \
294
 
        install-server install-client-nokey install-client uninstall \
295
 
        uninstall-server uninstall-client purge purge-server \
296
 
        purge-client
297
 
 
 
300
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
301
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
 
302
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
303
 
 
304
.PHONY: clean
298
305
clean:
299
306
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
300
307
 
 
308
.PHONY: distclean
301
309
distclean: clean
 
310
.PHONY: mostlyclean
302
311
mostlyclean: clean
 
312
.PHONY: maintainer-clean
303
313
maintainer-clean: clean
304
314
        -rm --force --recursive keydir confdir statedir
305
315
 
 
316
.PHONY: check
306
317
check: all
307
318
        ./mandos --check
308
319
        ./mandos-ctl --check
312
323
        ./dracut-module/password-agent --test
313
324
 
314
325
# Run the client with a local config and key
315
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
316
 
        @echo "###################################################################"
317
 
        @echo "# The following error messages are harmless and can be safely     #"
318
 
        @echo "# ignored:                                                        #"
319
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
320
 
        @echo "#                     setuid: Operation not permitted             #"
321
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
322
 
        @echo "# From mandos-client:                                             #"
323
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
324
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
325
 
        @echo "#                                                                 #"
326
 
        @echo "# (The messages are caused by not running as root, but you should #"
327
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
328
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
329
 
        @echo "###################################################################"
 
326
.PHONY: run-client
 
327
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
328
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
329
        @echo '######################################################'
 
330
        @echo '# The following error messages are harmless and can  #'
 
331
        @echo '#  be safely ignored:                                #'
 
332
        @echo '## From plugin-runner:                               #'
 
333
        @echo '# setgid: Operation not permitted                    #'
 
334
        @echo '# setuid: Operation not permitted                    #'
 
335
        @echo '## From askpass-fifo:                                #'
 
336
        @echo '# mkfifo: Permission denied                          #'
 
337
        @echo '## From mandos-client:                               #'
 
338
        @echo '# Failed to raise privileges: Operation not permi... #'
 
339
        @echo '# Warning: network hook "*" exited with status *     #'
 
340
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
341
        @echo '# Failed to bring up interface "*": Operation not... #'
 
342
        @echo '#                                                    #'
 
343
        @echo '# (The messages are caused by not running as root,   #'
 
344
        @echo '# but you should NOT run "make run-client" as root   #'
 
345
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
346
        @echo '# root, which is also NOT recommended.)              #'
 
347
        @echo '######################################################'
330
348
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
331
349
        ./plugin-runner --plugin-dir=plugins.d \
332
350
                --plugin-helper-dir=plugin-helpers \
339
357
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
340
358
        install --directory keydir
341
359
        ./mandos-keygen --dir keydir --force
 
360
        if ! [ -e keydir/tls-privkey.pem ]; then \
 
361
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
 
362
        fi
 
363
        if ! [ -e keydir/tls-pubkey.pem ]; then \
 
364
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
 
365
        fi
342
366
 
343
367
# Run the server with a local config
 
368
.PHONY: run-server
344
369
run-server: confdir/mandos.conf confdir/clients.conf statedir
345
370
        ./mandos --debug --no-dbus --configdir=confdir \
346
371
                --statedir=statedir $(SERVERARGS)
357
382
statedir:
358
383
        install --directory statedir
359
384
 
 
385
.PHONY: install
360
386
install: install-server install-client-nokey
361
387
 
 
388
.PHONY: install-html
362
389
install-html: html
363
390
        install --directory $(htmldir)
364
391
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
365
392
                $(htmldocs)
366
393
 
 
394
.PHONY: install-server
367
395
install-server: doc
368
396
        install --directory $(CONFDIR)
369
397
        if install --directory --mode=u=rwx --owner=$(USER) \
372
400
        elif install --directory --mode=u=rwx $(STATEDIR); then \
373
401
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
374
402
        fi
375
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
403
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
404
                        -a -d "$(TMPFILES)" ]; then \
376
405
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
377
406
                        $(TMPFILES)/mandos.conf; \
378
407
        fi
 
408
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
409
                        -a -d "$(SYSUSERS)" ]; then \
 
410
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
411
                        $(SYSUSERS)/mandos.conf; \
 
412
        fi
379
413
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
380
414
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
381
415
                mandos-ctl
410
444
        gzip --best --to-stdout intro.8mandos \
411
445
                > $(MANDIR)/man8/intro.8mandos.gz
412
446
 
 
447
.PHONY: install-client-nokey
413
448
install-client-nokey: all doc
414
449
        install --directory $(LIBDIR)/mandos $(CONFDIR)
415
450
        install --directory --mode=u=rwx $(KEYDIR) \
416
451
                $(LIBDIR)/mandos/plugins.d \
417
452
                $(LIBDIR)/mandos/plugin-helpers
 
453
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
454
                        -a -d "$(SYSUSERS)" ]; then \
 
455
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
456
                        $(SYSUSERS)/mandos-client.conf; \
 
457
        fi
418
458
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
419
459
                install --mode=u=rwx \
420
460
                        --directory "$(CONFDIR)/plugins.d" \
425
465
        install --mode=u=rwx,go=rx \
426
466
                --target-directory=$(LIBDIR)/mandos plugin-runner
427
467
        install --mode=u=rwx,go=rx \
428
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
468
                --target-directory=$(LIBDIR)/mandos \
 
469
                mandos-to-cryptroot-unlock
429
470
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
430
471
                mandos-keygen
431
472
        install --mode=u=rwx,go=rx \
488
529
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
489
530
                > $(MANDIR)/man8/password-agent.8mandos.gz
490
531
 
 
532
.PHONY: install-client
491
533
install-client: install-client-nokey
492
534
# Post-installation stuff
493
535
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
494
536
        if command -v update-initramfs >/dev/null; then \
495
537
            update-initramfs -k all -u; \
496
538
        elif command -v dracut >/dev/null; then \
497
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
539
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
498
540
                if [ -w "$$initrd" ]; then \
499
541
                    chmod go-r "$$initrd"; \
500
542
                    dracut --force "$$initrd"; \
503
545
        fi
504
546
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
505
547
 
 
548
.PHONY: uninstall
506
549
uninstall: uninstall-server uninstall-client
507
550
 
 
551
.PHONY: uninstall-server
508
552
uninstall-server:
509
553
        -rm --force $(PREFIX)/sbin/mandos \
510
554
                $(PREFIX)/sbin/mandos-ctl \
517
561
        update-rc.d -f mandos remove
518
562
        -rmdir $(CONFDIR)
519
563
 
 
564
.PHONY: uninstall-client
520
565
uninstall-client:
521
566
# Refuse to uninstall client if /etc/crypttab is explicitly configured
522
567
# to use it.
553
598
        if command -v update-initramfs >/dev/null; then \
554
599
            update-initramfs -k all -u; \
555
600
        elif command -v dracut >/dev/null; then \
556
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
601
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
557
602
                test -w "$$initrd" && dracut --force "$$initrd"; \
558
603
            done; \
559
604
        fi
560
605
 
 
606
.PHONY: purge
561
607
purge: purge-server purge-client
562
608
 
 
609
.PHONY: purge-server
563
610
purge-server: uninstall-server
564
611
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
565
612
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
570
617
                $(DESTDIR)/var/run/mandos.pid
571
618
        -rmdir $(CONFDIR)
572
619
 
 
620
.PHONY: purge-client
573
621
purge-client: uninstall-client
574
622
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
575
623
        -rm --force $(CONFDIR)/plugin-runner.conf \