/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-07-17 23:37:13 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190717233713-lwtm1x9mh9bm6zy9
mandos-keygen: Allow dashes at start of --passfile file names

Bug fix: Allow file names passed as the argument of the --passfile/-F
options to start with a dash (i.e. "-", a.k.a. 0x2D, the Unicode
HYPHEN-MINUS character).

* mandos-keygen (mode=password): Change "cat" to "cat --".

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 "2013-10-15">
 
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>
177
184
            <varname>PATH</varname> will be searched.  The default
178
185
            value for the checker command is <quote><literal
179
186
            ><command>fping</command> <option>-q</option> <option
180
 
            >--</option> %%(host)s</literal></quote>.
 
187
            >--</option> %%(host)s</literal></quote>.  Note that
 
188
            <command>mandos-keygen</command>, when generating output
 
189
            to be inserted into this file, normally looks for an SSH
 
190
            server on the Mandos client, and, if it finds one, outputs
 
191
            a <option>checker</option> option to check for the
 
192
            client’s SSH key fingerprint – this is more secure against
 
193
            spoofing.
181
194
          </para>
182
195
          <para>
183
196
            In addition to normal start time expansion, this option
220
233
          <para>
221
234
            This option sets the OpenPGP fingerprint that identifies
222
235
            the public key that clients authenticate themselves with
223
 
            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,
224
253
            but spaces or upper/lower case are not significant.
225
254
          </para>
226
255
        </listitem>
302
331
          <para>
303
332
            If present, this option must be set to a string of
304
333
            base64-encoded binary data.  It will be decoded and sent
305
 
            to the client matching the above
306
 
            <option>fingerprint</option>.  This should, of course, be
307
 
            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.
308
337
            The program <citerefentry><refentrytitle><command
309
338
            >mandos-keygen</command></refentrytitle><manvolnum
310
339
            >8</manvolnum></citerefentry> can, using its
405
434
        <quote><literal>created</literal></quote>,
406
435
        <quote><literal>enabled</literal></quote>,
407
436
        <quote><literal>expires</literal></quote>,
 
437
        <quote><literal>key_id</literal></quote>,
408
438
        <quote><literal>fingerprint</literal></quote>,
409
439
        <quote><literal>host</literal></quote>,
410
440
        <quote><literal>interval</literal></quote>,
453
483
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
454
484
      obscure.
455
485
    </para>
 
486
    <xi:include href="bugs.xml"/>
456
487
  </refsect1>
457
488
  
458
489
  <refsect1 id="example">
466
497
 
467
498
# Client "foo"
468
499
[foo]
 
500
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
469
501
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
470
502
secret =
471
503
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
488
520
 
489
521
# Client "bar"
490
522
[bar]
 
523
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
491
524
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
492
525
secfile = /etc/mandos/bar-secret
493
526
timeout = PT15M