/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: 2016-06-27 20:21:50 UTC
  • Revision ID: teddy@recompile.se-20160627202150-ml201ilxwjf1g29w
mandos-ctl: Implement --dump-json option

* mandos-ctl (main): Implement --dump-json option
* mandos-ctl.xml (NAME, DESCRIPTION): Change description to the more
                                      accurate "control or query".
  (SYNOPSIS): Add required group around action options and add new
              "--dump-json" option.
  (OPTIONS): Document new "--dump-json" option.

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 "2016-06-23">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
41
41
      <year>2014</year>
42
42
      <year>2015</year>
43
43
      <year>2016</year>
44
 
      <year>2017</year>
45
 
      <year>2018</year>
46
 
      <year>2019</year>
47
44
      <holder>Teddy Hogeborn</holder>
48
45
      <holder>Björn Påhlsson</holder>
49
46
    </copyright>
187
184
            >--</option> %%(host)s</literal></quote>.  Note that
188
185
            <command>mandos-keygen</command>, when generating output
189
186
            to be inserted into this file, normally looks for an SSH
190
 
            server on the Mandos client, and, if it finds one, outputs
 
187
            server on the Mandos client, and, if it find one, outputs
191
188
            a <option>checker</option> option to check for the
192
 
            client’s SSH key fingerprint – this is more secure against
 
189
            client’s key fingerprint – this is more secure against
193
190
            spoofing.
194
191
          </para>
195
192
          <para>
240
237
      </varlistentry>
241
238
      
242
239
      <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,
253
 
            but spaces or upper/lower case are not significant.
254
 
          </para>
255
 
        </listitem>
256
 
      </varlistentry>
257
 
      
258
 
      <varlistentry>
259
240
        <term><option><literal>host = </literal><replaceable
260
241
        >STRING</replaceable></option></term>
261
242
        <listitem>
331
312
          <para>
332
313
            If present, this option must be set to a string of
333
314
            base64-encoded binary data.  It will be decoded and sent
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.
 
315
            to the client matching the above
 
316
            <option>fingerprint</option>.  This should, of course, be
 
317
            OpenPGP encrypted data, decryptable only by the client.
337
318
            The program <citerefentry><refentrytitle><command
338
319
            >mandos-keygen</command></refentrytitle><manvolnum
339
320
            >8</manvolnum></citerefentry> can, using its
434
415
        <quote><literal>created</literal></quote>,
435
416
        <quote><literal>enabled</literal></quote>,
436
417
        <quote><literal>expires</literal></quote>,
437
 
        <quote><literal>key_id</literal></quote>,
438
418
        <quote><literal>fingerprint</literal></quote>,
439
419
        <quote><literal>host</literal></quote>,
440
420
        <quote><literal>interval</literal></quote>,
497
477
 
498
478
# Client "foo"
499
479
[foo]
500
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
501
480
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
502
481
secret =
503
482
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
520
499
 
521
500
# Client "bar"
522
501
[bar]
523
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
524
502
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
525
503
secfile = /etc/mandos/bar-secret
526
504
timeout = PT15M