/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: 2018-02-06 19:49:19 UTC
  • Revision ID: teddy@recompile.se-20180206194919-rfmlt49naz5jnpfx
Fix Python 3 issue

* (mandos/MandosServer.handle_ipc): Decode bytes into string.

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 "2019-02-10">
 
6
<!ENTITY TIMESTAMP "2017-02-23">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
42
42
      <year>2015</year>
43
43
      <year>2016</year>
44
44
      <year>2017</year>
45
 
      <year>2018</year>
46
 
      <year>2019</year>
47
45
      <holder>Teddy Hogeborn</holder>
48
46
      <holder>Björn Påhlsson</holder>
49
47
    </copyright>
187
185
            >--</option> %%(host)s</literal></quote>.  Note that
188
186
            <command>mandos-keygen</command>, when generating output
189
187
            to be inserted into this file, normally looks for an SSH
190
 
            server on the Mandos client, and, if it finds one, outputs
 
188
            server on the Mandos client, and, if it find one, outputs
191
189
            a <option>checker</option> option to check for the
192
 
            client’s SSH key fingerprint – this is more secure against
 
190
            client’s key fingerprint – this is more secure against
193
191
            spoofing.
194
192
          </para>
195
193
          <para>
228
226
        ><replaceable>HEXSTRING</replaceable></option></term>
229
227
        <listitem>
230
228
          <para>
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.
 
229
            This option is <emphasis>required</emphasis>.
 
230
          </para>
 
231
          <para>
 
232
            This option sets the OpenPGP fingerprint that identifies
 
233
            the public key that clients authenticate themselves with
 
234
            through TLS.  The string needs to be in hexadecimal form,
 
235
            but spaces or upper/lower case are not significant.
260
236
          </para>
261
237
        </listitem>
262
238
      </varlistentry>
337
313
          <para>
338
314
            If present, this option must be set to a string of
339
315
            base64-encoded binary data.  It will be decoded and sent
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.
 
316
            to the client matching the above
 
317
            <option>fingerprint</option>.  This should, of course, be
 
318
            OpenPGP encrypted data, decryptable only by the client.
343
319
            The program <citerefentry><refentrytitle><command
344
320
            >mandos-keygen</command></refentrytitle><manvolnum
345
321
            >8</manvolnum></citerefentry> can, using its
440
416
        <quote><literal>created</literal></quote>,
441
417
        <quote><literal>enabled</literal></quote>,
442
418
        <quote><literal>expires</literal></quote>,
443
 
        <quote><literal>key_id</literal></quote>,
444
419
        <quote><literal>fingerprint</literal></quote>,
445
420
        <quote><literal>host</literal></quote>,
446
421
        <quote><literal>interval</literal></quote>,
503
478
 
504
479
# Client "foo"
505
480
[foo]
506
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
507
481
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
508
482
secret =
509
483
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
526
500
 
527
501
# Client "bar"
528
502
[bar]
529
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
530
503
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
531
504
secfile = /etc/mandos/bar-secret
532
505
timeout = PT15M