/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
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
12
        -Wvolatile-register-var -Woverlength-strings
13
 
#DEBUG=-ggdb3
 
13
 
 
14
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
 
15
## Check which sanitizing options can be used
 
16
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
17
#       echo 'int main(){}' | $(CC) --language=c $(option) \
 
18
#       /dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
19
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
20
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
21
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
22
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
23
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
24
        -fsanitize=bounds -fsanitize=alignment \
 
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
28
        -fsanitize=enum
 
29
 
14
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
 
LINK_FORTIFY_LD=-z relro -z now
18
 
LINK_FORTIFY=
 
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
33
LINK_FORTIFY_LD:=-z relro -z now
 
34
LINK_FORTIFY:=
19
35
 
20
36
# If BROKEN_PIE is set, do not build with -pie
21
37
ifndef BROKEN_PIE
23
39
LINK_FORTIFY += -pie
24
40
endif
25
41
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
27
 
LANGUAGE=-std=gnu99
28
 
htmldir=man
29
 
version=1.6.6
30
 
SED=sed
 
42
OPTIMIZE:=-Os -fno-strict-aliasing
 
43
LANGUAGE:=-std=gnu11
 
44
htmldir:=man
 
45
version:=1.8.4
 
46
SED:=sed
31
47
 
32
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
33
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
 
49
        || getent passwd nobody || echo 65534)))
 
50
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
 
51
        || getent group nogroup || echo 65534)))
34
52
 
35
53
## Use these settings for a traditional /usr/local install
36
 
# PREFIX=$(DESTDIR)/usr/local
37
 
# CONFDIR=$(DESTDIR)/etc/mandos
38
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
39
 
# MANDIR=$(PREFIX)/man
40
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
41
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
42
 
# LIBDIR=$(PREFIX)/lib
 
54
# PREFIX:=$(DESTDIR)/usr/local
 
55
# CONFDIR:=$(DESTDIR)/etc/mandos
 
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
57
# MANDIR:=$(PREFIX)/man
 
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
59
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
60
# LIBDIR:=$(PREFIX)/lib
43
61
##
44
62
 
45
63
## These settings are for a package-type install
46
 
PREFIX=$(DESTDIR)/usr
47
 
CONFDIR=$(DESTDIR)/etc/mandos
48
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
49
 
MANDIR=$(PREFIX)/share/man
50
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
51
 
STATEDIR=$(DESTDIR)/var/lib/mandos
52
 
LIBDIR=$(shell \
 
64
PREFIX:=$(DESTDIR)/usr
 
65
CONFDIR:=$(DESTDIR)/etc/mandos
 
66
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
67
MANDIR:=$(PREFIX)/share/man
 
68
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
69
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
70
LIBDIR:=$(shell \
53
71
        for d in \
54
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
55
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
60
78
        done)
61
79
##
62
80
 
63
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
81
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
82
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
64
83
 
65
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
67
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
68
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
69
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
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)
 
88
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
89
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
90
        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)
72
93
 
73
94
# Do not change these two
74
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
75
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
76
 
        -DVERSION='"$(version)"'
77
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
95
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
96
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
 
98
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
78
99
 
79
100
# Commands to format a DocBook <refentry> document into a manual page
80
101
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
100
121
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
101
122
        $<; $(HTMLPOST) $@)
102
123
# Fix citerefentry links
103
 
HTMLPOST=$(SED) --in-place \
 
124
HTMLPOST:=$(SED) --in-place \
104
125
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
105
126
 
106
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
127
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
107
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
129
        plugins.d/plymouth
109
 
CPROGS=plugin-runner $(PLUGINS)
110
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
111
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
130
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
131
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
132
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
133
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
112
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
113
135
        plugins.d/mandos-client.8mandos \
114
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
115
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
116
138
        plugins.d/plymouth.8mandos intro.8mandos
117
139
 
118
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
140
htmldocs:=$(addsuffix .xhtml,$(DOCS))
119
141
 
120
 
objects=$(addsuffix .o,$(CPROGS))
 
142
objects:=$(addsuffix .o,$(CPROGS))
121
143
 
122
144
all: $(PROGS) mandos.lsm
123
145
 
235
257
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
236
258
                $@)
237
259
 
 
260
# Need to add the GnuTLS, Avahi and GPGME libraries
238
261
plugins.d/mandos-client: plugins.d/mandos-client.c
239
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
240
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
262
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
263
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
264
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
265
                ) $(LDLIBS) -o $@
 
266
 
 
267
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
268
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
269
                ) $(LOADLIBES) $(LDLIBS) -o $@
241
270
 
242
271
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
272
        check run-client run-server install install-html \
258
287
        ./mandos-ctl --check
259
288
 
260
289
# Run the client with a local config and key
261
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
290
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
262
291
        @echo "###################################################################"
263
292
        @echo "# The following error messages are harmless and can be safely     #"
264
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
265
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
266
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
293
        @echo "# ignored:                                                        #"
267
294
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
268
295
        @echo "#                     setuid: Operation not permitted             #"
269
296
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
270
297
        @echo "# From mandos-client:                                             #"
271
298
        @echo "#             Failed to raise privileges: Operation not permitted #"
272
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.)        #"
273
304
        @echo "###################################################################"
274
305
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
275
306
        ./plugin-runner --plugin-dir=plugins.d \
 
307
                --plugin-helper-dir=plugin-helpers \
276
308
                --config-file=plugin-runner.conf \
277
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
309
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
278
310
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
279
311
                $(CLIENTARGS)
280
312
 
281
313
# Used by run-client
282
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
314
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
283
315
        install --directory keydir
284
316
        ./mandos-keygen --dir keydir --force
285
317
 
292
324
confdir/mandos.conf: mandos.conf
293
325
        install --directory confdir
294
326
        install --mode=u=rw,go=r $^ $@
295
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
327
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
296
328
        install --directory confdir
297
329
        install --mode=u=rw $< $@
298
330
# Add a client password
315
347
        elif install --directory --mode=u=rwx $(STATEDIR); then \
316
348
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
317
349
        fi
 
350
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
351
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
352
                        $(TMPFILES)/mandos.conf; \
 
353
        fi
318
354
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
319
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
320
356
                mandos-ctl
352
388
install-client-nokey: all doc
353
389
        install --directory $(LIBDIR)/mandos $(CONFDIR)
354
390
        install --directory --mode=u=rwx $(KEYDIR) \
355
 
                $(LIBDIR)/mandos/plugins.d
 
391
                $(LIBDIR)/mandos/plugins.d \
 
392
                $(LIBDIR)/mandos/plugin-helpers
356
393
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
357
394
                install --mode=u=rwx \
358
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
395
                        --directory "$(CONFDIR)/plugins.d" \
 
396
                        "$(CONFDIR)/plugin-helpers"; \
359
397
        fi
360
398
        install --mode=u=rwx,go=rx --directory \
361
399
                "$(CONFDIR)/network-hooks.d"
362
400
        install --mode=u=rwx,go=rx \
363
401
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
402
        install --mode=u=rwx,go=rx \
 
403
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
364
404
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
365
405
                mandos-keygen
366
406
        install --mode=u=rwx,go=rx \
381
421
        install --mode=u=rwxs,go=rx \
382
422
                --target-directory=$(LIBDIR)/mandos/plugins.d \
383
423
                plugins.d/plymouth
 
424
        install --mode=u=rwx,go=rx \
 
425
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
426
                plugin-helpers/mandos-client-iprouteadddel
384
427
        install initramfs-tools-hook \
385
428
                $(INITRAMFSTOOLS)/hooks/mandos
386
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
387
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
429
        install --mode=u=rw,go=r initramfs-tools-conf \
 
430
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
431
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
432
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
388
433
        install initramfs-tools-script \
389
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
435
        install initramfs-tools-script-stop \
 
436
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
390
437
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
391
438
        gzip --best --to-stdout mandos-keygen.8 \
392
439
                > $(MANDIR)/man8/mandos-keygen.8.gz
466
513
        -rmdir $(CONFDIR)
467
514
 
468
515
purge-client: uninstall-client
469
 
        -shred --remove $(KEYDIR)/seckey.txt
 
516
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
470
517
        -rm --force $(CONFDIR)/plugin-runner.conf \
471
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
518
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
519
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
472
520
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)