/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
 
68
import binascii
 
69
import tempfile
 
70
import itertools
66
71
 
67
72
import dbus
68
73
import dbus.service
73
78
import ctypes.util
74
79
import xml.dom.minidom
75
80
import inspect
 
81
import GnuPGInterface
76
82
 
77
83
try:
78
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
88
    except ImportError:
83
89
        SO_BINDTODEVICE = None
84
90
 
85
 
 
86
 
version = "1.4.1"
 
91
version = "1.5.3"
 
92
stored_state_file = "clients.pickle"
87
93
 
88
94
logger = logging.getLogger()
89
95
syslogger = (logging.handlers.SysLogHandler
90
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
97
              address = str("/dev/log")))
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('%(asctime)s %(name)s'
99
 
                                       ' [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
102
 
logger.addHandler(console)
 
98
 
 
99
try:
 
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
                      (ctypes.util.find_library("c"))
 
102
                      .if_nametoindex)
 
103
except (OSError, AttributeError):
 
104
    def if_nametoindex(interface):
 
105
        "Get an interface index the hard way, i.e. using fcntl()"
 
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
107
        with contextlib.closing(socket.socket()) as s:
 
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
 
113
        return interface_index
 
114
 
 
115
 
 
116
def initlogger(debug, level=logging.WARNING):
 
117
    """init logger and add loglevel"""
 
118
    
 
119
    syslogger.setFormatter(logging.Formatter
 
120
                           ('Mandos [%(process)d]: %(levelname)s:'
 
121
                            ' %(message)s'))
 
122
    logger.addHandler(syslogger)
 
123
    
 
124
    if debug:
 
125
        console = logging.StreamHandler()
 
126
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
127
                                               ' [%(process)d]:'
 
128
                                               ' %(levelname)s:'
 
129
                                               ' %(message)s'))
 
130
        logger.addHandler(console)
 
131
    logger.setLevel(level)
 
132
 
 
133
 
 
134
class PGPError(Exception):
 
135
    """Exception if encryption/decryption fails"""
 
136
    pass
 
137
 
 
138
 
 
139
class PGPEngine(object):
 
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
 
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
144
        self.gnupg = GnuPGInterface.GnuPG()
 
145
        self.gnupg.options.meta_interactive = False
 
146
        self.gnupg.options.homedir = self.tempdir
 
147
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
148
                                              '--quiet',
 
149
                                              '--no-use-agent'])
 
150
    
 
151
    def __enter__(self):
 
152
        return self
 
153
    
 
154
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
        self._cleanup()
 
156
        return False
 
157
    
 
158
    def __del__(self):
 
159
        self._cleanup()
 
160
    
 
161
    def _cleanup(self):
 
162
        if self.tempdir is not None:
 
163
            # Delete contents of tempdir
 
164
            for root, dirs, files in os.walk(self.tempdir,
 
165
                                             topdown = False):
 
166
                for filename in files:
 
167
                    os.remove(os.path.join(root, filename))
 
168
                for dirname in dirs:
 
169
                    os.rmdir(os.path.join(root, dirname))
 
170
            # Remove tempdir
 
171
            os.rmdir(self.tempdir)
 
172
            self.tempdir = None
 
173
    
 
174
    def password_encode(self, password):
 
175
        # Passphrase can not be empty and can not contain newlines or
 
176
        # NUL bytes.  So we prefix it and hex encode it.
 
177
        return b"mandos" + binascii.hexlify(password)
 
178
    
 
179
    def encrypt(self, data, password):
 
180
        self.gnupg.passphrase = self.password_encode(password)
 
181
        with open(os.devnull, "w") as devnull:
 
182
            try:
 
183
                proc = self.gnupg.run(['--symmetric'],
 
184
                                      create_fhs=['stdin', 'stdout'],
 
185
                                      attach_fhs={'stderr': devnull})
 
186
                with contextlib.closing(proc.handles['stdin']) as f:
 
187
                    f.write(data)
 
188
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
                    ciphertext = f.read()
 
190
                proc.wait()
 
191
            except IOError as e:
 
192
                raise PGPError(e)
 
193
        self.gnupg.passphrase = None
 
194
        return ciphertext
 
195
    
 
196
    def decrypt(self, data, password):
 
197
        self.gnupg.passphrase = self.password_encode(password)
 
198
        with open(os.devnull, "w") as devnull:
 
199
            try:
 
200
                proc = self.gnupg.run(['--decrypt'],
 
201
                                      create_fhs=['stdin', 'stdout'],
 
202
                                      attach_fhs={'stderr': devnull})
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
 
204
                    f.write(data)
 
205
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
                    decrypted_plaintext = f.read()
 
207
                proc.wait()
 
208
            except IOError as e:
 
209
                raise PGPError(e)
 
210
        self.gnupg.passphrase = None
 
211
        return decrypted_plaintext
103
212
 
104
213
 
105
214
class AvahiError(Exception):
136
245
    server: D-Bus Server
137
246
    bus: dbus.SystemBus()
138
247
    """
 
248
    
139
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
140
250
                 servicetype = None, port = None, TXT = None,
141
251
                 domain = "", host = "", max_renames = 32768,
154
264
        self.server = None
155
265
        self.bus = bus
156
266
        self.entry_group_state_changed_match = None
 
267
    
157
268
    def rename(self):
158
269
        """Derived from the Avahi example code"""
159
270
        if self.rename_count >= self.max_renames:
169
280
        try:
170
281
            self.add()
171
282
        except dbus.exceptions.DBusException as error:
172
 
            logger.critical("DBusException: %s", error)
 
283
            logger.critical("D-Bus Exception", exc_info=error)
173
284
            self.cleanup()
174
285
            os._exit(1)
175
286
        self.rename_count += 1
 
287
    
176
288
    def remove(self):
177
289
        """Derived from the Avahi example code"""
178
290
        if self.entry_group_state_changed_match is not None:
180
292
            self.entry_group_state_changed_match = None
181
293
        if self.group is not None:
182
294
            self.group.Reset()
 
295
    
183
296
    def add(self):
184
297
        """Derived from the Avahi example code"""
185
298
        self.remove()
202
315
            dbus.UInt16(self.port),
203
316
            avahi.string_array_to_txt_array(self.TXT))
204
317
        self.group.Commit()
 
318
    
205
319
    def entry_group_state_changed(self, state, error):
206
320
        """Derived from the Avahi example code"""
207
321
        logger.debug("Avahi entry group state change: %i", state)
214
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
215
329
            logger.critical("Avahi: Error in group state changed %s",
216
330
                            unicode(error))
217
 
            raise AvahiGroupError("State changed: %s"
218
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
219
334
    def cleanup(self):
220
335
        """Derived from the Avahi example code"""
221
336
        if self.group is not None:
222
337
            try:
223
338
                self.group.Free()
224
339
            except (dbus.exceptions.UnknownMethodException,
225
 
                    dbus.exceptions.DBusException) as e:
 
340
                    dbus.exceptions.DBusException):
226
341
                pass
227
342
            self.group = None
228
343
        self.remove()
 
344
    
229
345
    def server_state_changed(self, state, error=None):
230
346
        """Derived from the Avahi example code"""
231
347
        logger.debug("Avahi server state change: %i", state)
250
366
                logger.debug("Unknown state: %r", state)
251
367
            else:
252
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
253
370
    def activate(self):
254
371
        """Derived from the Avahi example code"""
255
372
        if self.server is None:
267
384
        """Add the new name to the syslog messages"""
268
385
        ret = AvahiService.rename(self)
269
386
        syslogger.setFormatter(logging.Formatter
270
 
                               ('Mandos (%s) [%%(process)d]:'
271
 
                                ' %%(levelname)s: %%(message)s'
272
 
                                % self.name))
 
387
                               ('Mandos ({0}) [%(process)d]:'
 
388
                                ' %(levelname)s: %(message)s'
 
389
                                .format(self.name)))
273
390
        return ret
274
391
 
275
 
def _timedelta_to_milliseconds(td):
 
392
def timedelta_to_milliseconds(td):
276
393
    "Convert a datetime.timedelta() to milliseconds"
277
394
    return ((td.days * 24 * 60 * 60 * 1000)
278
395
            + (td.seconds * 1000)
279
396
            + (td.microseconds // 1000))
280
 
        
 
397
 
281
398
class Client(object):
282
399
    """A representation of a client host served by this server.
283
400
    
284
401
    Attributes:
285
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
402
    approved:   bool(); 'None' if not yet approved/disapproved
286
403
    approval_delay: datetime.timedelta(); Time to wait for approval
287
404
    approval_duration: datetime.timedelta(); Duration of one approval
288
405
    checker:    subprocess.Popen(); a running checker process used
295
412
                     instance %(name)s can be used in the command.
296
413
    checker_initiator_tag: a gobject event source tag, or None
297
414
    created:    datetime.datetime(); (UTC) object creation
 
415
    client_structure: Object describing what attributes a client has
 
416
                      and is used for storing the client at exit
298
417
    current_checker_command: string; current running checker_command
299
 
    disable_hook:  If set, called by disable() as disable_hook(self)
300
418
    disable_initiator_tag: a gobject event source tag, or None
301
419
    enabled:    bool()
302
420
    fingerprint: string (40 or 32 hexadecimal digits); used to
305
423
    interval:   datetime.timedelta(); How often to start a new checker
306
424
    last_approval_request: datetime.datetime(); (UTC) or None
307
425
    last_checked_ok: datetime.datetime(); (UTC) or None
308
 
    last_enabled: datetime.datetime(); (UTC)
 
426
    last_checker_status: integer between 0 and 255 reflecting exit
 
427
                         status of last checker. -1 reflects crashed
 
428
                         checker, -2 means no checker completed yet.
 
429
    last_enabled: datetime.datetime(); (UTC) or None
309
430
    name:       string; from the config file, used in log messages and
310
431
                        D-Bus identifiers
311
432
    secret:     bytestring; sent verbatim (over TLS) to client
312
433
    timeout:    datetime.timedelta(); How long from last_checked_ok
313
434
                                      until this client is disabled
314
 
    extended_timeout:   extra long timeout when password has been sent
 
435
    extended_timeout:   extra long timeout when secret has been sent
315
436
    runtime_expansions: Allowed attributes for runtime expansion.
316
437
    expires:    datetime.datetime(); time (UTC) when a client will be
317
438
                disabled, or None
321
442
                          "created", "enabled", "fingerprint",
322
443
                          "host", "interval", "last_checked_ok",
323
444
                          "last_enabled", "name", "timeout")
 
445
    client_defaults = { "timeout": "5m",
 
446
                        "extended_timeout": "15m",
 
447
                        "interval": "2m",
 
448
                        "checker": "fping -q -- %%(host)s",
 
449
                        "host": "",
 
450
                        "approval_delay": "0s",
 
451
                        "approval_duration": "1s",
 
452
                        "approved_by_default": "True",
 
453
                        "enabled": "True",
 
454
                        }
324
455
    
325
456
    def timeout_milliseconds(self):
326
457
        "Return the 'timeout' attribute in milliseconds"
327
 
        return _timedelta_to_milliseconds(self.timeout)
 
458
        return timedelta_to_milliseconds(self.timeout)
328
459
    
329
460
    def extended_timeout_milliseconds(self):
330
461
        "Return the 'extended_timeout' attribute in milliseconds"
331
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
462
        return timedelta_to_milliseconds(self.extended_timeout)
332
463
    
333
464
    def interval_milliseconds(self):
334
465
        "Return the 'interval' attribute in milliseconds"
335
 
        return _timedelta_to_milliseconds(self.interval)
 
466
        return timedelta_to_milliseconds(self.interval)
336
467
    
337
468
    def approval_delay_milliseconds(self):
338
 
        return _timedelta_to_milliseconds(self.approval_delay)
339
 
    
340
 
    def __init__(self, name = None, disable_hook=None, config=None):
341
 
        """Note: the 'checker' key in 'config' sets the
342
 
        'checker_command' attribute and *not* the 'checker'
343
 
        attribute."""
 
469
        return timedelta_to_milliseconds(self.approval_delay)
 
470
    
 
471
    @staticmethod
 
472
    def config_parser(config):
 
473
        """Construct a new dict of client settings of this form:
 
474
        { client_name: {setting_name: value, ...}, ...}
 
475
        with exceptions for any special settings as defined above.
 
476
        NOTE: Must be a pure function. Must return the same result
 
477
        value given the same arguments.
 
478
        """
 
479
        settings = {}
 
480
        for client_name in config.sections():
 
481
            section = dict(config.items(client_name))
 
482
            client = settings[client_name] = {}
 
483
            
 
484
            client["host"] = section["host"]
 
485
            # Reformat values from string types to Python types
 
486
            client["approved_by_default"] = config.getboolean(
 
487
                client_name, "approved_by_default")
 
488
            client["enabled"] = config.getboolean(client_name,
 
489
                                                  "enabled")
 
490
            
 
491
            client["fingerprint"] = (section["fingerprint"].upper()
 
492
                                     .replace(" ", ""))
 
493
            if "secret" in section:
 
494
                client["secret"] = section["secret"].decode("base64")
 
495
            elif "secfile" in section:
 
496
                with open(os.path.expanduser(os.path.expandvars
 
497
                                             (section["secfile"])),
 
498
                          "rb") as secfile:
 
499
                    client["secret"] = secfile.read()
 
500
            else:
 
501
                raise TypeError("No secret or secfile for section {0}"
 
502
                                .format(section))
 
503
            client["timeout"] = string_to_delta(section["timeout"])
 
504
            client["extended_timeout"] = string_to_delta(
 
505
                section["extended_timeout"])
 
506
            client["interval"] = string_to_delta(section["interval"])
 
507
            client["approval_delay"] = string_to_delta(
 
508
                section["approval_delay"])
 
509
            client["approval_duration"] = string_to_delta(
 
510
                section["approval_duration"])
 
511
            client["checker_command"] = section["checker"]
 
512
            client["last_approval_request"] = None
 
513
            client["last_checked_ok"] = None
 
514
            client["last_checker_status"] = -2
 
515
        
 
516
        return settings
 
517
    
 
518
    def __init__(self, settings, name = None):
344
519
        self.name = name
345
 
        if config is None:
346
 
            config = {}
 
520
        # adding all client settings
 
521
        for setting, value in settings.iteritems():
 
522
            setattr(self, setting, value)
 
523
        
 
524
        if self.enabled:
 
525
            if not hasattr(self, "last_enabled"):
 
526
                self.last_enabled = datetime.datetime.utcnow()
 
527
            if not hasattr(self, "expires"):
 
528
                self.expires = (datetime.datetime.utcnow()
 
529
                                + self.timeout)
 
530
        else:
 
531
            self.last_enabled = None
 
532
            self.expires = None
 
533
        
347
534
        logger.debug("Creating client %r", self.name)
348
535
        # Uppercase and remove spaces from fingerprint for later
349
536
        # comparison purposes with return value from the fingerprint()
350
537
        # function
351
 
        self.fingerprint = (config["fingerprint"].upper()
352
 
                            .replace(" ", ""))
353
538
        logger.debug("  Fingerprint: %s", self.fingerprint)
354
 
        if "secret" in config:
355
 
            self.secret = config["secret"].decode("base64")
356
 
        elif "secfile" in config:
357
 
            with open(os.path.expanduser(os.path.expandvars
358
 
                                         (config["secfile"])),
359
 
                      "rb") as secfile:
360
 
                self.secret = secfile.read()
361
 
        else:
362
 
            raise TypeError("No secret or secfile for client %s"
363
 
                            % self.name)
364
 
        self.host = config.get("host", "")
365
 
        self.created = datetime.datetime.utcnow()
366
 
        self.enabled = False
367
 
        self.last_approval_request = None
368
 
        self.last_enabled = None
369
 
        self.last_checked_ok = None
370
 
        self.timeout = string_to_delta(config["timeout"])
371
 
        self.extended_timeout = string_to_delta(config
372
 
                                                ["extended_timeout"])
373
 
        self.interval = string_to_delta(config["interval"])
374
 
        self.disable_hook = disable_hook
 
539
        self.created = settings.get("created",
 
540
                                    datetime.datetime.utcnow())
 
541
        
 
542
        # attributes specific for this server instance
375
543
        self.checker = None
376
544
        self.checker_initiator_tag = None
377
545
        self.disable_initiator_tag = None
378
 
        self.expires = None
379
546
        self.checker_callback_tag = None
380
 
        self.checker_command = config["checker"]
381
547
        self.current_checker_command = None
382
 
        self.last_connect = None
383
 
        self._approved = None
384
 
        self.approved_by_default = config.get("approved_by_default",
385
 
                                              True)
 
548
        self.approved = None
386
549
        self.approvals_pending = 0
387
 
        self.approval_delay = string_to_delta(
388
 
            config["approval_delay"])
389
 
        self.approval_duration = string_to_delta(
390
 
            config["approval_duration"])
391
550
        self.changedstate = (multiprocessing_manager
392
551
                             .Condition(multiprocessing_manager
393
552
                                        .Lock()))
 
553
        self.client_structure = [attr for attr in
 
554
                                 self.__dict__.iterkeys()
 
555
                                 if not attr.startswith("_")]
 
556
        self.client_structure.append("client_structure")
 
557
        
 
558
        for name, t in inspect.getmembers(type(self),
 
559
                                          lambda obj:
 
560
                                              isinstance(obj,
 
561
                                                         property)):
 
562
            if not name.startswith("_"):
 
563
                self.client_structure.append(name)
394
564
    
 
565
    # Send notice to process children that client state has changed
395
566
    def send_changedstate(self):
396
 
        self.changedstate.acquire()
397
 
        self.changedstate.notify_all()
398
 
        self.changedstate.release()
 
567
        with self.changedstate:
 
568
            self.changedstate.notify_all()
399
569
    
400
570
    def enable(self):
401
571
        """Start this client's checker and timeout hooks"""
403
573
            # Already enabled
404
574
            return
405
575
        self.send_changedstate()
406
 
        # Schedule a new checker to be started an 'interval' from now,
407
 
        # and every interval from then on.
408
 
        self.checker_initiator_tag = (gobject.timeout_add
409
 
                                      (self.interval_milliseconds(),
410
 
                                       self.start_checker))
411
 
        # Schedule a disable() when 'timeout' has passed
412
576
        self.expires = datetime.datetime.utcnow() + self.timeout
413
 
        self.disable_initiator_tag = (gobject.timeout_add
414
 
                                   (self.timeout_milliseconds(),
415
 
                                    self.disable))
416
577
        self.enabled = True
417
578
        self.last_enabled = datetime.datetime.utcnow()
418
 
        # Also start a new checker *right now*.
419
 
        self.start_checker()
 
579
        self.init_checker()
420
580
    
421
581
    def disable(self, quiet=True):
422
582
        """Disable this client."""
434
594
            gobject.source_remove(self.checker_initiator_tag)
435
595
            self.checker_initiator_tag = None
436
596
        self.stop_checker()
437
 
        if self.disable_hook:
438
 
            self.disable_hook(self)
439
597
        self.enabled = False
440
598
        # Do not run this again if called by a gobject.timeout_add
441
599
        return False
442
600
    
443
601
    def __del__(self):
444
 
        self.disable_hook = None
445
602
        self.disable()
446
603
    
 
604
    def init_checker(self):
 
605
        # Schedule a new checker to be started an 'interval' from now,
 
606
        # and every interval from then on.
 
607
        self.checker_initiator_tag = (gobject.timeout_add
 
608
                                      (self.interval_milliseconds(),
 
609
                                       self.start_checker))
 
610
        # Schedule a disable() when 'timeout' has passed
 
611
        self.disable_initiator_tag = (gobject.timeout_add
 
612
                                   (self.timeout_milliseconds(),
 
613
                                    self.disable))
 
614
        # Also start a new checker *right now*.
 
615
        self.start_checker()
 
616
    
447
617
    def checker_callback(self, pid, condition, command):
448
618
        """The checker has completed, so take appropriate actions."""
449
619
        self.checker_callback_tag = None
450
620
        self.checker = None
451
621
        if os.WIFEXITED(condition):
452
 
            exitstatus = os.WEXITSTATUS(condition)
453
 
            if exitstatus == 0:
 
622
            self.last_checker_status = os.WEXITSTATUS(condition)
 
623
            if self.last_checker_status == 0:
454
624
                logger.info("Checker for %(name)s succeeded",
455
625
                            vars(self))
456
626
                self.checked_ok()
458
628
                logger.info("Checker for %(name)s failed",
459
629
                            vars(self))
460
630
        else:
 
631
            self.last_checker_status = -1
461
632
            logger.warning("Checker for %(name)s crashed?",
462
633
                           vars(self))
463
634
    
464
 
    def checked_ok(self, timeout=None):
465
 
        """Bump up the timeout for this client.
466
 
        
467
 
        This should only be called when the client has been seen,
468
 
        alive and well.
469
 
        """
 
635
    def checked_ok(self):
 
636
        """Assert that the client has been seen, alive and well."""
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
 
638
        self.last_checker_status = 0
 
639
        self.bump_timeout()
 
640
    
 
641
    def bump_timeout(self, timeout=None):
 
642
        """Bump up the timeout for this client."""
470
643
        if timeout is None:
471
644
            timeout = self.timeout
472
 
        self.last_checked_ok = datetime.datetime.utcnow()
473
645
        if self.disable_initiator_tag is not None:
474
646
            gobject.source_remove(self.disable_initiator_tag)
475
647
        if getattr(self, "enabled", False):
476
648
            self.disable_initiator_tag = (gobject.timeout_add
477
 
                                          (_timedelta_to_milliseconds
 
649
                                          (timedelta_to_milliseconds
478
650
                                           (timeout), self.disable))
479
651
            self.expires = datetime.datetime.utcnow() + timeout
480
652
    
487
659
        If a checker already exists, leave it running and do
488
660
        nothing."""
489
661
        # The reason for not killing a running checker is that if we
490
 
        # did that, then if a checker (for some reason) started
491
 
        # running slowly and taking more than 'interval' time, the
492
 
        # client would inevitably timeout, since no checker would get
493
 
        # a chance to run to completion.  If we instead leave running
 
662
        # did that, and if a checker (for some reason) started running
 
663
        # slowly and taking more than 'interval' time, then the client
 
664
        # would inevitably timeout, since no checker would get a
 
665
        # chance to run to completion.  If we instead leave running
494
666
        # checkers alone, the checker would have to take more time
495
667
        # than 'timeout' for the client to be disabled, which is as it
496
668
        # should be.
526
698
                try:
527
699
                    command = self.checker_command % escaped_attrs
528
700
                except TypeError as error:
529
 
                    logger.error('Could not format string "%s":'
530
 
                                 ' %s', self.checker_command, error)
 
701
                    logger.error('Could not format string "%s"',
 
702
                                 self.checker_command, exc_info=error)
531
703
                    return True # Try again later
532
704
            self.current_checker_command = command
533
705
            try:
551
723
                    gobject.source_remove(self.checker_callback_tag)
552
724
                    self.checker_callback(pid, status, command)
553
725
            except OSError as error:
554
 
                logger.error("Failed to start subprocess: %s",
555
 
                             error)
 
726
                logger.error("Failed to start subprocess",
 
727
                             exc_info=error)
556
728
        # Re-run this periodically if run by gobject.timeout_add
557
729
        return True
558
730
    
565
737
            return
566
738
        logger.debug("Stopping checker for %(name)s", vars(self))
567
739
        try:
568
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
740
            self.checker.terminate()
569
741
            #time.sleep(0.5)
570
742
            #if self.checker.poll() is None:
571
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
743
            #    self.checker.kill()
572
744
        except OSError as error:
573
745
            if error.errno != errno.ESRCH: # No such process
574
746
                raise
591
763
    # "Set" method, so we fail early here:
592
764
    if byte_arrays and signature != "ay":
593
765
        raise ValueError("Byte arrays not supported for non-'ay'"
594
 
                         " signature %r" % signature)
 
766
                         " signature {0!r}".format(signature))
595
767
    def decorator(func):
596
768
        func._dbus_is_property = True
597
769
        func._dbus_interface = dbus_interface
605
777
    return decorator
606
778
 
607
779
 
 
780
def dbus_interface_annotations(dbus_interface):
 
781
    """Decorator for marking functions returning interface annotations
 
782
    
 
783
    Usage:
 
784
    
 
785
    @dbus_interface_annotations("org.example.Interface")
 
786
    def _foo(self):  # Function name does not matter
 
787
        return {"org.freedesktop.DBus.Deprecated": "true",
 
788
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
789
                    "false"}
 
790
    """
 
791
    def decorator(func):
 
792
        func._dbus_is_interface = True
 
793
        func._dbus_interface = dbus_interface
 
794
        func._dbus_name = dbus_interface
 
795
        return func
 
796
    return decorator
 
797
 
 
798
 
 
799
def dbus_annotations(annotations):
 
800
    """Decorator to annotate D-Bus methods, signals or properties
 
801
    Usage:
 
802
    
 
803
    @dbus_service_property("org.example.Interface", signature="b",
 
804
                           access="r")
 
805
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
806
                        "org.freedesktop.DBus.Property."
 
807
                        "EmitsChangedSignal": "false"})
 
808
    def Property_dbus_property(self):
 
809
        return dbus.Boolean(False)
 
810
    """
 
811
    def decorator(func):
 
812
        func._dbus_annotations = annotations
 
813
        return func
 
814
    return decorator
 
815
 
 
816
 
608
817
class DBusPropertyException(dbus.exceptions.DBusException):
609
818
    """A base class for D-Bus property-related exceptions
610
819
    """
633
842
    """
634
843
    
635
844
    @staticmethod
636
 
    def _is_dbus_property(obj):
637
 
        return getattr(obj, "_dbus_is_property", False)
 
845
    def _is_dbus_thing(thing):
 
846
        """Returns a function testing if an attribute is a D-Bus thing
 
847
        
 
848
        If called like _is_dbus_thing("method") it returns a function
 
849
        suitable for use as predicate to inspect.getmembers().
 
850
        """
 
851
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
852
                                   False)
638
853
    
639
 
    def _get_all_dbus_properties(self):
 
854
    def _get_all_dbus_things(self, thing):
640
855
        """Returns a generator of (name, attribute) pairs
641
856
        """
642
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
857
        return ((getattr(athing.__get__(self), "_dbus_name",
 
858
                         name),
 
859
                 athing.__get__(self))
643
860
                for cls in self.__class__.__mro__
644
 
                for name, prop in
645
 
                inspect.getmembers(cls, self._is_dbus_property))
 
861
                for name, athing in
 
862
                inspect.getmembers(cls,
 
863
                                   self._is_dbus_thing(thing)))
646
864
    
647
865
    def _get_dbus_property(self, interface_name, property_name):
648
866
        """Returns a bound method if one exists which is a D-Bus
650
868
        """
651
869
        for cls in  self.__class__.__mro__:
652
870
            for name, value in (inspect.getmembers
653
 
                                (cls, self._is_dbus_property)):
 
871
                                (cls,
 
872
                                 self._is_dbus_thing("property"))):
654
873
                if (value._dbus_name == property_name
655
874
                    and value._dbus_interface == interface_name):
656
875
                    return value.__get__(self)
685
904
            # signatures other than "ay".
686
905
            if prop._dbus_signature != "ay":
687
906
                raise ValueError
688
 
            value = dbus.ByteArray(''.join(unichr(byte)
689
 
                                           for byte in value))
 
907
            value = dbus.ByteArray(b''.join(chr(byte)
 
908
                                            for byte in value))
690
909
        prop(value)
691
910
    
692
911
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
697
916
        
698
917
        Note: Will not include properties with access="write".
699
918
        """
700
 
        all = {}
701
 
        for name, prop in self._get_all_dbus_properties():
 
919
        properties = {}
 
920
        for name, prop in self._get_all_dbus_things("property"):
702
921
            if (interface_name
703
922
                and interface_name != prop._dbus_interface):
704
923
                # Interface non-empty but did not match
708
927
                continue
709
928
            value = prop()
710
929
            if not hasattr(value, "variant_level"):
711
 
                all[name] = value
 
930
                properties[name] = value
712
931
                continue
713
 
            all[name] = type(value)(value, variant_level=
714
 
                                    value.variant_level+1)
715
 
        return dbus.Dictionary(all, signature="sv")
 
932
            properties[name] = type(value)(value, variant_level=
 
933
                                           value.variant_level+1)
 
934
        return dbus.Dictionary(properties, signature="sv")
716
935
    
717
936
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
718
937
                         out_signature="s",
719
938
                         path_keyword='object_path',
720
939
                         connection_keyword='connection')
721
940
    def Introspect(self, object_path, connection):
722
 
        """Standard D-Bus method, overloaded to insert property tags.
 
941
        """Overloading of standard D-Bus method.
 
942
        
 
943
        Inserts property tags and interface annotation tags.
723
944
        """
724
945
        xmlstring = dbus.service.Object.Introspect(self, object_path,
725
946
                                                   connection)
732
953
                e.setAttribute("access", prop._dbus_access)
733
954
                return e
734
955
            for if_tag in document.getElementsByTagName("interface"):
 
956
                # Add property tags
735
957
                for tag in (make_tag(document, name, prop)
736
958
                            for name, prop
737
 
                            in self._get_all_dbus_properties()
 
959
                            in self._get_all_dbus_things("property")
738
960
                            if prop._dbus_interface
739
961
                            == if_tag.getAttribute("name")):
740
962
                    if_tag.appendChild(tag)
 
963
                # Add annotation tags
 
964
                for typ in ("method", "signal", "property"):
 
965
                    for tag in if_tag.getElementsByTagName(typ):
 
966
                        annots = dict()
 
967
                        for name, prop in (self.
 
968
                                           _get_all_dbus_things(typ)):
 
969
                            if (name == tag.getAttribute("name")
 
970
                                and prop._dbus_interface
 
971
                                == if_tag.getAttribute("name")):
 
972
                                annots.update(getattr
 
973
                                              (prop,
 
974
                                               "_dbus_annotations",
 
975
                                               {}))
 
976
                        for name, value in annots.iteritems():
 
977
                            ann_tag = document.createElement(
 
978
                                "annotation")
 
979
                            ann_tag.setAttribute("name", name)
 
980
                            ann_tag.setAttribute("value", value)
 
981
                            tag.appendChild(ann_tag)
 
982
                # Add interface annotation tags
 
983
                for annotation, value in dict(
 
984
                    itertools.chain.from_iterable(
 
985
                        annotations().iteritems()
 
986
                        for name, annotations in
 
987
                        self._get_all_dbus_things("interface")
 
988
                        if name == if_tag.getAttribute("name")
 
989
                        )).iteritems():
 
990
                    ann_tag = document.createElement("annotation")
 
991
                    ann_tag.setAttribute("name", annotation)
 
992
                    ann_tag.setAttribute("value", value)
 
993
                    if_tag.appendChild(ann_tag)
741
994
                # Add the names to the return values for the
742
995
                # "org.freedesktop.DBus.Properties" methods
743
996
                if (if_tag.getAttribute("name")
758
1011
        except (AttributeError, xml.dom.DOMException,
759
1012
                xml.parsers.expat.ExpatError) as error:
760
1013
            logger.error("Failed to override Introspection method",
761
 
                         error)
 
1014
                         exc_info=error)
762
1015
        return xmlstring
763
1016
 
764
1017
 
769
1022
    return dbus.String(dt.isoformat(),
770
1023
                       variant_level=variant_level)
771
1024
 
772
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
773
 
                                  .__metaclass__):
774
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
775
 
    will add additional D-Bus attributes matching a certain pattern.
 
1025
 
 
1026
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1027
    """A class decorator; applied to a subclass of
 
1028
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1029
    interface names according to the "alt_interface_names" mapping.
 
1030
    Usage:
 
1031
    
 
1032
    @alternate_dbus_names({"org.example.Interface":
 
1033
                               "net.example.AlternateInterface"})
 
1034
    class SampleDBusObject(dbus.service.Object):
 
1035
        @dbus.service.method("org.example.Interface")
 
1036
        def SampleDBusMethod():
 
1037
            pass
 
1038
    
 
1039
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1040
    reachable via two interfaces: "org.example.Interface" and
 
1041
    "net.example.AlternateInterface", the latter of which will have
 
1042
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1043
    "true", unless "deprecate" is passed with a False value.
 
1044
    
 
1045
    This works for methods and signals, and also for D-Bus properties
 
1046
    (from DBusObjectWithProperties) and interfaces (from the
 
1047
    dbus_interface_annotations decorator).
776
1048
    """
777
 
    def __new__(mcs, name, bases, attr):
778
 
        # Go through all the base classes which could have D-Bus
779
 
        # methods, signals, or properties in them
780
 
        for base in (b for b in bases
781
 
                     if issubclass(b, dbus.service.Object)):
782
 
            # Go though all attributes of the base class
783
 
            for attrname, attribute in inspect.getmembers(base):
 
1049
    def wrapper(cls):
 
1050
        for orig_interface_name, alt_interface_name in (
 
1051
            alt_interface_names.iteritems()):
 
1052
            attr = {}
 
1053
            interface_names = set()
 
1054
            # Go though all attributes of the class
 
1055
            for attrname, attribute in inspect.getmembers(cls):
784
1056
                # Ignore non-D-Bus attributes, and D-Bus attributes
785
1057
                # with the wrong interface name
786
1058
                if (not hasattr(attribute, "_dbus_interface")
787
1059
                    or not attribute._dbus_interface
788
 
                    .startswith("se.recompile.Mandos")):
 
1060
                    .startswith(orig_interface_name)):
789
1061
                    continue
790
1062
                # Create an alternate D-Bus interface name based on
791
1063
                # the current name
792
1064
                alt_interface = (attribute._dbus_interface
793
 
                                 .replace("se.recompile.Mandos",
794
 
                                          "se.bsnet.fukt.Mandos"))
 
1065
                                 .replace(orig_interface_name,
 
1066
                                          alt_interface_name))
 
1067
                interface_names.add(alt_interface)
795
1068
                # Is this a D-Bus signal?
796
1069
                if getattr(attribute, "_dbus_is_signal", False):
797
1070
                    # Extract the original non-method function by
812
1085
                                nonmethod_func.func_name,
813
1086
                                nonmethod_func.func_defaults,
814
1087
                                nonmethod_func.func_closure)))
 
1088
                    # Copy annotations, if any
 
1089
                    try:
 
1090
                        new_function._dbus_annotations = (
 
1091
                            dict(attribute._dbus_annotations))
 
1092
                    except AttributeError:
 
1093
                        pass
815
1094
                    # Define a creator of a function to call both the
816
 
                    # old and new functions, so both the old and new
817
 
                    # signals gets sent when the function is called
 
1095
                    # original and alternate functions, so both the
 
1096
                    # original and alternate signals gets sent when
 
1097
                    # the function is called
818
1098
                    def fixscope(func1, func2):
819
1099
                        """This function is a scope container to pass
820
1100
                        func1 and func2 to the "call_both" function
827
1107
                        return call_both
828
1108
                    # Create the "call_both" function and add it to
829
1109
                    # the class
830
 
                    attr[attrname] = fixscope(attribute,
831
 
                                              new_function)
 
1110
                    attr[attrname] = fixscope(attribute, new_function)
832
1111
                # Is this a D-Bus method?
833
1112
                elif getattr(attribute, "_dbus_is_method", False):
834
1113
                    # Create a new, but exactly alike, function
845
1124
                                        attribute.func_name,
846
1125
                                        attribute.func_defaults,
847
1126
                                        attribute.func_closure)))
 
1127
                    # Copy annotations, if any
 
1128
                    try:
 
1129
                        attr[attrname]._dbus_annotations = (
 
1130
                            dict(attribute._dbus_annotations))
 
1131
                    except AttributeError:
 
1132
                        pass
848
1133
                # Is this a D-Bus property?
849
1134
                elif getattr(attribute, "_dbus_is_property", False):
850
1135
                    # Create a new, but exactly alike, function
864
1149
                                        attribute.func_name,
865
1150
                                        attribute.func_defaults,
866
1151
                                        attribute.func_closure)))
867
 
        return type.__new__(mcs, name, bases, attr)
868
 
 
 
1152
                    # Copy annotations, if any
 
1153
                    try:
 
1154
                        attr[attrname]._dbus_annotations = (
 
1155
                            dict(attribute._dbus_annotations))
 
1156
                    except AttributeError:
 
1157
                        pass
 
1158
                # Is this a D-Bus interface?
 
1159
                elif getattr(attribute, "_dbus_is_interface", False):
 
1160
                    # Create a new, but exactly alike, function
 
1161
                    # object.  Decorate it to be a new D-Bus interface
 
1162
                    # with the alternate D-Bus interface name.  Add it
 
1163
                    # to the class.
 
1164
                    attr[attrname] = (dbus_interface_annotations
 
1165
                                      (alt_interface)
 
1166
                                      (types.FunctionType
 
1167
                                       (attribute.func_code,
 
1168
                                        attribute.func_globals,
 
1169
                                        attribute.func_name,
 
1170
                                        attribute.func_defaults,
 
1171
                                        attribute.func_closure)))
 
1172
            if deprecate:
 
1173
                # Deprecate all alternate interfaces
 
1174
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1175
                for interface_name in interface_names:
 
1176
                    @dbus_interface_annotations(interface_name)
 
1177
                    def func(self):
 
1178
                        return { "org.freedesktop.DBus.Deprecated":
 
1179
                                     "true" }
 
1180
                    # Find an unused name
 
1181
                    for aname in (iname.format(i)
 
1182
                                  for i in itertools.count()):
 
1183
                        if aname not in attr:
 
1184
                            attr[aname] = func
 
1185
                            break
 
1186
            if interface_names:
 
1187
                # Replace the class with a new subclass of it with
 
1188
                # methods, signals, etc. as created above.
 
1189
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1190
                           (cls,), attr)
 
1191
        return cls
 
1192
    return wrapper
 
1193
 
 
1194
 
 
1195
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1196
                                "se.bsnet.fukt.Mandos"})
869
1197
class ClientDBus(Client, DBusObjectWithProperties):
870
1198
    """A Client class using D-Bus
871
1199
    
880
1208
    # dbus.service.Object doesn't use super(), so we can't either.
881
1209
    
882
1210
    def __init__(self, bus = None, *args, **kwargs):
883
 
        self._approvals_pending = 0
884
1211
        self.bus = bus
885
1212
        Client.__init__(self, *args, **kwargs)
886
1213
        # Only now, when this client is initialized, can it show up on
892
1219
                                 ("/clients/" + client_object_name))
893
1220
        DBusObjectWithProperties.__init__(self, self.bus,
894
1221
                                          self.dbus_object_path)
895
 
        
 
1222
    
896
1223
    def notifychangeproperty(transform_func,
897
1224
                             dbus_name, type_func=lambda x: x,
898
1225
                             variant_level=1):
899
1226
        """ Modify a variable so that it's a property which announces
900
1227
        its changes to DBus.
901
 
 
 
1228
        
902
1229
        transform_fun: Function that takes a value and a variant_level
903
1230
                       and transforms it to a D-Bus type.
904
1231
        dbus_name: D-Bus name of the variable
921
1248
        
922
1249
        return property(lambda self: getattr(self, attrname), setter)
923
1250
    
924
 
    
925
1251
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
926
1252
    approvals_pending = notifychangeproperty(dbus.Boolean,
927
1253
                                             "ApprovalPending",
934
1260
                                       checker is not None)
935
1261
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
936
1262
                                           "LastCheckedOK")
 
1263
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1264
                                               "LastCheckerStatus")
937
1265
    last_approval_request = notifychangeproperty(
938
1266
        datetime_to_dbus, "LastApprovalRequest")
939
1267
    approved_by_default = notifychangeproperty(dbus.Boolean,
940
1268
                                               "ApprovedByDefault")
941
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1269
    approval_delay = notifychangeproperty(dbus.UInt64,
942
1270
                                          "ApprovalDelay",
943
1271
                                          type_func =
944
 
                                          _timedelta_to_milliseconds)
 
1272
                                          timedelta_to_milliseconds)
945
1273
    approval_duration = notifychangeproperty(
946
 
        dbus.UInt16, "ApprovalDuration",
947
 
        type_func = _timedelta_to_milliseconds)
 
1274
        dbus.UInt64, "ApprovalDuration",
 
1275
        type_func = timedelta_to_milliseconds)
948
1276
    host = notifychangeproperty(dbus.String, "Host")
949
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1277
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
950
1278
                                   type_func =
951
 
                                   _timedelta_to_milliseconds)
 
1279
                                   timedelta_to_milliseconds)
952
1280
    extended_timeout = notifychangeproperty(
953
 
        dbus.UInt16, "ExtendedTimeout",
954
 
        type_func = _timedelta_to_milliseconds)
955
 
    interval = notifychangeproperty(dbus.UInt16,
 
1281
        dbus.UInt64, "ExtendedTimeout",
 
1282
        type_func = timedelta_to_milliseconds)
 
1283
    interval = notifychangeproperty(dbus.UInt64,
956
1284
                                    "Interval",
957
1285
                                    type_func =
958
 
                                    _timedelta_to_milliseconds)
 
1286
                                    timedelta_to_milliseconds)
959
1287
    checker_command = notifychangeproperty(dbus.String, "Checker")
960
1288
    
961
1289
    del notifychangeproperty
1003
1331
        return r
1004
1332
    
1005
1333
    def _reset_approved(self):
1006
 
        self._approved = None
 
1334
        self.approved = None
1007
1335
        return False
1008
1336
    
1009
1337
    def approve(self, value=True):
1010
1338
        self.send_changedstate()
1011
 
        self._approved = value
1012
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1339
        self.approved = value
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
1013
1341
                            (self.approval_duration),
1014
1342
                            self._reset_approved)
1015
1343
    
1016
 
    
1017
1344
    ## D-Bus methods, signals & properties
1018
1345
    _interface = "se.recompile.Mandos.Client"
1019
1346
    
 
1347
    ## Interfaces
 
1348
    
 
1349
    @dbus_interface_annotations(_interface)
 
1350
    def _foo(self):
 
1351
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1352
                     "false"}
 
1353
    
1020
1354
    ## Signals
1021
1355
    
1022
1356
    # CheckerCompleted - signal
1121
1455
                           access="readwrite")
1122
1456
    def ApprovalDuration_dbus_property(self, value=None):
1123
1457
        if value is None:       # get
1124
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1458
            return dbus.UInt64(timedelta_to_milliseconds(
1125
1459
                    self.approval_duration))
1126
1460
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1127
1461
    
1141
1475
    def Host_dbus_property(self, value=None):
1142
1476
        if value is None:       # get
1143
1477
            return dbus.String(self.host)
1144
 
        self.host = value
 
1478
        self.host = unicode(value)
1145
1479
    
1146
1480
    # Created - property
1147
1481
    @dbus_service_property(_interface, signature="s", access="read")
1148
1482
    def Created_dbus_property(self):
1149
 
        return dbus.String(datetime_to_dbus(self.created))
 
1483
        return datetime_to_dbus(self.created)
1150
1484
    
1151
1485
    # LastEnabled - property
1152
1486
    @dbus_service_property(_interface, signature="s", access="read")
1173
1507
            return
1174
1508
        return datetime_to_dbus(self.last_checked_ok)
1175
1509
    
 
1510
    # LastCheckerStatus - property
 
1511
    @dbus_service_property(_interface, signature="n",
 
1512
                           access="read")
 
1513
    def LastCheckerStatus_dbus_property(self):
 
1514
        return dbus.Int16(self.last_checker_status)
 
1515
    
1176
1516
    # Expires - property
1177
1517
    @dbus_service_property(_interface, signature="s", access="read")
1178
1518
    def Expires_dbus_property(self):
1190
1530
        if value is None:       # get
1191
1531
            return dbus.UInt64(self.timeout_milliseconds())
1192
1532
        self.timeout = datetime.timedelta(0, 0, 0, value)
1193
 
        if getattr(self, "disable_initiator_tag", None) is None:
1194
 
            return
1195
1533
        # Reschedule timeout
1196
 
        gobject.source_remove(self.disable_initiator_tag)
1197
 
        self.disable_initiator_tag = None
1198
 
        self.expires = None
1199
 
        time_to_die = _timedelta_to_milliseconds((self
1200
 
                                                  .last_checked_ok
1201
 
                                                  + self.timeout)
1202
 
                                                 - datetime.datetime
1203
 
                                                 .utcnow())
1204
 
        if time_to_die <= 0:
1205
 
            # The timeout has passed
1206
 
            self.disable()
1207
 
        else:
1208
 
            self.expires = (datetime.datetime.utcnow()
1209
 
                            + datetime.timedelta(milliseconds =
1210
 
                                                 time_to_die))
1211
 
            self.disable_initiator_tag = (gobject.timeout_add
1212
 
                                          (time_to_die, self.disable))
 
1534
        if self.enabled:
 
1535
            now = datetime.datetime.utcnow()
 
1536
            time_to_die = timedelta_to_milliseconds(
 
1537
                (self.last_checked_ok + self.timeout) - now)
 
1538
            if time_to_die <= 0:
 
1539
                # The timeout has passed
 
1540
                self.disable()
 
1541
            else:
 
1542
                self.expires = (now +
 
1543
                                datetime.timedelta(milliseconds =
 
1544
                                                   time_to_die))
 
1545
                if (getattr(self, "disable_initiator_tag", None)
 
1546
                    is None):
 
1547
                    return
 
1548
                gobject.source_remove(self.disable_initiator_tag)
 
1549
                self.disable_initiator_tag = (gobject.timeout_add
 
1550
                                              (time_to_die,
 
1551
                                               self.disable))
1213
1552
    
1214
1553
    # ExtendedTimeout - property
1215
1554
    @dbus_service_property(_interface, signature="t",
1228
1567
        self.interval = datetime.timedelta(0, 0, 0, value)
1229
1568
        if getattr(self, "checker_initiator_tag", None) is None:
1230
1569
            return
1231
 
        # Reschedule checker run
1232
 
        gobject.source_remove(self.checker_initiator_tag)
1233
 
        self.checker_initiator_tag = (gobject.timeout_add
1234
 
                                      (value, self.start_checker))
1235
 
        self.start_checker()    # Start one now, too
 
1570
        if self.enabled:
 
1571
            # Reschedule checker run
 
1572
            gobject.source_remove(self.checker_initiator_tag)
 
1573
            self.checker_initiator_tag = (gobject.timeout_add
 
1574
                                          (value, self.start_checker))
 
1575
            self.start_checker()    # Start one now, too
1236
1576
    
1237
1577
    # Checker - property
1238
1578
    @dbus_service_property(_interface, signature="s",
1240
1580
    def Checker_dbus_property(self, value=None):
1241
1581
        if value is None:       # get
1242
1582
            return dbus.String(self.checker_command)
1243
 
        self.checker_command = value
 
1583
        self.checker_command = unicode(value)
1244
1584
    
1245
1585
    # CheckerRunning - property
1246
1586
    @dbus_service_property(_interface, signature="b",
1275
1615
            raise KeyError()
1276
1616
    
1277
1617
    def __getattribute__(self, name):
1278
 
        if(name == '_pipe'):
 
1618
        if name == '_pipe':
1279
1619
            return super(ProxyClient, self).__getattribute__(name)
1280
1620
        self._pipe.send(('getattr', name))
1281
1621
        data = self._pipe.recv()
1288
1628
            return func
1289
1629
    
1290
1630
    def __setattr__(self, name, value):
1291
 
        if(name == '_pipe'):
 
1631
        if name == '_pipe':
1292
1632
            return super(ProxyClient, self).__setattr__(name, value)
1293
1633
        self._pipe.send(('setattr', name, value))
1294
1634
 
1295
 
class ClientDBusTransitional(ClientDBus):
1296
 
    __metaclass__ = AlternateDBusNamesMetaclass
1297
1635
 
1298
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
1299
1637
    """A class to handle client connections.
1382
1720
                            client.Rejected("Disabled")
1383
1721
                        return
1384
1722
                    
1385
 
                    if client._approved or not client.approval_delay:
 
1723
                    if client.approved or not client.approval_delay:
1386
1724
                        #We are approved or approval is disabled
1387
1725
                        break
1388
 
                    elif client._approved is None:
 
1726
                    elif client.approved is None:
1389
1727
                        logger.info("Client %s needs approval",
1390
1728
                                    client.name)
1391
1729
                        if self.server.use_dbus:
1405
1743
                    time = datetime.datetime.now()
1406
1744
                    client.changedstate.acquire()
1407
1745
                    (client.changedstate.wait
1408
 
                     (float(client._timedelta_to_milliseconds(delay)
 
1746
                     (float(client.timedelta_to_milliseconds(delay)
1409
1747
                            / 1000)))
1410
1748
                    client.changedstate.release()
1411
1749
                    time2 = datetime.datetime.now()
1428
1766
                    try:
1429
1767
                        sent = session.send(client.secret[sent_size:])
1430
1768
                    except gnutls.errors.GNUTLSError as error:
1431
 
                        logger.warning("gnutls send failed")
 
1769
                        logger.warning("gnutls send failed",
 
1770
                                       exc_info=error)
1432
1771
                        return
1433
1772
                    logger.debug("Sent: %d, remaining: %d",
1434
1773
                                 sent, len(client.secret)
1437
1776
                
1438
1777
                logger.info("Sending secret to %s", client.name)
1439
1778
                # bump the timeout using extended_timeout
1440
 
                client.checked_ok(client.extended_timeout)
 
1779
                client.bump_timeout(client.extended_timeout)
1441
1780
                if self.server.use_dbus:
1442
1781
                    # Emit D-Bus signal
1443
1782
                    client.GotSecret()
1448
1787
                try:
1449
1788
                    session.bye()
1450
1789
                except gnutls.errors.GNUTLSError as error:
1451
 
                    logger.warning("GnuTLS bye failed")
 
1790
                    logger.warning("GnuTLS bye failed",
 
1791
                                   exc_info=error)
1452
1792
    
1453
1793
    @staticmethod
1454
1794
    def peer_certificate(session):
1510
1850
        # Convert the buffer to a Python bytestring
1511
1851
        fpr = ctypes.string_at(buf, buf_len.value)
1512
1852
        # Convert the bytestring to hexadecimal notation
1513
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1853
        hex_fpr = binascii.hexlify(fpr).upper()
1514
1854
        return hex_fpr
1515
1855
 
1516
1856
 
1519
1859
    def sub_process_main(self, request, address):
1520
1860
        try:
1521
1861
            self.finish_request(request, address)
1522
 
        except:
 
1862
        except Exception:
1523
1863
            self.handle_error(request, address)
1524
1864
        self.close_request(request)
1525
1865
    
1526
1866
    def process_request(self, request, address):
1527
1867
        """Start a new process to process the request."""
1528
1868
        proc = multiprocessing.Process(target = self.sub_process_main,
1529
 
                                       args = (request,
1530
 
                                               address))
 
1869
                                       args = (request, address))
1531
1870
        proc.start()
1532
1871
        return proc
1533
1872
 
1630
1969
        self.enabled = False
1631
1970
        self.clients = clients
1632
1971
        if self.clients is None:
1633
 
            self.clients = set()
 
1972
            self.clients = {}
1634
1973
        self.use_dbus = use_dbus
1635
1974
        self.gnutls_priority = gnutls_priority
1636
1975
        IPv6_TCPServer.__init__(self, server_address,
1655
1994
    
1656
1995
    def handle_ipc(self, source, condition, parent_pipe=None,
1657
1996
                   proc = None, client_object=None):
1658
 
        condition_names = {
1659
 
            gobject.IO_IN: "IN",   # There is data to read.
1660
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1661
 
                                    # blocking).
1662
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1663
 
            gobject.IO_ERR: "ERR", # Error condition.
1664
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1665
 
                                    # broken, usually for pipes and
1666
 
                                    # sockets).
1667
 
            }
1668
 
        conditions_string = ' | '.join(name
1669
 
                                       for cond, name in
1670
 
                                       condition_names.iteritems()
1671
 
                                       if cond & condition)
1672
1997
        # error, or the other end of multiprocessing.Pipe has closed
1673
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1998
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1674
1999
            # Wait for other process to exit
1675
2000
            proc.join()
1676
2001
            return False
1683
2008
            fpr = request[1]
1684
2009
            address = request[2]
1685
2010
            
1686
 
            for c in self.clients:
 
2011
            for c in self.clients.itervalues():
1687
2012
                if c.fingerprint == fpr:
1688
2013
                    client = c
1689
2014
                    break
1766
2091
            elif suffix == "w":
1767
2092
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1768
2093
            else:
1769
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2094
                raise ValueError("Unknown suffix {0!r}"
 
2095
                                 .format(suffix))
1770
2096
        except (ValueError, IndexError) as e:
1771
2097
            raise ValueError(*(e.args))
1772
2098
        timevalue += delta
1773
2099
    return timevalue
1774
2100
 
1775
2101
 
1776
 
def if_nametoindex(interface):
1777
 
    """Call the C function if_nametoindex(), or equivalent
1778
 
    
1779
 
    Note: This function cannot accept a unicode string."""
1780
 
    global if_nametoindex
1781
 
    try:
1782
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1783
 
                          (ctypes.util.find_library("c"))
1784
 
                          .if_nametoindex)
1785
 
    except (OSError, AttributeError):
1786
 
        logger.warning("Doing if_nametoindex the hard way")
1787
 
        def if_nametoindex(interface):
1788
 
            "Get an interface index the hard way, i.e. using fcntl()"
1789
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1790
 
            with contextlib.closing(socket.socket()) as s:
1791
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1792
 
                                    struct.pack(str("16s16x"),
1793
 
                                                interface))
1794
 
            interface_index = struct.unpack(str("I"),
1795
 
                                            ifreq[16:20])[0]
1796
 
            return interface_index
1797
 
    return if_nametoindex(interface)
1798
 
 
1799
 
 
1800
2102
def daemon(nochdir = False, noclose = False):
1801
2103
    """See daemon(3).  Standard BSD Unix function.
1802
2104
    
1810
2112
        sys.exit()
1811
2113
    if not noclose:
1812
2114
        # Close all standard open file descriptors
1813
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2115
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1814
2116
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1815
2117
            raise OSError(errno.ENODEV,
1816
 
                          "%s not a character device"
1817
 
                          % os.path.devnull)
 
2118
                          "{0} not a character device"
 
2119
                          .format(os.devnull))
1818
2120
        os.dup2(null, sys.stdin.fileno())
1819
2121
        os.dup2(null, sys.stdout.fileno())
1820
2122
        os.dup2(null, sys.stderr.fileno())
1829
2131
    
1830
2132
    parser = argparse.ArgumentParser()
1831
2133
    parser.add_argument("-v", "--version", action="version",
1832
 
                        version = "%%(prog)s %s" % version,
 
2134
                        version = "%(prog)s {0}".format(version),
1833
2135
                        help="show version number and exit")
1834
2136
    parser.add_argument("-i", "--interface", metavar="IF",
1835
2137
                        help="Bind to interface IF")
1857
2159
                        " system bus interface")
1858
2160
    parser.add_argument("--no-ipv6", action="store_false",
1859
2161
                        dest="use_ipv6", help="Do not use IPv6")
 
2162
    parser.add_argument("--no-restore", action="store_false",
 
2163
                        dest="restore", help="Do not restore stored"
 
2164
                        " state")
 
2165
    parser.add_argument("--statedir", metavar="DIR",
 
2166
                        help="Directory to save/restore state in")
 
2167
    
1860
2168
    options = parser.parse_args()
1861
2169
    
1862
2170
    if options.check:
1875
2183
                        "use_dbus": "True",
1876
2184
                        "use_ipv6": "True",
1877
2185
                        "debuglevel": "",
 
2186
                        "restore": "True",
 
2187
                        "statedir": "/var/lib/mandos"
1878
2188
                        }
1879
2189
    
1880
2190
    # Parse config file for server-global settings
1897
2207
    # options, if set.
1898
2208
    for option in ("interface", "address", "port", "debug",
1899
2209
                   "priority", "servicename", "configdir",
1900
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2210
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2211
                   "statedir"):
1901
2212
        value = getattr(options, option)
1902
2213
        if value is not None:
1903
2214
            server_settings[option] = value
1915
2226
    debuglevel = server_settings["debuglevel"]
1916
2227
    use_dbus = server_settings["use_dbus"]
1917
2228
    use_ipv6 = server_settings["use_ipv6"]
 
2229
    stored_state_path = os.path.join(server_settings["statedir"],
 
2230
                                     stored_state_file)
 
2231
    
 
2232
    if debug:
 
2233
        initlogger(debug, logging.DEBUG)
 
2234
    else:
 
2235
        if not debuglevel:
 
2236
            initlogger(debug)
 
2237
        else:
 
2238
            level = getattr(logging, debuglevel.upper())
 
2239
            initlogger(debug, level)
1918
2240
    
1919
2241
    if server_settings["servicename"] != "Mandos":
1920
2242
        syslogger.setFormatter(logging.Formatter
1921
 
                               ('Mandos (%s) [%%(process)d]:'
1922
 
                                ' %%(levelname)s: %%(message)s'
1923
 
                                % server_settings["servicename"]))
 
2243
                               ('Mandos ({0}) [%(process)d]:'
 
2244
                                ' %(levelname)s: %(message)s'
 
2245
                                .format(server_settings
 
2246
                                        ["servicename"])))
1924
2247
    
1925
2248
    # Parse config file with clients
1926
 
    client_defaults = { "timeout": "5m",
1927
 
                        "extended_timeout": "15m",
1928
 
                        "interval": "2m",
1929
 
                        "checker": "fping -q -- %%(host)s",
1930
 
                        "host": "",
1931
 
                        "approval_delay": "0s",
1932
 
                        "approval_duration": "1s",
1933
 
                        }
1934
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2249
    client_config = configparser.SafeConfigParser(Client
 
2250
                                                  .client_defaults)
1935
2251
    client_config.read(os.path.join(server_settings["configdir"],
1936
2252
                                    "clients.conf"))
1937
2253
    
1951
2267
        pidfilename = "/var/run/mandos.pid"
1952
2268
        try:
1953
2269
            pidfile = open(pidfilename, "w")
1954
 
        except IOError:
1955
 
            logger.error("Could not open file %r", pidfilename)
 
2270
        except IOError as e:
 
2271
            logger.error("Could not open file %r", pidfilename,
 
2272
                         exc_info=e)
1956
2273
    
1957
 
    try:
1958
 
        uid = pwd.getpwnam("_mandos").pw_uid
1959
 
        gid = pwd.getpwnam("_mandos").pw_gid
1960
 
    except KeyError:
 
2274
    for name in ("_mandos", "mandos", "nobody"):
1961
2275
        try:
1962
 
            uid = pwd.getpwnam("mandos").pw_uid
1963
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2276
            uid = pwd.getpwnam(name).pw_uid
 
2277
            gid = pwd.getpwnam(name).pw_gid
 
2278
            break
1964
2279
        except KeyError:
1965
 
            try:
1966
 
                uid = pwd.getpwnam("nobody").pw_uid
1967
 
                gid = pwd.getpwnam("nobody").pw_gid
1968
 
            except KeyError:
1969
 
                uid = 65534
1970
 
                gid = 65534
 
2280
            continue
 
2281
    else:
 
2282
        uid = 65534
 
2283
        gid = 65534
1971
2284
    try:
1972
2285
        os.setgid(gid)
1973
2286
        os.setuid(uid)
1975
2288
        if error[0] != errno.EPERM:
1976
2289
            raise error
1977
2290
    
1978
 
    if not debug and not debuglevel:
1979
 
        logger.setLevel(logging.WARNING)
1980
 
    if debuglevel:
1981
 
        level = getattr(logging, debuglevel.upper())
1982
 
        logger.setLevel(level)
1983
 
    
1984
2291
    if debug:
1985
 
        logger.setLevel(logging.DEBUG)
1986
2292
        # Enable all possible GnuTLS debugging
1987
2293
        
1988
2294
        # "Use a log level over 10 to enable all debugging options."
1997
2303
         .gnutls_global_set_log_function(debug_gnutls))
1998
2304
        
1999
2305
        # Redirect stdin so all checkers get /dev/null
2000
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2306
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2001
2307
        os.dup2(null, sys.stdin.fileno())
2002
2308
        if null > 2:
2003
2309
            os.close(null)
2004
 
    else:
2005
 
        # No console logging
2006
 
        logger.removeHandler(console)
2007
2310
    
2008
2311
    # Need to fork before connecting to D-Bus
2009
2312
    if not debug:
2010
2313
        # Close all input and output, do double fork, etc.
2011
2314
        daemon()
2012
2315
    
 
2316
    gobject.threads_init()
 
2317
    
2013
2318
    global main_loop
2014
2319
    # From the Avahi example code
2015
 
    DBusGMainLoop(set_as_default=True )
 
2320
    DBusGMainLoop(set_as_default=True)
2016
2321
    main_loop = gobject.MainLoop()
2017
2322
    bus = dbus.SystemBus()
2018
2323
    # End of Avahi example code
2024
2329
                            ("se.bsnet.fukt.Mandos", bus,
2025
2330
                             do_not_queue=True))
2026
2331
        except dbus.exceptions.NameExistsException as e:
2027
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2332
            logger.error("Disabling D-Bus:", exc_info=e)
2028
2333
            use_dbus = False
2029
2334
            server_settings["use_dbus"] = False
2030
2335
            tcp_server.use_dbus = False
2042
2347
    
2043
2348
    client_class = Client
2044
2349
    if use_dbus:
2045
 
        client_class = functools.partial(ClientDBusTransitional,
2046
 
                                         bus = bus)
2047
 
    def client_config_items(config, section):
2048
 
        special_settings = {
2049
 
            "approved_by_default":
2050
 
                lambda: config.getboolean(section,
2051
 
                                          "approved_by_default"),
2052
 
            }
2053
 
        for name, value in config.items(section):
 
2350
        client_class = functools.partial(ClientDBus, bus = bus)
 
2351
    
 
2352
    client_settings = Client.config_parser(client_config)
 
2353
    old_client_settings = {}
 
2354
    clients_data = {}
 
2355
    
 
2356
    # Get client data and settings from last running state.
 
2357
    if server_settings["restore"]:
 
2358
        try:
 
2359
            with open(stored_state_path, "rb") as stored_state:
 
2360
                clients_data, old_client_settings = (pickle.load
 
2361
                                                     (stored_state))
 
2362
            os.remove(stored_state_path)
 
2363
        except IOError as e:
 
2364
            if e.errno == errno.ENOENT:
 
2365
                logger.warning("Could not load persistent state: {0}"
 
2366
                                .format(os.strerror(e.errno)))
 
2367
            else:
 
2368
                logger.critical("Could not load persistent state:",
 
2369
                                exc_info=e)
 
2370
                raise
 
2371
        except EOFError as e:
 
2372
            logger.warning("Could not load persistent state: "
 
2373
                           "EOFError:", exc_info=e)
 
2374
    
 
2375
    with PGPEngine() as pgp:
 
2376
        for client_name, client in clients_data.iteritems():
 
2377
            # Decide which value to use after restoring saved state.
 
2378
            # We have three different values: Old config file,
 
2379
            # new config file, and saved state.
 
2380
            # New config value takes precedence if it differs from old
 
2381
            # config value, otherwise use saved state.
 
2382
            for name, value in client_settings[client_name].items():
 
2383
                try:
 
2384
                    # For each value in new config, check if it
 
2385
                    # differs from the old config value (Except for
 
2386
                    # the "secret" attribute)
 
2387
                    if (name != "secret" and
 
2388
                        value != old_client_settings[client_name]
 
2389
                        [name]):
 
2390
                        client[name] = value
 
2391
                except KeyError:
 
2392
                    pass
 
2393
            
 
2394
            # Clients who has passed its expire date can still be
 
2395
            # enabled if its last checker was successful.  Clients
 
2396
            # whose checker succeeded before we stored its state is
 
2397
            # assumed to have successfully run all checkers during
 
2398
            # downtime.
 
2399
            if client["enabled"]:
 
2400
                if datetime.datetime.utcnow() >= client["expires"]:
 
2401
                    if not client["last_checked_ok"]:
 
2402
                        logger.warning(
 
2403
                            "disabling client {0} - Client never "
 
2404
                            "performed a successful checker"
 
2405
                            .format(client_name))
 
2406
                        client["enabled"] = False
 
2407
                    elif client["last_checker_status"] != 0:
 
2408
                        logger.warning(
 
2409
                            "disabling client {0} - Client "
 
2410
                            "last checker failed with error code {1}"
 
2411
                            .format(client_name,
 
2412
                                    client["last_checker_status"]))
 
2413
                        client["enabled"] = False
 
2414
                    else:
 
2415
                        client["expires"] = (datetime.datetime
 
2416
                                             .utcnow()
 
2417
                                             + client["timeout"])
 
2418
                        logger.debug("Last checker succeeded,"
 
2419
                                     " keeping {0} enabled"
 
2420
                                     .format(client_name))
2054
2421
            try:
2055
 
                yield (name, special_settings[name]())
2056
 
            except KeyError:
2057
 
                yield (name, value)
2058
 
    
2059
 
    tcp_server.clients.update(set(
2060
 
            client_class(name = section,
2061
 
                         config= dict(client_config_items(
2062
 
                        client_config, section)))
2063
 
            for section in client_config.sections()))
 
2422
                client["secret"] = (
 
2423
                    pgp.decrypt(client["encrypted_secret"],
 
2424
                                client_settings[client_name]
 
2425
                                ["secret"]))
 
2426
            except PGPError:
 
2427
                # If decryption fails, we use secret from new settings
 
2428
                logger.debug("Failed to decrypt {0} old secret"
 
2429
                             .format(client_name))
 
2430
                client["secret"] = (
 
2431
                    client_settings[client_name]["secret"])
 
2432
    
 
2433
    # Add/remove clients based on new changes made to config
 
2434
    for client_name in (set(old_client_settings)
 
2435
                        - set(client_settings)):
 
2436
        del clients_data[client_name]
 
2437
    for client_name in (set(client_settings)
 
2438
                        - set(old_client_settings)):
 
2439
        clients_data[client_name] = client_settings[client_name]
 
2440
    
 
2441
    # Create all client objects
 
2442
    for client_name, client in clients_data.iteritems():
 
2443
        tcp_server.clients[client_name] = client_class(
 
2444
            name = client_name, settings = client)
 
2445
    
2064
2446
    if not tcp_server.clients:
2065
2447
        logger.warning("No clients defined")
2066
 
        
 
2448
    
2067
2449
    if not debug:
2068
2450
        try:
2069
2451
            with pidfile:
2077
2459
            # "pidfile" was never created
2078
2460
            pass
2079
2461
        del pidfilename
2080
 
        
2081
2462
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2082
2463
    
2083
2464
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2084
2465
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2085
2466
    
2086
2467
    if use_dbus:
2087
 
        class MandosDBusService(dbus.service.Object):
 
2468
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2469
                                        "se.bsnet.fukt.Mandos"})
 
2470
        class MandosDBusService(DBusObjectWithProperties):
2088
2471
            """A D-Bus proxy object"""
2089
2472
            def __init__(self):
2090
2473
                dbus.service.Object.__init__(self, bus, "/")
2091
2474
            _interface = "se.recompile.Mandos"
2092
2475
            
 
2476
            @dbus_interface_annotations(_interface)
 
2477
            def _foo(self):
 
2478
                return { "org.freedesktop.DBus.Property"
 
2479
                         ".EmitsChangedSignal":
 
2480
                             "false"}
 
2481
            
2093
2482
            @dbus.service.signal(_interface, signature="o")
2094
2483
            def ClientAdded(self, objpath):
2095
2484
                "D-Bus signal"
2109
2498
            def GetAllClients(self):
2110
2499
                "D-Bus method"
2111
2500
                return dbus.Array(c.dbus_object_path
2112
 
                                  for c in tcp_server.clients)
 
2501
                                  for c in
 
2502
                                  tcp_server.clients.itervalues())
2113
2503
            
2114
2504
            @dbus.service.method(_interface,
2115
2505
                                 out_signature="a{oa{sv}}")
2117
2507
                "D-Bus method"
2118
2508
                return dbus.Dictionary(
2119
2509
                    ((c.dbus_object_path, c.GetAll(""))
2120
 
                     for c in tcp_server.clients),
 
2510
                     for c in tcp_server.clients.itervalues()),
2121
2511
                    signature="oa{sv}")
2122
2512
            
2123
2513
            @dbus.service.method(_interface, in_signature="o")
2124
2514
            def RemoveClient(self, object_path):
2125
2515
                "D-Bus method"
2126
 
                for c in tcp_server.clients:
 
2516
                for c in tcp_server.clients.itervalues():
2127
2517
                    if c.dbus_object_path == object_path:
2128
 
                        tcp_server.clients.remove(c)
 
2518
                        del tcp_server.clients[c.name]
2129
2519
                        c.remove_from_connection()
2130
2520
                        # Don't signal anything except ClientRemoved
2131
2521
                        c.disable(quiet=True)
2136
2526
            
2137
2527
            del _interface
2138
2528
        
2139
 
        class MandosDBusServiceTransitional(MandosDBusService):
2140
 
            __metaclass__ = AlternateDBusNamesMetaclass
2141
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2529
        mandos_dbus_service = MandosDBusService()
2142
2530
    
2143
2531
    def cleanup():
2144
2532
        "Cleanup function; run on exit"
2145
2533
        service.cleanup()
2146
2534
        
2147
2535
        multiprocessing.active_children()
 
2536
        if not (tcp_server.clients or client_settings):
 
2537
            return
 
2538
        
 
2539
        # Store client before exiting. Secrets are encrypted with key
 
2540
        # based on what config file has. If config file is
 
2541
        # removed/edited, old secret will thus be unrecovable.
 
2542
        clients = {}
 
2543
        with PGPEngine() as pgp:
 
2544
            for client in tcp_server.clients.itervalues():
 
2545
                key = client_settings[client.name]["secret"]
 
2546
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2547
                                                      key)
 
2548
                client_dict = {}
 
2549
                
 
2550
                # A list of attributes that can not be pickled
 
2551
                # + secret.
 
2552
                exclude = set(("bus", "changedstate", "secret",
 
2553
                               "checker"))
 
2554
                for name, typ in (inspect.getmembers
 
2555
                                  (dbus.service.Object)):
 
2556
                    exclude.add(name)
 
2557
                
 
2558
                client_dict["encrypted_secret"] = (client
 
2559
                                                   .encrypted_secret)
 
2560
                for attr in client.client_structure:
 
2561
                    if attr not in exclude:
 
2562
                        client_dict[attr] = getattr(client, attr)
 
2563
                
 
2564
                clients[client.name] = client_dict
 
2565
                del client_settings[client.name]["secret"]
 
2566
        
 
2567
        try:
 
2568
            with (tempfile.NamedTemporaryFile
 
2569
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2570
                   dir=os.path.dirname(stored_state_path),
 
2571
                   delete=False)) as stored_state:
 
2572
                pickle.dump((clients, client_settings), stored_state)
 
2573
                tempname=stored_state.name
 
2574
            os.rename(tempname, stored_state_path)
 
2575
        except (IOError, OSError) as e:
 
2576
            if not debug:
 
2577
                try:
 
2578
                    os.remove(tempname)
 
2579
                except NameError:
 
2580
                    pass
 
2581
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2582
                logger.warning("Could not save persistent state: {0}"
 
2583
                               .format(os.strerror(e.errno)))
 
2584
            else:
 
2585
                logger.warning("Could not save persistent state:",
 
2586
                               exc_info=e)
 
2587
                raise e
 
2588
        
 
2589
        # Delete all clients, and settings from config
2148
2590
        while tcp_server.clients:
2149
 
            client = tcp_server.clients.pop()
 
2591
            name, client = tcp_server.clients.popitem()
2150
2592
            if use_dbus:
2151
2593
                client.remove_from_connection()
2152
 
            client.disable_hook = None
2153
2594
            # Don't signal anything except ClientRemoved
2154
2595
            client.disable(quiet=True)
2155
2596
            if use_dbus:
2157
2598
                mandos_dbus_service.ClientRemoved(client
2158
2599
                                                  .dbus_object_path,
2159
2600
                                                  client.name)
 
2601
        client_settings.clear()
2160
2602
    
2161
2603
    atexit.register(cleanup)
2162
2604
    
2163
 
    for client in tcp_server.clients:
 
2605
    for client in tcp_server.clients.itervalues():
2164
2606
        if use_dbus:
2165
2607
            # Emit D-Bus signal
2166
2608
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2167
 
        client.enable()
 
2609
        # Need to initiate checking of clients
 
2610
        if client.enabled:
 
2611
            client.init_checker()
2168
2612
    
2169
2613
    tcp_server.enable()
2170
2614
    tcp_server.server_activate()
2173
2617
    service.port = tcp_server.socket.getsockname()[1]
2174
2618
    if use_ipv6:
2175
2619
        logger.info("Now listening on address %r, port %d,"
2176
 
                    " flowinfo %d, scope_id %d"
2177
 
                    % tcp_server.socket.getsockname())
 
2620
                    " flowinfo %d, scope_id %d",
 
2621
                    *tcp_server.socket.getsockname())
2178
2622
    else:                       # IPv4
2179
 
        logger.info("Now listening on address %r, port %d"
2180
 
                    % tcp_server.socket.getsockname())
 
2623
        logger.info("Now listening on address %r, port %d",
 
2624
                    *tcp_server.socket.getsockname())
2181
2625
    
2182
2626
    #service.interface = tcp_server.socket.getsockname()[3]
2183
2627
    
2186
2630
        try:
2187
2631
            service.activate()
2188
2632
        except dbus.exceptions.DBusException as error:
2189
 
            logger.critical("DBusException: %s", error)
 
2633
            logger.critical("D-Bus Exception", exc_info=error)
2190
2634
            cleanup()
2191
2635
            sys.exit(1)
2192
2636
        # End of Avahi example code
2199
2643
        logger.debug("Starting main loop")
2200
2644
        main_loop.run()
2201
2645
    except AvahiError as error:
2202
 
        logger.critical("AvahiError: %s", error)
 
2646
        logger.critical("Avahi Error", exc_info=error)
2203
2647
        cleanup()
2204
2648
        sys.exit(1)
2205
2649
    except KeyboardInterrupt:
2210
2654
    # Must run before the D-Bus bus name gets deregistered
2211
2655
    cleanup()
2212
2656
 
2213
 
 
2214
2657
if __name__ == '__main__':
2215
2658
    main()