/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-02-10 03:54:09 UTC
  • Revision ID: teddy@recompile.se-20190210035409-l2mqp2ftzkggwybz
Do minor fix to make mandos-monitor work with new python-urwid

* mandos-monitor (UserInterface.log): Initialize to an
                                      urwid.SimpleListWalker([]), not
                                      an empty list.
  (UserInterface.log_message_raw): Fix off-by-one error.

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