/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: 2016-03-13 00:37:02 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 339.
  • Revision ID: teddy@recompile.se-20160313003702-dulwtwt8ilpojra9
Server: Fix bug where it did not exit timely on signals

Use GLib.unix_signal_add() instead of signal.signal() to catch
signals; this will allow GLib to do its internal magic with signal
file descriptors.  (GLib does not handle signals properly otherwise.)
The function unix_signal_add() requires GLib 2.30 or later, which was
not required by PyGobject until version 3.7.1, so depend on this.

* INSTALL (Mandos Server): Document dependency on PyGObject 3.7.1
* mandos (main): Use GLib.unix_signal_add instead of signal.signal.
* init.d-mandos (do_stop): Remove workaround.
* mandos.service ([Service]): - '' -

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 "2012-01-01">
 
6
<!ENTITY TIMESTAMP "2016-03-05">
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>
40
44
      <holder>Teddy Hogeborn</holder>
41
45
      <holder>Björn Påhlsson</holder>
42
46
    </copyright>
66
70
      ><refentrytitle>mandos</refentrytitle>
67
71
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
68
72
      The file needs to list all clients that should be able to use
69
 
      the service.  All clients listed will be regarded as enabled,
70
 
      even if a client was disabled in a previous run of the server.
 
73
      the service.  The settings in this file can be overridden by
 
74
      runtime changes to the server, which it saves across restarts.
 
75
      (See the section called <quote>PERSISTENT STATE</quote> in
 
76
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
 
77
      >8</manvolnum></citerefentry>.)  However, any <emphasis
 
78
      >changes</emphasis> to this file (including adding and removing
 
79
      clients) will, at startup, override changes done during runtime.
71
80
    </para>
72
81
    <para>
73
82
      The format starts with a <literal>[<replaceable>section
112
121
          <para>
113
122
            How long to wait for external approval before resorting to
114
123
            use the <option>approved_by_default</option> value.  The
115
 
            default is <quote>0s</quote>, i.e. not to wait.
 
124
            default is <quote>PT0S</quote>, i.e. not to wait.
116
125
          </para>
117
126
          <para>
118
127
            The format of <replaceable>TIME</replaceable> is the same
162
171
            This option is <emphasis>optional</emphasis>.
163
172
          </para>
164
173
          <para>
165
 
            This option allows you to override the default shell
166
 
            command that the server will use to check if the client is
167
 
            still up.  Any output of the command will be ignored, only
168
 
            the exit code is checked:  If the exit code of the command
169
 
            is zero, the client is considered up.  The command will be
170
 
            run using <quote><command><filename>/bin/sh</filename>
 
174
            This option overrides the default shell command that the
 
175
            server will use to check if the client is still up.  Any
 
176
            output of the command will be ignored, only the exit code
 
177
            is checked:  If the exit code of the command is zero, the
 
178
            client is considered up.  The command will be run using
 
179
            <quote><command><filename>/bin/sh</filename>
171
180
            <option>-c</option></command></quote>, so
172
181
            <varname>PATH</varname> will be searched.  The default
173
182
            value for the checker command is <quote><literal
174
183
            ><command>fping</command> <option>-q</option> <option
175
 
            >--</option> %%(host)s</literal></quote>.
 
184
            >--</option> %%(host)s</literal></quote>.  Note that
 
185
            <command>mandos-keygen</command>, when generating output
 
186
            to be inserted into this file, normally looks for an SSH
 
187
            server on the Mandos client, and, if it find one, outputs
 
188
            a <option>checker</option> option to check for the
 
189
            client’s key fingerprint – this is more secure against
 
190
            spoofing.
176
191
          </para>
177
192
          <para>
178
193
            In addition to normal start time expansion, this option
330
345
            <option>extended_timeout</option> option.
331
346
          </para>
332
347
          <para>
333
 
            The <replaceable>TIME</replaceable> is specified as a
334
 
            space-separated number of values, each of which is a
335
 
            number and a one-character suffix.  The suffix must be one
336
 
            of <quote>d</quote>, <quote>s</quote>, <quote>m</quote>,
337
 
            <quote>h</quote>, and <quote>w</quote> for days, seconds,
338
 
            minutes, hours, and weeks, respectively.  The values are
339
 
            added together to give the total time value, so all of
340
 
            <quote><literal>330s</literal></quote>,
341
 
            <quote><literal>110s 110s 110s</literal></quote>, and
342
 
            <quote><literal>5m 30s</literal></quote> will give a value
343
 
            of five minutes and thirty seconds.
 
348
            The <replaceable>TIME</replaceable> is specified as an RFC
 
349
            3339 duration; for example
 
350
            <quote><literal>P1Y2M3DT4H5M6S</literal></quote> meaning
 
351
            one year, two months, three days, four hours, five
 
352
            minutes, and six seconds.  Some values can be omitted, see
 
353
            RFC 3339 Appendix A for details.
344
354
          </para>
345
355
        </listitem>
346
356
      </varlistentry>
404
414
        <quote><literal>approval_duration</literal></quote>,
405
415
        <quote><literal>created</literal></quote>,
406
416
        <quote><literal>enabled</literal></quote>,
 
417
        <quote><literal>expires</literal></quote>,
407
418
        <quote><literal>fingerprint</literal></quote>,
408
419
        <quote><literal>host</literal></quote>,
409
420
        <quote><literal>interval</literal></quote>,
452
463
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
453
464
      obscure.
454
465
    </para>
 
466
    <xi:include href="bugs.xml"/>
455
467
  </refsect1>
456
468
  
457
469
  <refsect1 id="example">
459
471
    <informalexample>
460
472
      <programlisting>
461
473
[DEFAULT]
462
 
timeout = 5m
463
 
interval = 2m
 
474
timeout = PT5M
 
475
interval = PT2M
464
476
checker = fping -q -- %%(host)s
465
477
 
466
478
# Client "foo"
483
495
        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
484
496
        QlnHIvPzEArRQLo=
485
497
host = foo.example.org
486
 
interval = 1m
 
498
interval = PT1M
487
499
 
488
500
# Client "bar"
489
501
[bar]
490
502
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
491
503
secfile = /etc/mandos/bar-secret
492
 
timeout = 15m
 
504
timeout = PT15M
493
505
approved_by_default = False
494
 
approval_delay = 30s
 
506
approval_delay = PT30S
495
507
      </programlisting>
496
508
    </informalexample>
497
509
  </refsect1>
506
518
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>
507
519
      <manvolnum>5</manvolnum></citerefentry>,
508
520
      <citerefentry><refentrytitle>mandos</refentrytitle>
 
521
      <manvolnum>8</manvolnum></citerefentry>,
 
522
      <citerefentry><refentrytitle>fping</refentrytitle>
509
523
      <manvolnum>8</manvolnum></citerefentry>
510
524
    </para>
 
525
    <variablelist>
 
526
      <varlistentry>
 
527
        <term>
 
528
          RFC 3339: <citetitle>Date and Time on the Internet:
 
529
          Timestamps</citetitle>
 
530
        </term>
 
531
      <listitem>
 
532
        <para>
 
533
          The time intervals are in the "duration" format, as
 
534
          specified in ABNF in Appendix A of RFC 3339.
 
535
        </para>
 
536
      </listitem>
 
537
      </varlistentry>
 
538
    </variablelist>
511
539
  </refsect1>
512
540
</refentry>
513
541
<!-- Local Variables: -->