/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

* initramfs-tools-hook: Set DEVICE for network hooks.

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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
65
63
import cPickle as pickle
66
64
import multiprocessing
67
65
import types
68
 
import binascii
69
 
import tempfile
70
 
import itertools
71
66
 
72
67
import dbus
73
68
import dbus.service
78
73
import ctypes.util
79
74
import xml.dom.minidom
80
75
import inspect
81
 
import GnuPGInterface
82
76
 
83
77
try:
84
78
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
82
    except ImportError:
89
83
        SO_BINDTODEVICE = None
90
84
 
91
 
version = "1.5.3"
92
 
stored_state_file = "clients.pickle"
93
 
 
94
 
logger = logging.getLogger()
 
85
 
 
86
version = "1.4.1"
 
87
 
 
88
#logger = logging.getLogger('mandos')
 
89
logger = logging.Logger('mandos')
95
90
syslogger = (logging.handlers.SysLogHandler
96
91
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
92
              address = str("/dev/log")))
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
212
 
 
 
93
syslogger.setFormatter(logging.Formatter
 
94
                       ('Mandos [%(process)d]: %(levelname)s:'
 
95
                        ' %(message)s'))
 
96
logger.addHandler(syslogger)
 
97
 
 
98
console = logging.StreamHandler()
 
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
100
                                       ' %(levelname)s:'
 
101
                                       ' %(message)s'))
 
102
logger.addHandler(console)
213
103
 
214
104
class AvahiError(Exception):
215
105
    def __init__(self, value, *args, **kwargs):
245
135
    server: D-Bus Server
246
136
    bus: dbus.SystemBus()
247
137
    """
248
 
    
249
138
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
139
                 servicetype = None, port = None, TXT = None,
251
140
                 domain = "", host = "", max_renames = 32768,
264
153
        self.server = None
265
154
        self.bus = bus
266
155
        self.entry_group_state_changed_match = None
267
 
    
268
156
    def rename(self):
269
157
        """Derived from the Avahi example code"""
270
158
        if self.rename_count >= self.max_renames:
276
164
                            .GetAlternativeServiceName(self.name))
277
165
        logger.info("Changing Zeroconf service name to %r ...",
278
166
                    self.name)
 
167
        syslogger.setFormatter(logging.Formatter
 
168
                               ('Mandos (%s) [%%(process)d]:'
 
169
                                ' %%(levelname)s: %%(message)s'
 
170
                                % self.name))
279
171
        self.remove()
280
172
        try:
281
173
            self.add()
282
174
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
175
            logger.critical("DBusException: %s", error)
284
176
            self.cleanup()
285
177
            os._exit(1)
286
178
        self.rename_count += 1
287
 
    
288
179
    def remove(self):
289
180
        """Derived from the Avahi example code"""
290
181
        if self.entry_group_state_changed_match is not None:
292
183
            self.entry_group_state_changed_match = None
293
184
        if self.group is not None:
294
185
            self.group.Reset()
295
 
    
296
186
    def add(self):
297
187
        """Derived from the Avahi example code"""
298
188
        self.remove()
303
193
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
304
194
        self.entry_group_state_changed_match = (
305
195
            self.group.connect_to_signal(
306
 
                'StateChanged', self.entry_group_state_changed))
 
196
                'StateChanged', self .entry_group_state_changed))
307
197
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
308
198
                     self.name, self.type)
309
199
        self.group.AddService(
315
205
            dbus.UInt16(self.port),
316
206
            avahi.string_array_to_txt_array(self.TXT))
317
207
        self.group.Commit()
318
 
    
319
208
    def entry_group_state_changed(self, state, error):
320
209
        """Derived from the Avahi example code"""
321
210
        logger.debug("Avahi entry group state change: %i", state)
328
217
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
218
            logger.critical("Avahi: Error in group state changed %s",
330
219
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
220
            raise AvahiGroupError("State changed: %s"
 
221
                                  % unicode(error))
334
222
    def cleanup(self):
335
223
        """Derived from the Avahi example code"""
336
224
        if self.group is not None:
337
225
            try:
338
226
                self.group.Free()
339
227
            except (dbus.exceptions.UnknownMethodException,
340
 
                    dbus.exceptions.DBusException):
 
228
                    dbus.exceptions.DBusException) as e:
341
229
                pass
342
230
            self.group = None
343
231
        self.remove()
344
 
    
345
232
    def server_state_changed(self, state, error=None):
346
233
        """Derived from the Avahi example code"""
347
234
        logger.debug("Avahi server state change: %i", state)
366
253
                logger.debug("Unknown state: %r", state)
367
254
            else:
368
255
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
256
    def activate(self):
371
257
        """Derived from the Avahi example code"""
372
258
        if self.server is None:
379
265
                                 self.server_state_changed)
380
266
        self.server_state_changed(self.server.GetState())
381
267
 
382
 
class AvahiServiceToSyslog(AvahiService):
383
 
    def rename(self):
384
 
        """Add the new name to the syslog messages"""
385
 
        ret = AvahiService.rename(self)
386
 
        syslogger.setFormatter(logging.Formatter
387
 
                               ('Mandos ({0}) [%(process)d]:'
388
 
                                ' %(levelname)s: %(message)s'
389
 
                                .format(self.name)))
390
 
        return ret
391
268
 
392
 
def timedelta_to_milliseconds(td):
 
269
def _timedelta_to_milliseconds(td):
393
270
    "Convert a datetime.timedelta() to milliseconds"
394
271
    return ((td.days * 24 * 60 * 60 * 1000)
395
272
            + (td.seconds * 1000)
396
273
            + (td.microseconds // 1000))
397
 
 
 
274
        
398
275
class Client(object):
399
276
    """A representation of a client host served by this server.
400
277
    
401
278
    Attributes:
402
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
279
    _approved:   bool(); 'None' if not yet approved/disapproved
403
280
    approval_delay: datetime.timedelta(); Time to wait for approval
404
281
    approval_duration: datetime.timedelta(); Duration of one approval
405
282
    checker:    subprocess.Popen(); a running checker process used
412
289
                     instance %(name)s can be used in the command.
413
290
    checker_initiator_tag: a gobject event source tag, or None
414
291
    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
417
292
    current_checker_command: string; current running checker_command
 
293
    disable_hook:  If set, called by disable() as disable_hook(self)
418
294
    disable_initiator_tag: a gobject event source tag, or None
419
295
    enabled:    bool()
420
296
    fingerprint: string (40 or 32 hexadecimal digits); used to
423
299
    interval:   datetime.timedelta(); How often to start a new checker
424
300
    last_approval_request: datetime.datetime(); (UTC) or None
425
301
    last_checked_ok: datetime.datetime(); (UTC) or None
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
 
302
    last_enabled: datetime.datetime(); (UTC)
430
303
    name:       string; from the config file, used in log messages and
431
304
                        D-Bus identifiers
432
305
    secret:     bytestring; sent verbatim (over TLS) to client
433
306
    timeout:    datetime.timedelta(); How long from last_checked_ok
434
307
                                      until this client is disabled
435
 
    extended_timeout:   extra long timeout when secret has been sent
 
308
    extended_timeout:   extra long timeout when password has been sent
436
309
    runtime_expansions: Allowed attributes for runtime expansion.
437
310
    expires:    datetime.datetime(); time (UTC) when a client will be
438
311
                disabled, or None
442
315
                          "created", "enabled", "fingerprint",
443
316
                          "host", "interval", "last_checked_ok",
444
317
                          "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
 
                        }
455
318
    
456
319
    def timeout_milliseconds(self):
457
320
        "Return the 'timeout' attribute in milliseconds"
458
 
        return timedelta_to_milliseconds(self.timeout)
 
321
        return _timedelta_to_milliseconds(self.timeout)
459
322
    
460
323
    def extended_timeout_milliseconds(self):
461
324
        "Return the 'extended_timeout' attribute in milliseconds"
462
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
325
        return _timedelta_to_milliseconds(self.extended_timeout)
463
326
    
464
327
    def interval_milliseconds(self):
465
328
        "Return the 'interval' attribute in milliseconds"
466
 
        return timedelta_to_milliseconds(self.interval)
 
329
        return _timedelta_to_milliseconds(self.interval)
467
330
    
468
331
    def approval_delay_milliseconds(self):
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):
 
332
        return _timedelta_to_milliseconds(self.approval_delay)
 
333
    
 
334
    def __init__(self, name = None, disable_hook=None, config=None):
 
335
        """Note: the 'checker' key in 'config' sets the
 
336
        'checker_command' attribute and *not* the 'checker'
 
337
        attribute."""
519
338
        self.name = name
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
 
        
 
339
        if config is None:
 
340
            config = {}
534
341
        logger.debug("Creating client %r", self.name)
535
342
        # Uppercase and remove spaces from fingerprint for later
536
343
        # comparison purposes with return value from the fingerprint()
537
344
        # function
 
345
        self.fingerprint = (config["fingerprint"].upper()
 
346
                            .replace(" ", ""))
538
347
        logger.debug("  Fingerprint: %s", self.fingerprint)
539
 
        self.created = settings.get("created",
540
 
                                    datetime.datetime.utcnow())
541
 
        
542
 
        # attributes specific for this server instance
 
348
        if "secret" in config:
 
349
            self.secret = config["secret"].decode("base64")
 
350
        elif "secfile" in config:
 
351
            with open(os.path.expanduser(os.path.expandvars
 
352
                                         (config["secfile"])),
 
353
                      "rb") as secfile:
 
354
                self.secret = secfile.read()
 
355
        else:
 
356
            raise TypeError("No secret or secfile for client %s"
 
357
                            % self.name)
 
358
        self.host = config.get("host", "")
 
359
        self.created = datetime.datetime.utcnow()
 
360
        self.enabled = False
 
361
        self.last_approval_request = None
 
362
        self.last_enabled = None
 
363
        self.last_checked_ok = None
 
364
        self.timeout = string_to_delta(config["timeout"])
 
365
        self.extended_timeout = string_to_delta(config
 
366
                                                ["extended_timeout"])
 
367
        self.interval = string_to_delta(config["interval"])
 
368
        self.disable_hook = disable_hook
543
369
        self.checker = None
544
370
        self.checker_initiator_tag = None
545
371
        self.disable_initiator_tag = None
 
372
        self.expires = None
546
373
        self.checker_callback_tag = None
 
374
        self.checker_command = config["checker"]
547
375
        self.current_checker_command = None
548
 
        self.approved = None
 
376
        self.last_connect = None
 
377
        self._approved = None
 
378
        self.approved_by_default = config.get("approved_by_default",
 
379
                                              True)
549
380
        self.approvals_pending = 0
 
381
        self.approval_delay = string_to_delta(
 
382
            config["approval_delay"])
 
383
        self.approval_duration = string_to_delta(
 
384
            config["approval_duration"])
550
385
        self.changedstate = (multiprocessing_manager
551
386
                             .Condition(multiprocessing_manager
552
387
                                        .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)
564
388
    
565
 
    # Send notice to process children that client state has changed
566
389
    def send_changedstate(self):
567
 
        with self.changedstate:
568
 
            self.changedstate.notify_all()
 
390
        self.changedstate.acquire()
 
391
        self.changedstate.notify_all()
 
392
        self.changedstate.release()
569
393
    
570
394
    def enable(self):
571
395
        """Start this client's checker and timeout hooks"""
573
397
            # Already enabled
574
398
            return
575
399
        self.send_changedstate()
 
400
        # Schedule a new checker to be started an 'interval' from now,
 
401
        # and every interval from then on.
 
402
        self.checker_initiator_tag = (gobject.timeout_add
 
403
                                      (self.interval_milliseconds(),
 
404
                                       self.start_checker))
 
405
        # Schedule a disable() when 'timeout' has passed
576
406
        self.expires = datetime.datetime.utcnow() + self.timeout
 
407
        self.disable_initiator_tag = (gobject.timeout_add
 
408
                                   (self.timeout_milliseconds(),
 
409
                                    self.disable))
577
410
        self.enabled = True
578
411
        self.last_enabled = datetime.datetime.utcnow()
579
 
        self.init_checker()
 
412
        # Also start a new checker *right now*.
 
413
        self.start_checker()
580
414
    
581
415
    def disable(self, quiet=True):
582
416
        """Disable this client."""
594
428
            gobject.source_remove(self.checker_initiator_tag)
595
429
            self.checker_initiator_tag = None
596
430
        self.stop_checker()
 
431
        if self.disable_hook:
 
432
            self.disable_hook(self)
597
433
        self.enabled = False
598
434
        # Do not run this again if called by a gobject.timeout_add
599
435
        return False
600
436
    
601
437
    def __del__(self):
 
438
        self.disable_hook = None
602
439
        self.disable()
603
440
    
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
 
    
617
441
    def checker_callback(self, pid, condition, command):
618
442
        """The checker has completed, so take appropriate actions."""
619
443
        self.checker_callback_tag = None
620
444
        self.checker = None
621
445
        if os.WIFEXITED(condition):
622
 
            self.last_checker_status = os.WEXITSTATUS(condition)
623
 
            if self.last_checker_status == 0:
 
446
            exitstatus = os.WEXITSTATUS(condition)
 
447
            if exitstatus == 0:
624
448
                logger.info("Checker for %(name)s succeeded",
625
449
                            vars(self))
626
450
                self.checked_ok()
628
452
                logger.info("Checker for %(name)s failed",
629
453
                            vars(self))
630
454
        else:
631
 
            self.last_checker_status = -1
632
455
            logger.warning("Checker for %(name)s crashed?",
633
456
                           vars(self))
634
457
    
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."""
 
458
    def checked_ok(self, timeout=None):
 
459
        """Bump up the timeout for this client.
 
460
        
 
461
        This should only be called when the client has been seen,
 
462
        alive and well.
 
463
        """
643
464
        if timeout is None:
644
465
            timeout = self.timeout
 
466
        self.last_checked_ok = datetime.datetime.utcnow()
645
467
        if self.disable_initiator_tag is not None:
646
468
            gobject.source_remove(self.disable_initiator_tag)
647
469
        if getattr(self, "enabled", False):
648
470
            self.disable_initiator_tag = (gobject.timeout_add
649
 
                                          (timedelta_to_milliseconds
 
471
                                          (_timedelta_to_milliseconds
650
472
                                           (timeout), self.disable))
651
473
            self.expires = datetime.datetime.utcnow() + timeout
652
474
    
659
481
        If a checker already exists, leave it running and do
660
482
        nothing."""
661
483
        # The reason for not killing a running checker is that if we
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
 
484
        # did that, then if a checker (for some reason) started
 
485
        # running slowly and taking more than 'interval' time, the
 
486
        # client would inevitably timeout, since no checker would get
 
487
        # a chance to run to completion.  If we instead leave running
666
488
        # checkers alone, the checker would have to take more time
667
489
        # than 'timeout' for the client to be disabled, which is as it
668
490
        # should be.
698
520
                try:
699
521
                    command = self.checker_command % escaped_attrs
700
522
                except TypeError as error:
701
 
                    logger.error('Could not format string "%s"',
702
 
                                 self.checker_command, exc_info=error)
 
523
                    logger.error('Could not format string "%s":'
 
524
                                 ' %s', self.checker_command, error)
703
525
                    return True # Try again later
704
526
            self.current_checker_command = command
705
527
            try:
723
545
                    gobject.source_remove(self.checker_callback_tag)
724
546
                    self.checker_callback(pid, status, command)
725
547
            except OSError as error:
726
 
                logger.error("Failed to start subprocess",
727
 
                             exc_info=error)
 
548
                logger.error("Failed to start subprocess: %s",
 
549
                             error)
728
550
        # Re-run this periodically if run by gobject.timeout_add
729
551
        return True
730
552
    
737
559
            return
738
560
        logger.debug("Stopping checker for %(name)s", vars(self))
739
561
        try:
740
 
            self.checker.terminate()
 
562
            os.kill(self.checker.pid, signal.SIGTERM)
741
563
            #time.sleep(0.5)
742
564
            #if self.checker.poll() is None:
743
 
            #    self.checker.kill()
 
565
            #    os.kill(self.checker.pid, signal.SIGKILL)
744
566
        except OSError as error:
745
567
            if error.errno != errno.ESRCH: # No such process
746
568
                raise
763
585
    # "Set" method, so we fail early here:
764
586
    if byte_arrays and signature != "ay":
765
587
        raise ValueError("Byte arrays not supported for non-'ay'"
766
 
                         " signature {0!r}".format(signature))
 
588
                         " signature %r" % signature)
767
589
    def decorator(func):
768
590
        func._dbus_is_property = True
769
591
        func._dbus_interface = dbus_interface
777
599
    return decorator
778
600
 
779
601
 
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
 
 
817
602
class DBusPropertyException(dbus.exceptions.DBusException):
818
603
    """A base class for D-Bus property-related exceptions
819
604
    """
842
627
    """
843
628
    
844
629
    @staticmethod
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)
 
630
    def _is_dbus_property(obj):
 
631
        return getattr(obj, "_dbus_is_property", False)
853
632
    
854
 
    def _get_all_dbus_things(self, thing):
 
633
    def _get_all_dbus_properties(self):
855
634
        """Returns a generator of (name, attribute) pairs
856
635
        """
857
 
        return ((getattr(athing.__get__(self), "_dbus_name",
858
 
                         name),
859
 
                 athing.__get__(self))
 
636
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
860
637
                for cls in self.__class__.__mro__
861
 
                for name, athing in
862
 
                inspect.getmembers(cls,
863
 
                                   self._is_dbus_thing(thing)))
 
638
                for name, prop in
 
639
                inspect.getmembers(cls, self._is_dbus_property))
864
640
    
865
641
    def _get_dbus_property(self, interface_name, property_name):
866
642
        """Returns a bound method if one exists which is a D-Bus
868
644
        """
869
645
        for cls in  self.__class__.__mro__:
870
646
            for name, value in (inspect.getmembers
871
 
                                (cls,
872
 
                                 self._is_dbus_thing("property"))):
 
647
                                (cls, self._is_dbus_property)):
873
648
                if (value._dbus_name == property_name
874
649
                    and value._dbus_interface == interface_name):
875
650
                    return value.__get__(self)
904
679
            # signatures other than "ay".
905
680
            if prop._dbus_signature != "ay":
906
681
                raise ValueError
907
 
            value = dbus.ByteArray(b''.join(chr(byte)
908
 
                                            for byte in value))
 
682
            value = dbus.ByteArray(''.join(unichr(byte)
 
683
                                           for byte in value))
909
684
        prop(value)
910
685
    
911
686
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
916
691
        
917
692
        Note: Will not include properties with access="write".
918
693
        """
919
 
        properties = {}
920
 
        for name, prop in self._get_all_dbus_things("property"):
 
694
        all = {}
 
695
        for name, prop in self._get_all_dbus_properties():
921
696
            if (interface_name
922
697
                and interface_name != prop._dbus_interface):
923
698
                # Interface non-empty but did not match
927
702
                continue
928
703
            value = prop()
929
704
            if not hasattr(value, "variant_level"):
930
 
                properties[name] = value
 
705
                all[name] = value
931
706
                continue
932
 
            properties[name] = type(value)(value, variant_level=
933
 
                                           value.variant_level+1)
934
 
        return dbus.Dictionary(properties, signature="sv")
 
707
            all[name] = type(value)(value, variant_level=
 
708
                                    value.variant_level+1)
 
709
        return dbus.Dictionary(all, signature="sv")
935
710
    
936
711
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
937
712
                         out_signature="s",
938
713
                         path_keyword='object_path',
939
714
                         connection_keyword='connection')
940
715
    def Introspect(self, object_path, connection):
941
 
        """Overloading of standard D-Bus method.
942
 
        
943
 
        Inserts property tags and interface annotation tags.
 
716
        """Standard D-Bus method, overloaded to insert property tags.
944
717
        """
945
718
        xmlstring = dbus.service.Object.Introspect(self, object_path,
946
719
                                                   connection)
953
726
                e.setAttribute("access", prop._dbus_access)
954
727
                return e
955
728
            for if_tag in document.getElementsByTagName("interface"):
956
 
                # Add property tags
957
729
                for tag in (make_tag(document, name, prop)
958
730
                            for name, prop
959
 
                            in self._get_all_dbus_things("property")
 
731
                            in self._get_all_dbus_properties()
960
732
                            if prop._dbus_interface
961
733
                            == if_tag.getAttribute("name")):
962
734
                    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)
994
735
                # Add the names to the return values for the
995
736
                # "org.freedesktop.DBus.Properties" methods
996
737
                if (if_tag.getAttribute("name")
1011
752
        except (AttributeError, xml.dom.DOMException,
1012
753
                xml.parsers.expat.ExpatError) as error:
1013
754
            logger.error("Failed to override Introspection method",
1014
 
                         exc_info=error)
 
755
                         error)
1015
756
        return xmlstring
1016
757
 
1017
758
 
1022
763
    return dbus.String(dt.isoformat(),
1023
764
                       variant_level=variant_level)
1024
765
 
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).
 
766
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
767
                                  .__metaclass__):
 
768
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
769
    will add additional D-Bus attributes matching a certain pattern.
1048
770
    """
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):
 
771
    def __new__(mcs, name, bases, attr):
 
772
        # Go through all the base classes which could have D-Bus
 
773
        # methods, signals, or properties in them
 
774
        for base in (b for b in bases
 
775
                     if issubclass(b, dbus.service.Object)):
 
776
            # Go though all attributes of the base class
 
777
            for attrname, attribute in inspect.getmembers(base):
1056
778
                # Ignore non-D-Bus attributes, and D-Bus attributes
1057
779
                # with the wrong interface name
1058
780
                if (not hasattr(attribute, "_dbus_interface")
1059
781
                    or not attribute._dbus_interface
1060
 
                    .startswith(orig_interface_name)):
 
782
                    .startswith("se.recompile.Mandos")):
1061
783
                    continue
1062
784
                # Create an alternate D-Bus interface name based on
1063
785
                # the current name
1064
786
                alt_interface = (attribute._dbus_interface
1065
 
                                 .replace(orig_interface_name,
1066
 
                                          alt_interface_name))
1067
 
                interface_names.add(alt_interface)
 
787
                                 .replace("se.recompile.Mandos",
 
788
                                          "se.bsnet.fukt.Mandos"))
1068
789
                # Is this a D-Bus signal?
1069
790
                if getattr(attribute, "_dbus_is_signal", False):
1070
791
                    # Extract the original non-method function by
1085
806
                                nonmethod_func.func_name,
1086
807
                                nonmethod_func.func_defaults,
1087
808
                                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
1094
809
                    # Define a creator of a function to call both the
1095
 
                    # original and alternate functions, so both the
1096
 
                    # original and alternate signals gets sent when
1097
 
                    # the function is called
 
810
                    # old and new functions, so both the old and new
 
811
                    # signals gets sent when the function is called
1098
812
                    def fixscope(func1, func2):
1099
813
                        """This function is a scope container to pass
1100
814
                        func1 and func2 to the "call_both" function
1107
821
                        return call_both
1108
822
                    # Create the "call_both" function and add it to
1109
823
                    # the class
1110
 
                    attr[attrname] = fixscope(attribute, new_function)
 
824
                    attr[attrname] = fixscope(attribute,
 
825
                                              new_function)
1111
826
                # Is this a D-Bus method?
1112
827
                elif getattr(attribute, "_dbus_is_method", False):
1113
828
                    # Create a new, but exactly alike, function
1124
839
                                        attribute.func_name,
1125
840
                                        attribute.func_defaults,
1126
841
                                        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
1133
842
                # Is this a D-Bus property?
1134
843
                elif getattr(attribute, "_dbus_is_property", False):
1135
844
                    # Create a new, but exactly alike, function
1149
858
                                        attribute.func_name,
1150
859
                                        attribute.func_defaults,
1151
860
                                        attribute.func_closure)))
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"})
 
861
        return type.__new__(mcs, name, bases, attr)
 
862
 
1197
863
class ClientDBus(Client, DBusObjectWithProperties):
1198
864
    """A Client class using D-Bus
1199
865
    
1208
874
    # dbus.service.Object doesn't use super(), so we can't either.
1209
875
    
1210
876
    def __init__(self, bus = None, *args, **kwargs):
 
877
        self._approvals_pending = 0
1211
878
        self.bus = bus
1212
879
        Client.__init__(self, *args, **kwargs)
1213
880
        # Only now, when this client is initialized, can it show up on
1219
886
                                 ("/clients/" + client_object_name))
1220
887
        DBusObjectWithProperties.__init__(self, self.bus,
1221
888
                                          self.dbus_object_path)
1222
 
    
 
889
        
1223
890
    def notifychangeproperty(transform_func,
1224
891
                             dbus_name, type_func=lambda x: x,
1225
892
                             variant_level=1):
1226
893
        """ Modify a variable so that it's a property which announces
1227
894
        its changes to DBus.
1228
 
        
 
895
 
1229
896
        transform_fun: Function that takes a value and a variant_level
1230
897
                       and transforms it to a D-Bus type.
1231
898
        dbus_name: D-Bus name of the variable
1248
915
        
1249
916
        return property(lambda self: getattr(self, attrname), setter)
1250
917
    
 
918
    
1251
919
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1252
920
    approvals_pending = notifychangeproperty(dbus.Boolean,
1253
921
                                             "ApprovalPending",
1260
928
                                       checker is not None)
1261
929
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1262
930
                                           "LastCheckedOK")
1263
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1264
 
                                               "LastCheckerStatus")
1265
931
    last_approval_request = notifychangeproperty(
1266
932
        datetime_to_dbus, "LastApprovalRequest")
1267
933
    approved_by_default = notifychangeproperty(dbus.Boolean,
1268
934
                                               "ApprovedByDefault")
1269
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
935
    approval_delay = notifychangeproperty(dbus.UInt16,
1270
936
                                          "ApprovalDelay",
1271
937
                                          type_func =
1272
 
                                          timedelta_to_milliseconds)
 
938
                                          _timedelta_to_milliseconds)
1273
939
    approval_duration = notifychangeproperty(
1274
 
        dbus.UInt64, "ApprovalDuration",
1275
 
        type_func = timedelta_to_milliseconds)
 
940
        dbus.UInt16, "ApprovalDuration",
 
941
        type_func = _timedelta_to_milliseconds)
1276
942
    host = notifychangeproperty(dbus.String, "Host")
1277
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
943
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1278
944
                                   type_func =
1279
 
                                   timedelta_to_milliseconds)
 
945
                                   _timedelta_to_milliseconds)
1280
946
    extended_timeout = notifychangeproperty(
1281
 
        dbus.UInt64, "ExtendedTimeout",
1282
 
        type_func = timedelta_to_milliseconds)
1283
 
    interval = notifychangeproperty(dbus.UInt64,
 
947
        dbus.UInt16, "ExtendedTimeout",
 
948
        type_func = _timedelta_to_milliseconds)
 
949
    interval = notifychangeproperty(dbus.UInt16,
1284
950
                                    "Interval",
1285
951
                                    type_func =
1286
 
                                    timedelta_to_milliseconds)
 
952
                                    _timedelta_to_milliseconds)
1287
953
    checker_command = notifychangeproperty(dbus.String, "Checker")
1288
954
    
1289
955
    del notifychangeproperty
1331
997
        return r
1332
998
    
1333
999
    def _reset_approved(self):
1334
 
        self.approved = None
 
1000
        self._approved = None
1335
1001
        return False
1336
1002
    
1337
1003
    def approve(self, value=True):
1338
1004
        self.send_changedstate()
1339
 
        self.approved = value
1340
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1005
        self._approved = value
 
1006
        gobject.timeout_add(_timedelta_to_milliseconds
1341
1007
                            (self.approval_duration),
1342
1008
                            self._reset_approved)
1343
1009
    
 
1010
    
1344
1011
    ## D-Bus methods, signals & properties
1345
1012
    _interface = "se.recompile.Mandos.Client"
1346
1013
    
1347
 
    ## Interfaces
1348
 
    
1349
 
    @dbus_interface_annotations(_interface)
1350
 
    def _foo(self):
1351
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1352
 
                     "false"}
1353
 
    
1354
1014
    ## Signals
1355
1015
    
1356
1016
    # CheckerCompleted - signal
1455
1115
                           access="readwrite")
1456
1116
    def ApprovalDuration_dbus_property(self, value=None):
1457
1117
        if value is None:       # get
1458
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1118
            return dbus.UInt64(_timedelta_to_milliseconds(
1459
1119
                    self.approval_duration))
1460
1120
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1461
1121
    
1475
1135
    def Host_dbus_property(self, value=None):
1476
1136
        if value is None:       # get
1477
1137
            return dbus.String(self.host)
1478
 
        self.host = unicode(value)
 
1138
        self.host = value
1479
1139
    
1480
1140
    # Created - property
1481
1141
    @dbus_service_property(_interface, signature="s", access="read")
1482
1142
    def Created_dbus_property(self):
1483
 
        return datetime_to_dbus(self.created)
 
1143
        return dbus.String(datetime_to_dbus(self.created))
1484
1144
    
1485
1145
    # LastEnabled - property
1486
1146
    @dbus_service_property(_interface, signature="s", access="read")
1507
1167
            return
1508
1168
        return datetime_to_dbus(self.last_checked_ok)
1509
1169
    
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
 
    
1516
1170
    # Expires - property
1517
1171
    @dbus_service_property(_interface, signature="s", access="read")
1518
1172
    def Expires_dbus_property(self):
1530
1184
        if value is None:       # get
1531
1185
            return dbus.UInt64(self.timeout_milliseconds())
1532
1186
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1187
        if getattr(self, "disable_initiator_tag", None) is None:
 
1188
            return
1533
1189
        # Reschedule timeout
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))
 
1190
        gobject.source_remove(self.disable_initiator_tag)
 
1191
        self.disable_initiator_tag = None
 
1192
        self.expires = None
 
1193
        time_to_die = _timedelta_to_milliseconds((self
 
1194
                                                  .last_checked_ok
 
1195
                                                  + self.timeout)
 
1196
                                                 - datetime.datetime
 
1197
                                                 .utcnow())
 
1198
        if time_to_die <= 0:
 
1199
            # The timeout has passed
 
1200
            self.disable()
 
1201
        else:
 
1202
            self.expires = (datetime.datetime.utcnow()
 
1203
                            + datetime.timedelta(milliseconds =
 
1204
                                                 time_to_die))
 
1205
            self.disable_initiator_tag = (gobject.timeout_add
 
1206
                                          (time_to_die, self.disable))
1552
1207
    
1553
1208
    # ExtendedTimeout - property
1554
1209
    @dbus_service_property(_interface, signature="t",
1567
1222
        self.interval = datetime.timedelta(0, 0, 0, value)
1568
1223
        if getattr(self, "checker_initiator_tag", None) is None:
1569
1224
            return
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
 
1225
        # Reschedule checker run
 
1226
        gobject.source_remove(self.checker_initiator_tag)
 
1227
        self.checker_initiator_tag = (gobject.timeout_add
 
1228
                                      (value, self.start_checker))
 
1229
        self.start_checker()    # Start one now, too
1576
1230
    
1577
1231
    # Checker - property
1578
1232
    @dbus_service_property(_interface, signature="s",
1580
1234
    def Checker_dbus_property(self, value=None):
1581
1235
        if value is None:       # get
1582
1236
            return dbus.String(self.checker_command)
1583
 
        self.checker_command = unicode(value)
 
1237
        self.checker_command = value
1584
1238
    
1585
1239
    # CheckerRunning - property
1586
1240
    @dbus_service_property(_interface, signature="b",
1615
1269
            raise KeyError()
1616
1270
    
1617
1271
    def __getattribute__(self, name):
1618
 
        if name == '_pipe':
 
1272
        if(name == '_pipe'):
1619
1273
            return super(ProxyClient, self).__getattribute__(name)
1620
1274
        self._pipe.send(('getattr', name))
1621
1275
        data = self._pipe.recv()
1628
1282
            return func
1629
1283
    
1630
1284
    def __setattr__(self, name, value):
1631
 
        if name == '_pipe':
 
1285
        if(name == '_pipe'):
1632
1286
            return super(ProxyClient, self).__setattr__(name, value)
1633
1287
        self._pipe.send(('setattr', name, value))
1634
1288
 
 
1289
class ClientDBusTransitional(ClientDBus):
 
1290
    __metaclass__ = AlternateDBusNamesMetaclass
1635
1291
 
1636
1292
class ClientHandler(socketserver.BaseRequestHandler, object):
1637
1293
    """A class to handle client connections.
1720
1376
                            client.Rejected("Disabled")
1721
1377
                        return
1722
1378
                    
1723
 
                    if client.approved or not client.approval_delay:
 
1379
                    if client._approved or not client.approval_delay:
1724
1380
                        #We are approved or approval is disabled
1725
1381
                        break
1726
 
                    elif client.approved is None:
 
1382
                    elif client._approved is None:
1727
1383
                        logger.info("Client %s needs approval",
1728
1384
                                    client.name)
1729
1385
                        if self.server.use_dbus:
1743
1399
                    time = datetime.datetime.now()
1744
1400
                    client.changedstate.acquire()
1745
1401
                    (client.changedstate.wait
1746
 
                     (float(client.timedelta_to_milliseconds(delay)
 
1402
                     (float(client._timedelta_to_milliseconds(delay)
1747
1403
                            / 1000)))
1748
1404
                    client.changedstate.release()
1749
1405
                    time2 = datetime.datetime.now()
1766
1422
                    try:
1767
1423
                        sent = session.send(client.secret[sent_size:])
1768
1424
                    except gnutls.errors.GNUTLSError as error:
1769
 
                        logger.warning("gnutls send failed",
1770
 
                                       exc_info=error)
 
1425
                        logger.warning("gnutls send failed")
1771
1426
                        return
1772
1427
                    logger.debug("Sent: %d, remaining: %d",
1773
1428
                                 sent, len(client.secret)
1776
1431
                
1777
1432
                logger.info("Sending secret to %s", client.name)
1778
1433
                # bump the timeout using extended_timeout
1779
 
                client.bump_timeout(client.extended_timeout)
 
1434
                client.checked_ok(client.extended_timeout)
1780
1435
                if self.server.use_dbus:
1781
1436
                    # Emit D-Bus signal
1782
1437
                    client.GotSecret()
1787
1442
                try:
1788
1443
                    session.bye()
1789
1444
                except gnutls.errors.GNUTLSError as error:
1790
 
                    logger.warning("GnuTLS bye failed",
1791
 
                                   exc_info=error)
 
1445
                    logger.warning("GnuTLS bye failed")
1792
1446
    
1793
1447
    @staticmethod
1794
1448
    def peer_certificate(session):
1850
1504
        # Convert the buffer to a Python bytestring
1851
1505
        fpr = ctypes.string_at(buf, buf_len.value)
1852
1506
        # Convert the bytestring to hexadecimal notation
1853
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1507
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1854
1508
        return hex_fpr
1855
1509
 
1856
1510
 
1859
1513
    def sub_process_main(self, request, address):
1860
1514
        try:
1861
1515
            self.finish_request(request, address)
1862
 
        except Exception:
 
1516
        except:
1863
1517
            self.handle_error(request, address)
1864
1518
        self.close_request(request)
1865
1519
    
1866
1520
    def process_request(self, request, address):
1867
1521
        """Start a new process to process the request."""
1868
1522
        proc = multiprocessing.Process(target = self.sub_process_main,
1869
 
                                       args = (request, address))
 
1523
                                       args = (request,
 
1524
                                               address))
1870
1525
        proc.start()
1871
1526
        return proc
1872
1527
 
1969
1624
        self.enabled = False
1970
1625
        self.clients = clients
1971
1626
        if self.clients is None:
1972
 
            self.clients = {}
 
1627
            self.clients = set()
1973
1628
        self.use_dbus = use_dbus
1974
1629
        self.gnutls_priority = gnutls_priority
1975
1630
        IPv6_TCPServer.__init__(self, server_address,
1994
1649
    
1995
1650
    def handle_ipc(self, source, condition, parent_pipe=None,
1996
1651
                   proc = None, client_object=None):
 
1652
        condition_names = {
 
1653
            gobject.IO_IN: "IN",   # There is data to read.
 
1654
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1655
                                    # blocking).
 
1656
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1657
            gobject.IO_ERR: "ERR", # Error condition.
 
1658
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1659
                                    # broken, usually for pipes and
 
1660
                                    # sockets).
 
1661
            }
 
1662
        conditions_string = ' | '.join(name
 
1663
                                       for cond, name in
 
1664
                                       condition_names.iteritems()
 
1665
                                       if cond & condition)
1997
1666
        # error, or the other end of multiprocessing.Pipe has closed
1998
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1667
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1999
1668
            # Wait for other process to exit
2000
1669
            proc.join()
2001
1670
            return False
2008
1677
            fpr = request[1]
2009
1678
            address = request[2]
2010
1679
            
2011
 
            for c in self.clients.itervalues():
 
1680
            for c in self.clients:
2012
1681
                if c.fingerprint == fpr:
2013
1682
                    client = c
2014
1683
                    break
2091
1760
            elif suffix == "w":
2092
1761
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2093
1762
            else:
2094
 
                raise ValueError("Unknown suffix {0!r}"
2095
 
                                 .format(suffix))
 
1763
                raise ValueError("Unknown suffix %r" % suffix)
2096
1764
        except (ValueError, IndexError) as e:
2097
1765
            raise ValueError(*(e.args))
2098
1766
        timevalue += delta
2099
1767
    return timevalue
2100
1768
 
2101
1769
 
 
1770
def if_nametoindex(interface):
 
1771
    """Call the C function if_nametoindex(), or equivalent
 
1772
    
 
1773
    Note: This function cannot accept a unicode string."""
 
1774
    global if_nametoindex
 
1775
    try:
 
1776
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1777
                          (ctypes.util.find_library("c"))
 
1778
                          .if_nametoindex)
 
1779
    except (OSError, AttributeError):
 
1780
        logger.warning("Doing if_nametoindex the hard way")
 
1781
        def if_nametoindex(interface):
 
1782
            "Get an interface index the hard way, i.e. using fcntl()"
 
1783
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1784
            with contextlib.closing(socket.socket()) as s:
 
1785
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1786
                                    struct.pack(str("16s16x"),
 
1787
                                                interface))
 
1788
            interface_index = struct.unpack(str("I"),
 
1789
                                            ifreq[16:20])[0]
 
1790
            return interface_index
 
1791
    return if_nametoindex(interface)
 
1792
 
 
1793
 
2102
1794
def daemon(nochdir = False, noclose = False):
2103
1795
    """See daemon(3).  Standard BSD Unix function.
2104
1796
    
2112
1804
        sys.exit()
2113
1805
    if not noclose:
2114
1806
        # Close all standard open file descriptors
2115
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1807
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2116
1808
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2117
1809
            raise OSError(errno.ENODEV,
2118
 
                          "{0} not a character device"
2119
 
                          .format(os.devnull))
 
1810
                          "%s not a character device"
 
1811
                          % os.path.devnull)
2120
1812
        os.dup2(null, sys.stdin.fileno())
2121
1813
        os.dup2(null, sys.stdout.fileno())
2122
1814
        os.dup2(null, sys.stderr.fileno())
2131
1823
    
2132
1824
    parser = argparse.ArgumentParser()
2133
1825
    parser.add_argument("-v", "--version", action="version",
2134
 
                        version = "%(prog)s {0}".format(version),
 
1826
                        version = "%%(prog)s %s" % version,
2135
1827
                        help="show version number and exit")
2136
1828
    parser.add_argument("-i", "--interface", metavar="IF",
2137
1829
                        help="Bind to interface IF")
2159
1851
                        " system bus interface")
2160
1852
    parser.add_argument("--no-ipv6", action="store_false",
2161
1853
                        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
 
    
2168
1854
    options = parser.parse_args()
2169
1855
    
2170
1856
    if options.check:
2183
1869
                        "use_dbus": "True",
2184
1870
                        "use_ipv6": "True",
2185
1871
                        "debuglevel": "",
2186
 
                        "restore": "True",
2187
 
                        "statedir": "/var/lib/mandos"
2188
1872
                        }
2189
1873
    
2190
1874
    # Parse config file for server-global settings
2207
1891
    # options, if set.
2208
1892
    for option in ("interface", "address", "port", "debug",
2209
1893
                   "priority", "servicename", "configdir",
2210
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2211
 
                   "statedir"):
 
1894
                   "use_dbus", "use_ipv6", "debuglevel"):
2212
1895
        value = getattr(options, option)
2213
1896
        if value is not None:
2214
1897
            server_settings[option] = value
2226
1909
    debuglevel = server_settings["debuglevel"]
2227
1910
    use_dbus = server_settings["use_dbus"]
2228
1911
    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)
2240
1912
    
2241
1913
    if server_settings["servicename"] != "Mandos":
2242
1914
        syslogger.setFormatter(logging.Formatter
2243
 
                               ('Mandos ({0}) [%(process)d]:'
2244
 
                                ' %(levelname)s: %(message)s'
2245
 
                                .format(server_settings
2246
 
                                        ["servicename"])))
 
1915
                               ('Mandos (%s) [%%(process)d]:'
 
1916
                                ' %%(levelname)s: %%(message)s'
 
1917
                                % server_settings["servicename"]))
2247
1918
    
2248
1919
    # Parse config file with clients
2249
 
    client_config = configparser.SafeConfigParser(Client
2250
 
                                                  .client_defaults)
 
1920
    client_defaults = { "timeout": "5m",
 
1921
                        "extended_timeout": "15m",
 
1922
                        "interval": "2m",
 
1923
                        "checker": "fping -q -- %%(host)s",
 
1924
                        "host": "",
 
1925
                        "approval_delay": "0s",
 
1926
                        "approval_duration": "1s",
 
1927
                        }
 
1928
    client_config = configparser.SafeConfigParser(client_defaults)
2251
1929
    client_config.read(os.path.join(server_settings["configdir"],
2252
1930
                                    "clients.conf"))
2253
1931
    
2267
1945
        pidfilename = "/var/run/mandos.pid"
2268
1946
        try:
2269
1947
            pidfile = open(pidfilename, "w")
2270
 
        except IOError as e:
2271
 
            logger.error("Could not open file %r", pidfilename,
2272
 
                         exc_info=e)
 
1948
        except IOError:
 
1949
            logger.error("Could not open file %r", pidfilename)
2273
1950
    
2274
 
    for name in ("_mandos", "mandos", "nobody"):
 
1951
    try:
 
1952
        uid = pwd.getpwnam("_mandos").pw_uid
 
1953
        gid = pwd.getpwnam("_mandos").pw_gid
 
1954
    except KeyError:
2275
1955
        try:
2276
 
            uid = pwd.getpwnam(name).pw_uid
2277
 
            gid = pwd.getpwnam(name).pw_gid
2278
 
            break
 
1956
            uid = pwd.getpwnam("mandos").pw_uid
 
1957
            gid = pwd.getpwnam("mandos").pw_gid
2279
1958
        except KeyError:
2280
 
            continue
2281
 
    else:
2282
 
        uid = 65534
2283
 
        gid = 65534
 
1959
            try:
 
1960
                uid = pwd.getpwnam("nobody").pw_uid
 
1961
                gid = pwd.getpwnam("nobody").pw_gid
 
1962
            except KeyError:
 
1963
                uid = 65534
 
1964
                gid = 65534
2284
1965
    try:
2285
1966
        os.setgid(gid)
2286
1967
        os.setuid(uid)
2288
1969
        if error[0] != errno.EPERM:
2289
1970
            raise error
2290
1971
    
 
1972
    if not debug and not debuglevel:
 
1973
        syslogger.setLevel(logging.WARNING)
 
1974
        console.setLevel(logging.WARNING)
 
1975
    if debuglevel:
 
1976
        level = getattr(logging, debuglevel.upper())
 
1977
        syslogger.setLevel(level)
 
1978
        console.setLevel(level)
 
1979
    
2291
1980
    if debug:
2292
1981
        # Enable all possible GnuTLS debugging
2293
1982
        
2303
1992
         .gnutls_global_set_log_function(debug_gnutls))
2304
1993
        
2305
1994
        # Redirect stdin so all checkers get /dev/null
2306
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1995
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2307
1996
        os.dup2(null, sys.stdin.fileno())
2308
1997
        if null > 2:
2309
1998
            os.close(null)
 
1999
    else:
 
2000
        # No console logging
 
2001
        logger.removeHandler(console)
2310
2002
    
2311
2003
    # Need to fork before connecting to D-Bus
2312
2004
    if not debug:
2313
2005
        # Close all input and output, do double fork, etc.
2314
2006
        daemon()
2315
2007
    
2316
 
    gobject.threads_init()
2317
 
    
2318
2008
    global main_loop
2319
2009
    # From the Avahi example code
2320
 
    DBusGMainLoop(set_as_default=True)
 
2010
    DBusGMainLoop(set_as_default=True )
2321
2011
    main_loop = gobject.MainLoop()
2322
2012
    bus = dbus.SystemBus()
2323
2013
    # End of Avahi example code
2329
2019
                            ("se.bsnet.fukt.Mandos", bus,
2330
2020
                             do_not_queue=True))
2331
2021
        except dbus.exceptions.NameExistsException as e:
2332
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2022
            logger.error(unicode(e) + ", disabling D-Bus")
2333
2023
            use_dbus = False
2334
2024
            server_settings["use_dbus"] = False
2335
2025
            tcp_server.use_dbus = False
2336
2026
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2337
 
    service = AvahiServiceToSyslog(name =
2338
 
                                   server_settings["servicename"],
2339
 
                                   servicetype = "_mandos._tcp",
2340
 
                                   protocol = protocol, bus = bus)
 
2027
    service = AvahiService(name = server_settings["servicename"],
 
2028
                           servicetype = "_mandos._tcp",
 
2029
                           protocol = protocol, bus = bus)
2341
2030
    if server_settings["interface"]:
2342
2031
        service.interface = (if_nametoindex
2343
2032
                             (str(server_settings["interface"])))
2347
2036
    
2348
2037
    client_class = Client
2349
2038
    if use_dbus:
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))
 
2039
        client_class = functools.partial(ClientDBusTransitional,
 
2040
                                         bus = bus)
 
2041
    def client_config_items(config, section):
 
2042
        special_settings = {
 
2043
            "approved_by_default":
 
2044
                lambda: config.getboolean(section,
 
2045
                                          "approved_by_default"),
 
2046
            }
 
2047
        for name, value in config.items(section):
2421
2048
            try:
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
 
    
 
2049
                yield (name, special_settings[name]())
 
2050
            except KeyError:
 
2051
                yield (name, value)
 
2052
    
 
2053
    tcp_server.clients.update(set(
 
2054
            client_class(name = section,
 
2055
                         config= dict(client_config_items(
 
2056
                        client_config, section)))
 
2057
            for section in client_config.sections()))
2446
2058
    if not tcp_server.clients:
2447
2059
        logger.warning("No clients defined")
2448
 
    
 
2060
        
2449
2061
    if not debug:
2450
2062
        try:
2451
2063
            with pidfile:
2459
2071
            # "pidfile" was never created
2460
2072
            pass
2461
2073
        del pidfilename
 
2074
        
2462
2075
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2463
2076
    
2464
2077
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2465
2078
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2466
2079
    
2467
2080
    if use_dbus:
2468
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2469
 
                                        "se.bsnet.fukt.Mandos"})
2470
 
        class MandosDBusService(DBusObjectWithProperties):
 
2081
        class MandosDBusService(dbus.service.Object):
2471
2082
            """A D-Bus proxy object"""
2472
2083
            def __init__(self):
2473
2084
                dbus.service.Object.__init__(self, bus, "/")
2474
2085
            _interface = "se.recompile.Mandos"
2475
2086
            
2476
 
            @dbus_interface_annotations(_interface)
2477
 
            def _foo(self):
2478
 
                return { "org.freedesktop.DBus.Property"
2479
 
                         ".EmitsChangedSignal":
2480
 
                             "false"}
2481
 
            
2482
2087
            @dbus.service.signal(_interface, signature="o")
2483
2088
            def ClientAdded(self, objpath):
2484
2089
                "D-Bus signal"
2498
2103
            def GetAllClients(self):
2499
2104
                "D-Bus method"
2500
2105
                return dbus.Array(c.dbus_object_path
2501
 
                                  for c in
2502
 
                                  tcp_server.clients.itervalues())
 
2106
                                  for c in tcp_server.clients)
2503
2107
            
2504
2108
            @dbus.service.method(_interface,
2505
2109
                                 out_signature="a{oa{sv}}")
2507
2111
                "D-Bus method"
2508
2112
                return dbus.Dictionary(
2509
2113
                    ((c.dbus_object_path, c.GetAll(""))
2510
 
                     for c in tcp_server.clients.itervalues()),
 
2114
                     for c in tcp_server.clients),
2511
2115
                    signature="oa{sv}")
2512
2116
            
2513
2117
            @dbus.service.method(_interface, in_signature="o")
2514
2118
            def RemoveClient(self, object_path):
2515
2119
                "D-Bus method"
2516
 
                for c in tcp_server.clients.itervalues():
 
2120
                for c in tcp_server.clients:
2517
2121
                    if c.dbus_object_path == object_path:
2518
 
                        del tcp_server.clients[c.name]
 
2122
                        tcp_server.clients.remove(c)
2519
2123
                        c.remove_from_connection()
2520
2124
                        # Don't signal anything except ClientRemoved
2521
2125
                        c.disable(quiet=True)
2526
2130
            
2527
2131
            del _interface
2528
2132
        
2529
 
        mandos_dbus_service = MandosDBusService()
 
2133
        class MandosDBusServiceTransitional(MandosDBusService):
 
2134
            __metaclass__ = AlternateDBusNamesMetaclass
 
2135
        mandos_dbus_service = MandosDBusServiceTransitional()
2530
2136
    
2531
2137
    def cleanup():
2532
2138
        "Cleanup function; run on exit"
2533
2139
        service.cleanup()
2534
2140
        
2535
2141
        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
2590
2142
        while tcp_server.clients:
2591
 
            name, client = tcp_server.clients.popitem()
 
2143
            client = tcp_server.clients.pop()
2592
2144
            if use_dbus:
2593
2145
                client.remove_from_connection()
 
2146
            client.disable_hook = None
2594
2147
            # Don't signal anything except ClientRemoved
2595
2148
            client.disable(quiet=True)
2596
2149
            if use_dbus:
2598
2151
                mandos_dbus_service.ClientRemoved(client
2599
2152
                                                  .dbus_object_path,
2600
2153
                                                  client.name)
2601
 
        client_settings.clear()
2602
2154
    
2603
2155
    atexit.register(cleanup)
2604
2156
    
2605
 
    for client in tcp_server.clients.itervalues():
 
2157
    for client in tcp_server.clients:
2606
2158
        if use_dbus:
2607
2159
            # Emit D-Bus signal
2608
2160
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2609
 
        # Need to initiate checking of clients
2610
 
        if client.enabled:
2611
 
            client.init_checker()
 
2161
        client.enable()
2612
2162
    
2613
2163
    tcp_server.enable()
2614
2164
    tcp_server.server_activate()
2617
2167
    service.port = tcp_server.socket.getsockname()[1]
2618
2168
    if use_ipv6:
2619
2169
        logger.info("Now listening on address %r, port %d,"
2620
 
                    " flowinfo %d, scope_id %d",
2621
 
                    *tcp_server.socket.getsockname())
 
2170
                    " flowinfo %d, scope_id %d"
 
2171
                    % tcp_server.socket.getsockname())
2622
2172
    else:                       # IPv4
2623
 
        logger.info("Now listening on address %r, port %d",
2624
 
                    *tcp_server.socket.getsockname())
 
2173
        logger.info("Now listening on address %r, port %d"
 
2174
                    % tcp_server.socket.getsockname())
2625
2175
    
2626
2176
    #service.interface = tcp_server.socket.getsockname()[3]
2627
2177
    
2630
2180
        try:
2631
2181
            service.activate()
2632
2182
        except dbus.exceptions.DBusException as error:
2633
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2183
            logger.critical("DBusException: %s", error)
2634
2184
            cleanup()
2635
2185
            sys.exit(1)
2636
2186
        # End of Avahi example code
2643
2193
        logger.debug("Starting main loop")
2644
2194
        main_loop.run()
2645
2195
    except AvahiError as error:
2646
 
        logger.critical("Avahi Error", exc_info=error)
 
2196
        logger.critical("AvahiError: %s", error)
2647
2197
        cleanup()
2648
2198
        sys.exit(1)
2649
2199
    except KeyboardInterrupt:
2654
2204
    # Must run before the D-Bus bus name gets deregistered
2655
2205
    cleanup()
2656
2206
 
 
2207
 
2657
2208
if __name__ == '__main__':
2658
2209
    main()