/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: 2012-01-15 20:27:28 UTC
  • Revision ID: teddy@recompile.se-20120115202728-185929ww2r84s8xg
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
                                                           property.
* mandos (Client.last_checker_status): Use -2 instead of None to match
                                       D-Bus property.  All users
                                       changed.
  (Client.checked_ok): Remove "timeout" argument and call
                       "self.bump_timeout()" instead.
  (Client.bump_timeout): New; separated out from "checked_ok".
  (ClientDBus.last_checker_status): Hook to a D-Bus property.
  (ClientDBus.LastCheckerStatus_dbus_property): New D-Bus property.
  (ClientHandler.handle): Call client.bump_timeout() instead of
                          client.checked_ok().

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-26">
 
6
<!ENTITY TIMESTAMP "2012-01-01">
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>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
37
      <year>2010</year>
 
38
      <year>2011</year>
 
39
      <year>2012</year>
38
40
      <holder>Teddy Hogeborn</holder>
39
41
      <holder>Björn Påhlsson</holder>
40
42
    </copyright>
64
66
      ><refentrytitle>mandos</refentrytitle>
65
67
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
66
68
      The file needs to list all clients that should be able to use
67
 
      the service.  All clients listed will be regarded as enabled,
68
 
      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.
69
76
    </para>
70
77
    <para>
71
78
      The format starts with a <literal>[<replaceable>section
181
188
      </varlistentry>
182
189
      
183
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>
184
214
        <term><option>fingerprint<literal> = </literal
185
215
        ><replaceable>HEXSTRING</replaceable></option></term>
186
216
        <listitem>
228
258
            will wait for a checker to complete until the below
229
259
            <quote><varname>timeout</varname></quote> occurs, at which
230
260
            time the client will be disabled, and any running checker
231
 
            killed.  The default interval is 5 minutes.
 
261
            killed.  The default interval is 2 minutes.
232
262
          </para>
233
263
          <para>
234
264
            The format of <replaceable>TIME</replaceable> is the same
298
328
            This option is <emphasis>optional</emphasis>.
299
329
          </para>
300
330
          <para>
301
 
            The timeout is how long the server will wait (for either a
302
 
            successful checker run or a client receiving its secret)
303
 
            until a client is disabled and not allowed to get the data
304
 
            this server holds.  By default Mandos will use 1 hour.
 
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.
305
336
          </para>
306
337
          <para>
307
338
            The <replaceable>TIME</replaceable> is specified as a
319
350
        </listitem>
320
351
      </varlistentry>
321
352
      
 
353
      <varlistentry>
 
354
        <term><option>enabled<literal> = </literal>{ <literal
 
355
        >1</literal> | <literal>yes</literal> | <literal>true</literal
 
356
        > | <literal >on</literal> | <literal>0</literal> | <literal
 
357
        >no</literal> | <literal>false</literal> | <literal
 
358
        >off</literal> }</option></term>
 
359
        <listitem>
 
360
          <para>
 
361
            Whether this client should be enabled by default.  The
 
362
            default is <quote>true</quote>.
 
363
          </para>
 
364
        </listitem>
 
365
      </varlistentry>
 
366
      
322
367
    </variablelist>
323
368
  </refsect1>
324
369
  
357
402
        <quote><literal>%%(<replaceable>foo</replaceable>)s</literal
358
403
        ></quote> will be replaced by the value of the attribute
359
404
        <varname>foo</varname> of the internal
360
 
        <quote><classname>Client</classname></quote> object.  See the
361
 
        source code for details, and let the authors know of any
362
 
        attributes that are useful so they may be preserved to any new
363
 
        versions of this software.
 
405
        <quote><classname>Client</classname></quote> object in the
 
406
        Mandos server.  The currently allowed values for
 
407
        <replaceable>foo</replaceable> are:
 
408
        <quote><literal>approval_delay</literal></quote>,
 
409
        <quote><literal>approval_duration</literal></quote>,
 
410
        <quote><literal>created</literal></quote>,
 
411
        <quote><literal>enabled</literal></quote>,
 
412
        <quote><literal>fingerprint</literal></quote>,
 
413
        <quote><literal>host</literal></quote>,
 
414
        <quote><literal>interval</literal></quote>,
 
415
        <quote><literal>last_approval_request</literal></quote>,
 
416
        <quote><literal>last_checked_ok</literal></quote>,
 
417
        <quote><literal>last_enabled</literal></quote>,
 
418
        <quote><literal>name</literal></quote>,
 
419
        <quote><literal>timeout</literal></quote>, and, if using
 
420
        D-Bus, <quote><literal>dbus_object_path</literal></quote>.
 
421
        See the source code for details.  <emphasis role="strong"
 
422
        >Currently, <emphasis>none</emphasis> of these attributes
 
423
        except <quote><literal>host</literal></quote> are guaranteed
 
424
        to be valid in future versions.</emphasis> Therefore, please
 
425
        let the authors know of any attributes that are useful so they
 
426
        may be preserved to any new versions of this software.
364
427
      </para>
365
428
      <para>
366
429
        Note that this means that, in order to include an actual
401
464
    <informalexample>
402
465
      <programlisting>
403
466
[DEFAULT]
404
 
timeout = 1h
405
 
interval = 5m
 
467
timeout = 5m
 
468
interval = 2m
406
469
checker = fping -q -- %%(host)s
407
470
 
408
471
# Client "foo"
441
504
  <refsect1 id="see_also">
442
505
    <title>SEE ALSO</title>
443
506
    <para>
 
507
      <citerefentry><refentrytitle>intro</refentrytitle>
 
508
      <manvolnum>8mandos</manvolnum></citerefentry>,
444
509
      <citerefentry><refentrytitle>mandos-keygen</refentrytitle>
445
510
      <manvolnum>8</manvolnum></citerefentry>,
446
511
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>