/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: 2019-08-03 11:39:38 UTC
  • Revision ID: teddy@recompile.se-20190803113938-httj8rqsnct08txx
dracut-module/password-agent.c: Bug fix: Ignore deleted files

If a question file ("ask.*") is opened, deleted, and then closed, we
still get an IN_CLOSE_WRITE ievent after the IN_DELETE ievent.  We
should pass the IN_EXCL_UNLINK flag to inotify_add_watch() to avoid
this.

* dracut-module/password-agent.c (add_inotify_dir_watch): Add
  "IN_EXCL_UNLINK" flag to inotify_add_watch().
  (test_add_inotify_dir_watch_IN_EXCL_UNLINK): New test.
  (run_tests): Add new test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
25
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum
 
28
        -fsanitize=enum -fsanitize-address-use-after-scope
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>.
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
44
44
htmldir:=man
45
 
version:=1.8.4
 
45
version:=1.8.5
46
46
SED:=sed
 
47
PKG_CONFIG?=pkg-config
47
48
 
48
49
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
50
        || getent passwd nobody || echo 65534)))
50
51
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
51
52
        || getent group nogroup || echo 65534)))
52
53
 
 
54
LINUXVERSION:=$(shell uname --kernel-release)
 
55
 
53
56
## Use these settings for a traditional /usr/local install
54
57
# PREFIX:=$(DESTDIR)/usr/local
55
58
# CONFDIR:=$(DESTDIR)/etc/mandos
56
59
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
57
60
# MANDIR:=$(PREFIX)/man
58
61
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
62
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
59
63
# STATEDIR:=$(DESTDIR)/var/lib/mandos
60
64
# LIBDIR:=$(PREFIX)/lib
61
65
##
66
70
KEYDIR:=$(DESTDIR)/etc/keys/mandos
67
71
MANDIR:=$(PREFIX)/share/man
68
72
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
73
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
69
74
STATEDIR:=$(DESTDIR)/var/lib/mandos
70
75
LIBDIR:=$(shell \
71
76
        for d in \
72
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
77
        "/usr/lib/`dpkg-architecture \
 
78
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
73
79
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
74
80
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
75
81
                        echo "$(DESTDIR)$$d"; \
78
84
        done)
79
85
##
80
86
 
81
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
82
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
87
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
88
                        --variable=systemdsystemunitdir)
 
89
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
90
                        --variable=tmpfilesdir)
83
91
 
84
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
85
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
86
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
87
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
92
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
93
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
94
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
95
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
88
96
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
89
97
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
90
98
        getconf LFS_LDFLAGS)
91
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
92
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
99
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
100
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
101
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
102
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
93
103
 
94
104
# Do not change these two
95
105
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
107
117
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
108
118
        $(notdir $<); \
109
119
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
110
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
111
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
112
 
        fi >/dev/null)
 
120
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
 
121
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
 
122
        $(notdir $@); fi >/dev/null)
113
123
 
114
124
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
115
125
        --param make.year.ranges                1 \
128
138
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
129
139
        plugins.d/plymouth
130
140
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
131
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
141
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
 
142
        $(PLUGIN_HELPERS)
132
143
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
133
144
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
134
145
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
146
        dracut-module/password-agent.8mandos \
135
147
        plugins.d/mandos-client.8mandos \
136
148
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
137
149
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
209
221
                overview.xml legalnotice.xml
210
222
        $(DOCBOOKTOHTML)
211
223
 
 
224
dracut-module/password-agent.8mandos: \
 
225
                dracut-module/password-agent.xml common.ent \
 
226
                overview.xml legalnotice.xml
 
227
        $(DOCBOOKTOMAN)
 
228
dracut-module/password-agent.8mandos.xhtml: \
 
229
                dracut-module/password-agent.xml common.ent \
 
230
                overview.xml legalnotice.xml
 
231
        $(DOCBOOKTOHTML)
 
232
 
212
233
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
213
234
                                        common.ent \
214
235
                                        mandos-options.xml \
264
285
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
265
286
                ) $(LDLIBS) -o $@
266
287
 
 
288
# Need to add the libnl-route library
267
289
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
268
290
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
269
291
                ) $(LOADLIBES) $(LDLIBS) -o $@
270
292
 
 
293
# 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
 
271
298
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
272
299
        check run-client run-server install install-html \
273
300
        install-server install-client-nokey install-client uninstall \
282
309
maintainer-clean: clean
283
310
        -rm --force --recursive keydir confdir statedir
284
311
 
285
 
check:  all
 
312
check: all
286
313
        ./mandos --check
287
314
        ./mandos-ctl --check
 
315
        ./mandos-keygen --version
 
316
        ./plugin-runner --version
 
317
        ./plugin-helpers/mandos-client-iprouteadddel --version
 
318
        ./dracut-module/password-agent --test
288
319
 
289
320
# Run the client with a local config and key
290
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
291
 
        @echo "###################################################################"
292
 
        @echo "# The following error messages are harmless and can be safely     #"
293
 
        @echo "# ignored:                                                        #"
294
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
295
 
        @echo "#                     setuid: Operation not permitted             #"
296
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
297
 
        @echo "# From mandos-client:                                             #"
298
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
299
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
300
 
        @echo "#                                                                 #"
301
 
        @echo "# (The messages are caused by not running as root, but you should #"
302
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
303
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
304
 
        @echo "###################################################################"
 
321
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
322
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
323
        @echo '######################################################'
 
324
        @echo '# The following error messages are harmless and can  #'
 
325
        @echo '#  be safely ignored:                                #'
 
326
        @echo '## From plugin-runner:                               #'
 
327
        @echo '# setgid: Operation not permitted                    #'
 
328
        @echo '# setuid: Operation not permitted                    #'
 
329
        @echo '## From askpass-fifo:                                #'
 
330
        @echo '# mkfifo: Permission denied                          #'
 
331
        @echo '## From mandos-client:                               #'
 
332
        @echo '# Failed to raise privileges: Operation not permi... #'
 
333
        @echo '# Warning: network hook "*" exited with status *     #'
 
334
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
335
        @echo '# Failed to bring up interface "*": Operation not... #'
 
336
        @echo '#                                                    #'
 
337
        @echo '# (The messages are caused by not running as root,   #'
 
338
        @echo '# but you should NOT run "make run-client" as root   #'
 
339
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
340
        @echo '# root, which is also NOT recommended.)              #'
 
341
        @echo '######################################################'
305
342
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
306
343
        ./plugin-runner --plugin-dir=plugins.d \
307
344
                --plugin-helper-dir=plugin-helpers \
347
384
        elif install --directory --mode=u=rwx $(STATEDIR); then \
348
385
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
349
386
        fi
350
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
387
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
388
                        -a -d "$(TMPFILES)" ]; then \
351
389
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
352
390
                        $(TMPFILES)/mandos.conf; \
353
391
        fi
400
438
        install --mode=u=rwx,go=rx \
401
439
                --target-directory=$(LIBDIR)/mandos plugin-runner
402
440
        install --mode=u=rwx,go=rx \
403
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
441
                --target-directory=$(LIBDIR)/mandos \
 
442
                mandos-to-cryptroot-unlock
404
443
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
405
444
                mandos-keygen
406
445
        install --mode=u=rwx,go=rx \
434
473
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
435
474
        install initramfs-tools-script-stop \
436
475
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
 
476
        install --directory $(DRACUTMODULE)
 
477
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
478
                dracut-module/ask-password-mandos.path \
 
479
                dracut-module/ask-password-mandos.service
 
480
        install --mode=u=rwxs,go=rx \
 
481
                --target-directory=$(DRACUTMODULE) \
 
482
                dracut-module/module-setup.sh \
 
483
                dracut-module/cmdline-mandos.sh \
 
484
                dracut-module/password-agent
437
485
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
438
486
        gzip --best --to-stdout mandos-keygen.8 \
439
487
                > $(MANDIR)/man8/mandos-keygen.8.gz
451
499
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
452
500
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
453
501
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
502
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
503
                > $(MANDIR)/man8/password-agent.8mandos.gz
454
504
 
455
505
install-client: install-client-nokey
456
506
# Post-installation stuff
457
507
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
458
 
        update-initramfs -k all -u
 
508
        if command -v update-initramfs >/dev/null; then \
 
509
            update-initramfs -k all -u; \
 
510
        elif command -v dracut >/dev/null; then \
 
511
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
512
                if [ -w "$$initrd" ]; then \
 
513
                    chmod go-r "$$initrd"; \
 
514
                    dracut --force "$$initrd"; \
 
515
                fi; \
 
516
            done; \
 
517
        fi
459
518
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
460
519
 
461
520
uninstall: uninstall-server uninstall-client
488
547
                $(INITRAMFSTOOLS)/hooks/mandos \
489
548
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
490
549
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
550
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
 
551
                $(DRACUTMODULE)/ask-password-mandos.path \
 
552
                $(DRACUTMODULE)/ask-password-mandos.service \
 
553
                $(DRACUTMODULE)/module-setup.sh \
 
554
                $(DRACUTMODULE)/cmdline-mandos.sh \
 
555
                $(DRACUTMODULE)/password-agent \
491
556
                $(MANDIR)/man8/mandos-keygen.8.gz \
492
557
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
493
558
                $(MANDIR)/man8/mandos-client.8mandos.gz
496
561
                $(MANDIR)/man8/splashy.8mandos.gz \
497
562
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
498
563
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
564
                $(MANDIR)/man8/password-agent.8mandos.gz \
499
565
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
500
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
501
 
        update-initramfs -k all -u
 
566
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
 
567
        if command -v update-initramfs >/dev/null; then \
 
568
            update-initramfs -k all -u; \
 
569
        elif command -v dracut >/dev/null; then \
 
570
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
571
                test -w "$$initrd" && dracut --force "$$initrd"; \
 
572
            done; \
 
573
        fi
502
574
 
503
575
purge: purge-server purge-client
504
576