/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 at bsnet
  • Date: 2011-11-12 18:14:55 UTC
  • mto: This revision was merged to the branch mainline in revision 522.
  • Revision ID: teddy@fukt.bsnet.se-20111112181455-8m6z4qrrib33bl2c
* plugins.d/mandos-client.c (SYNOPSIS, OPTIONS): Document
                                                 "--network-hook-dir"
                                                 option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
65
63
import cPickle as pickle
66
64
import multiprocessing
67
65
import types
68
 
import binascii
69
 
import tempfile
70
 
import itertools
 
66
import hashlib
71
67
 
72
68
import dbus
73
69
import dbus.service
78
74
import ctypes.util
79
75
import xml.dom.minidom
80
76
import inspect
81
 
import GnuPGInterface
 
77
import Crypto.Cipher.AES
82
78
 
83
79
try:
84
80
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
84
    except ImportError:
89
85
        SO_BINDTODEVICE = None
90
86
 
91
 
version = "1.5.3"
92
 
stored_state_file = "clients.pickle"
 
87
 
 
88
version = "1.4.1"
93
89
 
94
90
logger = logging.getLogger()
 
91
stored_state_path = "/var/lib/mandos/clients.pickle"
 
92
 
95
93
syslogger = (logging.handlers.SysLogHandler
96
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
95
              address = str("/dev/log")))
98
 
 
99
 
try:
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
101
 
                      (ctypes.util.find_library("c"))
102
 
                      .if_nametoindex)
103
 
except (OSError, AttributeError):
104
 
    def if_nametoindex(interface):
105
 
        "Get an interface index the hard way, i.e. using fcntl()"
106
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
107
 
        with contextlib.closing(socket.socket()) as s:
108
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
 
                                struct.pack(str("16s16x"),
110
 
                                            interface))
111
 
        interface_index = struct.unpack(str("I"),
112
 
                                        ifreq[16:20])[0]
113
 
        return interface_index
114
 
 
115
 
 
116
 
def initlogger(debug, level=logging.WARNING):
117
 
    """init logger and add loglevel"""
118
 
    
119
 
    syslogger.setFormatter(logging.Formatter
120
 
                           ('Mandos [%(process)d]: %(levelname)s:'
121
 
                            ' %(message)s'))
122
 
    logger.addHandler(syslogger)
123
 
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
131
 
    logger.setLevel(level)
132
 
 
133
 
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
136
 
    pass
137
 
 
138
 
 
139
 
class PGPEngine(object):
140
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
 
    def __init__(self):
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
 
        self.gnupg = GnuPGInterface.GnuPG()
145
 
        self.gnupg.options.meta_interactive = False
146
 
        self.gnupg.options.homedir = self.tempdir
147
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
150
 
    
151
 
    def __enter__(self):
152
 
        return self
153
 
    
154
 
    def __exit__ (self, exc_type, exc_value, traceback):
155
 
        self._cleanup()
156
 
        return False
157
 
    
158
 
    def __del__(self):
159
 
        self._cleanup()
160
 
    
161
 
    def _cleanup(self):
162
 
        if self.tempdir is not None:
163
 
            # Delete contents of tempdir
164
 
            for root, dirs, files in os.walk(self.tempdir,
165
 
                                             topdown = False):
166
 
                for filename in files:
167
 
                    os.remove(os.path.join(root, filename))
168
 
                for dirname in dirs:
169
 
                    os.rmdir(os.path.join(root, dirname))
170
 
            # Remove tempdir
171
 
            os.rmdir(self.tempdir)
172
 
            self.tempdir = None
173
 
    
174
 
    def password_encode(self, password):
175
 
        # Passphrase can not be empty and can not contain newlines or
176
 
        # NUL bytes.  So we prefix it and hex encode it.
177
 
        return b"mandos" + binascii.hexlify(password)
178
 
    
179
 
    def encrypt(self, data, password):
180
 
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
182
 
            try:
183
 
                proc = self.gnupg.run(['--symmetric'],
184
 
                                      create_fhs=['stdin', 'stdout'],
185
 
                                      attach_fhs={'stderr': devnull})
186
 
                with contextlib.closing(proc.handles['stdin']) as f:
187
 
                    f.write(data)
188
 
                with contextlib.closing(proc.handles['stdout']) as f:
189
 
                    ciphertext = f.read()
190
 
                proc.wait()
191
 
            except IOError as e:
192
 
                raise PGPError(e)
193
 
        self.gnupg.passphrase = None
194
 
        return ciphertext
195
 
    
196
 
    def decrypt(self, data, password):
197
 
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
199
 
            try:
200
 
                proc = self.gnupg.run(['--decrypt'],
201
 
                                      create_fhs=['stdin', 'stdout'],
202
 
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
204
 
                    f.write(data)
205
 
                with contextlib.closing(proc.handles['stdout']) as f:
206
 
                    decrypted_plaintext = f.read()
207
 
                proc.wait()
208
 
            except IOError as e:
209
 
                raise PGPError(e)
210
 
        self.gnupg.passphrase = None
211
 
        return decrypted_plaintext
 
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)
212
107
 
213
108
 
214
109
class AvahiError(Exception):
245
140
    server: D-Bus Server
246
141
    bus: dbus.SystemBus()
247
142
    """
248
 
    
249
143
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
144
                 servicetype = None, port = None, TXT = None,
251
145
                 domain = "", host = "", max_renames = 32768,
264
158
        self.server = None
265
159
        self.bus = bus
266
160
        self.entry_group_state_changed_match = None
267
 
    
268
161
    def rename(self):
269
162
        """Derived from the Avahi example code"""
270
163
        if self.rename_count >= self.max_renames:
280
173
        try:
281
174
            self.add()
282
175
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
176
            logger.critical("DBusException: %s", error)
284
177
            self.cleanup()
285
178
            os._exit(1)
286
179
        self.rename_count += 1
287
 
    
288
180
    def remove(self):
289
181
        """Derived from the Avahi example code"""
290
182
        if self.entry_group_state_changed_match is not None:
292
184
            self.entry_group_state_changed_match = None
293
185
        if self.group is not None:
294
186
            self.group.Reset()
295
 
    
296
187
    def add(self):
297
188
        """Derived from the Avahi example code"""
298
189
        self.remove()
315
206
            dbus.UInt16(self.port),
316
207
            avahi.string_array_to_txt_array(self.TXT))
317
208
        self.group.Commit()
318
 
    
319
209
    def entry_group_state_changed(self, state, error):
320
210
        """Derived from the Avahi example code"""
321
211
        logger.debug("Avahi entry group state change: %i", state)
328
218
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
219
            logger.critical("Avahi: Error in group state changed %s",
330
220
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
221
            raise AvahiGroupError("State changed: %s"
 
222
                                  % unicode(error))
334
223
    def cleanup(self):
335
224
        """Derived from the Avahi example code"""
336
225
        if self.group is not None:
337
226
            try:
338
227
                self.group.Free()
339
228
            except (dbus.exceptions.UnknownMethodException,
340
 
                    dbus.exceptions.DBusException):
 
229
                    dbus.exceptions.DBusException) as e:
341
230
                pass
342
231
            self.group = None
343
232
        self.remove()
344
 
    
345
233
    def server_state_changed(self, state, error=None):
346
234
        """Derived from the Avahi example code"""
347
235
        logger.debug("Avahi server state change: %i", state)
366
254
                logger.debug("Unknown state: %r", state)
367
255
            else:
368
256
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
257
    def activate(self):
371
258
        """Derived from the Avahi example code"""
372
259
        if self.server is None:
379
266
                                 self.server_state_changed)
380
267
        self.server_state_changed(self.server.GetState())
381
268
 
382
 
 
383
269
class AvahiServiceToSyslog(AvahiService):
384
270
    def rename(self):
385
271
        """Add the new name to the syslog messages"""
386
272
        ret = AvahiService.rename(self)
387
273
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
274
                               ('Mandos (%s) [%%(process)d]:'
 
275
                                ' %%(levelname)s: %%(message)s'
 
276
                                % self.name))
391
277
        return ret
392
278
 
393
 
 
394
 
def timedelta_to_milliseconds(td):
 
279
def _timedelta_to_milliseconds(td):
395
280
    "Convert a datetime.timedelta() to milliseconds"
396
281
    return ((td.days * 24 * 60 * 60 * 1000)
397
282
            + (td.seconds * 1000)
398
283
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
284
        
401
285
class Client(object):
402
286
    """A representation of a client host served by this server.
403
287
    
404
288
    Attributes:
405
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
289
    _approved:   bool(); 'None' if not yet approved/disapproved
406
290
    approval_delay: datetime.timedelta(); Time to wait for approval
407
291
    approval_duration: datetime.timedelta(); Duration of one approval
408
292
    checker:    subprocess.Popen(); a running checker process used
427
311
    last_approval_request: datetime.datetime(); (UTC) or None
428
312
    last_checked_ok: datetime.datetime(); (UTC) or None
429
313
    last_checker_status: integer between 0 and 255 reflecting exit
430
 
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
432
 
    last_enabled: datetime.datetime(); (UTC) or None
 
314
                         status of last checker. -1 reflect crashed
 
315
                         checker, or None.
 
316
    last_enabled: datetime.datetime(); (UTC)
433
317
    name:       string; from the config file, used in log messages and
434
318
                        D-Bus identifiers
435
319
    secret:     bytestring; sent verbatim (over TLS) to client
436
320
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
321
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
322
    extended_timeout:   extra long timeout when password has been sent
439
323
    runtime_expansions: Allowed attributes for runtime expansion.
440
324
    expires:    datetime.datetime(); time (UTC) when a client will be
441
325
                disabled, or None
442
326
    """
443
327
    
444
328
    runtime_expansions = ("approval_delay", "approval_duration",
445
 
                          "created", "enabled", "expires",
446
 
                          "fingerprint", "host", "interval",
447
 
                          "last_approval_request", "last_checked_ok",
 
329
                          "created", "enabled", "fingerprint",
 
330
                          "host", "interval", "last_checked_ok",
448
331
                          "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
 
                        }
459
332
    
460
333
    def timeout_milliseconds(self):
461
334
        "Return the 'timeout' attribute in milliseconds"
462
 
        return timedelta_to_milliseconds(self.timeout)
 
335
        return _timedelta_to_milliseconds(self.timeout)
463
336
    
464
337
    def extended_timeout_milliseconds(self):
465
338
        "Return the 'extended_timeout' attribute in milliseconds"
466
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
339
        return _timedelta_to_milliseconds(self.extended_timeout)
467
340
    
468
341
    def interval_milliseconds(self):
469
342
        "Return the 'interval' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.interval)
 
343
        return _timedelta_to_milliseconds(self.interval)
471
344
    
472
345
    def approval_delay_milliseconds(self):
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):
 
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."""
523
352
        self.name = name
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
 
        
 
353
        if config is None:
 
354
            config = {}
538
355
        logger.debug("Creating client %r", self.name)
539
356
        # Uppercase and remove spaces from fingerprint for later
540
357
        # comparison purposes with return value from the fingerprint()
541
358
        # function
 
359
        self.fingerprint = (config["fingerprint"].upper()
 
360
                            .replace(" ", ""))
542
361
        logger.debug("  Fingerprint: %s", self.fingerprint)
543
 
        self.created = settings.get("created",
544
 
                                    datetime.datetime.utcnow())
545
 
        
546
 
        # attributes specific for this server instance
 
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"])
547
383
        self.checker = None
548
384
        self.checker_initiator_tag = None
549
385
        self.disable_initiator_tag = None
 
386
        self.expires = datetime.datetime.utcnow() + self.timeout
550
387
        self.checker_callback_tag = None
 
388
        self.checker_command = config["checker"]
551
389
        self.current_checker_command = None
552
 
        self.approved = None
 
390
        self._approved = None
 
391
        self.approved_by_default = config.get("approved_by_default",
 
392
                                              True)
553
393
        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"])
554
398
        self.changedstate = (multiprocessing_manager
555
399
                             .Condition(multiprocessing_manager
556
400
                                        .Lock()))
557
 
        self.client_structure = [attr for attr in
558
 
                                 self.__dict__.iterkeys()
 
401
        self.client_structure = [attr for attr
 
402
                                 in self.__dict__.iterkeys()
559
403
                                 if not attr.startswith("_")]
560
404
        self.client_structure.append("client_structure")
561
 
        
 
405
 
 
406
 
562
407
        for name, t in inspect.getmembers(type(self),
563
408
                                          lambda obj:
564
409
                                              isinstance(obj,
576
421
        if getattr(self, "enabled", False):
577
422
            # Already enabled
578
423
            return
 
424
        self.send_changedstate()
579
425
        self.expires = datetime.datetime.utcnow() + self.timeout
580
426
        self.enabled = True
581
427
        self.last_enabled = datetime.datetime.utcnow()
582
428
        self.init_checker()
583
 
        self.send_changedstate()
584
429
    
585
430
    def disable(self, quiet=True):
586
431
        """Disable this client."""
587
432
        if not getattr(self, "enabled", False):
588
433
            return False
589
434
        if not quiet:
 
435
            self.send_changedstate()
 
436
        if not quiet:
590
437
            logger.info("Disabling client %s", self.name)
591
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
438
        if getattr(self, "disable_initiator_tag", False):
592
439
            gobject.source_remove(self.disable_initiator_tag)
593
440
            self.disable_initiator_tag = None
594
441
        self.expires = None
595
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
442
        if getattr(self, "checker_initiator_tag", False):
596
443
            gobject.source_remove(self.checker_initiator_tag)
597
444
            self.checker_initiator_tag = None
598
445
        self.stop_checker()
599
446
        self.enabled = False
600
 
        if not quiet:
601
 
            self.send_changedstate()
602
447
        # Do not run this again if called by a gobject.timeout_add
603
448
        return False
604
449
    
605
450
    def __del__(self):
606
451
        self.disable()
607
 
    
 
452
 
608
453
    def init_checker(self):
609
454
        # Schedule a new checker to be started an 'interval' from now,
610
455
        # and every interval from then on.
611
 
        if self.checker_initiator_tag is not None:
612
 
            gobject.source_remove(self.checker_initiator_tag)
613
456
        self.checker_initiator_tag = (gobject.timeout_add
614
457
                                      (self.interval_milliseconds(),
615
458
                                       self.start_checker))
616
459
        # Schedule a disable() when 'timeout' has passed
617
 
        if self.disable_initiator_tag is not None:
618
 
            gobject.source_remove(self.disable_initiator_tag)
619
460
        self.disable_initiator_tag = (gobject.timeout_add
620
461
                                   (self.timeout_milliseconds(),
621
462
                                    self.disable))
622
463
        # Also start a new checker *right now*.
623
464
        self.start_checker()
624
 
    
 
465
 
 
466
        
625
467
    def checker_callback(self, pid, condition, command):
626
468
        """The checker has completed, so take appropriate actions."""
627
469
        self.checker_callback_tag = None
628
470
        self.checker = None
629
471
        if os.WIFEXITED(condition):
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
472
            self.last_checker_status =  os.WEXITSTATUS(condition)
631
473
            if self.last_checker_status == 0:
632
474
                logger.info("Checker for %(name)s succeeded",
633
475
                            vars(self))
640
482
            logger.warning("Checker for %(name)s crashed?",
641
483
                           vars(self))
642
484
    
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."""
 
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
        """
651
491
        if timeout is None:
652
492
            timeout = self.timeout
 
493
        self.last_checked_ok = datetime.datetime.utcnow()
653
494
        if self.disable_initiator_tag is not None:
654
495
            gobject.source_remove(self.disable_initiator_tag)
655
 
            self.disable_initiator_tag = None
656
496
        if getattr(self, "enabled", False):
657
497
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (timedelta_to_milliseconds
 
498
                                          (_timedelta_to_milliseconds
659
499
                                           (timeout), self.disable))
660
500
            self.expires = datetime.datetime.utcnow() + timeout
661
501
    
668
508
        If a checker already exists, leave it running and do
669
509
        nothing."""
670
510
        # The reason for not killing a running checker is that if we
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
 
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
675
515
        # checkers alone, the checker would have to take more time
676
516
        # than 'timeout' for the client to be disabled, which is as it
677
517
        # should be.
691
531
                                      self.current_checker_command)
692
532
        # Start a new checker if needed
693
533
        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)
699
534
            try:
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
 
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
705
553
            self.current_checker_command = command
706
554
            try:
707
555
                logger.info("Starting checker %r for %s",
713
561
                self.checker = subprocess.Popen(command,
714
562
                                                close_fds=True,
715
563
                                                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)
716
574
            except OSError as 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)
 
575
                logger.error("Failed to start subprocess: %s",
 
576
                             error)
729
577
        # Re-run this periodically if run by gobject.timeout_add
730
578
        return True
731
579
    
738
586
            return
739
587
        logger.debug("Stopping checker for %(name)s", vars(self))
740
588
        try:
741
 
            self.checker.terminate()
 
589
            os.kill(self.checker.pid, signal.SIGTERM)
742
590
            #time.sleep(0.5)
743
591
            #if self.checker.poll() is None:
744
 
            #    self.checker.kill()
 
592
            #    os.kill(self.checker.pid, signal.SIGKILL)
745
593
        except OSError as error:
746
594
            if error.errno != errno.ESRCH: # No such process
747
595
                raise
748
596
        self.checker = None
749
597
 
 
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
 
750
648
 
751
649
def dbus_service_property(dbus_interface, signature="v",
752
650
                          access="readwrite", byte_arrays=False):
764
662
    # "Set" method, so we fail early here:
765
663
    if byte_arrays and signature != "ay":
766
664
        raise ValueError("Byte arrays not supported for non-'ay'"
767
 
                         " signature {0!r}".format(signature))
 
665
                         " signature %r" % signature)
768
666
    def decorator(func):
769
667
        func._dbus_is_property = True
770
668
        func._dbus_interface = dbus_interface
778
676
    return decorator
779
677
 
780
678
 
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
 
 
818
679
class DBusPropertyException(dbus.exceptions.DBusException):
819
680
    """A base class for D-Bus property-related exceptions
820
681
    """
843
704
    """
844
705
    
845
706
    @staticmethod
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)
 
707
    def _is_dbus_property(obj):
 
708
        return getattr(obj, "_dbus_is_property", False)
854
709
    
855
 
    def _get_all_dbus_things(self, thing):
 
710
    def _get_all_dbus_properties(self):
856
711
        """Returns a generator of (name, attribute) pairs
857
712
        """
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
859
 
                         name),
860
 
                 athing.__get__(self))
 
713
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
714
                for cls in self.__class__.__mro__
862
 
                for name, athing in
863
 
                inspect.getmembers(cls,
864
 
                                   self._is_dbus_thing(thing)))
 
715
                for name, prop in
 
716
                inspect.getmembers(cls, self._is_dbus_property))
865
717
    
866
718
    def _get_dbus_property(self, interface_name, property_name):
867
719
        """Returns a bound method if one exists which is a D-Bus
869
721
        """
870
722
        for cls in  self.__class__.__mro__:
871
723
            for name, value in (inspect.getmembers
872
 
                                (cls,
873
 
                                 self._is_dbus_thing("property"))):
 
724
                                (cls, self._is_dbus_property)):
874
725
                if (value._dbus_name == property_name
875
726
                    and value._dbus_interface == interface_name):
876
727
                    return value.__get__(self)
905
756
            # signatures other than "ay".
906
757
            if prop._dbus_signature != "ay":
907
758
                raise ValueError
908
 
            value = dbus.ByteArray(b''.join(chr(byte)
909
 
                                            for byte in value))
 
759
            value = dbus.ByteArray(''.join(unichr(byte)
 
760
                                           for byte in value))
910
761
        prop(value)
911
762
    
912
763
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
917
768
        
918
769
        Note: Will not include properties with access="write".
919
770
        """
920
 
        properties = {}
921
 
        for name, prop in self._get_all_dbus_things("property"):
 
771
        all = {}
 
772
        for name, prop in self._get_all_dbus_properties():
922
773
            if (interface_name
923
774
                and interface_name != prop._dbus_interface):
924
775
                # Interface non-empty but did not match
928
779
                continue
929
780
            value = prop()
930
781
            if not hasattr(value, "variant_level"):
931
 
                properties[name] = value
 
782
                all[name] = value
932
783
                continue
933
 
            properties[name] = type(value)(value, variant_level=
934
 
                                           value.variant_level+1)
935
 
        return dbus.Dictionary(properties, signature="sv")
 
784
            all[name] = type(value)(value, variant_level=
 
785
                                    value.variant_level+1)
 
786
        return dbus.Dictionary(all, signature="sv")
936
787
    
937
788
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
938
789
                         out_signature="s",
939
790
                         path_keyword='object_path',
940
791
                         connection_keyword='connection')
941
792
    def Introspect(self, object_path, connection):
942
 
        """Overloading of standard D-Bus method.
943
 
        
944
 
        Inserts property tags and interface annotation tags.
 
793
        """Standard D-Bus method, overloaded to insert property tags.
945
794
        """
946
795
        xmlstring = dbus.service.Object.Introspect(self, object_path,
947
796
                                                   connection)
954
803
                e.setAttribute("access", prop._dbus_access)
955
804
                return e
956
805
            for if_tag in document.getElementsByTagName("interface"):
957
 
                # Add property tags
958
806
                for tag in (make_tag(document, name, prop)
959
807
                            for name, prop
960
 
                            in self._get_all_dbus_things("property")
 
808
                            in self._get_all_dbus_properties()
961
809
                            if prop._dbus_interface
962
810
                            == if_tag.getAttribute("name")):
963
811
                    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)
995
812
                # Add the names to the return values for the
996
813
                # "org.freedesktop.DBus.Properties" methods
997
814
                if (if_tag.getAttribute("name")
1012
829
        except (AttributeError, xml.dom.DOMException,
1013
830
                xml.parsers.expat.ExpatError) as error:
1014
831
            logger.error("Failed to override Introspection method",
1015
 
                         exc_info=error)
 
832
                         error)
1016
833
        return xmlstring
1017
834
 
1018
835
 
1023
840
    return dbus.String(dt.isoformat(),
1024
841
                       variant_level=variant_level)
1025
842
 
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).
 
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.
1049
847
    """
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):
 
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):
1057
855
                # Ignore non-D-Bus attributes, and D-Bus attributes
1058
856
                # with the wrong interface name
1059
857
                if (not hasattr(attribute, "_dbus_interface")
1060
858
                    or not attribute._dbus_interface
1061
 
                    .startswith(orig_interface_name)):
 
859
                    .startswith("se.recompile.Mandos")):
1062
860
                    continue
1063
861
                # Create an alternate D-Bus interface name based on
1064
862
                # the current name
1065
863
                alt_interface = (attribute._dbus_interface
1066
 
                                 .replace(orig_interface_name,
1067
 
                                          alt_interface_name))
1068
 
                interface_names.add(alt_interface)
 
864
                                 .replace("se.recompile.Mandos",
 
865
                                          "se.bsnet.fukt.Mandos"))
1069
866
                # Is this a D-Bus signal?
1070
867
                if getattr(attribute, "_dbus_is_signal", False):
1071
868
                    # Extract the original non-method function by
1086
883
                                nonmethod_func.func_name,
1087
884
                                nonmethod_func.func_defaults,
1088
885
                                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
1095
886
                    # Define a creator of a function to call both the
1096
 
                    # original and alternate functions, so both the
1097
 
                    # original and alternate signals gets sent when
1098
 
                    # the function is called
 
887
                    # old and new functions, so both the old and new
 
888
                    # signals gets sent when the function is called
1099
889
                    def fixscope(func1, func2):
1100
890
                        """This function is a scope container to pass
1101
891
                        func1 and func2 to the "call_both" function
1108
898
                        return call_both
1109
899
                    # Create the "call_both" function and add it to
1110
900
                    # the class
1111
 
                    attr[attrname] = fixscope(attribute, new_function)
 
901
                    attr[attrname] = fixscope(attribute,
 
902
                                              new_function)
1112
903
                # Is this a D-Bus method?
1113
904
                elif getattr(attribute, "_dbus_is_method", False):
1114
905
                    # Create a new, but exactly alike, function
1125
916
                                        attribute.func_name,
1126
917
                                        attribute.func_defaults,
1127
918
                                        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
1134
919
                # Is this a D-Bus property?
1135
920
                elif getattr(attribute, "_dbus_is_property", False):
1136
921
                    # Create a new, but exactly alike, function
1150
935
                                        attribute.func_name,
1151
936
                                        attribute.func_defaults,
1152
937
                                        attribute.func_closure)))
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"})
 
938
        return type.__new__(mcs, name, bases, attr)
 
939
 
1198
940
class ClientDBus(Client, DBusObjectWithProperties):
1199
941
    """A Client class using D-Bus
1200
942
    
1210
952
    
1211
953
    def __init__(self, bus = None, *args, **kwargs):
1212
954
        self.bus = bus
 
955
        self._approvals_pending = 0
1213
956
        Client.__init__(self, *args, **kwargs)
 
957
        self.add_to_dbus()
 
958
    
 
959
    def add_to_dbus(self):
1214
960
        # Only now, when this client is initialized, can it show up on
1215
961
        # the D-Bus
1216
962
        client_object_name = unicode(self.name).translate(
1220
966
                                 ("/clients/" + client_object_name))
1221
967
        DBusObjectWithProperties.__init__(self, self.bus,
1222
968
                                          self.dbus_object_path)
1223
 
    
 
969
        
1224
970
    def notifychangeproperty(transform_func,
1225
971
                             dbus_name, type_func=lambda x: x,
1226
972
                             variant_level=1):
1227
973
        """ Modify a variable so that it's a property which announces
1228
974
        its changes to DBus.
1229
 
        
 
975
 
1230
976
        transform_fun: Function that takes a value and a variant_level
1231
977
                       and transforms it to a D-Bus type.
1232
978
        dbus_name: D-Bus name of the variable
1249
995
        
1250
996
        return property(lambda self: getattr(self, attrname), setter)
1251
997
    
 
998
    
1252
999
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1253
1000
    approvals_pending = notifychangeproperty(dbus.Boolean,
1254
1001
                                             "ApprovalPending",
1261
1008
                                       checker is not None)
1262
1009
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1263
1010
                                           "LastCheckedOK")
1264
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1265
 
                                               "LastCheckerStatus")
1266
1011
    last_approval_request = notifychangeproperty(
1267
1012
        datetime_to_dbus, "LastApprovalRequest")
1268
1013
    approved_by_default = notifychangeproperty(dbus.Boolean,
1269
1014
                                               "ApprovedByDefault")
1270
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1015
    approval_delay = notifychangeproperty(dbus.UInt16,
1271
1016
                                          "ApprovalDelay",
1272
1017
                                          type_func =
1273
 
                                          timedelta_to_milliseconds)
 
1018
                                          _timedelta_to_milliseconds)
1274
1019
    approval_duration = notifychangeproperty(
1275
 
        dbus.UInt64, "ApprovalDuration",
1276
 
        type_func = timedelta_to_milliseconds)
 
1020
        dbus.UInt16, "ApprovalDuration",
 
1021
        type_func = _timedelta_to_milliseconds)
1277
1022
    host = notifychangeproperty(dbus.String, "Host")
1278
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1023
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1279
1024
                                   type_func =
1280
 
                                   timedelta_to_milliseconds)
 
1025
                                   _timedelta_to_milliseconds)
1281
1026
    extended_timeout = notifychangeproperty(
1282
 
        dbus.UInt64, "ExtendedTimeout",
1283
 
        type_func = timedelta_to_milliseconds)
1284
 
    interval = notifychangeproperty(dbus.UInt64,
 
1027
        dbus.UInt16, "ExtendedTimeout",
 
1028
        type_func = _timedelta_to_milliseconds)
 
1029
    interval = notifychangeproperty(dbus.UInt16,
1285
1030
                                    "Interval",
1286
1031
                                    type_func =
1287
 
                                    timedelta_to_milliseconds)
 
1032
                                    _timedelta_to_milliseconds)
1288
1033
    checker_command = notifychangeproperty(dbus.String, "Checker")
1289
1034
    
1290
1035
    del notifychangeproperty
1332
1077
        return r
1333
1078
    
1334
1079
    def _reset_approved(self):
1335
 
        self.approved = None
 
1080
        self._approved = None
1336
1081
        return False
1337
1082
    
1338
1083
    def approve(self, value=True):
1339
 
        self.approved = value
1340
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1084
        self.send_changedstate()
 
1085
        self._approved = value
 
1086
        gobject.timeout_add(_timedelta_to_milliseconds
1341
1087
                            (self.approval_duration),
1342
1088
                            self._reset_approved)
1343
 
        self.send_changedstate()
 
1089
    
1344
1090
    
1345
1091
    ## D-Bus methods, signals & properties
1346
1092
    _interface = "se.recompile.Mandos.Client"
1347
1093
    
1348
 
    ## Interfaces
1349
 
    
1350
 
    @dbus_interface_annotations(_interface)
1351
 
    def _foo(self):
1352
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
 
                     "false"}
1354
 
    
1355
1094
    ## Signals
1356
1095
    
1357
1096
    # CheckerCompleted - signal
1456
1195
                           access="readwrite")
1457
1196
    def ApprovalDuration_dbus_property(self, value=None):
1458
1197
        if value is None:       # get
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1198
            return dbus.UInt64(_timedelta_to_milliseconds(
1460
1199
                    self.approval_duration))
1461
1200
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1462
1201
    
1476
1215
    def Host_dbus_property(self, value=None):
1477
1216
        if value is None:       # get
1478
1217
            return dbus.String(self.host)
1479
 
        self.host = unicode(value)
 
1218
        self.host = value
1480
1219
    
1481
1220
    # Created - property
1482
1221
    @dbus_service_property(_interface, signature="s", access="read")
1483
1222
    def Created_dbus_property(self):
1484
 
        return datetime_to_dbus(self.created)
 
1223
        return dbus.String(datetime_to_dbus(self.created))
1485
1224
    
1486
1225
    # LastEnabled - property
1487
1226
    @dbus_service_property(_interface, signature="s", access="read")
1508
1247
            return
1509
1248
        return datetime_to_dbus(self.last_checked_ok)
1510
1249
    
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
 
    
1517
1250
    # Expires - property
1518
1251
    @dbus_service_property(_interface, signature="s", access="read")
1519
1252
    def Expires_dbus_property(self):
1530
1263
    def Timeout_dbus_property(self, value=None):
1531
1264
        if value is None:       # get
1532
1265
            return dbus.UInt64(self.timeout_milliseconds())
1533
 
        old_timeout = self.timeout
1534
1266
        self.timeout = datetime.timedelta(0, 0, 0, value)
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))
 
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))
1551
1287
    
1552
1288
    # ExtendedTimeout - property
1553
1289
    @dbus_service_property(_interface, signature="t",
1566
1302
        self.interval = datetime.timedelta(0, 0, 0, value)
1567
1303
        if getattr(self, "checker_initiator_tag", None) is None:
1568
1304
            return
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
 
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
1575
1310
    
1576
1311
    # Checker - property
1577
1312
    @dbus_service_property(_interface, signature="s",
1579
1314
    def Checker_dbus_property(self, value=None):
1580
1315
        if value is None:       # get
1581
1316
            return dbus.String(self.checker_command)
1582
 
        self.checker_command = unicode(value)
 
1317
        self.checker_command = value
1583
1318
    
1584
1319
    # CheckerRunning - property
1585
1320
    @dbus_service_property(_interface, signature="b",
1614
1349
            raise KeyError()
1615
1350
    
1616
1351
    def __getattribute__(self, name):
1617
 
        if name == '_pipe':
 
1352
        if(name == '_pipe'):
1618
1353
            return super(ProxyClient, self).__getattribute__(name)
1619
1354
        self._pipe.send(('getattr', name))
1620
1355
        data = self._pipe.recv()
1627
1362
            return func
1628
1363
    
1629
1364
    def __setattr__(self, name, value):
1630
 
        if name == '_pipe':
 
1365
        if(name == '_pipe'):
1631
1366
            return super(ProxyClient, self).__setattr__(name, value)
1632
1367
        self._pipe.send(('setattr', name, value))
1633
1368
 
 
1369
class ClientDBusTransitional(ClientDBus):
 
1370
    __metaclass__ = AlternateDBusNamesMetaclass
1634
1371
 
1635
1372
class ClientHandler(socketserver.BaseRequestHandler, object):
1636
1373
    """A class to handle client connections.
1719
1456
                            client.Rejected("Disabled")
1720
1457
                        return
1721
1458
                    
1722
 
                    if client.approved or not client.approval_delay:
 
1459
                    if client._approved or not client.approval_delay:
1723
1460
                        #We are approved or approval is disabled
1724
1461
                        break
1725
 
                    elif client.approved is None:
 
1462
                    elif client._approved is None:
1726
1463
                        logger.info("Client %s needs approval",
1727
1464
                                    client.name)
1728
1465
                        if self.server.use_dbus:
1741
1478
                    #wait until timeout or approved
1742
1479
                    time = datetime.datetime.now()
1743
1480
                    client.changedstate.acquire()
1744
 
                    client.changedstate.wait(
1745
 
                        float(timedelta_to_milliseconds(delay)
1746
 
                              / 1000))
 
1481
                    (client.changedstate.wait
 
1482
                     (float(client._timedelta_to_milliseconds(delay)
 
1483
                            / 1000)))
1747
1484
                    client.changedstate.release()
1748
1485
                    time2 = datetime.datetime.now()
1749
1486
                    if (time2 - time) >= delay:
1765
1502
                    try:
1766
1503
                        sent = session.send(client.secret[sent_size:])
1767
1504
                    except gnutls.errors.GNUTLSError as error:
1768
 
                        logger.warning("gnutls send failed",
1769
 
                                       exc_info=error)
 
1505
                        logger.warning("gnutls send failed")
1770
1506
                        return
1771
1507
                    logger.debug("Sent: %d, remaining: %d",
1772
1508
                                 sent, len(client.secret)
1775
1511
                
1776
1512
                logger.info("Sending secret to %s", client.name)
1777
1513
                # bump the timeout using extended_timeout
1778
 
                client.bump_timeout(client.extended_timeout)
 
1514
                client.checked_ok(client.extended_timeout)
1779
1515
                if self.server.use_dbus:
1780
1516
                    # Emit D-Bus signal
1781
1517
                    client.GotSecret()
1786
1522
                try:
1787
1523
                    session.bye()
1788
1524
                except gnutls.errors.GNUTLSError as error:
1789
 
                    logger.warning("GnuTLS bye failed",
1790
 
                                   exc_info=error)
 
1525
                    logger.warning("GnuTLS bye failed")
1791
1526
    
1792
1527
    @staticmethod
1793
1528
    def peer_certificate(session):
1849
1584
        # Convert the buffer to a Python bytestring
1850
1585
        fpr = ctypes.string_at(buf, buf_len.value)
1851
1586
        # Convert the bytestring to hexadecimal notation
1852
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1587
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1853
1588
        return hex_fpr
1854
1589
 
1855
1590
 
1858
1593
    def sub_process_main(self, request, address):
1859
1594
        try:
1860
1595
            self.finish_request(request, address)
1861
 
        except Exception:
 
1596
        except:
1862
1597
            self.handle_error(request, address)
1863
1598
        self.close_request(request)
1864
1599
    
1865
1600
    def process_request(self, request, address):
1866
1601
        """Start a new process to process the request."""
1867
1602
        proc = multiprocessing.Process(target = self.sub_process_main,
1868
 
                                       args = (request, address))
 
1603
                                       args = (request,
 
1604
                                               address))
1869
1605
        proc.start()
1870
1606
        return proc
1871
1607
 
1921
1657
                                           str(self.interface
1922
1658
                                               + '\0'))
1923
1659
                except socket.error as error:
1924
 
                    if error.errno == errno.EPERM:
 
1660
                    if error[0] == errno.EPERM:
1925
1661
                        logger.error("No permission to"
1926
1662
                                     " bind to interface %s",
1927
1663
                                     self.interface)
1928
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1664
                    elif error[0] == errno.ENOPROTOOPT:
1929
1665
                        logger.error("SO_BINDTODEVICE not available;"
1930
1666
                                     " cannot bind to interface %s",
1931
1667
                                     self.interface)
1932
 
                    elif error.errno == errno.ENODEV:
1933
 
                        logger.error("Interface %s does not"
1934
 
                                     " exist, cannot bind",
1935
 
                                     self.interface)
1936
1668
                    else:
1937
1669
                        raise
1938
1670
        # Only bind(2) the socket if we really need to.
1997
1729
    
1998
1730
    def handle_ipc(self, source, condition, parent_pipe=None,
1999
1731
                   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)
2000
1746
        # error, or the other end of multiprocessing.Pipe has closed
2001
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1747
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2002
1748
            # Wait for other process to exit
2003
1749
            proc.join()
2004
1750
            return False
2094
1840
            elif suffix == "w":
2095
1841
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2096
1842
            else:
2097
 
                raise ValueError("Unknown suffix {0!r}"
2098
 
                                 .format(suffix))
 
1843
                raise ValueError("Unknown suffix %r" % suffix)
2099
1844
        except (ValueError, IndexError) as e:
2100
1845
            raise ValueError(*(e.args))
2101
1846
        timevalue += delta
2102
1847
    return timevalue
2103
1848
 
2104
1849
 
 
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
 
2105
1874
def daemon(nochdir = False, noclose = False):
2106
1875
    """See daemon(3).  Standard BSD Unix function.
2107
1876
    
2115
1884
        sys.exit()
2116
1885
    if not noclose:
2117
1886
        # Close all standard open file descriptors
2118
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1887
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2119
1888
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2120
1889
            raise OSError(errno.ENODEV,
2121
 
                          "{0} not a character device"
2122
 
                          .format(os.devnull))
 
1890
                          "%s not a character device"
 
1891
                          % os.path.devnull)
2123
1892
        os.dup2(null, sys.stdin.fileno())
2124
1893
        os.dup2(null, sys.stdout.fileno())
2125
1894
        os.dup2(null, sys.stderr.fileno())
2134
1903
    
2135
1904
    parser = argparse.ArgumentParser()
2136
1905
    parser.add_argument("-v", "--version", action="version",
2137
 
                        version = "%(prog)s {0}".format(version),
 
1906
                        version = "%%(prog)s %s" % version,
2138
1907
                        help="show version number and exit")
2139
1908
    parser.add_argument("-i", "--interface", metavar="IF",
2140
1909
                        help="Bind to interface IF")
2163
1932
    parser.add_argument("--no-ipv6", action="store_false",
2164
1933
                        dest="use_ipv6", help="Do not use IPv6")
2165
1934
    parser.add_argument("--no-restore", action="store_false",
2166
 
                        dest="restore", help="Do not restore stored"
2167
 
                        " state")
2168
 
    parser.add_argument("--statedir", metavar="DIR",
2169
 
                        help="Directory to save/restore state in")
2170
 
    
 
1935
                        dest="restore",
 
1936
                        help="Do not restore stored state",
 
1937
                        default=True)
 
1938
 
2171
1939
    options = parser.parse_args()
2172
1940
    
2173
1941
    if options.check:
2186
1954
                        "use_dbus": "True",
2187
1955
                        "use_ipv6": "True",
2188
1956
                        "debuglevel": "",
2189
 
                        "restore": "True",
2190
 
                        "statedir": "/var/lib/mandos"
2191
1957
                        }
2192
1958
    
2193
1959
    # Parse config file for server-global settings
2210
1976
    # options, if set.
2211
1977
    for option in ("interface", "address", "port", "debug",
2212
1978
                   "priority", "servicename", "configdir",
2213
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2214
 
                   "statedir"):
 
1979
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
2215
1980
        value = getattr(options, option)
2216
1981
        if value is not None:
2217
1982
            server_settings[option] = value
2229
1994
    debuglevel = server_settings["debuglevel"]
2230
1995
    use_dbus = server_settings["use_dbus"]
2231
1996
    use_ipv6 = server_settings["use_ipv6"]
2232
 
    stored_state_path = os.path.join(server_settings["statedir"],
2233
 
                                     stored_state_file)
2234
 
    
2235
 
    if debug:
2236
 
        initlogger(debug, logging.DEBUG)
2237
 
    else:
2238
 
        if not debuglevel:
2239
 
            initlogger(debug)
2240
 
        else:
2241
 
            level = getattr(logging, debuglevel.upper())
2242
 
            initlogger(debug, level)
2243
1997
    
2244
1998
    if server_settings["servicename"] != "Mandos":
2245
1999
        syslogger.setFormatter(logging.Formatter
2246
 
                               ('Mandos ({0}) [%(process)d]:'
2247
 
                                ' %(levelname)s: %(message)s'
2248
 
                                .format(server_settings
2249
 
                                        ["servicename"])))
 
2000
                               ('Mandos (%s) [%%(process)d]:'
 
2001
                                ' %%(levelname)s: %%(message)s'
 
2002
                                % server_settings["servicename"]))
2250
2003
    
2251
2004
    # Parse config file with clients
2252
 
    client_config = configparser.SafeConfigParser(Client
2253
 
                                                  .client_defaults)
 
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)
2254
2014
    client_config.read(os.path.join(server_settings["configdir"],
2255
2015
                                    "clients.conf"))
2256
2016
    
2270
2030
        pidfilename = "/var/run/mandos.pid"
2271
2031
        try:
2272
2032
            pidfile = open(pidfilename, "w")
2273
 
        except IOError as e:
2274
 
            logger.error("Could not open file %r", pidfilename,
2275
 
                         exc_info=e)
 
2033
        except IOError:
 
2034
            logger.error("Could not open file %r", pidfilename)
2276
2035
    
2277
 
    for name in ("_mandos", "mandos", "nobody"):
 
2036
    try:
 
2037
        uid = pwd.getpwnam("_mandos").pw_uid
 
2038
        gid = pwd.getpwnam("_mandos").pw_gid
 
2039
    except KeyError:
2278
2040
        try:
2279
 
            uid = pwd.getpwnam(name).pw_uid
2280
 
            gid = pwd.getpwnam(name).pw_gid
2281
 
            break
 
2041
            uid = pwd.getpwnam("mandos").pw_uid
 
2042
            gid = pwd.getpwnam("mandos").pw_gid
2282
2043
        except KeyError:
2283
 
            continue
2284
 
    else:
2285
 
        uid = 65534
2286
 
        gid = 65534
 
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
2287
2050
    try:
2288
2051
        os.setgid(gid)
2289
2052
        os.setuid(uid)
2290
2053
    except OSError as error:
2291
 
        if error.errno != errno.EPERM:
 
2054
        if error[0] != errno.EPERM:
2292
2055
            raise error
2293
2056
    
 
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
    
2294
2063
    if debug:
 
2064
        logger.setLevel(logging.DEBUG)
2295
2065
        # Enable all possible GnuTLS debugging
2296
2066
        
2297
2067
        # "Use a log level over 10 to enable all debugging options."
2306
2076
         .gnutls_global_set_log_function(debug_gnutls))
2307
2077
        
2308
2078
        # Redirect stdin so all checkers get /dev/null
2309
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2079
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2310
2080
        os.dup2(null, sys.stdin.fileno())
2311
2081
        if null > 2:
2312
2082
            os.close(null)
 
2083
    else:
 
2084
        # No console logging
 
2085
        logger.removeHandler(console)
2313
2086
    
2314
2087
    # Need to fork before connecting to D-Bus
2315
2088
    if not debug:
2316
2089
        # Close all input and output, do double fork, etc.
2317
2090
        daemon()
2318
2091
    
2319
 
    gobject.threads_init()
2320
 
    
2321
2092
    global main_loop
2322
2093
    # From the Avahi example code
2323
 
    DBusGMainLoop(set_as_default=True)
 
2094
    DBusGMainLoop(set_as_default=True )
2324
2095
    main_loop = gobject.MainLoop()
2325
2096
    bus = dbus.SystemBus()
2326
2097
    # End of Avahi example code
2332
2103
                            ("se.bsnet.fukt.Mandos", bus,
2333
2104
                             do_not_queue=True))
2334
2105
        except dbus.exceptions.NameExistsException as e:
2335
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2106
            logger.error(unicode(e) + ", disabling D-Bus")
2336
2107
            use_dbus = False
2337
2108
            server_settings["use_dbus"] = False
2338
2109
            tcp_server.use_dbus = False
2350
2121
    
2351
2122
    client_class = Client
2352
2123
    if use_dbus:
2353
 
        client_class = functools.partial(ClientDBus, bus = bus)
2354
 
    
2355
 
    client_settings = Client.config_parser(client_config)
 
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
    
2356
2147
    old_client_settings = {}
2357
 
    clients_data = {}
2358
 
    
2359
 
    # Get client data and settings from last running state.
 
2148
    clients_data = []
 
2149
 
 
2150
    # Get client data and settings from last running state. 
2360
2151
    if server_settings["restore"]:
2361
2152
        try:
2362
2153
            with open(stored_state_path, "rb") as stored_state:
2363
 
                clients_data, old_client_settings = (pickle.load
2364
 
                                                     (stored_state))
 
2154
                clients_data, old_client_settings = (
 
2155
                    pickle.load(stored_state))
2365
2156
            os.remove(stored_state_path)
2366
2157
        except IOError as e:
2367
 
            if e.errno == errno.ENOENT:
2368
 
                logger.warning("Could not load persistent state: {0}"
2369
 
                                .format(os.strerror(e.errno)))
2370
 
            else:
2371
 
                logger.critical("Could not load persistent state:",
2372
 
                                exc_info=e)
 
2158
            logger.warning("Could not load persistant state: {0}"
 
2159
                           .format(e))
 
2160
            if e.errno != errno.ENOENT:
2373
2161
                raise
2374
 
        except EOFError as e:
2375
 
            logger.warning("Could not load persistent state: "
2376
 
                           "EOFError:", exc_info=e)
2377
 
    
2378
 
    with PGPEngine() as pgp:
2379
 
        for client_name, client in clients_data.iteritems():
2380
 
            # Decide which value to use after restoring saved state.
2381
 
            # We have three different values: Old config file,
2382
 
            # new config file, and saved state.
2383
 
            # New config value takes precedence if it differs from old
2384
 
            # config value, otherwise use saved state.
2385
 
            for name, value in client_settings[client_name].items():
2386
 
                try:
2387
 
                    # For each value in new config, check if it
2388
 
                    # differs from the old config value (Except for
2389
 
                    # the "secret" attribute)
2390
 
                    if (name != "secret" and
2391
 
                        value != old_client_settings[client_name]
2392
 
                        [name]):
2393
 
                        client[name] = value
2394
 
                except KeyError:
2395
 
                    pass
2396
 
            
2397
 
            # Clients who has passed its expire date can still be
2398
 
            # enabled if its last checker was successful.  Clients
2399
 
            # whose checker succeeded before we stored its state is
2400
 
            # assumed to have successfully run all checkers during
2401
 
            # downtime.
2402
 
            if client["enabled"]:
2403
 
                if datetime.datetime.utcnow() >= client["expires"]:
2404
 
                    if not client["last_checked_ok"]:
2405
 
                        logger.warning(
2406
 
                            "disabling client {0} - Client never "
2407
 
                            "performed a successful checker"
2408
 
                            .format(client_name))
2409
 
                        client["enabled"] = False
2410
 
                    elif client["last_checker_status"] != 0:
2411
 
                        logger.warning(
2412
 
                            "disabling client {0} - Client "
2413
 
                            "last checker failed with error code {1}"
2414
 
                            .format(client_name,
2415
 
                                    client["last_checker_status"]))
2416
 
                        client["enabled"] = False
2417
 
                    else:
2418
 
                        client["expires"] = (datetime.datetime
2419
 
                                             .utcnow()
2420
 
                                             + client["timeout"])
2421
 
                        logger.debug("Last checker succeeded,"
2422
 
                                     " keeping {0} enabled"
2423
 
                                     .format(client_name))
 
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():
2424
2172
            try:
2425
 
                client["secret"] = (
2426
 
                    pgp.decrypt(client["encrypted_secret"],
2427
 
                                client_settings[client_name]
2428
 
                                ["secret"]))
2429
 
            except PGPError:
2430
 
                # If decryption fails, we use secret from new settings
2431
 
                logger.debug("Failed to decrypt {0} old secret"
2432
 
                             .format(client_name))
2433
 
                client["secret"] = (
2434
 
                    client_settings[client_name]["secret"])
2435
 
    
2436
 
    # Add/remove clients based on new changes made to config
2437
 
    for client_name in (set(old_client_settings)
2438
 
                        - set(client_settings)):
2439
 
        del clients_data[client_name]
2440
 
    for client_name in (set(client_settings)
2441
 
                        - set(old_client_settings)):
2442
 
        clients_data[client_name] = client_settings[client_name]
2443
 
    
2444
 
    # Create all client objects
2445
 
    for client_name, client in clients_data.iteritems():
2446
 
        tcp_server.clients[client_name] = client_class(
2447
 
            name = client_name, settings = client)
 
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])
2448
2224
    
2449
2225
    if not tcp_server.clients:
2450
2226
        logger.warning("No clients defined")
2451
 
    
 
2227
        
2452
2228
    if not debug:
2453
2229
        try:
2454
2230
            with pidfile:
2462
2238
            # "pidfile" was never created
2463
2239
            pass
2464
2240
        del pidfilename
 
2241
        
 
2242
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2465
2243
    
2466
2244
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2467
2245
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2468
2246
    
2469
2247
    if use_dbus:
2470
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2471
 
                                        "se.bsnet.fukt.Mandos"})
2472
 
        class MandosDBusService(DBusObjectWithProperties):
 
2248
        class MandosDBusService(dbus.service.Object):
2473
2249
            """A D-Bus proxy object"""
2474
2250
            def __init__(self):
2475
2251
                dbus.service.Object.__init__(self, bus, "/")
2476
2252
            _interface = "se.recompile.Mandos"
2477
2253
            
2478
 
            @dbus_interface_annotations(_interface)
2479
 
            def _foo(self):
2480
 
                return { "org.freedesktop.DBus.Property"
2481
 
                         ".EmitsChangedSignal":
2482
 
                             "false"}
2483
 
            
2484
2254
            @dbus.service.signal(_interface, signature="o")
2485
2255
            def ClientAdded(self, objpath):
2486
2256
                "D-Bus signal"
2528
2298
            
2529
2299
            del _interface
2530
2300
        
2531
 
        mandos_dbus_service = MandosDBusService()
 
2301
        class MandosDBusServiceTransitional(MandosDBusService):
 
2302
            __metaclass__ = AlternateDBusNamesMetaclass
 
2303
        mandos_dbus_service = MandosDBusServiceTransitional()
2532
2304
    
2533
2305
    def cleanup():
2534
2306
        "Cleanup function; run on exit"
2537
2309
        multiprocessing.active_children()
2538
2310
        if not (tcp_server.clients or client_settings):
2539
2311
            return
2540
 
        
 
2312
 
2541
2313
        # Store client before exiting. Secrets are encrypted with key
2542
2314
        # based on what config file has. If config file is
2543
2315
        # removed/edited, old secret will thus be unrecovable.
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
 
        
 
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
            
2569
2337
        try:
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:
 
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:
2574
2342
                pickle.dump((clients, client_settings), stored_state)
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
 
        
 
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
 
2591
2349
        # Delete all clients, and settings from config
2592
2350
        while tcp_server.clients:
2593
2351
            name, client = tcp_server.clients.popitem()
2611
2369
        # Need to initiate checking of clients
2612
2370
        if client.enabled:
2613
2371
            client.init_checker()
 
2372
 
2614
2373
    
2615
2374
    tcp_server.enable()
2616
2375
    tcp_server.server_activate()
2619
2378
    service.port = tcp_server.socket.getsockname()[1]
2620
2379
    if use_ipv6:
2621
2380
        logger.info("Now listening on address %r, port %d,"
2622
 
                    " flowinfo %d, scope_id %d",
2623
 
                    *tcp_server.socket.getsockname())
 
2381
                    " flowinfo %d, scope_id %d"
 
2382
                    % tcp_server.socket.getsockname())
2624
2383
    else:                       # IPv4
2625
 
        logger.info("Now listening on address %r, port %d",
2626
 
                    *tcp_server.socket.getsockname())
 
2384
        logger.info("Now listening on address %r, port %d"
 
2385
                    % tcp_server.socket.getsockname())
2627
2386
    
2628
2387
    #service.interface = tcp_server.socket.getsockname()[3]
2629
2388
    
2632
2391
        try:
2633
2392
            service.activate()
2634
2393
        except dbus.exceptions.DBusException as error:
2635
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2394
            logger.critical("DBusException: %s", error)
2636
2395
            cleanup()
2637
2396
            sys.exit(1)
2638
2397
        # End of Avahi example code
2645
2404
        logger.debug("Starting main loop")
2646
2405
        main_loop.run()
2647
2406
    except AvahiError as error:
2648
 
        logger.critical("Avahi Error", exc_info=error)
 
2407
        logger.critical("AvahiError: %s", error)
2649
2408
        cleanup()
2650
2409
        sys.exit(1)
2651
2410
    except KeyboardInterrupt:
2656
2415
    # Must run before the D-Bus bus name gets deregistered
2657
2416
    cleanup()
2658
2417
 
 
2418
 
2659
2419
if __name__ == '__main__':
2660
2420
    main()