/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: 2023-02-07 19:29:28 UTC
  • Revision ID: teddy@recompile.se-20230207192928-ueasjbsufb92o6ud
Clarify documentation and a comment about GnuTLS versions

* clients.conf ([foo]/secret): In the comment for the example client's
  "secret" setting, clarify GnuTLS version conditions.
* mandos-clients.conf.xml (OPTIONS/fingerprint, OPTIONS/key_id):
  Clarify required/optional status under different GnuTLS versions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 "2012-01-01">
 
6
<!ENTITY TIMESTAMP "2019-02-10">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
37
37
      <year>2010</year>
38
38
      <year>2011</year>
39
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
      <year>2019</year>
40
47
      <holder>Teddy Hogeborn</holder>
41
48
      <holder>Björn Påhlsson</holder>
42
49
    </copyright>
66
73
      ><refentrytitle>mandos</refentrytitle>
67
74
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
68
75
      The file needs to list all clients that should be able to use
69
 
      the service.  All clients listed will be regarded as enabled,
70
 
      even if a client was disabled in a previous run of the server.
 
76
      the service.  The settings in this file can be overridden by
 
77
      runtime changes to the server, which it saves across restarts.
 
78
      (See the section called <quote>PERSISTENT STATE</quote> in
 
79
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
 
80
      >8</manvolnum></citerefentry>.)  However, any <emphasis
 
81
      >changes</emphasis> to this file (including adding and removing
 
82
      clients) will, at startup, override changes done during runtime.
71
83
    </para>
72
84
    <para>
73
85
      The format starts with a <literal>[<replaceable>section
112
124
          <para>
113
125
            How long to wait for external approval before resorting to
114
126
            use the <option>approved_by_default</option> value.  The
115
 
            default is <quote>0s</quote>, i.e. not to wait.
 
127
            default is <quote>PT0S</quote>, i.e. not to wait.
116
128
          </para>
117
129
          <para>
118
130
            The format of <replaceable>TIME</replaceable> is the same
162
174
            This option is <emphasis>optional</emphasis>.
163
175
          </para>
164
176
          <para>
165
 
            This option allows you to override the default shell
166
 
            command that the server will use to check if the client is
167
 
            still up.  Any output of the command will be ignored, only
168
 
            the exit code is checked:  If the exit code of the command
169
 
            is zero, the client is considered up.  The command will be
170
 
            run using <quote><command><filename>/bin/sh</filename>
 
177
            This option overrides the default shell command that the
 
178
            server will use to check if the client is still up.  Any
 
179
            output of the command will be ignored, only the exit code
 
180
            is checked:  If the exit code of the command is zero, the
 
181
            client is considered up.  The command will be run using
 
182
            <quote><command><filename>/bin/sh</filename>
171
183
            <option>-c</option></command></quote>, so
172
184
            <varname>PATH</varname> will be searched.  The default
173
185
            value for the checker command is <quote><literal
174
186
            ><command>fping</command> <option>-q</option> <option
175
 
            >--</option> %%(host)s</literal></quote>.
 
187
            >--</option> %%(host)s</literal></quote>.  Note that
 
188
            <command>mandos-keygen</command>, when generating output
 
189
            to be inserted into this file, normally looks for an SSH
 
190
            server on the Mandos client, and, if it finds one, outputs
 
191
            a <option>checker</option> option to check for the
 
192
            client’s SSH key fingerprint – this is more secure against
 
193
            spoofing.
176
194
          </para>
177
195
          <para>
178
196
            In addition to normal start time expansion, this option
210
228
        ><replaceable>HEXSTRING</replaceable></option></term>
211
229
        <listitem>
212
230
          <para>
213
 
            This option is <emphasis>required</emphasis>.
214
 
          </para>
215
 
          <para>
216
 
            This option sets the OpenPGP fingerprint that identifies
217
 
            the public key that clients authenticate themselves with
218
 
            through TLS.  The string needs to be in hexidecimal form,
219
 
            but spaces or upper/lower case are not significant.
 
231
            This option is <emphasis>required</emphasis> if the
 
232
            <option>key_id</option> is not set, and
 
233
            <emphasis>optional</emphasis> otherwise.
 
234
          </para>
 
235
          <para>
 
236
            This option sets the OpenPGP fingerprint that (before
 
237
            GnuTLS 3.6.0) identified the public key that clients
 
238
            authenticate themselves with through TLS.  The string
 
239
            needs to be in hexadecimal form, but spaces or upper/lower
 
240
            case are not significant.
 
241
          </para>
 
242
        </listitem>
 
243
      </varlistentry>
 
244
      
 
245
      <varlistentry>
 
246
        <term><option>key_id<literal> = </literal
 
247
        ><replaceable>HEXSTRING</replaceable></option></term>
 
248
        <listitem>
 
249
          <para>
 
250
            This option is <emphasis>required</emphasis> if the
 
251
            <option>fingerprint</option> is not set, and
 
252
            <emphasis>optional</emphasis> otherwise.
 
253
          </para>
 
254
          <para>
 
255
            This option sets the certificate key ID that (with GnuTLS
 
256
            3.6.6 or later) identifies the public key that clients
 
257
            authenticate themselves with through TLS.  The string
 
258
            needs to be in hexadecimal form, but spaces or upper/lower
 
259
            case are not significant.
220
260
          </para>
221
261
        </listitem>
222
262
      </varlistentry>
297
337
          <para>
298
338
            If present, this option must be set to a string of
299
339
            base64-encoded binary data.  It will be decoded and sent
300
 
            to the client matching the above
301
 
            <option>fingerprint</option>.  This should, of course, be
302
 
            OpenPGP encrypted data, decryptable only by the client.
 
340
            to the client matching the above <option>key_id</option>
 
341
            or <option>fingerprint</option>.  This should, of course,
 
342
            be OpenPGP encrypted data, decryptable only by the client.
303
343
            The program <citerefentry><refentrytitle><command
304
344
            >mandos-keygen</command></refentrytitle><manvolnum
305
345
            >8</manvolnum></citerefentry> can, using its
330
370
            <option>extended_timeout</option> option.
331
371
          </para>
332
372
          <para>
333
 
            The <replaceable>TIME</replaceable> is specified as a
334
 
            space-separated number of values, each of which is a
335
 
            number and a one-character suffix.  The suffix must be one
336
 
            of <quote>d</quote>, <quote>s</quote>, <quote>m</quote>,
337
 
            <quote>h</quote>, and <quote>w</quote> for days, seconds,
338
 
            minutes, hours, and weeks, respectively.  The values are
339
 
            added together to give the total time value, so all of
340
 
            <quote><literal>330s</literal></quote>,
341
 
            <quote><literal>110s 110s 110s</literal></quote>, and
342
 
            <quote><literal>5m 30s</literal></quote> will give a value
343
 
            of five minutes and thirty seconds.
 
373
            The <replaceable>TIME</replaceable> is specified as an RFC
 
374
            3339 duration; for example
 
375
            <quote><literal>P1Y2M3DT4H5M6S</literal></quote> meaning
 
376
            one year, two months, three days, four hours, five
 
377
            minutes, and six seconds.  Some values can be omitted, see
 
378
            RFC 3339 Appendix A for details.
344
379
          </para>
345
380
        </listitem>
346
381
      </varlistentry>
404
439
        <quote><literal>approval_duration</literal></quote>,
405
440
        <quote><literal>created</literal></quote>,
406
441
        <quote><literal>enabled</literal></quote>,
 
442
        <quote><literal>expires</literal></quote>,
 
443
        <quote><literal>key_id</literal></quote>,
407
444
        <quote><literal>fingerprint</literal></quote>,
408
445
        <quote><literal>host</literal></quote>,
409
446
        <quote><literal>interval</literal></quote>,
452
489
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
453
490
      obscure.
454
491
    </para>
 
492
    <xi:include href="bugs.xml"/>
455
493
  </refsect1>
456
494
  
457
495
  <refsect1 id="example">
459
497
    <informalexample>
460
498
      <programlisting>
461
499
[DEFAULT]
462
 
timeout = 5m
463
 
interval = 2m
 
500
timeout = PT5M
 
501
interval = PT2M
464
502
checker = fping -q -- %%(host)s
465
503
 
466
504
# Client "foo"
467
505
[foo]
 
506
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
468
507
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
469
508
secret =
470
509
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
483
522
        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
484
523
        QlnHIvPzEArRQLo=
485
524
host = foo.example.org
486
 
interval = 1m
 
525
interval = PT1M
487
526
 
488
527
# Client "bar"
489
528
[bar]
 
529
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
490
530
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
491
531
secfile = /etc/mandos/bar-secret
492
 
timeout = 15m
 
532
timeout = PT15M
493
533
approved_by_default = False
494
 
approval_delay = 30s
 
534
approval_delay = PT30S
495
535
      </programlisting>
496
536
    </informalexample>
497
537
  </refsect1>
506
546
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>
507
547
      <manvolnum>5</manvolnum></citerefentry>,
508
548
      <citerefentry><refentrytitle>mandos</refentrytitle>
 
549
      <manvolnum>8</manvolnum></citerefentry>,
 
550
      <citerefentry><refentrytitle>fping</refentrytitle>
509
551
      <manvolnum>8</manvolnum></citerefentry>
510
552
    </para>
 
553
    <variablelist>
 
554
      <varlistentry>
 
555
        <term>
 
556
          RFC 3339: <citetitle>Date and Time on the Internet:
 
557
          Timestamps</citetitle>
 
558
        </term>
 
559
      <listitem>
 
560
        <para>
 
561
          The time intervals are in the "duration" format, as
 
562
          specified in ABNF in Appendix A of RFC 3339.
 
563
        </para>
 
564
      </listitem>
 
565
      </varlistentry>
 
566
    </variablelist>
511
567
  </refsect1>
512
568
</refentry>
513
569
<!-- Local Variables: -->