/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: 2014-06-14 02:57:16 UTC
  • Revision ID: teddy@recompile.se-20140614025716-i6887rk3u1iy9l67
In plugin-runner, protect against a larger FD_SETSIZE than fd_set.

* plugin-runner.c (main): Before forking, check that the first FD from
                          pipe() does not exceed FD_SETSIZE.

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
 
 
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
 
 
 
13
#DEBUG=-ggdb3
30
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
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:=
 
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=
35
19
 
36
20
# If BROKEN_PIE is set, do not build with -pie
37
21
ifndef BROKEN_PIE
39
23
LINK_FORTIFY += -pie
40
24
endif
41
25
#COVERAGE=--coverage
42
 
OPTIMIZE:=-Os -fno-strict-aliasing
43
 
LANGUAGE:=-std=gnu11
44
 
htmldir:=man
45
 
version:=1.8.4
46
 
SED:=sed
 
26
OPTIMIZE=-Os -fno-strict-aliasing
 
27
LANGUAGE=-std=gnu99
 
28
htmldir=man
 
29
version=1.6.5
 
30
SED=sed
47
31
 
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)))
 
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)))
52
34
 
53
35
## Use these settings for a traditional /usr/local install
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
 
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
61
43
##
62
44
 
63
45
## These settings are for a package-type install
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 \
 
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 \
71
53
        for d in \
72
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
73
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
78
60
        done)
79
61
##
80
62
 
81
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
82
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
83
64
 
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; \
 
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; \
90
71
        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)
93
72
 
94
73
# Do not change these two
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))
 
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))
99
78
 
100
79
# Commands to format a DocBook <refentry> document into a manual page
101
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
121
100
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
122
101
        $<; $(HTMLPOST) $@)
123
102
# Fix citerefentry links
124
 
HTMLPOST:=$(SED) --in-place \
 
103
HTMLPOST=$(SED) --in-place \
125
104
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
126
105
 
127
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
128
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
129
108
        plugins.d/plymouth
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 \
 
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 \
134
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
135
113
        plugins.d/mandos-client.8mandos \
136
114
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
137
115
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
138
116
        plugins.d/plymouth.8mandos intro.8mandos
139
117
 
140
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
118
htmldocs=$(addsuffix .xhtml,$(DOCS))
141
119
 
142
 
objects:=$(addsuffix .o,$(CPROGS))
 
120
objects=$(addsuffix .o,$(CPROGS))
143
121
 
144
122
all: $(PROGS) mandos.lsm
145
123
 
257
235
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
258
236
                $@)
259
237
 
260
 
# Need to add the GnuTLS, Avahi and GPGME libraries
261
238
plugins.d/mandos-client: plugins.d/mandos-client.c
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 $@
 
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
270
241
 
271
242
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
272
243
        check run-client run-server install install-html \
282
253
maintainer-clean: clean
283
254
        -rm --force --recursive keydir confdir statedir
284
255
 
285
 
check: all
 
256
check:  all
286
257
        ./mandos --check
287
258
        ./mandos-ctl --check
288
 
        ./mandos-keygen --version
289
 
        ./plugin-runner --version
290
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
291
259
 
292
260
# Run the client with a local config and key
293
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
261
run-client: all keydir/seckey.txt keydir/pubkey.txt
294
262
        @echo "###################################################################"
295
263
        @echo "# The following error messages are harmless and can be safely     #"
296
 
        @echo "# ignored:                                                        #"
297
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
298
 
        @echo "#                     setuid: Operation not permitted             #"
 
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. #"
 
267
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
299
268
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
300
 
        @echo "# From mandos-client:                                             #"
301
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
302
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
303
 
        @echo "#                                                                 #"
304
 
        @echo "# (The messages are caused by not running as root, but you should #"
305
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
306
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
 
269
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
270
        @echo "#                     seteuid: Operation not permitted            #"
 
271
        @echo "#                     klogctl: Operation not permitted            #"
307
272
        @echo "###################################################################"
308
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
309
273
        ./plugin-runner --plugin-dir=plugins.d \
310
 
                --plugin-helper-dir=plugin-helpers \
311
274
                --config-file=plugin-runner.conf \
312
 
                --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 \
313
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
275
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
314
276
                $(CLIENTARGS)
315
277
 
316
278
# Used by run-client
317
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
279
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
318
280
        install --directory keydir
319
281
        ./mandos-keygen --dir keydir --force
320
282
 
327
289
confdir/mandos.conf: mandos.conf
328
290
        install --directory confdir
329
291
        install --mode=u=rw,go=r $^ $@
330
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
292
confdir/clients.conf: clients.conf keydir/seckey.txt
331
293
        install --directory confdir
332
294
        install --mode=u=rw $< $@
333
295
# Add a client password
334
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
296
        ./mandos-keygen --dir keydir --password >> $@
335
297
statedir:
336
298
        install --directory statedir
337
299
 
350
312
        elif install --directory --mode=u=rwx $(STATEDIR); then \
351
313
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
352
314
        fi
353
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
354
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
355
 
                        $(TMPFILES)/mandos.conf; \
356
 
        fi
357
315
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
358
316
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
359
317
                mandos-ctl
391
349
install-client-nokey: all doc
392
350
        install --directory $(LIBDIR)/mandos $(CONFDIR)
393
351
        install --directory --mode=u=rwx $(KEYDIR) \
394
 
                $(LIBDIR)/mandos/plugins.d \
395
 
                $(LIBDIR)/mandos/plugin-helpers
 
352
                $(LIBDIR)/mandos/plugins.d
396
353
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
397
354
                install --mode=u=rwx \
398
 
                        --directory "$(CONFDIR)/plugins.d" \
399
 
                        "$(CONFDIR)/plugin-helpers"; \
 
355
                        --directory "$(CONFDIR)/plugins.d"; \
400
356
        fi
401
357
        install --mode=u=rwx,go=rx --directory \
402
358
                "$(CONFDIR)/network-hooks.d"
403
359
        install --mode=u=rwx,go=rx \
404
360
                --target-directory=$(LIBDIR)/mandos plugin-runner
405
 
        install --mode=u=rwx,go=rx \
406
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
407
361
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
408
362
                mandos-keygen
409
363
        install --mode=u=rwx,go=rx \
424
378
        install --mode=u=rwxs,go=rx \
425
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
426
380
                plugins.d/plymouth
427
 
        install --mode=u=rwx,go=rx \
428
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
429
 
                plugin-helpers/mandos-client-iprouteadddel
430
381
        install initramfs-tools-hook \
431
382
                $(INITRAMFSTOOLS)/hooks/mandos
432
 
        install --mode=u=rw,go=r initramfs-tools-conf \
433
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
434
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
435
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
383
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
384
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
436
385
        install initramfs-tools-script \
437
386
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
438
 
        install initramfs-tools-script-stop \
439
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
440
387
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
441
388
        gzip --best --to-stdout mandos-keygen.8 \
442
389
                > $(MANDIR)/man8/mandos-keygen.8.gz
516
463
        -rmdir $(CONFDIR)
517
464
 
518
465
purge-client: uninstall-client
519
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
466
        -shred --remove $(KEYDIR)/seckey.txt
520
467
        -rm --force $(CONFDIR)/plugin-runner.conf \
521
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
522
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
468
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
523
469
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)