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

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (237.12.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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 "2018-02-08">
 
6
<!ENTITY TIMESTAMP "2011-11-26">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
36
36
      <year>2009</year>
37
37
      <year>2010</year>
38
38
      <year>2011</year>
39
 
      <year>2012</year>
40
 
      <year>2013</year>
41
 
      <year>2014</year>
42
 
      <year>2015</year>
43
 
      <year>2016</year>
44
 
      <year>2017</year>
45
 
      <year>2018</year>
46
39
      <holder>Teddy Hogeborn</holder>
47
40
      <holder>Björn Påhlsson</holder>
48
41
    </copyright>
72
65
      ><refentrytitle>mandos</refentrytitle>
73
66
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
74
67
      The file needs to list all clients that should be able to use
75
 
      the service.  The settings in this file can be overridden by
76
 
      runtime changes to the server, which it saves across restarts.
77
 
      (See the section called <quote>PERSISTENT STATE</quote> in
78
 
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
79
 
      >8</manvolnum></citerefentry>.)  However, any <emphasis
80
 
      >changes</emphasis> to this file (including adding and removing
81
 
      clients) will, at startup, override changes done during runtime.
 
68
      the service.  All clients listed will be regarded as enabled,
 
69
      even if a client was disabled in a previous run of the server.
82
70
    </para>
83
71
    <para>
84
72
      The format starts with a <literal>[<replaceable>section
123
111
          <para>
124
112
            How long to wait for external approval before resorting to
125
113
            use the <option>approved_by_default</option> value.  The
126
 
            default is <quote>PT0S</quote>, i.e. not to wait.
 
114
            default is <quote>0s</quote>, i.e. not to wait.
127
115
          </para>
128
116
          <para>
129
117
            The format of <replaceable>TIME</replaceable> is the same
173
161
            This option is <emphasis>optional</emphasis>.
174
162
          </para>
175
163
          <para>
176
 
            This option overrides the default shell command that the
177
 
            server will use to check if the client is still up.  Any
178
 
            output of the command will be ignored, only the exit code
179
 
            is checked:  If the exit code of the command is zero, the
180
 
            client is considered up.  The command will be run using
181
 
            <quote><command><filename>/bin/sh</filename>
 
164
            This option allows you to override the default shell
 
165
            command that the server will use to check if the client is
 
166
            still up.  Any output of the command will be ignored, only
 
167
            the exit code is checked:  If the exit code of the command
 
168
            is zero, the client is considered up.  The command will be
 
169
            run using <quote><command><filename>/bin/sh</filename>
182
170
            <option>-c</option></command></quote>, so
183
171
            <varname>PATH</varname> will be searched.  The default
184
172
            value for the checker command is <quote><literal
185
173
            ><command>fping</command> <option>-q</option> <option
186
 
            >--</option> %%(host)s</literal></quote>.  Note that
187
 
            <command>mandos-keygen</command>, when generating output
188
 
            to be inserted into this file, normally looks for an SSH
189
 
            server on the Mandos client, and, if it find one, outputs
190
 
            a <option>checker</option> option to check for the
191
 
            client’s key fingerprint – this is more secure against
192
 
            spoofing.
 
174
            >--</option> %%(host)s</literal></quote>.
193
175
          </para>
194
176
          <para>
195
177
            In addition to normal start time expansion, this option
232
214
          <para>
233
215
            This option sets the OpenPGP fingerprint that identifies
234
216
            the public key that clients authenticate themselves with
235
 
            through TLS.  The string needs to be in hexadecimal form,
 
217
            through TLS.  The string needs to be in hexidecimal form,
236
218
            but spaces or upper/lower case are not significant.
237
219
          </para>
238
220
        </listitem>
347
329
            <option>extended_timeout</option> option.
348
330
          </para>
349
331
          <para>
350
 
            The <replaceable>TIME</replaceable> is specified as an RFC
351
 
            3339 duration; for example
352
 
            <quote><literal>P1Y2M3DT4H5M6S</literal></quote> meaning
353
 
            one year, two months, three days, four hours, five
354
 
            minutes, and six seconds.  Some values can be omitted, see
355
 
            RFC 3339 Appendix A for details.
 
332
            The <replaceable>TIME</replaceable> is specified as a
 
333
            space-separated number of values, each of which is a
 
334
            number and a one-character suffix.  The suffix must be one
 
335
            of <quote>d</quote>, <quote>s</quote>, <quote>m</quote>,
 
336
            <quote>h</quote>, and <quote>w</quote> for days, seconds,
 
337
            minutes, hours, and weeks, respectively.  The values are
 
338
            added together to give the total time value, so all of
 
339
            <quote><literal>330s</literal></quote>,
 
340
            <quote><literal>110s 110s 110s</literal></quote>, and
 
341
            <quote><literal>5m 30s</literal></quote> will give a value
 
342
            of five minutes and thirty seconds.
356
343
          </para>
357
344
        </listitem>
358
345
      </varlistentry>
416
403
        <quote><literal>approval_duration</literal></quote>,
417
404
        <quote><literal>created</literal></quote>,
418
405
        <quote><literal>enabled</literal></quote>,
419
 
        <quote><literal>expires</literal></quote>,
420
406
        <quote><literal>fingerprint</literal></quote>,
421
407
        <quote><literal>host</literal></quote>,
422
408
        <quote><literal>interval</literal></quote>,
465
451
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
466
452
      obscure.
467
453
    </para>
468
 
    <xi:include href="bugs.xml"/>
469
454
  </refsect1>
470
455
  
471
456
  <refsect1 id="example">
473
458
    <informalexample>
474
459
      <programlisting>
475
460
[DEFAULT]
476
 
timeout = PT5M
477
 
interval = PT2M
 
461
timeout = 5m
 
462
interval = 2m
478
463
checker = fping -q -- %%(host)s
479
464
 
480
465
# Client "foo"
497
482
        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
498
483
        QlnHIvPzEArRQLo=
499
484
host = foo.example.org
500
 
interval = PT1M
 
485
interval = 1m
501
486
 
502
487
# Client "bar"
503
488
[bar]
504
489
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
505
490
secfile = /etc/mandos/bar-secret
506
 
timeout = PT15M
 
491
timeout = 15m
507
492
approved_by_default = False
508
 
approval_delay = PT30S
 
493
approval_delay = 30s
509
494
      </programlisting>
510
495
    </informalexample>
511
496
  </refsect1>
520
505
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>
521
506
      <manvolnum>5</manvolnum></citerefentry>,
522
507
      <citerefentry><refentrytitle>mandos</refentrytitle>
523
 
      <manvolnum>8</manvolnum></citerefentry>,
524
 
      <citerefentry><refentrytitle>fping</refentrytitle>
525
508
      <manvolnum>8</manvolnum></citerefentry>
526
509
    </para>
527
 
    <variablelist>
528
 
      <varlistentry>
529
 
        <term>
530
 
          RFC 3339: <citetitle>Date and Time on the Internet:
531
 
          Timestamps</citetitle>
532
 
        </term>
533
 
      <listitem>
534
 
        <para>
535
 
          The time intervals are in the "duration" format, as
536
 
          specified in ABNF in Appendix A of RFC 3339.
537
 
        </para>
538
 
      </listitem>
539
 
      </varlistentry>
540
 
    </variablelist>
541
510
  </refsect1>
542
511
</refentry>
543
512
<!-- Local Variables: -->