/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

First version of a somewhat complete D-Bus server interface.  Also
change user/group name to "_mandos".

* debian/mandos.postinst: Rename old "mandos" user and group to
                          "_mandos"; create "_mandos" user and group
                          if none exist.
* debian/mandos-client.postinst: - '' -

* initramfs-tools-hook: Try "_mandos" before "mandos" as user and
                        group name.

* mandos (_datetime_to_dbus_struct): New; was previously local.
  (Client.started): Renamed to "last_started".  All users changed.
  (Client.started): New; boolean.
  (Client.dbus_object_path): New.
  (Client.check_command): Renamed to "checker_command".  All users
                          changed.
  (Client.__init__): Set and use "self.dbus_object_path".  Set
                     "self.started".
  (Client.start): Update "self.started".  Emit "self.PropertyChanged"
                  signals for both "started" and "last_started".
  (Client.stop): Update "self.started".  Emit "self.PropertyChanged"
                 signal for "started".
  (Client.checker_callback): Take additional "command" argument.  All
                             callers changed. Emit
                             "self.PropertyChanged" signal.
  (Client.bump_timeout): Emit "self.PropertyChanged" signal for
                         "last_checked_ok".
  (Client.start_checker): Emit "self.PropertyChanged" signal for
                          "checker_running".
  (Client.stop_checker): Emit "self.PropertyChanged" signal for
                         "checker_running".
  (Client.still_valid): Bug fix: use "getattr(self, started, False)"
                        instead of "self.started" in case this client
                        object is so new that the "started" attribute
                        has not been created yet.
  (Client.IntervalChanged, Client.CheckerIsRunning, Client.GetChecker,
  Client.GetCreated, Client.GetFingerprint, Client.GetHost,
  Client.GetInterval, Client.GetName, Client.GetStarted,
  Client.GetTimeout, Client.StateChanged, Client.TimeoutChanged):
  Removed; all callers changed.
  (Client.CheckerCompleted): Add "condition" and "command" arguments.
                             All callers changed.
  (Client.GetAllProperties, Client.PropertyChanged): New.
  (Client.StillValid): Renamed to "IsStillValid".
  (Client.StartChecker): Changed to its own function to avoid the
                         return value from "Client.start_checker()".
  (Client.Stop): Changed to its own function to avoid the return value
                 from "Client.stop()".
  (main): Try "_mandos" before "mandos" as user and group name.
          Removed inner function "remove_from_clients".  New inner
          class "MandosServer".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
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
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
22
14
#COVERAGE=--coverage
23
15
OPTIMIZE=-Os
24
16
LANGUAGE=-std=gnu99
25
17
htmldir=man
26
 
version=1.0.14
 
18
version=1.0.2
27
19
SED=sed
28
20
 
29
21
## Use these settings for a traditional /usr/local install
42
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
35
##
44
36
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
52
43
 
53
44
# Do not change these two
54
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
47
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
58
49
 
59
50
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
52
        --param man.charmap.use.subset          0 \
62
53
        --param make.year.ranges                1 \
63
54
        --param make.single.year.ranges         1 \
65
56
        --param man.authors.section.enabled     0 \
66
57
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
58
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
59
        $(MANPOST) $(notdir $@)
69
60
# DocBook-to-man post-processing to fix a '\n' escape bug
70
61
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
62
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
64
        --param make.year.ranges                1 \
74
65
        --param make.single.year.ranges         1 \
75
66
        --param man.output.quietly              1 \
77
68
        --param citerefentry.link               1 \
78
69
        --output $@ \
79
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
71
        $<; $(HTMLPOST) $@
81
72
# Fix citerefentry links
82
73
HTMLPOST=$(SED) --in-place \
83
74
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
75
 
85
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
78
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
79
PROGS=mandos mandos-keygen $(CPROGS)
90
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 \
92
81
        plugins.d/mandos-client.8mandos \
93
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
94
83
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
133
122
                 legalnotice.xml
134
123
        $(DOCBOOKTOHTML)
135
124
 
136
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
137
 
                legalnotice.xml
138
 
        $(DOCBOOKTOMAN)
139
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
140
 
                 legalnotice.xml
141
 
        $(DOCBOOKTOHTML)
142
 
 
143
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
144
126
                legalnotice.xml
145
127
        $(DOCBOOKTOMAN)
167
149
 
168
150
# Update all these files with version number $(version)
169
151
common.ent: Makefile
170
 
        $(strip $(SED) --in-place \
171
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
172
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
173
155
 
174
156
mandos: Makefile
175
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
176
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@)
 
159
                $@
178
160
 
179
161
mandos-keygen: Makefile
180
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
181
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
182
 
                $@)
183
 
 
184
 
mandos-ctl: Makefile
185
 
        $(strip $(SED) --in-place \
186
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
187
 
                $@)
188
 
 
189
 
mandos-monitor: Makefile
190
 
        $(strip $(SED) --in-place \
191
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
192
 
                $@)
 
164
                $@
193
165
 
194
166
mandos.lsm: Makefile
195
 
        $(strip $(SED) --in-place \
 
167
        $(SED) --in-place \
196
168
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
197
 
                $@)
198
 
        $(strip $(SED) --in-place \
 
169
                $@
 
170
        $(SED) --in-place \
199
171
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
200
 
                $@)
201
 
        $(strip $(SED) --in-place \
202
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
203
 
                $@)
 
172
                $@
204
173
 
205
 
plugins.d/mandos-client: plugins.d/mandos-client.c
206
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
207
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
174
plugins.d/mandos-client: plugins.d/mandos-client.o
 
175
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
176
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
208
177
 
209
178
.PHONY : all doc html clean distclean run-client run-server install \
210
179
        install-server install-client uninstall uninstall-server \
223
192
 
224
193
# Run the client with a local config and key
225
194
run-client: all keydir/seckey.txt keydir/pubkey.txt
226
 
        @echo "###################################################################"
227
 
        @echo "# The following error messages are harmless and can be safely     #"
228
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
229
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
230
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
231
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
232
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
233
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
234
 
        @echo "#                     seteuid: Operation not permitted            #"
235
 
        @echo "#                     klogctl: Operation not permitted            #"
236
 
        @echo "###################################################################"
237
195
        ./plugin-runner --plugin-dir=plugins.d \
238
196
                --config-file=plugin-runner.conf \
239
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
240
 
                $(CLIENTARGS)
 
197
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
241
198
 
242
199
# Used by run-client
243
200
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
246
203
 
247
204
# Run the server with a local config
248
205
run-server: confdir/mandos.conf confdir/clients.conf
249
 
        @echo "#################################################################"
250
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
251
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
252
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
253
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
254
 
        @echo "#################################################################"
255
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
206
        ./mandos --debug --configdir=confdir
256
207
 
257
208
# Used by run-server
258
209
confdir/mandos.conf: mandos.conf
274
225
install-server: doc
275
226
        install --directory $(CONFDIR)
276
227
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
277
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
278
 
                mandos-ctl
279
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
280
 
                mandos-monitor
281
228
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
282
229
                mandos.conf
283
230
        install --mode=u=rw --target-directory=$(CONFDIR) \
284
231
                clients.conf
285
 
        install --mode=u=rw,go=r dbus-mandos.conf \
286
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
287
232
        install --mode=u=rwx,go=rx init.d-mandos \
288
233
                $(DESTDIR)/etc/init.d/mandos
289
234
        install --mode=u=rw,go=r default-mandos \
325
270
        install --mode=u=rwxs,go=rx \
326
271
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
327
272
                plugins.d/askpass-fifo
328
 
        install --mode=u=rwxs,go=rx \
329
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
330
 
                plugins.d/plymouth
331
273
        install initramfs-tools-hook \
332
274
                $(INITRAMFSTOOLS)/hooks/mandos
333
275
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
334
276
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
335
277
        install initramfs-tools-script \
336
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
278
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
337
279
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
338
280
        gzip --best --to-stdout mandos-keygen.8 \
339
281
                > $(MANDIR)/man8/mandos-keygen.8.gz
360
302
 
361
303
uninstall-server:
362
304
        -rm --force $(PREFIX)/sbin/mandos \
363
 
                $(PREFIX)/sbin/mandos-ctl \
364
 
                $(PREFIX)/sbin/mandos-monitor \
365
305
                $(MANDIR)/man8/mandos.8.gz \
366
306
                $(MANDIR)/man5/mandos.conf.5.gz \
367
307
                $(MANDIR)/man5/mandos-clients.conf.5.gz
380
320
                $(PREFIX)/lib/mandos/plugins.d/usplash \
381
321
                $(PREFIX)/lib/mandos/plugins.d/splashy \
382
322
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
383
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
384
323
                $(INITRAMFSTOOLS)/hooks/mandos \
385
324
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
386
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
325
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
387
326
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
388
327
                $(MANDIR)/man8/mandos-keygen.8.gz \
389
328
                $(MANDIR)/man8/password-prompt.8mandos.gz \
399
338
 
400
339
purge-server: uninstall-server
401
340
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
402
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
403
341
                $(DESTDIR)/etc/default/mandos \
404
342
                $(DESTDIR)/etc/init.d/mandos \
405
343
                $(DESTDIR)/var/run/mandos.pid