/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-17 01:55:58 UTC
  • Revision ID: teddy@recompile.se-20120517015558-5703p8nkquc2rhgd
* .bzrignore (statedir): Added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
66
 
import hashlib
 
68
import binascii
 
69
import tempfile
 
70
import itertools
67
71
 
68
72
import dbus
69
73
import dbus.service
74
78
import ctypes.util
75
79
import xml.dom.minidom
76
80
import inspect
77
 
import Crypto.Cipher.AES
 
81
import GnuPGInterface
78
82
 
79
83
try:
80
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
88
    except ImportError:
85
89
        SO_BINDTODEVICE = None
86
90
 
87
 
 
88
 
version = "1.4.1"
 
91
version = "1.5.3"
 
92
stored_state_file = "clients.pickle"
89
93
 
90
94
logger = logging.getLogger()
91
 
stored_state_path = "/var/lib/mandos/clients.pickle"
92
 
 
93
95
syslogger = (logging.handlers.SysLogHandler
94
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
97
              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)
 
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
107
212
 
108
213
 
109
214
class AvahiError(Exception):
140
245
    server: D-Bus Server
141
246
    bus: dbus.SystemBus()
142
247
    """
 
248
    
143
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
250
                 servicetype = None, port = None, TXT = None,
145
251
                 domain = "", host = "", max_renames = 32768,
158
264
        self.server = None
159
265
        self.bus = bus
160
266
        self.entry_group_state_changed_match = None
 
267
    
161
268
    def rename(self):
162
269
        """Derived from the Avahi example code"""
163
270
        if self.rename_count >= self.max_renames:
173
280
        try:
174
281
            self.add()
175
282
        except dbus.exceptions.DBusException as error:
176
 
            logger.critical("DBusException: %s", error)
 
283
            logger.critical("D-Bus Exception", exc_info=error)
177
284
            self.cleanup()
178
285
            os._exit(1)
179
286
        self.rename_count += 1
 
287
    
180
288
    def remove(self):
181
289
        """Derived from the Avahi example code"""
182
290
        if self.entry_group_state_changed_match is not None:
184
292
            self.entry_group_state_changed_match = None
185
293
        if self.group is not None:
186
294
            self.group.Reset()
 
295
    
187
296
    def add(self):
188
297
        """Derived from the Avahi example code"""
189
298
        self.remove()
206
315
            dbus.UInt16(self.port),
207
316
            avahi.string_array_to_txt_array(self.TXT))
208
317
        self.group.Commit()
 
318
    
209
319
    def entry_group_state_changed(self, state, error):
210
320
        """Derived from the Avahi example code"""
211
321
        logger.debug("Avahi entry group state change: %i", state)
218
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
219
329
            logger.critical("Avahi: Error in group state changed %s",
220
330
                            unicode(error))
221
 
            raise AvahiGroupError("State changed: %s"
222
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
223
334
    def cleanup(self):
224
335
        """Derived from the Avahi example code"""
225
336
        if self.group is not None:
226
337
            try:
227
338
                self.group.Free()
228
339
            except (dbus.exceptions.UnknownMethodException,
229
 
                    dbus.exceptions.DBusException) as e:
 
340
                    dbus.exceptions.DBusException):
230
341
                pass
231
342
            self.group = None
232
343
        self.remove()
 
344
    
233
345
    def server_state_changed(self, state, error=None):
234
346
        """Derived from the Avahi example code"""
235
347
        logger.debug("Avahi server state change: %i", state)
254
366
                logger.debug("Unknown state: %r", state)
255
367
            else:
256
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
257
370
    def activate(self):
258
371
        """Derived from the Avahi example code"""
259
372
        if self.server is None:
266
379
                                 self.server_state_changed)
267
380
        self.server_state_changed(self.server.GetState())
268
381
 
 
382
 
269
383
class AvahiServiceToSyslog(AvahiService):
270
384
    def rename(self):
271
385
        """Add the new name to the syslog messages"""
272
386
        ret = AvahiService.rename(self)
273
387
        syslogger.setFormatter(logging.Formatter
274
 
                               ('Mandos (%s) [%%(process)d]:'
275
 
                                ' %%(levelname)s: %%(message)s'
276
 
                                % self.name))
 
388
                               ('Mandos ({0}) [%(process)d]:'
 
389
                                ' %(levelname)s: %(message)s'
 
390
                                .format(self.name)))
277
391
        return ret
278
392
 
279
 
def _timedelta_to_milliseconds(td):
 
393
 
 
394
def timedelta_to_milliseconds(td):
280
395
    "Convert a datetime.timedelta() to milliseconds"
281
396
    return ((td.days * 24 * 60 * 60 * 1000)
282
397
            + (td.seconds * 1000)
283
398
            + (td.microseconds // 1000))
284
 
        
 
399
 
 
400
 
285
401
class Client(object):
286
402
    """A representation of a client host served by this server.
287
403
    
288
404
    Attributes:
289
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
405
    approved:   bool(); 'None' if not yet approved/disapproved
290
406
    approval_delay: datetime.timedelta(); Time to wait for approval
291
407
    approval_duration: datetime.timedelta(); Duration of one approval
292
408
    checker:    subprocess.Popen(); a running checker process used
311
427
    last_approval_request: datetime.datetime(); (UTC) or None
312
428
    last_checked_ok: datetime.datetime(); (UTC) or None
313
429
    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)
 
430
                         status of last checker. -1 reflects crashed
 
431
                         checker, -2 means no checker completed yet.
 
432
    last_enabled: datetime.datetime(); (UTC) or None
317
433
    name:       string; from the config file, used in log messages and
318
434
                        D-Bus identifiers
319
435
    secret:     bytestring; sent verbatim (over TLS) to client
320
436
    timeout:    datetime.timedelta(); How long from last_checked_ok
321
437
                                      until this client is disabled
322
 
    extended_timeout:   extra long timeout when password has been sent
 
438
    extended_timeout:   extra long timeout when secret has been sent
323
439
    runtime_expansions: Allowed attributes for runtime expansion.
324
440
    expires:    datetime.datetime(); time (UTC) when a client will be
325
441
                disabled, or None
326
442
    """
327
443
    
328
444
    runtime_expansions = ("approval_delay", "approval_duration",
329
 
                          "created", "enabled", "fingerprint",
330
 
                          "host", "interval", "last_checked_ok",
 
445
                          "created", "enabled", "expires",
 
446
                          "fingerprint", "host", "interval",
 
447
                          "last_approval_request", "last_checked_ok",
331
448
                          "last_enabled", "name", "timeout")
 
449
    client_defaults = { "timeout": "5m",
 
450
                        "extended_timeout": "15m",
 
451
                        "interval": "2m",
 
452
                        "checker": "fping -q -- %%(host)s",
 
453
                        "host": "",
 
454
                        "approval_delay": "0s",
 
455
                        "approval_duration": "1s",
 
456
                        "approved_by_default": "True",
 
457
                        "enabled": "True",
 
458
                        }
332
459
    
333
460
    def timeout_milliseconds(self):
334
461
        "Return the 'timeout' attribute in milliseconds"
335
 
        return _timedelta_to_milliseconds(self.timeout)
 
462
        return timedelta_to_milliseconds(self.timeout)
336
463
    
337
464
    def extended_timeout_milliseconds(self):
338
465
        "Return the 'extended_timeout' attribute in milliseconds"
339
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
466
        return timedelta_to_milliseconds(self.extended_timeout)
340
467
    
341
468
    def interval_milliseconds(self):
342
469
        "Return the 'interval' attribute in milliseconds"
343
 
        return _timedelta_to_milliseconds(self.interval)
 
470
        return timedelta_to_milliseconds(self.interval)
344
471
    
345
472
    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."""
 
473
        return timedelta_to_milliseconds(self.approval_delay)
 
474
    
 
475
    @staticmethod
 
476
    def config_parser(config):
 
477
        """Construct a new dict of client settings of this form:
 
478
        { client_name: {setting_name: value, ...}, ...}
 
479
        with exceptions for any special settings as defined above.
 
480
        NOTE: Must be a pure function. Must return the same result
 
481
        value given the same arguments.
 
482
        """
 
483
        settings = {}
 
484
        for client_name in config.sections():
 
485
            section = dict(config.items(client_name))
 
486
            client = settings[client_name] = {}
 
487
            
 
488
            client["host"] = section["host"]
 
489
            # Reformat values from string types to Python types
 
490
            client["approved_by_default"] = config.getboolean(
 
491
                client_name, "approved_by_default")
 
492
            client["enabled"] = config.getboolean(client_name,
 
493
                                                  "enabled")
 
494
            
 
495
            client["fingerprint"] = (section["fingerprint"].upper()
 
496
                                     .replace(" ", ""))
 
497
            if "secret" in section:
 
498
                client["secret"] = section["secret"].decode("base64")
 
499
            elif "secfile" in section:
 
500
                with open(os.path.expanduser(os.path.expandvars
 
501
                                             (section["secfile"])),
 
502
                          "rb") as secfile:
 
503
                    client["secret"] = secfile.read()
 
504
            else:
 
505
                raise TypeError("No secret or secfile for section {0}"
 
506
                                .format(section))
 
507
            client["timeout"] = string_to_delta(section["timeout"])
 
508
            client["extended_timeout"] = string_to_delta(
 
509
                section["extended_timeout"])
 
510
            client["interval"] = string_to_delta(section["interval"])
 
511
            client["approval_delay"] = string_to_delta(
 
512
                section["approval_delay"])
 
513
            client["approval_duration"] = string_to_delta(
 
514
                section["approval_duration"])
 
515
            client["checker_command"] = section["checker"]
 
516
            client["last_approval_request"] = None
 
517
            client["last_checked_ok"] = None
 
518
            client["last_checker_status"] = -2
 
519
        
 
520
        return settings
 
521
    
 
522
    def __init__(self, settings, name = None):
352
523
        self.name = name
353
 
        if config is None:
354
 
            config = {}
 
524
        # adding all client settings
 
525
        for setting, value in settings.iteritems():
 
526
            setattr(self, setting, value)
 
527
        
 
528
        if self.enabled:
 
529
            if not hasattr(self, "last_enabled"):
 
530
                self.last_enabled = datetime.datetime.utcnow()
 
531
            if not hasattr(self, "expires"):
 
532
                self.expires = (datetime.datetime.utcnow()
 
533
                                + self.timeout)
 
534
        else:
 
535
            self.last_enabled = None
 
536
            self.expires = None
 
537
        
355
538
        logger.debug("Creating client %r", self.name)
356
539
        # Uppercase and remove spaces from fingerprint for later
357
540
        # comparison purposes with return value from the fingerprint()
358
541
        # function
359
 
        self.fingerprint = (config["fingerprint"].upper()
360
 
                            .replace(" ", ""))
361
542
        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"])
 
543
        self.created = settings.get("created",
 
544
                                    datetime.datetime.utcnow())
 
545
        
 
546
        # attributes specific for this server instance
383
547
        self.checker = None
384
548
        self.checker_initiator_tag = None
385
549
        self.disable_initiator_tag = None
386
 
        self.expires = datetime.datetime.utcnow() + self.timeout
387
550
        self.checker_callback_tag = None
388
 
        self.checker_command = config["checker"]
389
551
        self.current_checker_command = None
390
 
        self._approved = None
391
 
        self.approved_by_default = config.get("approved_by_default",
392
 
                                              True)
 
552
        self.approved = None
393
553
        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
554
        self.changedstate = (multiprocessing_manager
399
555
                             .Condition(multiprocessing_manager
400
556
                                        .Lock()))
401
 
        self.client_structure = [attr for attr
402
 
                                 in self.__dict__.iterkeys()
 
557
        self.client_structure = [attr for attr in
 
558
                                 self.__dict__.iterkeys()
403
559
                                 if not attr.startswith("_")]
404
560
        self.client_structure.append("client_structure")
405
 
 
406
 
 
 
561
        
407
562
        for name, t in inspect.getmembers(type(self),
408
563
                                          lambda obj:
409
564
                                              isinstance(obj,
421
576
        if getattr(self, "enabled", False):
422
577
            # Already enabled
423
578
            return
424
 
        self.send_changedstate()
425
579
        self.expires = datetime.datetime.utcnow() + self.timeout
426
580
        self.enabled = True
427
581
        self.last_enabled = datetime.datetime.utcnow()
428
582
        self.init_checker()
 
583
        self.send_changedstate()
429
584
    
430
585
    def disable(self, quiet=True):
431
586
        """Disable this client."""
432
587
        if not getattr(self, "enabled", False):
433
588
            return False
434
589
        if not quiet:
435
 
            self.send_changedstate()
436
 
        if not quiet:
437
590
            logger.info("Disabling client %s", self.name)
438
 
        if getattr(self, "disable_initiator_tag", False):
 
591
        if getattr(self, "disable_initiator_tag", None) is not None:
439
592
            gobject.source_remove(self.disable_initiator_tag)
440
593
            self.disable_initiator_tag = None
441
594
        self.expires = None
442
 
        if getattr(self, "checker_initiator_tag", False):
 
595
        if getattr(self, "checker_initiator_tag", None) is not None:
443
596
            gobject.source_remove(self.checker_initiator_tag)
444
597
            self.checker_initiator_tag = None
445
598
        self.stop_checker()
446
599
        self.enabled = False
 
600
        if not quiet:
 
601
            self.send_changedstate()
447
602
        # Do not run this again if called by a gobject.timeout_add
448
603
        return False
449
604
    
450
605
    def __del__(self):
451
606
        self.disable()
452
 
 
 
607
    
453
608
    def init_checker(self):
454
609
        # Schedule a new checker to be started an 'interval' from now,
455
610
        # and every interval from then on.
 
611
        if self.checker_initiator_tag is not None:
 
612
            gobject.source_remove(self.checker_initiator_tag)
456
613
        self.checker_initiator_tag = (gobject.timeout_add
457
614
                                      (self.interval_milliseconds(),
458
615
                                       self.start_checker))
459
616
        # Schedule a disable() when 'timeout' has passed
 
617
        if self.disable_initiator_tag is not None:
 
618
            gobject.source_remove(self.disable_initiator_tag)
460
619
        self.disable_initiator_tag = (gobject.timeout_add
461
620
                                   (self.timeout_milliseconds(),
462
621
                                    self.disable))
463
622
        # Also start a new checker *right now*.
464
623
        self.start_checker()
465
 
 
466
 
        
 
624
    
467
625
    def checker_callback(self, pid, condition, command):
468
626
        """The checker has completed, so take appropriate actions."""
469
627
        self.checker_callback_tag = None
470
628
        self.checker = None
471
629
        if os.WIFEXITED(condition):
472
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
630
            self.last_checker_status = os.WEXITSTATUS(condition)
473
631
            if self.last_checker_status == 0:
474
632
                logger.info("Checker for %(name)s succeeded",
475
633
                            vars(self))
482
640
            logger.warning("Checker for %(name)s crashed?",
483
641
                           vars(self))
484
642
    
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
 
        """
 
643
    def checked_ok(self):
 
644
        """Assert that the client has been seen, alive and well."""
 
645
        self.last_checked_ok = datetime.datetime.utcnow()
 
646
        self.last_checker_status = 0
 
647
        self.bump_timeout()
 
648
    
 
649
    def bump_timeout(self, timeout=None):
 
650
        """Bump up the timeout for this client."""
491
651
        if timeout is None:
492
652
            timeout = self.timeout
493
 
        self.last_checked_ok = datetime.datetime.utcnow()
494
653
        if self.disable_initiator_tag is not None:
495
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
            self.disable_initiator_tag = None
496
656
        if getattr(self, "enabled", False):
497
657
            self.disable_initiator_tag = (gobject.timeout_add
498
 
                                          (_timedelta_to_milliseconds
 
658
                                          (timedelta_to_milliseconds
499
659
                                           (timeout), self.disable))
500
660
            self.expires = datetime.datetime.utcnow() + timeout
501
661
    
508
668
        If a checker already exists, leave it running and do
509
669
        nothing."""
510
670
        # The reason for not killing a running checker is that if we
511
 
        # did that, then if a checker (for some reason) started
512
 
        # running slowly and taking more than 'interval' time, the
513
 
        # client would inevitably timeout, since no checker would get
514
 
        # a chance to run to completion.  If we instead leave running
 
671
        # did that, and if a checker (for some reason) started running
 
672
        # slowly and taking more than 'interval' time, then the client
 
673
        # would inevitably timeout, since no checker would get a
 
674
        # chance to run to completion.  If we instead leave running
515
675
        # checkers alone, the checker would have to take more time
516
676
        # than 'timeout' for the client to be disabled, which is as it
517
677
        # should be.
531
691
                                      self.current_checker_command)
532
692
        # Start a new checker if needed
533
693
        if self.checker is None:
 
694
            # Escape attributes for the shell
 
695
            escaped_attrs = dict(
 
696
                (attr, re.escape(unicode(getattr(self, attr))))
 
697
                for attr in
 
698
                self.runtime_expansions)
534
699
            try:
535
 
                # In case checker_command has exactly one % operator
536
 
                command = self.checker_command % self.host
537
 
            except TypeError:
538
 
                # Escape attributes for the shell
539
 
                escaped_attrs = dict(
540
 
                    (attr,
541
 
                     re.escape(unicode(str(getattr(self, attr, "")),
542
 
                                       errors=
543
 
                                       'replace')))
544
 
                    for attr in
545
 
                    self.runtime_expansions)
546
 
                
547
 
                try:
548
 
                    command = self.checker_command % escaped_attrs
549
 
                except TypeError as error:
550
 
                    logger.error('Could not format string "%s":'
551
 
                                 ' %s', self.checker_command, error)
552
 
                    return True # Try again later
 
700
                command = self.checker_command % escaped_attrs
 
701
            except TypeError as error:
 
702
                logger.error('Could not format string "%s"',
 
703
                             self.checker_command, exc_info=error)
 
704
                return True # Try again later
553
705
            self.current_checker_command = command
554
706
            try:
555
707
                logger.info("Starting checker %r for %s",
561
713
                self.checker = subprocess.Popen(command,
562
714
                                                close_fds=True,
563
715
                                                shell=True, cwd="/")
564
 
                self.checker_callback_tag = (gobject.child_watch_add
565
 
                                             (self.checker.pid,
566
 
                                              self.checker_callback,
567
 
                                              data=command))
568
 
                # The checker may have completed before the gobject
569
 
                # watch was added.  Check for this.
570
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
571
 
                if pid:
572
 
                    gobject.source_remove(self.checker_callback_tag)
573
 
                    self.checker_callback(pid, status, command)
574
716
            except OSError as error:
575
 
                logger.error("Failed to start subprocess: %s",
576
 
                             error)
 
717
                logger.error("Failed to start subprocess",
 
718
                             exc_info=error)
 
719
            self.checker_callback_tag = (gobject.child_watch_add
 
720
                                         (self.checker.pid,
 
721
                                          self.checker_callback,
 
722
                                          data=command))
 
723
            # The checker may have completed before the gobject
 
724
            # watch was added.  Check for this.
 
725
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
726
            if pid:
 
727
                gobject.source_remove(self.checker_callback_tag)
 
728
                self.checker_callback(pid, status, command)
577
729
        # Re-run this periodically if run by gobject.timeout_add
578
730
        return True
579
731
    
586
738
            return
587
739
        logger.debug("Stopping checker for %(name)s", vars(self))
588
740
        try:
589
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
741
            self.checker.terminate()
590
742
            #time.sleep(0.5)
591
743
            #if self.checker.poll() is None:
592
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
744
            #    self.checker.kill()
593
745
        except OSError as error:
594
746
            if error.errno != errno.ESRCH: # No such process
595
747
                raise
596
748
        self.checker = None
597
749
 
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
750
 
649
751
def dbus_service_property(dbus_interface, signature="v",
650
752
                          access="readwrite", byte_arrays=False):
662
764
    # "Set" method, so we fail early here:
663
765
    if byte_arrays and signature != "ay":
664
766
        raise ValueError("Byte arrays not supported for non-'ay'"
665
 
                         " signature %r" % signature)
 
767
                         " signature {0!r}".format(signature))
666
768
    def decorator(func):
667
769
        func._dbus_is_property = True
668
770
        func._dbus_interface = dbus_interface
676
778
    return decorator
677
779
 
678
780
 
 
781
def dbus_interface_annotations(dbus_interface):
 
782
    """Decorator for marking functions returning interface annotations
 
783
    
 
784
    Usage:
 
785
    
 
786
    @dbus_interface_annotations("org.example.Interface")
 
787
    def _foo(self):  # Function name does not matter
 
788
        return {"org.freedesktop.DBus.Deprecated": "true",
 
789
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
790
                    "false"}
 
791
    """
 
792
    def decorator(func):
 
793
        func._dbus_is_interface = True
 
794
        func._dbus_interface = dbus_interface
 
795
        func._dbus_name = dbus_interface
 
796
        return func
 
797
    return decorator
 
798
 
 
799
 
 
800
def dbus_annotations(annotations):
 
801
    """Decorator to annotate D-Bus methods, signals or properties
 
802
    Usage:
 
803
    
 
804
    @dbus_service_property("org.example.Interface", signature="b",
 
805
                           access="r")
 
806
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
807
                        "org.freedesktop.DBus.Property."
 
808
                        "EmitsChangedSignal": "false"})
 
809
    def Property_dbus_property(self):
 
810
        return dbus.Boolean(False)
 
811
    """
 
812
    def decorator(func):
 
813
        func._dbus_annotations = annotations
 
814
        return func
 
815
    return decorator
 
816
 
 
817
 
679
818
class DBusPropertyException(dbus.exceptions.DBusException):
680
819
    """A base class for D-Bus property-related exceptions
681
820
    """
704
843
    """
705
844
    
706
845
    @staticmethod
707
 
    def _is_dbus_property(obj):
708
 
        return getattr(obj, "_dbus_is_property", False)
 
846
    def _is_dbus_thing(thing):
 
847
        """Returns a function testing if an attribute is a D-Bus thing
 
848
        
 
849
        If called like _is_dbus_thing("method") it returns a function
 
850
        suitable for use as predicate to inspect.getmembers().
 
851
        """
 
852
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
853
                                   False)
709
854
    
710
 
    def _get_all_dbus_properties(self):
 
855
    def _get_all_dbus_things(self, thing):
711
856
        """Returns a generator of (name, attribute) pairs
712
857
        """
713
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
858
        return ((getattr(athing.__get__(self), "_dbus_name",
 
859
                         name),
 
860
                 athing.__get__(self))
714
861
                for cls in self.__class__.__mro__
715
 
                for name, prop in
716
 
                inspect.getmembers(cls, self._is_dbus_property))
 
862
                for name, athing in
 
863
                inspect.getmembers(cls,
 
864
                                   self._is_dbus_thing(thing)))
717
865
    
718
866
    def _get_dbus_property(self, interface_name, property_name):
719
867
        """Returns a bound method if one exists which is a D-Bus
721
869
        """
722
870
        for cls in  self.__class__.__mro__:
723
871
            for name, value in (inspect.getmembers
724
 
                                (cls, self._is_dbus_property)):
 
872
                                (cls,
 
873
                                 self._is_dbus_thing("property"))):
725
874
                if (value._dbus_name == property_name
726
875
                    and value._dbus_interface == interface_name):
727
876
                    return value.__get__(self)
756
905
            # signatures other than "ay".
757
906
            if prop._dbus_signature != "ay":
758
907
                raise ValueError
759
 
            value = dbus.ByteArray(''.join(unichr(byte)
760
 
                                           for byte in value))
 
908
            value = dbus.ByteArray(b''.join(chr(byte)
 
909
                                            for byte in value))
761
910
        prop(value)
762
911
    
763
912
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
768
917
        
769
918
        Note: Will not include properties with access="write".
770
919
        """
771
 
        all = {}
772
 
        for name, prop in self._get_all_dbus_properties():
 
920
        properties = {}
 
921
        for name, prop in self._get_all_dbus_things("property"):
773
922
            if (interface_name
774
923
                and interface_name != prop._dbus_interface):
775
924
                # Interface non-empty but did not match
779
928
                continue
780
929
            value = prop()
781
930
            if not hasattr(value, "variant_level"):
782
 
                all[name] = value
 
931
                properties[name] = value
783
932
                continue
784
 
            all[name] = type(value)(value, variant_level=
785
 
                                    value.variant_level+1)
786
 
        return dbus.Dictionary(all, signature="sv")
 
933
            properties[name] = type(value)(value, variant_level=
 
934
                                           value.variant_level+1)
 
935
        return dbus.Dictionary(properties, signature="sv")
787
936
    
788
937
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
789
938
                         out_signature="s",
790
939
                         path_keyword='object_path',
791
940
                         connection_keyword='connection')
792
941
    def Introspect(self, object_path, connection):
793
 
        """Standard D-Bus method, overloaded to insert property tags.
 
942
        """Overloading of standard D-Bus method.
 
943
        
 
944
        Inserts property tags and interface annotation tags.
794
945
        """
795
946
        xmlstring = dbus.service.Object.Introspect(self, object_path,
796
947
                                                   connection)
803
954
                e.setAttribute("access", prop._dbus_access)
804
955
                return e
805
956
            for if_tag in document.getElementsByTagName("interface"):
 
957
                # Add property tags
806
958
                for tag in (make_tag(document, name, prop)
807
959
                            for name, prop
808
 
                            in self._get_all_dbus_properties()
 
960
                            in self._get_all_dbus_things("property")
809
961
                            if prop._dbus_interface
810
962
                            == if_tag.getAttribute("name")):
811
963
                    if_tag.appendChild(tag)
 
964
                # Add annotation tags
 
965
                for typ in ("method", "signal", "property"):
 
966
                    for tag in if_tag.getElementsByTagName(typ):
 
967
                        annots = dict()
 
968
                        for name, prop in (self.
 
969
                                           _get_all_dbus_things(typ)):
 
970
                            if (name == tag.getAttribute("name")
 
971
                                and prop._dbus_interface
 
972
                                == if_tag.getAttribute("name")):
 
973
                                annots.update(getattr
 
974
                                              (prop,
 
975
                                               "_dbus_annotations",
 
976
                                               {}))
 
977
                        for name, value in annots.iteritems():
 
978
                            ann_tag = document.createElement(
 
979
                                "annotation")
 
980
                            ann_tag.setAttribute("name", name)
 
981
                            ann_tag.setAttribute("value", value)
 
982
                            tag.appendChild(ann_tag)
 
983
                # Add interface annotation tags
 
984
                for annotation, value in dict(
 
985
                    itertools.chain.from_iterable(
 
986
                        annotations().iteritems()
 
987
                        for name, annotations in
 
988
                        self._get_all_dbus_things("interface")
 
989
                        if name == if_tag.getAttribute("name")
 
990
                        )).iteritems():
 
991
                    ann_tag = document.createElement("annotation")
 
992
                    ann_tag.setAttribute("name", annotation)
 
993
                    ann_tag.setAttribute("value", value)
 
994
                    if_tag.appendChild(ann_tag)
812
995
                # Add the names to the return values for the
813
996
                # "org.freedesktop.DBus.Properties" methods
814
997
                if (if_tag.getAttribute("name")
829
1012
        except (AttributeError, xml.dom.DOMException,
830
1013
                xml.parsers.expat.ExpatError) as error:
831
1014
            logger.error("Failed to override Introspection method",
832
 
                         error)
 
1015
                         exc_info=error)
833
1016
        return xmlstring
834
1017
 
835
1018
 
840
1023
    return dbus.String(dt.isoformat(),
841
1024
                       variant_level=variant_level)
842
1025
 
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.
 
1026
 
 
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1028
    """A class decorator; applied to a subclass of
 
1029
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1030
    interface names according to the "alt_interface_names" mapping.
 
1031
    Usage:
 
1032
    
 
1033
    @alternate_dbus_names({"org.example.Interface":
 
1034
                               "net.example.AlternateInterface"})
 
1035
    class SampleDBusObject(dbus.service.Object):
 
1036
        @dbus.service.method("org.example.Interface")
 
1037
        def SampleDBusMethod():
 
1038
            pass
 
1039
    
 
1040
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1041
    reachable via two interfaces: "org.example.Interface" and
 
1042
    "net.example.AlternateInterface", the latter of which will have
 
1043
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1044
    "true", unless "deprecate" is passed with a False value.
 
1045
    
 
1046
    This works for methods and signals, and also for D-Bus properties
 
1047
    (from DBusObjectWithProperties) and interfaces (from the
 
1048
    dbus_interface_annotations decorator).
847
1049
    """
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):
 
1050
    def wrapper(cls):
 
1051
        for orig_interface_name, alt_interface_name in (
 
1052
            alt_interface_names.iteritems()):
 
1053
            attr = {}
 
1054
            interface_names = set()
 
1055
            # Go though all attributes of the class
 
1056
            for attrname, attribute in inspect.getmembers(cls):
855
1057
                # Ignore non-D-Bus attributes, and D-Bus attributes
856
1058
                # with the wrong interface name
857
1059
                if (not hasattr(attribute, "_dbus_interface")
858
1060
                    or not attribute._dbus_interface
859
 
                    .startswith("se.recompile.Mandos")):
 
1061
                    .startswith(orig_interface_name)):
860
1062
                    continue
861
1063
                # Create an alternate D-Bus interface name based on
862
1064
                # the current name
863
1065
                alt_interface = (attribute._dbus_interface
864
 
                                 .replace("se.recompile.Mandos",
865
 
                                          "se.bsnet.fukt.Mandos"))
 
1066
                                 .replace(orig_interface_name,
 
1067
                                          alt_interface_name))
 
1068
                interface_names.add(alt_interface)
866
1069
                # Is this a D-Bus signal?
867
1070
                if getattr(attribute, "_dbus_is_signal", False):
868
1071
                    # Extract the original non-method function by
883
1086
                                nonmethod_func.func_name,
884
1087
                                nonmethod_func.func_defaults,
885
1088
                                nonmethod_func.func_closure)))
 
1089
                    # Copy annotations, if any
 
1090
                    try:
 
1091
                        new_function._dbus_annotations = (
 
1092
                            dict(attribute._dbus_annotations))
 
1093
                    except AttributeError:
 
1094
                        pass
886
1095
                    # 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
 
1096
                    # original and alternate functions, so both the
 
1097
                    # original and alternate signals gets sent when
 
1098
                    # the function is called
889
1099
                    def fixscope(func1, func2):
890
1100
                        """This function is a scope container to pass
891
1101
                        func1 and func2 to the "call_both" function
898
1108
                        return call_both
899
1109
                    # Create the "call_both" function and add it to
900
1110
                    # the class
901
 
                    attr[attrname] = fixscope(attribute,
902
 
                                              new_function)
 
1111
                    attr[attrname] = fixscope(attribute, new_function)
903
1112
                # Is this a D-Bus method?
904
1113
                elif getattr(attribute, "_dbus_is_method", False):
905
1114
                    # Create a new, but exactly alike, function
916
1125
                                        attribute.func_name,
917
1126
                                        attribute.func_defaults,
918
1127
                                        attribute.func_closure)))
 
1128
                    # Copy annotations, if any
 
1129
                    try:
 
1130
                        attr[attrname]._dbus_annotations = (
 
1131
                            dict(attribute._dbus_annotations))
 
1132
                    except AttributeError:
 
1133
                        pass
919
1134
                # Is this a D-Bus property?
920
1135
                elif getattr(attribute, "_dbus_is_property", False):
921
1136
                    # Create a new, but exactly alike, function
935
1150
                                        attribute.func_name,
936
1151
                                        attribute.func_defaults,
937
1152
                                        attribute.func_closure)))
938
 
        return type.__new__(mcs, name, bases, attr)
939
 
 
 
1153
                    # Copy annotations, if any
 
1154
                    try:
 
1155
                        attr[attrname]._dbus_annotations = (
 
1156
                            dict(attribute._dbus_annotations))
 
1157
                    except AttributeError:
 
1158
                        pass
 
1159
                # Is this a D-Bus interface?
 
1160
                elif getattr(attribute, "_dbus_is_interface", False):
 
1161
                    # Create a new, but exactly alike, function
 
1162
                    # object.  Decorate it to be a new D-Bus interface
 
1163
                    # with the alternate D-Bus interface name.  Add it
 
1164
                    # to the class.
 
1165
                    attr[attrname] = (dbus_interface_annotations
 
1166
                                      (alt_interface)
 
1167
                                      (types.FunctionType
 
1168
                                       (attribute.func_code,
 
1169
                                        attribute.func_globals,
 
1170
                                        attribute.func_name,
 
1171
                                        attribute.func_defaults,
 
1172
                                        attribute.func_closure)))
 
1173
            if deprecate:
 
1174
                # Deprecate all alternate interfaces
 
1175
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1176
                for interface_name in interface_names:
 
1177
                    @dbus_interface_annotations(interface_name)
 
1178
                    def func(self):
 
1179
                        return { "org.freedesktop.DBus.Deprecated":
 
1180
                                     "true" }
 
1181
                    # Find an unused name
 
1182
                    for aname in (iname.format(i)
 
1183
                                  for i in itertools.count()):
 
1184
                        if aname not in attr:
 
1185
                            attr[aname] = func
 
1186
                            break
 
1187
            if interface_names:
 
1188
                # Replace the class with a new subclass of it with
 
1189
                # methods, signals, etc. as created above.
 
1190
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1191
                           (cls,), attr)
 
1192
        return cls
 
1193
    return wrapper
 
1194
 
 
1195
 
 
1196
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1197
                                "se.bsnet.fukt.Mandos"})
940
1198
class ClientDBus(Client, DBusObjectWithProperties):
941
1199
    """A Client class using D-Bus
942
1200
    
952
1210
    
953
1211
    def __init__(self, bus = None, *args, **kwargs):
954
1212
        self.bus = bus
955
 
        self._approvals_pending = 0
956
1213
        Client.__init__(self, *args, **kwargs)
957
 
        self.add_to_dbus()
958
 
    
959
 
    def add_to_dbus(self):
960
1214
        # Only now, when this client is initialized, can it show up on
961
1215
        # the D-Bus
962
1216
        client_object_name = unicode(self.name).translate(
966
1220
                                 ("/clients/" + client_object_name))
967
1221
        DBusObjectWithProperties.__init__(self, self.bus,
968
1222
                                          self.dbus_object_path)
969
 
        
 
1223
    
970
1224
    def notifychangeproperty(transform_func,
971
1225
                             dbus_name, type_func=lambda x: x,
972
1226
                             variant_level=1):
973
1227
        """ Modify a variable so that it's a property which announces
974
1228
        its changes to DBus.
975
 
 
 
1229
        
976
1230
        transform_fun: Function that takes a value and a variant_level
977
1231
                       and transforms it to a D-Bus type.
978
1232
        dbus_name: D-Bus name of the variable
995
1249
        
996
1250
        return property(lambda self: getattr(self, attrname), setter)
997
1251
    
998
 
    
999
1252
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1000
1253
    approvals_pending = notifychangeproperty(dbus.Boolean,
1001
1254
                                             "ApprovalPending",
1008
1261
                                       checker is not None)
1009
1262
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1010
1263
                                           "LastCheckedOK")
 
1264
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1265
                                               "LastCheckerStatus")
1011
1266
    last_approval_request = notifychangeproperty(
1012
1267
        datetime_to_dbus, "LastApprovalRequest")
1013
1268
    approved_by_default = notifychangeproperty(dbus.Boolean,
1014
1269
                                               "ApprovedByDefault")
1015
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1270
    approval_delay = notifychangeproperty(dbus.UInt64,
1016
1271
                                          "ApprovalDelay",
1017
1272
                                          type_func =
1018
 
                                          _timedelta_to_milliseconds)
 
1273
                                          timedelta_to_milliseconds)
1019
1274
    approval_duration = notifychangeproperty(
1020
 
        dbus.UInt16, "ApprovalDuration",
1021
 
        type_func = _timedelta_to_milliseconds)
 
1275
        dbus.UInt64, "ApprovalDuration",
 
1276
        type_func = timedelta_to_milliseconds)
1022
1277
    host = notifychangeproperty(dbus.String, "Host")
1023
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1278
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1024
1279
                                   type_func =
1025
 
                                   _timedelta_to_milliseconds)
 
1280
                                   timedelta_to_milliseconds)
1026
1281
    extended_timeout = notifychangeproperty(
1027
 
        dbus.UInt16, "ExtendedTimeout",
1028
 
        type_func = _timedelta_to_milliseconds)
1029
 
    interval = notifychangeproperty(dbus.UInt16,
 
1282
        dbus.UInt64, "ExtendedTimeout",
 
1283
        type_func = timedelta_to_milliseconds)
 
1284
    interval = notifychangeproperty(dbus.UInt64,
1030
1285
                                    "Interval",
1031
1286
                                    type_func =
1032
 
                                    _timedelta_to_milliseconds)
 
1287
                                    timedelta_to_milliseconds)
1033
1288
    checker_command = notifychangeproperty(dbus.String, "Checker")
1034
1289
    
1035
1290
    del notifychangeproperty
1077
1332
        return r
1078
1333
    
1079
1334
    def _reset_approved(self):
1080
 
        self._approved = None
 
1335
        self.approved = None
1081
1336
        return False
1082
1337
    
1083
1338
    def approve(self, value=True):
1084
 
        self.send_changedstate()
1085
 
        self._approved = value
1086
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1339
        self.approved = value
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
1087
1341
                            (self.approval_duration),
1088
1342
                            self._reset_approved)
1089
 
    
 
1343
        self.send_changedstate()
1090
1344
    
1091
1345
    ## D-Bus methods, signals & properties
1092
1346
    _interface = "se.recompile.Mandos.Client"
1093
1347
    
 
1348
    ## Interfaces
 
1349
    
 
1350
    @dbus_interface_annotations(_interface)
 
1351
    def _foo(self):
 
1352
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1353
                     "false"}
 
1354
    
1094
1355
    ## Signals
1095
1356
    
1096
1357
    # CheckerCompleted - signal
1195
1456
                           access="readwrite")
1196
1457
    def ApprovalDuration_dbus_property(self, value=None):
1197
1458
        if value is None:       # get
1198
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1459
            return dbus.UInt64(timedelta_to_milliseconds(
1199
1460
                    self.approval_duration))
1200
1461
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1201
1462
    
1215
1476
    def Host_dbus_property(self, value=None):
1216
1477
        if value is None:       # get
1217
1478
            return dbus.String(self.host)
1218
 
        self.host = value
 
1479
        self.host = unicode(value)
1219
1480
    
1220
1481
    # Created - property
1221
1482
    @dbus_service_property(_interface, signature="s", access="read")
1222
1483
    def Created_dbus_property(self):
1223
 
        return dbus.String(datetime_to_dbus(self.created))
 
1484
        return datetime_to_dbus(self.created)
1224
1485
    
1225
1486
    # LastEnabled - property
1226
1487
    @dbus_service_property(_interface, signature="s", access="read")
1247
1508
            return
1248
1509
        return datetime_to_dbus(self.last_checked_ok)
1249
1510
    
 
1511
    # LastCheckerStatus - property
 
1512
    @dbus_service_property(_interface, signature="n",
 
1513
                           access="read")
 
1514
    def LastCheckerStatus_dbus_property(self):
 
1515
        return dbus.Int16(self.last_checker_status)
 
1516
    
1250
1517
    # Expires - property
1251
1518
    @dbus_service_property(_interface, signature="s", access="read")
1252
1519
    def Expires_dbus_property(self):
1263
1530
    def Timeout_dbus_property(self, value=None):
1264
1531
        if value is None:       # get
1265
1532
            return dbus.UInt64(self.timeout_milliseconds())
 
1533
        old_timeout = self.timeout
1266
1534
        self.timeout = datetime.timedelta(0, 0, 0, value)
1267
 
        if getattr(self, "disable_initiator_tag", None) is None:
1268
 
            return
1269
 
        # 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))
 
1535
        # Reschedule disabling
 
1536
        if self.enabled:
 
1537
            now = datetime.datetime.utcnow()
 
1538
            self.expires += self.timeout - old_timeout
 
1539
            if self.expires <= now:
 
1540
                # The timeout has passed
 
1541
                self.disable()
 
1542
            else:
 
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 = (
 
1548
                    gobject.timeout_add(
 
1549
                        timedelta_to_milliseconds(self.expires - now),
 
1550
                        self.disable))
1287
1551
    
1288
1552
    # ExtendedTimeout - property
1289
1553
    @dbus_service_property(_interface, signature="t",
1302
1566
        self.interval = datetime.timedelta(0, 0, 0, value)
1303
1567
        if getattr(self, "checker_initiator_tag", None) is None:
1304
1568
            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
 
1569
        if self.enabled:
 
1570
            # Reschedule checker run
 
1571
            gobject.source_remove(self.checker_initiator_tag)
 
1572
            self.checker_initiator_tag = (gobject.timeout_add
 
1573
                                          (value, self.start_checker))
 
1574
            self.start_checker()    # Start one now, too
1310
1575
    
1311
1576
    # Checker - property
1312
1577
    @dbus_service_property(_interface, signature="s",
1314
1579
    def Checker_dbus_property(self, value=None):
1315
1580
        if value is None:       # get
1316
1581
            return dbus.String(self.checker_command)
1317
 
        self.checker_command = value
 
1582
        self.checker_command = unicode(value)
1318
1583
    
1319
1584
    # CheckerRunning - property
1320
1585
    @dbus_service_property(_interface, signature="b",
1349
1614
            raise KeyError()
1350
1615
    
1351
1616
    def __getattribute__(self, name):
1352
 
        if(name == '_pipe'):
 
1617
        if name == '_pipe':
1353
1618
            return super(ProxyClient, self).__getattribute__(name)
1354
1619
        self._pipe.send(('getattr', name))
1355
1620
        data = self._pipe.recv()
1362
1627
            return func
1363
1628
    
1364
1629
    def __setattr__(self, name, value):
1365
 
        if(name == '_pipe'):
 
1630
        if name == '_pipe':
1366
1631
            return super(ProxyClient, self).__setattr__(name, value)
1367
1632
        self._pipe.send(('setattr', name, value))
1368
1633
 
1369
 
class ClientDBusTransitional(ClientDBus):
1370
 
    __metaclass__ = AlternateDBusNamesMetaclass
1371
1634
 
1372
1635
class ClientHandler(socketserver.BaseRequestHandler, object):
1373
1636
    """A class to handle client connections.
1456
1719
                            client.Rejected("Disabled")
1457
1720
                        return
1458
1721
                    
1459
 
                    if client._approved or not client.approval_delay:
 
1722
                    if client.approved or not client.approval_delay:
1460
1723
                        #We are approved or approval is disabled
1461
1724
                        break
1462
 
                    elif client._approved is None:
 
1725
                    elif client.approved is None:
1463
1726
                        logger.info("Client %s needs approval",
1464
1727
                                    client.name)
1465
1728
                        if self.server.use_dbus:
1478
1741
                    #wait until timeout or approved
1479
1742
                    time = datetime.datetime.now()
1480
1743
                    client.changedstate.acquire()
1481
 
                    (client.changedstate.wait
1482
 
                     (float(client._timedelta_to_milliseconds(delay)
1483
 
                            / 1000)))
 
1744
                    client.changedstate.wait(
 
1745
                        float(timedelta_to_milliseconds(delay)
 
1746
                              / 1000))
1484
1747
                    client.changedstate.release()
1485
1748
                    time2 = datetime.datetime.now()
1486
1749
                    if (time2 - time) >= delay:
1502
1765
                    try:
1503
1766
                        sent = session.send(client.secret[sent_size:])
1504
1767
                    except gnutls.errors.GNUTLSError as error:
1505
 
                        logger.warning("gnutls send failed")
 
1768
                        logger.warning("gnutls send failed",
 
1769
                                       exc_info=error)
1506
1770
                        return
1507
1771
                    logger.debug("Sent: %d, remaining: %d",
1508
1772
                                 sent, len(client.secret)
1511
1775
                
1512
1776
                logger.info("Sending secret to %s", client.name)
1513
1777
                # bump the timeout using extended_timeout
1514
 
                client.checked_ok(client.extended_timeout)
 
1778
                client.bump_timeout(client.extended_timeout)
1515
1779
                if self.server.use_dbus:
1516
1780
                    # Emit D-Bus signal
1517
1781
                    client.GotSecret()
1522
1786
                try:
1523
1787
                    session.bye()
1524
1788
                except gnutls.errors.GNUTLSError as error:
1525
 
                    logger.warning("GnuTLS bye failed")
 
1789
                    logger.warning("GnuTLS bye failed",
 
1790
                                   exc_info=error)
1526
1791
    
1527
1792
    @staticmethod
1528
1793
    def peer_certificate(session):
1584
1849
        # Convert the buffer to a Python bytestring
1585
1850
        fpr = ctypes.string_at(buf, buf_len.value)
1586
1851
        # Convert the bytestring to hexadecimal notation
1587
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1852
        hex_fpr = binascii.hexlify(fpr).upper()
1588
1853
        return hex_fpr
1589
1854
 
1590
1855
 
1593
1858
    def sub_process_main(self, request, address):
1594
1859
        try:
1595
1860
            self.finish_request(request, address)
1596
 
        except:
 
1861
        except Exception:
1597
1862
            self.handle_error(request, address)
1598
1863
        self.close_request(request)
1599
1864
    
1600
1865
    def process_request(self, request, address):
1601
1866
        """Start a new process to process the request."""
1602
1867
        proc = multiprocessing.Process(target = self.sub_process_main,
1603
 
                                       args = (request,
1604
 
                                               address))
 
1868
                                       args = (request, address))
1605
1869
        proc.start()
1606
1870
        return proc
1607
1871
 
1657
1921
                                           str(self.interface
1658
1922
                                               + '\0'))
1659
1923
                except socket.error as error:
1660
 
                    if error[0] == errno.EPERM:
 
1924
                    if error.errno == errno.EPERM:
1661
1925
                        logger.error("No permission to"
1662
1926
                                     " bind to interface %s",
1663
1927
                                     self.interface)
1664
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1928
                    elif error.errno == errno.ENOPROTOOPT:
1665
1929
                        logger.error("SO_BINDTODEVICE not available;"
1666
1930
                                     " cannot bind to interface %s",
1667
1931
                                     self.interface)
 
1932
                    elif error.errno == errno.ENODEV:
 
1933
                        logger.error("Interface %s does not"
 
1934
                                     " exist, cannot bind",
 
1935
                                     self.interface)
1668
1936
                    else:
1669
1937
                        raise
1670
1938
        # Only bind(2) the socket if we really need to.
1729
1997
    
1730
1998
    def handle_ipc(self, source, condition, parent_pipe=None,
1731
1999
                   proc = None, client_object=None):
1732
 
        condition_names = {
1733
 
            gobject.IO_IN: "IN",   # There is data to read.
1734
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1735
 
                                    # blocking).
1736
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1737
 
            gobject.IO_ERR: "ERR", # Error condition.
1738
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1739
 
                                    # broken, usually for pipes and
1740
 
                                    # sockets).
1741
 
            }
1742
 
        conditions_string = ' | '.join(name
1743
 
                                       for cond, name in
1744
 
                                       condition_names.iteritems()
1745
 
                                       if cond & condition)
1746
2000
        # error, or the other end of multiprocessing.Pipe has closed
1747
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2001
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1748
2002
            # Wait for other process to exit
1749
2003
            proc.join()
1750
2004
            return False
1840
2094
            elif suffix == "w":
1841
2095
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1842
2096
            else:
1843
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2097
                raise ValueError("Unknown suffix {0!r}"
 
2098
                                 .format(suffix))
1844
2099
        except (ValueError, IndexError) as e:
1845
2100
            raise ValueError(*(e.args))
1846
2101
        timevalue += delta
1847
2102
    return timevalue
1848
2103
 
1849
2104
 
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
2105
def daemon(nochdir = False, noclose = False):
1875
2106
    """See daemon(3).  Standard BSD Unix function.
1876
2107
    
1884
2115
        sys.exit()
1885
2116
    if not noclose:
1886
2117
        # Close all standard open file descriptors
1887
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2118
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1888
2119
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1889
2120
            raise OSError(errno.ENODEV,
1890
 
                          "%s not a character device"
1891
 
                          % os.path.devnull)
 
2121
                          "{0} not a character device"
 
2122
                          .format(os.devnull))
1892
2123
        os.dup2(null, sys.stdin.fileno())
1893
2124
        os.dup2(null, sys.stdout.fileno())
1894
2125
        os.dup2(null, sys.stderr.fileno())
1903
2134
    
1904
2135
    parser = argparse.ArgumentParser()
1905
2136
    parser.add_argument("-v", "--version", action="version",
1906
 
                        version = "%%(prog)s %s" % version,
 
2137
                        version = "%(prog)s {0}".format(version),
1907
2138
                        help="show version number and exit")
1908
2139
    parser.add_argument("-i", "--interface", metavar="IF",
1909
2140
                        help="Bind to interface IF")
1932
2163
    parser.add_argument("--no-ipv6", action="store_false",
1933
2164
                        dest="use_ipv6", help="Do not use IPv6")
1934
2165
    parser.add_argument("--no-restore", action="store_false",
1935
 
                        dest="restore",
1936
 
                        help="Do not restore stored state",
1937
 
                        default=True)
1938
 
 
 
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
    
1939
2171
    options = parser.parse_args()
1940
2172
    
1941
2173
    if options.check:
1954
2186
                        "use_dbus": "True",
1955
2187
                        "use_ipv6": "True",
1956
2188
                        "debuglevel": "",
 
2189
                        "restore": "True",
 
2190
                        "statedir": "/var/lib/mandos"
1957
2191
                        }
1958
2192
    
1959
2193
    # Parse config file for server-global settings
1976
2210
    # options, if set.
1977
2211
    for option in ("interface", "address", "port", "debug",
1978
2212
                   "priority", "servicename", "configdir",
1979
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2213
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2214
                   "statedir"):
1980
2215
        value = getattr(options, option)
1981
2216
        if value is not None:
1982
2217
            server_settings[option] = value
1994
2229
    debuglevel = server_settings["debuglevel"]
1995
2230
    use_dbus = server_settings["use_dbus"]
1996
2231
    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)
1997
2243
    
1998
2244
    if server_settings["servicename"] != "Mandos":
1999
2245
        syslogger.setFormatter(logging.Formatter
2000
 
                               ('Mandos (%s) [%%(process)d]:'
2001
 
                                ' %%(levelname)s: %%(message)s'
2002
 
                                % server_settings["servicename"]))
 
2246
                               ('Mandos ({0}) [%(process)d]:'
 
2247
                                ' %(levelname)s: %(message)s'
 
2248
                                .format(server_settings
 
2249
                                        ["servicename"])))
2003
2250
    
2004
2251
    # 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)
 
2252
    client_config = configparser.SafeConfigParser(Client
 
2253
                                                  .client_defaults)
2014
2254
    client_config.read(os.path.join(server_settings["configdir"],
2015
2255
                                    "clients.conf"))
2016
2256
    
2030
2270
        pidfilename = "/var/run/mandos.pid"
2031
2271
        try:
2032
2272
            pidfile = open(pidfilename, "w")
2033
 
        except IOError:
2034
 
            logger.error("Could not open file %r", pidfilename)
 
2273
        except IOError as e:
 
2274
            logger.error("Could not open file %r", pidfilename,
 
2275
                         exc_info=e)
2035
2276
    
2036
 
    try:
2037
 
        uid = pwd.getpwnam("_mandos").pw_uid
2038
 
        gid = pwd.getpwnam("_mandos").pw_gid
2039
 
    except KeyError:
 
2277
    for name in ("_mandos", "mandos", "nobody"):
2040
2278
        try:
2041
 
            uid = pwd.getpwnam("mandos").pw_uid
2042
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2279
            uid = pwd.getpwnam(name).pw_uid
 
2280
            gid = pwd.getpwnam(name).pw_gid
 
2281
            break
2043
2282
        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
 
2283
            continue
 
2284
    else:
 
2285
        uid = 65534
 
2286
        gid = 65534
2050
2287
    try:
2051
2288
        os.setgid(gid)
2052
2289
        os.setuid(uid)
2053
2290
    except OSError as error:
2054
 
        if error[0] != errno.EPERM:
 
2291
        if error.errno != errno.EPERM:
2055
2292
            raise error
2056
2293
    
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
2294
    if debug:
2064
 
        logger.setLevel(logging.DEBUG)
2065
2295
        # Enable all possible GnuTLS debugging
2066
2296
        
2067
2297
        # "Use a log level over 10 to enable all debugging options."
2076
2306
         .gnutls_global_set_log_function(debug_gnutls))
2077
2307
        
2078
2308
        # Redirect stdin so all checkers get /dev/null
2079
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2309
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2080
2310
        os.dup2(null, sys.stdin.fileno())
2081
2311
        if null > 2:
2082
2312
            os.close(null)
2083
 
    else:
2084
 
        # No console logging
2085
 
        logger.removeHandler(console)
2086
2313
    
2087
2314
    # Need to fork before connecting to D-Bus
2088
2315
    if not debug:
2089
2316
        # Close all input and output, do double fork, etc.
2090
2317
        daemon()
2091
2318
    
 
2319
    gobject.threads_init()
 
2320
    
2092
2321
    global main_loop
2093
2322
    # From the Avahi example code
2094
 
    DBusGMainLoop(set_as_default=True )
 
2323
    DBusGMainLoop(set_as_default=True)
2095
2324
    main_loop = gobject.MainLoop()
2096
2325
    bus = dbus.SystemBus()
2097
2326
    # End of Avahi example code
2103
2332
                            ("se.bsnet.fukt.Mandos", bus,
2104
2333
                             do_not_queue=True))
2105
2334
        except dbus.exceptions.NameExistsException as e:
2106
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2335
            logger.error("Disabling D-Bus:", exc_info=e)
2107
2336
            use_dbus = False
2108
2337
            server_settings["use_dbus"] = False
2109
2338
            tcp_server.use_dbus = False
2121
2350
    
2122
2351
    client_class = Client
2123
2352
    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
 
    
 
2353
        client_class = functools.partial(ClientDBus, bus = bus)
 
2354
    
 
2355
    client_settings = Client.config_parser(client_config)
2147
2356
    old_client_settings = {}
2148
 
    clients_data = []
2149
 
 
2150
 
    # Get client data and settings from last running state. 
 
2357
    clients_data = {}
 
2358
    
 
2359
    # Get client data and settings from last running state.
2151
2360
    if server_settings["restore"]:
2152
2361
        try:
2153
2362
            with open(stored_state_path, "rb") as stored_state:
2154
 
                clients_data, old_client_settings = (
2155
 
                    pickle.load(stored_state))
 
2363
                clients_data, old_client_settings = (pickle.load
 
2364
                                                     (stored_state))
2156
2365
            os.remove(stored_state_path)
2157
2366
        except IOError as e:
2158
 
            logger.warning("Could not load persistant state: {0}"
2159
 
                           .format(e))
2160
 
            if e.errno != errno.ENOENT:
 
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)
2161
2373
                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():
 
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))
2172
2424
            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])
 
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)
2224
2448
    
2225
2449
    if not tcp_server.clients:
2226
2450
        logger.warning("No clients defined")
2227
 
        
 
2451
    
2228
2452
    if not debug:
2229
2453
        try:
2230
2454
            with pidfile:
2238
2462
            # "pidfile" was never created
2239
2463
            pass
2240
2464
        del pidfilename
2241
 
        
2242
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2243
2465
    
2244
2466
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2245
2467
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2246
2468
    
2247
2469
    if use_dbus:
2248
 
        class MandosDBusService(dbus.service.Object):
 
2470
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2471
                                        "se.bsnet.fukt.Mandos"})
 
2472
        class MandosDBusService(DBusObjectWithProperties):
2249
2473
            """A D-Bus proxy object"""
2250
2474
            def __init__(self):
2251
2475
                dbus.service.Object.__init__(self, bus, "/")
2252
2476
            _interface = "se.recompile.Mandos"
2253
2477
            
 
2478
            @dbus_interface_annotations(_interface)
 
2479
            def _foo(self):
 
2480
                return { "org.freedesktop.DBus.Property"
 
2481
                         ".EmitsChangedSignal":
 
2482
                             "false"}
 
2483
            
2254
2484
            @dbus.service.signal(_interface, signature="o")
2255
2485
            def ClientAdded(self, objpath):
2256
2486
                "D-Bus signal"
2298
2528
            
2299
2529
            del _interface
2300
2530
        
2301
 
        class MandosDBusServiceTransitional(MandosDBusService):
2302
 
            __metaclass__ = AlternateDBusNamesMetaclass
2303
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2531
        mandos_dbus_service = MandosDBusService()
2304
2532
    
2305
2533
    def cleanup():
2306
2534
        "Cleanup function; run on exit"
2309
2537
        multiprocessing.active_children()
2310
2538
        if not (tcp_server.clients or client_settings):
2311
2539
            return
2312
 
 
 
2540
        
2313
2541
        # Store client before exiting. Secrets are encrypted with key
2314
2542
        # based on what config file has. If config file is
2315
2543
        # 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
 
            
 
2544
        clients = {}
 
2545
        with PGPEngine() as pgp:
 
2546
            for client in tcp_server.clients.itervalues():
 
2547
                key = client_settings[client.name]["secret"]
 
2548
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2549
                                                      key)
 
2550
                client_dict = {}
 
2551
                
 
2552
                # A list of attributes that can not be pickled
 
2553
                # + secret.
 
2554
                exclude = set(("bus", "changedstate", "secret",
 
2555
                               "checker"))
 
2556
                for name, typ in (inspect.getmembers
 
2557
                                  (dbus.service.Object)):
 
2558
                    exclude.add(name)
 
2559
                
 
2560
                client_dict["encrypted_secret"] = (client
 
2561
                                                   .encrypted_secret)
 
2562
                for attr in client.client_structure:
 
2563
                    if attr not in exclude:
 
2564
                        client_dict[attr] = getattr(client, attr)
 
2565
                
 
2566
                clients[client.name] = client_dict
 
2567
                del client_settings[client.name]["secret"]
 
2568
        
2337
2569
        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:
 
2570
            with (tempfile.NamedTemporaryFile
 
2571
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2572
                   dir=os.path.dirname(stored_state_path),
 
2573
                   delete=False)) as stored_state:
2342
2574
                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
 
 
 
2575
                tempname=stored_state.name
 
2576
            os.rename(tempname, stored_state_path)
 
2577
        except (IOError, OSError) as e:
 
2578
            if not debug:
 
2579
                try:
 
2580
                    os.remove(tempname)
 
2581
                except NameError:
 
2582
                    pass
 
2583
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2584
                logger.warning("Could not save persistent state: {0}"
 
2585
                               .format(os.strerror(e.errno)))
 
2586
            else:
 
2587
                logger.warning("Could not save persistent state:",
 
2588
                               exc_info=e)
 
2589
                raise e
 
2590
        
2349
2591
        # Delete all clients, and settings from config
2350
2592
        while tcp_server.clients:
2351
2593
            name, client = tcp_server.clients.popitem()
2369
2611
        # Need to initiate checking of clients
2370
2612
        if client.enabled:
2371
2613
            client.init_checker()
2372
 
 
2373
2614
    
2374
2615
    tcp_server.enable()
2375
2616
    tcp_server.server_activate()
2378
2619
    service.port = tcp_server.socket.getsockname()[1]
2379
2620
    if use_ipv6:
2380
2621
        logger.info("Now listening on address %r, port %d,"
2381
 
                    " flowinfo %d, scope_id %d"
2382
 
                    % tcp_server.socket.getsockname())
 
2622
                    " flowinfo %d, scope_id %d",
 
2623
                    *tcp_server.socket.getsockname())
2383
2624
    else:                       # IPv4
2384
 
        logger.info("Now listening on address %r, port %d"
2385
 
                    % tcp_server.socket.getsockname())
 
2625
        logger.info("Now listening on address %r, port %d",
 
2626
                    *tcp_server.socket.getsockname())
2386
2627
    
2387
2628
    #service.interface = tcp_server.socket.getsockname()[3]
2388
2629
    
2391
2632
        try:
2392
2633
            service.activate()
2393
2634
        except dbus.exceptions.DBusException as error:
2394
 
            logger.critical("DBusException: %s", error)
 
2635
            logger.critical("D-Bus Exception", exc_info=error)
2395
2636
            cleanup()
2396
2637
            sys.exit(1)
2397
2638
        # End of Avahi example code
2404
2645
        logger.debug("Starting main loop")
2405
2646
        main_loop.run()
2406
2647
    except AvahiError as error:
2407
 
        logger.critical("AvahiError: %s", error)
 
2648
        logger.critical("Avahi Error", exc_info=error)
2408
2649
        cleanup()
2409
2650
        sys.exit(1)
2410
2651
    except KeyboardInterrupt:
2415
2656
    # Must run before the D-Bus bus name gets deregistered
2416
2657
    cleanup()
2417
2658
 
2418
 
 
2419
2659
if __name__ == '__main__':
2420
2660
    main()