/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-10-02 13:47:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111002134752-c5g5ibcga4biz7ob
* plugins.d/plymouth.c (plymouth_pid): Changed to
                                       "/run/initramfs/plymouth.pid".
  (plymouth_old_pid): New; set to "/dev/.initramfs/plymouth.pid".
  (get_pid): Try both 'plymouth_pid' and 'plymouth_old_pid'.

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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
 
import itertools
69
65
 
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
 
import GnuPGInterface
80
75
 
81
76
try:
82
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
    except ImportError:
87
82
        SO_BINDTODEVICE = None
88
83
 
89
 
version = "1.5.3"
90
 
stored_state_file = "clients.pickle"
91
 
 
92
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.1"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
96
 
 
97
 
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
101
 
except (OSError, AttributeError):
102
 
    def if_nametoindex(interface):
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
 
        with contextlib.closing(socket.socket()) as s:
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
111
 
        return interface_index
112
 
 
113
 
 
114
 
def initlogger(debug, level=logging.WARNING):
115
 
    """init logger and add loglevel"""
116
 
    
117
 
    syslogger.setFormatter(logging.Formatter
118
 
                           ('Mandos [%(process)d]: %(levelname)s:'
119
 
                            ' %(message)s'))
120
 
    logger.addHandler(syslogger)
121
 
    
122
 
    if debug:
123
 
        console = logging.StreamHandler()
124
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
 
                                               ' [%(process)d]:'
126
 
                                               ' %(levelname)s:'
127
 
                                               ' %(message)s'))
128
 
        logger.addHandler(console)
129
 
    logger.setLevel(level)
130
 
 
131
 
 
132
 
class PGPError(Exception):
133
 
    """Exception if encryption/decryption fails"""
134
 
    pass
135
 
 
136
 
 
137
 
class PGPEngine(object):
138
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
 
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
148
 
    
149
 
    def __enter__(self):
150
 
        return self
151
 
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
153
 
        self._cleanup()
154
 
        return False
155
 
    
156
 
    def __del__(self):
157
 
        self._cleanup()
158
 
    
159
 
    def _cleanup(self):
160
 
        if self.tempdir is not None:
161
 
            # Delete contents of tempdir
162
 
            for root, dirs, files in os.walk(self.tempdir,
163
 
                                             topdown = False):
164
 
                for filename in files:
165
 
                    os.remove(os.path.join(root, filename))
166
 
                for dirname in dirs:
167
 
                    os.rmdir(os.path.join(root, dirname))
168
 
            # Remove tempdir
169
 
            os.rmdir(self.tempdir)
170
 
            self.tempdir = None
171
 
    
172
 
    def password_encode(self, password):
173
 
        # Passphrase can not be empty and can not contain newlines or
174
 
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
176
 
    
177
 
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
192
 
        return ciphertext
193
 
    
194
 
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
209
 
        return decrypted_plaintext
210
 
 
211
 
 
 
92
syslogger.setFormatter(logging.Formatter
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
 
95
logger.addHandler(syslogger)
 
96
 
 
97
console = logging.StreamHandler()
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
 
101
logger.addHandler(console)
212
102
 
213
103
class AvahiError(Exception):
214
104
    def __init__(self, value, *args, **kwargs):
269
159
                            " after %i retries, exiting.",
270
160
                            self.rename_count)
271
161
            raise AvahiServiceError("Too many renames")
272
 
        self.name = unicode(self.server
273
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
274
163
        logger.info("Changing Zeroconf service name to %r ...",
275
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
276
169
        self.remove()
277
170
        try:
278
171
            self.add()
279
172
        except dbus.exceptions.DBusException as error:
280
 
            logger.critical("D-Bus Exception", exc_info=error)
 
173
            logger.critical("DBusException: %s", error)
281
174
            self.cleanup()
282
175
            os._exit(1)
283
176
        self.rename_count += 1
298
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
299
192
        self.entry_group_state_changed_match = (
300
193
            self.group.connect_to_signal(
301
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
302
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
303
196
                     self.name, self.type)
304
197
        self.group.AddService(
330
223
            try:
331
224
                self.group.Free()
332
225
            except (dbus.exceptions.UnknownMethodException,
333
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
334
227
                pass
335
228
            self.group = None
336
229
        self.remove()
370
263
                                 self.server_state_changed)
371
264
        self.server_state_changed(self.server.GetState())
372
265
 
373
 
class AvahiServiceToSyslog(AvahiService):
374
 
    def rename(self):
375
 
        """Add the new name to the syslog messages"""
376
 
        ret = AvahiService.rename(self)
377
 
        syslogger.setFormatter(logging.Formatter
378
 
                               ('Mandos (%s) [%%(process)d]:'
379
 
                                ' %%(levelname)s: %%(message)s'
380
 
                                % self.name))
381
 
        return ret
382
266
 
383
 
def timedelta_to_milliseconds(td):
 
267
def _timedelta_to_milliseconds(td):
384
268
    "Convert a datetime.timedelta() to milliseconds"
385
269
    return ((td.days * 24 * 60 * 60 * 1000)
386
270
            + (td.seconds * 1000)
390
274
    """A representation of a client host served by this server.
391
275
    
392
276
    Attributes:
393
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
277
    _approved:   bool(); 'None' if not yet approved/disapproved
394
278
    approval_delay: datetime.timedelta(); Time to wait for approval
395
279
    approval_duration: datetime.timedelta(); Duration of one approval
396
280
    checker:    subprocess.Popen(); a running checker process used
403
287
                     instance %(name)s can be used in the command.
404
288
    checker_initiator_tag: a gobject event source tag, or None
405
289
    created:    datetime.datetime(); (UTC) object creation
406
 
    client_structure: Object describing what attributes a client has
407
 
                      and is used for storing the client at exit
408
290
    current_checker_command: string; current running checker_command
 
291
    disable_hook:  If set, called by disable() as disable_hook(self)
409
292
    disable_initiator_tag: a gobject event source tag, or None
410
293
    enabled:    bool()
411
294
    fingerprint: string (40 or 32 hexadecimal digits); used to
414
297
    interval:   datetime.timedelta(); How often to start a new checker
415
298
    last_approval_request: datetime.datetime(); (UTC) or None
416
299
    last_checked_ok: datetime.datetime(); (UTC) or None
417
 
    last_checker_status: integer between 0 and 255 reflecting exit
418
 
                         status of last checker. -1 reflects crashed
419
 
                         checker, -2 means no checker completed yet.
420
 
    last_enabled: datetime.datetime(); (UTC) or None
 
300
    last_enabled: datetime.datetime(); (UTC)
421
301
    name:       string; from the config file, used in log messages and
422
302
                        D-Bus identifiers
423
303
    secret:     bytestring; sent verbatim (over TLS) to client
424
304
    timeout:    datetime.timedelta(); How long from last_checked_ok
425
305
                                      until this client is disabled
426
 
    extended_timeout:   extra long timeout when secret has been sent
 
306
    extended_timeout:   extra long timeout when password has been sent
427
307
    runtime_expansions: Allowed attributes for runtime expansion.
428
308
    expires:    datetime.datetime(); time (UTC) when a client will be
429
309
                disabled, or None
433
313
                          "created", "enabled", "fingerprint",
434
314
                          "host", "interval", "last_checked_ok",
435
315
                          "last_enabled", "name", "timeout")
436
 
    client_defaults = { "timeout": "5m",
437
 
                        "extended_timeout": "15m",
438
 
                        "interval": "2m",
439
 
                        "checker": "fping -q -- %%(host)s",
440
 
                        "host": "",
441
 
                        "approval_delay": "0s",
442
 
                        "approval_duration": "1s",
443
 
                        "approved_by_default": "True",
444
 
                        "enabled": "True",
445
 
                        }
446
316
    
447
317
    def timeout_milliseconds(self):
448
318
        "Return the 'timeout' attribute in milliseconds"
449
 
        return timedelta_to_milliseconds(self.timeout)
 
319
        return _timedelta_to_milliseconds(self.timeout)
450
320
    
451
321
    def extended_timeout_milliseconds(self):
452
322
        "Return the 'extended_timeout' attribute in milliseconds"
453
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
323
        return _timedelta_to_milliseconds(self.extended_timeout)    
454
324
    
455
325
    def interval_milliseconds(self):
456
326
        "Return the 'interval' attribute in milliseconds"
457
 
        return timedelta_to_milliseconds(self.interval)
 
327
        return _timedelta_to_milliseconds(self.interval)
458
328
    
459
329
    def approval_delay_milliseconds(self):
460
 
        return timedelta_to_milliseconds(self.approval_delay)
461
 
 
462
 
    @staticmethod
463
 
    def config_parser(config):
464
 
        """Construct a new dict of client settings of this form:
465
 
        { client_name: {setting_name: value, ...}, ...}
466
 
        with exceptions for any special settings as defined above.
467
 
        NOTE: Must be a pure function. Must return the same result
468
 
        value given the same arguments.
469
 
        """
470
 
        settings = {}
471
 
        for client_name in config.sections():
472
 
            section = dict(config.items(client_name))
473
 
            client = settings[client_name] = {}
474
 
            
475
 
            client["host"] = section["host"]
476
 
            # Reformat values from string types to Python types
477
 
            client["approved_by_default"] = config.getboolean(
478
 
                client_name, "approved_by_default")
479
 
            client["enabled"] = config.getboolean(client_name,
480
 
                                                  "enabled")
481
 
            
482
 
            client["fingerprint"] = (section["fingerprint"].upper()
483
 
                                     .replace(" ", ""))
484
 
            if "secret" in section:
485
 
                client["secret"] = section["secret"].decode("base64")
486
 
            elif "secfile" in section:
487
 
                with open(os.path.expanduser(os.path.expandvars
488
 
                                             (section["secfile"])),
489
 
                          "rb") as secfile:
490
 
                    client["secret"] = secfile.read()
491
 
            else:
492
 
                raise TypeError("No secret or secfile for section %s"
493
 
                                % section)
494
 
            client["timeout"] = string_to_delta(section["timeout"])
495
 
            client["extended_timeout"] = string_to_delta(
496
 
                section["extended_timeout"])
497
 
            client["interval"] = string_to_delta(section["interval"])
498
 
            client["approval_delay"] = string_to_delta(
499
 
                section["approval_delay"])
500
 
            client["approval_duration"] = string_to_delta(
501
 
                section["approval_duration"])
502
 
            client["checker_command"] = section["checker"]
503
 
            client["last_approval_request"] = None
504
 
            client["last_checked_ok"] = None
505
 
            client["last_checker_status"] = -2
506
 
        
507
 
        return settings
508
 
        
509
 
        
510
 
    def __init__(self, settings, name = None):
 
330
        return _timedelta_to_milliseconds(self.approval_delay)
 
331
    
 
332
    def __init__(self, name = None, disable_hook=None, config=None):
511
333
        """Note: the 'checker' key in 'config' sets the
512
334
        'checker_command' attribute and *not* the 'checker'
513
335
        attribute."""
514
336
        self.name = name
515
 
        # adding all client settings
516
 
        for setting, value in settings.iteritems():
517
 
            setattr(self, setting, value)
518
 
        
519
 
        if self.enabled:
520
 
            if not hasattr(self, "last_enabled"):
521
 
                self.last_enabled = datetime.datetime.utcnow()
522
 
            if not hasattr(self, "expires"):
523
 
                self.expires = (datetime.datetime.utcnow()
524
 
                                + self.timeout)
525
 
        else:
526
 
            self.last_enabled = None
527
 
            self.expires = None
528
 
       
 
337
        if config is None:
 
338
            config = {}
529
339
        logger.debug("Creating client %r", self.name)
530
340
        # Uppercase and remove spaces from fingerprint for later
531
341
        # comparison purposes with return value from the fingerprint()
532
342
        # function
 
343
        self.fingerprint = (config["fingerprint"].upper()
 
344
                            .replace(" ", ""))
533
345
        logger.debug("  Fingerprint: %s", self.fingerprint)
534
 
        self.created = settings.get("created",
535
 
                                    datetime.datetime.utcnow())
536
 
 
537
 
        # attributes specific for this server instance
 
346
        if "secret" in config:
 
347
            self.secret = config["secret"].decode("base64")
 
348
        elif "secfile" in config:
 
349
            with open(os.path.expanduser(os.path.expandvars
 
350
                                         (config["secfile"])),
 
351
                      "rb") as secfile:
 
352
                self.secret = secfile.read()
 
353
        else:
 
354
            raise TypeError("No secret or secfile for client %s"
 
355
                            % self.name)
 
356
        self.host = config.get("host", "")
 
357
        self.created = datetime.datetime.utcnow()
 
358
        self.enabled = False
 
359
        self.last_approval_request = None
 
360
        self.last_enabled = None
 
361
        self.last_checked_ok = None
 
362
        self.timeout = string_to_delta(config["timeout"])
 
363
        self.extended_timeout = string_to_delta(config["extended_timeout"])
 
364
        self.interval = string_to_delta(config["interval"])
 
365
        self.disable_hook = disable_hook
538
366
        self.checker = None
539
367
        self.checker_initiator_tag = None
540
368
        self.disable_initiator_tag = None
 
369
        self.expires = None
541
370
        self.checker_callback_tag = None
 
371
        self.checker_command = config["checker"]
542
372
        self.current_checker_command = None
543
 
        self.approved = None
 
373
        self.last_connect = None
 
374
        self._approved = None
 
375
        self.approved_by_default = config.get("approved_by_default",
 
376
                                              True)
544
377
        self.approvals_pending = 0
545
 
        self.changedstate = (multiprocessing_manager
546
 
                             .Condition(multiprocessing_manager
547
 
                                        .Lock()))
548
 
        self.client_structure = [attr for attr in
549
 
                                 self.__dict__.iterkeys()
550
 
                                 if not attr.startswith("_")]
551
 
        self.client_structure.append("client_structure")
552
 
        
553
 
        for name, t in inspect.getmembers(type(self),
554
 
                                          lambda obj:
555
 
                                              isinstance(obj,
556
 
                                                         property)):
557
 
            if not name.startswith("_"):
558
 
                self.client_structure.append(name)
 
378
        self.approval_delay = string_to_delta(
 
379
            config["approval_delay"])
 
380
        self.approval_duration = string_to_delta(
 
381
            config["approval_duration"])
 
382
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
559
383
    
560
 
    # Send notice to process children that client state has changed
561
384
    def send_changedstate(self):
562
 
        with self.changedstate:
563
 
            self.changedstate.notify_all()
564
 
    
 
385
        self.changedstate.acquire()
 
386
        self.changedstate.notify_all()
 
387
        self.changedstate.release()
 
388
        
565
389
    def enable(self):
566
390
        """Start this client's checker and timeout hooks"""
567
391
        if getattr(self, "enabled", False):
568
392
            # Already enabled
569
393
            return
570
394
        self.send_changedstate()
 
395
        # Schedule a new checker to be started an 'interval' from now,
 
396
        # and every interval from then on.
 
397
        self.checker_initiator_tag = (gobject.timeout_add
 
398
                                      (self.interval_milliseconds(),
 
399
                                       self.start_checker))
 
400
        # Schedule a disable() when 'timeout' has passed
571
401
        self.expires = datetime.datetime.utcnow() + self.timeout
 
402
        self.disable_initiator_tag = (gobject.timeout_add
 
403
                                   (self.timeout_milliseconds(),
 
404
                                    self.disable))
572
405
        self.enabled = True
573
406
        self.last_enabled = datetime.datetime.utcnow()
574
 
        self.init_checker()
 
407
        # Also start a new checker *right now*.
 
408
        self.start_checker()
575
409
    
576
410
    def disable(self, quiet=True):
577
411
        """Disable this client."""
589
423
            gobject.source_remove(self.checker_initiator_tag)
590
424
            self.checker_initiator_tag = None
591
425
        self.stop_checker()
 
426
        if self.disable_hook:
 
427
            self.disable_hook(self)
592
428
        self.enabled = False
593
429
        # Do not run this again if called by a gobject.timeout_add
594
430
        return False
595
431
    
596
432
    def __del__(self):
 
433
        self.disable_hook = None
597
434
        self.disable()
598
435
    
599
 
    def init_checker(self):
600
 
        # Schedule a new checker to be started an 'interval' from now,
601
 
        # and every interval from then on.
602
 
        self.checker_initiator_tag = (gobject.timeout_add
603
 
                                      (self.interval_milliseconds(),
604
 
                                       self.start_checker))
605
 
        # Schedule a disable() when 'timeout' has passed
606
 
        self.disable_initiator_tag = (gobject.timeout_add
607
 
                                   (self.timeout_milliseconds(),
608
 
                                    self.disable))
609
 
        # Also start a new checker *right now*.
610
 
        self.start_checker()
611
 
    
612
436
    def checker_callback(self, pid, condition, command):
613
437
        """The checker has completed, so take appropriate actions."""
614
438
        self.checker_callback_tag = None
615
439
        self.checker = None
616
440
        if os.WIFEXITED(condition):
617
 
            self.last_checker_status = os.WEXITSTATUS(condition)
618
 
            if self.last_checker_status == 0:
 
441
            exitstatus = os.WEXITSTATUS(condition)
 
442
            if exitstatus == 0:
619
443
                logger.info("Checker for %(name)s succeeded",
620
444
                            vars(self))
621
445
                self.checked_ok()
623
447
                logger.info("Checker for %(name)s failed",
624
448
                            vars(self))
625
449
        else:
626
 
            self.last_checker_status = -1
627
450
            logger.warning("Checker for %(name)s crashed?",
628
451
                           vars(self))
629
452
    
630
 
    def checked_ok(self):
631
 
        """Assert that the client has been seen, alive and well."""
632
 
        self.last_checked_ok = datetime.datetime.utcnow()
633
 
        self.last_checker_status = 0
634
 
        self.bump_timeout()
635
 
    
636
 
    def bump_timeout(self, timeout=None):
637
 
        """Bump up the timeout for this client."""
 
453
    def checked_ok(self, timeout=None):
 
454
        """Bump up the timeout for this client.
 
455
        
 
456
        This should only be called when the client has been seen,
 
457
        alive and well.
 
458
        """
638
459
        if timeout is None:
639
460
            timeout = self.timeout
640
 
        if self.disable_initiator_tag is not None:
641
 
            gobject.source_remove(self.disable_initiator_tag)
642
 
        if getattr(self, "enabled", False):
643
 
            self.disable_initiator_tag = (gobject.timeout_add
644
 
                                          (timedelta_to_milliseconds
645
 
                                           (timeout), self.disable))
646
 
            self.expires = datetime.datetime.utcnow() + timeout
 
461
        self.last_checked_ok = datetime.datetime.utcnow()
 
462
        gobject.source_remove(self.disable_initiator_tag)
 
463
        self.expires = datetime.datetime.utcnow() + timeout
 
464
        self.disable_initiator_tag = (gobject.timeout_add
 
465
                                      (_timedelta_to_milliseconds(timeout),
 
466
                                       self.disable))
647
467
    
648
468
    def need_approval(self):
649
469
        self.last_approval_request = datetime.datetime.utcnow()
693
513
                try:
694
514
                    command = self.checker_command % escaped_attrs
695
515
                except TypeError as error:
696
 
                    logger.error('Could not format string "%s"',
697
 
                                 self.checker_command, exc_info=error)
 
516
                    logger.error('Could not format string "%s":'
 
517
                                 ' %s', self.checker_command, error)
698
518
                    return True # Try again later
699
519
            self.current_checker_command = command
700
520
            try:
718
538
                    gobject.source_remove(self.checker_callback_tag)
719
539
                    self.checker_callback(pid, status, command)
720
540
            except OSError as error:
721
 
                logger.error("Failed to start subprocess",
722
 
                             exc_info=error)
 
541
                logger.error("Failed to start subprocess: %s",
 
542
                             error)
723
543
        # Re-run this periodically if run by gobject.timeout_add
724
544
        return True
725
545
    
732
552
            return
733
553
        logger.debug("Stopping checker for %(name)s", vars(self))
734
554
        try:
735
 
            self.checker.terminate()
 
555
            os.kill(self.checker.pid, signal.SIGTERM)
736
556
            #time.sleep(0.5)
737
557
            #if self.checker.poll() is None:
738
 
            #    self.checker.kill()
 
558
            #    os.kill(self.checker.pid, signal.SIGKILL)
739
559
        except OSError as error:
740
560
            if error.errno != errno.ESRCH: # No such process
741
561
                raise
772
592
    return decorator
773
593
 
774
594
 
775
 
def dbus_interface_annotations(dbus_interface):
776
 
    """Decorator for marking functions returning interface annotations.
777
 
    
778
 
    Usage:
779
 
    
780
 
    @dbus_interface_annotations("org.example.Interface")
781
 
    def _foo(self):  # Function name does not matter
782
 
        return {"org.freedesktop.DBus.Deprecated": "true",
783
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
784
 
                    "false"}
785
 
    """
786
 
    def decorator(func):
787
 
        func._dbus_is_interface = True
788
 
        func._dbus_interface = dbus_interface
789
 
        func._dbus_name = dbus_interface
790
 
        return func
791
 
    return decorator
792
 
 
793
 
 
794
 
def dbus_annotations(annotations):
795
 
    """Decorator to annotate D-Bus methods, signals or properties
796
 
    Usage:
797
 
    
798
 
    @dbus_service_property("org.example.Interface", signature="b",
799
 
                           access="r")
800
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
 
                        "org.freedesktop.DBus.Property."
802
 
                        "EmitsChangedSignal": "false"})
803
 
    def Property_dbus_property(self):
804
 
        return dbus.Boolean(False)
805
 
    """
806
 
    def decorator(func):
807
 
        func._dbus_annotations = annotations
808
 
        return func
809
 
    return decorator
810
 
 
811
 
 
812
595
class DBusPropertyException(dbus.exceptions.DBusException):
813
596
    """A base class for D-Bus property-related exceptions
814
597
    """
837
620
    """
838
621
    
839
622
    @staticmethod
840
 
    def _is_dbus_thing(thing):
841
 
        """Returns a function testing if an attribute is a D-Bus thing
842
 
        
843
 
        If called like _is_dbus_thing("method") it returns a function
844
 
        suitable for use as predicate to inspect.getmembers().
845
 
        """
846
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
847
 
                                   False)
 
623
    def _is_dbus_property(obj):
 
624
        return getattr(obj, "_dbus_is_property", False)
848
625
    
849
 
    def _get_all_dbus_things(self, thing):
 
626
    def _get_all_dbus_properties(self):
850
627
        """Returns a generator of (name, attribute) pairs
851
628
        """
852
 
        return ((getattr(athing.__get__(self), "_dbus_name",
853
 
                         name),
854
 
                 athing.__get__(self))
855
 
                for cls in self.__class__.__mro__
856
 
                for name, athing in
857
 
                inspect.getmembers(cls,
858
 
                                   self._is_dbus_thing(thing)))
 
629
        return ((prop._dbus_name, prop)
 
630
                for name, prop in
 
631
                inspect.getmembers(self, self._is_dbus_property))
859
632
    
860
633
    def _get_dbus_property(self, interface_name, property_name):
861
634
        """Returns a bound method if one exists which is a D-Bus
862
635
        property with the specified name and interface.
863
636
        """
864
 
        for cls in  self.__class__.__mro__:
865
 
            for name, value in (inspect.getmembers
866
 
                                (cls,
867
 
                                 self._is_dbus_thing("property"))):
868
 
                if (value._dbus_name == property_name
869
 
                    and value._dbus_interface == interface_name):
870
 
                    return value.__get__(self)
871
 
        
 
637
        for name in (property_name,
 
638
                     property_name + "_dbus_property"):
 
639
            prop = getattr(self, name, None)
 
640
            if (prop is None
 
641
                or not self._is_dbus_property(prop)
 
642
                or prop._dbus_name != property_name
 
643
                or (interface_name and prop._dbus_interface
 
644
                    and interface_name != prop._dbus_interface)):
 
645
                continue
 
646
            return prop
872
647
        # No such property
873
648
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
649
                                   + interface_name + "."
899
674
            # signatures other than "ay".
900
675
            if prop._dbus_signature != "ay":
901
676
                raise ValueError
902
 
            value = dbus.ByteArray(b''.join(chr(byte)
903
 
                                            for byte in value))
 
677
            value = dbus.ByteArray(''.join(unichr(byte)
 
678
                                           for byte in value))
904
679
        prop(value)
905
680
    
906
681
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
911
686
        
912
687
        Note: Will not include properties with access="write".
913
688
        """
914
 
        properties = {}
915
 
        for name, prop in self._get_all_dbus_things("property"):
 
689
        all = {}
 
690
        for name, prop in self._get_all_dbus_properties():
916
691
            if (interface_name
917
692
                and interface_name != prop._dbus_interface):
918
693
                # Interface non-empty but did not match
922
697
                continue
923
698
            value = prop()
924
699
            if not hasattr(value, "variant_level"):
925
 
                properties[name] = value
 
700
                all[name] = value
926
701
                continue
927
 
            properties[name] = type(value)(value, variant_level=
928
 
                                           value.variant_level+1)
929
 
        return dbus.Dictionary(properties, signature="sv")
 
702
            all[name] = type(value)(value, variant_level=
 
703
                                    value.variant_level+1)
 
704
        return dbus.Dictionary(all, signature="sv")
930
705
    
931
706
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
707
                         out_signature="s",
933
708
                         path_keyword='object_path',
934
709
                         connection_keyword='connection')
935
710
    def Introspect(self, object_path, connection):
936
 
        """Overloading of standard D-Bus method.
937
 
        
938
 
        Inserts property tags and interface annotation tags.
 
711
        """Standard D-Bus method, overloaded to insert property tags.
939
712
        """
940
713
        xmlstring = dbus.service.Object.Introspect(self, object_path,
941
714
                                                   connection)
948
721
                e.setAttribute("access", prop._dbus_access)
949
722
                return e
950
723
            for if_tag in document.getElementsByTagName("interface"):
951
 
                # Add property tags
952
724
                for tag in (make_tag(document, name, prop)
953
725
                            for name, prop
954
 
                            in self._get_all_dbus_things("property")
 
726
                            in self._get_all_dbus_properties()
955
727
                            if prop._dbus_interface
956
728
                            == if_tag.getAttribute("name")):
957
729
                    if_tag.appendChild(tag)
958
 
                # Add annotation tags
959
 
                for typ in ("method", "signal", "property"):
960
 
                    for tag in if_tag.getElementsByTagName(typ):
961
 
                        annots = dict()
962
 
                        for name, prop in (self.
963
 
                                           _get_all_dbus_things(typ)):
964
 
                            if (name == tag.getAttribute("name")
965
 
                                and prop._dbus_interface
966
 
                                == if_tag.getAttribute("name")):
967
 
                                annots.update(getattr
968
 
                                              (prop,
969
 
                                               "_dbus_annotations",
970
 
                                               {}))
971
 
                        for name, value in annots.iteritems():
972
 
                            ann_tag = document.createElement(
973
 
                                "annotation")
974
 
                            ann_tag.setAttribute("name", name)
975
 
                            ann_tag.setAttribute("value", value)
976
 
                            tag.appendChild(ann_tag)
977
 
                # Add interface annotation tags
978
 
                for annotation, value in dict(
979
 
                    itertools.chain(
980
 
                        *(annotations().iteritems()
981
 
                          for name, annotations in
982
 
                          self._get_all_dbus_things("interface")
983
 
                          if name == if_tag.getAttribute("name")
984
 
                          ))).iteritems():
985
 
                    ann_tag = document.createElement("annotation")
986
 
                    ann_tag.setAttribute("name", annotation)
987
 
                    ann_tag.setAttribute("value", value)
988
 
                    if_tag.appendChild(ann_tag)
989
730
                # Add the names to the return values for the
990
731
                # "org.freedesktop.DBus.Properties" methods
991
732
                if (if_tag.getAttribute("name")
1006
747
        except (AttributeError, xml.dom.DOMException,
1007
748
                xml.parsers.expat.ExpatError) as error:
1008
749
            logger.error("Failed to override Introspection method",
1009
 
                         exc_info=error)
 
750
                         error)
1010
751
        return xmlstring
1011
752
 
1012
753
 
1018
759
                       variant_level=variant_level)
1019
760
 
1020
761
 
1021
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
 
                                  .__metaclass__):
1023
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1024
 
    will add additional D-Bus attributes matching a certain pattern.
1025
 
    """
1026
 
    def __new__(mcs, name, bases, attr):
1027
 
        # Go through all the base classes which could have D-Bus
1028
 
        # methods, signals, or properties in them
1029
 
        old_interface_names = []
1030
 
        for base in (b for b in bases
1031
 
                     if issubclass(b, dbus.service.Object)):
1032
 
            # Go though all attributes of the base class
1033
 
            for attrname, attribute in inspect.getmembers(base):
1034
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1035
 
                # with the wrong interface name
1036
 
                if (not hasattr(attribute, "_dbus_interface")
1037
 
                    or not attribute._dbus_interface
1038
 
                    .startswith("se.recompile.Mandos")):
1039
 
                    continue
1040
 
                # Create an alternate D-Bus interface name based on
1041
 
                # the current name
1042
 
                alt_interface = (attribute._dbus_interface
1043
 
                                 .replace("se.recompile.Mandos",
1044
 
                                          "se.bsnet.fukt.Mandos"))
1045
 
                if alt_interface != attribute._dbus_interface:
1046
 
                    old_interface_names.append(alt_interface)
1047
 
                # Is this a D-Bus signal?
1048
 
                if getattr(attribute, "_dbus_is_signal", False):
1049
 
                    # Extract the original non-method function by
1050
 
                    # black magic
1051
 
                    nonmethod_func = (dict(
1052
 
                            zip(attribute.func_code.co_freevars,
1053
 
                                attribute.__closure__))["func"]
1054
 
                                      .cell_contents)
1055
 
                    # Create a new, but exactly alike, function
1056
 
                    # object, and decorate it to be a new D-Bus signal
1057
 
                    # with the alternate D-Bus interface name
1058
 
                    new_function = (dbus.service.signal
1059
 
                                    (alt_interface,
1060
 
                                     attribute._dbus_signature)
1061
 
                                    (types.FunctionType(
1062
 
                                nonmethod_func.func_code,
1063
 
                                nonmethod_func.func_globals,
1064
 
                                nonmethod_func.func_name,
1065
 
                                nonmethod_func.func_defaults,
1066
 
                                nonmethod_func.func_closure)))
1067
 
                    # Copy annotations, if any
1068
 
                    try:
1069
 
                        new_function._dbus_annotations = (
1070
 
                            dict(attribute._dbus_annotations))
1071
 
                    except AttributeError:
1072
 
                        pass
1073
 
                    # Define a creator of a function to call both the
1074
 
                    # old and new functions, so both the old and new
1075
 
                    # signals gets sent when the function is called
1076
 
                    def fixscope(func1, func2):
1077
 
                        """This function is a scope container to pass
1078
 
                        func1 and func2 to the "call_both" function
1079
 
                        outside of its arguments"""
1080
 
                        def call_both(*args, **kwargs):
1081
 
                            """This function will emit two D-Bus
1082
 
                            signals by calling func1 and func2"""
1083
 
                            func1(*args, **kwargs)
1084
 
                            func2(*args, **kwargs)
1085
 
                        return call_both
1086
 
                    # Create the "call_both" function and add it to
1087
 
                    # the class
1088
 
                    attr[attrname] = fixscope(attribute,
1089
 
                                              new_function)
1090
 
                # Is this a D-Bus method?
1091
 
                elif getattr(attribute, "_dbus_is_method", False):
1092
 
                    # Create a new, but exactly alike, function
1093
 
                    # object.  Decorate it to be a new D-Bus method
1094
 
                    # with the alternate D-Bus interface name.  Add it
1095
 
                    # to the class.
1096
 
                    attr[attrname] = (dbus.service.method
1097
 
                                      (alt_interface,
1098
 
                                       attribute._dbus_in_signature,
1099
 
                                       attribute._dbus_out_signature)
1100
 
                                      (types.FunctionType
1101
 
                                       (attribute.func_code,
1102
 
                                        attribute.func_globals,
1103
 
                                        attribute.func_name,
1104
 
                                        attribute.func_defaults,
1105
 
                                        attribute.func_closure)))
1106
 
                    # Copy annotations, if any
1107
 
                    try:
1108
 
                        attr[attrname]._dbus_annotations = (
1109
 
                            dict(attribute._dbus_annotations))
1110
 
                    except AttributeError:
1111
 
                        pass
1112
 
                # Is this a D-Bus property?
1113
 
                elif getattr(attribute, "_dbus_is_property", False):
1114
 
                    # Create a new, but exactly alike, function
1115
 
                    # object, and decorate it to be a new D-Bus
1116
 
                    # property with the alternate D-Bus interface
1117
 
                    # name.  Add it to the class.
1118
 
                    attr[attrname] = (dbus_service_property
1119
 
                                      (alt_interface,
1120
 
                                       attribute._dbus_signature,
1121
 
                                       attribute._dbus_access,
1122
 
                                       attribute
1123
 
                                       ._dbus_get_args_options
1124
 
                                       ["byte_arrays"])
1125
 
                                      (types.FunctionType
1126
 
                                       (attribute.func_code,
1127
 
                                        attribute.func_globals,
1128
 
                                        attribute.func_name,
1129
 
                                        attribute.func_defaults,
1130
 
                                        attribute.func_closure)))
1131
 
                    # Copy annotations, if any
1132
 
                    try:
1133
 
                        attr[attrname]._dbus_annotations = (
1134
 
                            dict(attribute._dbus_annotations))
1135
 
                    except AttributeError:
1136
 
                        pass
1137
 
                # Is this a D-Bus interface?
1138
 
                elif getattr(attribute, "_dbus_is_interface", False):
1139
 
                    # Create a new, but exactly alike, function
1140
 
                    # object.  Decorate it to be a new D-Bus interface
1141
 
                    # with the alternate D-Bus interface name.  Add it
1142
 
                    # to the class.
1143
 
                    attr[attrname] = (dbus_interface_annotations
1144
 
                                      (alt_interface)
1145
 
                                      (types.FunctionType
1146
 
                                       (attribute.func_code,
1147
 
                                        attribute.func_globals,
1148
 
                                        attribute.func_name,
1149
 
                                        attribute.func_defaults,
1150
 
                                        attribute.func_closure)))
1151
 
        # Deprecate all old interfaces
1152
 
        basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
 
        for old_interface_name in old_interface_names:
1154
 
            @dbus_interface_annotations(old_interface_name)
1155
 
            def func(self):
1156
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1157
 
            # Find an unused name
1158
 
            for aname in (basename.format(i) for i in
1159
 
                          itertools.count()):
1160
 
                if aname not in attr:
1161
 
                    attr[aname] = func
1162
 
                    break
1163
 
        return type.__new__(mcs, name, bases, attr)
1164
 
 
1165
 
 
1166
762
class ClientDBus(Client, DBusObjectWithProperties):
1167
763
    """A Client class using D-Bus
1168
764
    
1177
773
    # dbus.service.Object doesn't use super(), so we can't either.
1178
774
    
1179
775
    def __init__(self, bus = None, *args, **kwargs):
 
776
        self._approvals_pending = 0
1180
777
        self.bus = bus
1181
778
        Client.__init__(self, *args, **kwargs)
1182
779
        # Only now, when this client is initialized, can it show up on
1192
789
    def notifychangeproperty(transform_func,
1193
790
                             dbus_name, type_func=lambda x: x,
1194
791
                             variant_level=1):
1195
 
        """ Modify a variable so that it's a property which announces
1196
 
        its changes to DBus.
1197
 
        
1198
 
        transform_fun: Function that takes a value and a variant_level
1199
 
                       and transforms it to a D-Bus type.
1200
 
        dbus_name: D-Bus name of the variable
 
792
        """ Modify a variable so that its a property that announce its
 
793
        changes to DBus.
 
794
        transform_fun: Function that takes a value and transform it to
 
795
                       DBus type.
 
796
        dbus_name: DBus name of the variable
1201
797
        type_func: Function that transform the value before sending it
1202
 
                   to the D-Bus.  Default: no transform
1203
 
        variant_level: D-Bus variant level.  Default: 1
 
798
                   to DBus
 
799
        variant_level: DBus variant level. default: 1
1204
800
        """
1205
 
        attrname = "_{0}".format(dbus_name)
 
801
        real_value = [None,]
1206
802
        def setter(self, value):
 
803
            old_value = real_value[0]
 
804
            real_value[0] = value
1207
805
            if hasattr(self, "dbus_object_path"):
1208
 
                if (not hasattr(self, attrname) or
1209
 
                    type_func(getattr(self, attrname, None))
1210
 
                    != type_func(value)):
1211
 
                    dbus_value = transform_func(type_func(value),
1212
 
                                                variant_level
1213
 
                                                =variant_level)
 
806
                if type_func(old_value) != type_func(real_value[0]):
 
807
                    dbus_value = transform_func(type_func(real_value[0]),
 
808
                                                variant_level)
1214
809
                    self.PropertyChanged(dbus.String(dbus_name),
1215
810
                                         dbus_value)
1216
 
            setattr(self, attrname, value)
1217
811
        
1218
 
        return property(lambda self: getattr(self, attrname), setter)
 
812
        return property(lambda self: real_value[0], setter)
1219
813
    
1220
814
    
1221
815
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1226
820
    last_enabled = notifychangeproperty(datetime_to_dbus,
1227
821
                                        "LastEnabled")
1228
822
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
 
                                   type_func = lambda checker:
1230
 
                                       checker is not None)
 
823
                                   type_func = lambda checker: checker is not None)
1231
824
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
825
                                           "LastCheckedOK")
1233
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1234
 
                                               "LastCheckerStatus")
1235
 
    last_approval_request = notifychangeproperty(
1236
 
        datetime_to_dbus, "LastApprovalRequest")
 
826
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
827
                                                 "LastApprovalRequest")
1237
828
    approved_by_default = notifychangeproperty(dbus.Boolean,
1238
829
                                               "ApprovedByDefault")
1239
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1240
 
                                          "ApprovalDelay",
1241
 
                                          type_func =
1242
 
                                          timedelta_to_milliseconds)
1243
 
    approval_duration = notifychangeproperty(
1244
 
        dbus.UInt64, "ApprovalDuration",
1245
 
        type_func = timedelta_to_milliseconds)
 
830
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
 
831
                                          type_func = _timedelta_to_milliseconds)
 
832
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
 
833
                                             type_func = _timedelta_to_milliseconds)
1246
834
    host = notifychangeproperty(dbus.String, "Host")
1247
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
 
                                   type_func =
1249
 
                                   timedelta_to_milliseconds)
1250
 
    extended_timeout = notifychangeproperty(
1251
 
        dbus.UInt64, "ExtendedTimeout",
1252
 
        type_func = timedelta_to_milliseconds)
1253
 
    interval = notifychangeproperty(dbus.UInt64,
1254
 
                                    "Interval",
1255
 
                                    type_func =
1256
 
                                    timedelta_to_milliseconds)
 
835
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
836
                                   type_func = _timedelta_to_milliseconds)
 
837
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
 
838
                                            type_func = _timedelta_to_milliseconds)
 
839
    interval = notifychangeproperty(dbus.UInt16, "Interval",
 
840
                                    type_func = _timedelta_to_milliseconds)
1257
841
    checker_command = notifychangeproperty(dbus.String, "Checker")
1258
842
    
1259
843
    del notifychangeproperty
1301
885
        return r
1302
886
    
1303
887
    def _reset_approved(self):
1304
 
        self.approved = None
 
888
        self._approved = None
1305
889
        return False
1306
890
    
1307
891
    def approve(self, value=True):
1308
892
        self.send_changedstate()
1309
 
        self.approved = value
1310
 
        gobject.timeout_add(timedelta_to_milliseconds
 
893
        self._approved = value
 
894
        gobject.timeout_add(_timedelta_to_milliseconds
1311
895
                            (self.approval_duration),
1312
896
                            self._reset_approved)
1313
897
    
1314
898
    
1315
899
    ## D-Bus methods, signals & properties
1316
 
    _interface = "se.recompile.Mandos.Client"
1317
 
    
1318
 
    ## Interfaces
1319
 
    
1320
 
    @dbus_interface_annotations(_interface)
1321
 
    def _foo(self):
1322
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
 
                     "false"}
 
900
    _interface = "se.bsnet.fukt.Mandos.Client"
1324
901
    
1325
902
    ## Signals
1326
903
    
1426
1003
                           access="readwrite")
1427
1004
    def ApprovalDuration_dbus_property(self, value=None):
1428
1005
        if value is None:       # get
1429
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1006
            return dbus.UInt64(_timedelta_to_milliseconds(
1430
1007
                    self.approval_duration))
1431
1008
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1009
    
1446
1023
    def Host_dbus_property(self, value=None):
1447
1024
        if value is None:       # get
1448
1025
            return dbus.String(self.host)
1449
 
        self.host = unicode(value)
 
1026
        self.host = value
1450
1027
    
1451
1028
    # Created - property
1452
1029
    @dbus_service_property(_interface, signature="s", access="read")
1453
1030
    def Created_dbus_property(self):
1454
 
        return datetime_to_dbus(self.created)
 
1031
        return dbus.String(datetime_to_dbus(self.created))
1455
1032
    
1456
1033
    # LastEnabled - property
1457
1034
    @dbus_service_property(_interface, signature="s", access="read")
1478
1055
            return
1479
1056
        return datetime_to_dbus(self.last_checked_ok)
1480
1057
    
1481
 
    # LastCheckerStatus - property
1482
 
    @dbus_service_property(_interface, signature="n",
1483
 
                           access="read")
1484
 
    def LastCheckerStatus_dbus_property(self):
1485
 
        return dbus.Int16(self.last_checker_status)
1486
 
    
1487
1058
    # Expires - property
1488
1059
    @dbus_service_property(_interface, signature="s", access="read")
1489
1060
    def Expires_dbus_property(self):
1501
1072
        if value is None:       # get
1502
1073
            return dbus.UInt64(self.timeout_milliseconds())
1503
1074
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1075
        if getattr(self, "disable_initiator_tag", None) is None:
 
1076
            return
1504
1077
        # Reschedule timeout
1505
 
        if self.enabled:
1506
 
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
1510
 
                # The timeout has passed
1511
 
                self.disable()
1512
 
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
 
                if (getattr(self, "disable_initiator_tag", None)
1517
 
                    is None):
1518
 
                    return
1519
 
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
 
1078
        gobject.source_remove(self.disable_initiator_tag)
 
1079
        self.disable_initiator_tag = None
 
1080
        self.expires = None
 
1081
        time_to_die = (self.
 
1082
                       _timedelta_to_milliseconds((self
 
1083
                                                   .last_checked_ok
 
1084
                                                   + self.timeout)
 
1085
                                                  - datetime.datetime
 
1086
                                                  .utcnow()))
 
1087
        if time_to_die <= 0:
 
1088
            # The timeout has passed
 
1089
            self.disable()
 
1090
        else:
 
1091
            self.expires = (datetime.datetime.utcnow()
 
1092
                            + datetime.timedelta(milliseconds = time_to_die))
 
1093
            self.disable_initiator_tag = (gobject.timeout_add
 
1094
                                          (time_to_die, self.disable))
1523
1095
    
1524
1096
    # ExtendedTimeout - property
1525
1097
    @dbus_service_property(_interface, signature="t",
1538
1110
        self.interval = datetime.timedelta(0, 0, 0, value)
1539
1111
        if getattr(self, "checker_initiator_tag", None) is None:
1540
1112
            return
1541
 
        if self.enabled:
1542
 
            # Reschedule checker run
1543
 
            gobject.source_remove(self.checker_initiator_tag)
1544
 
            self.checker_initiator_tag = (gobject.timeout_add
1545
 
                                          (value, self.start_checker))
1546
 
            self.start_checker()    # Start one now, too
 
1113
        # Reschedule checker run
 
1114
        gobject.source_remove(self.checker_initiator_tag)
 
1115
        self.checker_initiator_tag = (gobject.timeout_add
 
1116
                                      (value, self.start_checker))
 
1117
        self.start_checker()    # Start one now, too
1547
1118
    
1548
1119
    # Checker - property
1549
1120
    @dbus_service_property(_interface, signature="s",
1551
1122
    def Checker_dbus_property(self, value=None):
1552
1123
        if value is None:       # get
1553
1124
            return dbus.String(self.checker_command)
1554
 
        self.checker_command = unicode(value)
 
1125
        self.checker_command = value
1555
1126
    
1556
1127
    # CheckerRunning - property
1557
1128
    @dbus_service_property(_interface, signature="b",
1586
1157
            raise KeyError()
1587
1158
    
1588
1159
    def __getattribute__(self, name):
1589
 
        if name == '_pipe':
 
1160
        if(name == '_pipe'):
1590
1161
            return super(ProxyClient, self).__getattribute__(name)
1591
1162
        self._pipe.send(('getattr', name))
1592
1163
        data = self._pipe.recv()
1599
1170
            return func
1600
1171
    
1601
1172
    def __setattr__(self, name, value):
1602
 
        if name == '_pipe':
 
1173
        if(name == '_pipe'):
1603
1174
            return super(ProxyClient, self).__setattr__(name, value)
1604
1175
        self._pipe.send(('setattr', name, value))
1605
1176
 
1606
1177
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1178
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1179
    """A class to handle client connections.
1613
1180
    
1692
1259
                                       client.name)
1693
1260
                        if self.server.use_dbus:
1694
1261
                            # Emit D-Bus signal
1695
 
                            client.Rejected("Disabled")
 
1262
                            client.Rejected("Disabled")                    
1696
1263
                        return
1697
1264
                    
1698
 
                    if client.approved or not client.approval_delay:
 
1265
                    if client._approved or not client.approval_delay:
1699
1266
                        #We are approved or approval is disabled
1700
1267
                        break
1701
 
                    elif client.approved is None:
 
1268
                    elif client._approved is None:
1702
1269
                        logger.info("Client %s needs approval",
1703
1270
                                    client.name)
1704
1271
                        if self.server.use_dbus:
1715
1282
                        return
1716
1283
                    
1717
1284
                    #wait until timeout or approved
 
1285
                    #x = float(client._timedelta_to_milliseconds(delay))
1718
1286
                    time = datetime.datetime.now()
1719
1287
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1288
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1723
1289
                    client.changedstate.release()
1724
1290
                    time2 = datetime.datetime.now()
1725
1291
                    if (time2 - time) >= delay:
1749
1315
                    sent_size += sent
1750
1316
                
1751
1317
                logger.info("Sending secret to %s", client.name)
1752
 
                # bump the timeout using extended_timeout
1753
 
                client.bump_timeout(client.extended_timeout)
 
1318
                # bump the timeout as if seen
 
1319
                client.checked_ok(client.extended_timeout)
1754
1320
                if self.server.use_dbus:
1755
1321
                    # Emit D-Bus signal
1756
1322
                    client.GotSecret()
1823
1389
        # Convert the buffer to a Python bytestring
1824
1390
        fpr = ctypes.string_at(buf, buf_len.value)
1825
1391
        # Convert the bytestring to hexadecimal notation
1826
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1392
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1827
1393
        return hex_fpr
1828
1394
 
1829
1395
 
1832
1398
    def sub_process_main(self, request, address):
1833
1399
        try:
1834
1400
            self.finish_request(request, address)
1835
 
        except Exception:
 
1401
        except:
1836
1402
            self.handle_error(request, address)
1837
1403
        self.close_request(request)
1838
 
    
 
1404
            
1839
1405
    def process_request(self, request, address):
1840
1406
        """Start a new process to process the request."""
1841
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1842
 
                                       args = (request,
1843
 
                                               address))
1844
 
        proc.start()
1845
 
        return proc
 
1407
        multiprocessing.Process(target = self.sub_process_main,
 
1408
                                args = (request, address)).start()
1846
1409
 
1847
1410
 
1848
1411
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1854
1417
        """
1855
1418
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1856
1419
        
1857
 
        proc = MultiprocessingMixIn.process_request(self, request,
1858
 
                                                    client_address)
 
1420
        super(MultiprocessingMixInWithPipe,
 
1421
              self).process_request(request, client_address)
1859
1422
        self.child_pipe.close()
1860
 
        self.add_pipe(parent_pipe, proc)
 
1423
        self.add_pipe(parent_pipe)
1861
1424
    
1862
 
    def add_pipe(self, parent_pipe, proc):
 
1425
    def add_pipe(self, parent_pipe):
1863
1426
        """Dummy function; override as necessary"""
1864
1427
        raise NotImplementedError
1865
1428
 
1943
1506
        self.enabled = False
1944
1507
        self.clients = clients
1945
1508
        if self.clients is None:
1946
 
            self.clients = {}
 
1509
            self.clients = set()
1947
1510
        self.use_dbus = use_dbus
1948
1511
        self.gnutls_priority = gnutls_priority
1949
1512
        IPv6_TCPServer.__init__(self, server_address,
1953
1516
    def server_activate(self):
1954
1517
        if self.enabled:
1955
1518
            return socketserver.TCPServer.server_activate(self)
1956
 
    
1957
1519
    def enable(self):
1958
1520
        self.enabled = True
1959
 
    
1960
 
    def add_pipe(self, parent_pipe, proc):
 
1521
    def add_pipe(self, parent_pipe):
1961
1522
        # Call "handle_ipc" for both data and EOF events
1962
1523
        gobject.io_add_watch(parent_pipe.fileno(),
1963
1524
                             gobject.IO_IN | gobject.IO_HUP,
1964
1525
                             functools.partial(self.handle_ipc,
1965
 
                                               parent_pipe =
1966
 
                                               parent_pipe,
1967
 
                                               proc = proc))
1968
 
    
 
1526
                                               parent_pipe = parent_pipe))
 
1527
        
1969
1528
    def handle_ipc(self, source, condition, parent_pipe=None,
1970
 
                   proc = None, client_object=None):
 
1529
                   client_object=None):
1971
1530
        condition_names = {
1972
1531
            gobject.IO_IN: "IN",   # There is data to read.
1973
1532
            gobject.IO_OUT: "OUT", # Data can be written (without
1982
1541
                                       for cond, name in
1983
1542
                                       condition_names.iteritems()
1984
1543
                                       if cond & condition)
1985
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1544
        # error or the other end of multiprocessing.Pipe has closed
1986
1545
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1987
 
            # Wait for other process to exit
1988
 
            proc.join()
1989
1546
            return False
1990
1547
        
1991
1548
        # Read a request from the child
1996
1553
            fpr = request[1]
1997
1554
            address = request[2]
1998
1555
            
1999
 
            for c in self.clients.itervalues():
 
1556
            for c in self.clients:
2000
1557
                if c.fingerprint == fpr:
2001
1558
                    client = c
2002
1559
                    break
2005
1562
                            "dress: %s", fpr, address)
2006
1563
                if self.use_dbus:
2007
1564
                    # Emit D-Bus signal
2008
 
                    mandos_dbus_service.ClientNotFound(fpr,
2009
 
                                                       address[0])
 
1565
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2010
1566
                parent_pipe.send(False)
2011
1567
                return False
2012
1568
            
2013
1569
            gobject.io_add_watch(parent_pipe.fileno(),
2014
1570
                                 gobject.IO_IN | gobject.IO_HUP,
2015
1571
                                 functools.partial(self.handle_ipc,
2016
 
                                                   parent_pipe =
2017
 
                                                   parent_pipe,
2018
 
                                                   proc = proc,
2019
 
                                                   client_object =
2020
 
                                                   client))
 
1572
                                                   parent_pipe = parent_pipe,
 
1573
                                                   client_object = client))
2021
1574
            parent_pipe.send(True)
2022
 
            # remove the old hook in favor of the new above hook on
2023
 
            # same fileno
 
1575
            # remove the old hook in favor of the new above hook on same fileno
2024
1576
            return False
2025
1577
        if command == 'funcall':
2026
1578
            funcname = request[1]
2027
1579
            args = request[2]
2028
1580
            kwargs = request[3]
2029
1581
            
2030
 
            parent_pipe.send(('data', getattr(client_object,
2031
 
                                              funcname)(*args,
2032
 
                                                         **kwargs)))
 
1582
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2033
1583
        
2034
1584
        if command == 'getattr':
2035
1585
            attrname = request[1]
2036
1586
            if callable(client_object.__getattribute__(attrname)):
2037
1587
                parent_pipe.send(('function',))
2038
1588
            else:
2039
 
                parent_pipe.send(('data', client_object
2040
 
                                  .__getattribute__(attrname)))
 
1589
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2041
1590
        
2042
1591
        if command == 'setattr':
2043
1592
            attrname = request[1]
2086
1635
    return timevalue
2087
1636
 
2088
1637
 
 
1638
def if_nametoindex(interface):
 
1639
    """Call the C function if_nametoindex(), or equivalent
 
1640
    
 
1641
    Note: This function cannot accept a unicode string."""
 
1642
    global if_nametoindex
 
1643
    try:
 
1644
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1645
                          (ctypes.util.find_library("c"))
 
1646
                          .if_nametoindex)
 
1647
    except (OSError, AttributeError):
 
1648
        logger.warning("Doing if_nametoindex the hard way")
 
1649
        def if_nametoindex(interface):
 
1650
            "Get an interface index the hard way, i.e. using fcntl()"
 
1651
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1652
            with contextlib.closing(socket.socket()) as s:
 
1653
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1654
                                    struct.pack(str("16s16x"),
 
1655
                                                interface))
 
1656
            interface_index = struct.unpack(str("I"),
 
1657
                                            ifreq[16:20])[0]
 
1658
            return interface_index
 
1659
    return if_nametoindex(interface)
 
1660
 
 
1661
 
2089
1662
def daemon(nochdir = False, noclose = False):
2090
1663
    """See daemon(3).  Standard BSD Unix function.
2091
1664
    
2099
1672
        sys.exit()
2100
1673
    if not noclose:
2101
1674
        # Close all standard open file descriptors
2102
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1675
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2103
1676
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2104
1677
            raise OSError(errno.ENODEV,
2105
1678
                          "%s not a character device"
2106
 
                          % os.devnull)
 
1679
                          % os.path.devnull)
2107
1680
        os.dup2(null, sys.stdin.fileno())
2108
1681
        os.dup2(null, sys.stdout.fileno())
2109
1682
        os.dup2(null, sys.stderr.fileno())
2146
1719
                        " system bus interface")
2147
1720
    parser.add_argument("--no-ipv6", action="store_false",
2148
1721
                        dest="use_ipv6", help="Do not use IPv6")
2149
 
    parser.add_argument("--no-restore", action="store_false",
2150
 
                        dest="restore", help="Do not restore stored"
2151
 
                        " state")
2152
 
    parser.add_argument("--statedir", metavar="DIR",
2153
 
                        help="Directory to save/restore state in")
2154
 
    
2155
1722
    options = parser.parse_args()
2156
1723
    
2157
1724
    if options.check:
2170
1737
                        "use_dbus": "True",
2171
1738
                        "use_ipv6": "True",
2172
1739
                        "debuglevel": "",
2173
 
                        "restore": "True",
2174
 
                        "statedir": "/var/lib/mandos"
2175
1740
                        }
2176
1741
    
2177
1742
    # Parse config file for server-global settings
2194
1759
    # options, if set.
2195
1760
    for option in ("interface", "address", "port", "debug",
2196
1761
                   "priority", "servicename", "configdir",
2197
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2198
 
                   "statedir"):
 
1762
                   "use_dbus", "use_ipv6", "debuglevel"):
2199
1763
        value = getattr(options, option)
2200
1764
        if value is not None:
2201
1765
            server_settings[option] = value
2213
1777
    debuglevel = server_settings["debuglevel"]
2214
1778
    use_dbus = server_settings["use_dbus"]
2215
1779
    use_ipv6 = server_settings["use_ipv6"]
2216
 
    stored_state_path = os.path.join(server_settings["statedir"],
2217
 
                                     stored_state_file)
2218
 
    
2219
 
    if debug:
2220
 
        initlogger(debug, logging.DEBUG)
2221
 
    else:
2222
 
        if not debuglevel:
2223
 
            initlogger(debug)
2224
 
        else:
2225
 
            level = getattr(logging, debuglevel.upper())
2226
 
            initlogger(debug, level)
2227
1780
    
2228
1781
    if server_settings["servicename"] != "Mandos":
2229
1782
        syslogger.setFormatter(logging.Formatter
2232
1785
                                % server_settings["servicename"]))
2233
1786
    
2234
1787
    # Parse config file with clients
2235
 
    client_config = configparser.SafeConfigParser(Client
2236
 
                                                  .client_defaults)
 
1788
    client_defaults = { "timeout": "5m",
 
1789
                        "extended_timeout": "15m",
 
1790
                        "interval": "2m",
 
1791
                        "checker": "fping -q -- %%(host)s",
 
1792
                        "host": "",
 
1793
                        "approval_delay": "0s",
 
1794
                        "approval_duration": "1s",
 
1795
                        }
 
1796
    client_config = configparser.SafeConfigParser(client_defaults)
2237
1797
    client_config.read(os.path.join(server_settings["configdir"],
2238
1798
                                    "clients.conf"))
2239
1799
    
2256
1816
        except IOError:
2257
1817
            logger.error("Could not open file %r", pidfilename)
2258
1818
    
2259
 
    for name in ("_mandos", "mandos", "nobody"):
 
1819
    try:
 
1820
        uid = pwd.getpwnam("_mandos").pw_uid
 
1821
        gid = pwd.getpwnam("_mandos").pw_gid
 
1822
    except KeyError:
2260
1823
        try:
2261
 
            uid = pwd.getpwnam(name).pw_uid
2262
 
            gid = pwd.getpwnam(name).pw_gid
2263
 
            break
 
1824
            uid = pwd.getpwnam("mandos").pw_uid
 
1825
            gid = pwd.getpwnam("mandos").pw_gid
2264
1826
        except KeyError:
2265
 
            continue
2266
 
    else:
2267
 
        uid = 65534
2268
 
        gid = 65534
 
1827
            try:
 
1828
                uid = pwd.getpwnam("nobody").pw_uid
 
1829
                gid = pwd.getpwnam("nobody").pw_gid
 
1830
            except KeyError:
 
1831
                uid = 65534
 
1832
                gid = 65534
2269
1833
    try:
2270
1834
        os.setgid(gid)
2271
1835
        os.setuid(uid)
2273
1837
        if error[0] != errno.EPERM:
2274
1838
            raise error
2275
1839
    
 
1840
    if not debug and not debuglevel:
 
1841
        syslogger.setLevel(logging.WARNING)
 
1842
        console.setLevel(logging.WARNING)
 
1843
    if debuglevel:
 
1844
        level = getattr(logging, debuglevel.upper())
 
1845
        syslogger.setLevel(level)
 
1846
        console.setLevel(level)
 
1847
    
2276
1848
    if debug:
2277
1849
        # Enable all possible GnuTLS debugging
2278
1850
        
2288
1860
         .gnutls_global_set_log_function(debug_gnutls))
2289
1861
        
2290
1862
        # Redirect stdin so all checkers get /dev/null
2291
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1863
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2292
1864
        os.dup2(null, sys.stdin.fileno())
2293
1865
        if null > 2:
2294
1866
            os.close(null)
 
1867
    else:
 
1868
        # No console logging
 
1869
        logger.removeHandler(console)
2295
1870
    
2296
1871
    # Need to fork before connecting to D-Bus
2297
1872
    if not debug:
2298
1873
        # Close all input and output, do double fork, etc.
2299
1874
        daemon()
2300
1875
    
2301
 
    gobject.threads_init()
2302
 
    
2303
1876
    global main_loop
2304
1877
    # From the Avahi example code
2305
 
    DBusGMainLoop(set_as_default=True)
 
1878
    DBusGMainLoop(set_as_default=True )
2306
1879
    main_loop = gobject.MainLoop()
2307
1880
    bus = dbus.SystemBus()
2308
1881
    # End of Avahi example code
2309
1882
    if use_dbus:
2310
1883
        try:
2311
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1884
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2312
1885
                                            bus, do_not_queue=True)
2313
 
            old_bus_name = (dbus.service.BusName
2314
 
                            ("se.bsnet.fukt.Mandos", bus,
2315
 
                             do_not_queue=True))
2316
1886
        except dbus.exceptions.NameExistsException as e:
2317
1887
            logger.error(unicode(e) + ", disabling D-Bus")
2318
1888
            use_dbus = False
2319
1889
            server_settings["use_dbus"] = False
2320
1890
            tcp_server.use_dbus = False
2321
1891
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2322
 
    service = AvahiServiceToSyslog(name =
2323
 
                                   server_settings["servicename"],
2324
 
                                   servicetype = "_mandos._tcp",
2325
 
                                   protocol = protocol, bus = bus)
 
1892
    service = AvahiService(name = server_settings["servicename"],
 
1893
                           servicetype = "_mandos._tcp",
 
1894
                           protocol = protocol, bus = bus)
2326
1895
    if server_settings["interface"]:
2327
1896
        service.interface = (if_nametoindex
2328
1897
                             (str(server_settings["interface"])))
2332
1901
    
2333
1902
    client_class = Client
2334
1903
    if use_dbus:
2335
 
        client_class = functools.partial(ClientDBusTransitional,
2336
 
                                         bus = bus)
2337
 
    
2338
 
    client_settings = Client.config_parser(client_config)
2339
 
    old_client_settings = {}
2340
 
    clients_data = {}
2341
 
    
2342
 
    # Get client data and settings from last running state.
2343
 
    if server_settings["restore"]:
2344
 
        try:
2345
 
            with open(stored_state_path, "rb") as stored_state:
2346
 
                clients_data, old_client_settings = (pickle.load
2347
 
                                                     (stored_state))
2348
 
            os.remove(stored_state_path)
2349
 
        except IOError as e:
2350
 
            logger.warning("Could not load persistent state: {0}"
2351
 
                           .format(e))
2352
 
            if e.errno != errno.ENOENT:
2353
 
                raise
2354
 
        except EOFError as e:
2355
 
            logger.warning("Could not load persistent state: "
2356
 
                           "EOFError: {0}".format(e))
2357
 
    
2358
 
    with PGPEngine() as pgp:
2359
 
        for client_name, client in clients_data.iteritems():
2360
 
            # Decide which value to use after restoring saved state.
2361
 
            # We have three different values: Old config file,
2362
 
            # new config file, and saved state.
2363
 
            # New config value takes precedence if it differs from old
2364
 
            # config value, otherwise use saved state.
2365
 
            for name, value in client_settings[client_name].items():
2366
 
                try:
2367
 
                    # For each value in new config, check if it
2368
 
                    # differs from the old config value (Except for
2369
 
                    # the "secret" attribute)
2370
 
                    if (name != "secret" and
2371
 
                        value != old_client_settings[client_name]
2372
 
                        [name]):
2373
 
                        client[name] = value
2374
 
                except KeyError:
2375
 
                    pass
2376
 
            
2377
 
            # Clients who has passed its expire date can still be
2378
 
            # enabled if its last checker was successful.  Clients
2379
 
            # whose checker succeeded before we stored its state is
2380
 
            # assumed to have successfully run all checkers during
2381
 
            # downtime.
2382
 
            if client["enabled"]:
2383
 
                if datetime.datetime.utcnow() >= client["expires"]:
2384
 
                    if not client["last_checked_ok"]:
2385
 
                        logger.warning(
2386
 
                            "disabling client {0} - Client never "
2387
 
                            "performed a successful checker"
2388
 
                            .format(client_name))
2389
 
                        client["enabled"] = False
2390
 
                    elif client["last_checker_status"] != 0:
2391
 
                        logger.warning(
2392
 
                            "disabling client {0} - Client "
2393
 
                            "last checker failed with error code {1}"
2394
 
                            .format(client_name,
2395
 
                                    client["last_checker_status"]))
2396
 
                        client["enabled"] = False
2397
 
                    else:
2398
 
                        client["expires"] = (datetime.datetime
2399
 
                                             .utcnow()
2400
 
                                             + client["timeout"])
2401
 
                        logger.debug("Last checker succeeded,"
2402
 
                                     " keeping {0} enabled"
2403
 
                                     .format(client_name))
 
1904
        client_class = functools.partial(ClientDBus, bus = bus)
 
1905
    def client_config_items(config, section):
 
1906
        special_settings = {
 
1907
            "approved_by_default":
 
1908
                lambda: config.getboolean(section,
 
1909
                                          "approved_by_default"),
 
1910
            }
 
1911
        for name, value in config.items(section):
2404
1912
            try:
2405
 
                client["secret"] = (
2406
 
                    pgp.decrypt(client["encrypted_secret"],
2407
 
                                client_settings[client_name]
2408
 
                                ["secret"]))
2409
 
            except PGPError:
2410
 
                # If decryption fails, we use secret from new settings
2411
 
                logger.debug("Failed to decrypt {0} old secret"
2412
 
                             .format(client_name))
2413
 
                client["secret"] = (
2414
 
                    client_settings[client_name]["secret"])
2415
 
 
2416
 
    
2417
 
    # Add/remove clients based on new changes made to config
2418
 
    for client_name in (set(old_client_settings)
2419
 
                        - set(client_settings)):
2420
 
        del clients_data[client_name]
2421
 
    for client_name in (set(client_settings)
2422
 
                        - set(old_client_settings)):
2423
 
        clients_data[client_name] = client_settings[client_name]
2424
 
 
2425
 
    # Create all client objects
2426
 
    for client_name, client in clients_data.iteritems():
2427
 
        tcp_server.clients[client_name] = client_class(
2428
 
            name = client_name, settings = client)
2429
 
    
 
1913
                yield (name, special_settings[name]())
 
1914
            except KeyError:
 
1915
                yield (name, value)
 
1916
    
 
1917
    tcp_server.clients.update(set(
 
1918
            client_class(name = section,
 
1919
                         config= dict(client_config_items(
 
1920
                        client_config, section)))
 
1921
            for section in client_config.sections()))
2430
1922
    if not tcp_server.clients:
2431
1923
        logger.warning("No clients defined")
2432
1924
        
2443
1935
            # "pidfile" was never created
2444
1936
            pass
2445
1937
        del pidfilename
 
1938
        
2446
1939
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2447
1940
    
2448
1941
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2449
1942
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2450
1943
    
2451
1944
    if use_dbus:
2452
 
        class MandosDBusService(DBusObjectWithProperties):
 
1945
        class MandosDBusService(dbus.service.Object):
2453
1946
            """A D-Bus proxy object"""
2454
1947
            def __init__(self):
2455
1948
                dbus.service.Object.__init__(self, bus, "/")
2456
 
            _interface = "se.recompile.Mandos"
2457
 
            
2458
 
            @dbus_interface_annotations(_interface)
2459
 
            def _foo(self):
2460
 
                return { "org.freedesktop.DBus.Property"
2461
 
                         ".EmitsChangedSignal":
2462
 
                             "false"}
 
1949
            _interface = "se.bsnet.fukt.Mandos"
2463
1950
            
2464
1951
            @dbus.service.signal(_interface, signature="o")
2465
1952
            def ClientAdded(self, objpath):
2480
1967
            def GetAllClients(self):
2481
1968
                "D-Bus method"
2482
1969
                return dbus.Array(c.dbus_object_path
2483
 
                                  for c in
2484
 
                                  tcp_server.clients.itervalues())
 
1970
                                  for c in tcp_server.clients)
2485
1971
            
2486
1972
            @dbus.service.method(_interface,
2487
1973
                                 out_signature="a{oa{sv}}")
2489
1975
                "D-Bus method"
2490
1976
                return dbus.Dictionary(
2491
1977
                    ((c.dbus_object_path, c.GetAll(""))
2492
 
                     for c in tcp_server.clients.itervalues()),
 
1978
                     for c in tcp_server.clients),
2493
1979
                    signature="oa{sv}")
2494
1980
            
2495
1981
            @dbus.service.method(_interface, in_signature="o")
2496
1982
            def RemoveClient(self, object_path):
2497
1983
                "D-Bus method"
2498
 
                for c in tcp_server.clients.itervalues():
 
1984
                for c in tcp_server.clients:
2499
1985
                    if c.dbus_object_path == object_path:
2500
 
                        del tcp_server.clients[c.name]
 
1986
                        tcp_server.clients.remove(c)
2501
1987
                        c.remove_from_connection()
2502
1988
                        # Don't signal anything except ClientRemoved
2503
1989
                        c.disable(quiet=True)
2508
1994
            
2509
1995
            del _interface
2510
1996
        
2511
 
        class MandosDBusServiceTransitional(MandosDBusService):
2512
 
            __metaclass__ = AlternateDBusNamesMetaclass
2513
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1997
        mandos_dbus_service = MandosDBusService()
2514
1998
    
2515
1999
    def cleanup():
2516
2000
        "Cleanup function; run on exit"
2517
2001
        service.cleanup()
2518
2002
        
2519
 
        multiprocessing.active_children()
2520
 
        if not (tcp_server.clients or client_settings):
2521
 
            return
2522
 
        
2523
 
        # Store client before exiting. Secrets are encrypted with key
2524
 
        # based on what config file has. If config file is
2525
 
        # removed/edited, old secret will thus be unrecovable.
2526
 
        clients = {}
2527
 
        with PGPEngine() as pgp:
2528
 
            for client in tcp_server.clients.itervalues():
2529
 
                key = client_settings[client.name]["secret"]
2530
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2531
 
                                                      key)
2532
 
                client_dict = {}
2533
 
                
2534
 
                # A list of attributes that can not be pickled
2535
 
                # + secret.
2536
 
                exclude = set(("bus", "changedstate", "secret",
2537
 
                               "checker"))
2538
 
                for name, typ in (inspect.getmembers
2539
 
                                  (dbus.service.Object)):
2540
 
                    exclude.add(name)
2541
 
                
2542
 
                client_dict["encrypted_secret"] = (client
2543
 
                                                   .encrypted_secret)
2544
 
                for attr in client.client_structure:
2545
 
                    if attr not in exclude:
2546
 
                        client_dict[attr] = getattr(client, attr)
2547
 
                
2548
 
                clients[client.name] = client_dict
2549
 
                del client_settings[client.name]["secret"]
2550
 
        
2551
 
        try:
2552
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2553
 
                                                prefix="clients-",
2554
 
                                                dir=os.path.dirname
2555
 
                                                (stored_state_path))
2556
 
            with os.fdopen(tempfd, "wb") as stored_state:
2557
 
                pickle.dump((clients, client_settings), stored_state)
2558
 
            os.rename(tempname, stored_state_path)
2559
 
        except (IOError, OSError) as e:
2560
 
            logger.warning("Could not save persistent state: {0}"
2561
 
                           .format(e))
2562
 
            if not debug:
2563
 
                try:
2564
 
                    os.remove(tempname)
2565
 
                except NameError:
2566
 
                    pass
2567
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2568
 
                                   errno.EEXIST)):
2569
 
                raise e
2570
 
        
2571
 
        # Delete all clients, and settings from config
2572
2003
        while tcp_server.clients:
2573
 
            name, client = tcp_server.clients.popitem()
 
2004
            client = tcp_server.clients.pop()
2574
2005
            if use_dbus:
2575
2006
                client.remove_from_connection()
 
2007
            client.disable_hook = None
2576
2008
            # Don't signal anything except ClientRemoved
2577
2009
            client.disable(quiet=True)
2578
2010
            if use_dbus:
2579
2011
                # Emit D-Bus signal
2580
 
                mandos_dbus_service.ClientRemoved(client
2581
 
                                                  .dbus_object_path,
 
2012
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2582
2013
                                                  client.name)
2583
 
        client_settings.clear()
2584
2014
    
2585
2015
    atexit.register(cleanup)
2586
2016
    
2587
 
    for client in tcp_server.clients.itervalues():
 
2017
    for client in tcp_server.clients:
2588
2018
        if use_dbus:
2589
2019
            # Emit D-Bus signal
2590
2020
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2591
 
        # Need to initiate checking of clients
2592
 
        if client.enabled:
2593
 
            client.init_checker()
 
2021
        client.enable()
2594
2022
    
2595
2023
    tcp_server.enable()
2596
2024
    tcp_server.server_activate()
2612
2040
        try:
2613
2041
            service.activate()
2614
2042
        except dbus.exceptions.DBusException as error:
2615
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2043
            logger.critical("DBusException: %s", error)
2616
2044
            cleanup()
2617
2045
            sys.exit(1)
2618
2046
        # End of Avahi example code
2625
2053
        logger.debug("Starting main loop")
2626
2054
        main_loop.run()
2627
2055
    except AvahiError as error:
2628
 
        logger.critical("Avahi Error", exc_info=error)
 
2056
        logger.critical("AvahiError: %s", error)
2629
2057
        cleanup()
2630
2058
        sys.exit(1)
2631
2059
    except KeyboardInterrupt:
2636
2064
    # Must run before the D-Bus bus name gets deregistered
2637
2065
    cleanup()
2638
2066
 
 
2067
 
2639
2068
if __name__ == '__main__':
2640
2069
    main()