/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-09">
 
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
45
      <holder>Teddy Hogeborn</holder>
47
46
      <holder>Björn Påhlsson</holder>
48
47
    </copyright>
186
185
            >--</option> %%(host)s</literal></quote>.  Note that
187
186
            <command>mandos-keygen</command>, when generating output
188
187
            to be inserted into this file, normally looks for an SSH
189
 
            server on the Mandos client, and, if it finds one, outputs
 
188
            server on the Mandos client, and, if it find one, outputs
190
189
            a <option>checker</option> option to check for the
191
 
            client’s SSH key fingerprint – this is more secure against
 
190
            client’s key fingerprint – this is more secure against
192
191
            spoofing.
193
192
          </para>
194
193
          <para>
239
238
      </varlistentry>
240
239
      
241
240
      <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,
252
 
            but spaces or upper/lower case are not significant.
253
 
          </para>
254
 
        </listitem>
255
 
      </varlistentry>
256
 
      
257
 
      <varlistentry>
258
241
        <term><option><literal>host = </literal><replaceable
259
242
        >STRING</replaceable></option></term>
260
243
        <listitem>
330
313
          <para>
331
314
            If present, this option must be set to a string of
332
315
            base64-encoded binary data.  It will be decoded and sent
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.
 
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.
336
319
            The program <citerefentry><refentrytitle><command
337
320
            >mandos-keygen</command></refentrytitle><manvolnum
338
321
            >8</manvolnum></citerefentry> can, using its
433
416
        <quote><literal>created</literal></quote>,
434
417
        <quote><literal>enabled</literal></quote>,
435
418
        <quote><literal>expires</literal></quote>,
436
 
        <quote><literal>key_id</literal></quote>,
437
419
        <quote><literal>fingerprint</literal></quote>,
438
420
        <quote><literal>host</literal></quote>,
439
421
        <quote><literal>interval</literal></quote>,
496
478
 
497
479
# Client "foo"
498
480
[foo]
499
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
500
481
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
501
482
secret =
502
483
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
519
500
 
520
501
# Client "bar"
521
502
[bar]
522
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
523
503
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
524
504
secfile = /etc/mandos/bar-secret
525
505
timeout = PT15M