/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: 2014-07-25 23:16:04 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 "2014-06-22">
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>
47
40
      <holder>Teddy Hogeborn</holder>
48
41
      <holder>Björn Påhlsson</holder>
49
42
    </copyright>
187
180
            >--</option> %%(host)s</literal></quote>.  Note that
188
181
            <command>mandos-keygen</command>, when generating output
189
182
            to be inserted into this file, normally looks for an SSH
190
 
            server on the Mandos client, and, if it finds one, outputs
 
183
            server on the Mandos client, and, if it find one, outputs
191
184
            a <option>checker</option> option to check for the
192
 
            client’s SSH key fingerprint – this is more secure against
 
185
            client’s key fingerprint – this is more secure against
193
186
            spoofing.
194
187
          </para>
195
188
          <para>
233
226
          <para>
234
227
            This option sets the OpenPGP fingerprint that identifies
235
228
            the public key that clients authenticate themselves with
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,
 
229
            through TLS.  The string needs to be in hexidecimal form,
253
230
            but spaces or upper/lower case are not significant.
254
231
          </para>
255
232
        </listitem>
331
308
          <para>
332
309
            If present, this option must be set to a string of
333
310
            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.
 
311
            to the client matching the above
 
312
            <option>fingerprint</option>.  This should, of course, be
 
313
            OpenPGP encrypted data, decryptable only by the client.
337
314
            The program <citerefentry><refentrytitle><command
338
315
            >mandos-keygen</command></refentrytitle><manvolnum
339
316
            >8</manvolnum></citerefentry> can, using its
434
411
        <quote><literal>created</literal></quote>,
435
412
        <quote><literal>enabled</literal></quote>,
436
413
        <quote><literal>expires</literal></quote>,
437
 
        <quote><literal>key_id</literal></quote>,
438
414
        <quote><literal>fingerprint</literal></quote>,
439
415
        <quote><literal>host</literal></quote>,
440
416
        <quote><literal>interval</literal></quote>,
483
459
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
484
460
      obscure.
485
461
    </para>
486
 
    <xi:include href="bugs.xml"/>
487
462
  </refsect1>
488
463
  
489
464
  <refsect1 id="example">
497
472
 
498
473
# Client "foo"
499
474
[foo]
500
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
501
475
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
502
476
secret =
503
477
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
520
494
 
521
495
# Client "bar"
522
496
[bar]
523
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
524
497
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
525
498
secfile = /etc/mandos/bar-secret
526
499
timeout = PT15M