/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: 2019-09-03 18:43:11 UTC
  • Revision ID: teddy@recompile.se-20190903184311-zr795sh32mmq2drk
mandos: Only join() still running checker processes

* mandos (Client.checker_callback): Only do .join() on checker if it
                                    is not None.

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 "2014-06-22">
 
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>
180
187
            >--</option> %%(host)s</literal></quote>.  Note that
181
188
            <command>mandos-keygen</command>, when generating output
182
189
            to be inserted into this file, normally looks for an SSH
183
 
            server on the Mandos client, and, if it find one, outputs
 
190
            server on the Mandos client, and, if it finds one, outputs
184
191
            a <option>checker</option> option to check for the
185
 
            client’s key fingerprint – this is more secure against
 
192
            client’s SSH key fingerprint – this is more secure against
186
193
            spoofing.
187
194
          </para>
188
195
          <para>
226
233
          <para>
227
234
            This option sets the OpenPGP fingerprint that identifies
228
235
            the public key that clients authenticate themselves with
229
 
            through TLS.  The string needs to be in hexidecimal form,
 
236
            through TLS.  The string needs to be in hexadecimal form,
 
237
            but spaces or upper/lower case are not significant.
 
238
          </para>
 
239
        </listitem>
 
240
      </varlistentry>
 
241
      
 
242
      <varlistentry>
 
243
        <term><option>key_id<literal> = </literal
 
244
        ><replaceable>HEXSTRING</replaceable></option></term>
 
245
        <listitem>
 
246
          <para>
 
247
            This option is <emphasis>optional</emphasis>.
 
248
          </para>
 
249
          <para>
 
250
            This option sets the certificate key ID that identifies
 
251
            the public key that clients authenticate themselves with
 
252
            through TLS.  The string needs to be in hexadecimal form,
230
253
            but spaces or upper/lower case are not significant.
231
254
          </para>
232
255
        </listitem>
308
331
          <para>
309
332
            If present, this option must be set to a string of
310
333
            base64-encoded binary data.  It will be decoded and sent
311
 
            to the client matching the above
312
 
            <option>fingerprint</option>.  This should, of course, be
313
 
            OpenPGP encrypted data, decryptable only by the client.
 
334
            to the client matching the above <option>key_id</option>
 
335
            or <option>fingerprint</option>.  This should, of course,
 
336
            be OpenPGP encrypted data, decryptable only by the client.
314
337
            The program <citerefentry><refentrytitle><command
315
338
            >mandos-keygen</command></refentrytitle><manvolnum
316
339
            >8</manvolnum></citerefentry> can, using its
411
434
        <quote><literal>created</literal></quote>,
412
435
        <quote><literal>enabled</literal></quote>,
413
436
        <quote><literal>expires</literal></quote>,
 
437
        <quote><literal>key_id</literal></quote>,
414
438
        <quote><literal>fingerprint</literal></quote>,
415
439
        <quote><literal>host</literal></quote>,
416
440
        <quote><literal>interval</literal></quote>,
459
483
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
460
484
      obscure.
461
485
    </para>
 
486
    <xi:include href="bugs.xml"/>
462
487
  </refsect1>
463
488
  
464
489
  <refsect1 id="example">
472
497
 
473
498
# Client "foo"
474
499
[foo]
 
500
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
475
501
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
476
502
secret =
477
503
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
494
520
 
495
521
# Client "bar"
496
522
[bar]
 
523
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
497
524
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
498
525
secfile = /etc/mandos/bar-secret
499
526
timeout = PT15M