/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 mandos-clients.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2014-06-14 23:29:00 UTC
  • Revision ID: teddy@recompile.se-20140614232900-vhcywskev4u8rz2d
mandos-client: Fix some bugs on error conditions.

* plugins.d/mandos-client.c (run_network_hooks): Init "dirent" to NULL
                                                 and, later, always
                                                 free() it unless
                                                 scandirat() or
                                                 scandir() failed.
  (main): Fix free() of uninitalized memory in case scandirat() or
          scandir() of "/sys/class/net" failed.  Also, when cleaning
          up, even if GPGME temp directory is empty, do
          free(direntries) and remove the directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-clients.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos-clients.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2010-09-25">
 
6
<!ENTITY TIMESTAMP "2013-10-15">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
20
20
        <firstname>Björn</firstname>
21
21
        <surname>Påhlsson</surname>
22
22
        <address>
23
 
          <email>belorn@fukt.bsnet.se</email>
 
23
          <email>belorn@recompile.se</email>
24
24
        </address>
25
25
      </author>
26
26
      <author>
27
27
        <firstname>Teddy</firstname>
28
28
        <surname>Hogeborn</surname>
29
29
        <address>
30
 
          <email>teddy@fukt.bsnet.se</email>
 
30
          <email>teddy@recompile.se</email>
31
31
        </address>
32
32
      </author>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
 
37
      <year>2010</year>
 
38
      <year>2011</year>
 
39
      <year>2012</year>
37
40
      <holder>Teddy Hogeborn</holder>
38
41
      <holder>Björn Påhlsson</holder>
39
42
    </copyright>
63
66
      ><refentrytitle>mandos</refentrytitle>
64
67
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
65
68
      The file needs to list all clients that should be able to use
66
 
      the service.  All clients listed will be regarded as enabled,
67
 
      even if a client was disabled in a previous run of the server.
 
69
      the service.  The settings in this file can be overridden by
 
70
      runtime changes to the server, which it saves across restarts.
 
71
      (See the section called <quote>PERSISTENT STATE</quote> in
 
72
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
 
73
      >8</manvolnum></citerefentry>.)  However, any <emphasis
 
74
      >changes</emphasis> to this file (including adding and removing
 
75
      clients) will, at startup, override changes done during runtime.
68
76
    </para>
69
77
    <para>
70
78
      The format starts with a <literal>[<replaceable>section
109
117
          <para>
110
118
            How long to wait for external approval before resorting to
111
119
            use the <option>approved_by_default</option> value.  The
112
 
            default is <quote>0s</quote>, i.e. not to wait.
 
120
            default is <quote>PT0S</quote>, i.e. not to wait.
113
121
          </para>
114
122
          <para>
115
123
            The format of <replaceable>TIME</replaceable> is the same
159
167
            This option is <emphasis>optional</emphasis>.
160
168
          </para>
161
169
          <para>
162
 
            This option allows you to override the default shell
163
 
            command that the server will use to check if the client is
164
 
            still up.  Any output of the command will be ignored, only
165
 
            the exit code is checked:  If the exit code of the command
166
 
            is zero, the client is considered up.  The command will be
167
 
            run using <quote><command><filename>/bin/sh</filename>
 
170
            This option overrides the default shell command that the
 
171
            server will use to check if the client is still up.  Any
 
172
            output of the command will be ignored, only the exit code
 
173
            is checked:  If the exit code of the command is zero, the
 
174
            client is considered up.  The command will be run using
 
175
            <quote><command><filename>/bin/sh</filename>
168
176
            <option>-c</option></command></quote>, so
169
177
            <varname>PATH</varname> will be searched.  The default
170
178
            value for the checker command is <quote><literal
180
188
      </varlistentry>
181
189
      
182
190
      <varlistentry>
 
191
        <term><option>extended_timeout<literal> = </literal><replaceable
 
192
        >TIME</replaceable></option></term>
 
193
        <listitem>
 
194
          <para>
 
195
            This option is <emphasis>optional</emphasis>.
 
196
          </para>
 
197
          <para>
 
198
            Extended timeout is an added timeout that is given once
 
199
            after a password has been sent successfully to a client.
 
200
            The timeout is by default longer than the normal timeout,
 
201
            and is used for handling the extra long downtime while a
 
202
            machine is booting up.  Time to take into consideration
 
203
            when changing this value is file system checks and quota
 
204
            checks.  The default value is 15 minutes.
 
205
          </para>
 
206
          <para>
 
207
            The format of <replaceable>TIME</replaceable> is the same
 
208
            as for <varname>timeout</varname> below.
 
209
          </para>
 
210
        </listitem>
 
211
      </varlistentry>
 
212
      
 
213
      <varlistentry>
183
214
        <term><option>fingerprint<literal> = </literal
184
215
        ><replaceable>HEXSTRING</replaceable></option></term>
185
216
        <listitem>
227
258
            will wait for a checker to complete until the below
228
259
            <quote><varname>timeout</varname></quote> occurs, at which
229
260
            time the client will be disabled, and any running checker
230
 
            killed.  The default interval is 5 minutes.
 
261
            killed.  The default interval is 2 minutes.
231
262
          </para>
232
263
          <para>
233
264
            The format of <replaceable>TIME</replaceable> is the same
297
328
            This option is <emphasis>optional</emphasis>.
298
329
          </para>
299
330
          <para>
300
 
            The timeout is how long the server will wait (for either a
301
 
            successful checker run or a client receiving its secret)
302
 
            until a client is disabled and not allowed to get the data
303
 
            this server holds.  By default Mandos will use 1 hour.
304
 
          </para>
305
 
          <para>
306
 
            The <replaceable>TIME</replaceable> is specified as a
307
 
            space-separated number of values, each of which is a
308
 
            number and a one-character suffix.  The suffix must be one
309
 
            of <quote>d</quote>, <quote>s</quote>, <quote>m</quote>,
310
 
            <quote>h</quote>, and <quote>w</quote> for days, seconds,
311
 
            minutes, hours, and weeks, respectively.  The values are
312
 
            added together to give the total time value, so all of
313
 
            <quote><literal>330s</literal></quote>,
314
 
            <quote><literal>110s 110s 110s</literal></quote>, and
315
 
            <quote><literal>5m 30s</literal></quote> will give a value
316
 
            of five minutes and thirty seconds.
 
331
            The timeout is how long the server will wait, after a
 
332
            successful checker run, until a client is disabled and not
 
333
            allowed to get the data this server holds.  By default
 
334
            Mandos will use 5 minutes.  See also the
 
335
            <option>extended_timeout</option> option.
 
336
          </para>
 
337
          <para>
 
338
            The <replaceable>TIME</replaceable> is specified as an RFC
 
339
            3339 duration; for example
 
340
            <quote><literal>P1Y2M3DT4H5M6S</literal></quote> meaning
 
341
            one year, two months, three days, four hours, five
 
342
            minutes, and six seconds.  Some values can be omitted, see
 
343
            RFC 3339 Appendix A for details.
 
344
          </para>
 
345
        </listitem>
 
346
      </varlistentry>
 
347
      
 
348
      <varlistentry>
 
349
        <term><option>enabled<literal> = </literal>{ <literal
 
350
        >1</literal> | <literal>yes</literal> | <literal>true</literal
 
351
        > | <literal >on</literal> | <literal>0</literal> | <literal
 
352
        >no</literal> | <literal>false</literal> | <literal
 
353
        >off</literal> }</option></term>
 
354
        <listitem>
 
355
          <para>
 
356
            Whether this client should be enabled by default.  The
 
357
            default is <quote>true</quote>.
317
358
          </para>
318
359
        </listitem>
319
360
      </varlistentry>
356
397
        <quote><literal>%%(<replaceable>foo</replaceable>)s</literal
357
398
        ></quote> will be replaced by the value of the attribute
358
399
        <varname>foo</varname> of the internal
359
 
        <quote><classname>Client</classname></quote> object.  See the
360
 
        source code for details, and let the authors know of any
361
 
        attributes that are useful so they may be preserved to any new
362
 
        versions of this software.
 
400
        <quote><classname>Client</classname></quote> object in the
 
401
        Mandos server.  The currently allowed values for
 
402
        <replaceable>foo</replaceable> are:
 
403
        <quote><literal>approval_delay</literal></quote>,
 
404
        <quote><literal>approval_duration</literal></quote>,
 
405
        <quote><literal>created</literal></quote>,
 
406
        <quote><literal>enabled</literal></quote>,
 
407
        <quote><literal>expires</literal></quote>,
 
408
        <quote><literal>fingerprint</literal></quote>,
 
409
        <quote><literal>host</literal></quote>,
 
410
        <quote><literal>interval</literal></quote>,
 
411
        <quote><literal>last_approval_request</literal></quote>,
 
412
        <quote><literal>last_checked_ok</literal></quote>,
 
413
        <quote><literal>last_enabled</literal></quote>,
 
414
        <quote><literal>name</literal></quote>,
 
415
        <quote><literal>timeout</literal></quote>, and, if using
 
416
        D-Bus, <quote><literal>dbus_object_path</literal></quote>.
 
417
        See the source code for details.  <emphasis role="strong"
 
418
        >Currently, <emphasis>none</emphasis> of these attributes
 
419
        except <quote><literal>host</literal></quote> are guaranteed
 
420
        to be valid in future versions.</emphasis> Therefore, please
 
421
        let the authors know of any attributes that are useful so they
 
422
        may be preserved to any new versions of this software.
363
423
      </para>
364
424
      <para>
365
425
        Note that this means that, in order to include an actual
400
460
    <informalexample>
401
461
      <programlisting>
402
462
[DEFAULT]
403
 
timeout = 1h
404
 
interval = 5m
 
463
timeout = PT5M
 
464
interval = PT2M
405
465
checker = fping -q -- %%(host)s
406
466
 
407
467
# Client "foo"
424
484
        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
425
485
        QlnHIvPzEArRQLo=
426
486
host = foo.example.org
427
 
interval = 1m
 
487
interval = PT1M
428
488
 
429
489
# Client "bar"
430
490
[bar]
431
491
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
432
492
secfile = /etc/mandos/bar-secret
433
 
timeout = 15m
 
493
timeout = PT15M
434
494
approved_by_default = False
435
 
approval_delay = 30s
 
495
approval_delay = PT30S
436
496
      </programlisting>
437
497
    </informalexample>
438
498
  </refsect1>
440
500
  <refsect1 id="see_also">
441
501
    <title>SEE ALSO</title>
442
502
    <para>
 
503
      <citerefentry><refentrytitle>intro</refentrytitle>
 
504
      <manvolnum>8mandos</manvolnum></citerefentry>,
443
505
      <citerefentry><refentrytitle>mandos-keygen</refentrytitle>
444
506
      <manvolnum>8</manvolnum></citerefentry>,
445
507
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>
446
508
      <manvolnum>5</manvolnum></citerefentry>,
447
509
      <citerefentry><refentrytitle>mandos</refentrytitle>
 
510
      <manvolnum>8</manvolnum></citerefentry>,
 
511
      <citerefentry><refentrytitle>fping</refentrytitle>
448
512
      <manvolnum>8</manvolnum></citerefentry>
449
513
    </para>
 
514
    <variablelist>
 
515
      <varlistentry>
 
516
        <term>
 
517
          RFC 3339: <citetitle>Date and Time on the Internet:
 
518
          Timestamps</citetitle>
 
519
        </term>
 
520
      <listitem>
 
521
        <para>
 
522
          The time intervals are in the "duration" format, as
 
523
          specified in ABNF in Appendix A of RFC 3339.
 
524
        </para>
 
525
      </listitem>
 
526
      </varlistentry>
 
527
    </variablelist>
450
528
  </refsect1>
451
529
</refentry>
452
530
<!-- Local Variables: -->