/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2023-02-07 23:03:33 UTC
  • 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.6
 
46
version:=1.8.15
46
47
SED:=sed
47
48
PKG_CONFIG?=pkg-config
48
49
 
88
89
                        --variable=systemdsystemunitdir)
89
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
91
94
 
92
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
93
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
94
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
95
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
96
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
97
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
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; \
98
103
        getconf LFS_LDFLAGS)
99
104
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
100
105
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
102
107
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
103
108
 
104
109
# Do not change these two
105
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
106
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
110
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
111
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
107
112
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
108
113
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
109
114
 
153
158
 
154
159
objects:=$(addsuffix .o,$(CPROGS))
155
160
 
 
161
.PHONY: all
156
162
all: $(PROGS) mandos.lsm
157
163
 
 
164
.PHONY: doc
158
165
doc: $(DOCS)
159
166
 
 
167
.PHONY: html
160
168
html: $(htmldocs)
161
169
 
162
170
%.5: %.xml common.ent legalnotice.xml
279
287
                $@)
280
288
 
281
289
# Need to add the GnuTLS, Avahi and GPGME libraries
282
 
plugins.d/mandos-client: plugins.d/mandos-client.c
283
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
284
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
285
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
286
 
                ) $(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)
287
294
 
288
295
# Need to add the libnl-route library
289
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
290
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
291
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
296
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
297
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
292
298
 
293
299
# Need to add the GLib and pthread libraries
294
 
dracut-module/password-agent: dracut-module/password-agent.c
295
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
296
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
297
 
 
298
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
 
        check run-client run-server install install-html \
300
 
        install-server install-client-nokey install-client uninstall \
301
 
        uninstall-server uninstall-client purge purge-server \
302
 
        purge-client
303
 
 
 
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
304
305
clean:
305
306
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
306
307
 
 
308
.PHONY: distclean
307
309
distclean: clean
 
310
.PHONY: mostlyclean
308
311
mostlyclean: clean
 
312
.PHONY: maintainer-clean
309
313
maintainer-clean: clean
310
314
        -rm --force --recursive keydir confdir statedir
311
315
 
 
316
.PHONY: check
312
317
check: all
313
318
        ./mandos --check
314
319
        ./mandos-ctl --check
318
323
        ./dracut-module/password-agent --test
319
324
 
320
325
# Run the client with a local config and key
 
326
.PHONY: run-client
321
327
run-client: all keydir/seckey.txt keydir/pubkey.txt \
322
328
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
323
329
        @echo '######################################################'
351
357
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
352
358
        install --directory keydir
353
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
354
366
 
355
367
# Run the server with a local config
 
368
.PHONY: run-server
356
369
run-server: confdir/mandos.conf confdir/clients.conf statedir
357
370
        ./mandos --debug --no-dbus --configdir=confdir \
358
371
                --statedir=statedir $(SERVERARGS)
369
382
statedir:
370
383
        install --directory statedir
371
384
 
 
385
.PHONY: install
372
386
install: install-server install-client-nokey
373
387
 
 
388
.PHONY: install-html
374
389
install-html: html
375
390
        install --directory $(htmldir)
376
391
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
377
392
                $(htmldocs)
378
393
 
 
394
.PHONY: install-server
379
395
install-server: doc
380
396
        install --directory $(CONFDIR)
381
397
        if install --directory --mode=u=rwx --owner=$(USER) \
389
405
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
406
                        $(TMPFILES)/mandos.conf; \
391
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
392
413
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
393
414
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
415
                mandos-ctl
423
444
        gzip --best --to-stdout intro.8mandos \
424
445
                > $(MANDIR)/man8/intro.8mandos.gz
425
446
 
 
447
.PHONY: install-client-nokey
426
448
install-client-nokey: all doc
427
449
        install --directory $(LIBDIR)/mandos $(CONFDIR)
428
450
        install --directory --mode=u=rwx $(KEYDIR) \
429
451
                $(LIBDIR)/mandos/plugins.d \
430
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
431
458
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
432
459
                install --mode=u=rwx \
433
460
                        --directory "$(CONFDIR)/plugins.d" \
502
529
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
503
530
                > $(MANDIR)/man8/password-agent.8mandos.gz
504
531
 
 
532
.PHONY: install-client
505
533
install-client: install-client-nokey
506
534
# Post-installation stuff
507
535
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
517
545
        fi
518
546
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
519
547
 
 
548
.PHONY: uninstall
520
549
uninstall: uninstall-server uninstall-client
521
550
 
 
551
.PHONY: uninstall-server
522
552
uninstall-server:
523
553
        -rm --force $(PREFIX)/sbin/mandos \
524
554
                $(PREFIX)/sbin/mandos-ctl \
531
561
        update-rc.d -f mandos remove
532
562
        -rmdir $(CONFDIR)
533
563
 
 
564
.PHONY: uninstall-client
534
565
uninstall-client:
535
566
# Refuse to uninstall client if /etc/crypttab is explicitly configured
536
567
# to use it.
572
603
            done; \
573
604
        fi
574
605
 
 
606
.PHONY: purge
575
607
purge: purge-server purge-client
576
608
 
 
609
.PHONY: purge-server
577
610
purge-server: uninstall-server
578
611
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
579
612
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
584
617
                $(DESTDIR)/var/run/mandos.pid
585
618
        -rmdir $(CONFDIR)
586
619
 
 
620
.PHONY: purge-client
587
621
purge-client: uninstall-client
588
622
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
589
623
        -rm --force $(CONFDIR)/plugin-runner.conf \