/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-06-19 00:37:04 UTC
  • mto: (24.1.149 mandos)
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: teddy@fukt.bsnet.se-20100619003704-vpicvssvv1ktg2om
* mandos (ClientHandler.handle): Set up the GnuTLS session object
                                 before reading the protocol number.
 (ClientHandler.handle/ProxyObject): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
9
 
# methods "add" and "remove" in the "AvahiService" class, the
10
 
# "server_state_changed" and "entry_group_state_changed" functions,
11
 
# and some lines in "main".
 
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".
12
12
13
13
# Everything else is
14
14
# Copyright © 2008,2009 Teddy Hogeborn
33
33
 
34
34
from __future__ import division, with_statement, absolute_import
35
35
 
36
 
import SocketServer
 
36
import SocketServer as socketserver
37
37
import socket
38
38
import optparse
39
39
import datetime
44
44
import gnutls.library.functions
45
45
import gnutls.library.constants
46
46
import gnutls.library.types
47
 
import ConfigParser
 
47
import ConfigParser as configparser
48
48
import sys
49
49
import re
50
50
import os
51
51
import signal
52
 
from sets import Set
53
52
import subprocess
54
53
import atexit
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
57
import pwd
59
 
from contextlib import closing
 
58
import contextlib
 
59
import struct
 
60
import fcntl
 
61
import functools
 
62
import cPickle as pickle
 
63
import select
60
64
 
61
65
import dbus
62
66
import dbus.service
65
69
from dbus.mainloop.glib import DBusGMainLoop
66
70
import ctypes
67
71
import ctypes.util
68
 
 
69
 
version = "1.0.5"
70
 
 
71
 
logger = logging.Logger('mandos')
 
72
import xml.dom.minidom
 
73
import inspect
 
74
 
 
75
try:
 
76
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
77
except AttributeError:
 
78
    try:
 
79
        from IN import SO_BINDTODEVICE
 
80
    except ImportError:
 
81
        SO_BINDTODEVICE = None
 
82
 
 
83
 
 
84
version = "1.0.14"
 
85
 
 
86
logger = logging.Logger(u'mandos')
72
87
syslogger = (logging.handlers.SysLogHandler
73
88
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
89
              address = "/dev/log"))
75
90
syslogger.setFormatter(logging.Formatter
76
 
                       ('Mandos: %(levelname)s: %(message)s'))
 
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
92
                        u' %(message)s'))
77
93
logger.addHandler(syslogger)
78
94
 
79
95
console = logging.StreamHandler()
80
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
81
 
                                       ' %(message)s'))
 
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
97
                                       u' %(levelname)s:'
 
98
                                       u' %(message)s'))
82
99
logger.addHandler(console)
83
100
 
84
101
class AvahiError(Exception):
97
114
 
98
115
class AvahiService(object):
99
116
    """An Avahi (Zeroconf) service.
 
117
    
100
118
    Attributes:
101
119
    interface: integer; avahi.IF_UNSPEC or an interface index.
102
120
               Used to optionally bind to the specified interface.
103
 
    name: string; Example: 'Mandos'
104
 
    type: string; Example: '_mandos._tcp'.
 
121
    name: string; Example: u'Mandos'
 
122
    type: string; Example: u'_mandos._tcp'.
105
123
                  See <http://www.dns-sd.org/ServiceTypes.html>
106
124
    port: integer; what port to announce
107
125
    TXT: list of strings; TXT record for the service
110
128
    max_renames: integer; maximum number of renames
111
129
    rename_count: integer; counter so we only rename after collisions
112
130
                  a sensible number of times
 
131
    group: D-Bus Entry Group
 
132
    server: D-Bus Server
 
133
    bus: dbus.SystemBus()
113
134
    """
114
135
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
136
                 servicetype = None, port = None, TXT = None,
116
 
                 domain = "", host = "", max_renames = 32768):
 
137
                 domain = u"", host = u"", max_renames = 32768,
 
138
                 protocol = avahi.PROTO_UNSPEC, bus = None):
117
139
        self.interface = interface
118
140
        self.name = name
119
141
        self.type = servicetype
123
145
        self.host = host
124
146
        self.rename_count = 0
125
147
        self.max_renames = max_renames
 
148
        self.protocol = protocol
 
149
        self.group = None       # our entry group
 
150
        self.server = None
 
151
        self.bus = bus
126
152
    def rename(self):
127
153
        """Derived from the Avahi example code"""
128
154
        if self.rename_count >= self.max_renames:
130
156
                            u" after %i retries, exiting.",
131
157
                            self.rename_count)
132
158
            raise AvahiServiceError(u"Too many renames")
133
 
        self.name = server.GetAlternativeServiceName(self.name)
 
159
        self.name = self.server.GetAlternativeServiceName(self.name)
134
160
        logger.info(u"Changing Zeroconf service name to %r ...",
135
 
                    str(self.name))
 
161
                    unicode(self.name))
136
162
        syslogger.setFormatter(logging.Formatter
137
 
                               ('Mandos (%s): %%(levelname)s:'
138
 
                                ' %%(message)s' % self.name))
 
163
                               (u'Mandos (%s) [%%(process)d]:'
 
164
                                u' %%(levelname)s: %%(message)s'
 
165
                                % self.name))
139
166
        self.remove()
140
167
        self.add()
141
168
        self.rename_count += 1
142
169
    def remove(self):
143
170
        """Derived from the Avahi example code"""
144
 
        if group is not None:
145
 
            group.Reset()
 
171
        if self.group is not None:
 
172
            self.group.Reset()
146
173
    def add(self):
147
174
        """Derived from the Avahi example code"""
148
 
        global group
149
 
        if group is None:
150
 
            group = dbus.Interface(bus.get_object
151
 
                                   (avahi.DBUS_NAME,
152
 
                                    server.EntryGroupNew()),
153
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
 
            group.connect_to_signal('StateChanged',
155
 
                                    entry_group_state_changed)
 
175
        if self.group is None:
 
176
            self.group = dbus.Interface(
 
177
                self.bus.get_object(avahi.DBUS_NAME,
 
178
                                    self.server.EntryGroupNew()),
 
179
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
180
            self.group.connect_to_signal('StateChanged',
 
181
                                         self
 
182
                                         .entry_group_state_changed)
156
183
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
157
 
                     service.name, service.type)
158
 
        group.AddService(
159
 
                self.interface,         # interface
160
 
                avahi.PROTO_INET6,      # protocol
161
 
                dbus.UInt32(0),         # flags
162
 
                self.name, self.type,
163
 
                self.domain, self.host,
164
 
                dbus.UInt16(self.port),
165
 
                avahi.string_array_to_txt_array(self.TXT))
166
 
        group.Commit()
167
 
 
168
 
# From the Avahi example code:
169
 
group = None                            # our entry group
170
 
# End of Avahi example code
171
 
 
172
 
 
173
 
def _datetime_to_dbus(dt, variant_level=0):
174
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
175
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
176
 
 
177
 
 
178
 
class Client(dbus.service.Object):
 
184
                     self.name, self.type)
 
185
        self.group.AddService(
 
186
            self.interface,
 
187
            self.protocol,
 
188
            dbus.UInt32(0),     # flags
 
189
            self.name, self.type,
 
190
            self.domain, self.host,
 
191
            dbus.UInt16(self.port),
 
192
            avahi.string_array_to_txt_array(self.TXT))
 
193
        self.group.Commit()
 
194
    def entry_group_state_changed(self, state, error):
 
195
        """Derived from the Avahi example code"""
 
196
        logger.debug(u"Avahi state change: %i", state)
 
197
        
 
198
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
199
            logger.debug(u"Zeroconf service established.")
 
200
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
201
            logger.warning(u"Zeroconf service name collision.")
 
202
            self.rename()
 
203
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
204
            logger.critical(u"Avahi: Error in group state changed %s",
 
205
                            unicode(error))
 
206
            raise AvahiGroupError(u"State changed: %s"
 
207
                                  % unicode(error))
 
208
    def cleanup(self):
 
209
        """Derived from the Avahi example code"""
 
210
        if self.group is not None:
 
211
            self.group.Free()
 
212
            self.group = None
 
213
    def server_state_changed(self, state):
 
214
        """Derived from the Avahi example code"""
 
215
        if state == avahi.SERVER_COLLISION:
 
216
            logger.error(u"Zeroconf server name collision")
 
217
            self.remove()
 
218
        elif state == avahi.SERVER_RUNNING:
 
219
            self.add()
 
220
    def activate(self):
 
221
        """Derived from the Avahi example code"""
 
222
        if self.server is None:
 
223
            self.server = dbus.Interface(
 
224
                self.bus.get_object(avahi.DBUS_NAME,
 
225
                                    avahi.DBUS_PATH_SERVER),
 
226
                avahi.DBUS_INTERFACE_SERVER)
 
227
        self.server.connect_to_signal(u"StateChanged",
 
228
                                 self.server_state_changed)
 
229
        self.server_state_changed(self.server.GetState())
 
230
 
 
231
 
 
232
class Client(object):
179
233
    """A representation of a client host served by this server.
 
234
    
180
235
    Attributes:
181
236
    name:       string; from the config file, used in log messages and
182
237
                        D-Bus identifiers
189
244
    enabled:    bool()
190
245
    last_checked_ok: datetime.datetime(); (UTC) or None
191
246
    timeout:    datetime.timedelta(); How long from last_checked_ok
192
 
                                      until this client is invalid
 
247
                                      until this client is disabled
193
248
    interval:   datetime.timedelta(); How often to start a new checker
194
249
    disable_hook:  If set, called by disable() as disable_hook(self)
195
250
    checker:    subprocess.Popen(); a running checker process used
196
251
                                    to see if the client lives.
197
252
                                    'None' if no process is running.
198
253
    checker_initiator_tag: a gobject event source tag, or None
199
 
    disable_initiator_tag:    - '' -
 
254
    disable_initiator_tag: - '' -
200
255
    checker_callback_tag:  - '' -
201
256
    checker_command: string; External command which is run to check if
202
257
                     client lives.  %() expansions are done at
203
258
                     runtime with vars(self) as dict, so that for
204
259
                     instance %(name)s can be used in the command.
205
 
    use_dbus: bool(); Whether to provide D-Bus interface and signals
206
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
 
260
    current_checker_command: string; current running checker_command
207
261
    """
 
262
    
 
263
    @staticmethod
 
264
    def _timedelta_to_milliseconds(td):
 
265
        "Convert a datetime.timedelta() to milliseconds"
 
266
        return ((td.days * 24 * 60 * 60 * 1000)
 
267
                + (td.seconds * 1000)
 
268
                + (td.microseconds // 1000))
 
269
    
208
270
    def timeout_milliseconds(self):
209
271
        "Return the 'timeout' attribute in milliseconds"
210
 
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
211
 
                + (self.timeout.seconds * 1000)
212
 
                + (self.timeout.microseconds // 1000))
 
272
        return self._timedelta_to_milliseconds(self.timeout)
213
273
    
214
274
    def interval_milliseconds(self):
215
275
        "Return the 'interval' attribute in milliseconds"
216
 
        return ((self.interval.days * 24 * 60 * 60 * 1000)
217
 
                + (self.interval.seconds * 1000)
218
 
                + (self.interval.microseconds // 1000))
 
276
        return self._timedelta_to_milliseconds(self.interval)
219
277
    
220
 
    def __init__(self, name = None, disable_hook=None, config=None,
221
 
                 use_dbus=True):
 
278
    def __init__(self, name = None, disable_hook=None, config=None):
222
279
        """Note: the 'checker' key in 'config' sets the
223
280
        'checker_command' attribute and *not* the 'checker'
224
281
        attribute."""
226
283
        if config is None:
227
284
            config = {}
228
285
        logger.debug(u"Creating client %r", self.name)
229
 
        self.use_dbus = False   # During __init__
230
286
        # Uppercase and remove spaces from fingerprint for later
231
287
        # comparison purposes with return value from the fingerprint()
232
288
        # function
233
 
        self.fingerprint = (config["fingerprint"].upper()
 
289
        self.fingerprint = (config[u"fingerprint"].upper()
234
290
                            .replace(u" ", u""))
235
291
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
236
 
        if "secret" in config:
237
 
            self.secret = config["secret"].decode(u"base64")
238
 
        elif "secfile" in config:
239
 
            with closing(open(os.path.expanduser
240
 
                              (os.path.expandvars
241
 
                               (config["secfile"])))) as secfile:
 
292
        if u"secret" in config:
 
293
            self.secret = config[u"secret"].decode(u"base64")
 
294
        elif u"secfile" in config:
 
295
            with open(os.path.expanduser(os.path.expandvars
 
296
                                         (config[u"secfile"])),
 
297
                      "rb") as secfile:
242
298
                self.secret = secfile.read()
243
299
        else:
244
300
            raise TypeError(u"No secret or secfile for client %s"
245
301
                            % self.name)
246
 
        self.host = config.get("host", "")
 
302
        self.host = config.get(u"host", u"")
247
303
        self.created = datetime.datetime.utcnow()
248
304
        self.enabled = False
249
305
        self.last_enabled = None
250
306
        self.last_checked_ok = None
251
 
        self.timeout = string_to_delta(config["timeout"])
252
 
        self.interval = string_to_delta(config["interval"])
 
307
        self.timeout = string_to_delta(config[u"timeout"])
 
308
        self.interval = string_to_delta(config[u"interval"])
253
309
        self.disable_hook = disable_hook
254
310
        self.checker = None
255
311
        self.checker_initiator_tag = None
256
312
        self.disable_initiator_tag = None
257
313
        self.checker_callback_tag = None
258
 
        self.checker_command = config["checker"]
 
314
        self.checker_command = config[u"checker"]
 
315
        self.current_checker_command = None
259
316
        self.last_connect = None
260
 
        # Only now, when this client is initialized, can it show up on
261
 
        # the D-Bus
262
 
        self.use_dbus = use_dbus
263
 
        if self.use_dbus:
264
 
            self.dbus_object_path = (dbus.ObjectPath
265
 
                                     ("/clients/"
266
 
                                      + self.name.replace(".", "_")))
267
 
            dbus.service.Object.__init__(self, bus,
268
 
                                         self.dbus_object_path)
269
317
    
270
318
    def enable(self):
271
319
        """Start this client's checker and timeout hooks"""
 
320
        if getattr(self, u"enabled", False):
 
321
            # Already enabled
 
322
            return
272
323
        self.last_enabled = datetime.datetime.utcnow()
273
324
        # Schedule a new checker to be started an 'interval' from now,
274
325
        # and every interval from then on.
275
326
        self.checker_initiator_tag = (gobject.timeout_add
276
327
                                      (self.interval_milliseconds(),
277
328
                                       self.start_checker))
278
 
        # Also start a new checker *right now*.
279
 
        self.start_checker()
280
329
        # Schedule a disable() when 'timeout' has passed
281
330
        self.disable_initiator_tag = (gobject.timeout_add
282
331
                                   (self.timeout_milliseconds(),
283
332
                                    self.disable))
284
333
        self.enabled = True
285
 
        if self.use_dbus:
286
 
            # Emit D-Bus signals
287
 
            self.PropertyChanged(dbus.String(u"enabled"),
288
 
                                 dbus.Boolean(True, variant_level=1))
289
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
290
 
                                 (_datetime_to_dbus(self.last_enabled,
291
 
                                                    variant_level=1)))
 
334
        # Also start a new checker *right now*.
 
335
        self.start_checker()
292
336
    
293
 
    def disable(self):
 
337
    def disable(self, quiet=True):
294
338
        """Disable this client."""
295
339
        if not getattr(self, "enabled", False):
296
340
            return False
297
 
        logger.info(u"Disabling client %s", self.name)
298
 
        if getattr(self, "disable_initiator_tag", False):
 
341
        if not quiet:
 
342
            logger.info(u"Disabling client %s", self.name)
 
343
        if getattr(self, u"disable_initiator_tag", False):
299
344
            gobject.source_remove(self.disable_initiator_tag)
300
345
            self.disable_initiator_tag = None
301
 
        if getattr(self, "checker_initiator_tag", False):
 
346
        if getattr(self, u"checker_initiator_tag", False):
302
347
            gobject.source_remove(self.checker_initiator_tag)
303
348
            self.checker_initiator_tag = None
304
349
        self.stop_checker()
305
350
        if self.disable_hook:
306
351
            self.disable_hook(self)
307
352
        self.enabled = False
308
 
        if self.use_dbus:
309
 
            # Emit D-Bus signal
310
 
            self.PropertyChanged(dbus.String(u"enabled"),
311
 
                                 dbus.Boolean(False, variant_level=1))
312
353
        # Do not run this again if called by a gobject.timeout_add
313
354
        return False
314
355
    
320
361
        """The checker has completed, so take appropriate actions."""
321
362
        self.checker_callback_tag = None
322
363
        self.checker = None
323
 
        if self.use_dbus:
324
 
            # Emit D-Bus signal
325
 
            self.PropertyChanged(dbus.String(u"checker_running"),
326
 
                                 dbus.Boolean(False, variant_level=1))
327
364
        if os.WIFEXITED(condition):
328
365
            exitstatus = os.WEXITSTATUS(condition)
329
366
            if exitstatus == 0:
333
370
            else:
334
371
                logger.info(u"Checker for %(name)s failed",
335
372
                            vars(self))
336
 
            if self.use_dbus:
337
 
                # Emit D-Bus signal
338
 
                self.CheckerCompleted(dbus.Int16(exitstatus),
339
 
                                      dbus.Int64(condition),
340
 
                                      dbus.String(command))
341
373
        else:
342
374
            logger.warning(u"Checker for %(name)s crashed?",
343
375
                           vars(self))
344
 
            if self.use_dbus:
345
 
                # Emit D-Bus signal
346
 
                self.CheckerCompleted(dbus.Int16(-1),
347
 
                                      dbus.Int64(condition),
348
 
                                      dbus.String(command))
349
376
    
350
377
    def checked_ok(self):
351
378
        """Bump up the timeout for this client.
 
379
        
352
380
        This should only be called when the client has been seen,
353
381
        alive and well.
354
382
        """
357
385
        self.disable_initiator_tag = (gobject.timeout_add
358
386
                                      (self.timeout_milliseconds(),
359
387
                                       self.disable))
360
 
        if self.use_dbus:
361
 
            # Emit D-Bus signal
362
 
            self.PropertyChanged(
363
 
                dbus.String(u"last_checked_ok"),
364
 
                (_datetime_to_dbus(self.last_checked_ok,
365
 
                                   variant_level=1)))
366
388
    
367
389
    def start_checker(self):
368
390
        """Start a new checker subprocess if one is not running.
 
391
        
369
392
        If a checker already exists, leave it running and do
370
393
        nothing."""
371
394
        # The reason for not killing a running checker is that if we
374
397
        # client would inevitably timeout, since no checker would get
375
398
        # a chance to run to completion.  If we instead leave running
376
399
        # checkers alone, the checker would have to take more time
377
 
        # than 'timeout' for the client to be declared invalid, which
378
 
        # is as it should be.
 
400
        # than 'timeout' for the client to be disabled, which is as it
 
401
        # should be.
 
402
        
 
403
        # If a checker exists, make sure it is not a zombie
 
404
        try:
 
405
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
406
        except (AttributeError, OSError), error:
 
407
            if (isinstance(error, OSError)
 
408
                and error.errno != errno.ECHILD):
 
409
                raise error
 
410
        else:
 
411
            if pid:
 
412
                logger.warning(u"Checker was a zombie")
 
413
                gobject.source_remove(self.checker_callback_tag)
 
414
                self.checker_callback(pid, status,
 
415
                                      self.current_checker_command)
 
416
        # Start a new checker if needed
379
417
        if self.checker is None:
380
418
            try:
381
419
                # In case checker_command has exactly one % operator
382
420
                command = self.checker_command % self.host
383
421
            except TypeError:
384
422
                # Escape attributes for the shell
385
 
                escaped_attrs = dict((key, re.escape(str(val)))
 
423
                escaped_attrs = dict((key,
 
424
                                      re.escape(unicode(str(val),
 
425
                                                        errors=
 
426
                                                        u'replace')))
386
427
                                     for key, val in
387
428
                                     vars(self).iteritems())
388
429
                try:
391
432
                    logger.error(u'Could not format string "%s":'
392
433
                                 u' %s', self.checker_command, error)
393
434
                    return True # Try again later
 
435
            self.current_checker_command = command
394
436
            try:
395
437
                logger.info(u"Starting checker %r for %s",
396
438
                            command, self.name)
400
442
                # always replaced by /dev/null.)
401
443
                self.checker = subprocess.Popen(command,
402
444
                                                close_fds=True,
403
 
                                                shell=True, cwd="/")
404
 
                if self.use_dbus:
405
 
                    # Emit D-Bus signal
406
 
                    self.CheckerStarted(command)
407
 
                    self.PropertyChanged(
408
 
                        dbus.String("checker_running"),
409
 
                        dbus.Boolean(True, variant_level=1))
 
445
                                                shell=True, cwd=u"/")
410
446
                self.checker_callback_tag = (gobject.child_watch_add
411
447
                                             (self.checker.pid,
412
448
                                              self.checker_callback,
413
449
                                              data=command))
 
450
                # The checker may have completed before the gobject
 
451
                # watch was added.  Check for this.
 
452
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
453
                if pid:
 
454
                    gobject.source_remove(self.checker_callback_tag)
 
455
                    self.checker_callback(pid, status, command)
414
456
            except OSError, error:
415
457
                logger.error(u"Failed to start subprocess: %s",
416
458
                             error)
422
464
        if self.checker_callback_tag:
423
465
            gobject.source_remove(self.checker_callback_tag)
424
466
            self.checker_callback_tag = None
425
 
        if getattr(self, "checker", None) is None:
 
467
        if getattr(self, u"checker", None) is None:
426
468
            return
427
469
        logger.debug(u"Stopping checker for %(name)s", vars(self))
428
470
        try:
429
471
            os.kill(self.checker.pid, signal.SIGTERM)
430
 
            #os.sleep(0.5)
 
472
            #time.sleep(0.5)
431
473
            #if self.checker.poll() is None:
432
474
            #    os.kill(self.checker.pid, signal.SIGKILL)
433
475
        except OSError, error:
434
476
            if error.errno != errno.ESRCH: # No such process
435
477
                raise
436
478
        self.checker = None
437
 
        if self.use_dbus:
 
479
 
 
480
 
 
481
def dbus_service_property(dbus_interface, signature=u"v",
 
482
                          access=u"readwrite", byte_arrays=False):
 
483
    """Decorators for marking methods of a DBusObjectWithProperties to
 
484
    become properties on the D-Bus.
 
485
    
 
486
    The decorated method will be called with no arguments by "Get"
 
487
    and with one argument by "Set".
 
488
    
 
489
    The parameters, where they are supported, are the same as
 
490
    dbus.service.method, except there is only "signature", since the
 
491
    type from Get() and the type sent to Set() is the same.
 
492
    """
 
493
    # Encoding deeply encoded byte arrays is not supported yet by the
 
494
    # "Set" method, so we fail early here:
 
495
    if byte_arrays and signature != u"ay":
 
496
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
497
                         u" signature %r" % signature)
 
498
    def decorator(func):
 
499
        func._dbus_is_property = True
 
500
        func._dbus_interface = dbus_interface
 
501
        func._dbus_signature = signature
 
502
        func._dbus_access = access
 
503
        func._dbus_name = func.__name__
 
504
        if func._dbus_name.endswith(u"_dbus_property"):
 
505
            func._dbus_name = func._dbus_name[:-14]
 
506
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
507
        return func
 
508
    return decorator
 
509
 
 
510
 
 
511
class DBusPropertyException(dbus.exceptions.DBusException):
 
512
    """A base class for D-Bus property-related exceptions
 
513
    """
 
514
    def __unicode__(self):
 
515
        return unicode(str(self))
 
516
 
 
517
 
 
518
class DBusPropertyAccessException(DBusPropertyException):
 
519
    """A property's access permissions disallows an operation.
 
520
    """
 
521
    pass
 
522
 
 
523
 
 
524
class DBusPropertyNotFound(DBusPropertyException):
 
525
    """An attempt was made to access a non-existing property.
 
526
    """
 
527
    pass
 
528
 
 
529
 
 
530
class DBusObjectWithProperties(dbus.service.Object):
 
531
    """A D-Bus object with properties.
 
532
 
 
533
    Classes inheriting from this can use the dbus_service_property
 
534
    decorator to expose methods as D-Bus properties.  It exposes the
 
535
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
536
    """
 
537
    
 
538
    @staticmethod
 
539
    def _is_dbus_property(obj):
 
540
        return getattr(obj, u"_dbus_is_property", False)
 
541
    
 
542
    def _get_all_dbus_properties(self):
 
543
        """Returns a generator of (name, attribute) pairs
 
544
        """
 
545
        return ((prop._dbus_name, prop)
 
546
                for name, prop in
 
547
                inspect.getmembers(self, self._is_dbus_property))
 
548
    
 
549
    def _get_dbus_property(self, interface_name, property_name):
 
550
        """Returns a bound method if one exists which is a D-Bus
 
551
        property with the specified name and interface.
 
552
        """
 
553
        for name in (property_name,
 
554
                     property_name + u"_dbus_property"):
 
555
            prop = getattr(self, name, None)
 
556
            if (prop is None
 
557
                or not self._is_dbus_property(prop)
 
558
                or prop._dbus_name != property_name
 
559
                or (interface_name and prop._dbus_interface
 
560
                    and interface_name != prop._dbus_interface)):
 
561
                continue
 
562
            return prop
 
563
        # No such property
 
564
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
565
                                   + interface_name + u"."
 
566
                                   + property_name)
 
567
    
 
568
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
569
                         out_signature=u"v")
 
570
    def Get(self, interface_name, property_name):
 
571
        """Standard D-Bus property Get() method, see D-Bus standard.
 
572
        """
 
573
        prop = self._get_dbus_property(interface_name, property_name)
 
574
        if prop._dbus_access == u"write":
 
575
            raise DBusPropertyAccessException(property_name)
 
576
        value = prop()
 
577
        if not hasattr(value, u"variant_level"):
 
578
            return value
 
579
        return type(value)(value, variant_level=value.variant_level+1)
 
580
    
 
581
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
582
    def Set(self, interface_name, property_name, value):
 
583
        """Standard D-Bus property Set() method, see D-Bus standard.
 
584
        """
 
585
        prop = self._get_dbus_property(interface_name, property_name)
 
586
        if prop._dbus_access == u"read":
 
587
            raise DBusPropertyAccessException(property_name)
 
588
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
589
            # The byte_arrays option is not supported yet on
 
590
            # signatures other than "ay".
 
591
            if prop._dbus_signature != u"ay":
 
592
                raise ValueError
 
593
            value = dbus.ByteArray(''.join(unichr(byte)
 
594
                                           for byte in value))
 
595
        prop(value)
 
596
    
 
597
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
598
                         out_signature=u"a{sv}")
 
599
    def GetAll(self, interface_name):
 
600
        """Standard D-Bus property GetAll() method, see D-Bus
 
601
        standard.
 
602
 
 
603
        Note: Will not include properties with access="write".
 
604
        """
 
605
        all = {}
 
606
        for name, prop in self._get_all_dbus_properties():
 
607
            if (interface_name
 
608
                and interface_name != prop._dbus_interface):
 
609
                # Interface non-empty but did not match
 
610
                continue
 
611
            # Ignore write-only properties
 
612
            if prop._dbus_access == u"write":
 
613
                continue
 
614
            value = prop()
 
615
            if not hasattr(value, u"variant_level"):
 
616
                all[name] = value
 
617
                continue
 
618
            all[name] = type(value)(value, variant_level=
 
619
                                    value.variant_level+1)
 
620
        return dbus.Dictionary(all, signature=u"sv")
 
621
    
 
622
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
623
                         out_signature=u"s",
 
624
                         path_keyword='object_path',
 
625
                         connection_keyword='connection')
 
626
    def Introspect(self, object_path, connection):
 
627
        """Standard D-Bus method, overloaded to insert property tags.
 
628
        """
 
629
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
630
                                                   connection)
 
631
        try:
 
632
            document = xml.dom.minidom.parseString(xmlstring)
 
633
            def make_tag(document, name, prop):
 
634
                e = document.createElement(u"property")
 
635
                e.setAttribute(u"name", name)
 
636
                e.setAttribute(u"type", prop._dbus_signature)
 
637
                e.setAttribute(u"access", prop._dbus_access)
 
638
                return e
 
639
            for if_tag in document.getElementsByTagName(u"interface"):
 
640
                for tag in (make_tag(document, name, prop)
 
641
                            for name, prop
 
642
                            in self._get_all_dbus_properties()
 
643
                            if prop._dbus_interface
 
644
                            == if_tag.getAttribute(u"name")):
 
645
                    if_tag.appendChild(tag)
 
646
                # Add the names to the return values for the
 
647
                # "org.freedesktop.DBus.Properties" methods
 
648
                if (if_tag.getAttribute(u"name")
 
649
                    == u"org.freedesktop.DBus.Properties"):
 
650
                    for cn in if_tag.getElementsByTagName(u"method"):
 
651
                        if cn.getAttribute(u"name") == u"Get":
 
652
                            for arg in cn.getElementsByTagName(u"arg"):
 
653
                                if (arg.getAttribute(u"direction")
 
654
                                    == u"out"):
 
655
                                    arg.setAttribute(u"name", u"value")
 
656
                        elif cn.getAttribute(u"name") == u"GetAll":
 
657
                            for arg in cn.getElementsByTagName(u"arg"):
 
658
                                if (arg.getAttribute(u"direction")
 
659
                                    == u"out"):
 
660
                                    arg.setAttribute(u"name", u"props")
 
661
            xmlstring = document.toxml(u"utf-8")
 
662
            document.unlink()
 
663
        except (AttributeError, xml.dom.DOMException,
 
664
                xml.parsers.expat.ExpatError), error:
 
665
            logger.error(u"Failed to override Introspection method",
 
666
                         error)
 
667
        return xmlstring
 
668
 
 
669
 
 
670
class ClientDBus(Client, DBusObjectWithProperties):
 
671
    """A Client class using D-Bus
 
672
    
 
673
    Attributes:
 
674
    dbus_object_path: dbus.ObjectPath
 
675
    bus: dbus.SystemBus()
 
676
    """
 
677
    # dbus.service.Object doesn't use super(), so we can't either.
 
678
    
 
679
    def __init__(self, bus = None, *args, **kwargs):
 
680
        self.bus = bus
 
681
        Client.__init__(self, *args, **kwargs)
 
682
        # Only now, when this client is initialized, can it show up on
 
683
        # the D-Bus
 
684
        self.dbus_object_path = (dbus.ObjectPath
 
685
                                 (u"/clients/"
 
686
                                  + self.name.replace(u".", u"_")))
 
687
        DBusObjectWithProperties.__init__(self, self.bus,
 
688
                                          self.dbus_object_path)
 
689
    
 
690
    @staticmethod
 
691
    def _datetime_to_dbus(dt, variant_level=0):
 
692
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
693
        return dbus.String(dt.isoformat(),
 
694
                           variant_level=variant_level)
 
695
    
 
696
    def enable(self):
 
697
        oldstate = getattr(self, u"enabled", False)
 
698
        r = Client.enable(self)
 
699
        if oldstate != self.enabled:
 
700
            # Emit D-Bus signals
 
701
            self.PropertyChanged(dbus.String(u"enabled"),
 
702
                                 dbus.Boolean(True, variant_level=1))
 
703
            self.PropertyChanged(
 
704
                dbus.String(u"last_enabled"),
 
705
                self._datetime_to_dbus(self.last_enabled,
 
706
                                       variant_level=1))
 
707
        return r
 
708
    
 
709
    def disable(self, quiet = False):
 
710
        oldstate = getattr(self, u"enabled", False)
 
711
        r = Client.disable(self, quiet=quiet)
 
712
        if not quiet and oldstate != self.enabled:
 
713
            # Emit D-Bus signal
 
714
            self.PropertyChanged(dbus.String(u"enabled"),
 
715
                                 dbus.Boolean(False, variant_level=1))
 
716
        return r
 
717
    
 
718
    def __del__(self, *args, **kwargs):
 
719
        try:
 
720
            self.remove_from_connection()
 
721
        except LookupError:
 
722
            pass
 
723
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
724
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
725
        Client.__del__(self, *args, **kwargs)
 
726
    
 
727
    def checker_callback(self, pid, condition, command,
 
728
                         *args, **kwargs):
 
729
        self.checker_callback_tag = None
 
730
        self.checker = None
 
731
        # Emit D-Bus signal
 
732
        self.PropertyChanged(dbus.String(u"checker_running"),
 
733
                             dbus.Boolean(False, variant_level=1))
 
734
        if os.WIFEXITED(condition):
 
735
            exitstatus = os.WEXITSTATUS(condition)
 
736
            # Emit D-Bus signal
 
737
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
738
                                  dbus.Int64(condition),
 
739
                                  dbus.String(command))
 
740
        else:
 
741
            # Emit D-Bus signal
 
742
            self.CheckerCompleted(dbus.Int16(-1),
 
743
                                  dbus.Int64(condition),
 
744
                                  dbus.String(command))
 
745
        
 
746
        return Client.checker_callback(self, pid, condition, command,
 
747
                                       *args, **kwargs)
 
748
    
 
749
    def checked_ok(self, *args, **kwargs):
 
750
        r = Client.checked_ok(self, *args, **kwargs)
 
751
        # Emit D-Bus signal
 
752
        self.PropertyChanged(
 
753
            dbus.String(u"last_checked_ok"),
 
754
            (self._datetime_to_dbus(self.last_checked_ok,
 
755
                                    variant_level=1)))
 
756
        return r
 
757
    
 
758
    def start_checker(self, *args, **kwargs):
 
759
        old_checker = self.checker
 
760
        if self.checker is not None:
 
761
            old_checker_pid = self.checker.pid
 
762
        else:
 
763
            old_checker_pid = None
 
764
        r = Client.start_checker(self, *args, **kwargs)
 
765
        # Only if new checker process was started
 
766
        if (self.checker is not None
 
767
            and old_checker_pid != self.checker.pid):
 
768
            # Emit D-Bus signal
 
769
            self.CheckerStarted(self.current_checker_command)
 
770
            self.PropertyChanged(
 
771
                dbus.String(u"checker_running"),
 
772
                dbus.Boolean(True, variant_level=1))
 
773
        return r
 
774
    
 
775
    def stop_checker(self, *args, **kwargs):
 
776
        old_checker = getattr(self, u"checker", None)
 
777
        r = Client.stop_checker(self, *args, **kwargs)
 
778
        if (old_checker is not None
 
779
            and getattr(self, u"checker", None) is None):
438
780
            self.PropertyChanged(dbus.String(u"checker_running"),
439
781
                                 dbus.Boolean(False, variant_level=1))
440
 
    
441
 
    def still_valid(self):
442
 
        """Has the timeout not yet passed for this client?"""
443
 
        if not getattr(self, "enabled", False):
444
 
            return False
445
 
        now = datetime.datetime.utcnow()
446
 
        if self.last_checked_ok is None:
447
 
            return now < (self.created + self.timeout)
448
 
        else:
449
 
            return now < (self.last_checked_ok + self.timeout)
450
 
    
451
 
    ## D-Bus methods & signals
 
782
        return r
 
783
    
 
784
    ## D-Bus methods, signals & properties
452
785
    _interface = u"se.bsnet.fukt.Mandos.Client"
453
786
    
454
 
    # CheckedOK - method
455
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
456
 
    CheckedOK.__name__ = "CheckedOK"
 
787
    ## Signals
457
788
    
458
789
    # CheckerCompleted - signal
459
 
    @dbus.service.signal(_interface, signature="nxs")
 
790
    @dbus.service.signal(_interface, signature=u"nxs")
460
791
    def CheckerCompleted(self, exitcode, waitstatus, command):
461
792
        "D-Bus signal"
462
793
        pass
463
794
    
464
795
    # CheckerStarted - signal
465
 
    @dbus.service.signal(_interface, signature="s")
 
796
    @dbus.service.signal(_interface, signature=u"s")
466
797
    def CheckerStarted(self, command):
467
798
        "D-Bus signal"
468
799
        pass
469
800
    
470
 
    # GetAllProperties - method
471
 
    @dbus.service.method(_interface, out_signature="a{sv}")
472
 
    def GetAllProperties(self):
473
 
        "D-Bus method"
474
 
        return dbus.Dictionary({
475
 
                dbus.String("name"):
476
 
                    dbus.String(self.name, variant_level=1),
477
 
                dbus.String("fingerprint"):
478
 
                    dbus.String(self.fingerprint, variant_level=1),
479
 
                dbus.String("host"):
480
 
                    dbus.String(self.host, variant_level=1),
481
 
                dbus.String("created"):
482
 
                    _datetime_to_dbus(self.created, variant_level=1),
483
 
                dbus.String("last_enabled"):
484
 
                    (_datetime_to_dbus(self.last_enabled,
485
 
                                       variant_level=1)
486
 
                     if self.last_enabled is not None
487
 
                     else dbus.Boolean(False, variant_level=1)),
488
 
                dbus.String("enabled"):
489
 
                    dbus.Boolean(self.enabled, variant_level=1),
490
 
                dbus.String("last_checked_ok"):
491
 
                    (_datetime_to_dbus(self.last_checked_ok,
492
 
                                       variant_level=1)
493
 
                     if self.last_checked_ok is not None
494
 
                     else dbus.Boolean (False, variant_level=1)),
495
 
                dbus.String("timeout"):
496
 
                    dbus.UInt64(self.timeout_milliseconds(),
497
 
                                variant_level=1),
498
 
                dbus.String("interval"):
499
 
                    dbus.UInt64(self.interval_milliseconds(),
500
 
                                variant_level=1),
501
 
                dbus.String("checker"):
502
 
                    dbus.String(self.checker_command,
503
 
                                variant_level=1),
504
 
                dbus.String("checker_running"):
505
 
                    dbus.Boolean(self.checker is not None,
506
 
                                 variant_level=1),
507
 
                dbus.String("object_path"):
508
 
                    dbus.ObjectPath(self.dbus_object_path,
509
 
                                    variant_level=1)
510
 
                }, signature="sv")
511
 
    
512
 
    # IsStillValid - method
513
 
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
514
 
                    (still_valid))
515
 
    IsStillValid.__name__ = "IsStillValid"
516
 
    
517
801
    # PropertyChanged - signal
518
 
    @dbus.service.signal(_interface, signature="sv")
 
802
    @dbus.service.signal(_interface, signature=u"sv")
519
803
    def PropertyChanged(self, property, value):
520
804
        "D-Bus signal"
521
805
        pass
522
806
    
523
 
    # SetChecker - method
524
 
    @dbus.service.method(_interface, in_signature="s")
525
 
    def SetChecker(self, checker):
526
 
        "D-Bus setter method"
527
 
        self.checker_command = checker
528
 
        # Emit D-Bus signal
529
 
        self.PropertyChanged(dbus.String(u"checker"),
530
 
                             dbus.String(self.checker_command,
531
 
                                         variant_level=1))
532
 
    
533
 
    # SetHost - method
534
 
    @dbus.service.method(_interface, in_signature="s")
535
 
    def SetHost(self, host):
536
 
        "D-Bus setter method"
537
 
        self.host = host
538
 
        # Emit D-Bus signal
539
 
        self.PropertyChanged(dbus.String(u"host"),
540
 
                             dbus.String(self.host, variant_level=1))
541
 
    
542
 
    # SetInterval - method
543
 
    @dbus.service.method(_interface, in_signature="t")
544
 
    def SetInterval(self, milliseconds):
545
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
546
 
        # Emit D-Bus signal
547
 
        self.PropertyChanged(dbus.String(u"interval"),
548
 
                             (dbus.UInt64(self.interval_milliseconds(),
549
 
                                          variant_level=1)))
550
 
    
551
 
    # SetSecret - method
552
 
    @dbus.service.method(_interface, in_signature="ay",
553
 
                         byte_arrays=True)
554
 
    def SetSecret(self, secret):
555
 
        "D-Bus setter method"
556
 
        self.secret = str(secret)
557
 
    
558
 
    # SetTimeout - method
559
 
    @dbus.service.method(_interface, in_signature="t")
560
 
    def SetTimeout(self, milliseconds):
561
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
562
 
        # Emit D-Bus signal
563
 
        self.PropertyChanged(dbus.String(u"timeout"),
564
 
                             (dbus.UInt64(self.timeout_milliseconds(),
565
 
                                          variant_level=1)))
 
807
    # GotSecret - signal
 
808
    @dbus.service.signal(_interface)
 
809
    def GotSecret(self):
 
810
        "D-Bus signal"
 
811
        pass
 
812
    
 
813
    # Rejected - signal
 
814
    @dbus.service.signal(_interface)
 
815
    def Rejected(self):
 
816
        "D-Bus signal"
 
817
        pass
 
818
    
 
819
    ## Methods
 
820
    
 
821
    # CheckedOK - method
 
822
    @dbus.service.method(_interface)
 
823
    def CheckedOK(self):
 
824
        return self.checked_ok()
566
825
    
567
826
    # Enable - method
568
 
    Enable = dbus.service.method(_interface)(enable)
569
 
    Enable.__name__ = "Enable"
 
827
    @dbus.service.method(_interface)
 
828
    def Enable(self):
 
829
        "D-Bus method"
 
830
        self.enable()
570
831
    
571
832
    # StartChecker - method
572
833
    @dbus.service.method(_interface)
581
842
        self.disable()
582
843
    
583
844
    # StopChecker - method
584
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
585
 
    StopChecker.__name__ = "StopChecker"
 
845
    @dbus.service.method(_interface)
 
846
    def StopChecker(self):
 
847
        self.stop_checker()
 
848
    
 
849
    ## Properties
 
850
    
 
851
    # name - property
 
852
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
853
    def name_dbus_property(self):
 
854
        return dbus.String(self.name)
 
855
    
 
856
    # fingerprint - property
 
857
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
858
    def fingerprint_dbus_property(self):
 
859
        return dbus.String(self.fingerprint)
 
860
    
 
861
    # host - property
 
862
    @dbus_service_property(_interface, signature=u"s",
 
863
                           access=u"readwrite")
 
864
    def host_dbus_property(self, value=None):
 
865
        if value is None:       # get
 
866
            return dbus.String(self.host)
 
867
        self.host = value
 
868
        # Emit D-Bus signal
 
869
        self.PropertyChanged(dbus.String(u"host"),
 
870
                             dbus.String(value, variant_level=1))
 
871
    
 
872
    # created - property
 
873
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
874
    def created_dbus_property(self):
 
875
        return dbus.String(self._datetime_to_dbus(self.created))
 
876
    
 
877
    # last_enabled - property
 
878
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
879
    def last_enabled_dbus_property(self):
 
880
        if self.last_enabled is None:
 
881
            return dbus.String(u"")
 
882
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
883
    
 
884
    # enabled - property
 
885
    @dbus_service_property(_interface, signature=u"b",
 
886
                           access=u"readwrite")
 
887
    def enabled_dbus_property(self, value=None):
 
888
        if value is None:       # get
 
889
            return dbus.Boolean(self.enabled)
 
890
        if value:
 
891
            self.enable()
 
892
        else:
 
893
            self.disable()
 
894
    
 
895
    # last_checked_ok - property
 
896
    @dbus_service_property(_interface, signature=u"s",
 
897
                           access=u"readwrite")
 
898
    def last_checked_ok_dbus_property(self, value=None):
 
899
        if value is not None:
 
900
            self.checked_ok()
 
901
            return
 
902
        if self.last_checked_ok is None:
 
903
            return dbus.String(u"")
 
904
        return dbus.String(self._datetime_to_dbus(self
 
905
                                                  .last_checked_ok))
 
906
    
 
907
    # timeout - property
 
908
    @dbus_service_property(_interface, signature=u"t",
 
909
                           access=u"readwrite")
 
910
    def timeout_dbus_property(self, value=None):
 
911
        if value is None:       # get
 
912
            return dbus.UInt64(self.timeout_milliseconds())
 
913
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
914
        # Emit D-Bus signal
 
915
        self.PropertyChanged(dbus.String(u"timeout"),
 
916
                             dbus.UInt64(value, variant_level=1))
 
917
        if getattr(self, u"disable_initiator_tag", None) is None:
 
918
            return
 
919
        # Reschedule timeout
 
920
        gobject.source_remove(self.disable_initiator_tag)
 
921
        self.disable_initiator_tag = None
 
922
        time_to_die = (self.
 
923
                       _timedelta_to_milliseconds((self
 
924
                                                   .last_checked_ok
 
925
                                                   + self.timeout)
 
926
                                                  - datetime.datetime
 
927
                                                  .utcnow()))
 
928
        if time_to_die <= 0:
 
929
            # The timeout has passed
 
930
            self.disable()
 
931
        else:
 
932
            self.disable_initiator_tag = (gobject.timeout_add
 
933
                                          (time_to_die, self.disable))
 
934
    
 
935
    # interval - property
 
936
    @dbus_service_property(_interface, signature=u"t",
 
937
                           access=u"readwrite")
 
938
    def interval_dbus_property(self, value=None):
 
939
        if value is None:       # get
 
940
            return dbus.UInt64(self.interval_milliseconds())
 
941
        self.interval = datetime.timedelta(0, 0, 0, value)
 
942
        # Emit D-Bus signal
 
943
        self.PropertyChanged(dbus.String(u"interval"),
 
944
                             dbus.UInt64(value, variant_level=1))
 
945
        if getattr(self, u"checker_initiator_tag", None) is None:
 
946
            return
 
947
        # Reschedule checker run
 
948
        gobject.source_remove(self.checker_initiator_tag)
 
949
        self.checker_initiator_tag = (gobject.timeout_add
 
950
                                      (value, self.start_checker))
 
951
        self.start_checker()    # Start one now, too
 
952
 
 
953
    # checker - property
 
954
    @dbus_service_property(_interface, signature=u"s",
 
955
                           access=u"readwrite")
 
956
    def checker_dbus_property(self, value=None):
 
957
        if value is None:       # get
 
958
            return dbus.String(self.checker_command)
 
959
        self.checker_command = value
 
960
        # Emit D-Bus signal
 
961
        self.PropertyChanged(dbus.String(u"checker"),
 
962
                             dbus.String(self.checker_command,
 
963
                                         variant_level=1))
 
964
    
 
965
    # checker_running - property
 
966
    @dbus_service_property(_interface, signature=u"b",
 
967
                           access=u"readwrite")
 
968
    def checker_running_dbus_property(self, value=None):
 
969
        if value is None:       # get
 
970
            return dbus.Boolean(self.checker is not None)
 
971
        if value:
 
972
            self.start_checker()
 
973
        else:
 
974
            self.stop_checker()
 
975
    
 
976
    # object_path - property
 
977
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
978
    def object_path_dbus_property(self):
 
979
        return self.dbus_object_path # is already a dbus.ObjectPath
 
980
    
 
981
    # secret = property
 
982
    @dbus_service_property(_interface, signature=u"ay",
 
983
                           access=u"write", byte_arrays=True)
 
984
    def secret_dbus_property(self, value):
 
985
        self.secret = str(value)
586
986
    
587
987
    del _interface
588
988
 
589
989
 
590
 
def peer_certificate(session):
591
 
    "Return the peer's OpenPGP certificate as a bytestring"
592
 
    # If not an OpenPGP certificate...
593
 
    if (gnutls.library.functions
594
 
        .gnutls_certificate_type_get(session._c_object)
595
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
596
 
        # ...do the normal thing
597
 
        return session.peer_certificate
598
 
    list_size = ctypes.c_uint()
599
 
    cert_list = (gnutls.library.functions
600
 
                 .gnutls_certificate_get_peers
601
 
                 (session._c_object, ctypes.byref(list_size)))
602
 
    if list_size.value == 0:
603
 
        return None
604
 
    cert = cert_list[0]
605
 
    return ctypes.string_at(cert.data, cert.size)
606
 
 
607
 
 
608
 
def fingerprint(openpgp):
609
 
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
610
 
    # New GnuTLS "datum" with the OpenPGP public key
611
 
    datum = (gnutls.library.types
612
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
613
 
                                         ctypes.POINTER
614
 
                                         (ctypes.c_ubyte)),
615
 
                             ctypes.c_uint(len(openpgp))))
616
 
    # New empty GnuTLS certificate
617
 
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
618
 
    (gnutls.library.functions
619
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
620
 
    # Import the OpenPGP public key into the certificate
621
 
    (gnutls.library.functions
622
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
623
 
                                gnutls.library.constants
624
 
                                .GNUTLS_OPENPGP_FMT_RAW))
625
 
    # Verify the self signature in the key
626
 
    crtverify = ctypes.c_uint()
627
 
    (gnutls.library.functions
628
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
629
 
    if crtverify.value != 0:
630
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
631
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
632
 
    # New buffer for the fingerprint
633
 
    buf = ctypes.create_string_buffer(20)
634
 
    buf_len = ctypes.c_size_t()
635
 
    # Get the fingerprint from the certificate into the buffer
636
 
    (gnutls.library.functions
637
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
638
 
                                         ctypes.byref(buf_len)))
639
 
    # Deinit the certificate
640
 
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
641
 
    # Convert the buffer to a Python bytestring
642
 
    fpr = ctypes.string_at(buf, buf_len.value)
643
 
    # Convert the bytestring to hexadecimal notation
644
 
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
645
 
    return hex_fpr
646
 
 
647
 
 
648
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
649
 
    """A TCP request handler class.
650
 
    Instantiated by IPv6_TCPServer for each request to handle it.
 
990
class ClientHandler(socketserver.BaseRequestHandler, object):
 
991
    """A class to handle client connections.
 
992
    
 
993
    Instantiated once for each connection to handle it.
651
994
    Note: This will run in its own forked process."""
652
995
    
653
996
    def handle(self):
654
997
        logger.info(u"TCP connection from: %s",
655
998
                    unicode(self.client_address))
656
 
        session = (gnutls.connection
657
 
                   .ClientSession(self.request,
658
 
                                  gnutls.connection
659
 
                                  .X509Credentials()))
660
 
        
661
 
        line = self.request.makefile().readline()
662
 
        logger.debug(u"Protocol version: %r", line)
663
 
        try:
664
 
            if int(line.strip().split()[0]) > 1:
665
 
                raise RuntimeError
666
 
        except (ValueError, IndexError, RuntimeError), error:
667
 
            logger.error(u"Unknown protocol version: %s", error)
668
 
            return
669
 
        
670
 
        # Note: gnutls.connection.X509Credentials is really a generic
671
 
        # GnuTLS certificate credentials object so long as no X.509
672
 
        # keys are added to it.  Therefore, we can use it here despite
673
 
        # using OpenPGP certificates.
674
 
        
675
 
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
676
 
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
677
 
        #                "+DHE-DSS"))
678
 
        # Use a fallback default, since this MUST be set.
679
 
        priority = self.server.settings.get("priority", "NORMAL")
680
 
        (gnutls.library.functions
681
 
         .gnutls_priority_set_direct(session._c_object,
682
 
                                     priority, None))
683
 
        
684
 
        try:
685
 
            session.handshake()
686
 
        except gnutls.errors.GNUTLSError, error:
687
 
            logger.warning(u"Handshake failed: %s", error)
688
 
            # Do not run session.bye() here: the session is not
689
 
            # established.  Just abandon the request.
690
 
            return
691
 
        try:
692
 
            fpr = fingerprint(peer_certificate(session))
693
 
        except (TypeError, gnutls.errors.GNUTLSError), error:
694
 
            logger.warning(u"Bad certificate: %s", error)
695
 
            session.bye()
696
 
            return
697
 
        logger.debug(u"Fingerprint: %s", fpr)
698
 
        for c in self.server.clients:
699
 
            if c.fingerprint == fpr:
700
 
                client = c
701
 
                break
702
 
        else:
703
 
            logger.warning(u"Client not found for fingerprint: %s",
704
 
                           fpr)
705
 
            session.bye()
706
 
            return
707
 
        # Have to check if client.still_valid(), since it is possible
708
 
        # that the client timed out while establishing the GnuTLS
709
 
        # session.
710
 
        if not client.still_valid():
711
 
            logger.warning(u"Client %(name)s is invalid",
712
 
                           vars(client))
713
 
            session.bye()
714
 
            return
715
 
        ## This won't work here, since we're in a fork.
716
 
        # client.checked_ok()
717
 
        sent_size = 0
718
 
        while sent_size < len(client.secret):
719
 
            sent = session.send(client.secret[sent_size:])
720
 
            logger.debug(u"Sent: %d, remaining: %d",
721
 
                         sent, len(client.secret)
722
 
                         - (sent_size + sent))
723
 
            sent_size += sent
724
 
        session.bye()
725
 
 
726
 
 
727
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
728
 
                     SocketServer.TCPServer, object):
729
 
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
 
999
        logger.debug(u"IPC Pipe FD: %d",
 
1000
                     self.server.child_pipe[1].fileno())
 
1001
        # Open IPC pipe to parent process
 
1002
        with contextlib.nested(self.server.child_pipe[1],
 
1003
                               self.server.parent_pipe[0]
 
1004
                               ) as (ipc, ipc_return):
 
1005
            session = (gnutls.connection
 
1006
                       .ClientSession(self.request,
 
1007
                                      gnutls.connection
 
1008
                                      .X509Credentials()))
 
1009
            
 
1010
            # Note: gnutls.connection.X509Credentials is really a
 
1011
            # generic GnuTLS certificate credentials object so long as
 
1012
            # no X.509 keys are added to it.  Therefore, we can use it
 
1013
            # here despite using OpenPGP certificates.
 
1014
            
 
1015
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1016
            #                      u"+AES-256-CBC", u"+SHA1",
 
1017
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1018
            #                      u"+DHE-DSS"))
 
1019
            # Use a fallback default, since this MUST be set.
 
1020
            priority = self.server.gnutls_priority
 
1021
            if priority is None:
 
1022
                priority = u"NORMAL"
 
1023
            (gnutls.library.functions
 
1024
             .gnutls_priority_set_direct(session._c_object,
 
1025
                                         priority, None))
 
1026
            
 
1027
            # Start communication using the Mandos protocol
 
1028
            # Get protocol number
 
1029
            line = self.request.makefile().readline()
 
1030
            logger.debug(u"Protocol version: %r", line)
 
1031
            try:
 
1032
                if int(line.strip().split()[0]) > 1:
 
1033
                    raise RuntimeError
 
1034
            except (ValueError, IndexError, RuntimeError), error:
 
1035
                logger.error(u"Unknown protocol version: %s", error)
 
1036
                return
 
1037
            
 
1038
            # Start GnuTLS connection
 
1039
            try:
 
1040
                session.handshake()
 
1041
            except gnutls.errors.GNUTLSError, error:
 
1042
                logger.warning(u"Handshake failed: %s", error)
 
1043
                # Do not run session.bye() here: the session is not
 
1044
                # established.  Just abandon the request.
 
1045
                return
 
1046
            logger.debug(u"Handshake succeeded")
 
1047
            try:
 
1048
                try:
 
1049
                    fpr = self.fingerprint(self.peer_certificate
 
1050
                                           (session))
 
1051
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1052
                    logger.warning(u"Bad certificate: %s", error)
 
1053
                    return
 
1054
                logger.debug(u"Fingerprint: %s", fpr)
 
1055
 
 
1056
                for c in self.server.clients:
 
1057
                    if c.fingerprint == fpr:
 
1058
                        client = c
 
1059
                        break
 
1060
                else:
 
1061
                    ipc.write(u"NOTFOUND %s %s\n"
 
1062
                              % (fpr, unicode(self.client_address)))
 
1063
                    return
 
1064
                
 
1065
                class ClientProxy(object):
 
1066
                    """Client proxy object.  Not for calling methods."""
 
1067
                    def __init__(self, client):
 
1068
                        self.client = client
 
1069
                    def __getattr__(self, name):
 
1070
                        if name.startswith("ipc_"):
 
1071
                            def tempfunc():
 
1072
                                ipc.write("%s %s\n" % (name[4:].upper(),
 
1073
                                                       self.client.name))
 
1074
                            return tempfunc
 
1075
                        if not hasattr(self.client, name):
 
1076
                            raise AttributeError
 
1077
                        ipc.write(u"GETATTR %s %s\n"
 
1078
                                  % (name, self.client.fingerprint))
 
1079
                        return pickle.load(ipc_return)
 
1080
                clientproxy = ClientProxy(client)
 
1081
                # Have to check if client.enabled, since it is
 
1082
                # possible that the client was disabled since the
 
1083
                # GnuTLS session was established.
 
1084
                if not clientproxy.enabled:
 
1085
                    clientproxy.ipc_disabled()
 
1086
                    return
 
1087
                
 
1088
                clientproxy.ipc_sending()
 
1089
                sent_size = 0
 
1090
                while sent_size < len(client.secret):
 
1091
                    sent = session.send(client.secret[sent_size:])
 
1092
                    logger.debug(u"Sent: %d, remaining: %d",
 
1093
                                 sent, len(client.secret)
 
1094
                                 - (sent_size + sent))
 
1095
                    sent_size += sent
 
1096
            finally:
 
1097
                session.bye()
 
1098
    
 
1099
    @staticmethod
 
1100
    def peer_certificate(session):
 
1101
        "Return the peer's OpenPGP certificate as a bytestring"
 
1102
        # If not an OpenPGP certificate...
 
1103
        if (gnutls.library.functions
 
1104
            .gnutls_certificate_type_get(session._c_object)
 
1105
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1106
            # ...do the normal thing
 
1107
            return session.peer_certificate
 
1108
        list_size = ctypes.c_uint(1)
 
1109
        cert_list = (gnutls.library.functions
 
1110
                     .gnutls_certificate_get_peers
 
1111
                     (session._c_object, ctypes.byref(list_size)))
 
1112
        if not bool(cert_list) and list_size.value != 0:
 
1113
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1114
                                            u" certificate")
 
1115
        if list_size.value == 0:
 
1116
            return None
 
1117
        cert = cert_list[0]
 
1118
        return ctypes.string_at(cert.data, cert.size)
 
1119
    
 
1120
    @staticmethod
 
1121
    def fingerprint(openpgp):
 
1122
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1123
        # New GnuTLS "datum" with the OpenPGP public key
 
1124
        datum = (gnutls.library.types
 
1125
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1126
                                             ctypes.POINTER
 
1127
                                             (ctypes.c_ubyte)),
 
1128
                                 ctypes.c_uint(len(openpgp))))
 
1129
        # New empty GnuTLS certificate
 
1130
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1131
        (gnutls.library.functions
 
1132
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1133
        # Import the OpenPGP public key into the certificate
 
1134
        (gnutls.library.functions
 
1135
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1136
                                    gnutls.library.constants
 
1137
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1138
        # Verify the self signature in the key
 
1139
        crtverify = ctypes.c_uint()
 
1140
        (gnutls.library.functions
 
1141
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1142
                                         ctypes.byref(crtverify)))
 
1143
        if crtverify.value != 0:
 
1144
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1145
            raise (gnutls.errors.CertificateSecurityError
 
1146
                   (u"Verify failed"))
 
1147
        # New buffer for the fingerprint
 
1148
        buf = ctypes.create_string_buffer(20)
 
1149
        buf_len = ctypes.c_size_t()
 
1150
        # Get the fingerprint from the certificate into the buffer
 
1151
        (gnutls.library.functions
 
1152
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1153
                                             ctypes.byref(buf_len)))
 
1154
        # Deinit the certificate
 
1155
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1156
        # Convert the buffer to a Python bytestring
 
1157
        fpr = ctypes.string_at(buf, buf_len.value)
 
1158
        # Convert the bytestring to hexadecimal notation
 
1159
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1160
        return hex_fpr
 
1161
 
 
1162
 
 
1163
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
 
1164
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
 
1165
    def process_request(self, request, client_address):
 
1166
        """Overrides and wraps the original process_request().
 
1167
        
 
1168
        This function creates a new pipe in self.pipe
 
1169
        """
 
1170
        # Child writes to child_pipe
 
1171
        self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
 
1172
        # Parent writes to parent_pipe
 
1173
        self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
 
1174
        super(ForkingMixInWithPipes,
 
1175
              self).process_request(request, client_address)
 
1176
        # Close unused ends for parent
 
1177
        self.parent_pipe[0].close() # close read end
 
1178
        self.child_pipe[1].close()  # close write end
 
1179
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
 
1180
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1181
        """Dummy function; override as necessary"""
 
1182
        child_pipe_fd.close()
 
1183
        parent_pipe_fd.close()
 
1184
 
 
1185
 
 
1186
class IPv6_TCPServer(ForkingMixInWithPipes,
 
1187
                     socketserver.TCPServer, object):
 
1188
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1189
    
730
1190
    Attributes:
731
 
        settings:       Server settings
732
 
        clients:        Set() of Client objects
733
1191
        enabled:        Boolean; whether this server is activated yet
 
1192
        interface:      None or a network interface name (string)
 
1193
        use_ipv6:       Boolean; to use IPv6 or not
734
1194
    """
735
 
    address_family = socket.AF_INET6
736
 
    def __init__(self, *args, **kwargs):
737
 
        if "settings" in kwargs:
738
 
            self.settings = kwargs["settings"]
739
 
            del kwargs["settings"]
740
 
        if "clients" in kwargs:
741
 
            self.clients = kwargs["clients"]
742
 
            del kwargs["clients"]
743
 
        self.enabled = False
744
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
1195
    def __init__(self, server_address, RequestHandlerClass,
 
1196
                 interface=None, use_ipv6=True):
 
1197
        self.interface = interface
 
1198
        if use_ipv6:
 
1199
            self.address_family = socket.AF_INET6
 
1200
        socketserver.TCPServer.__init__(self, server_address,
 
1201
                                        RequestHandlerClass)
745
1202
    def server_bind(self):
746
1203
        """This overrides the normal server_bind() function
747
1204
        to bind to an interface if one was specified, and also NOT to
748
1205
        bind to an address or port if they were not specified."""
749
 
        if self.settings["interface"]:
750
 
            # 25 is from /usr/include/asm-i486/socket.h
751
 
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
752
 
            try:
753
 
                self.socket.setsockopt(socket.SOL_SOCKET,
754
 
                                       SO_BINDTODEVICE,
755
 
                                       self.settings["interface"])
756
 
            except socket.error, error:
757
 
                if error[0] == errno.EPERM:
758
 
                    logger.error(u"No permission to"
759
 
                                 u" bind to interface %s",
760
 
                                 self.settings["interface"])
761
 
                else:
762
 
                    raise error
 
1206
        if self.interface is not None:
 
1207
            if SO_BINDTODEVICE is None:
 
1208
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1209
                             u" cannot bind to interface %s",
 
1210
                             self.interface)
 
1211
            else:
 
1212
                try:
 
1213
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1214
                                           SO_BINDTODEVICE,
 
1215
                                           str(self.interface
 
1216
                                               + u'\0'))
 
1217
                except socket.error, error:
 
1218
                    if error[0] == errno.EPERM:
 
1219
                        logger.error(u"No permission to"
 
1220
                                     u" bind to interface %s",
 
1221
                                     self.interface)
 
1222
                    elif error[0] == errno.ENOPROTOOPT:
 
1223
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1224
                                     u" cannot bind to interface %s",
 
1225
                                     self.interface)
 
1226
                    else:
 
1227
                        raise
763
1228
        # Only bind(2) the socket if we really need to.
764
1229
        if self.server_address[0] or self.server_address[1]:
765
1230
            if not self.server_address[0]:
766
 
                in6addr_any = "::"
767
 
                self.server_address = (in6addr_any,
 
1231
                if self.address_family == socket.AF_INET6:
 
1232
                    any_address = u"::" # in6addr_any
 
1233
                else:
 
1234
                    any_address = socket.INADDR_ANY
 
1235
                self.server_address = (any_address,
768
1236
                                       self.server_address[1])
769
1237
            elif not self.server_address[1]:
770
1238
                self.server_address = (self.server_address[0],
771
1239
                                       0)
772
 
#                 if self.settings["interface"]:
 
1240
#                 if self.interface:
773
1241
#                     self.server_address = (self.server_address[0],
774
1242
#                                            0, # port
775
1243
#                                            0, # flowinfo
776
1244
#                                            if_nametoindex
777
 
#                                            (self.settings
778
 
#                                             ["interface"]))
779
 
            return super(IPv6_TCPServer, self).server_bind()
 
1245
#                                            (self.interface))
 
1246
            return socketserver.TCPServer.server_bind(self)
 
1247
 
 
1248
 
 
1249
class MandosServer(IPv6_TCPServer):
 
1250
    """Mandos server.
 
1251
    
 
1252
    Attributes:
 
1253
        clients:        set of Client objects
 
1254
        gnutls_priority GnuTLS priority string
 
1255
        use_dbus:       Boolean; to emit D-Bus signals or not
 
1256
    
 
1257
    Assumes a gobject.MainLoop event loop.
 
1258
    """
 
1259
    def __init__(self, server_address, RequestHandlerClass,
 
1260
                 interface=None, use_ipv6=True, clients=None,
 
1261
                 gnutls_priority=None, use_dbus=True):
 
1262
        self.enabled = False
 
1263
        self.clients = clients
 
1264
        if self.clients is None:
 
1265
            self.clients = set()
 
1266
        self.use_dbus = use_dbus
 
1267
        self.gnutls_priority = gnutls_priority
 
1268
        IPv6_TCPServer.__init__(self, server_address,
 
1269
                                RequestHandlerClass,
 
1270
                                interface = interface,
 
1271
                                use_ipv6 = use_ipv6)
780
1272
    def server_activate(self):
781
1273
        if self.enabled:
782
 
            return super(IPv6_TCPServer, self).server_activate()
 
1274
            return socketserver.TCPServer.server_activate(self)
783
1275
    def enable(self):
784
1276
        self.enabled = True
 
1277
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1278
        # Call "handle_ipc" for both data and EOF events
 
1279
        gobject.io_add_watch(child_pipe_fd.fileno(),
 
1280
                             gobject.IO_IN | gobject.IO_HUP,
 
1281
                             functools.partial(self.handle_ipc,
 
1282
                                               reply = parent_pipe_fd,
 
1283
                                               sender= child_pipe_fd))
 
1284
    def handle_ipc(self, source, condition, reply=None, sender=None):
 
1285
        condition_names = {
 
1286
            gobject.IO_IN: u"IN",   # There is data to read.
 
1287
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1288
                                    # blocking).
 
1289
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1290
            gobject.IO_ERR: u"ERR", # Error condition.
 
1291
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1292
                                    # broken, usually for pipes and
 
1293
                                    # sockets).
 
1294
            }
 
1295
        conditions_string = ' | '.join(name
 
1296
                                       for cond, name in
 
1297
                                       condition_names.iteritems()
 
1298
                                       if cond & condition)
 
1299
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1300
                     conditions_string)
 
1301
        
 
1302
        # Read a line from the file object
 
1303
        cmdline = sender.readline()
 
1304
        if not cmdline:             # Empty line means end of file
 
1305
            # close the IPC pipes
 
1306
            sender.close()
 
1307
            reply.close()
 
1308
            
 
1309
            # Stop calling this function
 
1310
            return False
 
1311
        
 
1312
        logger.debug(u"IPC command: %r", cmdline)
 
1313
        
 
1314
        # Parse and act on command
 
1315
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
 
1316
        
 
1317
        if cmd == u"NOTFOUND":
 
1318
            fpr, address = args.split(None, 1)
 
1319
            logger.warning(u"Client not found for fingerprint: %s, ad"
 
1320
                           u"dress: %s", fpr, address)
 
1321
            if self.use_dbus:
 
1322
                # Emit D-Bus signal
 
1323
                mandos_dbus_service.ClientNotFound(fpr, address)
 
1324
        elif cmd == u"DISABLED":
 
1325
            for client in self.clients:
 
1326
                if client.name == args:
 
1327
                    logger.warning(u"Client %s is disabled", args)
 
1328
                    if self.use_dbus:
 
1329
                        # Emit D-Bus signal
 
1330
                        client.Rejected()
 
1331
                    break
 
1332
            else:
 
1333
                logger.error(u"Unknown client %s is disabled", args)
 
1334
        elif cmd == u"SENDING":
 
1335
            for client in self.clients:
 
1336
                if client.name == args:
 
1337
                    logger.info(u"Sending secret to %s", client.name)
 
1338
                    client.checked_ok()
 
1339
                    if self.use_dbus:
 
1340
                        # Emit D-Bus signal
 
1341
                        client.GotSecret()
 
1342
                    break
 
1343
            else:
 
1344
                logger.error(u"Sending secret to unknown client %s",
 
1345
                             args)
 
1346
        elif cmd == u"GETATTR":
 
1347
            attr_name, fpr = args.split(None, 1)
 
1348
            for client in self.clients:
 
1349
                if client.fingerprint == fpr:
 
1350
                    attr_value = getattr(client, attr_name, None)
 
1351
                    logger.debug("IPC reply: %r", attr_value)
 
1352
                    pickle.dump(attr_value, reply)
 
1353
                    break
 
1354
            else:
 
1355
                logger.error(u"Client %s on address %s requesting "
 
1356
                             u"attribute %s not found", fpr, address,
 
1357
                             attr_name)
 
1358
                pickle.dump(None, reply)
 
1359
        else:
 
1360
            logger.error(u"Unknown IPC command: %r", cmdline)
 
1361
        
 
1362
        # Keep calling this function
 
1363
        return True
785
1364
 
786
1365
 
787
1366
def string_to_delta(interval):
788
1367
    """Parse a string and return a datetime.timedelta
789
 
 
790
 
    >>> string_to_delta('7d')
 
1368
    
 
1369
    >>> string_to_delta(u'7d')
791
1370
    datetime.timedelta(7)
792
 
    >>> string_to_delta('60s')
 
1371
    >>> string_to_delta(u'60s')
793
1372
    datetime.timedelta(0, 60)
794
 
    >>> string_to_delta('60m')
 
1373
    >>> string_to_delta(u'60m')
795
1374
    datetime.timedelta(0, 3600)
796
 
    >>> string_to_delta('24h')
 
1375
    >>> string_to_delta(u'24h')
797
1376
    datetime.timedelta(1)
798
1377
    >>> string_to_delta(u'1w')
799
1378
    datetime.timedelta(7)
800
 
    >>> string_to_delta('5m 30s')
 
1379
    >>> string_to_delta(u'5m 30s')
801
1380
    datetime.timedelta(0, 330)
802
1381
    """
803
1382
    timevalue = datetime.timedelta(0)
816
1395
            elif suffix == u"w":
817
1396
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
818
1397
            else:
819
 
                raise ValueError
820
 
        except (ValueError, IndexError):
821
 
            raise ValueError
 
1398
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1399
        except (ValueError, IndexError), e:
 
1400
            raise ValueError(e.message)
822
1401
        timevalue += delta
823
1402
    return timevalue
824
1403
 
825
1404
 
826
 
def server_state_changed(state):
827
 
    """Derived from the Avahi example code"""
828
 
    if state == avahi.SERVER_COLLISION:
829
 
        logger.error(u"Zeroconf server name collision")
830
 
        service.remove()
831
 
    elif state == avahi.SERVER_RUNNING:
832
 
        service.add()
833
 
 
834
 
 
835
 
def entry_group_state_changed(state, error):
836
 
    """Derived from the Avahi example code"""
837
 
    logger.debug(u"Avahi state change: %i", state)
838
 
    
839
 
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
840
 
        logger.debug(u"Zeroconf service established.")
841
 
    elif state == avahi.ENTRY_GROUP_COLLISION:
842
 
        logger.warning(u"Zeroconf service name collision.")
843
 
        service.rename()
844
 
    elif state == avahi.ENTRY_GROUP_FAILURE:
845
 
        logger.critical(u"Avahi: Error in group state changed %s",
846
 
                        unicode(error))
847
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
848
 
 
849
1405
def if_nametoindex(interface):
850
 
    """Call the C function if_nametoindex(), or equivalent"""
 
1406
    """Call the C function if_nametoindex(), or equivalent
 
1407
    
 
1408
    Note: This function cannot accept a unicode string."""
851
1409
    global if_nametoindex
852
1410
    try:
853
1411
        if_nametoindex = (ctypes.cdll.LoadLibrary
854
 
                          (ctypes.util.find_library("c"))
 
1412
                          (ctypes.util.find_library(u"c"))
855
1413
                          .if_nametoindex)
856
1414
    except (OSError, AttributeError):
857
 
        if "struct" not in sys.modules:
858
 
            import struct
859
 
        if "fcntl" not in sys.modules:
860
 
            import fcntl
 
1415
        logger.warning(u"Doing if_nametoindex the hard way")
861
1416
        def if_nametoindex(interface):
862
1417
            "Get an interface index the hard way, i.e. using fcntl()"
863
1418
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
864
 
            with closing(socket.socket()) as s:
 
1419
            with contextlib.closing(socket.socket()) as s:
865
1420
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
866
 
                                    struct.pack("16s16x", interface))
867
 
            interface_index = struct.unpack("I", ifreq[16:20])[0]
 
1421
                                    struct.pack(str(u"16s16x"),
 
1422
                                                interface))
 
1423
            interface_index = struct.unpack(str(u"I"),
 
1424
                                            ifreq[16:20])[0]
868
1425
            return interface_index
869
1426
    return if_nametoindex(interface)
870
1427
 
871
1428
 
872
1429
def daemon(nochdir = False, noclose = False):
873
1430
    """See daemon(3).  Standard BSD Unix function.
 
1431
    
874
1432
    This should really exist as os.daemon, but it doesn't (yet)."""
875
1433
    if os.fork():
876
1434
        sys.exit()
877
1435
    os.setsid()
878
1436
    if not nochdir:
879
 
        os.chdir("/")
 
1437
        os.chdir(u"/")
880
1438
    if os.fork():
881
1439
        sys.exit()
882
1440
    if not noclose:
884
1442
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
885
1443
        if not stat.S_ISCHR(os.fstat(null).st_mode):
886
1444
            raise OSError(errno.ENODEV,
887
 
                          "/dev/null not a character device")
 
1445
                          u"%s not a character device"
 
1446
                          % os.path.devnull)
888
1447
        os.dup2(null, sys.stdin.fileno())
889
1448
        os.dup2(null, sys.stdout.fileno())
890
1449
        os.dup2(null, sys.stderr.fileno())
893
1452
 
894
1453
 
895
1454
def main():
 
1455
    
 
1456
    ##################################################################
 
1457
    # Parsing of options, both command line and config file
 
1458
    
896
1459
    parser = optparse.OptionParser(version = "%%prog %s" % version)
897
 
    parser.add_option("-i", "--interface", type="string",
898
 
                      metavar="IF", help="Bind to interface IF")
899
 
    parser.add_option("-a", "--address", type="string",
900
 
                      help="Address to listen for requests on")
901
 
    parser.add_option("-p", "--port", type="int",
902
 
                      help="Port number to receive requests on")
903
 
    parser.add_option("--check", action="store_true",
904
 
                      help="Run self-test")
905
 
    parser.add_option("--debug", action="store_true",
906
 
                      help="Debug mode; run in foreground and log to"
907
 
                      " terminal")
908
 
    parser.add_option("--priority", type="string", help="GnuTLS"
909
 
                      " priority string (see GnuTLS documentation)")
910
 
    parser.add_option("--servicename", type="string", metavar="NAME",
911
 
                      help="Zeroconf service name")
912
 
    parser.add_option("--configdir", type="string",
913
 
                      default="/etc/mandos", metavar="DIR",
914
 
                      help="Directory to search for configuration"
915
 
                      " files")
916
 
    parser.add_option("--no-dbus", action="store_false",
917
 
                      dest="use_dbus",
918
 
                      help="Do not provide D-Bus system bus"
919
 
                      " interface")
 
1460
    parser.add_option("-i", u"--interface", type=u"string",
 
1461
                      metavar="IF", help=u"Bind to interface IF")
 
1462
    parser.add_option("-a", u"--address", type=u"string",
 
1463
                      help=u"Address to listen for requests on")
 
1464
    parser.add_option("-p", u"--port", type=u"int",
 
1465
                      help=u"Port number to receive requests on")
 
1466
    parser.add_option("--check", action=u"store_true",
 
1467
                      help=u"Run self-test")
 
1468
    parser.add_option("--debug", action=u"store_true",
 
1469
                      help=u"Debug mode; run in foreground and log to"
 
1470
                      u" terminal")
 
1471
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1472
                      u" priority string (see GnuTLS documentation)")
 
1473
    parser.add_option("--servicename", type=u"string",
 
1474
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1475
    parser.add_option("--configdir", type=u"string",
 
1476
                      default=u"/etc/mandos", metavar=u"DIR",
 
1477
                      help=u"Directory to search for configuration"
 
1478
                      u" files")
 
1479
    parser.add_option("--no-dbus", action=u"store_false",
 
1480
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1481
                      u" system bus interface")
 
1482
    parser.add_option("--no-ipv6", action=u"store_false",
 
1483
                      dest=u"use_ipv6", help=u"Do not use IPv6")
920
1484
    options = parser.parse_args()[0]
921
1485
    
922
1486
    if options.check:
925
1489
        sys.exit()
926
1490
    
927
1491
    # Default values for config file for server-global settings
928
 
    server_defaults = { "interface": "",
929
 
                        "address": "",
930
 
                        "port": "",
931
 
                        "debug": "False",
932
 
                        "priority":
933
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
934
 
                        "servicename": "Mandos",
935
 
                        "use_dbus": "True",
 
1492
    server_defaults = { u"interface": u"",
 
1493
                        u"address": u"",
 
1494
                        u"port": u"",
 
1495
                        u"debug": u"False",
 
1496
                        u"priority":
 
1497
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1498
                        u"servicename": u"Mandos",
 
1499
                        u"use_dbus": u"True",
 
1500
                        u"use_ipv6": u"True",
936
1501
                        }
937
1502
    
938
1503
    # Parse config file for server-global settings
939
 
    server_config = ConfigParser.SafeConfigParser(server_defaults)
 
1504
    server_config = configparser.SafeConfigParser(server_defaults)
940
1505
    del server_defaults
941
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
1506
    server_config.read(os.path.join(options.configdir,
 
1507
                                    u"mandos.conf"))
942
1508
    # Convert the SafeConfigParser object to a dict
943
1509
    server_settings = server_config.defaults()
944
1510
    # Use the appropriate methods on the non-string config options
945
 
    server_settings["debug"] = server_config.getboolean("DEFAULT",
946
 
                                                        "debug")
947
 
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
948
 
                                                           "use_dbus")
 
1511
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1512
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
1513
                                                           option)
949
1514
    if server_settings["port"]:
950
 
        server_settings["port"] = server_config.getint("DEFAULT",
951
 
                                                       "port")
 
1515
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1516
                                                       u"port")
952
1517
    del server_config
953
1518
    
954
1519
    # Override the settings from the config file with command line
955
1520
    # options, if set.
956
 
    for option in ("interface", "address", "port", "debug",
957
 
                   "priority", "servicename", "configdir",
958
 
                   "use_dbus"):
 
1521
    for option in (u"interface", u"address", u"port", u"debug",
 
1522
                   u"priority", u"servicename", u"configdir",
 
1523
                   u"use_dbus", u"use_ipv6"):
959
1524
        value = getattr(options, option)
960
1525
        if value is not None:
961
1526
            server_settings[option] = value
962
1527
    del options
 
1528
    # Force all strings to be unicode
 
1529
    for option in server_settings.keys():
 
1530
        if type(server_settings[option]) is str:
 
1531
            server_settings[option] = unicode(server_settings[option])
963
1532
    # Now we have our good server settings in "server_settings"
964
1533
    
 
1534
    ##################################################################
 
1535
    
965
1536
    # For convenience
966
 
    debug = server_settings["debug"]
967
 
    use_dbus = server_settings["use_dbus"]
 
1537
    debug = server_settings[u"debug"]
 
1538
    use_dbus = server_settings[u"use_dbus"]
 
1539
    use_ipv6 = server_settings[u"use_ipv6"]
968
1540
    
969
1541
    if not debug:
970
1542
        syslogger.setLevel(logging.WARNING)
971
1543
        console.setLevel(logging.WARNING)
972
1544
    
973
 
    if server_settings["servicename"] != "Mandos":
 
1545
    if server_settings[u"servicename"] != u"Mandos":
974
1546
        syslogger.setFormatter(logging.Formatter
975
 
                               ('Mandos (%s): %%(levelname)s:'
976
 
                                ' %%(message)s'
977
 
                                % server_settings["servicename"]))
 
1547
                               (u'Mandos (%s) [%%(process)d]:'
 
1548
                                u' %%(levelname)s: %%(message)s'
 
1549
                                % server_settings[u"servicename"]))
978
1550
    
979
1551
    # Parse config file with clients
980
 
    client_defaults = { "timeout": "1h",
981
 
                        "interval": "5m",
982
 
                        "checker": "fping -q -- %%(host)s",
983
 
                        "host": "",
 
1552
    client_defaults = { u"timeout": u"1h",
 
1553
                        u"interval": u"5m",
 
1554
                        u"checker": u"fping -q -- %%(host)s",
 
1555
                        u"host": u"",
984
1556
                        }
985
 
    client_config = ConfigParser.SafeConfigParser(client_defaults)
986
 
    client_config.read(os.path.join(server_settings["configdir"],
987
 
                                    "clients.conf"))
988
 
    
989
 
    clients = Set()
990
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
991
 
                                 server_settings["port"]),
992
 
                                TCP_handler,
993
 
                                settings=server_settings,
994
 
                                clients=clients)
995
 
    pidfilename = "/var/run/mandos.pid"
996
 
    try:
997
 
        pidfile = open(pidfilename, "w")
998
 
    except IOError, error:
999
 
        logger.error("Could not open file %r", pidfilename)
1000
 
    
1001
 
    try:
1002
 
        uid = pwd.getpwnam("_mandos").pw_uid
1003
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1557
    client_config = configparser.SafeConfigParser(client_defaults)
 
1558
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1559
                                    u"clients.conf"))
 
1560
    
 
1561
    global mandos_dbus_service
 
1562
    mandos_dbus_service = None
 
1563
    
 
1564
    tcp_server = MandosServer((server_settings[u"address"],
 
1565
                               server_settings[u"port"]),
 
1566
                              ClientHandler,
 
1567
                              interface=server_settings[u"interface"],
 
1568
                              use_ipv6=use_ipv6,
 
1569
                              gnutls_priority=
 
1570
                              server_settings[u"priority"],
 
1571
                              use_dbus=use_dbus)
 
1572
    pidfilename = u"/var/run/mandos.pid"
 
1573
    try:
 
1574
        pidfile = open(pidfilename, u"w")
 
1575
    except IOError:
 
1576
        logger.error(u"Could not open file %r", pidfilename)
 
1577
    
 
1578
    try:
 
1579
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1580
        gid = pwd.getpwnam(u"_mandos").pw_gid
1004
1581
    except KeyError:
1005
1582
        try:
1006
 
            uid = pwd.getpwnam("mandos").pw_uid
1007
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1583
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1584
            gid = pwd.getpwnam(u"mandos").pw_gid
1008
1585
        except KeyError:
1009
1586
            try:
1010
 
                uid = pwd.getpwnam("nobody").pw_uid
1011
 
                gid = pwd.getpwnam("nogroup").pw_gid
 
1587
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1588
                gid = pwd.getpwnam(u"nobody").pw_gid
1012
1589
            except KeyError:
1013
1590
                uid = 65534
1014
1591
                gid = 65534
1015
1592
    try:
 
1593
        os.setgid(gid)
1016
1594
        os.setuid(uid)
1017
 
        os.setgid(gid)
1018
1595
    except OSError, error:
1019
1596
        if error[0] != errno.EPERM:
1020
1597
            raise error
1021
1598
    
1022
 
    global service
1023
 
    service = AvahiService(name = server_settings["servicename"],
1024
 
                           servicetype = "_mandos._tcp", )
1025
 
    if server_settings["interface"]:
1026
 
        service.interface = (if_nametoindex
1027
 
                             (server_settings["interface"]))
 
1599
    # Enable all possible GnuTLS debugging
 
1600
    if debug:
 
1601
        # "Use a log level over 10 to enable all debugging options."
 
1602
        # - GnuTLS manual
 
1603
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1604
        
 
1605
        @gnutls.library.types.gnutls_log_func
 
1606
        def debug_gnutls(level, string):
 
1607
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1608
        
 
1609
        (gnutls.library.functions
 
1610
         .gnutls_global_set_log_function(debug_gnutls))
1028
1611
    
1029
1612
    global main_loop
1030
 
    global bus
1031
 
    global server
1032
1613
    # From the Avahi example code
1033
1614
    DBusGMainLoop(set_as_default=True )
1034
1615
    main_loop = gobject.MainLoop()
1035
1616
    bus = dbus.SystemBus()
1036
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1037
 
                                           avahi.DBUS_PATH_SERVER),
1038
 
                            avahi.DBUS_INTERFACE_SERVER)
1039
1617
    # End of Avahi example code
1040
1618
    if use_dbus:
1041
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1619
        try:
 
1620
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1621
                                            bus, do_not_queue=True)
 
1622
        except dbus.exceptions.NameExistsException, e:
 
1623
            logger.error(unicode(e) + u", disabling D-Bus")
 
1624
            use_dbus = False
 
1625
            server_settings[u"use_dbus"] = False
 
1626
            tcp_server.use_dbus = False
 
1627
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1628
    service = AvahiService(name = server_settings[u"servicename"],
 
1629
                           servicetype = u"_mandos._tcp",
 
1630
                           protocol = protocol, bus = bus)
 
1631
    if server_settings["interface"]:
 
1632
        service.interface = (if_nametoindex
 
1633
                             (str(server_settings[u"interface"])))
1042
1634
    
1043
 
    clients.update(Set(Client(name = section,
1044
 
                              config
1045
 
                              = dict(client_config.items(section)),
1046
 
                              use_dbus = use_dbus)
1047
 
                       for section in client_config.sections()))
1048
 
    if not clients:
 
1635
    client_class = Client
 
1636
    if use_dbus:
 
1637
        client_class = functools.partial(ClientDBus, bus = bus)
 
1638
    tcp_server.clients.update(set(
 
1639
            client_class(name = section,
 
1640
                         config= dict(client_config.items(section)))
 
1641
            for section in client_config.sections()))
 
1642
    if not tcp_server.clients:
1049
1643
        logger.warning(u"No clients defined")
1050
1644
    
1051
1645
    if debug:
1061
1655
        daemon()
1062
1656
    
1063
1657
    try:
1064
 
        pid = os.getpid()
1065
 
        pidfile.write(str(pid) + "\n")
1066
 
        pidfile.close()
 
1658
        with pidfile:
 
1659
            pid = os.getpid()
 
1660
            pidfile.write(str(pid) + "\n")
1067
1661
        del pidfile
1068
1662
    except IOError:
1069
1663
        logger.error(u"Could not write to file %r with PID %d",
1073
1667
        pass
1074
1668
    del pidfilename
1075
1669
    
1076
 
    def cleanup():
1077
 
        "Cleanup function; run on exit"
1078
 
        global group
1079
 
        # From the Avahi example code
1080
 
        if not group is None:
1081
 
            group.Free()
1082
 
            group = None
1083
 
        # End of Avahi example code
1084
 
        
1085
 
        while clients:
1086
 
            client = clients.pop()
1087
 
            client.disable_hook = None
1088
 
            client.disable()
1089
 
    
1090
 
    atexit.register(cleanup)
1091
 
    
1092
1670
    if not debug:
1093
1671
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1094
1672
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1095
1673
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1096
1674
    
1097
1675
    if use_dbus:
1098
 
        class MandosServer(dbus.service.Object):
 
1676
        class MandosDBusService(dbus.service.Object):
1099
1677
            """A D-Bus proxy object"""
1100
1678
            def __init__(self):
1101
 
                dbus.service.Object.__init__(self, bus, "/")
 
1679
                dbus.service.Object.__init__(self, bus, u"/")
1102
1680
            _interface = u"se.bsnet.fukt.Mandos"
1103
1681
            
1104
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1105
 
            def ClientAdded(self, objpath, properties):
1106
 
                "D-Bus signal"
1107
 
                pass
1108
 
            
1109
 
            @dbus.service.signal(_interface, signature="os")
 
1682
            @dbus.service.signal(_interface, signature=u"o")
 
1683
            def ClientAdded(self, objpath):
 
1684
                "D-Bus signal"
 
1685
                pass
 
1686
            
 
1687
            @dbus.service.signal(_interface, signature=u"ss")
 
1688
            def ClientNotFound(self, fingerprint, address):
 
1689
                "D-Bus signal"
 
1690
                pass
 
1691
            
 
1692
            @dbus.service.signal(_interface, signature=u"os")
1110
1693
            def ClientRemoved(self, objpath, name):
1111
1694
                "D-Bus signal"
1112
1695
                pass
1113
1696
            
1114
 
            @dbus.service.method(_interface, out_signature="ao")
 
1697
            @dbus.service.method(_interface, out_signature=u"ao")
1115
1698
            def GetAllClients(self):
1116
 
                return dbus.Array(c.dbus_object_path for c in clients)
 
1699
                "D-Bus method"
 
1700
                return dbus.Array(c.dbus_object_path
 
1701
                                  for c in tcp_server.clients)
1117
1702
            
1118
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1703
            @dbus.service.method(_interface,
 
1704
                                 out_signature=u"a{oa{sv}}")
1119
1705
            def GetAllClientsWithProperties(self):
 
1706
                "D-Bus method"
1120
1707
                return dbus.Dictionary(
1121
 
                    ((c.dbus_object_path, c.GetAllProperties())
1122
 
                     for c in clients),
1123
 
                    signature="oa{sv}")
 
1708
                    ((c.dbus_object_path, c.GetAll(u""))
 
1709
                     for c in tcp_server.clients),
 
1710
                    signature=u"oa{sv}")
1124
1711
            
1125
 
            @dbus.service.method(_interface, in_signature="o")
 
1712
            @dbus.service.method(_interface, in_signature=u"o")
1126
1713
            def RemoveClient(self, object_path):
1127
 
                for c in clients:
 
1714
                "D-Bus method"
 
1715
                for c in tcp_server.clients:
1128
1716
                    if c.dbus_object_path == object_path:
1129
 
                        clients.remove(c)
 
1717
                        tcp_server.clients.remove(c)
 
1718
                        c.remove_from_connection()
1130
1719
                        # Don't signal anything except ClientRemoved
1131
 
                        c.use_dbus = False
1132
 
                        c.disable()
 
1720
                        c.disable(quiet=True)
1133
1721
                        # Emit D-Bus signal
1134
1722
                        self.ClientRemoved(object_path, c.name)
1135
1723
                        return
1136
 
                raise KeyError
 
1724
                raise KeyError(object_path)
1137
1725
            
1138
1726
            del _interface
1139
1727
        
1140
 
        mandos_server = MandosServer()
1141
 
    
1142
 
    for client in clients:
 
1728
        mandos_dbus_service = MandosDBusService()
 
1729
    
 
1730
    def cleanup():
 
1731
        "Cleanup function; run on exit"
 
1732
        service.cleanup()
 
1733
        
 
1734
        while tcp_server.clients:
 
1735
            client = tcp_server.clients.pop()
 
1736
            if use_dbus:
 
1737
                client.remove_from_connection()
 
1738
            client.disable_hook = None
 
1739
            # Don't signal anything except ClientRemoved
 
1740
            client.disable(quiet=True)
 
1741
            if use_dbus:
 
1742
                # Emit D-Bus signal
 
1743
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1744
                                                  client.name)
 
1745
    
 
1746
    atexit.register(cleanup)
 
1747
    
 
1748
    for client in tcp_server.clients:
1143
1749
        if use_dbus:
1144
1750
            # Emit D-Bus signal
1145
 
            mandos_server.ClientAdded(client.dbus_object_path,
1146
 
                                      client.GetAllProperties())
 
1751
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1147
1752
        client.enable()
1148
1753
    
1149
1754
    tcp_server.enable()
1151
1756
    
1152
1757
    # Find out what port we got
1153
1758
    service.port = tcp_server.socket.getsockname()[1]
1154
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1155
 
                u" scope_id %d" % tcp_server.socket.getsockname())
 
1759
    if use_ipv6:
 
1760
        logger.info(u"Now listening on address %r, port %d,"
 
1761
                    " flowinfo %d, scope_id %d"
 
1762
                    % tcp_server.socket.getsockname())
 
1763
    else:                       # IPv4
 
1764
        logger.info(u"Now listening on address %r, port %d"
 
1765
                    % tcp_server.socket.getsockname())
1156
1766
    
1157
1767
    #service.interface = tcp_server.socket.getsockname()[3]
1158
1768
    
1159
1769
    try:
1160
1770
        # From the Avahi example code
1161
 
        server.connect_to_signal("StateChanged", server_state_changed)
1162
1771
        try:
1163
 
            server_state_changed(server.GetState())
 
1772
            service.activate()
1164
1773
        except dbus.exceptions.DBusException, error:
1165
1774
            logger.critical(u"DBusException: %s", error)
 
1775
            cleanup()
1166
1776
            sys.exit(1)
1167
1777
        # End of Avahi example code
1168
1778
        
1175
1785
        main_loop.run()
1176
1786
    except AvahiError, error:
1177
1787
        logger.critical(u"AvahiError: %s", error)
 
1788
        cleanup()
1178
1789
        sys.exit(1)
1179
1790
    except KeyboardInterrupt:
1180
1791
        if debug:
1181
 
            print
 
1792
            print >> sys.stderr
 
1793
        logger.debug(u"Server received KeyboardInterrupt")
 
1794
    logger.debug(u"Server exiting")
 
1795
    # Must run before the D-Bus bus name gets deregistered
 
1796
    cleanup()
1182
1797
 
1183
1798
if __name__ == '__main__':
1184
1799
    main()