/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-06 16:13:00 UTC
  • Revision ID: teddy@recompile.se-20120506161300-43rls2rr4qub3zhw
* mandos: Use a class decorator instead of a metaclass to provide
          alternate D-Bus interface names on D-Bus object attributes.
  (alternate_dbus_interfaces): New class decorator.
  (AlternateDBusNamesMetaclass, ClientDBusTransitional,
   MandosDBusServiceTransitional): Removed; all users changed.
  (ClientDbus, MandosDBusService): Use new "alternate_dbus_interfaces"
                                   class decorator.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
66
 
import hashlib
 
66
import binascii
 
67
import tempfile
 
68
import itertools
67
69
 
68
70
import dbus
69
71
import dbus.service
74
76
import ctypes.util
75
77
import xml.dom.minidom
76
78
import inspect
77
 
import Crypto.Cipher.AES
 
79
import GnuPGInterface
78
80
 
79
81
try:
80
82
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
86
    except ImportError:
85
87
        SO_BINDTODEVICE = None
86
88
 
87
 
 
88
 
version = "1.4.1"
 
89
version = "1.5.3"
 
90
stored_state_file = "clients.pickle"
89
91
 
90
92
logger = logging.getLogger()
91
 
stored_state_path = "/var/lib/mandos/clients.pickle"
92
 
 
93
93
syslogger = (logging.handlers.SysLogHandler
94
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
95
              address = str("/dev/log")))
96
 
syslogger.setFormatter(logging.Formatter
97
 
                       ('Mandos [%(process)d]: %(levelname)s:'
98
 
                        ' %(message)s'))
99
 
logger.addHandler(syslogger)
100
 
 
101
 
console = logging.StreamHandler()
102
 
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
 
                                       ' [%(process)d]:'
104
 
                                       ' %(levelname)s:'
105
 
                                       ' %(message)s'))
106
 
logger.addHandler(console)
 
96
 
 
97
try:
 
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
                      (ctypes.util.find_library("c"))
 
100
                      .if_nametoindex)
 
101
except (OSError, AttributeError):
 
102
    def if_nametoindex(interface):
 
103
        "Get an interface index the hard way, i.e. using fcntl()"
 
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
105
        with contextlib.closing(socket.socket()) as s:
 
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
107
                                struct.pack(str("16s16x"),
 
108
                                            interface))
 
109
        interface_index = struct.unpack(str("I"),
 
110
                                        ifreq[16:20])[0]
 
111
        return interface_index
 
112
 
 
113
 
 
114
def initlogger(debug, level=logging.WARNING):
 
115
    """init logger and add loglevel"""
 
116
    
 
117
    syslogger.setFormatter(logging.Formatter
 
118
                           ('Mandos [%(process)d]: %(levelname)s:'
 
119
                            ' %(message)s'))
 
120
    logger.addHandler(syslogger)
 
121
    
 
122
    if debug:
 
123
        console = logging.StreamHandler()
 
124
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
125
                                               ' [%(process)d]:'
 
126
                                               ' %(levelname)s:'
 
127
                                               ' %(message)s'))
 
128
        logger.addHandler(console)
 
129
    logger.setLevel(level)
 
130
 
 
131
 
 
132
class PGPError(Exception):
 
133
    """Exception if encryption/decryption fails"""
 
134
    pass
 
135
 
 
136
 
 
137
class PGPEngine(object):
 
138
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
139
    def __init__(self):
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
141
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
142
        self.gnupg = GnuPGInterface.GnuPG()
 
143
        self.gnupg.options.meta_interactive = False
 
144
        self.gnupg.options.homedir = self.tempdir
 
145
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
146
                                              '--quiet',
 
147
                                              '--no-use-agent'])
 
148
    
 
149
    def __enter__(self):
 
150
        return self
 
151
    
 
152
    def __exit__ (self, exc_type, exc_value, traceback):
 
153
        self._cleanup()
 
154
        return False
 
155
    
 
156
    def __del__(self):
 
157
        self._cleanup()
 
158
    
 
159
    def _cleanup(self):
 
160
        if self.tempdir is not None:
 
161
            # Delete contents of tempdir
 
162
            for root, dirs, files in os.walk(self.tempdir,
 
163
                                             topdown = False):
 
164
                for filename in files:
 
165
                    os.remove(os.path.join(root, filename))
 
166
                for dirname in dirs:
 
167
                    os.rmdir(os.path.join(root, dirname))
 
168
            # Remove tempdir
 
169
            os.rmdir(self.tempdir)
 
170
            self.tempdir = None
 
171
    
 
172
    def password_encode(self, password):
 
173
        # Passphrase can not be empty and can not contain newlines or
 
174
        # NUL bytes.  So we prefix it and hex encode it.
 
175
        return b"mandos" + binascii.hexlify(password)
 
176
    
 
177
    def encrypt(self, data, password):
 
178
        self.gnupg.passphrase = self.password_encode(password)
 
179
        with open(os.devnull, "w") as devnull:
 
180
            try:
 
181
                proc = self.gnupg.run(['--symmetric'],
 
182
                                      create_fhs=['stdin', 'stdout'],
 
183
                                      attach_fhs={'stderr': devnull})
 
184
                with contextlib.closing(proc.handles['stdin']) as f:
 
185
                    f.write(data)
 
186
                with contextlib.closing(proc.handles['stdout']) as f:
 
187
                    ciphertext = f.read()
 
188
                proc.wait()
 
189
            except IOError as e:
 
190
                raise PGPError(e)
 
191
        self.gnupg.passphrase = None
 
192
        return ciphertext
 
193
    
 
194
    def decrypt(self, data, password):
 
195
        self.gnupg.passphrase = self.password_encode(password)
 
196
        with open(os.devnull, "w") as devnull:
 
197
            try:
 
198
                proc = self.gnupg.run(['--decrypt'],
 
199
                                      create_fhs=['stdin', 'stdout'],
 
200
                                      attach_fhs={'stderr': devnull})
 
201
                with contextlib.closing(proc.handles['stdin']) as f:
 
202
                    f.write(data)
 
203
                with contextlib.closing(proc.handles['stdout']) as f:
 
204
                    decrypted_plaintext = f.read()
 
205
                proc.wait()
 
206
            except IOError as e:
 
207
                raise PGPError(e)
 
208
        self.gnupg.passphrase = None
 
209
        return decrypted_plaintext
107
210
 
108
211
 
109
212
class AvahiError(Exception):
140
243
    server: D-Bus Server
141
244
    bus: dbus.SystemBus()
142
245
    """
 
246
    
143
247
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
248
                 servicetype = None, port = None, TXT = None,
145
249
                 domain = "", host = "", max_renames = 32768,
158
262
        self.server = None
159
263
        self.bus = bus
160
264
        self.entry_group_state_changed_match = None
 
265
    
161
266
    def rename(self):
162
267
        """Derived from the Avahi example code"""
163
268
        if self.rename_count >= self.max_renames:
173
278
        try:
174
279
            self.add()
175
280
        except dbus.exceptions.DBusException as error:
176
 
            logger.critical("DBusException: %s", error)
 
281
            logger.critical("D-Bus Exception", exc_info=error)
177
282
            self.cleanup()
178
283
            os._exit(1)
179
284
        self.rename_count += 1
 
285
    
180
286
    def remove(self):
181
287
        """Derived from the Avahi example code"""
182
288
        if self.entry_group_state_changed_match is not None:
184
290
            self.entry_group_state_changed_match = None
185
291
        if self.group is not None:
186
292
            self.group.Reset()
 
293
    
187
294
    def add(self):
188
295
        """Derived from the Avahi example code"""
189
296
        self.remove()
206
313
            dbus.UInt16(self.port),
207
314
            avahi.string_array_to_txt_array(self.TXT))
208
315
        self.group.Commit()
 
316
    
209
317
    def entry_group_state_changed(self, state, error):
210
318
        """Derived from the Avahi example code"""
211
319
        logger.debug("Avahi entry group state change: %i", state)
218
326
        elif state == avahi.ENTRY_GROUP_FAILURE:
219
327
            logger.critical("Avahi: Error in group state changed %s",
220
328
                            unicode(error))
221
 
            raise AvahiGroupError("State changed: %s"
222
 
                                  % unicode(error))
 
329
            raise AvahiGroupError("State changed: {0!s}"
 
330
                                  .format(error))
 
331
    
223
332
    def cleanup(self):
224
333
        """Derived from the Avahi example code"""
225
334
        if self.group is not None:
226
335
            try:
227
336
                self.group.Free()
228
337
            except (dbus.exceptions.UnknownMethodException,
229
 
                    dbus.exceptions.DBusException) as e:
 
338
                    dbus.exceptions.DBusException):
230
339
                pass
231
340
            self.group = None
232
341
        self.remove()
 
342
    
233
343
    def server_state_changed(self, state, error=None):
234
344
        """Derived from the Avahi example code"""
235
345
        logger.debug("Avahi server state change: %i", state)
254
364
                logger.debug("Unknown state: %r", state)
255
365
            else:
256
366
                logger.debug("Unknown state: %r: %r", state, error)
 
367
    
257
368
    def activate(self):
258
369
        """Derived from the Avahi example code"""
259
370
        if self.server is None:
271
382
        """Add the new name to the syslog messages"""
272
383
        ret = AvahiService.rename(self)
273
384
        syslogger.setFormatter(logging.Formatter
274
 
                               ('Mandos (%s) [%%(process)d]:'
275
 
                                ' %%(levelname)s: %%(message)s'
276
 
                                % self.name))
 
385
                               ('Mandos ({0}) [%(process)d]:'
 
386
                                ' %(levelname)s: %(message)s'
 
387
                                .format(self.name)))
277
388
        return ret
278
389
 
279
 
def _timedelta_to_milliseconds(td):
 
390
def timedelta_to_milliseconds(td):
280
391
    "Convert a datetime.timedelta() to milliseconds"
281
392
    return ((td.days * 24 * 60 * 60 * 1000)
282
393
            + (td.seconds * 1000)
283
394
            + (td.microseconds // 1000))
284
 
        
 
395
 
285
396
class Client(object):
286
397
    """A representation of a client host served by this server.
287
398
    
288
399
    Attributes:
289
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
400
    approved:   bool(); 'None' if not yet approved/disapproved
290
401
    approval_delay: datetime.timedelta(); Time to wait for approval
291
402
    approval_duration: datetime.timedelta(); Duration of one approval
292
403
    checker:    subprocess.Popen(); a running checker process used
311
422
    last_approval_request: datetime.datetime(); (UTC) or None
312
423
    last_checked_ok: datetime.datetime(); (UTC) or None
313
424
    last_checker_status: integer between 0 and 255 reflecting exit
314
 
                         status of last checker. -1 reflect crashed
315
 
                         checker, or None.
316
 
    last_enabled: datetime.datetime(); (UTC)
 
425
                         status of last checker. -1 reflects crashed
 
426
                         checker, -2 means no checker completed yet.
 
427
    last_enabled: datetime.datetime(); (UTC) or None
317
428
    name:       string; from the config file, used in log messages and
318
429
                        D-Bus identifiers
319
430
    secret:     bytestring; sent verbatim (over TLS) to client
320
431
    timeout:    datetime.timedelta(); How long from last_checked_ok
321
432
                                      until this client is disabled
322
 
    extended_timeout:   extra long timeout when password has been sent
 
433
    extended_timeout:   extra long timeout when secret has been sent
323
434
    runtime_expansions: Allowed attributes for runtime expansion.
324
435
    expires:    datetime.datetime(); time (UTC) when a client will be
325
436
                disabled, or None
329
440
                          "created", "enabled", "fingerprint",
330
441
                          "host", "interval", "last_checked_ok",
331
442
                          "last_enabled", "name", "timeout")
 
443
    client_defaults = { "timeout": "5m",
 
444
                        "extended_timeout": "15m",
 
445
                        "interval": "2m",
 
446
                        "checker": "fping -q -- %%(host)s",
 
447
                        "host": "",
 
448
                        "approval_delay": "0s",
 
449
                        "approval_duration": "1s",
 
450
                        "approved_by_default": "True",
 
451
                        "enabled": "True",
 
452
                        }
332
453
    
333
454
    def timeout_milliseconds(self):
334
455
        "Return the 'timeout' attribute in milliseconds"
335
 
        return _timedelta_to_milliseconds(self.timeout)
 
456
        return timedelta_to_milliseconds(self.timeout)
336
457
    
337
458
    def extended_timeout_milliseconds(self):
338
459
        "Return the 'extended_timeout' attribute in milliseconds"
339
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
460
        return timedelta_to_milliseconds(self.extended_timeout)
340
461
    
341
462
    def interval_milliseconds(self):
342
463
        "Return the 'interval' attribute in milliseconds"
343
 
        return _timedelta_to_milliseconds(self.interval)
 
464
        return timedelta_to_milliseconds(self.interval)
344
465
    
345
466
    def approval_delay_milliseconds(self):
346
 
        return _timedelta_to_milliseconds(self.approval_delay)
347
 
    
348
 
    def __init__(self, name = None, config=None):
349
 
        """Note: the 'checker' key in 'config' sets the
350
 
        'checker_command' attribute and *not* the 'checker'
351
 
        attribute."""
 
467
        return timedelta_to_milliseconds(self.approval_delay)
 
468
    
 
469
    @staticmethod
 
470
    def config_parser(config):
 
471
        """Construct a new dict of client settings of this form:
 
472
        { client_name: {setting_name: value, ...}, ...}
 
473
        with exceptions for any special settings as defined above.
 
474
        NOTE: Must be a pure function. Must return the same result
 
475
        value given the same arguments.
 
476
        """
 
477
        settings = {}
 
478
        for client_name in config.sections():
 
479
            section = dict(config.items(client_name))
 
480
            client = settings[client_name] = {}
 
481
            
 
482
            client["host"] = section["host"]
 
483
            # Reformat values from string types to Python types
 
484
            client["approved_by_default"] = config.getboolean(
 
485
                client_name, "approved_by_default")
 
486
            client["enabled"] = config.getboolean(client_name,
 
487
                                                  "enabled")
 
488
            
 
489
            client["fingerprint"] = (section["fingerprint"].upper()
 
490
                                     .replace(" ", ""))
 
491
            if "secret" in section:
 
492
                client["secret"] = section["secret"].decode("base64")
 
493
            elif "secfile" in section:
 
494
                with open(os.path.expanduser(os.path.expandvars
 
495
                                             (section["secfile"])),
 
496
                          "rb") as secfile:
 
497
                    client["secret"] = secfile.read()
 
498
            else:
 
499
                raise TypeError("No secret or secfile for section {0}"
 
500
                                .format(section))
 
501
            client["timeout"] = string_to_delta(section["timeout"])
 
502
            client["extended_timeout"] = string_to_delta(
 
503
                section["extended_timeout"])
 
504
            client["interval"] = string_to_delta(section["interval"])
 
505
            client["approval_delay"] = string_to_delta(
 
506
                section["approval_delay"])
 
507
            client["approval_duration"] = string_to_delta(
 
508
                section["approval_duration"])
 
509
            client["checker_command"] = section["checker"]
 
510
            client["last_approval_request"] = None
 
511
            client["last_checked_ok"] = None
 
512
            client["last_checker_status"] = -2
 
513
        
 
514
        return settings
 
515
    
 
516
    def __init__(self, settings, name = None):
352
517
        self.name = name
353
 
        if config is None:
354
 
            config = {}
 
518
        # adding all client settings
 
519
        for setting, value in settings.iteritems():
 
520
            setattr(self, setting, value)
 
521
        
 
522
        if self.enabled:
 
523
            if not hasattr(self, "last_enabled"):
 
524
                self.last_enabled = datetime.datetime.utcnow()
 
525
            if not hasattr(self, "expires"):
 
526
                self.expires = (datetime.datetime.utcnow()
 
527
                                + self.timeout)
 
528
        else:
 
529
            self.last_enabled = None
 
530
            self.expires = None
 
531
        
355
532
        logger.debug("Creating client %r", self.name)
356
533
        # Uppercase and remove spaces from fingerprint for later
357
534
        # comparison purposes with return value from the fingerprint()
358
535
        # function
359
 
        self.fingerprint = (config["fingerprint"].upper()
360
 
                            .replace(" ", ""))
361
536
        logger.debug("  Fingerprint: %s", self.fingerprint)
362
 
        if "secret" in config:
363
 
            self.secret = config["secret"].decode("base64")
364
 
        elif "secfile" in config:
365
 
            with open(os.path.expanduser(os.path.expandvars
366
 
                                         (config["secfile"])),
367
 
                      "rb") as secfile:
368
 
                self.secret = secfile.read()
369
 
        else:
370
 
            raise TypeError("No secret or secfile for client %s"
371
 
                            % self.name)
372
 
        self.host = config.get("host", "")
373
 
        self.created = datetime.datetime.utcnow()
374
 
        self.enabled = True
375
 
        self.last_approval_request = None
376
 
        self.last_enabled = datetime.datetime.utcnow()
377
 
        self.last_checked_ok = None
378
 
        self.last_checker_status = None
379
 
        self.timeout = string_to_delta(config["timeout"])
380
 
        self.extended_timeout = string_to_delta(config
381
 
                                                ["extended_timeout"])
382
 
        self.interval = string_to_delta(config["interval"])
 
537
        self.created = settings.get("created",
 
538
                                    datetime.datetime.utcnow())
 
539
        
 
540
        # attributes specific for this server instance
383
541
        self.checker = None
384
542
        self.checker_initiator_tag = None
385
543
        self.disable_initiator_tag = None
386
 
        self.expires = datetime.datetime.utcnow() + self.timeout
387
544
        self.checker_callback_tag = None
388
 
        self.checker_command = config["checker"]
389
545
        self.current_checker_command = None
390
 
        self._approved = None
391
 
        self.approved_by_default = config.get("approved_by_default",
392
 
                                              True)
 
546
        self.approved = None
393
547
        self.approvals_pending = 0
394
 
        self.approval_delay = string_to_delta(
395
 
            config["approval_delay"])
396
 
        self.approval_duration = string_to_delta(
397
 
            config["approval_duration"])
398
548
        self.changedstate = (multiprocessing_manager
399
549
                             .Condition(multiprocessing_manager
400
550
                                        .Lock()))
401
 
        self.client_structure = [attr for attr
402
 
                                 in self.__dict__.iterkeys()
 
551
        self.client_structure = [attr for attr in
 
552
                                 self.__dict__.iterkeys()
403
553
                                 if not attr.startswith("_")]
404
554
        self.client_structure.append("client_structure")
405
 
 
406
 
 
 
555
        
407
556
        for name, t in inspect.getmembers(type(self),
408
557
                                          lambda obj:
409
558
                                              isinstance(obj,
449
598
    
450
599
    def __del__(self):
451
600
        self.disable()
452
 
 
 
601
    
453
602
    def init_checker(self):
454
603
        # Schedule a new checker to be started an 'interval' from now,
455
604
        # and every interval from then on.
462
611
                                    self.disable))
463
612
        # Also start a new checker *right now*.
464
613
        self.start_checker()
465
 
 
466
 
        
 
614
    
467
615
    def checker_callback(self, pid, condition, command):
468
616
        """The checker has completed, so take appropriate actions."""
469
617
        self.checker_callback_tag = None
470
618
        self.checker = None
471
619
        if os.WIFEXITED(condition):
472
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
620
            self.last_checker_status = os.WEXITSTATUS(condition)
473
621
            if self.last_checker_status == 0:
474
622
                logger.info("Checker for %(name)s succeeded",
475
623
                            vars(self))
482
630
            logger.warning("Checker for %(name)s crashed?",
483
631
                           vars(self))
484
632
    
485
 
    def checked_ok(self, timeout=None):
486
 
        """Bump up the timeout for this client.
487
 
        
488
 
        This should only be called when the client has been seen,
489
 
        alive and well.
490
 
        """
 
633
    def checked_ok(self):
 
634
        """Assert that the client has been seen, alive and well."""
 
635
        self.last_checked_ok = datetime.datetime.utcnow()
 
636
        self.last_checker_status = 0
 
637
        self.bump_timeout()
 
638
    
 
639
    def bump_timeout(self, timeout=None):
 
640
        """Bump up the timeout for this client."""
491
641
        if timeout is None:
492
642
            timeout = self.timeout
493
 
        self.last_checked_ok = datetime.datetime.utcnow()
494
643
        if self.disable_initiator_tag is not None:
495
644
            gobject.source_remove(self.disable_initiator_tag)
496
645
        if getattr(self, "enabled", False):
497
646
            self.disable_initiator_tag = (gobject.timeout_add
498
 
                                          (_timedelta_to_milliseconds
 
647
                                          (timedelta_to_milliseconds
499
648
                                           (timeout), self.disable))
500
649
            self.expires = datetime.datetime.utcnow() + timeout
501
650
    
547
696
                try:
548
697
                    command = self.checker_command % escaped_attrs
549
698
                except TypeError as error:
550
 
                    logger.error('Could not format string "%s":'
551
 
                                 ' %s', self.checker_command, error)
 
699
                    logger.error('Could not format string "%s"',
 
700
                                 self.checker_command, exc_info=error)
552
701
                    return True # Try again later
553
702
            self.current_checker_command = command
554
703
            try:
572
721
                    gobject.source_remove(self.checker_callback_tag)
573
722
                    self.checker_callback(pid, status, command)
574
723
            except OSError as error:
575
 
                logger.error("Failed to start subprocess: %s",
576
 
                             error)
 
724
                logger.error("Failed to start subprocess",
 
725
                             exc_info=error)
577
726
        # Re-run this periodically if run by gobject.timeout_add
578
727
        return True
579
728
    
586
735
            return
587
736
        logger.debug("Stopping checker for %(name)s", vars(self))
588
737
        try:
589
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
738
            self.checker.terminate()
590
739
            #time.sleep(0.5)
591
740
            #if self.checker.poll() is None:
592
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
741
            #    self.checker.kill()
593
742
        except OSError as error:
594
743
            if error.errno != errno.ESRCH: # No such process
595
744
                raise
596
745
        self.checker = None
597
746
 
598
 
    # Encrypts a client secret and stores it in a varible
599
 
    # encrypted_secret
600
 
    def encrypt_secret(self, key):
601
 
        # Encryption-key need to be of a specific size, so we hash
602
 
        # supplied key
603
 
        hasheng = hashlib.sha256()
604
 
        hasheng.update(key)
605
 
        encryptionkey = hasheng.digest()
606
 
 
607
 
        # Create validation hash so we know at decryption if it was
608
 
        # sucessful
609
 
        hasheng = hashlib.sha256()
610
 
        hasheng.update(self.secret)
611
 
        validationhash = hasheng.digest()
612
 
 
613
 
        # Encrypt secret
614
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
615
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
616
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
617
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
618
 
        self.encrypted_secret = (ciphertext, iv)
619
 
 
620
 
    # Decrypt a encrypted client secret
621
 
    def decrypt_secret(self, key):
622
 
        # Decryption-key need to be of a specific size, so we hash
623
 
        # supplied key
624
 
        hasheng = hashlib.sha256()
625
 
        hasheng.update(key)
626
 
        encryptionkey = hasheng.digest()
627
 
 
628
 
        # Decrypt encrypted secret
629
 
        ciphertext, iv = self.encrypted_secret
630
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
631
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
632
 
        plain = ciphereng.decrypt(ciphertext)
633
 
 
634
 
        # Validate decrypted secret to know if it was succesful
635
 
        hasheng = hashlib.sha256()
636
 
        validationhash = plain[:hasheng.digest_size]
637
 
        secret = plain[hasheng.digest_size:]
638
 
        hasheng.update(secret)
639
 
 
640
 
        # If validation fails, we use key as new secret. Otherwise, we
641
 
        # use the decrypted secret
642
 
        if hasheng.digest() == validationhash:
643
 
            self.secret = secret
644
 
        else:
645
 
            self.secret = key
646
 
        del self.encrypted_secret
647
 
 
648
747
 
649
748
def dbus_service_property(dbus_interface, signature="v",
650
749
                          access="readwrite", byte_arrays=False):
662
761
    # "Set" method, so we fail early here:
663
762
    if byte_arrays and signature != "ay":
664
763
        raise ValueError("Byte arrays not supported for non-'ay'"
665
 
                         " signature %r" % signature)
 
764
                         " signature {0!r}".format(signature))
666
765
    def decorator(func):
667
766
        func._dbus_is_property = True
668
767
        func._dbus_interface = dbus_interface
676
775
    return decorator
677
776
 
678
777
 
 
778
def dbus_interface_annotations(dbus_interface):
 
779
    """Decorator for marking functions returning interface annotations
 
780
    
 
781
    Usage:
 
782
    
 
783
    @dbus_interface_annotations("org.example.Interface")
 
784
    def _foo(self):  # Function name does not matter
 
785
        return {"org.freedesktop.DBus.Deprecated": "true",
 
786
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
787
                    "false"}
 
788
    """
 
789
    def decorator(func):
 
790
        func._dbus_is_interface = True
 
791
        func._dbus_interface = dbus_interface
 
792
        func._dbus_name = dbus_interface
 
793
        return func
 
794
    return decorator
 
795
 
 
796
 
 
797
def dbus_annotations(annotations):
 
798
    """Decorator to annotate D-Bus methods, signals or properties
 
799
    Usage:
 
800
    
 
801
    @dbus_service_property("org.example.Interface", signature="b",
 
802
                           access="r")
 
803
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
804
                        "org.freedesktop.DBus.Property."
 
805
                        "EmitsChangedSignal": "false"})
 
806
    def Property_dbus_property(self):
 
807
        return dbus.Boolean(False)
 
808
    """
 
809
    def decorator(func):
 
810
        func._dbus_annotations = annotations
 
811
        return func
 
812
    return decorator
 
813
 
 
814
 
679
815
class DBusPropertyException(dbus.exceptions.DBusException):
680
816
    """A base class for D-Bus property-related exceptions
681
817
    """
704
840
    """
705
841
    
706
842
    @staticmethod
707
 
    def _is_dbus_property(obj):
708
 
        return getattr(obj, "_dbus_is_property", False)
 
843
    def _is_dbus_thing(thing):
 
844
        """Returns a function testing if an attribute is a D-Bus thing
 
845
        
 
846
        If called like _is_dbus_thing("method") it returns a function
 
847
        suitable for use as predicate to inspect.getmembers().
 
848
        """
 
849
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
850
                                   False)
709
851
    
710
 
    def _get_all_dbus_properties(self):
 
852
    def _get_all_dbus_things(self, thing):
711
853
        """Returns a generator of (name, attribute) pairs
712
854
        """
713
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
855
        return ((getattr(athing.__get__(self), "_dbus_name",
 
856
                         name),
 
857
                 athing.__get__(self))
714
858
                for cls in self.__class__.__mro__
715
 
                for name, prop in
716
 
                inspect.getmembers(cls, self._is_dbus_property))
 
859
                for name, athing in
 
860
                inspect.getmembers(cls,
 
861
                                   self._is_dbus_thing(thing)))
717
862
    
718
863
    def _get_dbus_property(self, interface_name, property_name):
719
864
        """Returns a bound method if one exists which is a D-Bus
721
866
        """
722
867
        for cls in  self.__class__.__mro__:
723
868
            for name, value in (inspect.getmembers
724
 
                                (cls, self._is_dbus_property)):
 
869
                                (cls,
 
870
                                 self._is_dbus_thing("property"))):
725
871
                if (value._dbus_name == property_name
726
872
                    and value._dbus_interface == interface_name):
727
873
                    return value.__get__(self)
756
902
            # signatures other than "ay".
757
903
            if prop._dbus_signature != "ay":
758
904
                raise ValueError
759
 
            value = dbus.ByteArray(''.join(unichr(byte)
760
 
                                           for byte in value))
 
905
            value = dbus.ByteArray(b''.join(chr(byte)
 
906
                                            for byte in value))
761
907
        prop(value)
762
908
    
763
909
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
768
914
        
769
915
        Note: Will not include properties with access="write".
770
916
        """
771
 
        all = {}
772
 
        for name, prop in self._get_all_dbus_properties():
 
917
        properties = {}
 
918
        for name, prop in self._get_all_dbus_things("property"):
773
919
            if (interface_name
774
920
                and interface_name != prop._dbus_interface):
775
921
                # Interface non-empty but did not match
779
925
                continue
780
926
            value = prop()
781
927
            if not hasattr(value, "variant_level"):
782
 
                all[name] = value
 
928
                properties[name] = value
783
929
                continue
784
 
            all[name] = type(value)(value, variant_level=
785
 
                                    value.variant_level+1)
786
 
        return dbus.Dictionary(all, signature="sv")
 
930
            properties[name] = type(value)(value, variant_level=
 
931
                                           value.variant_level+1)
 
932
        return dbus.Dictionary(properties, signature="sv")
787
933
    
788
934
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
789
935
                         out_signature="s",
790
936
                         path_keyword='object_path',
791
937
                         connection_keyword='connection')
792
938
    def Introspect(self, object_path, connection):
793
 
        """Standard D-Bus method, overloaded to insert property tags.
 
939
        """Overloading of standard D-Bus method.
 
940
        
 
941
        Inserts property tags and interface annotation tags.
794
942
        """
795
943
        xmlstring = dbus.service.Object.Introspect(self, object_path,
796
944
                                                   connection)
803
951
                e.setAttribute("access", prop._dbus_access)
804
952
                return e
805
953
            for if_tag in document.getElementsByTagName("interface"):
 
954
                # Add property tags
806
955
                for tag in (make_tag(document, name, prop)
807
956
                            for name, prop
808
 
                            in self._get_all_dbus_properties()
 
957
                            in self._get_all_dbus_things("property")
809
958
                            if prop._dbus_interface
810
959
                            == if_tag.getAttribute("name")):
811
960
                    if_tag.appendChild(tag)
 
961
                # Add annotation tags
 
962
                for typ in ("method", "signal", "property"):
 
963
                    for tag in if_tag.getElementsByTagName(typ):
 
964
                        annots = dict()
 
965
                        for name, prop in (self.
 
966
                                           _get_all_dbus_things(typ)):
 
967
                            if (name == tag.getAttribute("name")
 
968
                                and prop._dbus_interface
 
969
                                == if_tag.getAttribute("name")):
 
970
                                annots.update(getattr
 
971
                                              (prop,
 
972
                                               "_dbus_annotations",
 
973
                                               {}))
 
974
                        for name, value in annots.iteritems():
 
975
                            ann_tag = document.createElement(
 
976
                                "annotation")
 
977
                            ann_tag.setAttribute("name", name)
 
978
                            ann_tag.setAttribute("value", value)
 
979
                            tag.appendChild(ann_tag)
 
980
                # Add interface annotation tags
 
981
                for annotation, value in dict(
 
982
                    itertools.chain(
 
983
                        *(annotations().iteritems()
 
984
                          for name, annotations in
 
985
                          self._get_all_dbus_things("interface")
 
986
                          if name == if_tag.getAttribute("name")
 
987
                          ))).iteritems():
 
988
                    ann_tag = document.createElement("annotation")
 
989
                    ann_tag.setAttribute("name", annotation)
 
990
                    ann_tag.setAttribute("value", value)
 
991
                    if_tag.appendChild(ann_tag)
812
992
                # Add the names to the return values for the
813
993
                # "org.freedesktop.DBus.Properties" methods
814
994
                if (if_tag.getAttribute("name")
829
1009
        except (AttributeError, xml.dom.DOMException,
830
1010
                xml.parsers.expat.ExpatError) as error:
831
1011
            logger.error("Failed to override Introspection method",
832
 
                         error)
 
1012
                         exc_info=error)
833
1013
        return xmlstring
834
1014
 
835
1015
 
840
1020
    return dbus.String(dt.isoformat(),
841
1021
                       variant_level=variant_level)
842
1022
 
843
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
844
 
                                  .__metaclass__):
845
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
846
 
    will add additional D-Bus attributes matching a certain pattern.
 
1023
 
 
1024
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1025
    """A class decorator; applied to a subclass of
 
1026
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1027
    interface names according to the "alt_interface_names" mapping.
 
1028
    Usage:
 
1029
    
 
1030
    @alternate_dbus_names({"org.example.Interface":
 
1031
                               "net.example.AlternateInterface"})
 
1032
    class SampleDBusObject(dbus.service.Object):
 
1033
        @dbus.service.method("org.example.Interface")
 
1034
        def SampleDBusMethod():
 
1035
            pass
 
1036
    
 
1037
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1038
    reachable via two interfaces: "org.example.Interface" and
 
1039
    "net.example.AlternateInterface", the latter of which will have
 
1040
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1041
    "true", unless "deprecate" is passed with a False value.
 
1042
    
 
1043
    This works for methods and signals, and also for D-Bus properties
 
1044
    (from DBusObjectWithProperties) and interfaces (from the
 
1045
    dbus_interface_annotations decorator).
847
1046
    """
848
 
    def __new__(mcs, name, bases, attr):
849
 
        # Go through all the base classes which could have D-Bus
850
 
        # methods, signals, or properties in them
851
 
        for base in (b for b in bases
852
 
                     if issubclass(b, dbus.service.Object)):
853
 
            # Go though all attributes of the base class
854
 
            for attrname, attribute in inspect.getmembers(base):
 
1047
    def wrapper(cls):
 
1048
        for orig_interface_name, alt_interface_name in (
 
1049
            alt_interface_names.iteritems()):
 
1050
            attr = {}
 
1051
            interface_names = set()
 
1052
            # Go though all attributes of the class
 
1053
            for attrname, attribute in inspect.getmembers(cls):
855
1054
                # Ignore non-D-Bus attributes, and D-Bus attributes
856
1055
                # with the wrong interface name
857
1056
                if (not hasattr(attribute, "_dbus_interface")
858
1057
                    or not attribute._dbus_interface
859
 
                    .startswith("se.recompile.Mandos")):
 
1058
                    .startswith(orig_interface_name)):
860
1059
                    continue
861
1060
                # Create an alternate D-Bus interface name based on
862
1061
                # the current name
863
1062
                alt_interface = (attribute._dbus_interface
864
 
                                 .replace("se.recompile.Mandos",
865
 
                                          "se.bsnet.fukt.Mandos"))
 
1063
                                 .replace(orig_interface_name,
 
1064
                                          alt_interface_name))
 
1065
                interface_names.add(alt_interface)
866
1066
                # Is this a D-Bus signal?
867
1067
                if getattr(attribute, "_dbus_is_signal", False):
868
1068
                    # Extract the original non-method function by
883
1083
                                nonmethod_func.func_name,
884
1084
                                nonmethod_func.func_defaults,
885
1085
                                nonmethod_func.func_closure)))
 
1086
                    # Copy annotations, if any
 
1087
                    try:
 
1088
                        new_function._dbus_annotations = (
 
1089
                            dict(attribute._dbus_annotations))
 
1090
                    except AttributeError:
 
1091
                        pass
886
1092
                    # Define a creator of a function to call both the
887
 
                    # old and new functions, so both the old and new
888
 
                    # signals gets sent when the function is called
 
1093
                    # original and alternate functions, so both the
 
1094
                    # original and alternate signals gets sent when
 
1095
                    # the function is called
889
1096
                    def fixscope(func1, func2):
890
1097
                        """This function is a scope container to pass
891
1098
                        func1 and func2 to the "call_both" function
898
1105
                        return call_both
899
1106
                    # Create the "call_both" function and add it to
900
1107
                    # the class
901
 
                    attr[attrname] = fixscope(attribute,
902
 
                                              new_function)
 
1108
                    attr[attrname] = fixscope(attribute, new_function)
903
1109
                # Is this a D-Bus method?
904
1110
                elif getattr(attribute, "_dbus_is_method", False):
905
1111
                    # Create a new, but exactly alike, function
916
1122
                                        attribute.func_name,
917
1123
                                        attribute.func_defaults,
918
1124
                                        attribute.func_closure)))
 
1125
                    # Copy annotations, if any
 
1126
                    try:
 
1127
                        attr[attrname]._dbus_annotations = (
 
1128
                            dict(attribute._dbus_annotations))
 
1129
                    except AttributeError:
 
1130
                        pass
919
1131
                # Is this a D-Bus property?
920
1132
                elif getattr(attribute, "_dbus_is_property", False):
921
1133
                    # Create a new, but exactly alike, function
935
1147
                                        attribute.func_name,
936
1148
                                        attribute.func_defaults,
937
1149
                                        attribute.func_closure)))
938
 
        return type.__new__(mcs, name, bases, attr)
939
 
 
 
1150
                    # Copy annotations, if any
 
1151
                    try:
 
1152
                        attr[attrname]._dbus_annotations = (
 
1153
                            dict(attribute._dbus_annotations))
 
1154
                    except AttributeError:
 
1155
                        pass
 
1156
                # Is this a D-Bus interface?
 
1157
                elif getattr(attribute, "_dbus_is_interface", False):
 
1158
                    # Create a new, but exactly alike, function
 
1159
                    # object.  Decorate it to be a new D-Bus interface
 
1160
                    # with the alternate D-Bus interface name.  Add it
 
1161
                    # to the class.
 
1162
                    attr[attrname] = (dbus_interface_annotations
 
1163
                                      (alt_interface)
 
1164
                                      (types.FunctionType
 
1165
                                       (attribute.func_code,
 
1166
                                        attribute.func_globals,
 
1167
                                        attribute.func_name,
 
1168
                                        attribute.func_defaults,
 
1169
                                        attribute.func_closure)))
 
1170
            if deprecate:
 
1171
                # Deprecate all alternate interfaces
 
1172
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1173
                for interface_name in interface_names:
 
1174
                    @dbus_interface_annotations(interface_name)
 
1175
                    def func(self):
 
1176
                        return { "org.freedesktop.DBus.Deprecated":
 
1177
                                     "true" }
 
1178
                    # Find an unused name
 
1179
                    for aname in (iname.format(i)
 
1180
                                  for i in itertools.count()):
 
1181
                        if aname not in attr:
 
1182
                            attr[aname] = func
 
1183
                            break
 
1184
            if interface_names:
 
1185
                # Replace the class with a new subclass of it with
 
1186
                # methods, signals, etc. as created above.
 
1187
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1188
                           (cls,), attr)
 
1189
        return cls
 
1190
    return wrapper
 
1191
 
 
1192
 
 
1193
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1194
                                "se.bsnet.fukt.Mandos"})
940
1195
class ClientDBus(Client, DBusObjectWithProperties):
941
1196
    """A Client class using D-Bus
942
1197
    
952
1207
    
953
1208
    def __init__(self, bus = None, *args, **kwargs):
954
1209
        self.bus = bus
955
 
        self._approvals_pending = 0
956
1210
        Client.__init__(self, *args, **kwargs)
957
 
        self.add_to_dbus()
958
 
    
959
 
    def add_to_dbus(self):
960
1211
        # Only now, when this client is initialized, can it show up on
961
1212
        # the D-Bus
962
1213
        client_object_name = unicode(self.name).translate(
966
1217
                                 ("/clients/" + client_object_name))
967
1218
        DBusObjectWithProperties.__init__(self, self.bus,
968
1219
                                          self.dbus_object_path)
969
 
        
 
1220
    
970
1221
    def notifychangeproperty(transform_func,
971
1222
                             dbus_name, type_func=lambda x: x,
972
1223
                             variant_level=1):
973
1224
        """ Modify a variable so that it's a property which announces
974
1225
        its changes to DBus.
975
 
 
 
1226
        
976
1227
        transform_fun: Function that takes a value and a variant_level
977
1228
                       and transforms it to a D-Bus type.
978
1229
        dbus_name: D-Bus name of the variable
995
1246
        
996
1247
        return property(lambda self: getattr(self, attrname), setter)
997
1248
    
998
 
    
999
1249
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1000
1250
    approvals_pending = notifychangeproperty(dbus.Boolean,
1001
1251
                                             "ApprovalPending",
1008
1258
                                       checker is not None)
1009
1259
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1010
1260
                                           "LastCheckedOK")
 
1261
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1262
                                               "LastCheckerStatus")
1011
1263
    last_approval_request = notifychangeproperty(
1012
1264
        datetime_to_dbus, "LastApprovalRequest")
1013
1265
    approved_by_default = notifychangeproperty(dbus.Boolean,
1014
1266
                                               "ApprovedByDefault")
1015
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1267
    approval_delay = notifychangeproperty(dbus.UInt64,
1016
1268
                                          "ApprovalDelay",
1017
1269
                                          type_func =
1018
 
                                          _timedelta_to_milliseconds)
 
1270
                                          timedelta_to_milliseconds)
1019
1271
    approval_duration = notifychangeproperty(
1020
 
        dbus.UInt16, "ApprovalDuration",
1021
 
        type_func = _timedelta_to_milliseconds)
 
1272
        dbus.UInt64, "ApprovalDuration",
 
1273
        type_func = timedelta_to_milliseconds)
1022
1274
    host = notifychangeproperty(dbus.String, "Host")
1023
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1275
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1024
1276
                                   type_func =
1025
 
                                   _timedelta_to_milliseconds)
 
1277
                                   timedelta_to_milliseconds)
1026
1278
    extended_timeout = notifychangeproperty(
1027
 
        dbus.UInt16, "ExtendedTimeout",
1028
 
        type_func = _timedelta_to_milliseconds)
1029
 
    interval = notifychangeproperty(dbus.UInt16,
 
1279
        dbus.UInt64, "ExtendedTimeout",
 
1280
        type_func = timedelta_to_milliseconds)
 
1281
    interval = notifychangeproperty(dbus.UInt64,
1030
1282
                                    "Interval",
1031
1283
                                    type_func =
1032
 
                                    _timedelta_to_milliseconds)
 
1284
                                    timedelta_to_milliseconds)
1033
1285
    checker_command = notifychangeproperty(dbus.String, "Checker")
1034
1286
    
1035
1287
    del notifychangeproperty
1077
1329
        return r
1078
1330
    
1079
1331
    def _reset_approved(self):
1080
 
        self._approved = None
 
1332
        self.approved = None
1081
1333
        return False
1082
1334
    
1083
1335
    def approve(self, value=True):
1084
1336
        self.send_changedstate()
1085
 
        self._approved = value
1086
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1337
        self.approved = value
 
1338
        gobject.timeout_add(timedelta_to_milliseconds
1087
1339
                            (self.approval_duration),
1088
1340
                            self._reset_approved)
1089
1341
    
1090
 
    
1091
1342
    ## D-Bus methods, signals & properties
1092
1343
    _interface = "se.recompile.Mandos.Client"
1093
1344
    
 
1345
    ## Interfaces
 
1346
    
 
1347
    @dbus_interface_annotations(_interface)
 
1348
    def _foo(self):
 
1349
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1350
                     "false"}
 
1351
    
1094
1352
    ## Signals
1095
1353
    
1096
1354
    # CheckerCompleted - signal
1195
1453
                           access="readwrite")
1196
1454
    def ApprovalDuration_dbus_property(self, value=None):
1197
1455
        if value is None:       # get
1198
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1456
            return dbus.UInt64(timedelta_to_milliseconds(
1199
1457
                    self.approval_duration))
1200
1458
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1201
1459
    
1215
1473
    def Host_dbus_property(self, value=None):
1216
1474
        if value is None:       # get
1217
1475
            return dbus.String(self.host)
1218
 
        self.host = value
 
1476
        self.host = unicode(value)
1219
1477
    
1220
1478
    # Created - property
1221
1479
    @dbus_service_property(_interface, signature="s", access="read")
1222
1480
    def Created_dbus_property(self):
1223
 
        return dbus.String(datetime_to_dbus(self.created))
 
1481
        return datetime_to_dbus(self.created)
1224
1482
    
1225
1483
    # LastEnabled - property
1226
1484
    @dbus_service_property(_interface, signature="s", access="read")
1247
1505
            return
1248
1506
        return datetime_to_dbus(self.last_checked_ok)
1249
1507
    
 
1508
    # LastCheckerStatus - property
 
1509
    @dbus_service_property(_interface, signature="n",
 
1510
                           access="read")
 
1511
    def LastCheckerStatus_dbus_property(self):
 
1512
        return dbus.Int16(self.last_checker_status)
 
1513
    
1250
1514
    # Expires - property
1251
1515
    @dbus_service_property(_interface, signature="s", access="read")
1252
1516
    def Expires_dbus_property(self):
1264
1528
        if value is None:       # get
1265
1529
            return dbus.UInt64(self.timeout_milliseconds())
1266
1530
        self.timeout = datetime.timedelta(0, 0, 0, value)
1267
 
        if getattr(self, "disable_initiator_tag", None) is None:
1268
 
            return
1269
1531
        # Reschedule timeout
1270
 
        gobject.source_remove(self.disable_initiator_tag)
1271
 
        self.disable_initiator_tag = None
1272
 
        self.expires = None
1273
 
        time_to_die = _timedelta_to_milliseconds((self
1274
 
                                                  .last_checked_ok
1275
 
                                                  + self.timeout)
1276
 
                                                 - datetime.datetime
1277
 
                                                 .utcnow())
1278
 
        if time_to_die <= 0:
1279
 
            # The timeout has passed
1280
 
            self.disable()
1281
 
        else:
1282
 
            self.expires = (datetime.datetime.utcnow()
1283
 
                            + datetime.timedelta(milliseconds =
1284
 
                                                 time_to_die))
1285
 
            self.disable_initiator_tag = (gobject.timeout_add
1286
 
                                          (time_to_die, self.disable))
 
1532
        if self.enabled:
 
1533
            now = datetime.datetime.utcnow()
 
1534
            time_to_die = timedelta_to_milliseconds(
 
1535
                (self.last_checked_ok + self.timeout) - now)
 
1536
            if time_to_die <= 0:
 
1537
                # The timeout has passed
 
1538
                self.disable()
 
1539
            else:
 
1540
                self.expires = (now +
 
1541
                                datetime.timedelta(milliseconds =
 
1542
                                                   time_to_die))
 
1543
                if (getattr(self, "disable_initiator_tag", None)
 
1544
                    is None):
 
1545
                    return
 
1546
                gobject.source_remove(self.disable_initiator_tag)
 
1547
                self.disable_initiator_tag = (gobject.timeout_add
 
1548
                                              (time_to_die,
 
1549
                                               self.disable))
1287
1550
    
1288
1551
    # ExtendedTimeout - property
1289
1552
    @dbus_service_property(_interface, signature="t",
1302
1565
        self.interval = datetime.timedelta(0, 0, 0, value)
1303
1566
        if getattr(self, "checker_initiator_tag", None) is None:
1304
1567
            return
1305
 
        # Reschedule checker run
1306
 
        gobject.source_remove(self.checker_initiator_tag)
1307
 
        self.checker_initiator_tag = (gobject.timeout_add
1308
 
                                      (value, self.start_checker))
1309
 
        self.start_checker()    # Start one now, too
 
1568
        if self.enabled:
 
1569
            # Reschedule checker run
 
1570
            gobject.source_remove(self.checker_initiator_tag)
 
1571
            self.checker_initiator_tag = (gobject.timeout_add
 
1572
                                          (value, self.start_checker))
 
1573
            self.start_checker()    # Start one now, too
1310
1574
    
1311
1575
    # Checker - property
1312
1576
    @dbus_service_property(_interface, signature="s",
1314
1578
    def Checker_dbus_property(self, value=None):
1315
1579
        if value is None:       # get
1316
1580
            return dbus.String(self.checker_command)
1317
 
        self.checker_command = value
 
1581
        self.checker_command = unicode(value)
1318
1582
    
1319
1583
    # CheckerRunning - property
1320
1584
    @dbus_service_property(_interface, signature="b",
1349
1613
            raise KeyError()
1350
1614
    
1351
1615
    def __getattribute__(self, name):
1352
 
        if(name == '_pipe'):
 
1616
        if name == '_pipe':
1353
1617
            return super(ProxyClient, self).__getattribute__(name)
1354
1618
        self._pipe.send(('getattr', name))
1355
1619
        data = self._pipe.recv()
1362
1626
            return func
1363
1627
    
1364
1628
    def __setattr__(self, name, value):
1365
 
        if(name == '_pipe'):
 
1629
        if name == '_pipe':
1366
1630
            return super(ProxyClient, self).__setattr__(name, value)
1367
1631
        self._pipe.send(('setattr', name, value))
1368
1632
 
1369
 
class ClientDBusTransitional(ClientDBus):
1370
 
    __metaclass__ = AlternateDBusNamesMetaclass
1371
1633
 
1372
1634
class ClientHandler(socketserver.BaseRequestHandler, object):
1373
1635
    """A class to handle client connections.
1456
1718
                            client.Rejected("Disabled")
1457
1719
                        return
1458
1720
                    
1459
 
                    if client._approved or not client.approval_delay:
 
1721
                    if client.approved or not client.approval_delay:
1460
1722
                        #We are approved or approval is disabled
1461
1723
                        break
1462
 
                    elif client._approved is None:
 
1724
                    elif client.approved is None:
1463
1725
                        logger.info("Client %s needs approval",
1464
1726
                                    client.name)
1465
1727
                        if self.server.use_dbus:
1479
1741
                    time = datetime.datetime.now()
1480
1742
                    client.changedstate.acquire()
1481
1743
                    (client.changedstate.wait
1482
 
                     (float(client._timedelta_to_milliseconds(delay)
 
1744
                     (float(client.timedelta_to_milliseconds(delay)
1483
1745
                            / 1000)))
1484
1746
                    client.changedstate.release()
1485
1747
                    time2 = datetime.datetime.now()
1502
1764
                    try:
1503
1765
                        sent = session.send(client.secret[sent_size:])
1504
1766
                    except gnutls.errors.GNUTLSError as error:
1505
 
                        logger.warning("gnutls send failed")
 
1767
                        logger.warning("gnutls send failed",
 
1768
                                       exc_info=error)
1506
1769
                        return
1507
1770
                    logger.debug("Sent: %d, remaining: %d",
1508
1771
                                 sent, len(client.secret)
1511
1774
                
1512
1775
                logger.info("Sending secret to %s", client.name)
1513
1776
                # bump the timeout using extended_timeout
1514
 
                client.checked_ok(client.extended_timeout)
 
1777
                client.bump_timeout(client.extended_timeout)
1515
1778
                if self.server.use_dbus:
1516
1779
                    # Emit D-Bus signal
1517
1780
                    client.GotSecret()
1522
1785
                try:
1523
1786
                    session.bye()
1524
1787
                except gnutls.errors.GNUTLSError as error:
1525
 
                    logger.warning("GnuTLS bye failed")
 
1788
                    logger.warning("GnuTLS bye failed",
 
1789
                                   exc_info=error)
1526
1790
    
1527
1791
    @staticmethod
1528
1792
    def peer_certificate(session):
1584
1848
        # Convert the buffer to a Python bytestring
1585
1849
        fpr = ctypes.string_at(buf, buf_len.value)
1586
1850
        # Convert the bytestring to hexadecimal notation
1587
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1851
        hex_fpr = binascii.hexlify(fpr).upper()
1588
1852
        return hex_fpr
1589
1853
 
1590
1854
 
1593
1857
    def sub_process_main(self, request, address):
1594
1858
        try:
1595
1859
            self.finish_request(request, address)
1596
 
        except:
 
1860
        except Exception:
1597
1861
            self.handle_error(request, address)
1598
1862
        self.close_request(request)
1599
1863
    
1840
2104
            elif suffix == "w":
1841
2105
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1842
2106
            else:
1843
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2107
                raise ValueError("Unknown suffix {0!r}"
 
2108
                                 .format(suffix))
1844
2109
        except (ValueError, IndexError) as e:
1845
2110
            raise ValueError(*(e.args))
1846
2111
        timevalue += delta
1847
2112
    return timevalue
1848
2113
 
1849
2114
 
1850
 
def if_nametoindex(interface):
1851
 
    """Call the C function if_nametoindex(), or equivalent
1852
 
    
1853
 
    Note: This function cannot accept a unicode string."""
1854
 
    global if_nametoindex
1855
 
    try:
1856
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1857
 
                          (ctypes.util.find_library("c"))
1858
 
                          .if_nametoindex)
1859
 
    except (OSError, AttributeError):
1860
 
        logger.warning("Doing if_nametoindex the hard way")
1861
 
        def if_nametoindex(interface):
1862
 
            "Get an interface index the hard way, i.e. using fcntl()"
1863
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1864
 
            with contextlib.closing(socket.socket()) as s:
1865
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1866
 
                                    struct.pack(str("16s16x"),
1867
 
                                                interface))
1868
 
            interface_index = struct.unpack(str("I"),
1869
 
                                            ifreq[16:20])[0]
1870
 
            return interface_index
1871
 
    return if_nametoindex(interface)
1872
 
 
1873
 
 
1874
2115
def daemon(nochdir = False, noclose = False):
1875
2116
    """See daemon(3).  Standard BSD Unix function.
1876
2117
    
1884
2125
        sys.exit()
1885
2126
    if not noclose:
1886
2127
        # Close all standard open file descriptors
1887
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2128
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1888
2129
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1889
2130
            raise OSError(errno.ENODEV,
1890
 
                          "%s not a character device"
1891
 
                          % os.path.devnull)
 
2131
                          "{0} not a character device"
 
2132
                          .format(os.devnull))
1892
2133
        os.dup2(null, sys.stdin.fileno())
1893
2134
        os.dup2(null, sys.stdout.fileno())
1894
2135
        os.dup2(null, sys.stderr.fileno())
1903
2144
    
1904
2145
    parser = argparse.ArgumentParser()
1905
2146
    parser.add_argument("-v", "--version", action="version",
1906
 
                        version = "%%(prog)s %s" % version,
 
2147
                        version = "%(prog)s {0}".format(version),
1907
2148
                        help="show version number and exit")
1908
2149
    parser.add_argument("-i", "--interface", metavar="IF",
1909
2150
                        help="Bind to interface IF")
1932
2173
    parser.add_argument("--no-ipv6", action="store_false",
1933
2174
                        dest="use_ipv6", help="Do not use IPv6")
1934
2175
    parser.add_argument("--no-restore", action="store_false",
1935
 
                        dest="restore",
1936
 
                        help="Do not restore stored state",
1937
 
                        default=True)
1938
 
 
 
2176
                        dest="restore", help="Do not restore stored"
 
2177
                        " state")
 
2178
    parser.add_argument("--statedir", metavar="DIR",
 
2179
                        help="Directory to save/restore state in")
 
2180
    
1939
2181
    options = parser.parse_args()
1940
2182
    
1941
2183
    if options.check:
1954
2196
                        "use_dbus": "True",
1955
2197
                        "use_ipv6": "True",
1956
2198
                        "debuglevel": "",
 
2199
                        "restore": "True",
 
2200
                        "statedir": "/var/lib/mandos"
1957
2201
                        }
1958
2202
    
1959
2203
    # Parse config file for server-global settings
1976
2220
    # options, if set.
1977
2221
    for option in ("interface", "address", "port", "debug",
1978
2222
                   "priority", "servicename", "configdir",
1979
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2223
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2224
                   "statedir"):
1980
2225
        value = getattr(options, option)
1981
2226
        if value is not None:
1982
2227
            server_settings[option] = value
1994
2239
    debuglevel = server_settings["debuglevel"]
1995
2240
    use_dbus = server_settings["use_dbus"]
1996
2241
    use_ipv6 = server_settings["use_ipv6"]
 
2242
    stored_state_path = os.path.join(server_settings["statedir"],
 
2243
                                     stored_state_file)
 
2244
    
 
2245
    if debug:
 
2246
        initlogger(debug, logging.DEBUG)
 
2247
    else:
 
2248
        if not debuglevel:
 
2249
            initlogger(debug)
 
2250
        else:
 
2251
            level = getattr(logging, debuglevel.upper())
 
2252
            initlogger(debug, level)
1997
2253
    
1998
2254
    if server_settings["servicename"] != "Mandos":
1999
2255
        syslogger.setFormatter(logging.Formatter
2000
 
                               ('Mandos (%s) [%%(process)d]:'
2001
 
                                ' %%(levelname)s: %%(message)s'
2002
 
                                % server_settings["servicename"]))
 
2256
                               ('Mandos ({0}) [%(process)d]:'
 
2257
                                ' %(levelname)s: %(message)s'
 
2258
                                .format(server_settings
 
2259
                                        ["servicename"])))
2003
2260
    
2004
2261
    # Parse config file with clients
2005
 
    client_defaults = { "timeout": "5m",
2006
 
                        "extended_timeout": "15m",
2007
 
                        "interval": "2m",
2008
 
                        "checker": "fping -q -- %%(host)s",
2009
 
                        "host": "",
2010
 
                        "approval_delay": "0s",
2011
 
                        "approval_duration": "1s",
2012
 
                        }
2013
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2262
    client_config = configparser.SafeConfigParser(Client
 
2263
                                                  .client_defaults)
2014
2264
    client_config.read(os.path.join(server_settings["configdir"],
2015
2265
                                    "clients.conf"))
2016
2266
    
2030
2280
        pidfilename = "/var/run/mandos.pid"
2031
2281
        try:
2032
2282
            pidfile = open(pidfilename, "w")
2033
 
        except IOError:
2034
 
            logger.error("Could not open file %r", pidfilename)
 
2283
        except IOError as e:
 
2284
            logger.error("Could not open file %r", pidfilename,
 
2285
                         exc_info=e)
2035
2286
    
2036
 
    try:
2037
 
        uid = pwd.getpwnam("_mandos").pw_uid
2038
 
        gid = pwd.getpwnam("_mandos").pw_gid
2039
 
    except KeyError:
 
2287
    for name in ("_mandos", "mandos", "nobody"):
2040
2288
        try:
2041
 
            uid = pwd.getpwnam("mandos").pw_uid
2042
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2289
            uid = pwd.getpwnam(name).pw_uid
 
2290
            gid = pwd.getpwnam(name).pw_gid
 
2291
            break
2043
2292
        except KeyError:
2044
 
            try:
2045
 
                uid = pwd.getpwnam("nobody").pw_uid
2046
 
                gid = pwd.getpwnam("nobody").pw_gid
2047
 
            except KeyError:
2048
 
                uid = 65534
2049
 
                gid = 65534
 
2293
            continue
 
2294
    else:
 
2295
        uid = 65534
 
2296
        gid = 65534
2050
2297
    try:
2051
2298
        os.setgid(gid)
2052
2299
        os.setuid(uid)
2054
2301
        if error[0] != errno.EPERM:
2055
2302
            raise error
2056
2303
    
2057
 
    if not debug and not debuglevel:
2058
 
        logger.setLevel(logging.WARNING)
2059
 
    if debuglevel:
2060
 
        level = getattr(logging, debuglevel.upper())
2061
 
        logger.setLevel(level)
2062
 
    
2063
2304
    if debug:
2064
 
        logger.setLevel(logging.DEBUG)
2065
2305
        # Enable all possible GnuTLS debugging
2066
2306
        
2067
2307
        # "Use a log level over 10 to enable all debugging options."
2076
2316
         .gnutls_global_set_log_function(debug_gnutls))
2077
2317
        
2078
2318
        # Redirect stdin so all checkers get /dev/null
2079
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2319
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2080
2320
        os.dup2(null, sys.stdin.fileno())
2081
2321
        if null > 2:
2082
2322
            os.close(null)
2083
 
    else:
2084
 
        # No console logging
2085
 
        logger.removeHandler(console)
2086
2323
    
2087
2324
    # Need to fork before connecting to D-Bus
2088
2325
    if not debug:
2089
2326
        # Close all input and output, do double fork, etc.
2090
2327
        daemon()
2091
2328
    
 
2329
    gobject.threads_init()
 
2330
    
2092
2331
    global main_loop
2093
2332
    # From the Avahi example code
2094
 
    DBusGMainLoop(set_as_default=True )
 
2333
    DBusGMainLoop(set_as_default=True)
2095
2334
    main_loop = gobject.MainLoop()
2096
2335
    bus = dbus.SystemBus()
2097
2336
    # End of Avahi example code
2103
2342
                            ("se.bsnet.fukt.Mandos", bus,
2104
2343
                             do_not_queue=True))
2105
2344
        except dbus.exceptions.NameExistsException as e:
2106
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2345
            logger.error("Disabling D-Bus:", exc_info=e)
2107
2346
            use_dbus = False
2108
2347
            server_settings["use_dbus"] = False
2109
2348
            tcp_server.use_dbus = False
2121
2360
    
2122
2361
    client_class = Client
2123
2362
    if use_dbus:
2124
 
        client_class = functools.partial(ClientDBusTransitional,
2125
 
                                         bus = bus)
2126
 
    
2127
 
    special_settings = {
2128
 
        # Some settings need to be accessd by special methods;
2129
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2130
 
        "approved_by_default":
2131
 
            lambda section:
2132
 
            client_config.getboolean(section, "approved_by_default"),
2133
 
        }
2134
 
    # Construct a new dict of client settings of this form:
2135
 
    # { client_name: {setting_name: value, ...}, ...}
2136
 
    # with exceptions for any special settings as defined above
2137
 
    client_settings = dict((clientname,
2138
 
                           dict((setting,
2139
 
                                 (value if
2140
 
                                  setting not in special_settings
2141
 
                                  else special_settings[setting]
2142
 
                                  (clientname)))
2143
 
                                for setting, value
2144
 
                                in client_config.items(clientname)))
2145
 
                          for clientname in client_config.sections())
2146
 
    
 
2363
        client_class = functools.partial(ClientDBus, bus = bus)
 
2364
    
 
2365
    client_settings = Client.config_parser(client_config)
2147
2366
    old_client_settings = {}
2148
 
    clients_data = []
2149
 
 
2150
 
    # Get client data and settings from last running state. 
 
2367
    clients_data = {}
 
2368
    
 
2369
    # Get client data and settings from last running state.
2151
2370
    if server_settings["restore"]:
2152
2371
        try:
2153
2372
            with open(stored_state_path, "rb") as stored_state:
2154
 
                clients_data, old_client_settings = (
2155
 
                    pickle.load(stored_state))
 
2373
                clients_data, old_client_settings = (pickle.load
 
2374
                                                     (stored_state))
2156
2375
            os.remove(stored_state_path)
2157
2376
        except IOError as e:
2158
 
            logger.warning("Could not load persistant state: {0}"
2159
 
                           .format(e))
2160
 
            if e.errno != errno.ENOENT:
 
2377
            if e.errno == errno.ENOENT:
 
2378
                logger.warning("Could not load persistent state: {0}"
 
2379
                                .format(os.strerror(e.errno)))
 
2380
            else:
 
2381
                logger.critical("Could not load persistent state:",
 
2382
                                exc_info=e)
2161
2383
                raise
2162
 
 
2163
 
    for client in clients_data:
2164
 
        client_name = client["name"]
2165
 
        
2166
 
        # Decide which value to use after restoring saved state.
2167
 
        # We have three different values: Old config file,
2168
 
        # new config file, and saved state.
2169
 
        # New config value takes precedence if it differs from old
2170
 
        # config value, otherwise use saved state.
2171
 
        for name, value in client_settings[client_name].items():
 
2384
        except EOFError as e:
 
2385
            logger.warning("Could not load persistent state: "
 
2386
                           "EOFError:", exc_info=e)
 
2387
    
 
2388
    with PGPEngine() as pgp:
 
2389
        for client_name, client in clients_data.iteritems():
 
2390
            # Decide which value to use after restoring saved state.
 
2391
            # We have three different values: Old config file,
 
2392
            # new config file, and saved state.
 
2393
            # New config value takes precedence if it differs from old
 
2394
            # config value, otherwise use saved state.
 
2395
            for name, value in client_settings[client_name].items():
 
2396
                try:
 
2397
                    # For each value in new config, check if it
 
2398
                    # differs from the old config value (Except for
 
2399
                    # the "secret" attribute)
 
2400
                    if (name != "secret" and
 
2401
                        value != old_client_settings[client_name]
 
2402
                        [name]):
 
2403
                        client[name] = value
 
2404
                except KeyError:
 
2405
                    pass
 
2406
            
 
2407
            # Clients who has passed its expire date can still be
 
2408
            # enabled if its last checker was successful.  Clients
 
2409
            # whose checker succeeded before we stored its state is
 
2410
            # assumed to have successfully run all checkers during
 
2411
            # downtime.
 
2412
            if client["enabled"]:
 
2413
                if datetime.datetime.utcnow() >= client["expires"]:
 
2414
                    if not client["last_checked_ok"]:
 
2415
                        logger.warning(
 
2416
                            "disabling client {0} - Client never "
 
2417
                            "performed a successful checker"
 
2418
                            .format(client_name))
 
2419
                        client["enabled"] = False
 
2420
                    elif client["last_checker_status"] != 0:
 
2421
                        logger.warning(
 
2422
                            "disabling client {0} - Client "
 
2423
                            "last checker failed with error code {1}"
 
2424
                            .format(client_name,
 
2425
                                    client["last_checker_status"]))
 
2426
                        client["enabled"] = False
 
2427
                    else:
 
2428
                        client["expires"] = (datetime.datetime
 
2429
                                             .utcnow()
 
2430
                                             + client["timeout"])
 
2431
                        logger.debug("Last checker succeeded,"
 
2432
                                     " keeping {0} enabled"
 
2433
                                     .format(client_name))
2172
2434
            try:
2173
 
                # For each value in new config, check if it differs
2174
 
                # from the old config value (Except for the "secret"
2175
 
                # attribute)
2176
 
                if (name != "secret" and
2177
 
                    value != old_client_settings[client_name][name]):
2178
 
                    setattr(client, name, value)
2179
 
            except KeyError:
2180
 
                pass
2181
 
 
2182
 
        # Clients who has passed its expire date, can still be enabled
2183
 
        # if its last checker was sucessful. Clients who checkers
2184
 
        # failed before we stored it state is asumed to had failed
2185
 
        # checker during downtime.
2186
 
        if client["enabled"] and client["last_checked_ok"]:
2187
 
            if ((datetime.datetime.utcnow()
2188
 
                 - client["last_checked_ok"]) > client["interval"]):
2189
 
                if client["last_checker_status"] != 0:
2190
 
                    client["enabled"] = False
2191
 
                else:
2192
 
                    client["expires"] = (datetime.datetime.utcnow()
2193
 
                                         + client["timeout"])
2194
 
 
2195
 
        client["changedstate"] = (multiprocessing_manager
2196
 
                                  .Condition(multiprocessing_manager
2197
 
                                             .Lock()))
2198
 
        if use_dbus:
2199
 
            new_client = ClientDBusTransitional.__new__(
2200
 
                ClientDBusTransitional)
2201
 
            tcp_server.clients[client_name] = new_client
2202
 
            new_client.bus = bus
2203
 
            for name, value in client.iteritems():
2204
 
                setattr(new_client, name, value)
2205
 
            new_client._approvals_pending = 0
2206
 
            new_client.add_to_dbus()
2207
 
        else:
2208
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2209
 
            for name, value in client.iteritems():
2210
 
                setattr(tcp_server.clients[client_name], name, value)
2211
 
                
2212
 
        tcp_server.clients[client_name].decrypt_secret(
2213
 
            client_settings[client_name]["secret"])            
2214
 
        
2215
 
    # Create/remove clients based on new changes made to config
2216
 
    for clientname in set(old_client_settings) - set(client_settings):
2217
 
        del tcp_server.clients[clientname]
2218
 
    for clientname in set(client_settings) - set(old_client_settings):
2219
 
        tcp_server.clients[clientname] = client_class(name
2220
 
                                                      = clientname,
2221
 
                                                      config =
2222
 
                                                      client_settings
2223
 
                                                      [clientname])
 
2435
                client["secret"] = (
 
2436
                    pgp.decrypt(client["encrypted_secret"],
 
2437
                                client_settings[client_name]
 
2438
                                ["secret"]))
 
2439
            except PGPError:
 
2440
                # If decryption fails, we use secret from new settings
 
2441
                logger.debug("Failed to decrypt {0} old secret"
 
2442
                             .format(client_name))
 
2443
                client["secret"] = (
 
2444
                    client_settings[client_name]["secret"])
 
2445
    
 
2446
    # Add/remove clients based on new changes made to config
 
2447
    for client_name in (set(old_client_settings)
 
2448
                        - set(client_settings)):
 
2449
        del clients_data[client_name]
 
2450
    for client_name in (set(client_settings)
 
2451
                        - set(old_client_settings)):
 
2452
        clients_data[client_name] = client_settings[client_name]
 
2453
    
 
2454
    # Create all client objects
 
2455
    for client_name, client in clients_data.iteritems():
 
2456
        tcp_server.clients[client_name] = client_class(
 
2457
            name = client_name, settings = client)
2224
2458
    
2225
2459
    if not tcp_server.clients:
2226
2460
        logger.warning("No clients defined")
2227
 
        
 
2461
    
2228
2462
    if not debug:
2229
2463
        try:
2230
2464
            with pidfile:
2238
2472
            # "pidfile" was never created
2239
2473
            pass
2240
2474
        del pidfilename
2241
 
        
2242
2475
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2243
2476
    
2244
2477
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2245
2478
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2246
2479
    
2247
2480
    if use_dbus:
2248
 
        class MandosDBusService(dbus.service.Object):
 
2481
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2482
                                        "se.bsnet.fukt.Mandos"})
 
2483
        class MandosDBusService(DBusObjectWithProperties):
2249
2484
            """A D-Bus proxy object"""
2250
2485
            def __init__(self):
2251
2486
                dbus.service.Object.__init__(self, bus, "/")
2252
2487
            _interface = "se.recompile.Mandos"
2253
2488
            
 
2489
            @dbus_interface_annotations(_interface)
 
2490
            def _foo(self):
 
2491
                return { "org.freedesktop.DBus.Property"
 
2492
                         ".EmitsChangedSignal":
 
2493
                             "false"}
 
2494
            
2254
2495
            @dbus.service.signal(_interface, signature="o")
2255
2496
            def ClientAdded(self, objpath):
2256
2497
                "D-Bus signal"
2298
2539
            
2299
2540
            del _interface
2300
2541
        
2301
 
        class MandosDBusServiceTransitional(MandosDBusService):
2302
 
            __metaclass__ = AlternateDBusNamesMetaclass
2303
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2542
        mandos_dbus_service = MandosDBusService()
2304
2543
    
2305
2544
    def cleanup():
2306
2545
        "Cleanup function; run on exit"
2309
2548
        multiprocessing.active_children()
2310
2549
        if not (tcp_server.clients or client_settings):
2311
2550
            return
2312
 
 
 
2551
        
2313
2552
        # Store client before exiting. Secrets are encrypted with key
2314
2553
        # based on what config file has. If config file is
2315
2554
        # removed/edited, old secret will thus be unrecovable.
2316
 
        clients = []
2317
 
        for client in tcp_server.clients.itervalues():
2318
 
            client.encrypt_secret(
2319
 
                client_settings[client.name]["secret"])
2320
 
 
2321
 
            client_dict = {}
2322
 
 
2323
 
            # A list of attributes that will not be stored when
2324
 
            # shutting down.
2325
 
            exclude = set(("bus", "changedstate", "secret"))
2326
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2327
 
                exclude.add(name)
2328
 
                
2329
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2330
 
            for attr in client.client_structure:
2331
 
                if attr not in exclude:
2332
 
                    client_dict[attr] = getattr(client, attr)
2333
 
 
2334
 
            clients.append(client_dict) 
2335
 
            del client_settings[client.name]["secret"]
2336
 
            
 
2555
        clients = {}
 
2556
        with PGPEngine() as pgp:
 
2557
            for client in tcp_server.clients.itervalues():
 
2558
                key = client_settings[client.name]["secret"]
 
2559
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2560
                                                      key)
 
2561
                client_dict = {}
 
2562
                
 
2563
                # A list of attributes that can not be pickled
 
2564
                # + secret.
 
2565
                exclude = set(("bus", "changedstate", "secret",
 
2566
                               "checker"))
 
2567
                for name, typ in (inspect.getmembers
 
2568
                                  (dbus.service.Object)):
 
2569
                    exclude.add(name)
 
2570
                
 
2571
                client_dict["encrypted_secret"] = (client
 
2572
                                                   .encrypted_secret)
 
2573
                for attr in client.client_structure:
 
2574
                    if attr not in exclude:
 
2575
                        client_dict[attr] = getattr(client, attr)
 
2576
                
 
2577
                clients[client.name] = client_dict
 
2578
                del client_settings[client.name]["secret"]
 
2579
        
2337
2580
        try:
2338
 
            with os.fdopen(os.open(stored_state_path,
2339
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2340
 
                                   stat.S_IRUSR | stat.S_IWUSR),
2341
 
                           "wb") as stored_state:
 
2581
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2582
                                                prefix="clients-",
 
2583
                                                dir=os.path.dirname
 
2584
                                                (stored_state_path))
 
2585
            with os.fdopen(tempfd, "wb") as stored_state:
2342
2586
                pickle.dump((clients, client_settings), stored_state)
2343
 
        except IOError as e:
2344
 
            logger.warning("Could not save persistant state: {0}"
2345
 
                           .format(e))
2346
 
            if e.errno != errno.ENOENT:
2347
 
                raise
2348
 
 
 
2587
            os.rename(tempname, stored_state_path)
 
2588
        except (IOError, OSError) as e:
 
2589
            if not debug:
 
2590
                try:
 
2591
                    os.remove(tempname)
 
2592
                except NameError:
 
2593
                    pass
 
2594
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2595
                logger.warning("Could not save persistent state: {0}"
 
2596
                               .format(os.strerror(e.errno)))
 
2597
            else:
 
2598
                logger.warning("Could not save persistent state:",
 
2599
                               exc_info=e)
 
2600
                raise e
 
2601
        
2349
2602
        # Delete all clients, and settings from config
2350
2603
        while tcp_server.clients:
2351
2604
            name, client = tcp_server.clients.popitem()
2369
2622
        # Need to initiate checking of clients
2370
2623
        if client.enabled:
2371
2624
            client.init_checker()
2372
 
 
2373
2625
    
2374
2626
    tcp_server.enable()
2375
2627
    tcp_server.server_activate()
2378
2630
    service.port = tcp_server.socket.getsockname()[1]
2379
2631
    if use_ipv6:
2380
2632
        logger.info("Now listening on address %r, port %d,"
2381
 
                    " flowinfo %d, scope_id %d"
2382
 
                    % tcp_server.socket.getsockname())
 
2633
                    " flowinfo %d, scope_id %d",
 
2634
                    *tcp_server.socket.getsockname())
2383
2635
    else:                       # IPv4
2384
 
        logger.info("Now listening on address %r, port %d"
2385
 
                    % tcp_server.socket.getsockname())
 
2636
        logger.info("Now listening on address %r, port %d",
 
2637
                    *tcp_server.socket.getsockname())
2386
2638
    
2387
2639
    #service.interface = tcp_server.socket.getsockname()[3]
2388
2640
    
2391
2643
        try:
2392
2644
            service.activate()
2393
2645
        except dbus.exceptions.DBusException as error:
2394
 
            logger.critical("DBusException: %s", error)
 
2646
            logger.critical("D-Bus Exception", exc_info=error)
2395
2647
            cleanup()
2396
2648
            sys.exit(1)
2397
2649
        # End of Avahi example code
2404
2656
        logger.debug("Starting main loop")
2405
2657
        main_loop.run()
2406
2658
    except AvahiError as error:
2407
 
        logger.critical("AvahiError: %s", error)
 
2659
        logger.critical("Avahi Error", exc_info=error)
2408
2660
        cleanup()
2409
2661
        sys.exit(1)
2410
2662
    except KeyboardInterrupt:
2415
2667
    # Must run before the D-Bus bus name gets deregistered
2416
2668
    cleanup()
2417
2669
 
2418
 
 
2419
2670
if __name__ == '__main__':
2420
2671
    main()