/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: 2019-07-18 00:02:43 UTC
  • Revision ID: teddy@recompile.se-20190718000243-okz4s9xao1r1tfnx
Document bug in mandos-keygen which strips white space from passwords

Passwords, as read by mandos-keygen when given the --password or -p
options, are stripped of white space from the start and from the end
of the password.  This is because mandos-keygen is a shell script, and
the Bourne Shell "read" builtin does not seem to have a way to avoid
this.  Document this bug.

* manods-keygen.xml (OPTIONS): Document the white space-stripping
                               nature of the --password/-p option, and
                               also note in the description of
                               --passfile and -F that they avoid this
                               behavior.
  (BUGS): Again mention the problem with the --password and -p
          options, and suggest --passfile as a possible workaround.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
44
44
htmldir:=man
45
 
version:=1.8.5
 
45
version:=1.8.4
46
46
SED:=sed
47
 
PKG_CONFIG?=pkg-config
48
47
 
49
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
50
49
        || getent passwd nobody || echo 65534)))
51
50
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
52
51
        || getent group nogroup || echo 65534)))
53
52
 
54
 
LINUXVERSION:=$(shell uname --kernel-release)
55
 
 
56
53
## Use these settings for a traditional /usr/local install
57
54
# PREFIX:=$(DESTDIR)/usr/local
58
55
# CONFDIR:=$(DESTDIR)/etc/mandos
59
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
60
57
# MANDIR:=$(PREFIX)/man
61
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
62
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
63
59
# STATEDIR:=$(DESTDIR)/var/lib/mandos
64
60
# LIBDIR:=$(PREFIX)/lib
65
61
##
70
66
KEYDIR:=$(DESTDIR)/etc/keys/mandos
71
67
MANDIR:=$(PREFIX)/share/man
72
68
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
73
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
74
69
STATEDIR:=$(DESTDIR)/var/lib/mandos
75
70
LIBDIR:=$(shell \
76
71
        for d in \
77
 
        "/usr/lib/`dpkg-architecture \
78
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
79
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
80
74
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
81
75
                        echo "$(DESTDIR)$$d"; \
84
78
        done)
85
79
##
86
80
 
87
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
88
 
                        --variable=systemdsystemunitdir)
89
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
 
                        --variable=tmpfilesdir)
 
81
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
82
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
91
83
 
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)
 
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)
96
88
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
97
89
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
98
90
        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)
 
91
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
92
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
103
93
 
104
94
# Do not change these two
105
95
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
117
107
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
118
108
        $(notdir $<); \
119
109
        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)
 
110
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
111
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
112
        fi >/dev/null)
123
113
 
124
114
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
125
115
        --param make.year.ranges                1 \
138
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
139
129
        plugins.d/plymouth
140
130
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
141
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
142
 
        $(PLUGIN_HELPERS)
 
131
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
143
132
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
144
133
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
145
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
146
 
        dracut-module/password-agent.8mandos \
147
135
        plugins.d/mandos-client.8mandos \
148
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
149
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
221
209
                overview.xml legalnotice.xml
222
210
        $(DOCBOOKTOHTML)
223
211
 
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
 
 
233
212
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
234
213
                                        common.ent \
235
214
                                        mandos-options.xml \
290
269
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
291
270
                ) $(LOADLIBES) $(LDLIBS) -o $@
292
271
 
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
272
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
273
        check run-client run-server install install-html \
300
274
        install-server install-client-nokey install-client uninstall \
315
289
        ./mandos-keygen --version
316
290
        ./plugin-runner --version
317
291
        ./plugin-helpers/mandos-client-iprouteadddel --version
318
 
        ./dracut-module/password-agent --test
319
292
 
320
293
# Run the client with a local config and key
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 '######################################################'
 
294
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
295
        @echo "###################################################################"
 
296
        @echo "# The following error messages are harmless and can be safely     #"
 
297
        @echo "# ignored:                                                        #"
 
298
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
299
        @echo "#                     setuid: Operation not permitted             #"
 
300
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
301
        @echo "# From mandos-client:                                             #"
 
302
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
303
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
304
        @echo "#                                                                 #"
 
305
        @echo "# (The messages are caused by not running as root, but you should #"
 
306
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
307
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
 
308
        @echo "###################################################################"
342
309
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
343
310
        ./plugin-runner --plugin-dir=plugins.d \
344
311
                --plugin-helper-dir=plugin-helpers \
384
351
        elif install --directory --mode=u=rwx $(STATEDIR); then \
385
352
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
386
353
        fi
387
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
388
 
                        -a -d "$(TMPFILES)" ]; then \
 
354
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
389
355
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
356
                        $(TMPFILES)/mandos.conf; \
391
357
        fi
438
404
        install --mode=u=rwx,go=rx \
439
405
                --target-directory=$(LIBDIR)/mandos plugin-runner
440
406
        install --mode=u=rwx,go=rx \
441
 
                --target-directory=$(LIBDIR)/mandos \
442
 
                mandos-to-cryptroot-unlock
 
407
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
443
408
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
444
409
                mandos-keygen
445
410
        install --mode=u=rwx,go=rx \
473
438
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
474
439
        install initramfs-tools-script-stop \
475
440
                $(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
485
441
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
486
442
        gzip --best --to-stdout mandos-keygen.8 \
487
443
                > $(MANDIR)/man8/mandos-keygen.8.gz
499
455
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
500
456
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
501
457
                > $(MANDIR)/man8/plymouth.8mandos.gz
502
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
503
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
504
458
 
505
459
install-client: install-client-nokey
506
460
# Post-installation stuff
507
461
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
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
 
462
        update-initramfs -k all -u
518
463
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
519
464
 
520
465
uninstall: uninstall-server uninstall-client
547
492
                $(INITRAMFSTOOLS)/hooks/mandos \
548
493
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
549
494
                $(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
495
                $(MANDIR)/man8/mandos-keygen.8.gz \
557
496
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
558
497
                $(MANDIR)/man8/mandos-client.8mandos.gz
561
500
                $(MANDIR)/man8/splashy.8mandos.gz \
562
501
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
563
502
                $(MANDIR)/man8/plymouth.8mandos.gz \
564
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
565
503
        -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
 
504
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
505
        update-initramfs -k all -u
574
506
 
575
507
purge: purge-server purge-client
576
508