/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: 2019-07-14 23:39:53 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190714233953-1zmsd3o062xloazt
Server bug fix: Allow restarts when using port= option

If the Mandos server is configured to use a specific TCP port to
listen to (by using the port= option in mandos.conf or the command
line --port option), that port becomes unusable for a time when the
Mandos server is restarted, making restarts fail.  Avoid this by, if a
port number is specified, using SO_REUSEADDR when binding the
listening TCP socket to a port number.

* mandos (IPv6_TCPServer.server_bind): Set self.allow_reuse_address if
                                       a port number is specified.

Reported-by: Juan Miguel Alcarria Herrera <juanmi@arco2000.es>

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