/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
3 by Björn Påhlsson
Python based server
1
#!/usr/bin/python
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2
# -*- mode: python; coding: utf-8 -*-
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
3
# 
4
# Mandos server - give out binary blobs to connecting clients.
5
# 
6
# This program is partly derived from an example program for an Avahi
7
# service publisher, downloaded from
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
336 by Teddy Hogeborn
Code cleanup.
9
# methods "add", "remove", "server_state_changed",
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
# "AvahiService" class, and some lines in "main".
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
12
# 
28 by Teddy Hogeborn
* server.conf: New file.
13
# Everything else is
466 by Teddy Hogeborn
Update copyright year to "2011" wherever appropriate.
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
16
# 
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
19
# the Free Software Foundation, either version 3 of the License, or
20
# (at your option) any later version.
21
#
22
#     This program is distributed in the hope that it will be useful,
23
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
24
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
25
#     GNU General Public License for more details.
26
# 
27
# You should have received a copy of the GNU General Public License
109 by Teddy Hogeborn
* .bzrignore: New.
28
# along with this program.  If not, see
29
# <http://www.gnu.org/licenses/>.
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
30
# 
28 by Teddy Hogeborn
* server.conf: New file.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
32
# 
3 by Björn Påhlsson
Python based server
33
463.1.5 by teddy at bsnet
* mandos: Use unicode string literals.
34
from __future__ import (division, absolute_import, print_function,
35
                        unicode_literals)
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
36
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
37
import SocketServer as socketserver
3 by Björn Påhlsson
Python based server
38
import socket
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
39
import argparse
3 by Björn Påhlsson
Python based server
40
import datetime
41
import errno
42
import gnutls.crypto
43
import gnutls.connection
44
import gnutls.errors
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
48
import ConfigParser as configparser
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
49
import sys
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
50
import re
51
import os
52
import signal
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
53
import subprocess
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
54
import atexit
55
import stat
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
56
import logging
57
import logging.handlers
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
58
import pwd
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
59
import contextlib
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
60
import struct
61
import fcntl
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
62
import functools
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
63
import cPickle as pickle
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
64
import multiprocessing
5 by Teddy Hogeborn
* server.py (server_metaclass): New.
65
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
66
import dbus
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
67
import dbus.service
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
68
import gobject
69
import avahi
70
from dbus.mainloop.glib import DBusGMainLoop
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
71
import ctypes
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
72
import ctypes.util
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
73
import xml.dom.minidom
74
import inspect
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
75
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
76
try:
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
78
except AttributeError:
79
    try:
80
        from IN import SO_BINDTODEVICE
81
    except ImportError:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
82
        SO_BINDTODEVICE = None
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
83
84
237.4.14 by Teddy Hogeborn
* Makefile (version): Changed to "1.3.0".
85
version = "1.3.0"
13 by Björn Påhlsson
Added following support:
86
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
89
syslogger = (logging.handlers.SysLogHandler
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
463.1.6 by teddy at bsnet
* mandos: Bug fix: pass str("/dev/log") to logging.SysLogHandler(),
91
              address = str("/dev/log")))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
92
syslogger.setFormatter(logging.Formatter
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
93
                       ('Mandos [%(process)d]: %(levelname)s:'
94
                        ' %(message)s'))
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
95
logger.addHandler(syslogger)
13 by Björn Påhlsson
Added following support:
96
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
97
console = logging.StreamHandler()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
                                       ' %(levelname)s:'
100
                                       ' %(message)s'))
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
101
logger.addHandler(console)
28 by Teddy Hogeborn
* server.conf: New file.
102
103
class AvahiError(Exception):
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
104
    def __init__(self, value, *args, **kwargs):
28 by Teddy Hogeborn
* server.conf: New file.
105
        self.value = value
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
107
    def __unicode__(self):
108
        return unicode(repr(self.value))
28 by Teddy Hogeborn
* server.conf: New file.
109
110
class AvahiServiceError(AvahiError):
111
    pass
112
113
class AvahiGroupError(AvahiError):
114
    pass
115
116
117
class AvahiService(object):
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
118
    """An Avahi (Zeroconf) service.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
119
    
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
120
    Attributes:
28 by Teddy Hogeborn
* server.conf: New file.
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
               Used to optionally bind to the specified interface.
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
123
    name: string; Example: 'Mandos'
124
    type: string; Example: '_mandos._tcp'.
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
126
    port: integer; what port to announce
127
    TXT: list of strings; TXT record for the service
128
    domain: string; Domain to publish on, default to .local if empty.
129
    host: string; Host to publish records for, default is localhost
130
    max_renames: integer; maximum number of renames
131
    rename_count: integer; counter so we only rename after collisions
132
                  a sensible number of times
336 by Teddy Hogeborn
Code cleanup.
133
    group: D-Bus Entry Group
134
    server: D-Bus Server
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
135
    bus: dbus.SystemBus()
28 by Teddy Hogeborn
* server.conf: New file.
136
    """
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
138
                 servicetype = None, port = None, TXT = None,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
139
                 domain = "", host = "", max_renames = 32768,
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
28 by Teddy Hogeborn
* server.conf: New file.
141
        self.interface = interface
142
        self.name = name
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
143
        self.type = servicetype
28 by Teddy Hogeborn
* server.conf: New file.
144
        self.port = port
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
145
        self.TXT = TXT if TXT is not None else []
28 by Teddy Hogeborn
* server.conf: New file.
146
        self.domain = domain
147
        self.host = host
148
        self.rename_count = 0
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
149
        self.max_renames = max_renames
314 by Teddy Hogeborn
Support not using IPv6 in server:
150
        self.protocol = protocol
336 by Teddy Hogeborn
Code cleanup.
151
        self.group = None       # our entry group
152
        self.server = None
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
153
        self.bus = bus
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
154
        self.entry_group_state_changed_match = None
28 by Teddy Hogeborn
* server.conf: New file.
155
    def rename(self):
156
        """Derived from the Avahi example code"""
157
        if self.rename_count >= self.max_renames:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
158
            logger.critical("No suitable Zeroconf service name found"
159
                            " after %i retries, exiting.",
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
160
                            self.rename_count)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
161
            raise AvahiServiceError("Too many renames")
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
163
        logger.info("Changing Zeroconf service name to %r ...",
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
164
                    self.name)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
165
        syslogger.setFormatter(logging.Formatter
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
166
                               ('Mandos (%s) [%%(process)d]:'
167
                                ' %%(levelname)s: %%(message)s'
327 by Teddy Hogeborn
Merge from pipe IPC branch.
168
                                % self.name))
28 by Teddy Hogeborn
* server.conf: New file.
169
        self.remove()
24.1.160 by Björn Påhlsson
fixed bug with local name collisions after a non-local name collision
170
        try:
171
            self.add()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
172
        except dbus.exceptions.DBusException as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
173
            logger.critical("DBusException: %s", error)
24.1.160 by Björn Påhlsson
fixed bug with local name collisions after a non-local name collision
174
            self.cleanup()
175
            os._exit(1)
28 by Teddy Hogeborn
* server.conf: New file.
176
        self.rename_count += 1
177
    def remove(self):
178
        """Derived from the Avahi example code"""
336 by Teddy Hogeborn
Code cleanup.
179
        if self.group is not None:
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
180
            try:
181
                self.group.Free()
182
            except (dbus.exceptions.UnknownMethodException,
183
                    dbus.exceptions.DBusException) as e:
184
                pass
185
            self.group = None
186
        if self.entry_group_state_changed_match is not None:
187
            self.entry_group_state_changed_match.remove()
188
            self.entry_group_state_changed_match = None
28 by Teddy Hogeborn
* server.conf: New file.
189
    def add(self):
190
        """Derived from the Avahi example code"""
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
191
        self.remove()
192
        self.group = dbus.Interface(
193
            self.bus.get_object(avahi.DBUS_NAME,
194
                                self.server.EntryGroupNew(),
195
                                follow_name_owner_changes=True),
196
            avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
        self.entry_group_state_changed_match = (
198
            self.group.connect_to_signal(
199
                'StateChanged', self .entry_group_state_changed))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
200
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
336 by Teddy Hogeborn
Code cleanup.
201
                     self.name, self.type)
202
        self.group.AddService(
203
            self.interface,
204
            self.protocol,
205
            dbus.UInt32(0),     # flags
206
            self.name, self.type,
207
            self.domain, self.host,
208
            dbus.UInt16(self.port),
209
            avahi.string_array_to_txt_array(self.TXT))
210
        self.group.Commit()
211
    def entry_group_state_changed(self, state, error):
212
        """Derived from the Avahi example code"""
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
213
        logger.debug("Avahi entry group state change: %i", state)
336 by Teddy Hogeborn
Code cleanup.
214
        
215
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
216
            logger.debug("Zeroconf service established.")
336 by Teddy Hogeborn
Code cleanup.
217
        elif state == avahi.ENTRY_GROUP_COLLISION:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
218
            logger.info("Zeroconf service name collision.")
336 by Teddy Hogeborn
Code cleanup.
219
            self.rename()
220
        elif state == avahi.ENTRY_GROUP_FAILURE:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
221
            logger.critical("Avahi: Error in group state changed %s",
336 by Teddy Hogeborn
Code cleanup.
222
                            unicode(error))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
223
            raise AvahiGroupError("State changed: %s"
336 by Teddy Hogeborn
Code cleanup.
224
                                  % unicode(error))
225
    def cleanup(self):
226
        """Derived from the Avahi example code"""
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
227
        self.remove()
228
    def server_state_changed(self, state, error=None):
336 by Teddy Hogeborn
Code cleanup.
229
        """Derived from the Avahi example code"""
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
230
        logger.debug("Avahi server state change: %i", state)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
231
        bad_states = { avahi.SERVER_INVALID:
232
                           "Zeroconf server invalid",
233
                       avahi.SERVER_REGISTERING: None,
234
                       avahi.SERVER_COLLISION:
235
                           "Zeroconf server name collision",
236
                       avahi.SERVER_FAILURE:
237
                           "Zeroconf server failure" }
238
        if state in bad_states:
239
            if bad_states[state]:
240
                logger.error(bad_states[state])
336 by Teddy Hogeborn
Code cleanup.
241
            self.remove()
242
        elif state == avahi.SERVER_RUNNING:
243
            self.add()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
244
        else:
245
            logger.debug("Unknown state: %r", state)
336 by Teddy Hogeborn
Code cleanup.
246
    def activate(self):
247
        """Derived from the Avahi example code"""
248
        if self.server is None:
249
            self.server = dbus.Interface(
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
250
                self.bus.get_object(avahi.DBUS_NAME,
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
251
                                    avahi.DBUS_PATH_SERVER,
252
                                    follow_name_owner_changes=True),
336 by Teddy Hogeborn
Code cleanup.
253
                avahi.DBUS_INTERFACE_SERVER)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
254
        self.server.connect_to_signal("StateChanged",
336 by Teddy Hogeborn
Code cleanup.
255
                                 self.server_state_changed)
256
        self.server_state_changed(self.server.GetState())
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
257
258
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
259
class Client(object):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
260
    """A representation of a client host served by this server.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
261
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
262
    Attributes:
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
263
    _approved:   bool(); 'None' if not yet approved/disapproved
264
    approval_delay: datetime.timedelta(); Time to wait for approval
265
    approval_duration: datetime.timedelta(); Duration of one approval
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
266
    checker:    subprocess.Popen(); a running checker process used
267
                                    to see if the client lives.
268
                                    'None' if no process is running.
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
269
    checker_callback_tag: a gobject event source tag, or None
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
270
    checker_command: string; External command which is run to check
271
                     if client lives.  %() expansions are done at
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
272
                     runtime with vars(self) as dict, so that for
273
                     instance %(name)s can be used in the command.
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
274
    checker_initiator_tag: a gobject event source tag, or None
275
    created:    datetime.datetime(); (UTC) object creation
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
276
    current_checker_command: string; current running checker_command
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
277
    disable_hook:  If set, called by disable() as disable_hook(self)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
278
    disable_initiator_tag: a gobject event source tag, or None
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
279
    enabled:    bool()
280
    fingerprint: string (40 or 32 hexadecimal digits); used to
281
                 uniquely identify the client
282
    host:       string; available for use by the checker command
283
    interval:   datetime.timedelta(); How often to start a new checker
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
284
    last_approval_request: datetime.datetime(); (UTC) or None
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
285
    last_checked_ok: datetime.datetime(); (UTC) or None
286
    last_enabled: datetime.datetime(); (UTC)
287
    name:       string; from the config file, used in log messages and
288
                        D-Bus identifiers
289
    secret:     bytestring; sent verbatim (over TLS) to client
290
    timeout:    datetime.timedelta(); How long from last_checked_ok
291
                                      until this client is disabled
292
    runtime_expansions: Allowed attributes for runtime expansion.
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
293
    """
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
294
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
295
    runtime_expansions = ("approval_delay", "approval_duration",
296
                          "created", "enabled", "fingerprint",
297
                          "host", "interval", "last_checked_ok",
298
                          "last_enabled", "name", "timeout")
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
299
    
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
300
    @staticmethod
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
301
    def _timedelta_to_milliseconds(td):
302
        "Convert a datetime.timedelta() to milliseconds"
303
        return ((td.days * 24 * 60 * 60 * 1000)
304
                + (td.seconds * 1000)
305
                + (td.microseconds // 1000))
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
306
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
307
    def timeout_milliseconds(self):
308
        "Return the 'timeout' attribute in milliseconds"
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
309
        return self._timedelta_to_milliseconds(self.timeout)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
310
    
311
    def interval_milliseconds(self):
312
        "Return the 'interval' attribute in milliseconds"
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
313
        return self._timedelta_to_milliseconds(self.interval)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
314
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
315
    def approval_delay_milliseconds(self):
316
        return self._timedelta_to_milliseconds(self.approval_delay)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
317
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
318
    def __init__(self, name = None, disable_hook=None, config=None):
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
319
        """Note: the 'checker' key in 'config' sets the
320
        'checker_command' attribute and *not* the 'checker'
321
        attribute."""
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
322
        self.name = name
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
323
        if config is None:
324
            config = {}
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
325
        logger.debug("Creating client %r", self.name)
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
326
        # Uppercase and remove spaces from fingerprint for later
327
        # comparison purposes with return value from the fingerprint()
328
        # function
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
329
        self.fingerprint = (config["fingerprint"].upper()
330
                            .replace(" ", ""))
331
        logger.debug("  Fingerprint: %s", self.fingerprint)
332
        if "secret" in config:
333
            self.secret = config["secret"].decode("base64")
334
        elif "secfile" in config:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
335
            with open(os.path.expanduser(os.path.expandvars
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
336
                                         (config["secfile"])),
337
                      "rb") as secfile:
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
338
                self.secret = secfile.read()
3 by Björn Påhlsson
Python based server
339
        else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
340
            raise TypeError("No secret or secfile for client %s"
28 by Teddy Hogeborn
* server.conf: New file.
341
                            % self.name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
342
        self.host = config.get("host", "")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
343
        self.created = datetime.datetime.utcnow()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
344
        self.enabled = False
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
345
        self.last_approval_request = None
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
346
        self.last_enabled = None
28 by Teddy Hogeborn
* server.conf: New file.
347
        self.last_checked_ok = None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
348
        self.timeout = string_to_delta(config["timeout"])
349
        self.interval = string_to_delta(config["interval"])
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
350
        self.disable_hook = disable_hook
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
351
        self.checker = None
352
        self.checker_initiator_tag = None
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
353
        self.disable_initiator_tag = None
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
354
        self.checker_callback_tag = None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
355
        self.checker_command = config["checker"]
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
356
        self.current_checker_command = None
279 by Teddy Hogeborn
* mandos (Client.__init__): Disable D-Bus during init to avoid
357
        self.last_connect = None
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
358
        self._approved = None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
359
        self.approved_by_default = config.get("approved_by_default",
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
360
                                              True)
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
361
        self.approvals_pending = 0
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
362
        self.approval_delay = string_to_delta(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
363
            config["approval_delay"])
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
364
        self.approval_duration = string_to_delta(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
365
            config["approval_duration"])
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
366
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
367
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
368
    def send_changedstate(self):
369
        self.changedstate.acquire()
370
        self.changedstate.notify_all()
371
        self.changedstate.release()
372
        
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
373
    def enable(self):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
374
        """Start this client's checker and timeout hooks"""
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
375
        if getattr(self, "enabled", False):
341 by Teddy Hogeborn
Code cleanup and one bug fix.
376
            # Already enabled
377
            return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
378
        self.send_changedstate()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
379
        self.last_enabled = datetime.datetime.utcnow()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
380
        # Schedule a new checker to be started an 'interval' from now,
381
        # and every interval from then on.
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
382
        self.checker_initiator_tag = (gobject.timeout_add
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
383
                                      (self.interval_milliseconds(),
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
384
                                       self.start_checker))
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
385
        # Schedule a disable() when 'timeout' has passed
386
        self.disable_initiator_tag = (gobject.timeout_add
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
387
                                   (self.timeout_milliseconds(),
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
388
                                    self.disable))
389
        self.enabled = True
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
390
        # Also start a new checker *right now*.
391
        self.start_checker()
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
392
    
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
393
    def disable(self, quiet=True):
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
394
        """Disable this client."""
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
395
        if not getattr(self, "enabled", False):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
396
            return False
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
397
        if not quiet:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
398
            self.send_changedstate()
399
        if not quiet:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
400
            logger.info("Disabling client %s", self.name)
401
        if getattr(self, "disable_initiator_tag", False):
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
402
            gobject.source_remove(self.disable_initiator_tag)
403
            self.disable_initiator_tag = None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
404
        if getattr(self, "checker_initiator_tag", False):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
405
            gobject.source_remove(self.checker_initiator_tag)
406
            self.checker_initiator_tag = None
407
        self.stop_checker()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
408
        if self.disable_hook:
409
            self.disable_hook(self)
410
        self.enabled = False
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
411
        # Do not run this again if called by a gobject.timeout_add
412
        return False
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
413
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
414
    def __del__(self):
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
415
        self.disable_hook = None
416
        self.disable()
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
417
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
418
    def checker_callback(self, pid, condition, command):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
419
        """The checker has completed, so take appropriate actions."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
420
        self.checker_callback_tag = None
421
        self.checker = None
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
422
        if os.WIFEXITED(condition):
423
            exitstatus = os.WEXITSTATUS(condition)
424
            if exitstatus == 0:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
425
                logger.info("Checker for %(name)s succeeded",
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
426
                            vars(self))
281 by Teddy Hogeborn
* mandos (Client.bump_timeout): Renamed to "checked_ok". All callers
427
                self.checked_ok()
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
428
            else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
429
                logger.info("Checker for %(name)s failed",
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
430
                            vars(self))
431
        else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
432
            logger.warning("Checker for %(name)s crashed?",
13 by Björn Påhlsson
Added following support:
433
                           vars(self))
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
434
    
281 by Teddy Hogeborn
* mandos (Client.bump_timeout): Renamed to "checked_ok". All callers
435
    def checked_ok(self):
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
436
        """Bump up the timeout for this client.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
437
        
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
438
        This should only be called when the client has been seen,
439
        alive and well.
440
        """
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
441
        self.last_checked_ok = datetime.datetime.utcnow()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
442
        gobject.source_remove(self.disable_initiator_tag)
443
        self.disable_initiator_tag = (gobject.timeout_add
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
444
                                      (self.timeout_milliseconds(),
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
445
                                       self.disable))
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
446
    
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
447
    def need_approval(self):
448
        self.last_approval_request = datetime.datetime.utcnow()
449
    
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
450
    def start_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
451
        """Start a new checker subprocess if one is not running.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
452
        
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
453
        If a checker already exists, leave it running and do
454
        nothing."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
455
        # The reason for not killing a running checker is that if we
456
        # did that, then if a checker (for some reason) started
457
        # running slowly and taking more than 'interval' time, the
458
        # client would inevitably timeout, since no checker would get
459
        # a chance to run to completion.  If we instead leave running
460
        # checkers alone, the checker would have to take more time
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
461
        # than 'timeout' for the client to be disabled, which is as it
462
        # should be.
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
463
        
464
        # If a checker exists, make sure it is not a zombie
383 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Fix race condition with
465
        try:
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
466
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
467
        except (AttributeError, OSError) as error:
383 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Fix race condition with
468
            if (isinstance(error, OSError)
469
                and error.errno != errno.ECHILD):
470
                raise error
471
        else:
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
472
            if pid:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
473
                logger.warning("Checker was a zombie")
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
474
                gobject.source_remove(self.checker_callback_tag)
475
                self.checker_callback(pid, status,
476
                                      self.current_checker_command)
477
        # Start a new checker if needed
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
478
        if self.checker is None:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
479
            try:
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
480
                # In case checker_command has exactly one % operator
481
                command = self.checker_command % self.host
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
482
            except TypeError:
28 by Teddy Hogeborn
* server.conf: New file.
483
                # Escape attributes for the shell
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
484
                escaped_attrs = dict(
485
                    (attr,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
486
                     re.escape(unicode(str(getattr(self, attr, "")),
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
487
                                       errors=
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
488
                                       'replace')))
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
489
                    for attr in
490
                    self.runtime_expansions)
491
13 by Björn Påhlsson
Added following support:
492
                try:
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
493
                    command = self.checker_command % escaped_attrs
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
494
                except TypeError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
495
                    logger.error('Could not format string "%s":'
496
                                 ' %s', self.checker_command, error)
13 by Björn Påhlsson
Added following support:
497
                    return True # Try again later
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
498
            self.current_checker_command = command
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
499
            try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
500
                logger.info("Starting checker %r for %s",
44 by Teddy Hogeborn
* ca.pem: Removed.
501
                            command, self.name)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
502
                # We don't need to redirect stdout and stderr, since
503
                # in normal mode, that is already done by daemon(),
504
                # and in debug mode we don't want to.  (Stdin is
505
                # always replaced by /dev/null.)
28 by Teddy Hogeborn
* server.conf: New file.
506
                self.checker = subprocess.Popen(command,
507
                                                close_fds=True,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
508
                                                shell=True, cwd="/")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
509
                self.checker_callback_tag = (gobject.child_watch_add
510
                                             (self.checker.pid,
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
511
                                              self.checker_callback,
512
                                              data=command))
310 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Add extra check in case the
513
                # The checker may have completed before the gobject
514
                # watch was added.  Check for this.
515
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
516
                if pid:
517
                    gobject.source_remove(self.checker_callback_tag)
518
                    self.checker_callback(pid, status, command)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
519
            except OSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
520
                logger.error("Failed to start subprocess: %s",
13 by Björn Påhlsson
Added following support:
521
                             error)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
522
        # Re-run this periodically if run by gobject.timeout_add
523
        return True
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
524
    
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
525
    def stop_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
526
        """Force the checker process, if any, to stop."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
527
        if self.checker_callback_tag:
528
            gobject.source_remove(self.checker_callback_tag)
529
            self.checker_callback_tag = None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
530
        if getattr(self, "checker", None) is None:
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
531
            return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
532
        logger.debug("Stopping checker for %(name)s", vars(self))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
533
        try:
534
            os.kill(self.checker.pid, signal.SIGTERM)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
535
            #time.sleep(0.5)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
536
            #if self.checker.poll() is None:
537
            #    os.kill(self.checker.pid, signal.SIGKILL)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
538
        except OSError as error:
28 by Teddy Hogeborn
* server.conf: New file.
539
            if error.errno != errno.ESRCH: # No such process
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
540
                raise
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
541
        self.checker = None
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
542
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
543
def dbus_service_property(dbus_interface, signature="v",
544
                          access="readwrite", byte_arrays=False):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
545
    """Decorators for marking methods of a DBusObjectWithProperties to
546
    become properties on the D-Bus.
547
    
548
    The decorated method will be called with no arguments by "Get"
549
    and with one argument by "Set".
550
    
551
    The parameters, where they are supported, are the same as
552
    dbus.service.method, except there is only "signature", since the
553
    type from Get() and the type sent to Set() is the same.
554
    """
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
555
    # Encoding deeply encoded byte arrays is not supported yet by the
556
    # "Set" method, so we fail early here:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
557
    if byte_arrays and signature != "ay":
558
        raise ValueError("Byte arrays not supported for non-'ay'"
559
                         " signature %r" % signature)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
560
    def decorator(func):
561
        func._dbus_is_property = True
562
        func._dbus_interface = dbus_interface
563
        func._dbus_signature = signature
564
        func._dbus_access = access
565
        func._dbus_name = func.__name__
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
566
        if func._dbus_name.endswith("_dbus_property"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
567
            func._dbus_name = func._dbus_name[:-14]
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
568
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
569
        return func
570
    return decorator
571
572
573
class DBusPropertyException(dbus.exceptions.DBusException):
574
    """A base class for D-Bus property-related exceptions
575
    """
576
    def __unicode__(self):
577
        return unicode(str(self))
578
579
580
class DBusPropertyAccessException(DBusPropertyException):
581
    """A property's access permissions disallows an operation.
582
    """
583
    pass
584
585
586
class DBusPropertyNotFound(DBusPropertyException):
587
    """An attempt was made to access a non-existing property.
588
    """
589
    pass
590
591
592
class DBusObjectWithProperties(dbus.service.Object):
593
    """A D-Bus object with properties.
594
595
    Classes inheriting from this can use the dbus_service_property
596
    decorator to expose methods as D-Bus properties.  It exposes the
597
    standard Get(), Set(), and GetAll() methods on the D-Bus.
598
    """
599
    
600
    @staticmethod
601
    def _is_dbus_property(obj):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
602
        return getattr(obj, "_dbus_is_property", False)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
603
    
604
    def _get_all_dbus_properties(self):
605
        """Returns a generator of (name, attribute) pairs
606
        """
607
        return ((prop._dbus_name, prop)
608
                for name, prop in
609
                inspect.getmembers(self, self._is_dbus_property))
610
    
611
    def _get_dbus_property(self, interface_name, property_name):
612
        """Returns a bound method if one exists which is a D-Bus
613
        property with the specified name and interface.
614
        """
615
        for name in (property_name,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
616
                     property_name + "_dbus_property"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
617
            prop = getattr(self, name, None)
618
            if (prop is None
619
                or not self._is_dbus_property(prop)
620
                or prop._dbus_name != property_name
621
                or (interface_name and prop._dbus_interface
622
                    and interface_name != prop._dbus_interface)):
623
                continue
624
            return prop
625
        # No such property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
626
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
                                   + interface_name + "."
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
628
                                   + property_name)
629
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
630
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
631
                         out_signature="v")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
632
    def Get(self, interface_name, property_name):
633
        """Standard D-Bus property Get() method, see D-Bus standard.
634
        """
635
        prop = self._get_dbus_property(interface_name, property_name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
636
        if prop._dbus_access == "write":
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
637
            raise DBusPropertyAccessException(property_name)
638
        value = prop()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
639
        if not hasattr(value, "variant_level"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
640
            return value
641
        return type(value)(value, variant_level=value.variant_level+1)
642
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
643
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
644
    def Set(self, interface_name, property_name, value):
645
        """Standard D-Bus property Set() method, see D-Bus standard.
646
        """
647
        prop = self._get_dbus_property(interface_name, property_name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
648
        if prop._dbus_access == "read":
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
649
            raise DBusPropertyAccessException(property_name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
650
        if prop._dbus_get_args_options["byte_arrays"]:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
651
            # The byte_arrays option is not supported yet on
652
            # signatures other than "ay".
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
653
            if prop._dbus_signature != "ay":
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
654
                raise ValueError
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
655
            value = dbus.ByteArray(''.join(unichr(byte)
656
                                           for byte in value))
657
        prop(value)
658
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
659
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
                         out_signature="a{sv}")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
661
    def GetAll(self, interface_name):
662
        """Standard D-Bus property GetAll() method, see D-Bus
663
        standard.
664
665
        Note: Will not include properties with access="write".
666
        """
667
        all = {}
668
        for name, prop in self._get_all_dbus_properties():
669
            if (interface_name
670
                and interface_name != prop._dbus_interface):
671
                # Interface non-empty but did not match
672
                continue
673
            # Ignore write-only properties
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
674
            if prop._dbus_access == "write":
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
675
                continue
676
            value = prop()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
677
            if not hasattr(value, "variant_level"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
678
                all[name] = value
679
                continue
680
            all[name] = type(value)(value, variant_level=
681
                                    value.variant_level+1)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
682
        return dbus.Dictionary(all, signature="sv")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
683
    
684
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
685
                         out_signature="s",
686
                         path_keyword='object_path',
687
                         connection_keyword='connection')
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
688
    def Introspect(self, object_path, connection):
689
        """Standard D-Bus method, overloaded to insert property tags.
690
        """
691
        xmlstring = dbus.service.Object.Introspect(self, object_path,
386 by Teddy Hogeborn
* mandos (DBusObjectWithProperties.Introspect): Add the name
692
                                                   connection)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
693
        try:
694
            document = xml.dom.minidom.parseString(xmlstring)
695
            def make_tag(document, name, prop):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
696
                e = document.createElement("property")
697
                e.setAttribute("name", name)
698
                e.setAttribute("type", prop._dbus_signature)
699
                e.setAttribute("access", prop._dbus_access)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
700
                return e
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
701
            for if_tag in document.getElementsByTagName("interface"):
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
702
                for tag in (make_tag(document, name, prop)
703
                            for name, prop
704
                            in self._get_all_dbus_properties()
705
                            if prop._dbus_interface
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
706
                            == if_tag.getAttribute("name")):
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
707
                    if_tag.appendChild(tag)
708
                # Add the names to the return values for the
709
                # "org.freedesktop.DBus.Properties" methods
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
710
                if (if_tag.getAttribute("name")
711
                    == "org.freedesktop.DBus.Properties"):
712
                    for cn in if_tag.getElementsByTagName("method"):
713
                        if cn.getAttribute("name") == "Get":
714
                            for arg in cn.getElementsByTagName("arg"):
715
                                if (arg.getAttribute("direction")
716
                                    == "out"):
717
                                    arg.setAttribute("name", "value")
718
                        elif cn.getAttribute("name") == "GetAll":
719
                            for arg in cn.getElementsByTagName("arg"):
720
                                if (arg.getAttribute("direction")
721
                                    == "out"):
722
                                    arg.setAttribute("name", "props")
723
            xmlstring = document.toxml("utf-8")
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
724
            document.unlink()
725
        except (AttributeError, xml.dom.DOMException,
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
726
                xml.parsers.expat.ExpatError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
727
            logger.error("Failed to override Introspection method",
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
728
                         error)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
729
        return xmlstring
730
731
732
class ClientDBus(Client, DBusObjectWithProperties):
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
733
    """A Client class using D-Bus
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
734
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
735
    Attributes:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
736
    dbus_object_path: dbus.ObjectPath
737
    bus: dbus.SystemBus()
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
738
    """
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
739
    
740
    runtime_expansions = (Client.runtime_expansions
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
741
                          + ("dbus_object_path",))
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
742
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
743
    # dbus.service.Object doesn't use super(), so we can't either.
744
    
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
745
    def __init__(self, bus = None, *args, **kwargs):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
746
        self._approvals_pending = 0
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
747
        self.bus = bus
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
748
        Client.__init__(self, *args, **kwargs)
749
        # Only now, when this client is initialized, can it show up on
750
        # the D-Bus
441 by Teddy Hogeborn
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
751
        client_object_name = unicode(self.name).translate(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
752
            {ord("."): ord("_"),
753
             ord("-"): ord("_")})
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
754
        self.dbus_object_path = (dbus.ObjectPath
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
755
                                 ("/clients/" + client_object_name))
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
756
        DBusObjectWithProperties.__init__(self, self.bus,
757
                                          self.dbus_object_path)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
758
        
24.1.154 by Björn Påhlsson
merge
759
    def _get_approvals_pending(self):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
760
        return self._approvals_pending
24.2.5 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Bug fix: Only send D-Bus
761
    def _set_approvals_pending(self, value):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
762
        old_value = self._approvals_pending
763
        self._approvals_pending = value
764
        bval = bool(value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
765
        if (hasattr(self, "dbus_object_path")
24.1.154 by Björn Påhlsson
merge
766
            and bval is not bool(old_value)):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
767
            dbus_bool = dbus.Boolean(bval, variant_level=1)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
768
            self.PropertyChanged(dbus.String("ApprovalPending"),
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
769
                                 dbus_bool)
24.1.154 by Björn Påhlsson
merge
770
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
771
    approvals_pending = property(_get_approvals_pending,
772
                                 _set_approvals_pending)
773
    del _get_approvals_pending, _set_approvals_pending
774
    
336 by Teddy Hogeborn
Code cleanup.
775
    @staticmethod
776
    def _datetime_to_dbus(dt, variant_level=0):
777
        """Convert a UTC datetime.datetime() to a D-Bus type."""
778
        return dbus.String(dt.isoformat(),
779
                           variant_level=variant_level)
780
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
781
    def enable(self):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
782
        oldstate = getattr(self, "enabled", False)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
783
        r = Client.enable(self)
784
        if oldstate != self.enabled:
785
            # Emit D-Bus signals
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
786
            self.PropertyChanged(dbus.String("Enabled"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
787
                                 dbus.Boolean(True, variant_level=1))
336 by Teddy Hogeborn
Code cleanup.
788
            self.PropertyChanged(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
789
                dbus.String("LastEnabled"),
336 by Teddy Hogeborn
Code cleanup.
790
                self._datetime_to_dbus(self.last_enabled,
791
                                       variant_level=1))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
792
        return r
793
    
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
794
    def disable(self, quiet = False):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
795
        oldstate = getattr(self, "enabled", False)
403 by Teddy Hogeborn
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
796
        r = Client.disable(self, quiet=quiet)
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
797
        if not quiet and oldstate != self.enabled:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
798
            # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
799
            self.PropertyChanged(dbus.String("Enabled"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
800
                                 dbus.Boolean(False, variant_level=1))
801
        return r
802
    
803
    def __del__(self, *args, **kwargs):
804
        try:
805
            self.remove_from_connection()
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
806
        except LookupError:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
807
            pass
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
808
        if hasattr(DBusObjectWithProperties, "__del__"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
809
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
810
        Client.__del__(self, *args, **kwargs)
811
    
812
    def checker_callback(self, pid, condition, command,
813
                         *args, **kwargs):
814
        self.checker_callback_tag = None
815
        self.checker = None
816
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
817
        self.PropertyChanged(dbus.String("CheckerRunning"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
818
                             dbus.Boolean(False, variant_level=1))
819
        if os.WIFEXITED(condition):
820
            exitstatus = os.WEXITSTATUS(condition)
821
            # Emit D-Bus signal
822
            self.CheckerCompleted(dbus.Int16(exitstatus),
823
                                  dbus.Int64(condition),
824
                                  dbus.String(command))
825
        else:
826
            # Emit D-Bus signal
827
            self.CheckerCompleted(dbus.Int16(-1),
828
                                  dbus.Int64(condition),
829
                                  dbus.String(command))
830
        
831
        return Client.checker_callback(self, pid, condition, command,
832
                                       *args, **kwargs)
833
    
834
    def checked_ok(self, *args, **kwargs):
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
835
        Client.checked_ok(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
836
        # Emit D-Bus signal
837
        self.PropertyChanged(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
838
            dbus.String("LastCheckedOK"),
336 by Teddy Hogeborn
Code cleanup.
839
            (self._datetime_to_dbus(self.last_checked_ok,
840
                                    variant_level=1)))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
841
    
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
842
    def need_approval(self, *args, **kwargs):
843
        r = Client.need_approval(self, *args, **kwargs)
844
        # Emit D-Bus signal
845
        self.PropertyChanged(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
846
            dbus.String("LastApprovalRequest"),
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
847
            (self._datetime_to_dbus(self.last_approval_request,
848
                                    variant_level=1)))
849
        return r
850
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
851
    def start_checker(self, *args, **kwargs):
852
        old_checker = self.checker
853
        if self.checker is not None:
854
            old_checker_pid = self.checker.pid
855
        else:
856
            old_checker_pid = None
857
        r = Client.start_checker(self, *args, **kwargs)
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
858
        # Only if new checker process was started
859
        if (self.checker is not None
860
            and old_checker_pid != self.checker.pid):
861
            # Emit D-Bus signal
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
862
            self.CheckerStarted(self.current_checker_command)
863
            self.PropertyChanged(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
864
                dbus.String("CheckerRunning"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
865
                dbus.Boolean(True, variant_level=1))
866
        return r
867
    
868
    def stop_checker(self, *args, **kwargs):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
869
        old_checker = getattr(self, "checker", None)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
870
        r = Client.stop_checker(self, *args, **kwargs)
871
        if (old_checker is not None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
872
            and getattr(self, "checker", None) is None):
873
            self.PropertyChanged(dbus.String("CheckerRunning"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
874
                                 dbus.Boolean(False, variant_level=1))
875
        return r
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
876
877
    def _reset_approved(self):
878
        self._approved = None
879
        return False
880
    
881
    def approve(self, value=True):
24.1.154 by Björn Påhlsson
merge
882
        self.send_changedstate()
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
883
        self._approved = value
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
884
        gobject.timeout_add(self._timedelta_to_milliseconds
885
                            (self.approval_duration),
24.1.154 by Björn Påhlsson
merge
886
                            self._reset_approved)
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
887
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
888
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
889
    ## D-Bus methods, signals & properties
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
890
    _interface = "se.bsnet.fukt.Mandos.Client"
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
891
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
892
    ## Signals
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
893
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
894
    # CheckerCompleted - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
895
    @dbus.service.signal(_interface, signature="nxs")
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
896
    def CheckerCompleted(self, exitcode, waitstatus, command):
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
897
        "D-Bus signal"
898
        pass
899
    
900
    # CheckerStarted - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
901
    @dbus.service.signal(_interface, signature="s")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
902
    def CheckerStarted(self, command):
903
        "D-Bus signal"
904
        pass
905
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
906
    # PropertyChanged - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
907
    @dbus.service.signal(_interface, signature="sv")
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
908
    def PropertyChanged(self, property, value):
909
        "D-Bus signal"
910
        pass
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
911
    
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
912
    # GotSecret - signal
327 by Teddy Hogeborn
Merge from pipe IPC branch.
913
    @dbus.service.signal(_interface)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
914
    def GotSecret(self):
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
915
        """D-Bus signal
916
        Is sent after a successful transfer of secret from the Mandos
917
        server to mandos-client
918
        """
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
919
        pass
327 by Teddy Hogeborn
Merge from pipe IPC branch.
920
    
921
    # Rejected - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
922
    @dbus.service.signal(_interface, signature="s")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
923
    def Rejected(self, reason):
924
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
925
        pass
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
926
    
927
    # NeedApproval - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
928
    @dbus.service.signal(_interface, signature="tb")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
929
    def NeedApproval(self, timeout, default):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
930
        "D-Bus signal"
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
931
        return self.need_approval()
327 by Teddy Hogeborn
Merge from pipe IPC branch.
932
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
933
    ## Methods
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
934
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
935
    # Approve - method
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
936
    @dbus.service.method(_interface, in_signature="b")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
937
    def Approve(self, value):
938
        self.approve(value)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
939
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
940
    # CheckedOK - method
941
    @dbus.service.method(_interface)
942
    def CheckedOK(self):
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
943
        self.checked_ok()
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
944
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
945
    # Enable - method
946
    @dbus.service.method(_interface)
947
    def Enable(self):
948
        "D-Bus method"
949
        self.enable()
950
    
951
    # StartChecker - method
952
    @dbus.service.method(_interface)
953
    def StartChecker(self):
954
        "D-Bus method"
955
        self.start_checker()
956
    
957
    # Disable - method
958
    @dbus.service.method(_interface)
959
    def Disable(self):
960
        "D-Bus method"
961
        self.disable()
962
    
963
    # StopChecker - method
964
    @dbus.service.method(_interface)
965
    def StopChecker(self):
966
        self.stop_checker()
967
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
968
    ## Properties
969
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
970
    # ApprovalPending - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
971
    @dbus_service_property(_interface, signature="b", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
972
    def ApprovalPending_dbus_property(self):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
973
        return dbus.Boolean(bool(self.approvals_pending))
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
974
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
975
    # ApprovedByDefault - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
976
    @dbus_service_property(_interface, signature="b",
977
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
978
    def ApprovedByDefault_dbus_property(self, value=None):
979
        if value is None:       # get
980
            return dbus.Boolean(self.approved_by_default)
981
        self.approved_by_default = bool(value)
982
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
983
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
984
                             dbus.Boolean(value, variant_level=1))
985
    
986
    # ApprovalDelay - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
987
    @dbus_service_property(_interface, signature="t",
988
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
989
    def ApprovalDelay_dbus_property(self, value=None):
990
        if value is None:       # get
991
            return dbus.UInt64(self.approval_delay_milliseconds())
992
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
993
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
994
        self.PropertyChanged(dbus.String("ApprovalDelay"),
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
995
                             dbus.UInt64(value, variant_level=1))
996
    
997
    # ApprovalDuration - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
998
    @dbus_service_property(_interface, signature="t",
999
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1000
    def ApprovalDuration_dbus_property(self, value=None):
1001
        if value is None:       # get
1002
            return dbus.UInt64(self._timedelta_to_milliseconds(
1003
                    self.approval_duration))
1004
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1005
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1006
        self.PropertyChanged(dbus.String("ApprovalDuration"),
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1007
                             dbus.UInt64(value, variant_level=1))
1008
    
1009
    # Name - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1010
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1011
    def Name_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1012
        return dbus.String(self.name)
1013
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1014
    # Fingerprint - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1015
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1016
    def Fingerprint_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1017
        return dbus.String(self.fingerprint)
1018
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1019
    # Host - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1020
    @dbus_service_property(_interface, signature="s",
1021
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1022
    def Host_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1023
        if value is None:       # get
1024
            return dbus.String(self.host)
1025
        self.host = value
1026
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1027
        self.PropertyChanged(dbus.String("Host"),
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1028
                             dbus.String(value, variant_level=1))
1029
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1030
    # Created - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1031
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1032
    def Created_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1033
        return dbus.String(self._datetime_to_dbus(self.created))
1034
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1035
    # LastEnabled - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1036
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1037
    def LastEnabled_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1038
        if self.last_enabled is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1039
            return dbus.String("")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1040
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1041
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1042
    # Enabled - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1043
    @dbus_service_property(_interface, signature="b",
1044
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1045
    def Enabled_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1046
        if value is None:       # get
1047
            return dbus.Boolean(self.enabled)
1048
        if value:
1049
            self.enable()
1050
        else:
1051
            self.disable()
1052
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1053
    # LastCheckedOK - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1054
    @dbus_service_property(_interface, signature="s",
1055
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1056
    def LastCheckedOK_dbus_property(self, value=None):
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1057
        if value is not None:
1058
            self.checked_ok()
1059
            return
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1060
        if self.last_checked_ok is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1061
            return dbus.String("")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1062
        return dbus.String(self._datetime_to_dbus(self
1063
                                                  .last_checked_ok))
1064
    
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1065
    # LastApprovalRequest - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1066
    @dbus_service_property(_interface, signature="s", access="read")
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1067
    def LastApprovalRequest_dbus_property(self):
1068
        if self.last_approval_request is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1069
            return dbus.String("")
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1070
        return dbus.String(self.
1071
                           _datetime_to_dbus(self
1072
                                             .last_approval_request))
1073
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1074
    # Timeout - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1075
    @dbus_service_property(_interface, signature="t",
1076
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1077
    def Timeout_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1078
        if value is None:       # get
1079
            return dbus.UInt64(self.timeout_milliseconds())
1080
        self.timeout = datetime.timedelta(0, 0, 0, value)
1081
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1082
        self.PropertyChanged(dbus.String("Timeout"),
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1083
                             dbus.UInt64(value, variant_level=1))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1084
        if getattr(self, "disable_initiator_tag", None) is None:
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1085
            return
1086
        # Reschedule timeout
1087
        gobject.source_remove(self.disable_initiator_tag)
1088
        self.disable_initiator_tag = None
1089
        time_to_die = (self.
1090
                       _timedelta_to_milliseconds((self
1091
                                                   .last_checked_ok
1092
                                                   + self.timeout)
1093
                                                  - datetime.datetime
1094
                                                  .utcnow()))
1095
        if time_to_die <= 0:
1096
            # The timeout has passed
1097
            self.disable()
1098
        else:
1099
            self.disable_initiator_tag = (gobject.timeout_add
1100
                                          (time_to_die, self.disable))
1101
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1102
    # Interval - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1103
    @dbus_service_property(_interface, signature="t",
1104
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1105
    def Interval_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1106
        if value is None:       # get
1107
            return dbus.UInt64(self.interval_milliseconds())
1108
        self.interval = datetime.timedelta(0, 0, 0, value)
1109
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1110
        self.PropertyChanged(dbus.String("Interval"),
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1111
                             dbus.UInt64(value, variant_level=1))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1112
        if getattr(self, "checker_initiator_tag", None) is None:
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1113
            return
1114
        # Reschedule checker run
1115
        gobject.source_remove(self.checker_initiator_tag)
1116
        self.checker_initiator_tag = (gobject.timeout_add
1117
                                      (value, self.start_checker))
1118
        self.start_checker()    # Start one now, too
1119
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1120
    # Checker - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1121
    @dbus_service_property(_interface, signature="s",
1122
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1123
    def Checker_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1124
        if value is None:       # get
1125
            return dbus.String(self.checker_command)
1126
        self.checker_command = value
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1127
        # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1128
        self.PropertyChanged(dbus.String("Checker"),
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1129
                             dbus.String(self.checker_command,
1130
                                         variant_level=1))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1131
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1132
    # CheckerRunning - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1133
    @dbus_service_property(_interface, signature="b",
1134
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1135
    def CheckerRunning_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1136
        if value is None:       # get
1137
            return dbus.Boolean(self.checker is not None)
1138
        if value:
1139
            self.start_checker()
1140
        else:
1141
            self.stop_checker()
1142
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1143
    # ObjectPath - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1144
    @dbus_service_property(_interface, signature="o", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1145
    def ObjectPath_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1146
        return self.dbus_object_path # is already a dbus.ObjectPath
1147
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1148
    # Secret = property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1149
    @dbus_service_property(_interface, signature="ay",
1150
                           access="write", byte_arrays=True)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1151
    def Secret_dbus_property(self, value):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1152
        self.secret = str(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1153
    
1154
    del _interface
3 by Björn Påhlsson
Python based server
1155
1156
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1157
class ProxyClient(object):
1158
    def __init__(self, child_pipe, fpr, address):
1159
        self._pipe = child_pipe
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1160
        self._pipe.send(('init', fpr, address))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1161
        if not self._pipe.recv():
1162
            raise KeyError()
1163
1164
    def __getattribute__(self, name):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1165
        if(name == '_pipe'):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1166
            return super(ProxyClient, self).__getattribute__(name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1167
        self._pipe.send(('getattr', name))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1168
        data = self._pipe.recv()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1169
        if data[0] == 'data':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1170
            return data[1]
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1171
        if data[0] == 'function':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1172
            def func(*args, **kwargs):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1173
                self._pipe.send(('funcall', name, args, kwargs))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1174
                return self._pipe.recv()[1]
1175
            return func
1176
1177
    def __setattr__(self, name, value):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1178
        if(name == '_pipe'):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1179
            return super(ProxyClient, self).__setattr__(name, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1180
        self._pipe.send(('setattr', name, value))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1181
1182
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1183
class ClientHandler(socketserver.BaseRequestHandler, object):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1184
    """A class to handle client connections.
1185
    
1186
    Instantiated once for each connection to handle it.
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1187
    Note: This will run in its own forked process."""
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1188
    
3 by Björn Påhlsson
Python based server
1189
    def handle(self):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1190
        with contextlib.closing(self.server.child_pipe) as child_pipe:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1191
            logger.info("TCP connection from: %s",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1192
                        unicode(self.client_address))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1193
            logger.debug("Pipe FD: %d",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1194
                         self.server.child_pipe.fileno())
1195
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1196
            session = (gnutls.connection
1197
                       .ClientSession(self.request,
1198
                                      gnutls.connection
1199
                                      .X509Credentials()))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1200
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1201
            # Note: gnutls.connection.X509Credentials is really a
1202
            # generic GnuTLS certificate credentials object so long as
1203
            # no X.509 keys are added to it.  Therefore, we can use it
1204
            # here despite using OpenPGP certificates.
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1205
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1206
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
            #                      "+AES-256-CBC", "+SHA1",
1208
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1209
            #                      "+DHE-DSS"))
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1210
            # Use a fallback default, since this MUST be set.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1211
            priority = self.server.gnutls_priority
1212
            if priority is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1213
                priority = "NORMAL"
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1214
            (gnutls.library.functions
1215
             .gnutls_priority_set_direct(session._c_object,
1216
                                         priority, None))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1217
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1218
            # Start communication using the Mandos protocol
1219
            # Get protocol number
1220
            line = self.request.makefile().readline()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1221
            logger.debug("Protocol version: %r", line)
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1222
            try:
1223
                if int(line.strip().split()[0]) > 1:
1224
                    raise RuntimeError
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1225
            except (ValueError, IndexError, RuntimeError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1226
                logger.error("Unknown protocol version: %s", error)
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1227
                return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1228
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1229
            # Start GnuTLS connection
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1230
            try:
1231
                session.handshake()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1232
            except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1233
                logger.warning("Handshake failed: %s", error)
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1234
                # Do not run session.bye() here: the session is not
1235
                # established.  Just abandon the request.
1236
                return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1237
            logger.debug("Handshake succeeded")
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1238
1239
            approval_required = False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1240
            try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1241
                try:
1242
                    fpr = self.fingerprint(self.peer_certificate
1243
                                           (session))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1244
                except (TypeError,
1245
                        gnutls.errors.GNUTLSError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1246
                    logger.warning("Bad certificate: %s", error)
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1247
                    return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1248
                logger.debug("Fingerprint: %s", fpr)
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1249
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1250
                try:
1251
                    client = ProxyClient(child_pipe, fpr,
1252
                                         self.client_address)
1253
                except KeyError:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1254
                    return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1255
                
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1256
                if client.approval_delay:
1257
                    delay = client.approval_delay
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1258
                    client.approvals_pending += 1
1259
                    approval_required = True
1260
                
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1261
                while True:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1262
                    if not client.enabled:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1263
                        logger.warning("Client %s is disabled",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1264
                                       client.name)
1265
                        if self.server.use_dbus:
1266
                            # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1267
                            client.Rejected("Disabled")                    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1268
                        return
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1269
                    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1270
                    if client._approved or not client.approval_delay:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1271
                        #We are approved or approval is disabled
1272
                        break
1273
                    elif client._approved is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1274
                        logger.info("Client %s needs approval",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1275
                                    client.name)
1276
                        if self.server.use_dbus:
1277
                            # Emit D-Bus signal
1278
                            client.NeedApproval(
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1279
                                client.approval_delay_milliseconds(),
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1280
                                client.approved_by_default)
1281
                    else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1282
                        logger.warning("Client %s was not approved",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1283
                                       client.name)
1284
                        if self.server.use_dbus:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1285
                            # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1286
                            client.Rejected("Denied")
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1287
                        return
1288
                    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1289
                    #wait until timeout or approved
1290
                    #x = float(client._timedelta_to_milliseconds(delay))
1291
                    time = datetime.datetime.now()
1292
                    client.changedstate.acquire()
1293
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1294
                    client.changedstate.release()
1295
                    time2 = datetime.datetime.now()
1296
                    if (time2 - time) >= delay:
1297
                        if not client.approved_by_default:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1298
                            logger.warning("Client %s timed out while"
1299
                                           " waiting for approval",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1300
                                           client.name)
1301
                            if self.server.use_dbus:
1302
                                # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1303
                                client.Rejected("Approval timed out")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1304
                            return
1305
                        else:
1306
                            break
1307
                    else:
1308
                        delay -= time2 - time
1309
                
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1310
                sent_size = 0
1311
                while sent_size < len(client.secret):
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1312
                    try:
1313
                        sent = session.send(client.secret[sent_size:])
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1314
                    except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1315
                        logger.warning("gnutls send failed")
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1316
                        return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1317
                    logger.debug("Sent: %d, remaining: %d",
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1318
                                 sent, len(client.secret)
1319
                                 - (sent_size + sent))
1320
                    sent_size += sent
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1321
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1322
                logger.info("Sending secret to %s", client.name)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1323
                # bump the timeout as if seen
1324
                client.checked_ok()
1325
                if self.server.use_dbus:
1326
                    # Emit D-Bus signal
1327
                    client.GotSecret()
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1328
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1329
            finally:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1330
                if approval_required:
1331
                    client.approvals_pending -= 1
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1332
                try:
1333
                    session.bye()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1334
                except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1335
                    logger.warning("GnuTLS bye failed")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1336
    
1337
    @staticmethod
1338
    def peer_certificate(session):
1339
        "Return the peer's OpenPGP certificate as a bytestring"
1340
        # If not an OpenPGP certificate...
1341
        if (gnutls.library.functions
1342
            .gnutls_certificate_type_get(session._c_object)
1343
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1344
            # ...do the normal thing
1345
            return session.peer_certificate
1346
        list_size = ctypes.c_uint(1)
1347
        cert_list = (gnutls.library.functions
1348
                     .gnutls_certificate_get_peers
1349
                     (session._c_object, ctypes.byref(list_size)))
1350
        if not bool(cert_list) and list_size.value != 0:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1351
            raise gnutls.errors.GNUTLSError("error getting peer"
1352
                                            " certificate")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1353
        if list_size.value == 0:
1354
            return None
1355
        cert = cert_list[0]
1356
        return ctypes.string_at(cert.data, cert.size)
1357
    
1358
    @staticmethod
1359
    def fingerprint(openpgp):
1360
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1361
        # New GnuTLS "datum" with the OpenPGP public key
1362
        datum = (gnutls.library.types
1363
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1364
                                             ctypes.POINTER
1365
                                             (ctypes.c_ubyte)),
1366
                                 ctypes.c_uint(len(openpgp))))
1367
        # New empty GnuTLS certificate
1368
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1369
        (gnutls.library.functions
1370
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1371
        # Import the OpenPGP public key into the certificate
1372
        (gnutls.library.functions
1373
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1374
                                    gnutls.library.constants
1375
                                    .GNUTLS_OPENPGP_FMT_RAW))
1376
        # Verify the self signature in the key
1377
        crtverify = ctypes.c_uint()
1378
        (gnutls.library.functions
1379
         .gnutls_openpgp_crt_verify_self(crt, 0,
1380
                                         ctypes.byref(crtverify)))
1381
        if crtverify.value != 0:
1382
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1383
            raise (gnutls.errors.CertificateSecurityError
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1384
                   ("Verify failed"))
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1385
        # New buffer for the fingerprint
1386
        buf = ctypes.create_string_buffer(20)
1387
        buf_len = ctypes.c_size_t()
1388
        # Get the fingerprint from the certificate into the buffer
1389
        (gnutls.library.functions
1390
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1391
                                             ctypes.byref(buf_len)))
1392
        # Deinit the certificate
1393
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1394
        # Convert the buffer to a Python bytestring
1395
        fpr = ctypes.string_at(buf, buf_len.value)
1396
        # Convert the bytestring to hexadecimal notation
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1397
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1398
        return hex_fpr
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1399
1400
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1401
class MultiprocessingMixIn(object):
1402
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1403
    def sub_process_main(self, request, address):
1404
        try:
1405
            self.finish_request(request, address)
1406
        except:
1407
            self.handle_error(request, address)
1408
        self.close_request(request)
1409
            
1410
    def process_request(self, request, address):
1411
        """Start a new process to process the request."""
1412
        multiprocessing.Process(target = self.sub_process_main,
1413
                                args = (request, address)).start()
1414
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1416
    """ adds a pipe to the MixIn """
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1417
    def process_request(self, request, client_address):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1418
        """Overrides and wraps the original process_request().
1419
        
355 by Teddy Hogeborn
* mandos: White-space fixes only.
1420
        This function creates a new pipe in self.pipe
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1421
        """
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1422
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1423
1424
        super(MultiprocessingMixInWithPipe,
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1425
              self).process_request(request, client_address)
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1426
        self.child_pipe.close()
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1427
        self.add_pipe(parent_pipe)
24.1.154 by Björn Påhlsson
merge
1428
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1429
    def add_pipe(self, parent_pipe):
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1430
        """Dummy function; override as necessary"""
464 by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also
1431
        raise NotImplementedError
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1432
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1434
                     socketserver.TCPServer, object):
237.2.13 by Teddy Hogeborn
Merge from trunk. Notable changes:
1435
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1436
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1437
    Attributes:
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1438
        enabled:        Boolean; whether this server is activated yet
1439
        interface:      None or a network interface name (string)
1440
        use_ipv6:       Boolean; to use IPv6 or not
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1441
    """
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1442
    def __init__(self, server_address, RequestHandlerClass,
339 by Teddy Hogeborn
Code cleanup.
1443
                 interface=None, use_ipv6=True):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1444
        self.interface = interface
1445
        if use_ipv6:
1446
            self.address_family = socket.AF_INET6
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1447
        socketserver.TCPServer.__init__(self, server_address,
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1448
                                        RequestHandlerClass)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1449
    def server_bind(self):
1450
        """This overrides the normal server_bind() function
1451
        to bind to an interface if one was specified, and also NOT to
1452
        bind to an address or port if they were not specified."""
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1453
        if self.interface is not None:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1454
            if SO_BINDTODEVICE is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1455
                logger.error("SO_BINDTODEVICE does not exist;"
1456
                             " cannot bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1457
                             self.interface)
1458
            else:
1459
                try:
1460
                    self.socket.setsockopt(socket.SOL_SOCKET,
1461
                                           SO_BINDTODEVICE,
1462
                                           str(self.interface
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1463
                                               + '\0'))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1464
                except socket.error as error:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1465
                    if error[0] == errno.EPERM:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1466
                        logger.error("No permission to"
1467
                                     " bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1468
                                     self.interface)
1469
                    elif error[0] == errno.ENOPROTOOPT:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1470
                        logger.error("SO_BINDTODEVICE not available;"
1471
                                     " cannot bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1472
                                     self.interface)
1473
                    else:
1474
                        raise
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1475
        # Only bind(2) the socket if we really need to.
1476
        if self.server_address[0] or self.server_address[1]:
1477
            if not self.server_address[0]:
314 by Teddy Hogeborn
Support not using IPv6 in server:
1478
                if self.address_family == socket.AF_INET6:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1479
                    any_address = "::" # in6addr_any
314 by Teddy Hogeborn
Support not using IPv6 in server:
1480
                else:
1481
                    any_address = socket.INADDR_ANY
1482
                self.server_address = (any_address,
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1483
                                       self.server_address[1])
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1484
            elif not self.server_address[1]:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1485
                self.server_address = (self.server_address[0],
1486
                                       0)
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1487
#                 if self.interface:
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1488
#                     self.server_address = (self.server_address[0],
1489
#                                            0, # port
1490
#                                            0, # flowinfo
1491
#                                            if_nametoindex
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1492
#                                            (self.interface))
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1493
            return socketserver.TCPServer.server_bind(self)
339 by Teddy Hogeborn
Code cleanup.
1494
1495
1496
class MandosServer(IPv6_TCPServer):
1497
    """Mandos server.
1498
    
1499
    Attributes:
1500
        clients:        set of Client objects
1501
        gnutls_priority GnuTLS priority string
1502
        use_dbus:       Boolean; to emit D-Bus signals or not
340 by Teddy Hogeborn
Code cleanup.
1503
    
1504
    Assumes a gobject.MainLoop event loop.
339 by Teddy Hogeborn
Code cleanup.
1505
    """
1506
    def __init__(self, server_address, RequestHandlerClass,
1507
                 interface=None, use_ipv6=True, clients=None,
1508
                 gnutls_priority=None, use_dbus=True):
1509
        self.enabled = False
1510
        self.clients = clients
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1511
        if self.clients is None:
1512
            self.clients = set()
339 by Teddy Hogeborn
Code cleanup.
1513
        self.use_dbus = use_dbus
1514
        self.gnutls_priority = gnutls_priority
1515
        IPv6_TCPServer.__init__(self, server_address,
1516
                                RequestHandlerClass,
1517
                                interface = interface,
1518
                                use_ipv6 = use_ipv6)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1519
    def server_activate(self):
1520
        if self.enabled:
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1521
            return socketserver.TCPServer.server_activate(self)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1522
    def enable(self):
1523
        self.enabled = True
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1524
    def add_pipe(self, parent_pipe):
340 by Teddy Hogeborn
Code cleanup.
1525
        # Call "handle_ipc" for both data and EOF events
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1526
        gobject.io_add_watch(parent_pipe.fileno(),
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1527
                             gobject.IO_IN | gobject.IO_HUP,
1528
                             functools.partial(self.handle_ipc,
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1529
                                               parent_pipe = parent_pipe))
1530
        
1531
    def handle_ipc(self, source, condition, parent_pipe=None,
1532
                   client_object=None):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1533
        condition_names = {
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1534
            gobject.IO_IN: "IN",   # There is data to read.
1535
            gobject.IO_OUT: "OUT", # Data can be written (without
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1536
                                    # blocking).
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1537
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
            gobject.IO_ERR: "ERR", # Error condition.
1539
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1540
                                    # broken, usually for pipes and
1541
                                    # sockets).
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1542
            }
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1543
        conditions_string = ' | '.join(name
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1544
                                       for cond, name in
1545
                                       condition_names.iteritems()
1546
                                       if cond & condition)
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1547
        # error or the other end of multiprocessing.Pipe has closed
1548
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1549
            return False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1550
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1551
        # Read a request from the child
1552
        request = parent_pipe.recv()
1553
        command = request[0]
1554
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1555
        if command == 'init':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1556
            fpr = request[1]
1557
            address = request[2]
1558
            
1559
            for c in self.clients:
1560
                if c.fingerprint == fpr:
1561
                    client = c
1562
                    break
1563
            else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1564
                logger.warning("Client not found for fingerprint: %s, ad"
1565
                               "dress: %s", fpr, address)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1566
                if self.use_dbus:
1567
                    # Emit D-Bus signal
441 by Teddy Hogeborn
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
1568
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1569
                parent_pipe.send(False)
1570
                return False
1571
            
1572
            gobject.io_add_watch(parent_pipe.fileno(),
1573
                                 gobject.IO_IN | gobject.IO_HUP,
1574
                                 functools.partial(self.handle_ipc,
1575
                                                   parent_pipe = parent_pipe,
1576
                                                   client_object = client))
1577
            parent_pipe.send(True)
1578
            # remove the old hook in favor of the new above hook on same fileno
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1579
            return False
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1580
        if command == 'funcall':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1581
            funcname = request[1]
1582
            args = request[2]
1583
            kwargs = request[3]
1584
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1585
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1586
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1587
        if command == 'getattr':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1588
            attrname = request[1]
1589
            if callable(client_object.__getattribute__(attrname)):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1590
                parent_pipe.send(('function',))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1591
            else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1592
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1593
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1594
        if command == 'setattr':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1595
            attrname = request[1]
1596
            value = request[2]
1597
            setattr(client_object, attrname, value)
24.1.154 by Björn Påhlsson
merge
1598
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1599
        return True
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
1600
3 by Björn Påhlsson
Python based server
1601
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1602
def string_to_delta(interval):
1603
    """Parse a string and return a datetime.timedelta
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1604
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1605
    >>> string_to_delta('7d')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1606
    datetime.timedelta(7)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1607
    >>> string_to_delta('60s')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1608
    datetime.timedelta(0, 60)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1609
    >>> string_to_delta('60m')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1610
    datetime.timedelta(0, 3600)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1611
    >>> string_to_delta('24h')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1612
    datetime.timedelta(1)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1613
    >>> string_to_delta('1w')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1614
    datetime.timedelta(7)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1615
    >>> string_to_delta('5m 30s')
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1616
    datetime.timedelta(0, 330)
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1617
    """
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1618
    timevalue = datetime.timedelta(0)
1619
    for s in interval.split():
1620
        try:
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1621
            suffix = unicode(s[-1])
1622
            value = int(s[:-1])
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1623
            if suffix == "d":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1624
                delta = datetime.timedelta(value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1625
            elif suffix == "s":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1626
                delta = datetime.timedelta(0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1627
            elif suffix == "m":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1628
                delta = datetime.timedelta(0, 0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1629
            elif suffix == "h":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1630
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1631
            elif suffix == "w":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1632
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1633
            else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1634
                raise ValueError("Unknown suffix %r" % suffix)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1635
        except (ValueError, IndexError) as e:
464 by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also
1636
            raise ValueError(*(e.args))
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1637
        timevalue += delta
1638
    return timevalue
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1639
8 by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT.
1640
24.1.13 by Björn Påhlsson
mandosclient
1641
def if_nametoindex(interface):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1642
    """Call the C function if_nametoindex(), or equivalent
1643
    
1644
    Note: This function cannot accept a unicode string."""
24.1.13 by Björn Påhlsson
mandosclient
1645
    global if_nametoindex
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1646
    try:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1647
        if_nametoindex = (ctypes.cdll.LoadLibrary
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1648
                          (ctypes.util.find_library("c"))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1649
                          .if_nametoindex)
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1650
    except (OSError, AttributeError):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1651
        logger.warning("Doing if_nametoindex the hard way")
24.1.13 by Björn Påhlsson
mandosclient
1652
        def if_nametoindex(interface):
28 by Teddy Hogeborn
* server.conf: New file.
1653
            "Get an interface index the hard way, i.e. using fcntl()"
1654
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1655
            with contextlib.closing(socket.socket()) as s:
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
1656
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1657
                                    struct.pack(str("16s16x"),
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1658
                                                interface))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1659
            interface_index = struct.unpack(str("I"),
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1660
                                            ifreq[16:20])[0]
28 by Teddy Hogeborn
* server.conf: New file.
1661
            return interface_index
24.1.13 by Björn Påhlsson
mandosclient
1662
    return if_nametoindex(interface)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1663
1664
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
1665
def daemon(nochdir = False, noclose = False):
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1666
    """See daemon(3).  Standard BSD Unix function.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1667
    
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1668
    This should really exist as os.daemon, but it doesn't (yet)."""
1669
    if os.fork():
1670
        sys.exit()
1671
    os.setsid()
1672
    if not nochdir:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1673
        os.chdir("/")
46 by Teddy Hogeborn
* network-protocol.txt: New.
1674
    if os.fork():
1675
        sys.exit()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1676
    if not noclose:
1677
        # Close all standard open file descriptors
28 by Teddy Hogeborn
* server.conf: New file.
1678
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1679
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1680
            raise OSError(errno.ENODEV,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1681
                          "%s not a character device"
388 by Teddy Hogeborn
* mandos (daemon): Use "os.path.devnull" in the error message.
1682
                          % os.path.devnull)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1683
        os.dup2(null, sys.stdin.fileno())
1684
        os.dup2(null, sys.stdout.fileno())
1685
        os.dup2(null, sys.stderr.fileno())
1686
        if null > 2:
1687
            os.close(null)
1688
1689
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1690
def main():
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1691
    
379 by Teddy Hogeborn
* mandos: Fix line lengths.
1692
    ##################################################################
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1693
    # Parsing of options, both command line and config file
1694
    
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
1695
    parser = argparse.ArgumentParser()
1696
    parser.add_argument("-v", "--version", action="version",
1697
                        version = "%%(prog)s %s" % version,
1698
                        help="show version number and exit")
1699
    parser.add_argument("-i", "--interface", metavar="IF",
1700
                        help="Bind to interface IF")
1701
    parser.add_argument("-a", "--address",
1702
                        help="Address to listen for requests on")
1703
    parser.add_argument("-p", "--port", type=int,
1704
                        help="Port number to receive requests on")
1705
    parser.add_argument("--check", action="store_true",
1706
                        help="Run self-test")
1707
    parser.add_argument("--debug", action="store_true",
1708
                        help="Debug mode; run in foreground and log"
1709
                        " to terminal")
1710
    parser.add_argument("--debuglevel", metavar="LEVEL",
1711
                        help="Debug level for stdout output")
1712
    parser.add_argument("--priority", help="GnuTLS"
1713
                        " priority string (see GnuTLS documentation)")
1714
    parser.add_argument("--servicename",
1715
                        metavar="NAME", help="Zeroconf service name")
1716
    parser.add_argument("--configdir",
1717
                        default="/etc/mandos", metavar="DIR",
1718
                        help="Directory to search for configuration"
1719
                        " files")
1720
    parser.add_argument("--no-dbus", action="store_false",
1721
                        dest="use_dbus", help="Do not provide D-Bus"
1722
                        " system bus interface")
1723
    parser.add_argument("--no-ipv6", action="store_false",
1724
                        dest="use_ipv6", help="Do not use IPv6")
1725
    options = parser.parse_args()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1726
    
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1727
    if options.check:
1728
        import doctest
1729
        doctest.testmod()
1730
        sys.exit()
3 by Björn Påhlsson
Python based server
1731
    
28 by Teddy Hogeborn
* server.conf: New file.
1732
    # Default values for config file for server-global settings
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1733
    server_defaults = { "interface": "",
1734
                        "address": "",
1735
                        "port": "",
1736
                        "debug": "False",
1737
                        "priority":
1738
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
                        "servicename": "Mandos",
1740
                        "use_dbus": "True",
1741
                        "use_ipv6": "True",
1742
                        "debuglevel": "",
28 by Teddy Hogeborn
* server.conf: New file.
1743
                        }
1744
    
1745
    # Parse config file for server-global settings
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1746
    server_config = configparser.SafeConfigParser(server_defaults)
28 by Teddy Hogeborn
* server.conf: New file.
1747
    del server_defaults
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1748
    server_config.read(os.path.join(options.configdir,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1749
                                    "mandos.conf"))
28 by Teddy Hogeborn
* server.conf: New file.
1750
    # Convert the SafeConfigParser object to a dict
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
1751
    server_settings = server_config.defaults()
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
1752
    # Use the appropriate methods on the non-string config options
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1753
    for option in ("debug", "use_dbus", "use_ipv6"):
1754
        server_settings[option] = server_config.getboolean("DEFAULT",
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1755
                                                           option)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1756
    if server_settings["port"]:
1757
        server_settings["port"] = server_config.getint("DEFAULT",
1758
                                                       "port")
28 by Teddy Hogeborn
* server.conf: New file.
1759
    del server_config
1760
    
1761
    # Override the settings from the config file with command line
1762
    # options, if set.
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1763
    for option in ("interface", "address", "port", "debug",
1764
                   "priority", "servicename", "configdir",
1765
                   "use_dbus", "use_ipv6", "debuglevel"):
28 by Teddy Hogeborn
* server.conf: New file.
1766
        value = getattr(options, option)
1767
        if value is not None:
1768
            server_settings[option] = value
1769
    del options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1770
    # Force all strings to be unicode
1771
    for option in server_settings.keys():
1772
        if type(server_settings[option]) is str:
1773
            server_settings[option] = unicode(server_settings[option])
28 by Teddy Hogeborn
* server.conf: New file.
1774
    # Now we have our good server settings in "server_settings"
1775
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1776
    ##################################################################
1777
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1778
    # For convenience
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1779
    debug = server_settings["debug"]
1780
    debuglevel = server_settings["debuglevel"]
1781
    use_dbus = server_settings["use_dbus"]
1782
    use_ipv6 = server_settings["use_ipv6"]
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1783
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1784
    if server_settings["servicename"] != "Mandos":
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1785
        syslogger.setFormatter(logging.Formatter
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1786
                               ('Mandos (%s) [%%(process)d]:'
1787
                                ' %%(levelname)s: %%(message)s'
1788
                                % server_settings["servicename"]))
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1789
    
28 by Teddy Hogeborn
* server.conf: New file.
1790
    # Parse config file with clients
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1791
    client_defaults = { "timeout": "1h",
1792
                        "interval": "5m",
1793
                        "checker": "fping -q -- %%(host)s",
1794
                        "host": "",
1795
                        "approval_delay": "0s",
1796
                        "approval_duration": "1s",
28 by Teddy Hogeborn
* server.conf: New file.
1797
                        }
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1798
    client_config = configparser.SafeConfigParser(client_defaults)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1799
    client_config.read(os.path.join(server_settings["configdir"],
1800
                                    "clients.conf"))
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1801
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1802
    global mandos_dbus_service
1803
    mandos_dbus_service = None
28 by Teddy Hogeborn
* server.conf: New file.
1804
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1805
    tcp_server = MandosServer((server_settings["address"],
1806
                               server_settings["port"]),
339 by Teddy Hogeborn
Code cleanup.
1807
                              ClientHandler,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1808
                              interface=(server_settings["interface"]
237.2.35 by teddy at bsnet
* mandos (main): Bug fix: Don't try to bind to an empty string
1809
                                         or None),
339 by Teddy Hogeborn
Code cleanup.
1810
                              use_ipv6=use_ipv6,
1811
                              gnutls_priority=
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1812
                              server_settings["priority"],
339 by Teddy Hogeborn
Code cleanup.
1813
                              use_dbus=use_dbus)
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1814
    if not debug:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1815
        pidfilename = "/var/run/mandos.pid"
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1816
        try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1817
            pidfile = open(pidfilename, "w")
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1818
        except IOError:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1819
            logger.error("Could not open file %r", pidfilename)
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1820
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1821
    try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1822
        uid = pwd.getpwnam("_mandos").pw_uid
1823
        gid = pwd.getpwnam("_mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1824
    except KeyError:
1825
        try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1826
            uid = pwd.getpwnam("mandos").pw_uid
1827
            gid = pwd.getpwnam("mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1828
        except KeyError:
1829
            try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1830
                uid = pwd.getpwnam("nobody").pw_uid
1831
                gid = pwd.getpwnam("nobody").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1832
            except KeyError:
1833
                uid = 65534
1834
                gid = 65534
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1835
    try:
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1836
        os.setgid(gid)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1837
        os.setuid(uid)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1838
    except OSError as error:
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1839
        if error[0] != errno.EPERM:
1840
            raise error
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1841
    
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1842
    if not debug and not debuglevel:
1843
        syslogger.setLevel(logging.WARNING)
1844
        console.setLevel(logging.WARNING)
1845
    if debuglevel:
1846
        level = getattr(logging, debuglevel.upper())
1847
        syslogger.setLevel(level)
1848
        console.setLevel(level)
1849
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1850
    if debug:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1851
        # Enable all possible GnuTLS debugging
1852
        
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1853
        # "Use a log level over 10 to enable all debugging options."
1854
        # - GnuTLS manual
1855
        gnutls.library.functions.gnutls_global_set_log_level(11)
1856
        
1857
        @gnutls.library.types.gnutls_log_func
1858
        def debug_gnutls(level, string):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1859
            logger.debug("GnuTLS: %s", string[:-1])
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1860
        
1861
        (gnutls.library.functions
1862
         .gnutls_global_set_log_function(debug_gnutls))
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1863
        
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1864
        # Redirect stdin so all checkers get /dev/null
1865
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1866
        os.dup2(null, sys.stdin.fileno())
1867
        if null > 2:
1868
            os.close(null)
1869
    else:
1870
        # No console logging
1871
        logger.removeHandler(console)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1872
    
458 by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus.
1873
    # Need to fork before connecting to D-Bus
1874
    if not debug:
1875
        # Close all input and output, do double fork, etc.
1876
        daemon()
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1877
    
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1878
    global main_loop
1879
    # From the Avahi example code
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1880
    DBusGMainLoop(set_as_default=True )
1881
    main_loop = gobject.MainLoop()
1882
    bus = dbus.SystemBus()
1883
    # End of Avahi example code
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1884
    if use_dbus:
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1885
        try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1886
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1887
                                            bus, do_not_queue=True)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1888
        except dbus.exceptions.NameExistsException as e:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1889
            logger.error(unicode(e) + ", disabling D-Bus")
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1890
            use_dbus = False
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1891
            server_settings["use_dbus"] = False
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1892
            tcp_server.use_dbus = False
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1893
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1894
    service = AvahiService(name = server_settings["servicename"],
1895
                           servicetype = "_mandos._tcp",
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1896
                           protocol = protocol, bus = bus)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1897
    if server_settings["interface"]:
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1898
        service.interface = (if_nametoindex
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1899
                             (str(server_settings["interface"])))
458 by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus.
1900
    
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1901
    global multiprocessing_manager
1902
    multiprocessing_manager = multiprocessing.Manager()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1903
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1904
    client_class = Client
1905
    if use_dbus:
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1906
        client_class = functools.partial(ClientDBus, bus = bus)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1907
    def client_config_items(config, section):
1908
        special_settings = {
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1909
            "approved_by_default":
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1910
                lambda: config.getboolean(section,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1911
                                          "approved_by_default"),
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1912
            }
1913
        for name, value in config.items(section):
1914
            try:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1915
                yield (name, special_settings[name]())
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1916
            except KeyError:
1917
                yield (name, value)
1918
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1919
    tcp_server.clients.update(set(
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1920
            client_class(name = section,
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1921
                         config= dict(client_config_items(
1922
                        client_config, section)))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1923
            for section in client_config.sections()))
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1924
    if not tcp_server.clients:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1925
        logger.warning("No clients defined")
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1926
        
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1927
    if not debug:
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1928
        try:
1929
            with pidfile:
1930
                pid = os.getpid()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1931
                pidfile.write(str(pid) + "\n".encode("utf-8"))
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1932
            del pidfile
1933
        except IOError:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1934
            logger.error("Could not write to file %r with PID %d",
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1935
                         pidfilename, pid)
1936
        except NameError:
1937
            # "pidfile" was never created
1938
            pass
1939
        del pidfilename
1940
        
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1941
        signal.signal(signal.SIGINT, signal.SIG_IGN)
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
1942
28 by Teddy Hogeborn
* server.conf: New file.
1943
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1944
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1945
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1946
    if use_dbus:
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1947
        class MandosDBusService(dbus.service.Object):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1948
            """A D-Bus proxy object"""
1949
            def __init__(self):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1950
                dbus.service.Object.__init__(self, bus, "/")
1951
            _interface = "se.bsnet.fukt.Mandos"
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1952
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1953
            @dbus.service.signal(_interface, signature="o")
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1954
            def ClientAdded(self, objpath):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1955
                "D-Bus signal"
1956
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1957
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1958
            @dbus.service.signal(_interface, signature="ss")
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
1959
            def ClientNotFound(self, fingerprint, address):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1960
                "D-Bus signal"
1961
                pass
1962
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1963
            @dbus.service.signal(_interface, signature="os")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1964
            def ClientRemoved(self, objpath, name):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1965
                "D-Bus signal"
1966
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1967
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1968
            @dbus.service.method(_interface, out_signature="ao")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1969
            def GetAllClients(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1970
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1971
                return dbus.Array(c.dbus_object_path
1972
                                  for c in tcp_server.clients)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1973
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1974
            @dbus.service.method(_interface,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1975
                                 out_signature="a{oa{sv}}")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1976
            def GetAllClientsWithProperties(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1977
                "D-Bus method"
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1978
                return dbus.Dictionary(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1979
                    ((c.dbus_object_path, c.GetAll(""))
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1980
                     for c in tcp_server.clients),
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1981
                    signature="oa{sv}")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1982
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1983
            @dbus.service.method(_interface, in_signature="o")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1984
            def RemoveClient(self, object_path):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1985
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1986
                for c in tcp_server.clients:
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1987
                    if c.dbus_object_path == object_path:
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1988
                        tcp_server.clients.remove(c)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1989
                        c.remove_from_connection()
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1990
                        # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1991
                        c.disable(quiet=True)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1992
                        # Emit D-Bus signal
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1993
                        self.ClientRemoved(object_path, c.name)
1994
                        return
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1995
                raise KeyError(object_path)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1996
            
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1997
            del _interface
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1998
        
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1999
        mandos_dbus_service = MandosDBusService()
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2000
    
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2001
    def cleanup():
2002
        "Cleanup function; run on exit"
2003
        service.cleanup()
2004
        
2005
        while tcp_server.clients:
2006
            client = tcp_server.clients.pop()
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2007
            if use_dbus:
2008
                client.remove_from_connection()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2009
            client.disable_hook = None
2010
            # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2011
            client.disable(quiet=True)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2012
            if use_dbus:
2013
                # Emit D-Bus signal
2014
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2015
                                                  client.name)
2016
    
2017
    atexit.register(cleanup)
2018
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
2019
    for client in tcp_server.clients:
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2020
        if use_dbus:
2021
            # Emit D-Bus signal
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
2022
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
2023
        client.enable()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2024
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2025
    tcp_server.enable()
2026
    tcp_server.server_activate()
2027
    
28 by Teddy Hogeborn
* server.conf: New file.
2028
    # Find out what port we got
2029
    service.port = tcp_server.socket.getsockname()[1]
314 by Teddy Hogeborn
Support not using IPv6 in server:
2030
    if use_ipv6:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2031
        logger.info("Now listening on address %r, port %d,"
2032
                    " flowinfo %d, scope_id %d"
314 by Teddy Hogeborn
Support not using IPv6 in server:
2033
                    % tcp_server.socket.getsockname())
2034
    else:                       # IPv4
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2035
        logger.info("Now listening on address %r, port %d"
314 by Teddy Hogeborn
Support not using IPv6 in server:
2036
                    % tcp_server.socket.getsockname())
28 by Teddy Hogeborn
* server.conf: New file.
2037
    
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
2038
    #service.interface = tcp_server.socket.getsockname()[3]
28 by Teddy Hogeborn
* server.conf: New file.
2039
    
2040
    try:
2041
        # From the Avahi example code
2042
        try:
336 by Teddy Hogeborn
Code cleanup.
2043
            service.activate()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2044
        except dbus.exceptions.DBusException as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2045
            logger.critical("DBusException: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2046
            cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
2047
            sys.exit(1)
2048
        # End of Avahi example code
2049
        
2050
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2051
                             lambda *args, **kwargs:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
2052
                             (tcp_server.handle_request
2053
                              (*args[2:], **kwargs) or True))
28 by Teddy Hogeborn
* server.conf: New file.
2054
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2055
        logger.debug("Starting main loop")
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2056
        main_loop.run()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2057
    except AvahiError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2058
        logger.critical("AvahiError: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2059
        cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
2060
        sys.exit(1)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2061
    except KeyboardInterrupt:
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2062
        if debug:
463.1.5 by teddy at bsnet
* mandos: Use unicode string literals.
2063
            print("", file=sys.stderr)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2064
        logger.debug("Server received KeyboardInterrupt")
2065
    logger.debug("Server exiting")
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2066
    # Must run before the D-Bus bus name gets deregistered
2067
    cleanup()
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2068
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2069
if __name__ == '__main__':
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2070
    main()