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

  • Committer: Teddy Hogeborn
  • Date: 2015-08-10 09:00:23 UTC
  • Revision ID: teddy@recompile.se-20150810090023-fz6vjqr7zf33e2tf
Support the standard org.freedesktop.DBus.ObjectManager interface.

Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods.  This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".

* DBUS-API: Removed references to deprecated methods and signals;
  insert reference to the org.freedesktop.DBus.ObjectManager
  interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
  (dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
  (DBusObjectWithObjectManager): New.
  (main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
  (main/MandosDBusService.ClientRemoved): Annotate as deprecated.
  (main/MandosDBusService.GetAllClients): - '' -
  (main/MandosDBusService.GetAllClientsWithProperties): Annotate as
                                                        deprecated.
                                                        Also only
                                                        return
                                                        properties on
                                                        client
                                                        interface.
  (main/MandosDBusService.RemoveClient): Call client_removed_signal
                                         instead of ClientRemoved.
  (main/MandosDBusService.GetManagedObjects): New.
  (main/MandosDBusService.client_added_signal): New.
  (main/MandosDBusService.client_removed_signal): - '' -
  (main/cleanup): Call "client_removed_signal" instead of sending
                  "ClientRemoved" signal directly.
  (main): Call "client_added_signal" instead of sending "ClientAdded"
          signal directly.
* mandos-ctl: Use GetManagedObjects instead of
              GetAllClientsWithProperties.  Also, show better error
              message in case of failure to connect to the D-Bus

* mandos-monitor (MandosClientPropertyCache.properties_changed):
  Bug fix; only update properties on client interface.
  (UserInterface.find_and_remove_client): Change to accept arguments
                                          from InterfacesRemoved
                                          signal.  Also, bug fix:
                                          working error message when
                                          removing unknown client.
  (UserInterface.add_new_client): Change to accept arguments from
                                  InterfacesRemoved signal.  Pass
                                  properties to MandosClientWidget
                                  constructor.
  (UserInterface.run): Connect find_and_remove_client method to
                       InterfacesRemoved signal and the add_new_client
                       method to the InterfacesAdded signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
1
 
<?xml version='1.0' encoding='UTF-8'?>
 
1
<?xml version="1.0" encoding="UTF-8"?>
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
 
<!ENTITY VERSION "1.0">
5
4
<!ENTITY CONFNAME "mandos.conf">
6
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
 
6
<!ENTITY TIMESTAMP "2015-07-20">
 
7
<!ENTITY % common SYSTEM "common.ent">
 
8
%common;
7
9
]>
8
10
 
9
11
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
10
12
  <refentryinfo>
11
 
    <title>&CONFNAME;</title>
 
13
    <title>Mandos Manual</title>
12
14
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
13
 
    <productname>&CONFNAME;</productname>
14
 
    <productnumber>&VERSION;</productnumber>
 
15
    <productname>Mandos</productname>
 
16
    <productnumber>&version;</productnumber>
 
17
    <date>&TIMESTAMP;</date>
15
18
    <authorgroup>
16
19
      <author>
17
20
        <firstname>Björn</firstname>
18
21
        <surname>Påhlsson</surname>
19
22
        <address>
20
 
          <email>belorn@fukt.bsnet.se</email>
 
23
          <email>belorn@recompile.se</email>
21
24
        </address>
22
25
      </author>
23
26
      <author>
24
27
        <firstname>Teddy</firstname>
25
28
        <surname>Hogeborn</surname>
26
29
        <address>
27
 
          <email>teddy@fukt.bsnet.se</email>
 
30
          <email>teddy@recompile.se</email>
28
31
        </address>
29
32
      </author>
30
33
    </authorgroup>
31
34
    <copyright>
32
35
      <year>2008</year>
 
36
      <year>2009</year>
 
37
      <year>2010</year>
 
38
      <year>2011</year>
 
39
      <year>2012</year>
 
40
      <year>2013</year>
 
41
      <year>2014</year>
 
42
      <year>2015</year>
33
43
      <holder>Teddy Hogeborn</holder>
34
44
      <holder>Björn Påhlsson</holder>
35
45
    </copyright>
36
 
    <legalnotice>
37
 
      <para>
38
 
        This manual page is free software: you can redistribute it
39
 
        and/or modify it under the terms of the GNU General Public
40
 
        License as published by the Free Software Foundation,
41
 
        either version 3 of the License, or (at your option) any
42
 
        later version.
43
 
      </para>
44
 
 
45
 
      <para>
46
 
        This manual page is distributed in the hope that it will
47
 
        be useful, but WITHOUT ANY WARRANTY; without even the
48
 
        implied warranty of MERCHANTABILITY or FITNESS FOR A
49
 
        PARTICULAR PURPOSE.  See the GNU General Public License
50
 
        for more details.
51
 
      </para>
52
 
 
53
 
      <para>
54
 
        You should have received a copy of the GNU General Public
55
 
        License along with this program; If not, see
56
 
        <ulink url="http://www.gnu.org/licenses/"/>.
57
 
      </para>
58
 
    </legalnotice>
 
46
    <xi:include href="legalnotice.xml"/>
59
47
  </refentryinfo>
60
 
 
 
48
  
61
49
  <refmeta>
62
50
    <refentrytitle>&CONFNAME;</refentrytitle>
63
51
    <manvolnum>5</manvolnum>
69
57
      Configuration file for the Mandos server
70
58
    </refpurpose>
71
59
  </refnamediv>
72
 
 
 
60
  
73
61
  <refsynopsisdiv>
74
 
    <synopsis>
75
 
      &CONFPATH;
76
 
    </synopsis>
 
62
    <synopsis>&CONFPATH;</synopsis>
77
63
  </refsynopsisdiv>
78
 
 
 
64
  
79
65
  <refsect1 id="description">
80
66
    <title>DESCRIPTION</title>
81
67
    <para>
93
79
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
94
80
      to provide comments.
95
81
    </para>
96
 
 
 
82
    
97
83
  </refsect1>
98
84
  <refsect1>
99
85
    <title>OPTIONS</title>
100
86
    
101
87
    <variablelist>
102
88
      <varlistentry>
103
 
        <term><varname>interface</varname></term>
 
89
        <term><option>interface<literal> = </literal><replaceable
 
90
        >NAME</replaceable></option></term>
104
91
        <listitem>
105
 
          <synopsis><literal>interface = </literal><replaceable
106
 
          >IF</replaceable>
107
 
          </synopsis>
108
92
          <xi:include href="mandos-options.xml" xpointer="interface"/>
109
93
        </listitem>
110
94
      </varlistentry>
111
 
 
 
95
      
112
96
      <varlistentry>
113
 
        <term><varname>address</varname></term>
 
97
        <term><option>address<literal> = </literal><replaceable
 
98
          >ADDRESS</replaceable></option></term>
114
99
        <listitem>
115
 
          <synopsis><literal>address = </literal><replaceable
116
 
          >ADDRESS</replaceable>
117
 
          </synopsis>
118
100
          <xi:include href="mandos-options.xml" xpointer="address"/>
119
101
        </listitem>
120
102
      </varlistentry>
121
 
 
 
103
      
122
104
      <varlistentry>
123
 
        <term><varname>port</varname></term>
 
105
        <term><option>port<literal> = </literal><replaceable
 
106
        >NUMBER</replaceable></option></term>
124
107
        <listitem>
125
 
          <synopsis><literal>port = </literal><replaceable
126
 
          >PORT</replaceable>
127
 
          </synopsis>
128
108
          <xi:include href="mandos-options.xml" xpointer="port"/>
129
109
        </listitem>
130
110
      </varlistentry>
131
 
 
 
111
      
132
112
      <varlistentry>
133
 
        <term><varname>debug</varname></term>
134
 
        <listitem>
135
 
          <synopsis><literal>debug = </literal>{ <literal
 
113
        <term><option>debug<literal> = </literal>{ <literal
136
114
          >1</literal> | <literal>yes</literal> | <literal
137
115
          >true</literal> | <literal>on</literal> | <literal
138
116
          >0</literal> | <literal>no</literal> | <literal
139
 
          >false</literal> | <literal>off</literal> }
140
 
          </synopsis>
 
117
          >false</literal> | <literal>off</literal> }</option></term>
 
118
        <listitem>
141
119
          <xi:include href="mandos-options.xml" xpointer="debug"/>
142
120
        </listitem>
143
121
      </varlistentry>
144
 
 
 
122
      
145
123
      <varlistentry>
146
 
        <term><varname>priority</varname></term>
 
124
        <term><option>priority<literal> = </literal><replaceable
 
125
        >STRING</replaceable></option></term>
147
126
        <listitem>
148
 
          <synopsis><literal>priority = </literal><replaceable
149
 
          >PRIORITY</replaceable>
150
 
          </synopsis>
151
127
          <xi:include href="mandos-options.xml" xpointer="priority"/>
152
128
        </listitem>
153
129
      </varlistentry>
154
 
 
 
130
      
155
131
      <varlistentry>
156
 
        <term><varname>servicename</varname></term>
 
132
        <term><option>servicename<literal> = </literal
 
133
        ><replaceable>NAME</replaceable></option></term>
157
134
        <listitem>
158
 
          <synopsis><literal>servicename = </literal><replaceable
159
 
          >NAME</replaceable>
160
 
          </synopsis>
161
135
          <xi:include href="mandos-options.xml"
162
136
                      xpointer="servicename"/>
163
137
        </listitem>
164
138
      </varlistentry>
165
139
      
 
140
      <varlistentry>
 
141
        <term><option>use_dbus<literal> = </literal>{ <literal
 
142
          >1</literal> | <literal>yes</literal> | <literal
 
143
          >true</literal> | <literal>on</literal> | <literal
 
144
          >0</literal> | <literal>no</literal> | <literal
 
145
          >false</literal> | <literal>off</literal> }</option></term>
 
146
        <listitem>
 
147
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
148
        </listitem>
 
149
      </varlistentry>
 
150
      
 
151
      <varlistentry>
 
152
        <term><option>use_ipv6<literal> = </literal>{ <literal
 
153
          >1</literal> | <literal>yes</literal> | <literal
 
154
          >true</literal> | <literal>on</literal> | <literal
 
155
          >0</literal> | <literal>no</literal> | <literal
 
156
          >false</literal> | <literal>off</literal> }</option></term>
 
157
        <listitem>
 
158
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
 
159
        </listitem>
 
160
      </varlistentry>
 
161
      
 
162
      <varlistentry>
 
163
        <term><option>restore<literal> = </literal>{ <literal
 
164
          >1</literal> | <literal>yes</literal> | <literal
 
165
          >true</literal> | <literal>on</literal> | <literal
 
166
          >0</literal> | <literal>no</literal> | <literal
 
167
          >false</literal> | <literal>off</literal> }</option></term>
 
168
        <listitem>
 
169
          <xi:include href="mandos-options.xml" xpointer="restore"/>
 
170
        </listitem>
 
171
      </varlistentry>
 
172
      
 
173
      <varlistentry>
 
174
        <term><option>statedir<literal> = </literal><replaceable
 
175
        >DIRECTORY</replaceable></option></term>
 
176
        <listitem>
 
177
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
 
178
        </listitem>
 
179
      </varlistentry>
 
180
      
 
181
      <varlistentry>
 
182
        <term><option>socket<literal> = </literal><replaceable
 
183
        >NUMBER</replaceable></option></term>
 
184
        <listitem>
 
185
          <xi:include href="mandos-options.xml" xpointer="socket"/>
 
186
        </listitem>
 
187
      </varlistentry>
 
188
      
166
189
    </variablelist>
167
190
  </refsect1>
168
191
  
178
201
    <para>
179
202
      The <literal>[DEFAULT]</literal> is necessary because the Python
180
203
      built-in module <systemitem class="library">ConfigParser</systemitem>
181
 
      requres it.
 
204
      requires it.
182
205
    </para>
183
206
  </refsect1>
184
207
  
200
223
[DEFAULT]
201
224
# A configuration example
202
225
interface = eth0
203
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
226
address = fe80::aede:48ff:fe71:f6f2
204
227
port = 1025
205
 
debug = true
206
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
 
228
debug = True
 
229
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
207
230
servicename = Daena
 
231
use_dbus = False
 
232
use_ipv6 = True
 
233
restore = True
 
234
statedir = /var/lib/mandos
208
235
      </programlisting>
209
236
    </informalexample>
210
237
  </refsect1>
212
239
  <refsect1 id="see_also">
213
240
    <title>SEE ALSO</title>
214
241
    <para>
215
 
      <citerefentry>
216
 
        <refentrytitle>mandos</refentrytitle>
217
 
        <manvolnum>8</manvolnum></citerefentry>, <citerefentry>
218
 
        <refentrytitle>mandos-clients.conf</refentrytitle>
219
 
        <manvolnum>5</manvolnum></citerefentry>
 
242
      <citerefentry><refentrytitle>intro</refentrytitle>
 
243
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
244
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
 
245
      ><manvolnum>3</manvolnum></citerefentry>,
 
246
      <citerefentry><refentrytitle>mandos</refentrytitle>
 
247
      <manvolnum>8</manvolnum></citerefentry>,
 
248
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
 
249
      <manvolnum>5</manvolnum></citerefentry>
220
250
    </para>
 
251
    
 
252
    <variablelist>
 
253
      <varlistentry>
 
254
        <term>
 
255
          RFC 4291: <citetitle>IP Version 6 Addressing
 
256
          Architecture</citetitle>
 
257
        </term>
 
258
        <listitem>
 
259
          <variablelist>
 
260
            <varlistentry>
 
261
              <term>Section 2.2: <citetitle>Text Representation of
 
262
              Addresses</citetitle></term>
 
263
              <listitem><para/></listitem>
 
264
            </varlistentry>
 
265
            <varlistentry>
 
266
              <term>Section 2.5.5.2: <citetitle>IPv4-Mapped IPv6
 
267
              Address</citetitle></term>
 
268
              <listitem><para/></listitem>
 
269
            </varlistentry>
 
270
            <varlistentry>
 
271
            <term>Section 2.5.6, <citetitle>Link-Local IPv6 Unicast
 
272
            Addresses</citetitle></term>
 
273
            <listitem>
 
274
              <para>
 
275
                The clients use IPv6 link-local addresses, which are
 
276
                immediately usable since a link-local addresses is
 
277
                automatically assigned to a network interface when it
 
278
                is brought up.
 
279
              </para>
 
280
            </listitem>
 
281
            </varlistentry>
 
282
          </variablelist>
 
283
        </listitem>
 
284
      </varlistentry>
 
285
      <varlistentry>
 
286
        <term>
 
287
          <ulink url="http://www.zeroconf.org/">Zeroconf</ulink>
 
288
        </term>
 
289
        <listitem>
 
290
          <para>
 
291
            Zeroconf is the network protocol standard used by clients
 
292
            for finding the Mandos server on the local network.
 
293
          </para>
 
294
        </listitem>
 
295
      </varlistentry>
 
296
    </variablelist>
221
297
  </refsect1>
222
298
</refentry>
 
299
<!-- Local Variables: -->
 
300
<!-- time-stamp-start: "<!ENTITY TIMESTAMP [\"']" -->
 
301
<!-- time-stamp-end: "[\"']>" -->
 
302
<!-- time-stamp-format: "%:y-%02m-%02d" -->
 
303
<!-- End: -->