/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 at bsnet
  • Date: 2011-03-15 19:15:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110315191524-jc3ajgqu2za7dcly
* mandos: Use the new argparse library instead of optparse.
* debian/control (mandos): Depend on python (<=2.7) | python-argparse

Show diffs side-by-side

added added

removed removed

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