/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
56
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
57
57
# MANDIR:=$(PREFIX)/man
58
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
59
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
60
59
# STATEDIR:=$(DESTDIR)/var/lib/mandos
61
60
# LIBDIR:=$(PREFIX)/lib
62
61
##
67
66
KEYDIR:=$(DESTDIR)/etc/keys/mandos
68
67
MANDIR:=$(PREFIX)/share/man
69
68
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
70
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
71
69
STATEDIR:=$(DESTDIR)/var/lib/mandos
72
70
LIBDIR:=$(shell \
73
71
        for d in \
92
90
        getconf LFS_LDFLAGS)
93
91
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
94
92
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
95
 
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
96
 
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
97
93
 
98
94
# Do not change these two
99
95
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
111
107
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
112
108
        $(notdir $<); \
113
109
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
114
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
115
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
116
 
        $(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)
117
113
 
118
114
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
119
115
        --param make.year.ranges                1 \
132
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
133
129
        plugins.d/plymouth
134
130
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
135
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
136
 
        $(PLUGIN_HELPERS)
 
131
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
137
132
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
138
133
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
139
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
140
 
        dracut-module/password-agent.8mandos \
141
135
        plugins.d/mandos-client.8mandos \
142
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
143
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
215
209
                overview.xml legalnotice.xml
216
210
        $(DOCBOOKTOHTML)
217
211
 
218
 
dracut-module/password-agent.8mandos: \
219
 
                dracut-module/password-agent.xml common.ent \
220
 
                overview.xml legalnotice.xml
221
 
        $(DOCBOOKTOMAN)
222
 
dracut-module/password-agent.8mandos.xhtml: \
223
 
                dracut-module/password-agent.xml common.ent \
224
 
                overview.xml legalnotice.xml
225
 
        $(DOCBOOKTOHTML)
226
 
 
227
212
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
228
213
                                        common.ent \
229
214
                                        mandos-options.xml \
284
269
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
285
270
                ) $(LOADLIBES) $(LDLIBS) -o $@
286
271
 
287
 
# Need to add the GLib and pthread libraries
288
 
dracut-module/password-agent: dracut-module/password-agent.c
289
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
290
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
291
 
 
292
272
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
293
273
        check run-client run-server install install-html \
294
274
        install-server install-client-nokey install-client uninstall \
309
289
        ./mandos-keygen --version
310
290
        ./plugin-runner --version
311
291
        ./plugin-helpers/mandos-client-iprouteadddel --version
312
 
        ./dracut-module/password-agent --test
313
292
 
314
293
# Run the client with a local config and key
315
294
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
459
438
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
460
439
        install initramfs-tools-script-stop \
461
440
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
462
 
        install --directory $(DRACUTMODULE)
463
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
464
 
                dracut-module/ask-password-mandos.path \
465
 
                dracut-module/ask-password-mandos.service
466
 
        install --mode=u=rwxs,go=rx \
467
 
                --target-directory=$(DRACUTMODULE) \
468
 
                dracut-module/module-setup.sh \
469
 
                dracut-module/cmdline-mandos.sh \
470
 
                dracut-module/password-agent
471
441
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
472
442
        gzip --best --to-stdout mandos-keygen.8 \
473
443
                > $(MANDIR)/man8/mandos-keygen.8.gz
485
455
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
486
456
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
487
457
                > $(MANDIR)/man8/plymouth.8mandos.gz
488
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
489
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
490
458
 
491
459
install-client: install-client-nokey
492
460
# Post-installation stuff
493
461
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
494
 
        if command -v update-initramfs >/dev/null; then \
495
 
            update-initramfs -k all -u; \
496
 
        elif command -v dracut >/dev/null; then \
497
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
498
 
                if [ -w "$$initrd" ]; then \
499
 
                    chmod go-r "$$initrd"; \
500
 
                    dracut --force "$$initrd"; \
501
 
                fi; \
502
 
            done; \
503
 
        fi
 
462
        update-initramfs -k all -u
504
463
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
505
464
 
506
465
uninstall: uninstall-server uninstall-client
533
492
                $(INITRAMFSTOOLS)/hooks/mandos \
534
493
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
535
494
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
536
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
537
 
                $(DRACUTMODULE)/ask-password-mandos.path \
538
 
                $(DRACUTMODULE)/ask-password-mandos.service \
539
 
                $(DRACUTMODULE)/module-setup.sh \
540
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
541
 
                $(DRACUTMODULE)/password-agent \
542
495
                $(MANDIR)/man8/mandos-keygen.8.gz \
543
496
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
544
497
                $(MANDIR)/man8/mandos-client.8mandos.gz
547
500
                $(MANDIR)/man8/splashy.8mandos.gz \
548
501
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
549
502
                $(MANDIR)/man8/plymouth.8mandos.gz \
550
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
551
503
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
552
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
553
 
        if command -v update-initramfs >/dev/null; then \
554
 
            update-initramfs -k all -u; \
555
 
        elif command -v dracut >/dev/null; then \
556
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
557
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
558
 
            done; \
559
 
        fi
 
504
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
505
        update-initramfs -k all -u
560
506
 
561
507
purge: purge-server purge-client
562
508