/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-08-02 22:16:53 UTC
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: teddy@recompile.se-20190802221653-ic1iko9hbefzwsk7
Fix bug in server Debian package: Fails to start on first install

There has been a very long-standing bug where installation of the
server (the "mandos" Debian package) would fail to start the server
properly right after installation.  It would work on manual (re)start
after installation, or after reboot, and even after package purge and
reinstall, it would then work the first time.  The problem, it turns
out, is when the new "_mandos" user (and corresponding group) is
created, the D-Bus server is not reloaded, and is therefore not aware
of that user, and does not recognize the user and group name in the
/etc/dbus-1/system.d/mandos.conf file.  The Mandos server, when it
tries to start and access the D-Bus, is then not permitted to connect
to its D-Bus bus name, and disables D-Bus use as a fallback measure;
i.e. the server works, but it is not controllable via D-Bus commands
(via mandos-ctl or mandos-monitor).  The next time the D-Bus daemon is
reloaded for any reason, the new user & group would become visible to
the D-Bus daemon and after that, any restart of the Mandos server
would succeed and it would bind to its D-Bus name properly, and
thereby be visible and controllable by mandos-ctl & mandos-monitor.
This was mostly invisible when using sysvinit, but systemd makes the
problem visible since the systemd service file for the Mandos server
is configured to not consider the Mandos server "started" until the
D-Bus name has been bound; this makes the starting of the service wait
for 90 seconds and then fail with a timeout error.

Fixing this should also make the Debian CI autopkgtest tests work.

* debian/mandos.postinst (configure): After creating (or renaming)
                                      user & group, reload D-Bus
                                      daemon (if present).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
9
 
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
 
LINK_FORTIFY_LD=-z relro -fPIE
15
 
LINK_FORTIFY=-pie
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
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 -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:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
33
LINK_FORTIFY_LD:=-z relro -z now
 
34
LINK_FORTIFY:=
 
35
 
 
36
# If BROKEN_PIE is set, do not build with -pie
 
37
ifndef BROKEN_PIE
 
38
FORTIFY += -fPIE
 
39
LINK_FORTIFY += -pie
 
40
endif
16
41
#COVERAGE=--coverage
17
 
OPTIMIZE=-Os
18
 
LANGUAGE=-std=gnu99
19
 
htmldir=man
20
 
version=1.0.12
21
 
SED=sed
 
42
OPTIMIZE:=-Os -fno-strict-aliasing
 
43
LANGUAGE:=-std=gnu11
 
44
htmldir:=man
 
45
version:=1.8.5
 
46
SED:=sed
 
47
PKG_CONFIG?=pkg-config
 
48
 
 
49
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
 
50
        || getent passwd nobody || echo 65534)))
 
51
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
 
52
        || getent group nogroup || echo 65534)))
 
53
 
 
54
LINUXVERSION:=$(shell uname --kernel-release)
22
55
 
23
56
## Use these settings for a traditional /usr/local install
24
 
# PREFIX=$(DESTDIR)/usr/local
25
 
# CONFDIR=$(DESTDIR)/etc/mandos
26
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
27
 
# MANDIR=$(PREFIX)/man
28
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
57
# PREFIX:=$(DESTDIR)/usr/local
 
58
# CONFDIR:=$(DESTDIR)/etc/mandos
 
59
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
60
# MANDIR:=$(PREFIX)/man
 
61
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
62
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
 
63
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
64
# LIBDIR:=$(PREFIX)/lib
29
65
##
30
66
 
31
67
## These settings are for a package-type install
32
 
PREFIX=$(DESTDIR)/usr
33
 
CONFDIR=$(DESTDIR)/etc/mandos
34
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
35
 
MANDIR=$(PREFIX)/share/man
36
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
68
PREFIX:=$(DESTDIR)/usr
 
69
CONFDIR:=$(DESTDIR)/etc/mandos
 
70
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
71
MANDIR:=$(PREFIX)/share/man
 
72
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
73
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
 
74
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
75
LIBDIR:=$(shell \
 
76
        for d in \
 
77
        "/usr/lib/`dpkg-architecture \
 
78
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
79
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
80
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
81
                        echo "$(DESTDIR)$$d"; \
 
82
                        break; \
 
83
                fi; \
 
84
        done)
37
85
##
38
86
 
39
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
40
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
41
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
42
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
43
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
44
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
87
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
88
                        --variable=systemdsystemunitdir)
 
89
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
90
                        --variable=tmpfilesdir)
 
91
 
 
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)
 
96
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
97
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
45
98
        getconf LFS_LDFLAGS)
 
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)
46
103
 
47
104
# Do not change these two
48
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
49
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
50
 
        -DVERSION='"$(version)"'
51
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
105
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
106
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
107
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
 
108
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
52
109
 
53
110
# Commands to format a DocBook <refentry> document into a manual page
54
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
111
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
55
112
        --param man.charmap.use.subset          0 \
56
113
        --param make.year.ranges                1 \
57
114
        --param make.single.year.ranges         1 \
58
115
        --param man.output.quietly              1 \
59
116
        --param man.authors.section.enabled     0 \
60
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
117
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
61
118
        $(notdir $<); \
62
 
        $(MANPOST) $(notdir $@)
63
 
# DocBook-to-man post-processing to fix a '\n' escape bug
64
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
119
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
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)
65
123
 
66
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
124
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
67
125
        --param make.year.ranges                1 \
68
126
        --param make.single.year.ranges         1 \
69
127
        --param man.output.quietly              1 \
71
129
        --param citerefentry.link               1 \
72
130
        --output $@ \
73
131
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
74
 
        $<; $(HTMLPOST) $@
 
132
        $<; $(HTMLPOST) $@)
75
133
# Fix citerefentry links
76
 
HTMLPOST=$(SED) --in-place \
 
134
HTMLPOST:=$(SED) --in-place \
77
135
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
78
136
 
79
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
80
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
81
 
CPROGS=plugin-runner $(PLUGINS)
82
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
83
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
137
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
138
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
139
        plugins.d/plymouth
 
140
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
141
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
 
142
        $(PLUGIN_HELPERS)
 
143
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
144
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
145
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
146
        dracut-module/password-agent.8mandos \
84
147
        plugins.d/mandos-client.8mandos \
85
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
86
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
87
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
88
 
 
89
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
90
 
 
91
 
objects=$(addsuffix .o,$(CPROGS))
 
148
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
149
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
150
        plugins.d/plymouth.8mandos intro.8mandos
 
151
 
 
152
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
153
 
 
154
objects:=$(addsuffix .o,$(CPROGS))
92
155
 
93
156
all: $(PROGS) mandos.lsm
94
157
 
111
174
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
112
175
        $(DOCBOOKTOHTML)
113
176
 
 
177
intro.8mandos: intro.xml common.ent legalnotice.xml
 
178
        $(DOCBOOKTOMAN)
 
179
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
180
        $(DOCBOOKTOHTML)
 
181
 
114
182
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
115
183
                legalnotice.xml
116
184
        $(DOCBOOKTOMAN)
125
193
                 legalnotice.xml
126
194
        $(DOCBOOKTOHTML)
127
195
 
 
196
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
197
                legalnotice.xml
 
198
        $(DOCBOOKTOMAN)
 
199
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
200
                 legalnotice.xml
 
201
        $(DOCBOOKTOHTML)
 
202
 
 
203
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
204
                legalnotice.xml
 
205
        $(DOCBOOKTOMAN)
 
206
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
207
                 legalnotice.xml
 
208
        $(DOCBOOKTOHTML)
 
209
 
128
210
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
129
211
                legalnotice.xml
130
212
        $(DOCBOOKTOMAN)
139
221
                overview.xml legalnotice.xml
140
222
        $(DOCBOOKTOHTML)
141
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
 
142
233
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
143
234
                                        common.ent \
144
235
                                        mandos-options.xml \
152
243
 
153
244
# Update all these files with version number $(version)
154
245
common.ent: Makefile
155
 
        $(SED) --in-place \
 
246
        $(strip $(SED) --in-place \
156
247
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
157
 
                $@
 
248
                $@)
158
249
 
159
250
mandos: Makefile
160
 
        $(SED) --in-place \
 
251
        $(strip $(SED) --in-place \
161
252
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
162
 
                $@
 
253
                $@)
163
254
 
164
255
mandos-keygen: Makefile
165
 
        $(SED) --in-place \
 
256
        $(strip $(SED) --in-place \
166
257
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
167
 
                $@
 
258
                $@)
168
259
 
169
260
mandos-ctl: Makefile
170
 
        $(SED) --in-place \
171
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
172
 
                $@
 
261
        $(strip $(SED) --in-place \
 
262
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
263
                $@)
 
264
 
 
265
mandos-monitor: Makefile
 
266
        $(strip $(SED) --in-place \
 
267
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
268
                $@)
173
269
 
174
270
mandos.lsm: Makefile
175
 
        $(SED) --in-place \
 
271
        $(strip $(SED) --in-place \
176
272
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
177
 
                $@
178
 
        $(SED) --in-place \
 
273
                $@)
 
274
        $(strip $(SED) --in-place \
179
275
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
180
 
                $@
181
 
        $(SED) --in-place \
 
276
                $@)
 
277
        $(strip $(SED) --in-place \
182
278
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
183
 
                $@
184
 
 
185
 
plugins.d/mandos-client: plugins.d/mandos-client.o
186
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
187
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
188
 
 
189
 
.PHONY : all doc html clean distclean run-client run-server install \
190
 
        install-server install-client uninstall uninstall-server \
191
 
        uninstall-client purge purge-server purge-client
 
279
                $@)
 
280
 
 
281
# Need to add the GnuTLS, Avahi and GPGME libraries
 
282
plugins.d/mandos-client: plugins.d/mandos-client.c
 
283
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
284
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
285
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
286
                ) $(LDLIBS) -o $@
 
287
 
 
288
# Need to add the libnl-route library
 
289
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
290
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
291
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
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
 
 
298
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
299
        check run-client run-server install install-html \
 
300
        install-server install-client-nokey install-client uninstall \
 
301
        uninstall-server uninstall-client purge purge-server \
 
302
        purge-client
192
303
 
193
304
clean:
194
305
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
196
307
distclean: clean
197
308
mostlyclean: clean
198
309
maintainer-clean: clean
199
 
        -rm --force --recursive keydir confdir
 
310
        -rm --force --recursive keydir confdir statedir
200
311
 
201
 
check:  all
 
312
check: all
202
313
        ./mandos --check
 
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
203
319
 
204
320
# Run the client with a local config and key
205
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
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 '######################################################'
 
342
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
206
343
        ./plugin-runner --plugin-dir=plugins.d \
 
344
                --plugin-helper-dir=plugin-helpers \
207
345
                --config-file=plugin-runner.conf \
208
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
346
                --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 \
 
347
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
209
348
                $(CLIENTARGS)
210
349
 
211
350
# Used by run-client
212
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
351
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
213
352
        install --directory keydir
214
353
        ./mandos-keygen --dir keydir --force
215
354
 
216
355
# Run the server with a local config
217
 
run-server: confdir/mandos.conf confdir/clients.conf
218
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
356
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
357
        ./mandos --debug --no-dbus --configdir=confdir \
 
358
                --statedir=statedir $(SERVERARGS)
219
359
 
220
360
# Used by run-server
221
361
confdir/mandos.conf: mandos.conf
222
362
        install --directory confdir
223
363
        install --mode=u=rw,go=r $^ $@
224
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
364
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
225
365
        install --directory confdir
226
366
        install --mode=u=rw $< $@
227
367
# Add a client password
228
 
        ./mandos-keygen --dir keydir --password >> $@
 
368
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
369
statedir:
 
370
        install --directory statedir
229
371
 
230
372
install: install-server install-client-nokey
231
373
 
236
378
 
237
379
install-server: doc
238
380
        install --directory $(CONFDIR)
 
381
        if install --directory --mode=u=rwx --owner=$(USER) \
 
382
                --group=$(GROUP) $(STATEDIR); then \
 
383
                :; \
 
384
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
385
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
386
        fi
 
387
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
388
                        -a -d "$(TMPFILES)" ]; then \
 
389
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
390
                        $(TMPFILES)/mandos.conf; \
 
391
        fi
239
392
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
393
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
394
                mandos-ctl
 
395
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
396
                mandos-monitor
240
397
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
241
398
                mandos.conf
242
399
        install --mode=u=rw --target-directory=$(CONFDIR) \
243
400
                clients.conf
 
401
        install --mode=u=rw,go=r dbus-mandos.conf \
 
402
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
244
403
        install --mode=u=rwx,go=rx init.d-mandos \
245
404
                $(DESTDIR)/etc/init.d/mandos
 
405
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
406
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
407
        fi
246
408
        install --mode=u=rw,go=r default-mandos \
247
409
                $(DESTDIR)/etc/default/mandos
248
410
        if [ -z $(DESTDIR) ]; then \
250
412
        fi
251
413
        gzip --best --to-stdout mandos.8 \
252
414
                > $(MANDIR)/man8/mandos.8.gz
 
415
        gzip --best --to-stdout mandos-monitor.8 \
 
416
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
417
        gzip --best --to-stdout mandos-ctl.8 \
 
418
                > $(MANDIR)/man8/mandos-ctl.8.gz
253
419
        gzip --best --to-stdout mandos.conf.5 \
254
420
                > $(MANDIR)/man5/mandos.conf.5.gz
255
421
        gzip --best --to-stdout mandos-clients.conf.5 \
256
422
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
423
        gzip --best --to-stdout intro.8mandos \
 
424
                > $(MANDIR)/man8/intro.8mandos.gz
257
425
 
258
426
install-client-nokey: all doc
259
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
427
        install --directory $(LIBDIR)/mandos $(CONFDIR)
260
428
        install --directory --mode=u=rwx $(KEYDIR) \
261
 
                $(PREFIX)/lib/mandos/plugins.d
262
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
429
                $(LIBDIR)/mandos/plugins.d \
 
430
                $(LIBDIR)/mandos/plugin-helpers
 
431
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
263
432
                install --mode=u=rwx \
264
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
433
                        --directory "$(CONFDIR)/plugins.d" \
 
434
                        "$(CONFDIR)/plugin-helpers"; \
265
435
        fi
266
 
        install --mode=u=rwx,go=rx \
267
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
436
        install --mode=u=rwx,go=rx --directory \
 
437
                "$(CONFDIR)/network-hooks.d"
 
438
        install --mode=u=rwx,go=rx \
 
439
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
440
        install --mode=u=rwx,go=rx \
 
441
                --target-directory=$(LIBDIR)/mandos \
 
442
                mandos-to-cryptroot-unlock
268
443
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
269
444
                mandos-keygen
270
445
        install --mode=u=rwx,go=rx \
271
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
446
                --target-directory=$(LIBDIR)/mandos/plugins.d \
272
447
                plugins.d/password-prompt
273
448
        install --mode=u=rwxs,go=rx \
274
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
449
                --target-directory=$(LIBDIR)/mandos/plugins.d \
275
450
                plugins.d/mandos-client
276
451
        install --mode=u=rwxs,go=rx \
277
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
452
                --target-directory=$(LIBDIR)/mandos/plugins.d \
278
453
                plugins.d/usplash
279
454
        install --mode=u=rwxs,go=rx \
280
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
455
                --target-directory=$(LIBDIR)/mandos/plugins.d \
281
456
                plugins.d/splashy
282
457
        install --mode=u=rwxs,go=rx \
283
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
458
                --target-directory=$(LIBDIR)/mandos/plugins.d \
284
459
                plugins.d/askpass-fifo
 
460
        install --mode=u=rwxs,go=rx \
 
461
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
462
                plugins.d/plymouth
 
463
        install --mode=u=rwx,go=rx \
 
464
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
465
                plugin-helpers/mandos-client-iprouteadddel
285
466
        install initramfs-tools-hook \
286
467
                $(INITRAMFSTOOLS)/hooks/mandos
287
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
288
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
468
        install --mode=u=rw,go=r initramfs-tools-conf \
 
469
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
470
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
471
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
289
472
        install initramfs-tools-script \
290
473
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
474
        install initramfs-tools-script-stop \
 
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
291
485
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
292
486
        gzip --best --to-stdout mandos-keygen.8 \
293
487
                > $(MANDIR)/man8/mandos-keygen.8.gz
294
488
        gzip --best --to-stdout plugin-runner.8mandos \
295
489
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
490
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
491
                > $(MANDIR)/man8/mandos-client.8mandos.gz
296
492
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
297
493
                > $(MANDIR)/man8/password-prompt.8mandos.gz
298
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
299
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
300
494
        gzip --best --to-stdout plugins.d/usplash.8mandos \
301
495
                > $(MANDIR)/man8/usplash.8mandos.gz
302
496
        gzip --best --to-stdout plugins.d/splashy.8mandos \
303
497
                > $(MANDIR)/man8/splashy.8mandos.gz
304
498
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
305
499
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
500
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
501
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
502
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
503
                > $(MANDIR)/man8/password-agent.8mandos.gz
306
504
 
307
505
install-client: install-client-nokey
308
506
# Post-installation stuff
309
507
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
310
 
        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
311
518
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
312
519
 
313
520
uninstall: uninstall-server uninstall-client
314
521
 
315
522
uninstall-server:
316
523
        -rm --force $(PREFIX)/sbin/mandos \
 
524
                $(PREFIX)/sbin/mandos-ctl \
 
525
                $(PREFIX)/sbin/mandos-monitor \
317
526
                $(MANDIR)/man8/mandos.8.gz \
 
527
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
528
                $(MANDIR)/man8/mandos-ctl.8.gz \
318
529
                $(MANDIR)/man5/mandos.conf.5.gz \
319
530
                $(MANDIR)/man5/mandos-clients.conf.5.gz
320
531
        update-rc.d -f mandos remove
326
537
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
327
538
                $(DESTDIR)/etc/crypttab
328
539
        -rm --force $(PREFIX)/sbin/mandos-keygen \
329
 
                $(PREFIX)/lib/mandos/plugin-runner \
330
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
331
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
332
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
333
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
334
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
540
                $(LIBDIR)/mandos/plugin-runner \
 
541
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
542
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
543
                $(LIBDIR)/mandos/plugins.d/usplash \
 
544
                $(LIBDIR)/mandos/plugins.d/splashy \
 
545
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
546
                $(LIBDIR)/mandos/plugins.d/plymouth \
335
547
                $(INITRAMFSTOOLS)/hooks/mandos \
336
548
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
337
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 \
 
556
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
557
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
339
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
558
                $(MANDIR)/man8/mandos-client.8mandos.gz
340
559
                $(MANDIR)/man8/password-prompt.8mandos.gz \
341
560
                $(MANDIR)/man8/usplash.8mandos.gz \
342
561
                $(MANDIR)/man8/splashy.8mandos.gz \
343
562
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
344
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
345
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
346
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
347
 
        update-initramfs -k all -u
 
563
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
564
                $(MANDIR)/man8/password-agent.8mandos.gz \
 
565
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
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
348
574
 
349
575
purge: purge-server purge-client
350
576
 
351
577
purge-server: uninstall-server
352
578
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
579
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
353
580
                $(DESTDIR)/etc/default/mandos \
354
581
                $(DESTDIR)/etc/init.d/mandos \
 
582
                $(SYSTEMD)/mandos.service \
 
583
                $(DESTDIR)/run/mandos.pid \
355
584
                $(DESTDIR)/var/run/mandos.pid
356
585
        -rmdir $(CONFDIR)
357
586
 
358
587
purge-client: uninstall-client
359
 
        -shred --remove $(KEYDIR)/seckey.txt
 
588
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
360
589
        -rm --force $(CONFDIR)/plugin-runner.conf \
361
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
590
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
591
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
362
592
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)