/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: 2016-03-17 20:40:55 UTC
  • Revision ID: teddy@recompile.se-20160317204055-bhsh5xsidq7w5cxu
Client: Fix plymouth agent; broken since 1.7.2.

Fix an very old memory bug in the plymouth agent (which has been
present since its apperance in version 1.2), but which was only
recently detected at run time due to the new -fsanitize=address
compile- time flag, which has been used since version 1.7.2.  This
detection of a memory access violation causes the program to abort,
making the Plymouth graphical boot system unable to accept interactive
input of passwords when using the Mandos client.

* plugins.d/plymouth.c (exec_and_wait): Fix memory allocation bug when
  allocating new_argv.  Also tolerate a zero-length argv.

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)))
 
13
#DEBUG=-ggdb3
 
14
# 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
19
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
20
 
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
21
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
22
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
23
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
25
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
25
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum -fsanitize-address-use-after-scope
29
 
 
30
 
# 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:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
34
 
LINK_FORTIFY_LD:=-z relro -z now
35
 
LINK_FORTIFY:=
 
26
        -fsanitize=enum
 
27
# Check which sanitizing options can be used
 
28
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
29
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
 
30
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
31
LINK_FORTIFY_LD=-z relro -z now
 
32
LINK_FORTIFY=
36
33
 
37
34
# If BROKEN_PIE is set, do not build with -pie
38
35
ifndef BROKEN_PIE
40
37
LINK_FORTIFY += -pie
41
38
endif
42
39
#COVERAGE=--coverage
43
 
OPTIMIZE:=-Os -fno-strict-aliasing
44
 
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
46
 
htmldir:=man
47
 
version:=1.8.17
48
 
SED:=sed
49
 
PKG_CONFIG?=pkg-config
50
 
 
51
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
52
 
        || getent passwd nobody || echo 65534)))
53
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
54
 
        || getent group nogroup || echo 65534)))
55
 
 
56
 
LINUXVERSION:=$(shell uname --kernel-release)
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
 
42
htmldir=man
 
43
version=1.7.6
 
44
SED=sed
 
45
 
 
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
47
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
57
48
 
58
49
## Use these settings for a traditional /usr/local install
59
 
# PREFIX:=$(DESTDIR)/usr/local
60
 
# CONFDIR:=$(DESTDIR)/etc/mandos
61
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
62
 
# MANDIR:=$(PREFIX)/man
63
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
64
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
 
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
 
50
# PREFIX=$(DESTDIR)/usr/local
 
51
# CONFDIR=$(DESTDIR)/etc/mandos
 
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
53
# MANDIR=$(PREFIX)/man
 
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR=$(PREFIX)/lib
68
57
##
69
58
 
70
59
## These settings are for a package-type install
71
 
PREFIX:=$(DESTDIR)/usr
72
 
CONFDIR:=$(DESTDIR)/etc/mandos
73
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
74
 
MANDIR:=$(PREFIX)/share/man
75
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
76
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
77
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
78
 
LIBDIR:=$(shell \
 
60
PREFIX=$(DESTDIR)/usr
 
61
CONFDIR=$(DESTDIR)/etc/mandos
 
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
63
MANDIR=$(PREFIX)/share/man
 
64
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
65
STATEDIR=$(DESTDIR)/var/lib/mandos
 
66
LIBDIR=$(shell \
79
67
        for d in \
80
 
        "/usr/lib/`dpkg-architecture \
81
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
82
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
83
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
84
71
                        echo "$(DESTDIR)$$d"; \
85
72
                        break; \
86
73
                fi; \
87
74
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
75
##
90
76
 
91
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
92
 
                        --variable=systemdsystemunitdir)
93
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
94
 
                        --variable=tmpfilesdir)
95
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
 
                        --variable=sysusersdir)
 
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
97
78
 
98
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
99
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
102
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
103
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
104
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
105
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
79
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
80
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
81
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
82
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
83
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
84
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
106
85
        getconf LFS_LDFLAGS)
107
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
109
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
110
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
86
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
87
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
111
88
 
112
89
# Do not change these two
113
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
115
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
90
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
91
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
92
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
93
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
94
 
118
95
# Commands to format a DocBook <refentry> document into a manual page
119
96
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
125
102
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
126
103
        $(notdir $<); \
127
104
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
128
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
129
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
130
 
        $(notdir $@); fi >/dev/null)
 
105
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
106
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
107
        fi >/dev/null)
131
108
 
132
109
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
133
110
        --param make.year.ranges                1 \
139
116
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
140
117
        $<; $(HTMLPOST) $@)
141
118
# Fix citerefentry links
142
 
HTMLPOST:=$(SED) --in-place \
 
119
HTMLPOST=$(SED) --in-place \
143
120
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
144
121
 
145
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
122
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
146
123
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
147
124
        plugins.d/plymouth
148
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
149
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
150
 
        $(PLUGIN_HELPERS)
151
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
152
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
125
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
126
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
127
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
128
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
153
129
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
154
 
        dracut-module/password-agent.8mandos \
155
130
        plugins.d/mandos-client.8mandos \
156
131
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
157
132
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
158
133
        plugins.d/plymouth.8mandos intro.8mandos
159
134
 
160
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
161
 
 
162
 
objects:=$(addsuffix .o,$(CPROGS))
163
 
 
164
 
.PHONY: all
 
135
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
136
 
 
137
objects=$(addsuffix .o,$(CPROGS))
 
138
 
165
139
all: $(PROGS) mandos.lsm
166
140
 
167
 
.PHONY: doc
168
141
doc: $(DOCS)
169
142
 
170
 
.PHONY: html
171
143
html: $(htmldocs)
172
144
 
173
145
%.5: %.xml common.ent legalnotice.xml
232
204
                overview.xml legalnotice.xml
233
205
        $(DOCBOOKTOHTML)
234
206
 
235
 
dracut-module/password-agent.8mandos: \
236
 
                dracut-module/password-agent.xml common.ent \
237
 
                overview.xml legalnotice.xml
238
 
        $(DOCBOOKTOMAN)
239
 
dracut-module/password-agent.8mandos.xhtml: \
240
 
                dracut-module/password-agent.xml common.ent \
241
 
                overview.xml legalnotice.xml
242
 
        $(DOCBOOKTOHTML)
243
 
 
244
207
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
245
208
                                        common.ent \
246
209
                                        mandos-options.xml \
289
252
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
253
                $@)
291
254
 
292
 
# Does the linker support the --no-warn-execstack option?
293
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
294
 
# These programs use nested functions, which uses an executable stack
295
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
296
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
297
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
298
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
300
 
endif
301
 
 
302
 
# Need to add the GnuTLS, Avahi and GPGME libraries
303
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
304
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
305
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
306
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
307
 
 
308
 
# Need to add the libnl-route library
309
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
310
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
311
 
 
312
 
# Need to add the GLib and pthread libraries
313
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
314
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
315
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
316
 
 
317
 
.PHONY: clean
 
255
plugins.d/mandos-client: plugins.d/mandos-client.c
 
256
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
257
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
258
 
 
259
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
260
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
261
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
262
 
 
263
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
264
        check run-client run-server install install-html \
 
265
        install-server install-client-nokey install-client uninstall \
 
266
        uninstall-server uninstall-client purge purge-server \
 
267
        purge-client
 
268
 
318
269
clean:
319
270
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
320
271
 
321
 
.PHONY: distclean
322
272
distclean: clean
323
 
.PHONY: mostlyclean
324
273
mostlyclean: clean
325
 
.PHONY: maintainer-clean
326
274
maintainer-clean: clean
327
275
        -rm --force --recursive keydir confdir statedir
328
276
 
329
 
.PHONY: check
330
 
check: all
 
277
check:  all
331
278
        ./mandos --check
332
279
        ./mandos-ctl --check
333
 
        ./mandos-keygen --version
334
 
        ./plugin-runner --version
335
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
336
 
        ./dracut-module/password-agent --test
337
280
 
338
281
# Run the client with a local config and key
339
 
.PHONY: run-client
340
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
341
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
342
 
        @echo '######################################################'
343
 
        @echo '# The following error messages are harmless and can  #'
344
 
        @echo '#  be safely ignored:                                #'
345
 
        @echo '## From plugin-runner:                               #'
346
 
        @echo '# setgid: Operation not permitted                    #'
347
 
        @echo '# setuid: Operation not permitted                    #'
348
 
        @echo '## From askpass-fifo:                                #'
349
 
        @echo '# mkfifo: Permission denied                          #'
350
 
        @echo '## From mandos-client:                               #'
351
 
        @echo '# Failed to raise privileges: Operation not permi... #'
352
 
        @echo '# Warning: network hook "*" exited with status *     #'
353
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
354
 
        @echo '# Failed to bring up interface "*": Operation not... #'
355
 
        @echo '#                                                    #'
356
 
        @echo '# (The messages are caused by not running as root,   #'
357
 
        @echo '# but you should NOT run "make run-client" as root   #'
358
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
359
 
        @echo '# root, which is also NOT recommended.)              #'
360
 
        @echo '######################################################'
 
282
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
283
        @echo "###################################################################"
 
284
        @echo "# The following error messages are harmless and can be safely     #"
 
285
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
286
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
287
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
288
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
289
        @echo "#                     setuid: Operation not permitted             #"
 
290
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
291
        @echo "# From mandos-client:                                             #"
 
292
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
293
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
294
        @echo "###################################################################"
361
295
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
362
296
        ./plugin-runner --plugin-dir=plugins.d \
363
297
                --plugin-helper-dir=plugin-helpers \
364
298
                --config-file=plugin-runner.conf \
365
 
                --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 \
 
299
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
366
300
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
367
301
                $(CLIENTARGS)
368
302
 
369
303
# Used by run-client
370
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
304
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
371
305
        install --directory keydir
372
306
        ./mandos-keygen --dir keydir --force
373
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
374
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
375
 
        fi
376
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
377
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
378
 
        fi
379
307
 
380
308
# Run the server with a local config
381
 
.PHONY: run-server
382
309
run-server: confdir/mandos.conf confdir/clients.conf statedir
383
310
        ./mandos --debug --no-dbus --configdir=confdir \
384
311
                --statedir=statedir $(SERVERARGS)
385
312
 
386
313
# Used by run-server
387
314
confdir/mandos.conf: mandos.conf
388
 
        install -D --mode=u=rw,go=r $^ $@
389
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
390
 
        install -D --mode=u=rw $< $@
 
315
        install --directory confdir
 
316
        install --mode=u=rw,go=r $^ $@
 
317
confdir/clients.conf: clients.conf keydir/seckey.txt
 
318
        install --directory confdir
 
319
        install --mode=u=rw $< $@
391
320
# Add a client password
392
321
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
393
322
statedir:
394
323
        install --directory statedir
395
324
 
396
 
.PHONY: install
397
325
install: install-server install-client-nokey
398
326
 
399
 
.PHONY: install-html
400
327
install-html: html
401
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
328
        install --directory $(htmldir)
 
329
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
402
330
                $(htmldocs)
403
331
 
404
 
.PHONY: install-server
405
332
install-server: doc
 
333
        install --directory $(CONFDIR)
406
334
        if install --directory --mode=u=rwx --owner=$(USER) \
407
335
                --group=$(GROUP) $(STATEDIR); then \
408
336
                :; \
409
337
        elif install --directory --mode=u=rwx $(STATEDIR); then \
410
338
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
411
339
        fi
412
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
413
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
414
 
                        $(TMPFILES)/mandos.conf; \
415
 
        fi
416
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
417
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
418
 
                        $(SYSUSERS)/mandos.conf; \
419
 
        fi
420
 
        install --directory $(PREFIX)/sbin
421
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
422
 
                mandos
 
340
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
423
341
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
424
342
                mandos-ctl
425
343
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
426
344
                mandos-monitor
427
 
        install --directory $(CONFDIR)
428
345
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
429
346
                mandos.conf
430
347
        install --mode=u=rw --target-directory=$(CONFDIR) \
431
348
                clients.conf
432
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
433
 
                $(DBUSPOLICYDIR)/mandos.conf
434
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
349
        install --mode=u=rw,go=r dbus-mandos.conf \
 
350
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
351
        install --mode=u=rwx,go=rx init.d-mandos \
435
352
                $(DESTDIR)/etc/init.d/mandos
436
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
437
 
                install -D --mode=u=rw,go=r mandos.service \
438
 
                        $(SYSTEMD); \
 
353
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
354
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
439
355
        fi
440
 
        install -D --mode=u=rw,go=r default-mandos \
 
356
        install --mode=u=rw,go=r default-mandos \
441
357
                $(DESTDIR)/etc/default/mandos
442
358
        if [ -z $(DESTDIR) ]; then \
443
359
                update-rc.d mandos defaults 25 15;\
444
360
        fi
445
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
446
361
        gzip --best --to-stdout mandos.8 \
447
362
                > $(MANDIR)/man8/mandos.8.gz
448
363
        gzip --best --to-stdout mandos-monitor.8 \
456
371
        gzip --best --to-stdout intro.8mandos \
457
372
                > $(MANDIR)/man8/intro.8mandos.gz
458
373
 
459
 
.PHONY: install-client-nokey
460
374
install-client-nokey: all doc
 
375
        install --directory $(LIBDIR)/mandos $(CONFDIR)
461
376
        install --directory --mode=u=rwx $(KEYDIR) \
462
377
                $(LIBDIR)/mandos/plugins.d \
463
378
                $(LIBDIR)/mandos/plugin-helpers
464
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
465
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
466
 
                        $(SYSUSERS)/mandos-client.conf; \
467
 
        fi
468
379
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
469
 
                install --directory \
470
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
471
 
                        "$(CONFDIR)/plugin-helpers"; \
 
380
                install --mode=u=rwx \
 
381
                        --directory "$(CONFDIR)/plugins.d"; \
 
382
                install --directory "$(CONFDIR)/plugin-helpers"; \
472
383
        fi
473
 
        install --directory --mode=u=rwx,go=rx \
 
384
        install --mode=u=rwx,go=rx --directory \
474
385
                "$(CONFDIR)/network-hooks.d"
475
386
        install --mode=u=rwx,go=rx \
476
387
                --target-directory=$(LIBDIR)/mandos plugin-runner
477
 
        install --mode=u=rwx,go=rx \
478
 
                --target-directory=$(LIBDIR)/mandos \
479
 
                mandos-to-cryptroot-unlock
480
 
        install --directory $(PREFIX)/sbin
481
388
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
482
389
                mandos-keygen
483
390
        install --mode=u=rwx,go=rx \
498
405
        install --mode=u=rwxs,go=rx \
499
406
                --target-directory=$(LIBDIR)/mandos/plugins.d \
500
407
                plugins.d/plymouth
501
 
        install --mode=u=rwx,go=rx \
 
408
        install --mode=u=rwxs,go=rx \
502
409
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
503
410
                plugin-helpers/mandos-client-iprouteadddel
504
 
        install -D initramfs-tools-hook \
 
411
        install initramfs-tools-hook \
505
412
                $(INITRAMFSTOOLS)/hooks/mandos
506
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
507
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
508
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
509
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
510
 
        install -D initramfs-tools-script \
 
413
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
414
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
415
        install initramfs-tools-script \
511
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
512
 
        install -D initramfs-tools-script-stop \
513
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
514
 
        install -D --mode=u=rw,go=r \
515
 
                --target-directory=$(DRACUTMODULE) \
516
 
                dracut-module/ask-password-mandos.path \
517
 
                dracut-module/ask-password-mandos.service
518
 
        install --mode=u=rwxs,go=rx \
519
 
                --target-directory=$(DRACUTMODULE) \
520
 
                dracut-module/module-setup.sh \
521
 
                dracut-module/cmdline-mandos.sh \
522
 
                dracut-module/password-agent
523
417
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
524
 
        install --directory $(MANDIR)/man8
525
418
        gzip --best --to-stdout mandos-keygen.8 \
526
419
                > $(MANDIR)/man8/mandos-keygen.8.gz
527
420
        gzip --best --to-stdout plugin-runner.8mandos \
538
431
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
539
432
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
540
433
                > $(MANDIR)/man8/plymouth.8mandos.gz
541
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
542
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
543
434
 
544
 
.PHONY: install-client
545
435
install-client: install-client-nokey
546
436
# Post-installation stuff
547
437
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
548
 
        if command -v update-initramfs >/dev/null; then \
549
 
            update-initramfs -k all -u; \
550
 
        elif command -v dracut >/dev/null; then \
551
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
552
 
                if [ -w "$$initrd" ]; then \
553
 
                    chmod go-r "$$initrd"; \
554
 
                    dracut --force "$$initrd"; \
555
 
                fi; \
556
 
            done; \
557
 
        fi
 
438
        update-initramfs -k all -u
558
439
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
559
440
 
560
 
.PHONY: uninstall
561
441
uninstall: uninstall-server uninstall-client
562
442
 
563
 
.PHONY: uninstall-server
564
443
uninstall-server:
565
444
        -rm --force $(PREFIX)/sbin/mandos \
566
445
                $(PREFIX)/sbin/mandos-ctl \
573
452
        update-rc.d -f mandos remove
574
453
        -rmdir $(CONFDIR)
575
454
 
576
 
.PHONY: uninstall-client
577
455
uninstall-client:
578
456
# Refuse to uninstall client if /etc/crypttab is explicitly configured
579
457
# to use it.
590
468
                $(INITRAMFSTOOLS)/hooks/mandos \
591
469
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
592
470
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
593
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
594
 
                $(DRACUTMODULE)/ask-password-mandos.path \
595
 
                $(DRACUTMODULE)/ask-password-mandos.service \
596
 
                $(DRACUTMODULE)/module-setup.sh \
597
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
598
 
                $(DRACUTMODULE)/password-agent \
599
471
                $(MANDIR)/man8/mandos-keygen.8.gz \
600
472
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
601
473
                $(MANDIR)/man8/mandos-client.8mandos.gz
604
476
                $(MANDIR)/man8/splashy.8mandos.gz \
605
477
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
606
478
                $(MANDIR)/man8/plymouth.8mandos.gz \
607
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
608
479
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
609
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
610
 
        if command -v update-initramfs >/dev/null; then \
611
 
            update-initramfs -k all -u; \
612
 
        elif command -v dracut >/dev/null; then \
613
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
614
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
615
 
            done; \
616
 
        fi
 
480
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
481
        update-initramfs -k all -u
617
482
 
618
 
.PHONY: purge
619
483
purge: purge-server purge-client
620
484
 
621
 
.PHONY: purge-server
622
485
purge-server: uninstall-server
623
486
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
624
487
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
625
488
                $(DESTDIR)/etc/default/mandos \
626
489
                $(DESTDIR)/etc/init.d/mandos \
 
490
                $(SYSTEMD)/mandos.service \
627
491
                $(DESTDIR)/run/mandos.pid \
628
492
                $(DESTDIR)/var/run/mandos.pid
629
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
630
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
631
 
        fi
632
493
        -rmdir $(CONFDIR)
633
494
 
634
 
.PHONY: purge-client
635
495
purge-client: uninstall-client
636
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
496
        -shred --remove $(KEYDIR)/seckey.txt
637
497
        -rm --force $(CONFDIR)/plugin-runner.conf \
638
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
639
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
498
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
640
499
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)