/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

* network-hooks.d/bridge: Bug fix - use the found brctl.

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"""
572
396
        if getattr(self, "enabled", False):
573
397
            # Already enabled
574
398
            return
575
 
        self.expires = datetime.datetime.utcnow() + self.timeout
576
 
        self.enabled = True
577
 
        self.last_enabled = datetime.datetime.utcnow()
578
 
        self.init_checker()
579
399
        self.send_changedstate()
580
 
    
581
 
    def disable(self, quiet=True):
582
 
        """Disable this client."""
583
 
        if not getattr(self, "enabled", False):
584
 
            return False
585
 
        if not quiet:
586
 
            logger.info("Disabling client %s", self.name)
587
 
        if getattr(self, "disable_initiator_tag", None) is not None:
588
 
            gobject.source_remove(self.disable_initiator_tag)
589
 
            self.disable_initiator_tag = None
590
 
        self.expires = None
591
 
        if getattr(self, "checker_initiator_tag", None) is not None:
592
 
            gobject.source_remove(self.checker_initiator_tag)
593
 
            self.checker_initiator_tag = None
594
 
        self.stop_checker()
595
 
        self.enabled = False
596
 
        if not quiet:
597
 
            self.send_changedstate()
598
 
        # Do not run this again if called by a gobject.timeout_add
599
 
        return False
600
 
    
601
 
    def __del__(self):
602
 
        self.disable()
603
 
    
604
 
    def init_checker(self):
605
400
        # Schedule a new checker to be started an 'interval' from now,
606
401
        # and every interval from then on.
607
 
        if self.checker_initiator_tag is not None:
608
 
            gobject.source_remove(self.checker_initiator_tag)
609
402
        self.checker_initiator_tag = (gobject.timeout_add
610
403
                                      (self.interval_milliseconds(),
611
404
                                       self.start_checker))
612
405
        # Schedule a disable() when 'timeout' has passed
613
 
        if self.disable_initiator_tag is not None:
614
 
            gobject.source_remove(self.disable_initiator_tag)
 
406
        self.expires = datetime.datetime.utcnow() + self.timeout
615
407
        self.disable_initiator_tag = (gobject.timeout_add
616
408
                                   (self.timeout_milliseconds(),
617
409
                                    self.disable))
 
410
        self.enabled = True
 
411
        self.last_enabled = datetime.datetime.utcnow()
618
412
        # Also start a new checker *right now*.
619
413
        self.start_checker()
620
414
    
 
415
    def disable(self, quiet=True):
 
416
        """Disable this client."""
 
417
        if not getattr(self, "enabled", False):
 
418
            return False
 
419
        if not quiet:
 
420
            self.send_changedstate()
 
421
        if not quiet:
 
422
            logger.info("Disabling client %s", self.name)
 
423
        if getattr(self, "disable_initiator_tag", False):
 
424
            gobject.source_remove(self.disable_initiator_tag)
 
425
            self.disable_initiator_tag = None
 
426
        self.expires = None
 
427
        if getattr(self, "checker_initiator_tag", False):
 
428
            gobject.source_remove(self.checker_initiator_tag)
 
429
            self.checker_initiator_tag = None
 
430
        self.stop_checker()
 
431
        if self.disable_hook:
 
432
            self.disable_hook(self)
 
433
        self.enabled = False
 
434
        # Do not run this again if called by a gobject.timeout_add
 
435
        return False
 
436
    
 
437
    def __del__(self):
 
438
        self.disable_hook = None
 
439
        self.disable()
 
440
    
621
441
    def checker_callback(self, pid, condition, command):
622
442
        """The checker has completed, so take appropriate actions."""
623
443
        self.checker_callback_tag = None
624
444
        self.checker = None
625
445
        if os.WIFEXITED(condition):
626
 
            self.last_checker_status = os.WEXITSTATUS(condition)
627
 
            if self.last_checker_status == 0:
 
446
            exitstatus = os.WEXITSTATUS(condition)
 
447
            if exitstatus == 0:
628
448
                logger.info("Checker for %(name)s succeeded",
629
449
                            vars(self))
630
450
                self.checked_ok()
632
452
                logger.info("Checker for %(name)s failed",
633
453
                            vars(self))
634
454
        else:
635
 
            self.last_checker_status = -1
636
455
            logger.warning("Checker for %(name)s crashed?",
637
456
                           vars(self))
638
457
    
639
 
    def checked_ok(self):
640
 
        """Assert that the client has been seen, alive and well."""
641
 
        self.last_checked_ok = datetime.datetime.utcnow()
642
 
        self.last_checker_status = 0
643
 
        self.bump_timeout()
644
 
    
645
 
    def bump_timeout(self, timeout=None):
646
 
        """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
        """
647
464
        if timeout is None:
648
465
            timeout = self.timeout
 
466
        self.last_checked_ok = datetime.datetime.utcnow()
649
467
        if self.disable_initiator_tag is not None:
650
468
            gobject.source_remove(self.disable_initiator_tag)
651
 
            self.disable_initiator_tag = None
652
469
        if getattr(self, "enabled", False):
653
470
            self.disable_initiator_tag = (gobject.timeout_add
654
 
                                          (timedelta_to_milliseconds
 
471
                                          (_timedelta_to_milliseconds
655
472
                                           (timeout), self.disable))
656
473
            self.expires = datetime.datetime.utcnow() + timeout
657
474
    
664
481
        If a checker already exists, leave it running and do
665
482
        nothing."""
666
483
        # The reason for not killing a running checker is that if we
667
 
        # did that, and if a checker (for some reason) started running
668
 
        # slowly and taking more than 'interval' time, then the client
669
 
        # would inevitably timeout, since no checker would get a
670
 
        # 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
671
488
        # checkers alone, the checker would have to take more time
672
489
        # than 'timeout' for the client to be disabled, which is as it
673
490
        # should be.
703
520
                try:
704
521
                    command = self.checker_command % escaped_attrs
705
522
                except TypeError as error:
706
 
                    logger.error('Could not format string "%s"',
707
 
                                 self.checker_command, exc_info=error)
 
523
                    logger.error('Could not format string "%s":'
 
524
                                 ' %s', self.checker_command, error)
708
525
                    return True # Try again later
709
526
            self.current_checker_command = command
710
527
            try:
728
545
                    gobject.source_remove(self.checker_callback_tag)
729
546
                    self.checker_callback(pid, status, command)
730
547
            except OSError as error:
731
 
                logger.error("Failed to start subprocess",
732
 
                             exc_info=error)
 
548
                logger.error("Failed to start subprocess: %s",
 
549
                             error)
733
550
        # Re-run this periodically if run by gobject.timeout_add
734
551
        return True
735
552
    
742
559
            return
743
560
        logger.debug("Stopping checker for %(name)s", vars(self))
744
561
        try:
745
 
            self.checker.terminate()
 
562
            os.kill(self.checker.pid, signal.SIGTERM)
746
563
            #time.sleep(0.5)
747
564
            #if self.checker.poll() is None:
748
 
            #    self.checker.kill()
 
565
            #    os.kill(self.checker.pid, signal.SIGKILL)
749
566
        except OSError as error:
750
567
            if error.errno != errno.ESRCH: # No such process
751
568
                raise
768
585
    # "Set" method, so we fail early here:
769
586
    if byte_arrays and signature != "ay":
770
587
        raise ValueError("Byte arrays not supported for non-'ay'"
771
 
                         " signature {0!r}".format(signature))
 
588
                         " signature %r" % signature)
772
589
    def decorator(func):
773
590
        func._dbus_is_property = True
774
591
        func._dbus_interface = dbus_interface
782
599
    return decorator
783
600
 
784
601
 
785
 
def dbus_interface_annotations(dbus_interface):
786
 
    """Decorator for marking functions returning interface annotations
787
 
    
788
 
    Usage:
789
 
    
790
 
    @dbus_interface_annotations("org.example.Interface")
791
 
    def _foo(self):  # Function name does not matter
792
 
        return {"org.freedesktop.DBus.Deprecated": "true",
793
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
794
 
                    "false"}
795
 
    """
796
 
    def decorator(func):
797
 
        func._dbus_is_interface = True
798
 
        func._dbus_interface = dbus_interface
799
 
        func._dbus_name = dbus_interface
800
 
        return func
801
 
    return decorator
802
 
 
803
 
 
804
 
def dbus_annotations(annotations):
805
 
    """Decorator to annotate D-Bus methods, signals or properties
806
 
    Usage:
807
 
    
808
 
    @dbus_service_property("org.example.Interface", signature="b",
809
 
                           access="r")
810
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
811
 
                        "org.freedesktop.DBus.Property."
812
 
                        "EmitsChangedSignal": "false"})
813
 
    def Property_dbus_property(self):
814
 
        return dbus.Boolean(False)
815
 
    """
816
 
    def decorator(func):
817
 
        func._dbus_annotations = annotations
818
 
        return func
819
 
    return decorator
820
 
 
821
 
 
822
602
class DBusPropertyException(dbus.exceptions.DBusException):
823
603
    """A base class for D-Bus property-related exceptions
824
604
    """
847
627
    """
848
628
    
849
629
    @staticmethod
850
 
    def _is_dbus_thing(thing):
851
 
        """Returns a function testing if an attribute is a D-Bus thing
852
 
        
853
 
        If called like _is_dbus_thing("method") it returns a function
854
 
        suitable for use as predicate to inspect.getmembers().
855
 
        """
856
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
857
 
                                   False)
 
630
    def _is_dbus_property(obj):
 
631
        return getattr(obj, "_dbus_is_property", False)
858
632
    
859
 
    def _get_all_dbus_things(self, thing):
 
633
    def _get_all_dbus_properties(self):
860
634
        """Returns a generator of (name, attribute) pairs
861
635
        """
862
 
        return ((getattr(athing.__get__(self), "_dbus_name",
863
 
                         name),
864
 
                 athing.__get__(self))
 
636
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
865
637
                for cls in self.__class__.__mro__
866
 
                for name, athing in
867
 
                inspect.getmembers(cls,
868
 
                                   self._is_dbus_thing(thing)))
 
638
                for name, prop in
 
639
                inspect.getmembers(cls, self._is_dbus_property))
869
640
    
870
641
    def _get_dbus_property(self, interface_name, property_name):
871
642
        """Returns a bound method if one exists which is a D-Bus
873
644
        """
874
645
        for cls in  self.__class__.__mro__:
875
646
            for name, value in (inspect.getmembers
876
 
                                (cls,
877
 
                                 self._is_dbus_thing("property"))):
 
647
                                (cls, self._is_dbus_property)):
878
648
                if (value._dbus_name == property_name
879
649
                    and value._dbus_interface == interface_name):
880
650
                    return value.__get__(self)
909
679
            # signatures other than "ay".
910
680
            if prop._dbus_signature != "ay":
911
681
                raise ValueError
912
 
            value = dbus.ByteArray(b''.join(chr(byte)
913
 
                                            for byte in value))
 
682
            value = dbus.ByteArray(''.join(unichr(byte)
 
683
                                           for byte in value))
914
684
        prop(value)
915
685
    
916
686
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
921
691
        
922
692
        Note: Will not include properties with access="write".
923
693
        """
924
 
        properties = {}
925
 
        for name, prop in self._get_all_dbus_things("property"):
 
694
        all = {}
 
695
        for name, prop in self._get_all_dbus_properties():
926
696
            if (interface_name
927
697
                and interface_name != prop._dbus_interface):
928
698
                # Interface non-empty but did not match
932
702
                continue
933
703
            value = prop()
934
704
            if not hasattr(value, "variant_level"):
935
 
                properties[name] = value
 
705
                all[name] = value
936
706
                continue
937
 
            properties[name] = type(value)(value, variant_level=
938
 
                                           value.variant_level+1)
939
 
        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")
940
710
    
941
711
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
942
712
                         out_signature="s",
943
713
                         path_keyword='object_path',
944
714
                         connection_keyword='connection')
945
715
    def Introspect(self, object_path, connection):
946
 
        """Overloading of standard D-Bus method.
947
 
        
948
 
        Inserts property tags and interface annotation tags.
 
716
        """Standard D-Bus method, overloaded to insert property tags.
949
717
        """
950
718
        xmlstring = dbus.service.Object.Introspect(self, object_path,
951
719
                                                   connection)
958
726
                e.setAttribute("access", prop._dbus_access)
959
727
                return e
960
728
            for if_tag in document.getElementsByTagName("interface"):
961
 
                # Add property tags
962
729
                for tag in (make_tag(document, name, prop)
963
730
                            for name, prop
964
 
                            in self._get_all_dbus_things("property")
 
731
                            in self._get_all_dbus_properties()
965
732
                            if prop._dbus_interface
966
733
                            == if_tag.getAttribute("name")):
967
734
                    if_tag.appendChild(tag)
968
 
                # Add annotation tags
969
 
                for typ in ("method", "signal", "property"):
970
 
                    for tag in if_tag.getElementsByTagName(typ):
971
 
                        annots = dict()
972
 
                        for name, prop in (self.
973
 
                                           _get_all_dbus_things(typ)):
974
 
                            if (name == tag.getAttribute("name")
975
 
                                and prop._dbus_interface
976
 
                                == if_tag.getAttribute("name")):
977
 
                                annots.update(getattr
978
 
                                              (prop,
979
 
                                               "_dbus_annotations",
980
 
                                               {}))
981
 
                        for name, value in annots.iteritems():
982
 
                            ann_tag = document.createElement(
983
 
                                "annotation")
984
 
                            ann_tag.setAttribute("name", name)
985
 
                            ann_tag.setAttribute("value", value)
986
 
                            tag.appendChild(ann_tag)
987
 
                # Add interface annotation tags
988
 
                for annotation, value in dict(
989
 
                    itertools.chain.from_iterable(
990
 
                        annotations().iteritems()
991
 
                        for name, annotations in
992
 
                        self._get_all_dbus_things("interface")
993
 
                        if name == if_tag.getAttribute("name")
994
 
                        )).iteritems():
995
 
                    ann_tag = document.createElement("annotation")
996
 
                    ann_tag.setAttribute("name", annotation)
997
 
                    ann_tag.setAttribute("value", value)
998
 
                    if_tag.appendChild(ann_tag)
999
735
                # Add the names to the return values for the
1000
736
                # "org.freedesktop.DBus.Properties" methods
1001
737
                if (if_tag.getAttribute("name")
1016
752
        except (AttributeError, xml.dom.DOMException,
1017
753
                xml.parsers.expat.ExpatError) as error:
1018
754
            logger.error("Failed to override Introspection method",
1019
 
                         exc_info=error)
 
755
                         error)
1020
756
        return xmlstring
1021
757
 
1022
758
 
1027
763
    return dbus.String(dt.isoformat(),
1028
764
                       variant_level=variant_level)
1029
765
 
1030
 
 
1031
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1032
 
    """A class decorator; applied to a subclass of
1033
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1034
 
    interface names according to the "alt_interface_names" mapping.
1035
 
    Usage:
1036
 
    
1037
 
    @alternate_dbus_names({"org.example.Interface":
1038
 
                               "net.example.AlternateInterface"})
1039
 
    class SampleDBusObject(dbus.service.Object):
1040
 
        @dbus.service.method("org.example.Interface")
1041
 
        def SampleDBusMethod():
1042
 
            pass
1043
 
    
1044
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1045
 
    reachable via two interfaces: "org.example.Interface" and
1046
 
    "net.example.AlternateInterface", the latter of which will have
1047
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1048
 
    "true", unless "deprecate" is passed with a False value.
1049
 
    
1050
 
    This works for methods and signals, and also for D-Bus properties
1051
 
    (from DBusObjectWithProperties) and interfaces (from the
1052
 
    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.
1053
770
    """
1054
 
    def wrapper(cls):
1055
 
        for orig_interface_name, alt_interface_name in (
1056
 
            alt_interface_names.iteritems()):
1057
 
            attr = {}
1058
 
            interface_names = set()
1059
 
            # Go though all attributes of the class
1060
 
            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):
1061
778
                # Ignore non-D-Bus attributes, and D-Bus attributes
1062
779
                # with the wrong interface name
1063
780
                if (not hasattr(attribute, "_dbus_interface")
1064
781
                    or not attribute._dbus_interface
1065
 
                    .startswith(orig_interface_name)):
 
782
                    .startswith("se.recompile.Mandos")):
1066
783
                    continue
1067
784
                # Create an alternate D-Bus interface name based on
1068
785
                # the current name
1069
786
                alt_interface = (attribute._dbus_interface
1070
 
                                 .replace(orig_interface_name,
1071
 
                                          alt_interface_name))
1072
 
                interface_names.add(alt_interface)
 
787
                                 .replace("se.recompile.Mandos",
 
788
                                          "se.bsnet.fukt.Mandos"))
1073
789
                # Is this a D-Bus signal?
1074
790
                if getattr(attribute, "_dbus_is_signal", False):
1075
791
                    # Extract the original non-method function by
1090
806
                                nonmethod_func.func_name,
1091
807
                                nonmethod_func.func_defaults,
1092
808
                                nonmethod_func.func_closure)))
1093
 
                    # Copy annotations, if any
1094
 
                    try:
1095
 
                        new_function._dbus_annotations = (
1096
 
                            dict(attribute._dbus_annotations))
1097
 
                    except AttributeError:
1098
 
                        pass
1099
809
                    # Define a creator of a function to call both the
1100
 
                    # original and alternate functions, so both the
1101
 
                    # original and alternate signals gets sent when
1102
 
                    # the function is called
 
810
                    # old and new functions, so both the old and new
 
811
                    # signals gets sent when the function is called
1103
812
                    def fixscope(func1, func2):
1104
813
                        """This function is a scope container to pass
1105
814
                        func1 and func2 to the "call_both" function
1112
821
                        return call_both
1113
822
                    # Create the "call_both" function and add it to
1114
823
                    # the class
1115
 
                    attr[attrname] = fixscope(attribute, new_function)
 
824
                    attr[attrname] = fixscope(attribute,
 
825
                                              new_function)
1116
826
                # Is this a D-Bus method?
1117
827
                elif getattr(attribute, "_dbus_is_method", False):
1118
828
                    # Create a new, but exactly alike, function
1129
839
                                        attribute.func_name,
1130
840
                                        attribute.func_defaults,
1131
841
                                        attribute.func_closure)))
1132
 
                    # Copy annotations, if any
1133
 
                    try:
1134
 
                        attr[attrname]._dbus_annotations = (
1135
 
                            dict(attribute._dbus_annotations))
1136
 
                    except AttributeError:
1137
 
                        pass
1138
842
                # Is this a D-Bus property?
1139
843
                elif getattr(attribute, "_dbus_is_property", False):
1140
844
                    # Create a new, but exactly alike, function
1154
858
                                        attribute.func_name,
1155
859
                                        attribute.func_defaults,
1156
860
                                        attribute.func_closure)))
1157
 
                    # Copy annotations, if any
1158
 
                    try:
1159
 
                        attr[attrname]._dbus_annotations = (
1160
 
                            dict(attribute._dbus_annotations))
1161
 
                    except AttributeError:
1162
 
                        pass
1163
 
                # Is this a D-Bus interface?
1164
 
                elif getattr(attribute, "_dbus_is_interface", False):
1165
 
                    # Create a new, but exactly alike, function
1166
 
                    # object.  Decorate it to be a new D-Bus interface
1167
 
                    # with the alternate D-Bus interface name.  Add it
1168
 
                    # to the class.
1169
 
                    attr[attrname] = (dbus_interface_annotations
1170
 
                                      (alt_interface)
1171
 
                                      (types.FunctionType
1172
 
                                       (attribute.func_code,
1173
 
                                        attribute.func_globals,
1174
 
                                        attribute.func_name,
1175
 
                                        attribute.func_defaults,
1176
 
                                        attribute.func_closure)))
1177
 
            if deprecate:
1178
 
                # Deprecate all alternate interfaces
1179
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1180
 
                for interface_name in interface_names:
1181
 
                    @dbus_interface_annotations(interface_name)
1182
 
                    def func(self):
1183
 
                        return { "org.freedesktop.DBus.Deprecated":
1184
 
                                     "true" }
1185
 
                    # Find an unused name
1186
 
                    for aname in (iname.format(i)
1187
 
                                  for i in itertools.count()):
1188
 
                        if aname not in attr:
1189
 
                            attr[aname] = func
1190
 
                            break
1191
 
            if interface_names:
1192
 
                # Replace the class with a new subclass of it with
1193
 
                # methods, signals, etc. as created above.
1194
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1195
 
                           (cls,), attr)
1196
 
        return cls
1197
 
    return wrapper
1198
 
 
1199
 
 
1200
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1201
 
                                "se.bsnet.fukt.Mandos"})
 
861
        return type.__new__(mcs, name, bases, attr)
 
862
 
1202
863
class ClientDBus(Client, DBusObjectWithProperties):
1203
864
    """A Client class using D-Bus
1204
865
    
1213
874
    # dbus.service.Object doesn't use super(), so we can't either.
1214
875
    
1215
876
    def __init__(self, bus = None, *args, **kwargs):
 
877
        self._approvals_pending = 0
1216
878
        self.bus = bus
1217
879
        Client.__init__(self, *args, **kwargs)
1218
880
        # Only now, when this client is initialized, can it show up on
1224
886
                                 ("/clients/" + client_object_name))
1225
887
        DBusObjectWithProperties.__init__(self, self.bus,
1226
888
                                          self.dbus_object_path)
1227
 
    
 
889
        
1228
890
    def notifychangeproperty(transform_func,
1229
891
                             dbus_name, type_func=lambda x: x,
1230
892
                             variant_level=1):
1231
893
        """ Modify a variable so that it's a property which announces
1232
894
        its changes to DBus.
1233
 
        
 
895
 
1234
896
        transform_fun: Function that takes a value and a variant_level
1235
897
                       and transforms it to a D-Bus type.
1236
898
        dbus_name: D-Bus name of the variable
1253
915
        
1254
916
        return property(lambda self: getattr(self, attrname), setter)
1255
917
    
 
918
    
1256
919
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1257
920
    approvals_pending = notifychangeproperty(dbus.Boolean,
1258
921
                                             "ApprovalPending",
1265
928
                                       checker is not None)
1266
929
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1267
930
                                           "LastCheckedOK")
1268
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1269
 
                                               "LastCheckerStatus")
1270
931
    last_approval_request = notifychangeproperty(
1271
932
        datetime_to_dbus, "LastApprovalRequest")
1272
933
    approved_by_default = notifychangeproperty(dbus.Boolean,
1273
934
                                               "ApprovedByDefault")
1274
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
935
    approval_delay = notifychangeproperty(dbus.UInt16,
1275
936
                                          "ApprovalDelay",
1276
937
                                          type_func =
1277
 
                                          timedelta_to_milliseconds)
 
938
                                          _timedelta_to_milliseconds)
1278
939
    approval_duration = notifychangeproperty(
1279
 
        dbus.UInt64, "ApprovalDuration",
1280
 
        type_func = timedelta_to_milliseconds)
 
940
        dbus.UInt16, "ApprovalDuration",
 
941
        type_func = _timedelta_to_milliseconds)
1281
942
    host = notifychangeproperty(dbus.String, "Host")
1282
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
943
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1283
944
                                   type_func =
1284
 
                                   timedelta_to_milliseconds)
 
945
                                   _timedelta_to_milliseconds)
1285
946
    extended_timeout = notifychangeproperty(
1286
 
        dbus.UInt64, "ExtendedTimeout",
1287
 
        type_func = timedelta_to_milliseconds)
1288
 
    interval = notifychangeproperty(dbus.UInt64,
 
947
        dbus.UInt16, "ExtendedTimeout",
 
948
        type_func = _timedelta_to_milliseconds)
 
949
    interval = notifychangeproperty(dbus.UInt16,
1289
950
                                    "Interval",
1290
951
                                    type_func =
1291
 
                                    timedelta_to_milliseconds)
 
952
                                    _timedelta_to_milliseconds)
1292
953
    checker_command = notifychangeproperty(dbus.String, "Checker")
1293
954
    
1294
955
    del notifychangeproperty
1336
997
        return r
1337
998
    
1338
999
    def _reset_approved(self):
1339
 
        self.approved = None
 
1000
        self._approved = None
1340
1001
        return False
1341
1002
    
1342
1003
    def approve(self, value=True):
1343
 
        self.approved = value
1344
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1004
        self.send_changedstate()
 
1005
        self._approved = value
 
1006
        gobject.timeout_add(_timedelta_to_milliseconds
1345
1007
                            (self.approval_duration),
1346
1008
                            self._reset_approved)
1347
 
        self.send_changedstate()
 
1009
    
1348
1010
    
1349
1011
    ## D-Bus methods, signals & properties
1350
1012
    _interface = "se.recompile.Mandos.Client"
1351
1013
    
1352
 
    ## Interfaces
1353
 
    
1354
 
    @dbus_interface_annotations(_interface)
1355
 
    def _foo(self):
1356
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1357
 
                     "false"}
1358
 
    
1359
1014
    ## Signals
1360
1015
    
1361
1016
    # CheckerCompleted - signal
1460
1115
                           access="readwrite")
1461
1116
    def ApprovalDuration_dbus_property(self, value=None):
1462
1117
        if value is None:       # get
1463
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1118
            return dbus.UInt64(_timedelta_to_milliseconds(
1464
1119
                    self.approval_duration))
1465
1120
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1466
1121
    
1480
1135
    def Host_dbus_property(self, value=None):
1481
1136
        if value is None:       # get
1482
1137
            return dbus.String(self.host)
1483
 
        self.host = unicode(value)
 
1138
        self.host = value
1484
1139
    
1485
1140
    # Created - property
1486
1141
    @dbus_service_property(_interface, signature="s", access="read")
1487
1142
    def Created_dbus_property(self):
1488
 
        return datetime_to_dbus(self.created)
 
1143
        return dbus.String(datetime_to_dbus(self.created))
1489
1144
    
1490
1145
    # LastEnabled - property
1491
1146
    @dbus_service_property(_interface, signature="s", access="read")
1512
1167
            return
1513
1168
        return datetime_to_dbus(self.last_checked_ok)
1514
1169
    
1515
 
    # LastCheckerStatus - property
1516
 
    @dbus_service_property(_interface, signature="n",
1517
 
                           access="read")
1518
 
    def LastCheckerStatus_dbus_property(self):
1519
 
        return dbus.Int16(self.last_checker_status)
1520
 
    
1521
1170
    # Expires - property
1522
1171
    @dbus_service_property(_interface, signature="s", access="read")
1523
1172
    def Expires_dbus_property(self):
1534
1183
    def Timeout_dbus_property(self, value=None):
1535
1184
        if value is None:       # get
1536
1185
            return dbus.UInt64(self.timeout_milliseconds())
1537
 
        old_timeout = self.timeout
1538
1186
        self.timeout = datetime.timedelta(0, 0, 0, value)
1539
 
        # Reschedule disabling
1540
 
        if self.enabled:
1541
 
            now = datetime.datetime.utcnow()
1542
 
            self.expires += self.timeout - old_timeout
1543
 
            if self.expires <= now:
1544
 
                # The timeout has passed
1545
 
                self.disable()
1546
 
            else:
1547
 
                if (getattr(self, "disable_initiator_tag", None)
1548
 
                    is None):
1549
 
                    return
1550
 
                gobject.source_remove(self.disable_initiator_tag)
1551
 
                self.disable_initiator_tag = (
1552
 
                    gobject.timeout_add(
1553
 
                        timedelta_to_milliseconds(self.expires - now),
1554
 
                        self.disable))
 
1187
        if getattr(self, "disable_initiator_tag", None) is None:
 
1188
            return
 
1189
        # Reschedule timeout
 
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))
1555
1207
    
1556
1208
    # ExtendedTimeout - property
1557
1209
    @dbus_service_property(_interface, signature="t",
1570
1222
        self.interval = datetime.timedelta(0, 0, 0, value)
1571
1223
        if getattr(self, "checker_initiator_tag", None) is None:
1572
1224
            return
1573
 
        if self.enabled:
1574
 
            # Reschedule checker run
1575
 
            gobject.source_remove(self.checker_initiator_tag)
1576
 
            self.checker_initiator_tag = (gobject.timeout_add
1577
 
                                          (value, self.start_checker))
1578
 
            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
1579
1230
    
1580
1231
    # Checker - property
1581
1232
    @dbus_service_property(_interface, signature="s",
1583
1234
    def Checker_dbus_property(self, value=None):
1584
1235
        if value is None:       # get
1585
1236
            return dbus.String(self.checker_command)
1586
 
        self.checker_command = unicode(value)
 
1237
        self.checker_command = value
1587
1238
    
1588
1239
    # CheckerRunning - property
1589
1240
    @dbus_service_property(_interface, signature="b",
1618
1269
            raise KeyError()
1619
1270
    
1620
1271
    def __getattribute__(self, name):
1621
 
        if name == '_pipe':
 
1272
        if(name == '_pipe'):
1622
1273
            return super(ProxyClient, self).__getattribute__(name)
1623
1274
        self._pipe.send(('getattr', name))
1624
1275
        data = self._pipe.recv()
1631
1282
            return func
1632
1283
    
1633
1284
    def __setattr__(self, name, value):
1634
 
        if name == '_pipe':
 
1285
        if(name == '_pipe'):
1635
1286
            return super(ProxyClient, self).__setattr__(name, value)
1636
1287
        self._pipe.send(('setattr', name, value))
1637
1288
 
 
1289
class ClientDBusTransitional(ClientDBus):
 
1290
    __metaclass__ = AlternateDBusNamesMetaclass
1638
1291
 
1639
1292
class ClientHandler(socketserver.BaseRequestHandler, object):
1640
1293
    """A class to handle client connections.
1723
1376
                            client.Rejected("Disabled")
1724
1377
                        return
1725
1378
                    
1726
 
                    if client.approved or not client.approval_delay:
 
1379
                    if client._approved or not client.approval_delay:
1727
1380
                        #We are approved or approval is disabled
1728
1381
                        break
1729
 
                    elif client.approved is None:
 
1382
                    elif client._approved is None:
1730
1383
                        logger.info("Client %s needs approval",
1731
1384
                                    client.name)
1732
1385
                        if self.server.use_dbus:
1745
1398
                    #wait until timeout or approved
1746
1399
                    time = datetime.datetime.now()
1747
1400
                    client.changedstate.acquire()
1748
 
                    client.changedstate.wait(
1749
 
                        float(timedelta_to_milliseconds(delay)
1750
 
                              / 1000))
 
1401
                    (client.changedstate.wait
 
1402
                     (float(client._timedelta_to_milliseconds(delay)
 
1403
                            / 1000)))
1751
1404
                    client.changedstate.release()
1752
1405
                    time2 = datetime.datetime.now()
1753
1406
                    if (time2 - time) >= delay:
1769
1422
                    try:
1770
1423
                        sent = session.send(client.secret[sent_size:])
1771
1424
                    except gnutls.errors.GNUTLSError as error:
1772
 
                        logger.warning("gnutls send failed",
1773
 
                                       exc_info=error)
 
1425
                        logger.warning("gnutls send failed")
1774
1426
                        return
1775
1427
                    logger.debug("Sent: %d, remaining: %d",
1776
1428
                                 sent, len(client.secret)
1779
1431
                
1780
1432
                logger.info("Sending secret to %s", client.name)
1781
1433
                # bump the timeout using extended_timeout
1782
 
                client.bump_timeout(client.extended_timeout)
 
1434
                client.checked_ok(client.extended_timeout)
1783
1435
                if self.server.use_dbus:
1784
1436
                    # Emit D-Bus signal
1785
1437
                    client.GotSecret()
1790
1442
                try:
1791
1443
                    session.bye()
1792
1444
                except gnutls.errors.GNUTLSError as error:
1793
 
                    logger.warning("GnuTLS bye failed",
1794
 
                                   exc_info=error)
 
1445
                    logger.warning("GnuTLS bye failed")
1795
1446
    
1796
1447
    @staticmethod
1797
1448
    def peer_certificate(session):
1853
1504
        # Convert the buffer to a Python bytestring
1854
1505
        fpr = ctypes.string_at(buf, buf_len.value)
1855
1506
        # Convert the bytestring to hexadecimal notation
1856
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1507
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1857
1508
        return hex_fpr
1858
1509
 
1859
1510
 
1862
1513
    def sub_process_main(self, request, address):
1863
1514
        try:
1864
1515
            self.finish_request(request, address)
1865
 
        except Exception:
 
1516
        except:
1866
1517
            self.handle_error(request, address)
1867
1518
        self.close_request(request)
1868
1519
    
1869
1520
    def process_request(self, request, address):
1870
1521
        """Start a new process to process the request."""
1871
1522
        proc = multiprocessing.Process(target = self.sub_process_main,
1872
 
                                       args = (request, address))
 
1523
                                       args = (request,
 
1524
                                               address))
1873
1525
        proc.start()
1874
1526
        return proc
1875
1527
 
1972
1624
        self.enabled = False
1973
1625
        self.clients = clients
1974
1626
        if self.clients is None:
1975
 
            self.clients = {}
 
1627
            self.clients = set()
1976
1628
        self.use_dbus = use_dbus
1977
1629
        self.gnutls_priority = gnutls_priority
1978
1630
        IPv6_TCPServer.__init__(self, server_address,
1997
1649
    
1998
1650
    def handle_ipc(self, source, condition, parent_pipe=None,
1999
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)
2000
1666
        # error, or the other end of multiprocessing.Pipe has closed
2001
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1667
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2002
1668
            # Wait for other process to exit
2003
1669
            proc.join()
2004
1670
            return False
2011
1677
            fpr = request[1]
2012
1678
            address = request[2]
2013
1679
            
2014
 
            for c in self.clients.itervalues():
 
1680
            for c in self.clients:
2015
1681
                if c.fingerprint == fpr:
2016
1682
                    client = c
2017
1683
                    break
2094
1760
            elif suffix == "w":
2095
1761
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2096
1762
            else:
2097
 
                raise ValueError("Unknown suffix {0!r}"
2098
 
                                 .format(suffix))
 
1763
                raise ValueError("Unknown suffix %r" % suffix)
2099
1764
        except (ValueError, IndexError) as e:
2100
1765
            raise ValueError(*(e.args))
2101
1766
        timevalue += delta
2102
1767
    return timevalue
2103
1768
 
2104
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
 
2105
1794
def daemon(nochdir = False, noclose = False):
2106
1795
    """See daemon(3).  Standard BSD Unix function.
2107
1796
    
2115
1804
        sys.exit()
2116
1805
    if not noclose:
2117
1806
        # Close all standard open file descriptors
2118
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1807
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2119
1808
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2120
1809
            raise OSError(errno.ENODEV,
2121
 
                          "{0} not a character device"
2122
 
                          .format(os.devnull))
 
1810
                          "%s not a character device"
 
1811
                          % os.path.devnull)
2123
1812
        os.dup2(null, sys.stdin.fileno())
2124
1813
        os.dup2(null, sys.stdout.fileno())
2125
1814
        os.dup2(null, sys.stderr.fileno())
2134
1823
    
2135
1824
    parser = argparse.ArgumentParser()
2136
1825
    parser.add_argument("-v", "--version", action="version",
2137
 
                        version = "%(prog)s {0}".format(version),
 
1826
                        version = "%%(prog)s %s" % version,
2138
1827
                        help="show version number and exit")
2139
1828
    parser.add_argument("-i", "--interface", metavar="IF",
2140
1829
                        help="Bind to interface IF")
2162
1851
                        " system bus interface")
2163
1852
    parser.add_argument("--no-ipv6", action="store_false",
2164
1853
                        dest="use_ipv6", help="Do not use IPv6")
2165
 
    parser.add_argument("--no-restore", action="store_false",
2166
 
                        dest="restore", help="Do not restore stored"
2167
 
                        " state")
2168
 
    parser.add_argument("--statedir", metavar="DIR",
2169
 
                        help="Directory to save/restore state in")
2170
 
    
2171
1854
    options = parser.parse_args()
2172
1855
    
2173
1856
    if options.check:
2186
1869
                        "use_dbus": "True",
2187
1870
                        "use_ipv6": "True",
2188
1871
                        "debuglevel": "",
2189
 
                        "restore": "True",
2190
 
                        "statedir": "/var/lib/mandos"
2191
1872
                        }
2192
1873
    
2193
1874
    # Parse config file for server-global settings
2210
1891
    # options, if set.
2211
1892
    for option in ("interface", "address", "port", "debug",
2212
1893
                   "priority", "servicename", "configdir",
2213
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2214
 
                   "statedir"):
 
1894
                   "use_dbus", "use_ipv6", "debuglevel"):
2215
1895
        value = getattr(options, option)
2216
1896
        if value is not None:
2217
1897
            server_settings[option] = value
2229
1909
    debuglevel = server_settings["debuglevel"]
2230
1910
    use_dbus = server_settings["use_dbus"]
2231
1911
    use_ipv6 = server_settings["use_ipv6"]
2232
 
    stored_state_path = os.path.join(server_settings["statedir"],
2233
 
                                     stored_state_file)
2234
 
    
2235
 
    if debug:
2236
 
        initlogger(debug, logging.DEBUG)
2237
 
    else:
2238
 
        if not debuglevel:
2239
 
            initlogger(debug)
2240
 
        else:
2241
 
            level = getattr(logging, debuglevel.upper())
2242
 
            initlogger(debug, level)
2243
1912
    
2244
1913
    if server_settings["servicename"] != "Mandos":
2245
1914
        syslogger.setFormatter(logging.Formatter
2246
 
                               ('Mandos ({0}) [%(process)d]:'
2247
 
                                ' %(levelname)s: %(message)s'
2248
 
                                .format(server_settings
2249
 
                                        ["servicename"])))
 
1915
                               ('Mandos (%s) [%%(process)d]:'
 
1916
                                ' %%(levelname)s: %%(message)s'
 
1917
                                % server_settings["servicename"]))
2250
1918
    
2251
1919
    # Parse config file with clients
2252
 
    client_config = configparser.SafeConfigParser(Client
2253
 
                                                  .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)
2254
1929
    client_config.read(os.path.join(server_settings["configdir"],
2255
1930
                                    "clients.conf"))
2256
1931
    
2270
1945
        pidfilename = "/var/run/mandos.pid"
2271
1946
        try:
2272
1947
            pidfile = open(pidfilename, "w")
2273
 
        except IOError as e:
2274
 
            logger.error("Could not open file %r", pidfilename,
2275
 
                         exc_info=e)
 
1948
        except IOError:
 
1949
            logger.error("Could not open file %r", pidfilename)
2276
1950
    
2277
 
    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:
2278
1955
        try:
2279
 
            uid = pwd.getpwnam(name).pw_uid
2280
 
            gid = pwd.getpwnam(name).pw_gid
2281
 
            break
 
1956
            uid = pwd.getpwnam("mandos").pw_uid
 
1957
            gid = pwd.getpwnam("mandos").pw_gid
2282
1958
        except KeyError:
2283
 
            continue
2284
 
    else:
2285
 
        uid = 65534
2286
 
        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
2287
1965
    try:
2288
1966
        os.setgid(gid)
2289
1967
        os.setuid(uid)
2291
1969
        if error[0] != errno.EPERM:
2292
1970
            raise error
2293
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
    
2294
1980
    if debug:
2295
1981
        # Enable all possible GnuTLS debugging
2296
1982
        
2306
1992
         .gnutls_global_set_log_function(debug_gnutls))
2307
1993
        
2308
1994
        # Redirect stdin so all checkers get /dev/null
2309
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1995
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2310
1996
        os.dup2(null, sys.stdin.fileno())
2311
1997
        if null > 2:
2312
1998
            os.close(null)
 
1999
    else:
 
2000
        # No console logging
 
2001
        logger.removeHandler(console)
2313
2002
    
2314
2003
    # Need to fork before connecting to D-Bus
2315
2004
    if not debug:
2316
2005
        # Close all input and output, do double fork, etc.
2317
2006
        daemon()
2318
2007
    
2319
 
    gobject.threads_init()
2320
 
    
2321
2008
    global main_loop
2322
2009
    # From the Avahi example code
2323
 
    DBusGMainLoop(set_as_default=True)
 
2010
    DBusGMainLoop(set_as_default=True )
2324
2011
    main_loop = gobject.MainLoop()
2325
2012
    bus = dbus.SystemBus()
2326
2013
    # End of Avahi example code
2332
2019
                            ("se.bsnet.fukt.Mandos", bus,
2333
2020
                             do_not_queue=True))
2334
2021
        except dbus.exceptions.NameExistsException as e:
2335
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2022
            logger.error(unicode(e) + ", disabling D-Bus")
2336
2023
            use_dbus = False
2337
2024
            server_settings["use_dbus"] = False
2338
2025
            tcp_server.use_dbus = False
2339
2026
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2340
 
    service = AvahiServiceToSyslog(name =
2341
 
                                   server_settings["servicename"],
2342
 
                                   servicetype = "_mandos._tcp",
2343
 
                                   protocol = protocol, bus = bus)
 
2027
    service = AvahiService(name = server_settings["servicename"],
 
2028
                           servicetype = "_mandos._tcp",
 
2029
                           protocol = protocol, bus = bus)
2344
2030
    if server_settings["interface"]:
2345
2031
        service.interface = (if_nametoindex
2346
2032
                             (str(server_settings["interface"])))
2350
2036
    
2351
2037
    client_class = Client
2352
2038
    if use_dbus:
2353
 
        client_class = functools.partial(ClientDBus, bus = bus)
2354
 
    
2355
 
    client_settings = Client.config_parser(client_config)
2356
 
    old_client_settings = {}
2357
 
    clients_data = {}
2358
 
    
2359
 
    # Get client data and settings from last running state.
2360
 
    if server_settings["restore"]:
2361
 
        try:
2362
 
            with open(stored_state_path, "rb") as stored_state:
2363
 
                clients_data, old_client_settings = (pickle.load
2364
 
                                                     (stored_state))
2365
 
            os.remove(stored_state_path)
2366
 
        except IOError as e:
2367
 
            if e.errno == errno.ENOENT:
2368
 
                logger.warning("Could not load persistent state: {0}"
2369
 
                                .format(os.strerror(e.errno)))
2370
 
            else:
2371
 
                logger.critical("Could not load persistent state:",
2372
 
                                exc_info=e)
2373
 
                raise
2374
 
        except EOFError as e:
2375
 
            logger.warning("Could not load persistent state: "
2376
 
                           "EOFError:", exc_info=e)
2377
 
    
2378
 
    with PGPEngine() as pgp:
2379
 
        for client_name, client in clients_data.iteritems():
2380
 
            # Decide which value to use after restoring saved state.
2381
 
            # We have three different values: Old config file,
2382
 
            # new config file, and saved state.
2383
 
            # New config value takes precedence if it differs from old
2384
 
            # config value, otherwise use saved state.
2385
 
            for name, value in client_settings[client_name].items():
2386
 
                try:
2387
 
                    # For each value in new config, check if it
2388
 
                    # differs from the old config value (Except for
2389
 
                    # the "secret" attribute)
2390
 
                    if (name != "secret" and
2391
 
                        value != old_client_settings[client_name]
2392
 
                        [name]):
2393
 
                        client[name] = value
2394
 
                except KeyError:
2395
 
                    pass
2396
 
            
2397
 
            # Clients who has passed its expire date can still be
2398
 
            # enabled if its last checker was successful.  Clients
2399
 
            # whose checker succeeded before we stored its state is
2400
 
            # assumed to have successfully run all checkers during
2401
 
            # downtime.
2402
 
            if client["enabled"]:
2403
 
                if datetime.datetime.utcnow() >= client["expires"]:
2404
 
                    if not client["last_checked_ok"]:
2405
 
                        logger.warning(
2406
 
                            "disabling client {0} - Client never "
2407
 
                            "performed a successful checker"
2408
 
                            .format(client_name))
2409
 
                        client["enabled"] = False
2410
 
                    elif client["last_checker_status"] != 0:
2411
 
                        logger.warning(
2412
 
                            "disabling client {0} - Client "
2413
 
                            "last checker failed with error code {1}"
2414
 
                            .format(client_name,
2415
 
                                    client["last_checker_status"]))
2416
 
                        client["enabled"] = False
2417
 
                    else:
2418
 
                        client["expires"] = (datetime.datetime
2419
 
                                             .utcnow()
2420
 
                                             + client["timeout"])
2421
 
                        logger.debug("Last checker succeeded,"
2422
 
                                     " keeping {0} enabled"
2423
 
                                     .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):
2424
2048
            try:
2425
 
                client["secret"] = (
2426
 
                    pgp.decrypt(client["encrypted_secret"],
2427
 
                                client_settings[client_name]
2428
 
                                ["secret"]))
2429
 
            except PGPError:
2430
 
                # If decryption fails, we use secret from new settings
2431
 
                logger.debug("Failed to decrypt {0} old secret"
2432
 
                             .format(client_name))
2433
 
                client["secret"] = (
2434
 
                    client_settings[client_name]["secret"])
2435
 
    
2436
 
    # Add/remove clients based on new changes made to config
2437
 
    for client_name in (set(old_client_settings)
2438
 
                        - set(client_settings)):
2439
 
        del clients_data[client_name]
2440
 
    for client_name in (set(client_settings)
2441
 
                        - set(old_client_settings)):
2442
 
        clients_data[client_name] = client_settings[client_name]
2443
 
    
2444
 
    # Create all client objects
2445
 
    for client_name, client in clients_data.iteritems():
2446
 
        tcp_server.clients[client_name] = client_class(
2447
 
            name = client_name, settings = client)
2448
 
    
 
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()))
2449
2058
    if not tcp_server.clients:
2450
2059
        logger.warning("No clients defined")
2451
 
    
 
2060
        
2452
2061
    if not debug:
2453
2062
        try:
2454
2063
            with pidfile:
2462
2071
            # "pidfile" was never created
2463
2072
            pass
2464
2073
        del pidfilename
 
2074
        
2465
2075
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2466
2076
    
2467
2077
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2468
2078
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2469
2079
    
2470
2080
    if use_dbus:
2471
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2472
 
                                        "se.bsnet.fukt.Mandos"})
2473
 
        class MandosDBusService(DBusObjectWithProperties):
 
2081
        class MandosDBusService(dbus.service.Object):
2474
2082
            """A D-Bus proxy object"""
2475
2083
            def __init__(self):
2476
2084
                dbus.service.Object.__init__(self, bus, "/")
2477
2085
            _interface = "se.recompile.Mandos"
2478
2086
            
2479
 
            @dbus_interface_annotations(_interface)
2480
 
            def _foo(self):
2481
 
                return { "org.freedesktop.DBus.Property"
2482
 
                         ".EmitsChangedSignal":
2483
 
                             "false"}
2484
 
            
2485
2087
            @dbus.service.signal(_interface, signature="o")
2486
2088
            def ClientAdded(self, objpath):
2487
2089
                "D-Bus signal"
2501
2103
            def GetAllClients(self):
2502
2104
                "D-Bus method"
2503
2105
                return dbus.Array(c.dbus_object_path
2504
 
                                  for c in
2505
 
                                  tcp_server.clients.itervalues())
 
2106
                                  for c in tcp_server.clients)
2506
2107
            
2507
2108
            @dbus.service.method(_interface,
2508
2109
                                 out_signature="a{oa{sv}}")
2510
2111
                "D-Bus method"
2511
2112
                return dbus.Dictionary(
2512
2113
                    ((c.dbus_object_path, c.GetAll(""))
2513
 
                     for c in tcp_server.clients.itervalues()),
 
2114
                     for c in tcp_server.clients),
2514
2115
                    signature="oa{sv}")
2515
2116
            
2516
2117
            @dbus.service.method(_interface, in_signature="o")
2517
2118
            def RemoveClient(self, object_path):
2518
2119
                "D-Bus method"
2519
 
                for c in tcp_server.clients.itervalues():
 
2120
                for c in tcp_server.clients:
2520
2121
                    if c.dbus_object_path == object_path:
2521
 
                        del tcp_server.clients[c.name]
 
2122
                        tcp_server.clients.remove(c)
2522
2123
                        c.remove_from_connection()
2523
2124
                        # Don't signal anything except ClientRemoved
2524
2125
                        c.disable(quiet=True)
2529
2130
            
2530
2131
            del _interface
2531
2132
        
2532
 
        mandos_dbus_service = MandosDBusService()
 
2133
        class MandosDBusServiceTransitional(MandosDBusService):
 
2134
            __metaclass__ = AlternateDBusNamesMetaclass
 
2135
        mandos_dbus_service = MandosDBusServiceTransitional()
2533
2136
    
2534
2137
    def cleanup():
2535
2138
        "Cleanup function; run on exit"
2536
2139
        service.cleanup()
2537
2140
        
2538
2141
        multiprocessing.active_children()
2539
 
        if not (tcp_server.clients or client_settings):
2540
 
            return
2541
 
        
2542
 
        # Store client before exiting. Secrets are encrypted with key
2543
 
        # based on what config file has. If config file is
2544
 
        # removed/edited, old secret will thus be unrecovable.
2545
 
        clients = {}
2546
 
        with PGPEngine() as pgp:
2547
 
            for client in tcp_server.clients.itervalues():
2548
 
                key = client_settings[client.name]["secret"]
2549
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2550
 
                                                      key)
2551
 
                client_dict = {}
2552
 
                
2553
 
                # A list of attributes that can not be pickled
2554
 
                # + secret.
2555
 
                exclude = set(("bus", "changedstate", "secret",
2556
 
                               "checker"))
2557
 
                for name, typ in (inspect.getmembers
2558
 
                                  (dbus.service.Object)):
2559
 
                    exclude.add(name)
2560
 
                
2561
 
                client_dict["encrypted_secret"] = (client
2562
 
                                                   .encrypted_secret)
2563
 
                for attr in client.client_structure:
2564
 
                    if attr not in exclude:
2565
 
                        client_dict[attr] = getattr(client, attr)
2566
 
                
2567
 
                clients[client.name] = client_dict
2568
 
                del client_settings[client.name]["secret"]
2569
 
        
2570
 
        try:
2571
 
            with (tempfile.NamedTemporaryFile
2572
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2573
 
                   dir=os.path.dirname(stored_state_path),
2574
 
                   delete=False)) as stored_state:
2575
 
                pickle.dump((clients, client_settings), stored_state)
2576
 
                tempname=stored_state.name
2577
 
            os.rename(tempname, stored_state_path)
2578
 
        except (IOError, OSError) as e:
2579
 
            if not debug:
2580
 
                try:
2581
 
                    os.remove(tempname)
2582
 
                except NameError:
2583
 
                    pass
2584
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2585
 
                logger.warning("Could not save persistent state: {0}"
2586
 
                               .format(os.strerror(e.errno)))
2587
 
            else:
2588
 
                logger.warning("Could not save persistent state:",
2589
 
                               exc_info=e)
2590
 
                raise e
2591
 
        
2592
 
        # Delete all clients, and settings from config
2593
2142
        while tcp_server.clients:
2594
 
            name, client = tcp_server.clients.popitem()
 
2143
            client = tcp_server.clients.pop()
2595
2144
            if use_dbus:
2596
2145
                client.remove_from_connection()
 
2146
            client.disable_hook = None
2597
2147
            # Don't signal anything except ClientRemoved
2598
2148
            client.disable(quiet=True)
2599
2149
            if use_dbus:
2601
2151
                mandos_dbus_service.ClientRemoved(client
2602
2152
                                                  .dbus_object_path,
2603
2153
                                                  client.name)
2604
 
        client_settings.clear()
2605
2154
    
2606
2155
    atexit.register(cleanup)
2607
2156
    
2608
 
    for client in tcp_server.clients.itervalues():
 
2157
    for client in tcp_server.clients:
2609
2158
        if use_dbus:
2610
2159
            # Emit D-Bus signal
2611
2160
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2612
 
        # Need to initiate checking of clients
2613
 
        if client.enabled:
2614
 
            client.init_checker()
 
2161
        client.enable()
2615
2162
    
2616
2163
    tcp_server.enable()
2617
2164
    tcp_server.server_activate()
2620
2167
    service.port = tcp_server.socket.getsockname()[1]
2621
2168
    if use_ipv6:
2622
2169
        logger.info("Now listening on address %r, port %d,"
2623
 
                    " flowinfo %d, scope_id %d",
2624
 
                    *tcp_server.socket.getsockname())
 
2170
                    " flowinfo %d, scope_id %d"
 
2171
                    % tcp_server.socket.getsockname())
2625
2172
    else:                       # IPv4
2626
 
        logger.info("Now listening on address %r, port %d",
2627
 
                    *tcp_server.socket.getsockname())
 
2173
        logger.info("Now listening on address %r, port %d"
 
2174
                    % tcp_server.socket.getsockname())
2628
2175
    
2629
2176
    #service.interface = tcp_server.socket.getsockname()[3]
2630
2177
    
2633
2180
        try:
2634
2181
            service.activate()
2635
2182
        except dbus.exceptions.DBusException as error:
2636
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2183
            logger.critical("DBusException: %s", error)
2637
2184
            cleanup()
2638
2185
            sys.exit(1)
2639
2186
        # End of Avahi example code
2646
2193
        logger.debug("Starting main loop")
2647
2194
        main_loop.run()
2648
2195
    except AvahiError as error:
2649
 
        logger.critical("Avahi Error", exc_info=error)
 
2196
        logger.critical("AvahiError: %s", error)
2650
2197
        cleanup()
2651
2198
        sys.exit(1)
2652
2199
    except KeyboardInterrupt:
2657
2204
    # Must run before the D-Bus bus name gets deregistered
2658
2205
    cleanup()
2659
2206
 
 
2207
 
2660
2208
if __name__ == '__main__':
2661
2209
    main()