/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-ctl.xml

  • Committer: Teddy Hogeborn
  • Date: 2015-05-23 20:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 756.
  • Revision ID: teddy@recompile.se-20150523201834-e89ex4ito93yni8x
mandos: Use multiprocessing module to run checkers.

For a long time, the Mandos server has occasionally logged the message
"ERROR: Child process vanished".  This was never a fatal error, but it
has been annoying and slightly worrying, since a definite cause was
not found.  One potential cause could be the "multiprocessing" and
"subprocess" modules conflicting w.r.t. SIGCHLD.  To avoid this,
change the running of checkers from using subprocess.Popen
asynchronously to instead first create a multiprocessing.Process()
(which is asynchronous) calling a function, and have that function
then call subprocess.call() (which is synchronous).  In this way, the
only thing using any asynchronous subprocesses is the multiprocessing
module.

This makes it necessary to change one small thing in the D-Bus API,
since the subprocesses.call() function does not expose the raw wait(2)
status value.

DBUS-API (CheckerCompleted): Change the second value provided by this
                             D-Bus signal from the raw wait(2) status
                             to the actual terminating signal number.
mandos (subprocess_call_pipe): New function to be called by
                               multiprocessing.Process (starting a
                               separate process).
(Client.last_checker signal): New attribute for signal which
                              terminated last checker.  Like
                              last_checker_status, only not accessible
                              via D-Bus.
(Client.checker_callback): Take new "connection" argument and use it
                           to get returncode; set last_checker_signal.
                           Return False so gobject does not call this
                           callback again.
(Client.start_checker): Start checker using a multiprocessing.Process
                        instead of a subprocess.Popen.
(ClientDBus.checker_callback): Take new "connection" argument.        Call
                               Client.checker_callback early to have
                               it set last_checker_status and
                               last_checker_signal; use those.  Change
                               second value provided to D-Bus signal
                               CheckerCompleted to use
                               last_checker_signal if checker was
                               terminated by signal.
mandos-monitor: Update to reflect DBus API change.
(MandosClientWidget.checker_completed): Take "signal" instead of
                                        "condition" argument.  Use it
                                        accordingly.  Remove dead code
                                        (os.WCOREDUMP case).

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos-ctl">
5
 
<!ENTITY TIMESTAMP "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2012-06-22">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
34
34
      <year>2010</year>
35
35
      <year>2011</year>
36
36
      <year>2012</year>
37
 
      <year>2013</year>
38
 
      <year>2014</year>
39
 
      <year>2015</year>
40
 
      <year>2016</year>
41
 
      <year>2017</year>
42
37
      <holder>Teddy Hogeborn</holder>
43
38
      <holder>Björn Påhlsson</holder>
44
39
    </copyright>
53
48
  <refnamediv>
54
49
    <refname><command>&COMMANDNAME;</command></refname>
55
50
    <refpurpose>
56
 
      Control or query the operation of the Mandos server
 
51
      Control the operation of the Mandos server
57
52
    </refpurpose>
58
53
  </refnamediv>
59
54
  
60
55
  <refsynopsisdiv>
61
56
    <cmdsynopsis>
62
57
      <command>&COMMANDNAME;</command>
63
 
      <group choice="req">
64
 
        <group>
65
 
          <arg choice="plain"><option>--enable</option></arg>
66
 
          <arg choice="plain"><option>-e</option></arg>
67
 
          <sbr/>
68
 
          <arg choice="plain"><option>--disable</option></arg>
69
 
          <arg choice="plain"><option>-d</option></arg>
70
 
        </group>
71
 
        <sbr/>
72
 
        <group>
73
 
          <arg choice="plain"><option>--bump-timeout</option></arg>
74
 
          <arg choice="plain"><option>-b</option></arg>
75
 
        </group>
76
 
        <sbr/>
77
 
        <group>
78
 
          <arg choice="plain"><option>--start-checker</option></arg>
79
 
        </group>
80
 
        <sbr/>
81
 
        <group>
82
 
          <arg choice="plain"><option>--stop-checker</option></arg>
83
 
        </group>
84
 
        <sbr/>
85
 
        <group>
86
 
          <arg choice="plain"><option>--remove</option></arg>
87
 
          <arg choice="plain"><option>-r</option></arg>
88
 
        </group>
89
 
        <sbr/>
90
 
        <group>
91
 
          <arg choice="plain"><option>--checker
92
 
          <replaceable>COMMAND</replaceable></option></arg>
93
 
          <arg choice="plain"><option>-c
94
 
          <replaceable>COMMAND</replaceable></option></arg>
95
 
        </group>
96
 
        <sbr/>
97
 
        <group>
98
 
          <arg choice="plain"><option>--timeout
99
 
          <replaceable>TIME</replaceable></option></arg>
100
 
          <arg choice="plain"><option>-t
101
 
          <replaceable>TIME</replaceable></option></arg>
102
 
        </group>
103
 
        <sbr/>
104
 
        <group>
105
 
          <arg choice="plain"><option>--extended-timeout
106
 
          <replaceable>TIME</replaceable></option></arg>
107
 
        </group>
108
 
        <sbr/>
109
 
        <group>
110
 
          <arg choice="plain"><option>--interval
111
 
          <replaceable>TIME</replaceable></option></arg>
112
 
          <arg choice="plain"><option>-i
113
 
          <replaceable>TIME</replaceable></option></arg>
114
 
        </group>
115
 
        <sbr/>
116
 
        <group>
117
 
          <arg choice="plain"><option>--approve-by-default</option
118
 
          ></arg>
119
 
          <sbr/>
120
 
          <arg choice="plain"><option>--deny-by-default</option></arg>
121
 
        </group>
122
 
        <sbr/>
123
 
        <group>
124
 
          <arg choice="plain"><option>--approval-delay
125
 
          <replaceable>TIME</replaceable></option></arg>
126
 
        </group>
127
 
        <sbr/>
128
 
        <group>
129
 
          <arg choice="plain"><option>--approval-duration
130
 
          <replaceable>TIME</replaceable></option></arg>
131
 
        </group>
132
 
        <sbr/>
133
 
        <group>
134
 
          <arg choice="plain"><option>--interval
135
 
          <replaceable>TIME</replaceable></option></arg>
136
 
          <arg choice="plain"><option>-i
137
 
          <replaceable>TIME</replaceable></option></arg>
138
 
        </group>
139
 
        <sbr/>
140
 
        <group>
141
 
          <arg choice="plain"><option>--host
142
 
          <replaceable>STRING</replaceable></option></arg>
143
 
          <arg choice="plain"><option>-H
144
 
          <replaceable>STRING</replaceable></option></arg>
145
 
        </group>
146
 
        <sbr/>
147
 
        <group>
148
 
          <arg choice="plain"><option>--secret
149
 
          <replaceable>FILENAME</replaceable></option></arg>
150
 
          <arg choice="plain"><option>-s
151
 
          <replaceable>FILENAME</replaceable></option></arg>
152
 
        </group>
153
 
        <sbr/>
154
 
        <group>
155
 
          <arg choice="plain"><option>--approve</option></arg>
156
 
          <arg choice="plain"><option>-A</option></arg>
157
 
          <sbr/>
158
 
          <arg choice="plain"><option>--deny</option></arg>
159
 
          <arg choice="plain"><option>-D</option></arg>
160
 
        </group>
 
58
      <group>
 
59
        <arg choice="plain"><option>--enable</option></arg>
 
60
        <arg choice="plain"><option>-e</option></arg>
 
61
        <sbr/>
 
62
        <arg choice="plain"><option>--disable</option></arg>
 
63
        <arg choice="plain"><option>-d</option></arg>
 
64
      </group>
 
65
      <sbr/>
 
66
      <group>
 
67
        <arg choice="plain"><option>--bump-timeout</option></arg>
 
68
        <arg choice="plain"><option>-b</option></arg>
 
69
      </group>
 
70
      <sbr/>
 
71
      <group>
 
72
        <arg choice="plain"><option>--start-checker</option></arg>
 
73
      </group>
 
74
      <sbr/>
 
75
      <group>
 
76
        <arg choice="plain"><option>--stop-checker</option></arg>
 
77
      </group>
 
78
      <sbr/>
 
79
      <group>
 
80
        <arg choice="plain"><option>--remove</option></arg>
 
81
        <arg choice="plain"><option>-r</option></arg>
 
82
      </group>
 
83
      <sbr/>
 
84
      <group>
 
85
        <arg choice="plain"><option>--checker
 
86
        <replaceable>COMMAND</replaceable></option></arg>
 
87
        <arg choice="plain"><option>-c
 
88
        <replaceable>COMMAND</replaceable></option></arg>
 
89
      </group>
 
90
      <sbr/>
 
91
      <group>
 
92
        <arg choice="plain"><option>--timeout
 
93
        <replaceable>TIME</replaceable></option></arg>
 
94
        <arg choice="plain"><option>-t
 
95
        <replaceable>TIME</replaceable></option></arg>
 
96
      </group>
 
97
      <sbr/>
 
98
      <group>
 
99
        <arg choice="plain"><option>--extended-timeout
 
100
        <replaceable>TIME</replaceable></option></arg>
 
101
      </group>
 
102
      <sbr/>
 
103
      <group>
 
104
        <arg choice="plain"><option>--interval
 
105
        <replaceable>TIME</replaceable></option></arg>
 
106
        <arg choice="plain"><option>-i
 
107
        <replaceable>TIME</replaceable></option></arg>
 
108
      </group>
 
109
      <sbr/>
 
110
      <group>
 
111
        <arg choice="plain"><option>--approve-by-default</option
 
112
        ></arg>
 
113
        <sbr/>
 
114
        <arg choice="plain"><option>--deny-by-default</option></arg>
 
115
      </group>
 
116
      <sbr/>
 
117
      <group>
 
118
        <arg choice="plain"><option>--approval-delay
 
119
        <replaceable>TIME</replaceable></option></arg>
 
120
      </group>
 
121
      <sbr/>
 
122
      <group>
 
123
        <arg choice="plain"><option>--approval-duration
 
124
        <replaceable>TIME</replaceable></option></arg>
 
125
      </group>
 
126
      <sbr/>
 
127
      <group>
 
128
        <arg choice="plain"><option>--interval
 
129
        <replaceable>TIME</replaceable></option></arg>
 
130
        <arg choice="plain"><option>-i
 
131
        <replaceable>TIME</replaceable></option></arg>
 
132
      </group>
 
133
      <sbr/>
 
134
      <group>
 
135
        <arg choice="plain"><option>--host
 
136
        <replaceable>STRING</replaceable></option></arg>
 
137
        <arg choice="plain"><option>-H
 
138
        <replaceable>STRING</replaceable></option></arg>
 
139
      </group>
 
140
      <sbr/>
 
141
      <group>
 
142
        <arg choice="plain"><option>--secret
 
143
        <replaceable>FILENAME</replaceable></option></arg>
 
144
        <arg choice="plain"><option>-s
 
145
        <replaceable>FILENAME</replaceable></option></arg>
 
146
      </group>
 
147
      <sbr/>
 
148
      <group>
 
149
        <arg choice="plain"><option>--approve</option></arg>
 
150
        <arg choice="plain"><option>-A</option></arg>
 
151
        <sbr/>
 
152
        <arg choice="plain"><option>--deny</option></arg>
 
153
        <arg choice="plain"><option>-D</option></arg>
161
154
      </group>
162
155
      <sbr/>
163
156
      <group choice="req">
171
164
    <cmdsynopsis>
172
165
      <command>&COMMANDNAME;</command>
173
166
      <group>
174
 
          <arg choice="plain"><option>--verbose</option></arg>
175
 
          <arg choice="plain"><option>-v</option></arg>
176
 
          <sbr/>
177
 
          <arg choice="plain"><option>--dump-json</option></arg>
178
 
          <arg choice="plain"><option>-j</option></arg>
 
167
        <arg choice="plain"><option>--verbose</option></arg>
 
168
        <arg choice="plain"><option>-v</option></arg>
179
169
      </group>
180
170
      <group>
181
171
        <arg rep='repeat' choice='plain'>
214
204
  <refsect1 id="description">
215
205
    <title>DESCRIPTION</title>
216
206
    <para>
217
 
      <command>&COMMANDNAME;</command> is a program to control or
218
 
      query the operation of the Mandos server
219
 
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
220
 
      >8</manvolnum></citerefentry>.
 
207
      <command>&COMMANDNAME;</command> is a program to control the
 
208
      operation of the Mandos server <citerefentry><refentrytitle
 
209
      >mandos</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
221
210
    </para>
222
211
    <para>
223
212
      This program can be used to change client settings, approve or
481
470
      </varlistentry>
482
471
      
483
472
      <varlistentry>
484
 
        <term><option>--dump-json</option></term>
485
 
        <term><option>-j</option></term>
486
 
        <listitem>
487
 
          <para>
488
 
            Dump client settings as JSON to standard output.
489
 
          </para>
490
 
        </listitem>
491
 
      </varlistentry>
492
 
      
493
 
      <varlistentry>
494
473
        <term><option>--is-enabled</option></term>
495
474
        <term><option>-V</option></term>
496
475
        <listitem>
531
510
    </para>
532
511
  </refsect1>
533
512
  
534
 
  <refsect1 id="bugs">
535
 
    <title>BUGS</title>
536
 
    <xi:include href="bugs.xml"/>
537
 
  </refsect1>
 
513
<!--   <refsect1 id="bugs"> -->
 
514
<!--     <title>BUGS</title> -->
 
515
<!--     <para> -->
 
516
<!--     </para> -->
 
517
<!--   </refsect1> -->
538
518
  
539
519
  <refsect1 id="example">
540
520
    <title>EXAMPLE</title>