/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: 2019-09-01 04:27:59 UTC
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: teddy@recompile.se-20190901042759-dgadz8cg7x9y83ci
Fix minor Python 3 bytes/str mixups

* mandos (PGPEngine.__init__): Use byte string literals, not strings,
                               when working with byte strings.
  (main): When restoring persistent state from a file created by
          Python 2, also convert the "checker_command" setting from a
          byte string to a string, the same as "name" and "host".

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 "2015-07-20">
 
6
<!ENTITY TIMESTAMP "2019-02-10">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
40
40
      <year>2013</year>
41
41
      <year>2014</year>
42
42
      <year>2015</year>
 
43
      <year>2016</year>
 
44
      <year>2017</year>
 
45
      <year>2018</year>
 
46
      <year>2019</year>
43
47
      <holder>Teddy Hogeborn</holder>
44
48
      <holder>Björn Påhlsson</holder>
45
49
    </copyright>
183
187
            >--</option> %%(host)s</literal></quote>.  Note that
184
188
            <command>mandos-keygen</command>, when generating output
185
189
            to be inserted into this file, normally looks for an SSH
186
 
            server on the Mandos client, and, if it find one, outputs
 
190
            server on the Mandos client, and, if it finds one, outputs
187
191
            a <option>checker</option> option to check for the
188
 
            client’s key fingerprint – this is more secure against
 
192
            client’s SSH key fingerprint – this is more secure against
189
193
            spoofing.
190
194
          </para>
191
195
          <para>
229
233
          <para>
230
234
            This option sets the OpenPGP fingerprint that identifies
231
235
            the public key that clients authenticate themselves with
232
 
            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,
233
253
            but spaces or upper/lower case are not significant.
234
254
          </para>
235
255
        </listitem>
311
331
          <para>
312
332
            If present, this option must be set to a string of
313
333
            base64-encoded binary data.  It will be decoded and sent
314
 
            to the client matching the above
315
 
            <option>fingerprint</option>.  This should, of course, be
316
 
            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.
317
337
            The program <citerefentry><refentrytitle><command
318
338
            >mandos-keygen</command></refentrytitle><manvolnum
319
339
            >8</manvolnum></citerefentry> can, using its
414
434
        <quote><literal>created</literal></quote>,
415
435
        <quote><literal>enabled</literal></quote>,
416
436
        <quote><literal>expires</literal></quote>,
 
437
        <quote><literal>key_id</literal></quote>,
417
438
        <quote><literal>fingerprint</literal></quote>,
418
439
        <quote><literal>host</literal></quote>,
419
440
        <quote><literal>interval</literal></quote>,
462
483
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
463
484
      obscure.
464
485
    </para>
 
486
    <xi:include href="bugs.xml"/>
465
487
  </refsect1>
466
488
  
467
489
  <refsect1 id="example">
475
497
 
476
498
# Client "foo"
477
499
[foo]
 
500
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
478
501
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
479
502
secret =
480
503
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
497
520
 
498
521
# Client "bar"
499
522
[bar]
 
523
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
500
524
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
501
525
secfile = /etc/mandos/bar-secret
502
526
timeout = PT15M