/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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
 
import itertools
69
65
 
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
 
import GnuPGInterface
80
75
 
81
76
try:
82
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
    except ImportError:
87
82
        SO_BINDTODEVICE = None
88
83
 
89
 
version = "1.5.3"
90
 
stored_state_file = "clients.pickle"
91
 
 
92
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.0"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
96
 
 
97
 
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
101
 
except (OSError, AttributeError):
102
 
    def if_nametoindex(interface):
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
 
        with contextlib.closing(socket.socket()) as s:
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
111
 
        return interface_index
112
 
 
113
 
 
114
 
def initlogger(debug, level=logging.WARNING):
115
 
    """init logger and add loglevel"""
116
 
    
117
 
    syslogger.setFormatter(logging.Formatter
118
 
                           ('Mandos [%(process)d]: %(levelname)s:'
119
 
                            ' %(message)s'))
120
 
    logger.addHandler(syslogger)
121
 
    
122
 
    if debug:
123
 
        console = logging.StreamHandler()
124
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
 
                                               ' [%(process)d]:'
126
 
                                               ' %(levelname)s:'
127
 
                                               ' %(message)s'))
128
 
        logger.addHandler(console)
129
 
    logger.setLevel(level)
130
 
 
131
 
 
132
 
class PGPError(Exception):
133
 
    """Exception if encryption/decryption fails"""
134
 
    pass
135
 
 
136
 
 
137
 
class PGPEngine(object):
138
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
 
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
148
 
    
149
 
    def __enter__(self):
150
 
        return self
151
 
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
153
 
        self._cleanup()
154
 
        return False
155
 
    
156
 
    def __del__(self):
157
 
        self._cleanup()
158
 
    
159
 
    def _cleanup(self):
160
 
        if self.tempdir is not None:
161
 
            # Delete contents of tempdir
162
 
            for root, dirs, files in os.walk(self.tempdir,
163
 
                                             topdown = False):
164
 
                for filename in files:
165
 
                    os.remove(os.path.join(root, filename))
166
 
                for dirname in dirs:
167
 
                    os.rmdir(os.path.join(root, dirname))
168
 
            # Remove tempdir
169
 
            os.rmdir(self.tempdir)
170
 
            self.tempdir = None
171
 
    
172
 
    def password_encode(self, password):
173
 
        # Passphrase can not be empty and can not contain newlines or
174
 
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
176
 
    
177
 
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
192
 
        return ciphertext
193
 
    
194
 
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
209
 
        return decrypted_plaintext
210
 
 
211
 
 
 
92
syslogger.setFormatter(logging.Formatter
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
 
95
logger.addHandler(syslogger)
 
96
 
 
97
console = logging.StreamHandler()
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
 
101
logger.addHandler(console)
212
102
 
213
103
class AvahiError(Exception):
214
104
    def __init__(self, value, *args, **kwargs):
261
151
        self.group = None       # our entry group
262
152
        self.server = None
263
153
        self.bus = bus
264
 
        self.entry_group_state_changed_match = None
265
154
    def rename(self):
266
155
        """Derived from the Avahi example code"""
267
156
        if self.rename_count >= self.max_renames:
269
158
                            " after %i retries, exiting.",
270
159
                            self.rename_count)
271
160
            raise AvahiServiceError("Too many renames")
272
 
        self.name = unicode(self.server
273
 
                            .GetAlternativeServiceName(self.name))
 
161
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
274
162
        logger.info("Changing Zeroconf service name to %r ...",
275
163
                    self.name)
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               ('Mandos (%s) [%%(process)d]:'
 
166
                                ' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
276
168
        self.remove()
277
169
        try:
278
170
            self.add()
279
 
        except dbus.exceptions.DBusException as error:
280
 
            logger.critical("D-Bus Exception", exc_info=error)
 
171
        except dbus.exceptions.DBusException, error:
 
172
            logger.critical("DBusException: %s", error)
281
173
            self.cleanup()
282
174
            os._exit(1)
283
175
        self.rename_count += 1
284
176
    def remove(self):
285
177
        """Derived from the Avahi example code"""
286
 
        if self.entry_group_state_changed_match is not None:
287
 
            self.entry_group_state_changed_match.remove()
288
 
            self.entry_group_state_changed_match = None
289
178
        if self.group is not None:
290
179
            self.group.Reset()
291
180
    def add(self):
292
181
        """Derived from the Avahi example code"""
293
 
        self.remove()
294
182
        if self.group is None:
295
183
            self.group = dbus.Interface(
296
184
                self.bus.get_object(avahi.DBUS_NAME,
297
185
                                    self.server.EntryGroupNew()),
298
186
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
299
 
        self.entry_group_state_changed_match = (
300
 
            self.group.connect_to_signal(
301
 
                'StateChanged', self.entry_group_state_changed))
 
187
            self.group.connect_to_signal('StateChanged',
 
188
                                         self
 
189
                                         .entry_group_state_changed)
302
190
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
303
191
                     self.name, self.type)
304
192
        self.group.AddService(
327
215
    def cleanup(self):
328
216
        """Derived from the Avahi example code"""
329
217
        if self.group is not None:
330
 
            try:
331
 
                self.group.Free()
332
 
            except (dbus.exceptions.UnknownMethodException,
333
 
                    dbus.exceptions.DBusException):
334
 
                pass
 
218
            self.group.Free()
335
219
            self.group = None
336
 
        self.remove()
337
 
    def server_state_changed(self, state, error=None):
 
220
    def server_state_changed(self, state):
338
221
        """Derived from the Avahi example code"""
339
222
        logger.debug("Avahi server state change: %i", state)
340
 
        bad_states = { avahi.SERVER_INVALID:
341
 
                           "Zeroconf server invalid",
342
 
                       avahi.SERVER_REGISTERING: None,
343
 
                       avahi.SERVER_COLLISION:
344
 
                           "Zeroconf server name collision",
345
 
                       avahi.SERVER_FAILURE:
346
 
                           "Zeroconf server failure" }
347
 
        if state in bad_states:
348
 
            if bad_states[state] is not None:
349
 
                if error is None:
350
 
                    logger.error(bad_states[state])
351
 
                else:
352
 
                    logger.error(bad_states[state] + ": %r", error)
353
 
            self.cleanup()
 
223
        if state == avahi.SERVER_COLLISION:
 
224
            logger.error("Zeroconf server name collision")
 
225
            self.remove()
354
226
        elif state == avahi.SERVER_RUNNING:
355
227
            self.add()
356
 
        else:
357
 
            if error is None:
358
 
                logger.debug("Unknown state: %r", state)
359
 
            else:
360
 
                logger.debug("Unknown state: %r: %r", state, error)
361
228
    def activate(self):
362
229
        """Derived from the Avahi example code"""
363
230
        if self.server is None:
364
231
            self.server = dbus.Interface(
365
232
                self.bus.get_object(avahi.DBUS_NAME,
366
 
                                    avahi.DBUS_PATH_SERVER,
367
 
                                    follow_name_owner_changes=True),
 
233
                                    avahi.DBUS_PATH_SERVER),
368
234
                avahi.DBUS_INTERFACE_SERVER)
369
235
        self.server.connect_to_signal("StateChanged",
370
236
                                 self.server_state_changed)
371
237
        self.server_state_changed(self.server.GetState())
372
238
 
373
 
class AvahiServiceToSyslog(AvahiService):
374
 
    def rename(self):
375
 
        """Add the new name to the syslog messages"""
376
 
        ret = AvahiService.rename(self)
377
 
        syslogger.setFormatter(logging.Formatter
378
 
                               ('Mandos (%s) [%%(process)d]:'
379
 
                                ' %%(levelname)s: %%(message)s'
380
 
                                % self.name))
381
 
        return ret
382
239
 
383
 
def timedelta_to_milliseconds(td):
384
 
    "Convert a datetime.timedelta() to milliseconds"
385
 
    return ((td.days * 24 * 60 * 60 * 1000)
386
 
            + (td.seconds * 1000)
387
 
            + (td.microseconds // 1000))
388
 
        
389
240
class Client(object):
390
241
    """A representation of a client host served by this server.
391
242
    
392
243
    Attributes:
393
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
244
    _approved:   bool(); 'None' if not yet approved/disapproved
394
245
    approval_delay: datetime.timedelta(); Time to wait for approval
395
246
    approval_duration: datetime.timedelta(); Duration of one approval
396
247
    checker:    subprocess.Popen(); a running checker process used
403
254
                     instance %(name)s can be used in the command.
404
255
    checker_initiator_tag: a gobject event source tag, or None
405
256
    created:    datetime.datetime(); (UTC) object creation
406
 
    client_structure: Object describing what attributes a client has
407
 
                      and is used for storing the client at exit
408
257
    current_checker_command: string; current running checker_command
 
258
    disable_hook:  If set, called by disable() as disable_hook(self)
409
259
    disable_initiator_tag: a gobject event source tag, or None
410
260
    enabled:    bool()
411
261
    fingerprint: string (40 or 32 hexadecimal digits); used to
414
264
    interval:   datetime.timedelta(); How often to start a new checker
415
265
    last_approval_request: datetime.datetime(); (UTC) or None
416
266
    last_checked_ok: datetime.datetime(); (UTC) or None
417
 
    last_checker_status: integer between 0 and 255 reflecting exit
418
 
                         status of last checker. -1 reflects crashed
419
 
                         checker, -2 means no checker completed yet.
420
 
    last_enabled: datetime.datetime(); (UTC) or None
 
267
    last_enabled: datetime.datetime(); (UTC)
421
268
    name:       string; from the config file, used in log messages and
422
269
                        D-Bus identifiers
423
270
    secret:     bytestring; sent verbatim (over TLS) to client
424
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
425
272
                                      until this client is disabled
426
 
    extended_timeout:   extra long timeout when secret has been sent
427
273
    runtime_expansions: Allowed attributes for runtime expansion.
428
 
    expires:    datetime.datetime(); time (UTC) when a client will be
429
 
                disabled, or None
430
274
    """
431
275
    
432
276
    runtime_expansions = ("approval_delay", "approval_duration",
433
277
                          "created", "enabled", "fingerprint",
434
278
                          "host", "interval", "last_checked_ok",
435
279
                          "last_enabled", "name", "timeout")
436
 
    client_defaults = { "timeout": "5m",
437
 
                        "extended_timeout": "15m",
438
 
                        "interval": "2m",
439
 
                        "checker": "fping -q -- %%(host)s",
440
 
                        "host": "",
441
 
                        "approval_delay": "0s",
442
 
                        "approval_duration": "1s",
443
 
                        "approved_by_default": "True",
444
 
                        "enabled": "True",
445
 
                        }
 
280
    
 
281
    @staticmethod
 
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))
446
287
    
447
288
    def timeout_milliseconds(self):
448
289
        "Return the 'timeout' attribute in milliseconds"
449
 
        return timedelta_to_milliseconds(self.timeout)
450
 
    
451
 
    def extended_timeout_milliseconds(self):
452
 
        "Return the 'extended_timeout' attribute in milliseconds"
453
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
290
        return self._timedelta_to_milliseconds(self.timeout)
454
291
    
455
292
    def interval_milliseconds(self):
456
293
        "Return the 'interval' attribute in milliseconds"
457
 
        return timedelta_to_milliseconds(self.interval)
458
 
    
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
295
 
459
296
    def approval_delay_milliseconds(self):
460
 
        return timedelta_to_milliseconds(self.approval_delay)
461
 
 
462
 
    @staticmethod
463
 
    def config_parser(config):
464
 
        """Construct a new dict of client settings of this form:
465
 
        { client_name: {setting_name: value, ...}, ...}
466
 
        with exceptions for any special settings as defined above.
467
 
        NOTE: Must be a pure function. Must return the same result
468
 
        value given the same arguments.
469
 
        """
470
 
        settings = {}
471
 
        for client_name in config.sections():
472
 
            section = dict(config.items(client_name))
473
 
            client = settings[client_name] = {}
474
 
            
475
 
            client["host"] = section["host"]
476
 
            # Reformat values from string types to Python types
477
 
            client["approved_by_default"] = config.getboolean(
478
 
                client_name, "approved_by_default")
479
 
            client["enabled"] = config.getboolean(client_name,
480
 
                                                  "enabled")
481
 
            
482
 
            client["fingerprint"] = (section["fingerprint"].upper()
483
 
                                     .replace(" ", ""))
484
 
            if "secret" in section:
485
 
                client["secret"] = section["secret"].decode("base64")
486
 
            elif "secfile" in section:
487
 
                with open(os.path.expanduser(os.path.expandvars
488
 
                                             (section["secfile"])),
489
 
                          "rb") as secfile:
490
 
                    client["secret"] = secfile.read()
491
 
            else:
492
 
                raise TypeError("No secret or secfile for section %s"
493
 
                                % section)
494
 
            client["timeout"] = string_to_delta(section["timeout"])
495
 
            client["extended_timeout"] = string_to_delta(
496
 
                section["extended_timeout"])
497
 
            client["interval"] = string_to_delta(section["interval"])
498
 
            client["approval_delay"] = string_to_delta(
499
 
                section["approval_delay"])
500
 
            client["approval_duration"] = string_to_delta(
501
 
                section["approval_duration"])
502
 
            client["checker_command"] = section["checker"]
503
 
            client["last_approval_request"] = None
504
 
            client["last_checked_ok"] = None
505
 
            client["last_checker_status"] = -2
506
 
        
507
 
        return settings
508
 
        
509
 
        
510
 
    def __init__(self, settings, name = None):
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
 
298
    
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
511
300
        """Note: the 'checker' key in 'config' sets the
512
301
        'checker_command' attribute and *not* the 'checker'
513
302
        attribute."""
514
303
        self.name = name
515
 
        # adding all client settings
516
 
        for setting, value in settings.iteritems():
517
 
            setattr(self, setting, value)
518
 
        
519
 
        if self.enabled:
520
 
            if not hasattr(self, "last_enabled"):
521
 
                self.last_enabled = datetime.datetime.utcnow()
522
 
            if not hasattr(self, "expires"):
523
 
                self.expires = (datetime.datetime.utcnow()
524
 
                                + self.timeout)
525
 
        else:
526
 
            self.last_enabled = None
527
 
            self.expires = None
528
 
       
 
304
        if config is None:
 
305
            config = {}
529
306
        logger.debug("Creating client %r", self.name)
530
307
        # Uppercase and remove spaces from fingerprint for later
531
308
        # comparison purposes with return value from the fingerprint()
532
309
        # function
 
310
        self.fingerprint = (config["fingerprint"].upper()
 
311
                            .replace(" ", ""))
533
312
        logger.debug("  Fingerprint: %s", self.fingerprint)
534
 
        self.created = settings.get("created",
535
 
                                    datetime.datetime.utcnow())
536
 
 
537
 
        # attributes specific for this server instance
 
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:
 
319
                self.secret = secfile.read()
 
320
        else:
 
321
            raise TypeError("No secret or secfile for client %s"
 
322
                            % self.name)
 
323
        self.host = config.get("host", "")
 
324
        self.created = datetime.datetime.utcnow()
 
325
        self.enabled = False
 
326
        self.last_approval_request = None
 
327
        self.last_enabled = None
 
328
        self.last_checked_ok = None
 
329
        self.timeout = string_to_delta(config["timeout"])
 
330
        self.interval = string_to_delta(config["interval"])
 
331
        self.disable_hook = disable_hook
538
332
        self.checker = None
539
333
        self.checker_initiator_tag = None
540
334
        self.disable_initiator_tag = None
541
335
        self.checker_callback_tag = None
 
336
        self.checker_command = config["checker"]
542
337
        self.current_checker_command = None
543
 
        self.approved = None
 
338
        self.last_connect = None
 
339
        self._approved = None
 
340
        self.approved_by_default = config.get("approved_by_default",
 
341
                                              True)
544
342
        self.approvals_pending = 0
545
 
        self.changedstate = (multiprocessing_manager
546
 
                             .Condition(multiprocessing_manager
547
 
                                        .Lock()))
548
 
        self.client_structure = [attr for attr in
549
 
                                 self.__dict__.iterkeys()
550
 
                                 if not attr.startswith("_")]
551
 
        self.client_structure.append("client_structure")
552
 
        
553
 
        for name, t in inspect.getmembers(type(self),
554
 
                                          lambda obj:
555
 
                                              isinstance(obj,
556
 
                                                         property)):
557
 
            if not name.startswith("_"):
558
 
                self.client_structure.append(name)
 
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())
559
348
    
560
 
    # Send notice to process children that client state has changed
561
349
    def send_changedstate(self):
562
 
        with self.changedstate:
563
 
            self.changedstate.notify_all()
564
 
    
 
350
        self.changedstate.acquire()
 
351
        self.changedstate.notify_all()
 
352
        self.changedstate.release()
 
353
        
565
354
    def enable(self):
566
355
        """Start this client's checker and timeout hooks"""
567
356
        if getattr(self, "enabled", False):
568
357
            # Already enabled
569
358
            return
570
359
        self.send_changedstate()
571
 
        self.expires = datetime.datetime.utcnow() + self.timeout
572
 
        self.enabled = True
573
360
        self.last_enabled = datetime.datetime.utcnow()
574
 
        self.init_checker()
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
362
        # and every interval from then on.
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
364
                                      (self.interval_milliseconds(),
 
365
                                       self.start_checker))
 
366
        # Schedule a disable() when 'timeout' has passed
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
368
                                   (self.timeout_milliseconds(),
 
369
                                    self.disable))
 
370
        self.enabled = True
 
371
        # Also start a new checker *right now*.
 
372
        self.start_checker()
575
373
    
576
374
    def disable(self, quiet=True):
577
375
        """Disable this client."""
584
382
        if getattr(self, "disable_initiator_tag", False):
585
383
            gobject.source_remove(self.disable_initiator_tag)
586
384
            self.disable_initiator_tag = None
587
 
        self.expires = None
588
385
        if getattr(self, "checker_initiator_tag", False):
589
386
            gobject.source_remove(self.checker_initiator_tag)
590
387
            self.checker_initiator_tag = None
591
388
        self.stop_checker()
 
389
        if self.disable_hook:
 
390
            self.disable_hook(self)
592
391
        self.enabled = False
593
392
        # Do not run this again if called by a gobject.timeout_add
594
393
        return False
595
394
    
596
395
    def __del__(self):
 
396
        self.disable_hook = None
597
397
        self.disable()
598
398
    
599
 
    def init_checker(self):
600
 
        # Schedule a new checker to be started an 'interval' from now,
601
 
        # and every interval from then on.
602
 
        self.checker_initiator_tag = (gobject.timeout_add
603
 
                                      (self.interval_milliseconds(),
604
 
                                       self.start_checker))
605
 
        # Schedule a disable() when 'timeout' has passed
606
 
        self.disable_initiator_tag = (gobject.timeout_add
607
 
                                   (self.timeout_milliseconds(),
608
 
                                    self.disable))
609
 
        # Also start a new checker *right now*.
610
 
        self.start_checker()
611
 
    
612
399
    def checker_callback(self, pid, condition, command):
613
400
        """The checker has completed, so take appropriate actions."""
614
401
        self.checker_callback_tag = None
615
402
        self.checker = None
616
403
        if os.WIFEXITED(condition):
617
 
            self.last_checker_status = os.WEXITSTATUS(condition)
618
 
            if self.last_checker_status == 0:
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
405
            if exitstatus == 0:
619
406
                logger.info("Checker for %(name)s succeeded",
620
407
                            vars(self))
621
408
                self.checked_ok()
623
410
                logger.info("Checker for %(name)s failed",
624
411
                            vars(self))
625
412
        else:
626
 
            self.last_checker_status = -1
627
413
            logger.warning("Checker for %(name)s crashed?",
628
414
                           vars(self))
629
415
    
630
416
    def checked_ok(self):
631
 
        """Assert that the client has been seen, alive and well."""
 
417
        """Bump up the timeout for this client.
 
418
        
 
419
        This should only be called when the client has been seen,
 
420
        alive and well.
 
421
        """
632
422
        self.last_checked_ok = datetime.datetime.utcnow()
633
 
        self.last_checker_status = 0
634
 
        self.bump_timeout()
635
 
    
636
 
    def bump_timeout(self, timeout=None):
637
 
        """Bump up the timeout for this client."""
638
 
        if timeout is None:
639
 
            timeout = self.timeout
640
 
        if self.disable_initiator_tag is not None:
641
 
            gobject.source_remove(self.disable_initiator_tag)
642
 
        if getattr(self, "enabled", False):
643
 
            self.disable_initiator_tag = (gobject.timeout_add
644
 
                                          (timedelta_to_milliseconds
645
 
                                           (timeout), self.disable))
646
 
            self.expires = datetime.datetime.utcnow() + timeout
 
423
        gobject.source_remove(self.disable_initiator_tag)
 
424
        self.disable_initiator_tag = (gobject.timeout_add
 
425
                                      (self.timeout_milliseconds(),
 
426
                                       self.disable))
647
427
    
648
428
    def need_approval(self):
649
429
        self.last_approval_request = datetime.datetime.utcnow()
665
445
        # If a checker exists, make sure it is not a zombie
666
446
        try:
667
447
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
 
        except (AttributeError, OSError) as error:
 
448
        except (AttributeError, OSError), error:
669
449
            if (isinstance(error, OSError)
670
450
                and error.errno != errno.ECHILD):
671
451
                raise error
689
469
                                       'replace')))
690
470
                    for attr in
691
471
                    self.runtime_expansions)
692
 
                
 
472
 
693
473
                try:
694
474
                    command = self.checker_command % escaped_attrs
695
 
                except TypeError as error:
696
 
                    logger.error('Could not format string "%s"',
697
 
                                 self.checker_command, exc_info=error)
 
475
                except TypeError, error:
 
476
                    logger.error('Could not format string "%s":'
 
477
                                 ' %s', self.checker_command, error)
698
478
                    return True # Try again later
699
479
            self.current_checker_command = command
700
480
            try:
717
497
                if pid:
718
498
                    gobject.source_remove(self.checker_callback_tag)
719
499
                    self.checker_callback(pid, status, command)
720
 
            except OSError as error:
721
 
                logger.error("Failed to start subprocess",
722
 
                             exc_info=error)
 
500
            except OSError, error:
 
501
                logger.error("Failed to start subprocess: %s",
 
502
                             error)
723
503
        # Re-run this periodically if run by gobject.timeout_add
724
504
        return True
725
505
    
732
512
            return
733
513
        logger.debug("Stopping checker for %(name)s", vars(self))
734
514
        try:
735
 
            self.checker.terminate()
 
515
            os.kill(self.checker.pid, signal.SIGTERM)
736
516
            #time.sleep(0.5)
737
517
            #if self.checker.poll() is None:
738
 
            #    self.checker.kill()
739
 
        except OSError as error:
 
518
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
519
        except OSError, error:
740
520
            if error.errno != errno.ESRCH: # No such process
741
521
                raise
742
522
        self.checker = None
743
523
 
744
 
 
745
524
def dbus_service_property(dbus_interface, signature="v",
746
525
                          access="readwrite", byte_arrays=False):
747
526
    """Decorators for marking methods of a DBusObjectWithProperties to
772
551
    return decorator
773
552
 
774
553
 
775
 
def dbus_interface_annotations(dbus_interface):
776
 
    """Decorator for marking functions returning interface annotations.
777
 
    
778
 
    Usage:
779
 
    
780
 
    @dbus_interface_annotations("org.example.Interface")
781
 
    def _foo(self):  # Function name does not matter
782
 
        return {"org.freedesktop.DBus.Deprecated": "true",
783
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
784
 
                    "false"}
785
 
    """
786
 
    def decorator(func):
787
 
        func._dbus_is_interface = True
788
 
        func._dbus_interface = dbus_interface
789
 
        func._dbus_name = dbus_interface
790
 
        return func
791
 
    return decorator
792
 
 
793
 
 
794
 
def dbus_annotations(annotations):
795
 
    """Decorator to annotate D-Bus methods, signals or properties
796
 
    Usage:
797
 
    
798
 
    @dbus_service_property("org.example.Interface", signature="b",
799
 
                           access="r")
800
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
 
                        "org.freedesktop.DBus.Property."
802
 
                        "EmitsChangedSignal": "false"})
803
 
    def Property_dbus_property(self):
804
 
        return dbus.Boolean(False)
805
 
    """
806
 
    def decorator(func):
807
 
        func._dbus_annotations = annotations
808
 
        return func
809
 
    return decorator
810
 
 
811
 
 
812
554
class DBusPropertyException(dbus.exceptions.DBusException):
813
555
    """A base class for D-Bus property-related exceptions
814
556
    """
830
572
 
831
573
class DBusObjectWithProperties(dbus.service.Object):
832
574
    """A D-Bus object with properties.
833
 
    
 
575
 
834
576
    Classes inheriting from this can use the dbus_service_property
835
577
    decorator to expose methods as D-Bus properties.  It exposes the
836
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
837
579
    """
838
580
    
839
581
    @staticmethod
840
 
    def _is_dbus_thing(thing):
841
 
        """Returns a function testing if an attribute is a D-Bus thing
842
 
        
843
 
        If called like _is_dbus_thing("method") it returns a function
844
 
        suitable for use as predicate to inspect.getmembers().
845
 
        """
846
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
847
 
                                   False)
 
582
    def _is_dbus_property(obj):
 
583
        return getattr(obj, "_dbus_is_property", False)
848
584
    
849
 
    def _get_all_dbus_things(self, thing):
 
585
    def _get_all_dbus_properties(self):
850
586
        """Returns a generator of (name, attribute) pairs
851
587
        """
852
 
        return ((getattr(athing.__get__(self), "_dbus_name",
853
 
                         name),
854
 
                 athing.__get__(self))
855
 
                for cls in self.__class__.__mro__
856
 
                for name, athing in
857
 
                inspect.getmembers(cls,
858
 
                                   self._is_dbus_thing(thing)))
 
588
        return ((prop._dbus_name, prop)
 
589
                for name, prop in
 
590
                inspect.getmembers(self, self._is_dbus_property))
859
591
    
860
592
    def _get_dbus_property(self, interface_name, property_name):
861
593
        """Returns a bound method if one exists which is a D-Bus
862
594
        property with the specified name and interface.
863
595
        """
864
 
        for cls in  self.__class__.__mro__:
865
 
            for name, value in (inspect.getmembers
866
 
                                (cls,
867
 
                                 self._is_dbus_thing("property"))):
868
 
                if (value._dbus_name == property_name
869
 
                    and value._dbus_interface == interface_name):
870
 
                    return value.__get__(self)
871
 
        
 
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
872
606
        # No such property
873
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
608
                                   + interface_name + "."
899
633
            # signatures other than "ay".
900
634
            if prop._dbus_signature != "ay":
901
635
                raise ValueError
902
 
            value = dbus.ByteArray(b''.join(chr(byte)
903
 
                                            for byte in value))
 
636
            value = dbus.ByteArray(''.join(unichr(byte)
 
637
                                           for byte in value))
904
638
        prop(value)
905
639
    
906
640
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
908
642
    def GetAll(self, interface_name):
909
643
        """Standard D-Bus property GetAll() method, see D-Bus
910
644
        standard.
911
 
        
 
645
 
912
646
        Note: Will not include properties with access="write".
913
647
        """
914
 
        properties = {}
915
 
        for name, prop in self._get_all_dbus_things("property"):
 
648
        all = {}
 
649
        for name, prop in self._get_all_dbus_properties():
916
650
            if (interface_name
917
651
                and interface_name != prop._dbus_interface):
918
652
                # Interface non-empty but did not match
922
656
                continue
923
657
            value = prop()
924
658
            if not hasattr(value, "variant_level"):
925
 
                properties[name] = value
 
659
                all[name] = value
926
660
                continue
927
 
            properties[name] = type(value)(value, variant_level=
928
 
                                           value.variant_level+1)
929
 
        return dbus.Dictionary(properties, signature="sv")
 
661
            all[name] = type(value)(value, variant_level=
 
662
                                    value.variant_level+1)
 
663
        return dbus.Dictionary(all, signature="sv")
930
664
    
931
665
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
666
                         out_signature="s",
933
667
                         path_keyword='object_path',
934
668
                         connection_keyword='connection')
935
669
    def Introspect(self, object_path, connection):
936
 
        """Overloading of standard D-Bus method.
937
 
        
938
 
        Inserts property tags and interface annotation tags.
 
670
        """Standard D-Bus method, overloaded to insert property tags.
939
671
        """
940
672
        xmlstring = dbus.service.Object.Introspect(self, object_path,
941
673
                                                   connection)
948
680
                e.setAttribute("access", prop._dbus_access)
949
681
                return e
950
682
            for if_tag in document.getElementsByTagName("interface"):
951
 
                # Add property tags
952
683
                for tag in (make_tag(document, name, prop)
953
684
                            for name, prop
954
 
                            in self._get_all_dbus_things("property")
 
685
                            in self._get_all_dbus_properties()
955
686
                            if prop._dbus_interface
956
687
                            == if_tag.getAttribute("name")):
957
688
                    if_tag.appendChild(tag)
958
 
                # Add annotation tags
959
 
                for typ in ("method", "signal", "property"):
960
 
                    for tag in if_tag.getElementsByTagName(typ):
961
 
                        annots = dict()
962
 
                        for name, prop in (self.
963
 
                                           _get_all_dbus_things(typ)):
964
 
                            if (name == tag.getAttribute("name")
965
 
                                and prop._dbus_interface
966
 
                                == if_tag.getAttribute("name")):
967
 
                                annots.update(getattr
968
 
                                              (prop,
969
 
                                               "_dbus_annotations",
970
 
                                               {}))
971
 
                        for name, value in annots.iteritems():
972
 
                            ann_tag = document.createElement(
973
 
                                "annotation")
974
 
                            ann_tag.setAttribute("name", name)
975
 
                            ann_tag.setAttribute("value", value)
976
 
                            tag.appendChild(ann_tag)
977
 
                # Add interface annotation tags
978
 
                for annotation, value in dict(
979
 
                    itertools.chain(
980
 
                        *(annotations().iteritems()
981
 
                          for name, annotations in
982
 
                          self._get_all_dbus_things("interface")
983
 
                          if name == if_tag.getAttribute("name")
984
 
                          ))).iteritems():
985
 
                    ann_tag = document.createElement("annotation")
986
 
                    ann_tag.setAttribute("name", annotation)
987
 
                    ann_tag.setAttribute("value", value)
988
 
                    if_tag.appendChild(ann_tag)
989
689
                # Add the names to the return values for the
990
690
                # "org.freedesktop.DBus.Properties" methods
991
691
                if (if_tag.getAttribute("name")
1004
704
            xmlstring = document.toxml("utf-8")
1005
705
            document.unlink()
1006
706
        except (AttributeError, xml.dom.DOMException,
1007
 
                xml.parsers.expat.ExpatError) as error:
 
707
                xml.parsers.expat.ExpatError), error:
1008
708
            logger.error("Failed to override Introspection method",
1009
 
                         exc_info=error)
 
709
                         error)
1010
710
        return xmlstring
1011
711
 
1012
712
 
1013
 
def datetime_to_dbus (dt, variant_level=0):
1014
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1015
 
    if dt is None:
1016
 
        return dbus.String("", variant_level = variant_level)
1017
 
    return dbus.String(dt.isoformat(),
1018
 
                       variant_level=variant_level)
1019
 
 
1020
 
 
1021
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
 
                                  .__metaclass__):
1023
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1024
 
    will add additional D-Bus attributes matching a certain pattern.
1025
 
    """
1026
 
    def __new__(mcs, name, bases, attr):
1027
 
        # Go through all the base classes which could have D-Bus
1028
 
        # methods, signals, or properties in them
1029
 
        old_interface_names = []
1030
 
        for base in (b for b in bases
1031
 
                     if issubclass(b, dbus.service.Object)):
1032
 
            # Go though all attributes of the base class
1033
 
            for attrname, attribute in inspect.getmembers(base):
1034
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1035
 
                # with the wrong interface name
1036
 
                if (not hasattr(attribute, "_dbus_interface")
1037
 
                    or not attribute._dbus_interface
1038
 
                    .startswith("se.recompile.Mandos")):
1039
 
                    continue
1040
 
                # Create an alternate D-Bus interface name based on
1041
 
                # the current name
1042
 
                alt_interface = (attribute._dbus_interface
1043
 
                                 .replace("se.recompile.Mandos",
1044
 
                                          "se.bsnet.fukt.Mandos"))
1045
 
                if alt_interface != attribute._dbus_interface:
1046
 
                    old_interface_names.append(alt_interface)
1047
 
                # Is this a D-Bus signal?
1048
 
                if getattr(attribute, "_dbus_is_signal", False):
1049
 
                    # Extract the original non-method function by
1050
 
                    # black magic
1051
 
                    nonmethod_func = (dict(
1052
 
                            zip(attribute.func_code.co_freevars,
1053
 
                                attribute.__closure__))["func"]
1054
 
                                      .cell_contents)
1055
 
                    # Create a new, but exactly alike, function
1056
 
                    # object, and decorate it to be a new D-Bus signal
1057
 
                    # with the alternate D-Bus interface name
1058
 
                    new_function = (dbus.service.signal
1059
 
                                    (alt_interface,
1060
 
                                     attribute._dbus_signature)
1061
 
                                    (types.FunctionType(
1062
 
                                nonmethod_func.func_code,
1063
 
                                nonmethod_func.func_globals,
1064
 
                                nonmethod_func.func_name,
1065
 
                                nonmethod_func.func_defaults,
1066
 
                                nonmethod_func.func_closure)))
1067
 
                    # Copy annotations, if any
1068
 
                    try:
1069
 
                        new_function._dbus_annotations = (
1070
 
                            dict(attribute._dbus_annotations))
1071
 
                    except AttributeError:
1072
 
                        pass
1073
 
                    # Define a creator of a function to call both the
1074
 
                    # old and new functions, so both the old and new
1075
 
                    # signals gets sent when the function is called
1076
 
                    def fixscope(func1, func2):
1077
 
                        """This function is a scope container to pass
1078
 
                        func1 and func2 to the "call_both" function
1079
 
                        outside of its arguments"""
1080
 
                        def call_both(*args, **kwargs):
1081
 
                            """This function will emit two D-Bus
1082
 
                            signals by calling func1 and func2"""
1083
 
                            func1(*args, **kwargs)
1084
 
                            func2(*args, **kwargs)
1085
 
                        return call_both
1086
 
                    # Create the "call_both" function and add it to
1087
 
                    # the class
1088
 
                    attr[attrname] = fixscope(attribute,
1089
 
                                              new_function)
1090
 
                # Is this a D-Bus method?
1091
 
                elif getattr(attribute, "_dbus_is_method", False):
1092
 
                    # Create a new, but exactly alike, function
1093
 
                    # object.  Decorate it to be a new D-Bus method
1094
 
                    # with the alternate D-Bus interface name.  Add it
1095
 
                    # to the class.
1096
 
                    attr[attrname] = (dbus.service.method
1097
 
                                      (alt_interface,
1098
 
                                       attribute._dbus_in_signature,
1099
 
                                       attribute._dbus_out_signature)
1100
 
                                      (types.FunctionType
1101
 
                                       (attribute.func_code,
1102
 
                                        attribute.func_globals,
1103
 
                                        attribute.func_name,
1104
 
                                        attribute.func_defaults,
1105
 
                                        attribute.func_closure)))
1106
 
                    # Copy annotations, if any
1107
 
                    try:
1108
 
                        attr[attrname]._dbus_annotations = (
1109
 
                            dict(attribute._dbus_annotations))
1110
 
                    except AttributeError:
1111
 
                        pass
1112
 
                # Is this a D-Bus property?
1113
 
                elif getattr(attribute, "_dbus_is_property", False):
1114
 
                    # Create a new, but exactly alike, function
1115
 
                    # object, and decorate it to be a new D-Bus
1116
 
                    # property with the alternate D-Bus interface
1117
 
                    # name.  Add it to the class.
1118
 
                    attr[attrname] = (dbus_service_property
1119
 
                                      (alt_interface,
1120
 
                                       attribute._dbus_signature,
1121
 
                                       attribute._dbus_access,
1122
 
                                       attribute
1123
 
                                       ._dbus_get_args_options
1124
 
                                       ["byte_arrays"])
1125
 
                                      (types.FunctionType
1126
 
                                       (attribute.func_code,
1127
 
                                        attribute.func_globals,
1128
 
                                        attribute.func_name,
1129
 
                                        attribute.func_defaults,
1130
 
                                        attribute.func_closure)))
1131
 
                    # Copy annotations, if any
1132
 
                    try:
1133
 
                        attr[attrname]._dbus_annotations = (
1134
 
                            dict(attribute._dbus_annotations))
1135
 
                    except AttributeError:
1136
 
                        pass
1137
 
                # Is this a D-Bus interface?
1138
 
                elif getattr(attribute, "_dbus_is_interface", False):
1139
 
                    # Create a new, but exactly alike, function
1140
 
                    # object.  Decorate it to be a new D-Bus interface
1141
 
                    # with the alternate D-Bus interface name.  Add it
1142
 
                    # to the class.
1143
 
                    attr[attrname] = (dbus_interface_annotations
1144
 
                                      (alt_interface)
1145
 
                                      (types.FunctionType
1146
 
                                       (attribute.func_code,
1147
 
                                        attribute.func_globals,
1148
 
                                        attribute.func_name,
1149
 
                                        attribute.func_defaults,
1150
 
                                        attribute.func_closure)))
1151
 
        # Deprecate all old interfaces
1152
 
        basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
 
        for old_interface_name in old_interface_names:
1154
 
            @dbus_interface_annotations(old_interface_name)
1155
 
            def func(self):
1156
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1157
 
            # Find an unused name
1158
 
            for aname in (basename.format(i) for i in
1159
 
                          itertools.count()):
1160
 
                if aname not in attr:
1161
 
                    attr[aname] = func
1162
 
                    break
1163
 
        return type.__new__(mcs, name, bases, attr)
1164
 
 
1165
 
 
1166
713
class ClientDBus(Client, DBusObjectWithProperties):
1167
714
    """A Client class using D-Bus
1168
715
    
1177
724
    # dbus.service.Object doesn't use super(), so we can't either.
1178
725
    
1179
726
    def __init__(self, bus = None, *args, **kwargs):
 
727
        self._approvals_pending = 0
1180
728
        self.bus = bus
1181
729
        Client.__init__(self, *args, **kwargs)
1182
730
        # Only now, when this client is initialized, can it show up on
1189
737
        DBusObjectWithProperties.__init__(self, self.bus,
1190
738
                                          self.dbus_object_path)
1191
739
        
1192
 
    def notifychangeproperty(transform_func,
1193
 
                             dbus_name, type_func=lambda x: x,
1194
 
                             variant_level=1):
1195
 
        """ Modify a variable so that it's a property which announces
1196
 
        its changes to DBus.
1197
 
        
1198
 
        transform_fun: Function that takes a value and a variant_level
1199
 
                       and transforms it to a D-Bus type.
1200
 
        dbus_name: D-Bus name of the variable
1201
 
        type_func: Function that transform the value before sending it
1202
 
                   to the D-Bus.  Default: no transform
1203
 
        variant_level: D-Bus variant level.  Default: 1
1204
 
        """
1205
 
        attrname = "_{0}".format(dbus_name)
1206
 
        def setter(self, value):
1207
 
            if hasattr(self, "dbus_object_path"):
1208
 
                if (not hasattr(self, attrname) or
1209
 
                    type_func(getattr(self, attrname, None))
1210
 
                    != type_func(value)):
1211
 
                    dbus_value = transform_func(type_func(value),
1212
 
                                                variant_level
1213
 
                                                =variant_level)
1214
 
                    self.PropertyChanged(dbus.String(dbus_name),
1215
 
                                         dbus_value)
1216
 
            setattr(self, attrname, value)
1217
 
        
1218
 
        return property(lambda self: getattr(self, attrname), setter)
1219
 
    
1220
 
    
1221
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1222
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1223
 
                                             "ApprovalPending",
1224
 
                                             type_func = bool)
1225
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1226
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1227
 
                                        "LastEnabled")
1228
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
 
                                   type_func = lambda checker:
1230
 
                                       checker is not None)
1231
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
 
                                           "LastCheckedOK")
1233
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1234
 
                                               "LastCheckerStatus")
1235
 
    last_approval_request = notifychangeproperty(
1236
 
        datetime_to_dbus, "LastApprovalRequest")
1237
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1238
 
                                               "ApprovedByDefault")
1239
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1240
 
                                          "ApprovalDelay",
1241
 
                                          type_func =
1242
 
                                          timedelta_to_milliseconds)
1243
 
    approval_duration = notifychangeproperty(
1244
 
        dbus.UInt64, "ApprovalDuration",
1245
 
        type_func = timedelta_to_milliseconds)
1246
 
    host = notifychangeproperty(dbus.String, "Host")
1247
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
 
                                   type_func =
1249
 
                                   timedelta_to_milliseconds)
1250
 
    extended_timeout = notifychangeproperty(
1251
 
        dbus.UInt64, "ExtendedTimeout",
1252
 
        type_func = timedelta_to_milliseconds)
1253
 
    interval = notifychangeproperty(dbus.UInt64,
1254
 
                                    "Interval",
1255
 
                                    type_func =
1256
 
                                    timedelta_to_milliseconds)
1257
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1258
 
    
1259
 
    del notifychangeproperty
 
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
 
755
    
 
756
    @staticmethod
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
759
        return dbus.String(dt.isoformat(),
 
760
                           variant_level=variant_level)
 
761
    
 
762
    def enable(self):
 
763
        oldstate = getattr(self, "enabled", False)
 
764
        r = Client.enable(self)
 
765
        if oldstate != self.enabled:
 
766
            # Emit D-Bus signals
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
768
                                 dbus.Boolean(True, variant_level=1))
 
769
            self.PropertyChanged(
 
770
                dbus.String("LastEnabled"),
 
771
                self._datetime_to_dbus(self.last_enabled,
 
772
                                       variant_level=1))
 
773
        return r
 
774
    
 
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:
 
779
            # Emit D-Bus signal
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
781
                                 dbus.Boolean(False, variant_level=1))
 
782
        return r
1260
783
    
1261
784
    def __del__(self, *args, **kwargs):
1262
785
        try:
1271
794
                         *args, **kwargs):
1272
795
        self.checker_callback_tag = None
1273
796
        self.checker = None
 
797
        # Emit D-Bus signal
 
798
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
799
                             dbus.Boolean(False, variant_level=1))
1274
800
        if os.WIFEXITED(condition):
1275
801
            exitstatus = os.WEXITSTATUS(condition)
1276
802
            # Emit D-Bus signal
1286
812
        return Client.checker_callback(self, pid, condition, command,
1287
813
                                       *args, **kwargs)
1288
814
    
 
815
    def checked_ok(self, *args, **kwargs):
 
816
        r = Client.checked_ok(self, *args, **kwargs)
 
817
        # Emit D-Bus signal
 
818
        self.PropertyChanged(
 
819
            dbus.String("LastCheckedOK"),
 
820
            (self._datetime_to_dbus(self.last_checked_ok,
 
821
                                    variant_level=1)))
 
822
        return r
 
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
    
1289
833
    def start_checker(self, *args, **kwargs):
1290
834
        old_checker = self.checker
1291
835
        if self.checker is not None:
1298
842
            and old_checker_pid != self.checker.pid):
1299
843
            # Emit D-Bus signal
1300
844
            self.CheckerStarted(self.current_checker_command)
 
845
            self.PropertyChanged(
 
846
                dbus.String("CheckerRunning"),
 
847
                dbus.Boolean(True, variant_level=1))
1301
848
        return r
1302
849
    
 
850
    def stop_checker(self, *args, **kwargs):
 
851
        old_checker = getattr(self, "checker", None)
 
852
        r = Client.stop_checker(self, *args, **kwargs)
 
853
        if (old_checker is not None
 
854
            and getattr(self, "checker", None) is None):
 
855
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
856
                                 dbus.Boolean(False, variant_level=1))
 
857
        return r
 
858
 
1303
859
    def _reset_approved(self):
1304
 
        self.approved = None
 
860
        self._approved = None
1305
861
        return False
1306
862
    
1307
863
    def approve(self, value=True):
1308
864
        self.send_changedstate()
1309
 
        self.approved = value
1310
 
        gobject.timeout_add(timedelta_to_milliseconds
 
865
        self._approved = value
 
866
        gobject.timeout_add(self._timedelta_to_milliseconds
1311
867
                            (self.approval_duration),
1312
868
                            self._reset_approved)
1313
869
    
1314
870
    
1315
871
    ## D-Bus methods, signals & properties
1316
 
    _interface = "se.recompile.Mandos.Client"
1317
 
    
1318
 
    ## Interfaces
1319
 
    
1320
 
    @dbus_interface_annotations(_interface)
1321
 
    def _foo(self):
1322
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
 
                     "false"}
 
872
    _interface = "se.bsnet.fukt.Mandos.Client"
1324
873
    
1325
874
    ## Signals
1326
875
    
1373
922
    # CheckedOK - method
1374
923
    @dbus.service.method(_interface)
1375
924
    def CheckedOK(self):
1376
 
        self.checked_ok()
 
925
        return self.checked_ok()
1377
926
    
1378
927
    # Enable - method
1379
928
    @dbus.service.method(_interface)
1412
961
        if value is None:       # get
1413
962
            return dbus.Boolean(self.approved_by_default)
1414
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))
1415
967
    
1416
968
    # ApprovalDelay - property
1417
969
    @dbus_service_property(_interface, signature="t",
1420
972
        if value is None:       # get
1421
973
            return dbus.UInt64(self.approval_delay_milliseconds())
1422
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))
1423
978
    
1424
979
    # ApprovalDuration - property
1425
980
    @dbus_service_property(_interface, signature="t",
1426
981
                           access="readwrite")
1427
982
    def ApprovalDuration_dbus_property(self, value=None):
1428
983
        if value is None:       # get
1429
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
984
            return dbus.UInt64(self._timedelta_to_milliseconds(
1430
985
                    self.approval_duration))
1431
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))
1432
990
    
1433
991
    # Name - property
1434
992
    @dbus_service_property(_interface, signature="s", access="read")
1446
1004
    def Host_dbus_property(self, value=None):
1447
1005
        if value is None:       # get
1448
1006
            return dbus.String(self.host)
1449
 
        self.host = unicode(value)
 
1007
        self.host = value
 
1008
        # Emit D-Bus signal
 
1009
        self.PropertyChanged(dbus.String("Host"),
 
1010
                             dbus.String(value, variant_level=1))
1450
1011
    
1451
1012
    # Created - property
1452
1013
    @dbus_service_property(_interface, signature="s", access="read")
1453
1014
    def Created_dbus_property(self):
1454
 
        return datetime_to_dbus(self.created)
 
1015
        return dbus.String(self._datetime_to_dbus(self.created))
1455
1016
    
1456
1017
    # LastEnabled - property
1457
1018
    @dbus_service_property(_interface, signature="s", access="read")
1458
1019
    def LastEnabled_dbus_property(self):
1459
 
        return datetime_to_dbus(self.last_enabled)
 
1020
        if self.last_enabled is None:
 
1021
            return dbus.String("")
 
1022
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1460
1023
    
1461
1024
    # Enabled - property
1462
1025
    @dbus_service_property(_interface, signature="b",
1476
1039
        if value is not None:
1477
1040
            self.checked_ok()
1478
1041
            return
1479
 
        return datetime_to_dbus(self.last_checked_ok)
1480
 
    
1481
 
    # LastCheckerStatus - property
1482
 
    @dbus_service_property(_interface, signature="n",
1483
 
                           access="read")
1484
 
    def LastCheckerStatus_dbus_property(self):
1485
 
        return dbus.Int16(self.last_checker_status)
1486
 
    
1487
 
    # Expires - property
1488
 
    @dbus_service_property(_interface, signature="s", access="read")
1489
 
    def Expires_dbus_property(self):
1490
 
        return datetime_to_dbus(self.expires)
 
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))
1491
1046
    
1492
1047
    # LastApprovalRequest - property
1493
1048
    @dbus_service_property(_interface, signature="s", access="read")
1494
1049
    def LastApprovalRequest_dbus_property(self):
1495
 
        return datetime_to_dbus(self.last_approval_request)
 
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))
1496
1055
    
1497
1056
    # Timeout - property
1498
1057
    @dbus_service_property(_interface, signature="t",
1501
1060
        if value is None:       # get
1502
1061
            return dbus.UInt64(self.timeout_milliseconds())
1503
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
1504
1068
        # Reschedule timeout
1505
 
        if self.enabled:
1506
 
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
1510
 
                # The timeout has passed
1511
 
                self.disable()
1512
 
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
 
                if (getattr(self, "disable_initiator_tag", None)
1517
 
                    is None):
1518
 
                    return
1519
 
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
1523
 
    
1524
 
    # ExtendedTimeout - property
1525
 
    @dbus_service_property(_interface, signature="t",
1526
 
                           access="readwrite")
1527
 
    def ExtendedTimeout_dbus_property(self, value=None):
1528
 
        if value is None:       # get
1529
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1530
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
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))
1531
1083
    
1532
1084
    # Interval - property
1533
1085
    @dbus_service_property(_interface, signature="t",
1536
1088
        if value is None:       # get
1537
1089
            return dbus.UInt64(self.interval_milliseconds())
1538
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))
1539
1094
        if getattr(self, "checker_initiator_tag", None) is None:
1540
1095
            return
1541
 
        if self.enabled:
1542
 
            # Reschedule checker run
1543
 
            gobject.source_remove(self.checker_initiator_tag)
1544
 
            self.checker_initiator_tag = (gobject.timeout_add
1545
 
                                          (value, self.start_checker))
1546
 
            self.start_checker()    # Start one now, too
1547
 
    
 
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
 
1548
1102
    # Checker - property
1549
1103
    @dbus_service_property(_interface, signature="s",
1550
1104
                           access="readwrite")
1551
1105
    def Checker_dbus_property(self, value=None):
1552
1106
        if value is None:       # get
1553
1107
            return dbus.String(self.checker_command)
1554
 
        self.checker_command = unicode(value)
 
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))
1555
1113
    
1556
1114
    # CheckerRunning - property
1557
1115
    @dbus_service_property(_interface, signature="b",
1584
1142
        self._pipe.send(('init', fpr, address))
1585
1143
        if not self._pipe.recv():
1586
1144
            raise KeyError()
1587
 
    
 
1145
 
1588
1146
    def __getattribute__(self, name):
1589
 
        if name == '_pipe':
 
1147
        if(name == '_pipe'):
1590
1148
            return super(ProxyClient, self).__getattribute__(name)
1591
1149
        self._pipe.send(('getattr', name))
1592
1150
        data = self._pipe.recv()
1597
1155
                self._pipe.send(('funcall', name, args, kwargs))
1598
1156
                return self._pipe.recv()[1]
1599
1157
            return func
1600
 
    
 
1158
 
1601
1159
    def __setattr__(self, name, value):
1602
 
        if name == '_pipe':
 
1160
        if(name == '_pipe'):
1603
1161
            return super(ProxyClient, self).__setattr__(name, value)
1604
1162
        self._pipe.send(('setattr', name, value))
1605
1163
 
1606
1164
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1166
    """A class to handle client connections.
1613
1167
    
1620
1174
                        unicode(self.client_address))
1621
1175
            logger.debug("Pipe FD: %d",
1622
1176
                         self.server.child_pipe.fileno())
1623
 
            
 
1177
 
1624
1178
            session = (gnutls.connection
1625
1179
                       .ClientSession(self.request,
1626
1180
                                      gnutls.connection
1627
1181
                                      .X509Credentials()))
1628
 
            
 
1182
 
1629
1183
            # Note: gnutls.connection.X509Credentials is really a
1630
1184
            # generic GnuTLS certificate credentials object so long as
1631
1185
            # no X.509 keys are added to it.  Therefore, we can use it
1632
1186
            # here despite using OpenPGP certificates.
1633
 
            
 
1187
 
1634
1188
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
1189
            #                      "+AES-256-CBC", "+SHA1",
1636
1190
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1642
1196
            (gnutls.library.functions
1643
1197
             .gnutls_priority_set_direct(session._c_object,
1644
1198
                                         priority, None))
1645
 
            
 
1199
 
1646
1200
            # Start communication using the Mandos protocol
1647
1201
            # Get protocol number
1648
1202
            line = self.request.makefile().readline()
1650
1204
            try:
1651
1205
                if int(line.strip().split()[0]) > 1:
1652
1206
                    raise RuntimeError
1653
 
            except (ValueError, IndexError, RuntimeError) as error:
 
1207
            except (ValueError, IndexError, RuntimeError), error:
1654
1208
                logger.error("Unknown protocol version: %s", error)
1655
1209
                return
1656
 
            
 
1210
 
1657
1211
            # Start GnuTLS connection
1658
1212
            try:
1659
1213
                session.handshake()
1660
 
            except gnutls.errors.GNUTLSError as error:
 
1214
            except gnutls.errors.GNUTLSError, error:
1661
1215
                logger.warning("Handshake failed: %s", error)
1662
1216
                # Do not run session.bye() here: the session is not
1663
1217
                # established.  Just abandon the request.
1664
1218
                return
1665
1219
            logger.debug("Handshake succeeded")
1666
 
            
 
1220
 
1667
1221
            approval_required = False
1668
1222
            try:
1669
1223
                try:
1670
1224
                    fpr = self.fingerprint(self.peer_certificate
1671
1225
                                           (session))
1672
 
                except (TypeError,
1673
 
                        gnutls.errors.GNUTLSError) as error:
 
1226
                except (TypeError, gnutls.errors.GNUTLSError), error:
1674
1227
                    logger.warning("Bad certificate: %s", error)
1675
1228
                    return
1676
1229
                logger.debug("Fingerprint: %s", fpr)
1677
 
                
 
1230
 
1678
1231
                try:
1679
1232
                    client = ProxyClient(child_pipe, fpr,
1680
1233
                                         self.client_address)
1688
1241
                
1689
1242
                while True:
1690
1243
                    if not client.enabled:
1691
 
                        logger.info("Client %s is disabled",
 
1244
                        logger.warning("Client %s is disabled",
1692
1245
                                       client.name)
1693
1246
                        if self.server.use_dbus:
1694
1247
                            # Emit D-Bus signal
1695
 
                            client.Rejected("Disabled")
 
1248
                            client.Rejected("Disabled")                    
1696
1249
                        return
1697
1250
                    
1698
 
                    if client.approved or not client.approval_delay:
 
1251
                    if client._approved or not client.approval_delay:
1699
1252
                        #We are approved or approval is disabled
1700
1253
                        break
1701
 
                    elif client.approved is None:
 
1254
                    elif client._approved is None:
1702
1255
                        logger.info("Client %s needs approval",
1703
1256
                                    client.name)
1704
1257
                        if self.server.use_dbus:
1715
1268
                        return
1716
1269
                    
1717
1270
                    #wait until timeout or approved
 
1271
                    #x = float(client._timedelta_to_milliseconds(delay))
1718
1272
                    time = datetime.datetime.now()
1719
1273
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1274
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1723
1275
                    client.changedstate.release()
1724
1276
                    time2 = datetime.datetime.now()
1725
1277
                    if (time2 - time) >= delay:
1740
1292
                while sent_size < len(client.secret):
1741
1293
                    try:
1742
1294
                        sent = session.send(client.secret[sent_size:])
1743
 
                    except gnutls.errors.GNUTLSError as error:
 
1295
                    except (gnutls.errors.GNUTLSError), error:
1744
1296
                        logger.warning("gnutls send failed")
1745
1297
                        return
1746
1298
                    logger.debug("Sent: %d, remaining: %d",
1747
1299
                                 sent, len(client.secret)
1748
1300
                                 - (sent_size + sent))
1749
1301
                    sent_size += sent
1750
 
                
 
1302
 
1751
1303
                logger.info("Sending secret to %s", client.name)
1752
 
                # bump the timeout using extended_timeout
1753
 
                client.bump_timeout(client.extended_timeout)
 
1304
                # bump the timeout as if seen
 
1305
                client.checked_ok()
1754
1306
                if self.server.use_dbus:
1755
1307
                    # Emit D-Bus signal
1756
1308
                    client.GotSecret()
1760
1312
                    client.approvals_pending -= 1
1761
1313
                try:
1762
1314
                    session.bye()
1763
 
                except gnutls.errors.GNUTLSError as error:
 
1315
                except (gnutls.errors.GNUTLSError), error:
1764
1316
                    logger.warning("GnuTLS bye failed")
1765
1317
    
1766
1318
    @staticmethod
1823
1375
        # Convert the buffer to a Python bytestring
1824
1376
        fpr = ctypes.string_at(buf, buf_len.value)
1825
1377
        # Convert the bytestring to hexadecimal notation
1826
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1378
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1827
1379
        return hex_fpr
1828
1380
 
1829
1381
 
1832
1384
    def sub_process_main(self, request, address):
1833
1385
        try:
1834
1386
            self.finish_request(request, address)
1835
 
        except Exception:
 
1387
        except:
1836
1388
            self.handle_error(request, address)
1837
1389
        self.close_request(request)
1838
 
    
 
1390
            
1839
1391
    def process_request(self, request, address):
1840
1392
        """Start a new process to process the request."""
1841
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1842
 
                                       args = (request,
1843
 
                                               address))
1844
 
        proc.start()
1845
 
        return proc
1846
 
 
 
1393
        multiprocessing.Process(target = self.sub_process_main,
 
1394
                                args = (request, address)).start()
1847
1395
 
1848
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1849
1397
    """ adds a pipe to the MixIn """
1853
1401
        This function creates a new pipe in self.pipe
1854
1402
        """
1855
1403
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1856
 
        
1857
 
        proc = MultiprocessingMixIn.process_request(self, request,
1858
 
                                                    client_address)
 
1404
 
 
1405
        super(MultiprocessingMixInWithPipe,
 
1406
              self).process_request(request, client_address)
1859
1407
        self.child_pipe.close()
1860
 
        self.add_pipe(parent_pipe, proc)
1861
 
    
1862
 
    def add_pipe(self, parent_pipe, proc):
 
1408
        self.add_pipe(parent_pipe)
 
1409
 
 
1410
    def add_pipe(self, parent_pipe):
1863
1411
        """Dummy function; override as necessary"""
1864
1412
        raise NotImplementedError
1865
1413
 
1866
 
 
1867
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
1415
                     socketserver.TCPServer, object):
1869
1416
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1895
1442
                                           SO_BINDTODEVICE,
1896
1443
                                           str(self.interface
1897
1444
                                               + '\0'))
1898
 
                except socket.error as error:
 
1445
                except socket.error, error:
1899
1446
                    if error[0] == errno.EPERM:
1900
1447
                        logger.error("No permission to"
1901
1448
                                     " bind to interface %s",
1943
1490
        self.enabled = False
1944
1491
        self.clients = clients
1945
1492
        if self.clients is None:
1946
 
            self.clients = {}
 
1493
            self.clients = set()
1947
1494
        self.use_dbus = use_dbus
1948
1495
        self.gnutls_priority = gnutls_priority
1949
1496
        IPv6_TCPServer.__init__(self, server_address,
1953
1500
    def server_activate(self):
1954
1501
        if self.enabled:
1955
1502
            return socketserver.TCPServer.server_activate(self)
1956
 
    
1957
1503
    def enable(self):
1958
1504
        self.enabled = True
1959
 
    
1960
 
    def add_pipe(self, parent_pipe, proc):
 
1505
    def add_pipe(self, parent_pipe):
1961
1506
        # Call "handle_ipc" for both data and EOF events
1962
1507
        gobject.io_add_watch(parent_pipe.fileno(),
1963
1508
                             gobject.IO_IN | gobject.IO_HUP,
1964
1509
                             functools.partial(self.handle_ipc,
1965
 
                                               parent_pipe =
1966
 
                                               parent_pipe,
1967
 
                                               proc = proc))
1968
 
    
 
1510
                                               parent_pipe = parent_pipe))
 
1511
        
1969
1512
    def handle_ipc(self, source, condition, parent_pipe=None,
1970
 
                   proc = None, client_object=None):
 
1513
                   client_object=None):
1971
1514
        condition_names = {
1972
1515
            gobject.IO_IN: "IN",   # There is data to read.
1973
1516
            gobject.IO_OUT: "OUT", # Data can be written (without
1982
1525
                                       for cond, name in
1983
1526
                                       condition_names.iteritems()
1984
1527
                                       if cond & condition)
1985
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1528
        # error or the other end of multiprocessing.Pipe has closed
1986
1529
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1987
 
            # Wait for other process to exit
1988
 
            proc.join()
1989
1530
            return False
1990
1531
        
1991
1532
        # Read a request from the child
1996
1537
            fpr = request[1]
1997
1538
            address = request[2]
1998
1539
            
1999
 
            for c in self.clients.itervalues():
 
1540
            for c in self.clients:
2000
1541
                if c.fingerprint == fpr:
2001
1542
                    client = c
2002
1543
                    break
2003
1544
            else:
2004
 
                logger.info("Client not found for fingerprint: %s, ad"
2005
 
                            "dress: %s", fpr, address)
 
1545
                logger.warning("Client not found for fingerprint: %s, ad"
 
1546
                               "dress: %s", fpr, address)
2006
1547
                if self.use_dbus:
2007
1548
                    # Emit D-Bus signal
2008
 
                    mandos_dbus_service.ClientNotFound(fpr,
2009
 
                                                       address[0])
 
1549
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2010
1550
                parent_pipe.send(False)
2011
1551
                return False
2012
1552
            
2013
1553
            gobject.io_add_watch(parent_pipe.fileno(),
2014
1554
                                 gobject.IO_IN | gobject.IO_HUP,
2015
1555
                                 functools.partial(self.handle_ipc,
2016
 
                                                   parent_pipe =
2017
 
                                                   parent_pipe,
2018
 
                                                   proc = proc,
2019
 
                                                   client_object =
2020
 
                                                   client))
 
1556
                                                   parent_pipe = parent_pipe,
 
1557
                                                   client_object = client))
2021
1558
            parent_pipe.send(True)
2022
 
            # remove the old hook in favor of the new above hook on
2023
 
            # same fileno
 
1559
            # remove the old hook in favor of the new above hook on same fileno
2024
1560
            return False
2025
1561
        if command == 'funcall':
2026
1562
            funcname = request[1]
2027
1563
            args = request[2]
2028
1564
            kwargs = request[3]
2029
1565
            
2030
 
            parent_pipe.send(('data', getattr(client_object,
2031
 
                                              funcname)(*args,
2032
 
                                                         **kwargs)))
2033
 
        
 
1566
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1567
 
2034
1568
        if command == 'getattr':
2035
1569
            attrname = request[1]
2036
1570
            if callable(client_object.__getattribute__(attrname)):
2037
1571
                parent_pipe.send(('function',))
2038
1572
            else:
2039
 
                parent_pipe.send(('data', client_object
2040
 
                                  .__getattribute__(attrname)))
 
1573
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2041
1574
        
2042
1575
        if command == 'setattr':
2043
1576
            attrname = request[1]
2044
1577
            value = request[2]
2045
1578
            setattr(client_object, attrname, value)
2046
 
        
 
1579
 
2047
1580
        return True
2048
1581
 
2049
1582
 
2080
1613
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
1614
            else:
2082
1615
                raise ValueError("Unknown suffix %r" % suffix)
2083
 
        except (ValueError, IndexError) as e:
 
1616
        except (ValueError, IndexError), e:
2084
1617
            raise ValueError(*(e.args))
2085
1618
        timevalue += delta
2086
1619
    return timevalue
2087
1620
 
2088
1621
 
 
1622
def if_nametoindex(interface):
 
1623
    """Call the C function if_nametoindex(), or equivalent
 
1624
    
 
1625
    Note: This function cannot accept a unicode string."""
 
1626
    global if_nametoindex
 
1627
    try:
 
1628
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1629
                          (ctypes.util.find_library("c"))
 
1630
                          .if_nametoindex)
 
1631
    except (OSError, AttributeError):
 
1632
        logger.warning("Doing if_nametoindex the hard way")
 
1633
        def if_nametoindex(interface):
 
1634
            "Get an interface index the hard way, i.e. using fcntl()"
 
1635
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1636
            with contextlib.closing(socket.socket()) as s:
 
1637
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1638
                                    struct.pack(str("16s16x"),
 
1639
                                                interface))
 
1640
            interface_index = struct.unpack(str("I"),
 
1641
                                            ifreq[16:20])[0]
 
1642
            return interface_index
 
1643
    return if_nametoindex(interface)
 
1644
 
 
1645
 
2089
1646
def daemon(nochdir = False, noclose = False):
2090
1647
    """See daemon(3).  Standard BSD Unix function.
2091
1648
    
2099
1656
        sys.exit()
2100
1657
    if not noclose:
2101
1658
        # Close all standard open file descriptors
2102
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1659
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2103
1660
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2104
1661
            raise OSError(errno.ENODEV,
2105
1662
                          "%s not a character device"
2106
 
                          % os.devnull)
 
1663
                          % os.path.devnull)
2107
1664
        os.dup2(null, sys.stdin.fileno())
2108
1665
        os.dup2(null, sys.stdout.fileno())
2109
1666
        os.dup2(null, sys.stderr.fileno())
2146
1703
                        " system bus interface")
2147
1704
    parser.add_argument("--no-ipv6", action="store_false",
2148
1705
                        dest="use_ipv6", help="Do not use IPv6")
2149
 
    parser.add_argument("--no-restore", action="store_false",
2150
 
                        dest="restore", help="Do not restore stored"
2151
 
                        " state")
2152
 
    parser.add_argument("--statedir", metavar="DIR",
2153
 
                        help="Directory to save/restore state in")
2154
 
    
2155
1706
    options = parser.parse_args()
2156
1707
    
2157
1708
    if options.check:
2170
1721
                        "use_dbus": "True",
2171
1722
                        "use_ipv6": "True",
2172
1723
                        "debuglevel": "",
2173
 
                        "restore": "True",
2174
 
                        "statedir": "/var/lib/mandos"
2175
1724
                        }
2176
1725
    
2177
1726
    # Parse config file for server-global settings
2194
1743
    # options, if set.
2195
1744
    for option in ("interface", "address", "port", "debug",
2196
1745
                   "priority", "servicename", "configdir",
2197
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2198
 
                   "statedir"):
 
1746
                   "use_dbus", "use_ipv6", "debuglevel"):
2199
1747
        value = getattr(options, option)
2200
1748
        if value is not None:
2201
1749
            server_settings[option] = value
2213
1761
    debuglevel = server_settings["debuglevel"]
2214
1762
    use_dbus = server_settings["use_dbus"]
2215
1763
    use_ipv6 = server_settings["use_ipv6"]
2216
 
    stored_state_path = os.path.join(server_settings["statedir"],
2217
 
                                     stored_state_file)
2218
 
    
2219
 
    if debug:
2220
 
        initlogger(debug, logging.DEBUG)
2221
 
    else:
2222
 
        if not debuglevel:
2223
 
            initlogger(debug)
2224
 
        else:
2225
 
            level = getattr(logging, debuglevel.upper())
2226
 
            initlogger(debug, level)
2227
 
    
 
1764
 
2228
1765
    if server_settings["servicename"] != "Mandos":
2229
1766
        syslogger.setFormatter(logging.Formatter
2230
1767
                               ('Mandos (%s) [%%(process)d]:'
2232
1769
                                % server_settings["servicename"]))
2233
1770
    
2234
1771
    # Parse config file with clients
2235
 
    client_config = configparser.SafeConfigParser(Client
2236
 
                                                  .client_defaults)
 
1772
    client_defaults = { "timeout": "1h",
 
1773
                        "interval": "5m",
 
1774
                        "checker": "fping -q -- %%(host)s",
 
1775
                        "host": "",
 
1776
                        "approval_delay": "0s",
 
1777
                        "approval_duration": "1s",
 
1778
                        }
 
1779
    client_config = configparser.SafeConfigParser(client_defaults)
2237
1780
    client_config.read(os.path.join(server_settings["configdir"],
2238
1781
                                    "clients.conf"))
2239
1782
    
2273
1816
    try:
2274
1817
        os.setgid(gid)
2275
1818
        os.setuid(uid)
2276
 
    except OSError as error:
 
1819
    except OSError, error:
2277
1820
        if error[0] != errno.EPERM:
2278
1821
            raise error
2279
1822
    
 
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
 
2280
1831
    if debug:
2281
1832
        # Enable all possible GnuTLS debugging
2282
1833
        
2292
1843
         .gnutls_global_set_log_function(debug_gnutls))
2293
1844
        
2294
1845
        # Redirect stdin so all checkers get /dev/null
2295
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1846
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2296
1847
        os.dup2(null, sys.stdin.fileno())
2297
1848
        if null > 2:
2298
1849
            os.close(null)
 
1850
    else:
 
1851
        # No console logging
 
1852
        logger.removeHandler(console)
2299
1853
    
2300
1854
    # Need to fork before connecting to D-Bus
2301
1855
    if not debug:
2302
1856
        # Close all input and output, do double fork, etc.
2303
1857
        daemon()
2304
1858
    
2305
 
    gobject.threads_init()
2306
 
    
2307
1859
    global main_loop
2308
1860
    # From the Avahi example code
2309
 
    DBusGMainLoop(set_as_default=True)
 
1861
    DBusGMainLoop(set_as_default=True )
2310
1862
    main_loop = gobject.MainLoop()
2311
1863
    bus = dbus.SystemBus()
2312
1864
    # End of Avahi example code
2313
1865
    if use_dbus:
2314
1866
        try:
2315
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1867
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2316
1868
                                            bus, do_not_queue=True)
2317
 
            old_bus_name = (dbus.service.BusName
2318
 
                            ("se.bsnet.fukt.Mandos", bus,
2319
 
                             do_not_queue=True))
2320
 
        except dbus.exceptions.NameExistsException as e:
 
1869
        except dbus.exceptions.NameExistsException, e:
2321
1870
            logger.error(unicode(e) + ", disabling D-Bus")
2322
1871
            use_dbus = False
2323
1872
            server_settings["use_dbus"] = False
2324
1873
            tcp_server.use_dbus = False
2325
1874
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2326
 
    service = AvahiServiceToSyslog(name =
2327
 
                                   server_settings["servicename"],
2328
 
                                   servicetype = "_mandos._tcp",
2329
 
                                   protocol = protocol, bus = bus)
 
1875
    service = AvahiService(name = server_settings["servicename"],
 
1876
                           servicetype = "_mandos._tcp",
 
1877
                           protocol = protocol, bus = bus)
2330
1878
    if server_settings["interface"]:
2331
1879
        service.interface = (if_nametoindex
2332
1880
                             (str(server_settings["interface"])))
2336
1884
    
2337
1885
    client_class = Client
2338
1886
    if use_dbus:
2339
 
        client_class = functools.partial(ClientDBusTransitional,
2340
 
                                         bus = bus)
2341
 
    
2342
 
    client_settings = Client.config_parser(client_config)
2343
 
    old_client_settings = {}
2344
 
    clients_data = {}
2345
 
    
2346
 
    # Get client data and settings from last running state.
2347
 
    if server_settings["restore"]:
2348
 
        try:
2349
 
            with open(stored_state_path, "rb") as stored_state:
2350
 
                clients_data, old_client_settings = (pickle.load
2351
 
                                                     (stored_state))
2352
 
            os.remove(stored_state_path)
2353
 
        except IOError as e:
2354
 
            logger.warning("Could not load persistent state: {0}"
2355
 
                           .format(e))
2356
 
            if e.errno != errno.ENOENT:
2357
 
                raise
2358
 
        except EOFError as e:
2359
 
            logger.warning("Could not load persistent state: "
2360
 
                           "EOFError: {0}".format(e))
2361
 
    
2362
 
    with PGPEngine() as pgp:
2363
 
        for client_name, client in clients_data.iteritems():
2364
 
            # Decide which value to use after restoring saved state.
2365
 
            # We have three different values: Old config file,
2366
 
            # new config file, and saved state.
2367
 
            # New config value takes precedence if it differs from old
2368
 
            # config value, otherwise use saved state.
2369
 
            for name, value in client_settings[client_name].items():
2370
 
                try:
2371
 
                    # For each value in new config, check if it
2372
 
                    # differs from the old config value (Except for
2373
 
                    # the "secret" attribute)
2374
 
                    if (name != "secret" and
2375
 
                        value != old_client_settings[client_name]
2376
 
                        [name]):
2377
 
                        client[name] = value
2378
 
                except KeyError:
2379
 
                    pass
2380
 
            
2381
 
            # Clients who has passed its expire date can still be
2382
 
            # enabled if its last checker was successful.  Clients
2383
 
            # whose checker succeeded before we stored its state is
2384
 
            # assumed to have successfully run all checkers during
2385
 
            # downtime.
2386
 
            if client["enabled"]:
2387
 
                if datetime.datetime.utcnow() >= client["expires"]:
2388
 
                    if not client["last_checked_ok"]:
2389
 
                        logger.warning(
2390
 
                            "disabling client {0} - Client never "
2391
 
                            "performed a successful checker"
2392
 
                            .format(client_name))
2393
 
                        client["enabled"] = False
2394
 
                    elif client["last_checker_status"] != 0:
2395
 
                        logger.warning(
2396
 
                            "disabling client {0} - Client "
2397
 
                            "last checker failed with error code {1}"
2398
 
                            .format(client_name,
2399
 
                                    client["last_checker_status"]))
2400
 
                        client["enabled"] = False
2401
 
                    else:
2402
 
                        client["expires"] = (datetime.datetime
2403
 
                                             .utcnow()
2404
 
                                             + client["timeout"])
2405
 
                        logger.debug("Last checker succeeded,"
2406
 
                                     " keeping {0} enabled"
2407
 
                                     .format(client_name))
 
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):
2408
1895
            try:
2409
 
                client["secret"] = (
2410
 
                    pgp.decrypt(client["encrypted_secret"],
2411
 
                                client_settings[client_name]
2412
 
                                ["secret"]))
2413
 
            except PGPError:
2414
 
                # If decryption fails, we use secret from new settings
2415
 
                logger.debug("Failed to decrypt {0} old secret"
2416
 
                             .format(client_name))
2417
 
                client["secret"] = (
2418
 
                    client_settings[client_name]["secret"])
2419
 
 
2420
 
    
2421
 
    # Add/remove clients based on new changes made to config
2422
 
    for client_name in (set(old_client_settings)
2423
 
                        - set(client_settings)):
2424
 
        del clients_data[client_name]
2425
 
    for client_name in (set(client_settings)
2426
 
                        - set(old_client_settings)):
2427
 
        clients_data[client_name] = client_settings[client_name]
2428
 
 
2429
 
    # Create all client objects
2430
 
    for client_name, client in clients_data.iteritems():
2431
 
        tcp_server.clients[client_name] = client_class(
2432
 
            name = client_name, settings = client)
2433
 
    
 
1896
                yield (name, special_settings[name]())
 
1897
            except KeyError:
 
1898
                yield (name, value)
 
1899
    
 
1900
    tcp_server.clients.update(set(
 
1901
            client_class(name = section,
 
1902
                         config= dict(client_config_items(
 
1903
                        client_config, section)))
 
1904
            for section in client_config.sections()))
2434
1905
    if not tcp_server.clients:
2435
1906
        logger.warning("No clients defined")
2436
1907
        
2447
1918
            # "pidfile" was never created
2448
1919
            pass
2449
1920
        del pidfilename
 
1921
        
2450
1922
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2451
 
    
 
1923
 
2452
1924
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2453
1925
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2454
1926
    
2455
1927
    if use_dbus:
2456
 
        class MandosDBusService(DBusObjectWithProperties):
 
1928
        class MandosDBusService(dbus.service.Object):
2457
1929
            """A D-Bus proxy object"""
2458
1930
            def __init__(self):
2459
1931
                dbus.service.Object.__init__(self, bus, "/")
2460
 
            _interface = "se.recompile.Mandos"
2461
 
            
2462
 
            @dbus_interface_annotations(_interface)
2463
 
            def _foo(self):
2464
 
                return { "org.freedesktop.DBus.Property"
2465
 
                         ".EmitsChangedSignal":
2466
 
                             "false"}
 
1932
            _interface = "se.bsnet.fukt.Mandos"
2467
1933
            
2468
1934
            @dbus.service.signal(_interface, signature="o")
2469
1935
            def ClientAdded(self, objpath):
2484
1950
            def GetAllClients(self):
2485
1951
                "D-Bus method"
2486
1952
                return dbus.Array(c.dbus_object_path
2487
 
                                  for c in
2488
 
                                  tcp_server.clients.itervalues())
 
1953
                                  for c in tcp_server.clients)
2489
1954
            
2490
1955
            @dbus.service.method(_interface,
2491
1956
                                 out_signature="a{oa{sv}}")
2493
1958
                "D-Bus method"
2494
1959
                return dbus.Dictionary(
2495
1960
                    ((c.dbus_object_path, c.GetAll(""))
2496
 
                     for c in tcp_server.clients.itervalues()),
 
1961
                     for c in tcp_server.clients),
2497
1962
                    signature="oa{sv}")
2498
1963
            
2499
1964
            @dbus.service.method(_interface, in_signature="o")
2500
1965
            def RemoveClient(self, object_path):
2501
1966
                "D-Bus method"
2502
 
                for c in tcp_server.clients.itervalues():
 
1967
                for c in tcp_server.clients:
2503
1968
                    if c.dbus_object_path == object_path:
2504
 
                        del tcp_server.clients[c.name]
 
1969
                        tcp_server.clients.remove(c)
2505
1970
                        c.remove_from_connection()
2506
1971
                        # Don't signal anything except ClientRemoved
2507
1972
                        c.disable(quiet=True)
2512
1977
            
2513
1978
            del _interface
2514
1979
        
2515
 
        class MandosDBusServiceTransitional(MandosDBusService):
2516
 
            __metaclass__ = AlternateDBusNamesMetaclass
2517
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1980
        mandos_dbus_service = MandosDBusService()
2518
1981
    
2519
1982
    def cleanup():
2520
1983
        "Cleanup function; run on exit"
2521
1984
        service.cleanup()
2522
1985
        
2523
 
        multiprocessing.active_children()
2524
 
        if not (tcp_server.clients or client_settings):
2525
 
            return
2526
 
        
2527
 
        # Store client before exiting. Secrets are encrypted with key
2528
 
        # based on what config file has. If config file is
2529
 
        # removed/edited, old secret will thus be unrecovable.
2530
 
        clients = {}
2531
 
        with PGPEngine() as pgp:
2532
 
            for client in tcp_server.clients.itervalues():
2533
 
                key = client_settings[client.name]["secret"]
2534
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2535
 
                                                      key)
2536
 
                client_dict = {}
2537
 
                
2538
 
                # A list of attributes that can not be pickled
2539
 
                # + secret.
2540
 
                exclude = set(("bus", "changedstate", "secret",
2541
 
                               "checker"))
2542
 
                for name, typ in (inspect.getmembers
2543
 
                                  (dbus.service.Object)):
2544
 
                    exclude.add(name)
2545
 
                
2546
 
                client_dict["encrypted_secret"] = (client
2547
 
                                                   .encrypted_secret)
2548
 
                for attr in client.client_structure:
2549
 
                    if attr not in exclude:
2550
 
                        client_dict[attr] = getattr(client, attr)
2551
 
                
2552
 
                clients[client.name] = client_dict
2553
 
                del client_settings[client.name]["secret"]
2554
 
        
2555
 
        try:
2556
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2557
 
                                                prefix="clients-",
2558
 
                                                dir=os.path.dirname
2559
 
                                                (stored_state_path))
2560
 
            with os.fdopen(tempfd, "wb") as stored_state:
2561
 
                pickle.dump((clients, client_settings), stored_state)
2562
 
            os.rename(tempname, stored_state_path)
2563
 
        except (IOError, OSError) as e:
2564
 
            logger.warning("Could not save persistent state: {0}"
2565
 
                           .format(e))
2566
 
            if not debug:
2567
 
                try:
2568
 
                    os.remove(tempname)
2569
 
                except NameError:
2570
 
                    pass
2571
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2572
 
                                   errno.EEXIST)):
2573
 
                raise e
2574
 
        
2575
 
        # Delete all clients, and settings from config
2576
1986
        while tcp_server.clients:
2577
 
            name, client = tcp_server.clients.popitem()
 
1987
            client = tcp_server.clients.pop()
2578
1988
            if use_dbus:
2579
1989
                client.remove_from_connection()
 
1990
            client.disable_hook = None
2580
1991
            # Don't signal anything except ClientRemoved
2581
1992
            client.disable(quiet=True)
2582
1993
            if use_dbus:
2583
1994
                # Emit D-Bus signal
2584
 
                mandos_dbus_service.ClientRemoved(client
2585
 
                                                  .dbus_object_path,
 
1995
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2586
1996
                                                  client.name)
2587
 
        client_settings.clear()
2588
1997
    
2589
1998
    atexit.register(cleanup)
2590
1999
    
2591
 
    for client in tcp_server.clients.itervalues():
 
2000
    for client in tcp_server.clients:
2592
2001
        if use_dbus:
2593
2002
            # Emit D-Bus signal
2594
2003
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2595
 
        # Need to initiate checking of clients
2596
 
        if client.enabled:
2597
 
            client.init_checker()
 
2004
        client.enable()
2598
2005
    
2599
2006
    tcp_server.enable()
2600
2007
    tcp_server.server_activate()
2615
2022
        # From the Avahi example code
2616
2023
        try:
2617
2024
            service.activate()
2618
 
        except dbus.exceptions.DBusException as error:
2619
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2025
        except dbus.exceptions.DBusException, error:
 
2026
            logger.critical("DBusException: %s", error)
2620
2027
            cleanup()
2621
2028
            sys.exit(1)
2622
2029
        # End of Avahi example code
2628
2035
        
2629
2036
        logger.debug("Starting main loop")
2630
2037
        main_loop.run()
2631
 
    except AvahiError as error:
2632
 
        logger.critical("Avahi Error", exc_info=error)
 
2038
    except AvahiError, error:
 
2039
        logger.critical("AvahiError: %s", error)
2633
2040
        cleanup()
2634
2041
        sys.exit(1)
2635
2042
    except KeyboardInterrupt: