/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-03 20:16:22 UTC
  • Revision ID: teddy@recompile.se-20120503201622-d9yezi9t17i00lio
* mandos-ctl: Use new string format method.  Bug fix: --version now
              shows the program name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
 
66
import binascii
 
67
import tempfile
 
68
import itertools
66
69
 
67
70
import dbus
68
71
import dbus.service
73
76
import ctypes.util
74
77
import xml.dom.minidom
75
78
import inspect
 
79
import GnuPGInterface
76
80
 
77
81
try:
78
82
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
86
    except ImportError:
83
87
        SO_BINDTODEVICE = None
84
88
 
85
 
 
86
 
version = "1.3.1"
87
 
 
88
 
#logger = logging.getLogger('mandos')
89
 
logger = logging.Logger('mandos')
 
89
version = "1.5.3"
 
90
stored_state_file = "clients.pickle"
 
91
 
 
92
logger = logging.getLogger()
90
93
syslogger = (logging.handlers.SysLogHandler
91
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
95
              address = str("/dev/log")))
93
 
syslogger.setFormatter(logging.Formatter
94
 
                       ('Mandos [%(process)d]: %(levelname)s:'
95
 
                        ' %(message)s'))
96
 
logger.addHandler(syslogger)
97
 
 
98
 
console = logging.StreamHandler()
99
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
102
 
logger.addHandler(console)
 
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
 
103
212
 
104
213
class AvahiError(Exception):
105
214
    def __init__(self, value, *args, **kwargs):
160
269
                            " after %i retries, exiting.",
161
270
                            self.rename_count)
162
271
            raise AvahiServiceError("Too many renames")
163
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
272
        self.name = unicode(self.server
 
273
                            .GetAlternativeServiceName(self.name))
164
274
        logger.info("Changing Zeroconf service name to %r ...",
165
275
                    self.name)
166
 
        syslogger.setFormatter(logging.Formatter
167
 
                               ('Mandos (%s) [%%(process)d]:'
168
 
                                ' %%(levelname)s: %%(message)s'
169
 
                                % self.name))
170
276
        self.remove()
171
277
        try:
172
278
            self.add()
173
279
        except dbus.exceptions.DBusException as error:
174
 
            logger.critical("DBusException: %s", error)
 
280
            logger.critical("D-Bus Exception", exc_info=error)
175
281
            self.cleanup()
176
282
            os._exit(1)
177
283
        self.rename_count += 1
192
298
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
299
        self.entry_group_state_changed_match = (
194
300
            self.group.connect_to_signal(
195
 
                'StateChanged', self .entry_group_state_changed))
 
301
                'StateChanged', self.entry_group_state_changed))
196
302
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
197
303
                     self.name, self.type)
198
304
        self.group.AddService(
216
322
        elif state == avahi.ENTRY_GROUP_FAILURE:
217
323
            logger.critical("Avahi: Error in group state changed %s",
218
324
                            unicode(error))
219
 
            raise AvahiGroupError("State changed: %s"
220
 
                                  % unicode(error))
 
325
            raise AvahiGroupError("State changed: {0!s}"
 
326
                                  .format(error))
221
327
    def cleanup(self):
222
328
        """Derived from the Avahi example code"""
223
329
        if self.group is not None:
224
330
            try:
225
331
                self.group.Free()
226
332
            except (dbus.exceptions.UnknownMethodException,
227
 
                    dbus.exceptions.DBusException) as e:
 
333
                    dbus.exceptions.DBusException):
228
334
                pass
229
335
            self.group = None
230
336
        self.remove()
264
370
                                 self.server_state_changed)
265
371
        self.server_state_changed(self.server.GetState())
266
372
 
 
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 ({0}) [%(process)d]:'
 
379
                                ' %(levelname)s: %(message)s'
 
380
                                .format(self.name)))
 
381
        return ret
267
382
 
268
 
def _timedelta_to_milliseconds(td):
 
383
def timedelta_to_milliseconds(td):
269
384
    "Convert a datetime.timedelta() to milliseconds"
270
385
    return ((td.days * 24 * 60 * 60 * 1000)
271
386
            + (td.seconds * 1000)
275
390
    """A representation of a client host served by this server.
276
391
    
277
392
    Attributes:
278
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
393
    approved:   bool(); 'None' if not yet approved/disapproved
279
394
    approval_delay: datetime.timedelta(); Time to wait for approval
280
395
    approval_duration: datetime.timedelta(); Duration of one approval
281
396
    checker:    subprocess.Popen(); a running checker process used
288
403
                     instance %(name)s can be used in the command.
289
404
    checker_initiator_tag: a gobject event source tag, or None
290
405
    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
291
408
    current_checker_command: string; current running checker_command
292
 
    disable_hook:  If set, called by disable() as disable_hook(self)
293
409
    disable_initiator_tag: a gobject event source tag, or None
294
410
    enabled:    bool()
295
411
    fingerprint: string (40 or 32 hexadecimal digits); used to
298
414
    interval:   datetime.timedelta(); How often to start a new checker
299
415
    last_approval_request: datetime.datetime(); (UTC) or None
300
416
    last_checked_ok: datetime.datetime(); (UTC) or None
301
 
    last_enabled: datetime.datetime(); (UTC)
 
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
302
421
    name:       string; from the config file, used in log messages and
303
422
                        D-Bus identifiers
304
423
    secret:     bytestring; sent verbatim (over TLS) to client
305
424
    timeout:    datetime.timedelta(); How long from last_checked_ok
306
425
                                      until this client is disabled
307
 
    extended_timeout:   extra long timeout when password has been sent
 
426
    extended_timeout:   extra long timeout when secret has been sent
308
427
    runtime_expansions: Allowed attributes for runtime expansion.
309
428
    expires:    datetime.datetime(); time (UTC) when a client will be
310
429
                disabled, or None
314
433
                          "created", "enabled", "fingerprint",
315
434
                          "host", "interval", "last_checked_ok",
316
435
                          "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
                        }
317
446
    
318
447
    def timeout_milliseconds(self):
319
448
        "Return the 'timeout' attribute in milliseconds"
320
 
        return _timedelta_to_milliseconds(self.timeout)
 
449
        return timedelta_to_milliseconds(self.timeout)
321
450
    
322
451
    def extended_timeout_milliseconds(self):
323
452
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
453
        return timedelta_to_milliseconds(self.extended_timeout)
325
454
    
326
455
    def interval_milliseconds(self):
327
456
        "Return the 'interval' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.interval)
 
457
        return timedelta_to_milliseconds(self.interval)
329
458
    
330
459
    def approval_delay_milliseconds(self):
331
 
        return _timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
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 {0}"
 
493
                                .format(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):
334
511
        """Note: the 'checker' key in 'config' sets the
335
512
        'checker_command' attribute and *not* the 'checker'
336
513
        attribute."""
337
514
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
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
       
340
529
        logger.debug("Creating client %r", self.name)
341
530
        # Uppercase and remove spaces from fingerprint for later
342
531
        # comparison purposes with return value from the fingerprint()
343
532
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
533
        logger.debug("  Fingerprint: %s", self.fingerprint)
347
 
        if "secret" in config:
348
 
            self.secret = config["secret"].decode("base64")
349
 
        elif "secfile" in config:
350
 
            with open(os.path.expanduser(os.path.expandvars
351
 
                                         (config["secfile"])),
352
 
                      "rb") as secfile:
353
 
                self.secret = secfile.read()
354
 
        else:
355
 
            raise TypeError("No secret or secfile for client %s"
356
 
                            % self.name)
357
 
        self.host = config.get("host", "")
358
 
        self.created = datetime.datetime.utcnow()
359
 
        self.enabled = False
360
 
        self.last_approval_request = None
361
 
        self.last_enabled = None
362
 
        self.last_checked_ok = None
363
 
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
365
 
        self.interval = string_to_delta(config["interval"])
366
 
        self.disable_hook = disable_hook
 
534
        self.created = settings.get("created",
 
535
                                    datetime.datetime.utcnow())
 
536
 
 
537
        # attributes specific for this server instance
367
538
        self.checker = None
368
539
        self.checker_initiator_tag = None
369
540
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
541
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
542
        self.current_checker_command = None
374
 
        self.last_connect = None
375
 
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
377
 
                                              True)
 
543
        self.approved = None
378
544
        self.approvals_pending = 0
379
 
        self.approval_delay = string_to_delta(
380
 
            config["approval_delay"])
381
 
        self.approval_duration = string_to_delta(
382
 
            config["approval_duration"])
383
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
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)
384
559
    
 
560
    # Send notice to process children that client state has changed
385
561
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
562
        with self.changedstate:
 
563
            self.changedstate.notify_all()
 
564
    
390
565
    def enable(self):
391
566
        """Start this client's checker and timeout hooks"""
392
567
        if getattr(self, "enabled", False):
393
568
            # Already enabled
394
569
            return
395
570
        self.send_changedstate()
396
 
        # Schedule a new checker to be started an 'interval' from now,
397
 
        # and every interval from then on.
398
 
        self.checker_initiator_tag = (gobject.timeout_add
399
 
                                      (self.interval_milliseconds(),
400
 
                                       self.start_checker))
401
 
        # Schedule a disable() when 'timeout' has passed
402
571
        self.expires = datetime.datetime.utcnow() + self.timeout
403
 
        self.disable_initiator_tag = (gobject.timeout_add
404
 
                                   (self.timeout_milliseconds(),
405
 
                                    self.disable))
406
572
        self.enabled = True
407
573
        self.last_enabled = datetime.datetime.utcnow()
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
574
        self.init_checker()
410
575
    
411
576
    def disable(self, quiet=True):
412
577
        """Disable this client."""
424
589
            gobject.source_remove(self.checker_initiator_tag)
425
590
            self.checker_initiator_tag = None
426
591
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
592
        self.enabled = False
430
593
        # Do not run this again if called by a gobject.timeout_add
431
594
        return False
432
595
    
433
596
    def __del__(self):
434
 
        self.disable_hook = None
435
597
        self.disable()
436
598
    
 
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
    
437
612
    def checker_callback(self, pid, condition, command):
438
613
        """The checker has completed, so take appropriate actions."""
439
614
        self.checker_callback_tag = None
440
615
        self.checker = None
441
616
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
617
            self.last_checker_status = os.WEXITSTATUS(condition)
 
618
            if self.last_checker_status == 0:
444
619
                logger.info("Checker for %(name)s succeeded",
445
620
                            vars(self))
446
621
                self.checked_ok()
448
623
                logger.info("Checker for %(name)s failed",
449
624
                            vars(self))
450
625
        else:
 
626
            self.last_checker_status = -1
451
627
            logger.warning("Checker for %(name)s crashed?",
452
628
                           vars(self))
453
629
    
454
 
    def checked_ok(self, timeout=None):
455
 
        """Bump up the timeout for this client.
456
 
        
457
 
        This should only be called when the client has been seen,
458
 
        alive and well.
459
 
        """
 
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."""
460
638
        if timeout is None:
461
639
            timeout = self.timeout
462
 
        self.last_checked_ok = datetime.datetime.utcnow()
463
 
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
 
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (_timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
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
468
647
    
469
648
    def need_approval(self):
470
649
        self.last_approval_request = datetime.datetime.utcnow()
514
693
                try:
515
694
                    command = self.checker_command % escaped_attrs
516
695
                except TypeError as error:
517
 
                    logger.error('Could not format string "%s":'
518
 
                                 ' %s', self.checker_command, error)
 
696
                    logger.error('Could not format string "%s"',
 
697
                                 self.checker_command, exc_info=error)
519
698
                    return True # Try again later
520
699
            self.current_checker_command = command
521
700
            try:
539
718
                    gobject.source_remove(self.checker_callback_tag)
540
719
                    self.checker_callback(pid, status, command)
541
720
            except OSError as error:
542
 
                logger.error("Failed to start subprocess: %s",
543
 
                             error)
 
721
                logger.error("Failed to start subprocess",
 
722
                             exc_info=error)
544
723
        # Re-run this periodically if run by gobject.timeout_add
545
724
        return True
546
725
    
553
732
            return
554
733
        logger.debug("Stopping checker for %(name)s", vars(self))
555
734
        try:
556
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
735
            self.checker.terminate()
557
736
            #time.sleep(0.5)
558
737
            #if self.checker.poll() is None:
559
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
738
            #    self.checker.kill()
560
739
        except OSError as error:
561
740
            if error.errno != errno.ESRCH: # No such process
562
741
                raise
579
758
    # "Set" method, so we fail early here:
580
759
    if byte_arrays and signature != "ay":
581
760
        raise ValueError("Byte arrays not supported for non-'ay'"
582
 
                         " signature %r" % signature)
 
761
                         " signature {0!r}".format(signature))
583
762
    def decorator(func):
584
763
        func._dbus_is_property = True
585
764
        func._dbus_interface = dbus_interface
593
772
    return decorator
594
773
 
595
774
 
 
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
 
596
812
class DBusPropertyException(dbus.exceptions.DBusException):
597
813
    """A base class for D-Bus property-related exceptions
598
814
    """
621
837
    """
622
838
    
623
839
    @staticmethod
624
 
    def _is_dbus_property(obj):
625
 
        return getattr(obj, "_dbus_is_property", False)
 
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)
626
848
    
627
 
    def _get_all_dbus_properties(self):
 
849
    def _get_all_dbus_things(self, thing):
628
850
        """Returns a generator of (name, attribute) pairs
629
851
        """
630
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
852
        return ((getattr(athing.__get__(self), "_dbus_name",
 
853
                         name),
 
854
                 athing.__get__(self))
631
855
                for cls in self.__class__.__mro__
632
 
                for name, prop in inspect.getmembers(cls, self._is_dbus_property))
 
856
                for name, athing in
 
857
                inspect.getmembers(cls,
 
858
                                   self._is_dbus_thing(thing)))
633
859
    
634
860
    def _get_dbus_property(self, interface_name, property_name):
635
861
        """Returns a bound method if one exists which is a D-Bus
636
862
        property with the specified name and interface.
637
863
        """
638
864
        for cls in  self.__class__.__mro__:
639
 
            for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
 
                if value._dbus_name == property_name and value._dbus_interface == interface_name:
 
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):
641
870
                    return value.__get__(self)
642
871
        
643
872
        # No such property
644
873
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
874
                                   + interface_name + "."
646
875
                                   + property_name)
647
 
 
648
876
    
649
877
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
650
878
                         out_signature="v")
671
899
            # signatures other than "ay".
672
900
            if prop._dbus_signature != "ay":
673
901
                raise ValueError
674
 
            value = dbus.ByteArray(''.join(unichr(byte)
675
 
                                           for byte in value))
 
902
            value = dbus.ByteArray(b''.join(chr(byte)
 
903
                                            for byte in value))
676
904
        prop(value)
677
905
    
678
906
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
683
911
        
684
912
        Note: Will not include properties with access="write".
685
913
        """
686
 
        all = {}
687
 
        for name, prop in self._get_all_dbus_properties():
 
914
        properties = {}
 
915
        for name, prop in self._get_all_dbus_things("property"):
688
916
            if (interface_name
689
917
                and interface_name != prop._dbus_interface):
690
918
                # Interface non-empty but did not match
694
922
                continue
695
923
            value = prop()
696
924
            if not hasattr(value, "variant_level"):
697
 
                all[name] = value
 
925
                properties[name] = value
698
926
                continue
699
 
            all[name] = type(value)(value, variant_level=
700
 
                                    value.variant_level+1)
701
 
        return dbus.Dictionary(all, signature="sv")
 
927
            properties[name] = type(value)(value, variant_level=
 
928
                                           value.variant_level+1)
 
929
        return dbus.Dictionary(properties, signature="sv")
702
930
    
703
931
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
704
932
                         out_signature="s",
705
933
                         path_keyword='object_path',
706
934
                         connection_keyword='connection')
707
935
    def Introspect(self, object_path, connection):
708
 
        """Standard D-Bus method, overloaded to insert property tags.
 
936
        """Overloading of standard D-Bus method.
 
937
        
 
938
        Inserts property tags and interface annotation tags.
709
939
        """
710
940
        xmlstring = dbus.service.Object.Introspect(self, object_path,
711
941
                                                   connection)
718
948
                e.setAttribute("access", prop._dbus_access)
719
949
                return e
720
950
            for if_tag in document.getElementsByTagName("interface"):
 
951
                # Add property tags
721
952
                for tag in (make_tag(document, name, prop)
722
953
                            for name, prop
723
 
                            in self._get_all_dbus_properties()
 
954
                            in self._get_all_dbus_things("property")
724
955
                            if prop._dbus_interface
725
956
                            == if_tag.getAttribute("name")):
726
957
                    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)
727
989
                # Add the names to the return values for the
728
990
                # "org.freedesktop.DBus.Properties" methods
729
991
                if (if_tag.getAttribute("name")
744
1006
        except (AttributeError, xml.dom.DOMException,
745
1007
                xml.parsers.expat.ExpatError) as error:
746
1008
            logger.error("Failed to override Introspection method",
747
 
                         error)
 
1009
                         exc_info=error)
748
1010
        return xmlstring
749
1011
 
750
1012
 
755
1017
    return dbus.String(dt.isoformat(),
756
1018
                       variant_level=variant_level)
757
1019
 
758
 
class transitional_dbus_metaclass(DBusObjectWithProperties.__metaclass__):
 
1020
 
 
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
    """
759
1026
    def __new__(mcs, name, bases, attr):
760
 
        for attrname, old_dbusobj in inspect.getmembers(bases[0]):
761
 
            new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
762
 
            if (getattr(old_dbusobj, "_dbus_is_signal", False)
763
 
                and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
764
 
                unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
765
 
                                    old_dbusobj.__closure__))["func"].cell_contents
766
 
                newfunc = types.FunctionType(unwrappedfunc.func_code,
767
 
                                             unwrappedfunc.func_globals,
768
 
                                             unwrappedfunc.func_name,
769
 
                                             unwrappedfunc.func_defaults,
770
 
                                             unwrappedfunc.func_closure)
771
 
                new_dbusfunc = dbus.service.signal(
772
 
                    new_interface, old_dbusobj._dbus_signature)(newfunc)            
773
 
                attr["_transitional_" + attrname] = new_dbusfunc
774
 
 
775
 
                def fixscope(func1, func2):
776
 
                    def newcall(*args, **kwargs):
777
 
                        func1(*args, **kwargs)
778
 
                        func2(*args, **kwargs)
779
 
                    return newcall
780
 
 
781
 
                attr[attrname] = fixscope(old_dbusobj, new_dbusfunc)
782
 
            
783
 
            elif (getattr(old_dbusobj, "_dbus_is_method", False)
784
 
                and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
785
 
                new_dbusfunc = (dbus.service.method
786
 
                                (new_interface,
787
 
                                 old_dbusobj._dbus_in_signature,
788
 
                                 old_dbusobj._dbus_out_signature)
789
 
                                (types.FunctionType
790
 
                                 (old_dbusobj.func_code,
791
 
                                  old_dbusobj.func_globals,
792
 
                                  old_dbusobj.func_name,
793
 
                                  old_dbusobj.func_defaults,
794
 
                                  old_dbusobj.func_closure)))
795
 
 
796
 
                attr[attrname] = new_dbusfunc
797
 
            elif (getattr(old_dbusobj, "_dbus_is_property", False)
798
 
                  and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
799
 
                new_dbusfunc = (dbus_service_property
800
 
                                (new_interface,
801
 
                                 old_dbusobj._dbus_signature,
802
 
                                 old_dbusobj._dbus_access,
803
 
                                 old_dbusobj._dbus_get_args_options["byte_arrays"])
804
 
                                (types.FunctionType
805
 
                                 (old_dbusobj.func_code,
806
 
                                  old_dbusobj.func_globals,
807
 
                                  old_dbusobj.func_name,
808
 
                                  old_dbusobj.func_defaults,
809
 
                                  old_dbusobj.func_closure)))
810
 
 
811
 
                attr[attrname] = new_dbusfunc
 
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
812
1163
        return type.__new__(mcs, name, bases, attr)
813
1164
 
 
1165
 
814
1166
class ClientDBus(Client, DBusObjectWithProperties):
815
1167
    """A Client class using D-Bus
816
1168
    
825
1177
    # dbus.service.Object doesn't use super(), so we can't either.
826
1178
    
827
1179
    def __init__(self, bus = None, *args, **kwargs):
828
 
        self._approvals_pending = 0
829
1180
        self.bus = bus
830
1181
        Client.__init__(self, *args, **kwargs)
831
1182
        # Only now, when this client is initialized, can it show up on
841
1192
    def notifychangeproperty(transform_func,
842
1193
                             dbus_name, type_func=lambda x: x,
843
1194
                             variant_level=1):
844
 
        """ Modify a variable so that its a property that announce its
845
 
        changes to DBus.
846
 
        transform_fun: Function that takes a value and transform it to
847
 
                       DBus type.
848
 
        dbus_name: DBus name of the variable
 
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
849
1201
        type_func: Function that transform the value before sending it
850
 
                   to DBus
851
 
        variant_level: DBus variant level. default: 1
 
1202
                   to the D-Bus.  Default: no transform
 
1203
        variant_level: D-Bus variant level.  Default: 1
852
1204
        """
853
 
        real_value = [None,]
 
1205
        attrname = "_{0}".format(dbus_name)
854
1206
        def setter(self, value):
855
 
            old_value = real_value[0]
856
 
            real_value[0] = value
857
1207
            if hasattr(self, "dbus_object_path"):
858
 
                if type_func(old_value) != type_func(real_value[0]):
859
 
                    dbus_value = transform_func(type_func(real_value[0]),
860
 
                                                variant_level)
 
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)
861
1214
                    self.PropertyChanged(dbus.String(dbus_name),
862
1215
                                         dbus_value)
 
1216
            setattr(self, attrname, value)
863
1217
        
864
 
        return property(lambda self: real_value[0], setter)
 
1218
        return property(lambda self: getattr(self, attrname), setter)
865
1219
    
866
1220
    
867
1221
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
872
1226
    last_enabled = notifychangeproperty(datetime_to_dbus,
873
1227
                                        "LastEnabled")
874
1228
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
875
 
                                   type_func = lambda checker: checker is not None)
 
1229
                                   type_func = lambda checker:
 
1230
                                       checker is not None)
876
1231
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
877
1232
                                           "LastCheckedOK")
878
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
879
 
                                                 "LastApprovalRequest")
 
1233
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1234
                                               "LastCheckerStatus")
 
1235
    last_approval_request = notifychangeproperty(
 
1236
        datetime_to_dbus, "LastApprovalRequest")
880
1237
    approved_by_default = notifychangeproperty(dbus.Boolean,
881
1238
                                               "ApprovedByDefault")
882
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
883
 
                                          type_func = _timedelta_to_milliseconds)
884
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
885
 
                                             type_func = _timedelta_to_milliseconds)
 
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)
886
1246
    host = notifychangeproperty(dbus.String, "Host")
887
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
888
 
                                   type_func = _timedelta_to_milliseconds)
889
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
890
 
                                            type_func = _timedelta_to_milliseconds)
891
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
892
 
                                    type_func = _timedelta_to_milliseconds)
 
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)
893
1257
    checker_command = notifychangeproperty(dbus.String, "Checker")
894
1258
    
895
1259
    del notifychangeproperty
937
1301
        return r
938
1302
    
939
1303
    def _reset_approved(self):
940
 
        self._approved = None
 
1304
        self.approved = None
941
1305
        return False
942
1306
    
943
1307
    def approve(self, value=True):
944
1308
        self.send_changedstate()
945
 
        self._approved = value
946
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1309
        self.approved = value
 
1310
        gobject.timeout_add(timedelta_to_milliseconds
947
1311
                            (self.approval_duration),
948
1312
                            self._reset_approved)
949
1313
    
950
1314
    
951
1315
    ## D-Bus methods, signals & properties
952
 
    _interface = "se.bsnet.fukt.Mandos.Client"
953
 
 
 
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"}
 
1324
    
954
1325
    ## Signals
955
1326
    
956
1327
    # CheckerCompleted - signal
1055
1426
                           access="readwrite")
1056
1427
    def ApprovalDuration_dbus_property(self, value=None):
1057
1428
        if value is None:       # get
1058
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1429
            return dbus.UInt64(timedelta_to_milliseconds(
1059
1430
                    self.approval_duration))
1060
1431
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1061
1432
    
1075
1446
    def Host_dbus_property(self, value=None):
1076
1447
        if value is None:       # get
1077
1448
            return dbus.String(self.host)
1078
 
        self.host = value
 
1449
        self.host = unicode(value)
1079
1450
    
1080
1451
    # Created - property
1081
1452
    @dbus_service_property(_interface, signature="s", access="read")
1082
1453
    def Created_dbus_property(self):
1083
 
        return dbus.String(datetime_to_dbus(self.created))
 
1454
        return datetime_to_dbus(self.created)
1084
1455
    
1085
1456
    # LastEnabled - property
1086
1457
    @dbus_service_property(_interface, signature="s", access="read")
1107
1478
            return
1108
1479
        return datetime_to_dbus(self.last_checked_ok)
1109
1480
    
 
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
    
1110
1487
    # Expires - property
1111
1488
    @dbus_service_property(_interface, signature="s", access="read")
1112
1489
    def Expires_dbus_property(self):
1124
1501
        if value is None:       # get
1125
1502
            return dbus.UInt64(self.timeout_milliseconds())
1126
1503
        self.timeout = datetime.timedelta(0, 0, 0, value)
1127
 
        if getattr(self, "disable_initiator_tag", None) is None:
1128
 
            return
1129
1504
        # Reschedule timeout
1130
 
        gobject.source_remove(self.disable_initiator_tag)
1131
 
        self.disable_initiator_tag = None
1132
 
        self.expires = None
1133
 
        time_to_die = (self.
1134
 
                       _timedelta_to_milliseconds((self
1135
 
                                                   .last_checked_ok
1136
 
                                                   + self.timeout)
1137
 
                                                  - datetime.datetime
1138
 
                                                  .utcnow()))
1139
 
        if time_to_die <= 0:
1140
 
            # The timeout has passed
1141
 
            self.disable()
1142
 
        else:
1143
 
            self.expires = (datetime.datetime.utcnow()
1144
 
                            + datetime.timedelta(milliseconds = time_to_die))
1145
 
            self.disable_initiator_tag = (gobject.timeout_add
1146
 
                                          (time_to_die, self.disable))
 
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))
1147
1523
    
1148
1524
    # ExtendedTimeout - property
1149
1525
    @dbus_service_property(_interface, signature="t",
1162
1538
        self.interval = datetime.timedelta(0, 0, 0, value)
1163
1539
        if getattr(self, "checker_initiator_tag", None) is None:
1164
1540
            return
1165
 
        # Reschedule checker run
1166
 
        gobject.source_remove(self.checker_initiator_tag)
1167
 
        self.checker_initiator_tag = (gobject.timeout_add
1168
 
                                      (value, self.start_checker))
1169
 
        self.start_checker()    # Start one now, too
 
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
1170
1547
    
1171
1548
    # Checker - property
1172
1549
    @dbus_service_property(_interface, signature="s",
1174
1551
    def Checker_dbus_property(self, value=None):
1175
1552
        if value is None:       # get
1176
1553
            return dbus.String(self.checker_command)
1177
 
        self.checker_command = value
 
1554
        self.checker_command = unicode(value)
1178
1555
    
1179
1556
    # CheckerRunning - property
1180
1557
    @dbus_service_property(_interface, signature="b",
1209
1586
            raise KeyError()
1210
1587
    
1211
1588
    def __getattribute__(self, name):
1212
 
        if(name == '_pipe'):
 
1589
        if name == '_pipe':
1213
1590
            return super(ProxyClient, self).__getattribute__(name)
1214
1591
        self._pipe.send(('getattr', name))
1215
1592
        data = self._pipe.recv()
1222
1599
            return func
1223
1600
    
1224
1601
    def __setattr__(self, name, value):
1225
 
        if(name == '_pipe'):
 
1602
        if name == '_pipe':
1226
1603
            return super(ProxyClient, self).__setattr__(name, value)
1227
1604
        self._pipe.send(('setattr', name, value))
1228
1605
 
 
1606
 
1229
1607
class ClientDBusTransitional(ClientDBus):
1230
 
    __metaclass__ = transitional_dbus_metaclass
 
1608
    __metaclass__ = AlternateDBusNamesMetaclass
 
1609
 
1231
1610
 
1232
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
1233
1612
    """A class to handle client connections.
1313
1692
                                       client.name)
1314
1693
                        if self.server.use_dbus:
1315
1694
                            # Emit D-Bus signal
1316
 
                            client.Rejected("Disabled")                    
 
1695
                            client.Rejected("Disabled")
1317
1696
                        return
1318
1697
                    
1319
 
                    if client._approved or not client.approval_delay:
 
1698
                    if client.approved or not client.approval_delay:
1320
1699
                        #We are approved or approval is disabled
1321
1700
                        break
1322
 
                    elif client._approved is None:
 
1701
                    elif client.approved is None:
1323
1702
                        logger.info("Client %s needs approval",
1324
1703
                                    client.name)
1325
1704
                        if self.server.use_dbus:
1336
1715
                        return
1337
1716
                    
1338
1717
                    #wait until timeout or approved
1339
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1340
1718
                    time = datetime.datetime.now()
1341
1719
                    client.changedstate.acquire()
1342
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1720
                    (client.changedstate.wait
 
1721
                     (float(client.timedelta_to_milliseconds(delay)
 
1722
                            / 1000)))
1343
1723
                    client.changedstate.release()
1344
1724
                    time2 = datetime.datetime.now()
1345
1725
                    if (time2 - time) >= delay:
1369
1749
                    sent_size += sent
1370
1750
                
1371
1751
                logger.info("Sending secret to %s", client.name)
1372
 
                # bump the timeout as if seen
1373
 
                client.checked_ok(client.extended_timeout)
 
1752
                # bump the timeout using extended_timeout
 
1753
                client.bump_timeout(client.extended_timeout)
1374
1754
                if self.server.use_dbus:
1375
1755
                    # Emit D-Bus signal
1376
1756
                    client.GotSecret()
1443
1823
        # Convert the buffer to a Python bytestring
1444
1824
        fpr = ctypes.string_at(buf, buf_len.value)
1445
1825
        # Convert the bytestring to hexadecimal notation
1446
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1826
        hex_fpr = binascii.hexlify(fpr).upper()
1447
1827
        return hex_fpr
1448
1828
 
1449
1829
 
1452
1832
    def sub_process_main(self, request, address):
1453
1833
        try:
1454
1834
            self.finish_request(request, address)
1455
 
        except:
 
1835
        except Exception:
1456
1836
            self.handle_error(request, address)
1457
1837
        self.close_request(request)
1458
 
            
 
1838
    
1459
1839
    def process_request(self, request, address):
1460
1840
        """Start a new process to process the request."""
1461
 
        multiprocessing.Process(target = self.sub_process_main,
1462
 
                                args = (request, address)).start()
 
1841
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1842
                                       args = (request,
 
1843
                                               address))
 
1844
        proc.start()
 
1845
        return proc
1463
1846
 
1464
1847
 
1465
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1471
1854
        """
1472
1855
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1473
1856
        
1474
 
        super(MultiprocessingMixInWithPipe,
1475
 
              self).process_request(request, client_address)
 
1857
        proc = MultiprocessingMixIn.process_request(self, request,
 
1858
                                                    client_address)
1476
1859
        self.child_pipe.close()
1477
 
        self.add_pipe(parent_pipe)
 
1860
        self.add_pipe(parent_pipe, proc)
1478
1861
    
1479
 
    def add_pipe(self, parent_pipe):
 
1862
    def add_pipe(self, parent_pipe, proc):
1480
1863
        """Dummy function; override as necessary"""
1481
1864
        raise NotImplementedError
1482
1865
 
1560
1943
        self.enabled = False
1561
1944
        self.clients = clients
1562
1945
        if self.clients is None:
1563
 
            self.clients = set()
 
1946
            self.clients = {}
1564
1947
        self.use_dbus = use_dbus
1565
1948
        self.gnutls_priority = gnutls_priority
1566
1949
        IPv6_TCPServer.__init__(self, server_address,
1570
1953
    def server_activate(self):
1571
1954
        if self.enabled:
1572
1955
            return socketserver.TCPServer.server_activate(self)
 
1956
    
1573
1957
    def enable(self):
1574
1958
        self.enabled = True
1575
 
    def add_pipe(self, parent_pipe):
 
1959
    
 
1960
    def add_pipe(self, parent_pipe, proc):
1576
1961
        # Call "handle_ipc" for both data and EOF events
1577
1962
        gobject.io_add_watch(parent_pipe.fileno(),
1578
1963
                             gobject.IO_IN | gobject.IO_HUP,
1579
1964
                             functools.partial(self.handle_ipc,
1580
 
                                               parent_pipe = parent_pipe))
1581
 
        
 
1965
                                               parent_pipe =
 
1966
                                               parent_pipe,
 
1967
                                               proc = proc))
 
1968
    
1582
1969
    def handle_ipc(self, source, condition, parent_pipe=None,
1583
 
                   client_object=None):
 
1970
                   proc = None, client_object=None):
1584
1971
        condition_names = {
1585
1972
            gobject.IO_IN: "IN",   # There is data to read.
1586
1973
            gobject.IO_OUT: "OUT", # Data can be written (without
1595
1982
                                       for cond, name in
1596
1983
                                       condition_names.iteritems()
1597
1984
                                       if cond & condition)
1598
 
        # error or the other end of multiprocessing.Pipe has closed
 
1985
        # error, or the other end of multiprocessing.Pipe has closed
1599
1986
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1987
            # Wait for other process to exit
 
1988
            proc.join()
1600
1989
            return False
1601
1990
        
1602
1991
        # Read a request from the child
1607
1996
            fpr = request[1]
1608
1997
            address = request[2]
1609
1998
            
1610
 
            for c in self.clients:
 
1999
            for c in self.clients.itervalues():
1611
2000
                if c.fingerprint == fpr:
1612
2001
                    client = c
1613
2002
                    break
1616
2005
                            "dress: %s", fpr, address)
1617
2006
                if self.use_dbus:
1618
2007
                    # Emit D-Bus signal
1619
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
2008
                    mandos_dbus_service.ClientNotFound(fpr,
 
2009
                                                       address[0])
1620
2010
                parent_pipe.send(False)
1621
2011
                return False
1622
2012
            
1623
2013
            gobject.io_add_watch(parent_pipe.fileno(),
1624
2014
                                 gobject.IO_IN | gobject.IO_HUP,
1625
2015
                                 functools.partial(self.handle_ipc,
1626
 
                                                   parent_pipe = parent_pipe,
1627
 
                                                   client_object = client))
 
2016
                                                   parent_pipe =
 
2017
                                                   parent_pipe,
 
2018
                                                   proc = proc,
 
2019
                                                   client_object =
 
2020
                                                   client))
1628
2021
            parent_pipe.send(True)
1629
 
            # remove the old hook in favor of the new above hook on same fileno
 
2022
            # remove the old hook in favor of the new above hook on
 
2023
            # same fileno
1630
2024
            return False
1631
2025
        if command == 'funcall':
1632
2026
            funcname = request[1]
1633
2027
            args = request[2]
1634
2028
            kwargs = request[3]
1635
2029
            
1636
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
2030
            parent_pipe.send(('data', getattr(client_object,
 
2031
                                              funcname)(*args,
 
2032
                                                         **kwargs)))
1637
2033
        
1638
2034
        if command == 'getattr':
1639
2035
            attrname = request[1]
1640
2036
            if callable(client_object.__getattribute__(attrname)):
1641
2037
                parent_pipe.send(('function',))
1642
2038
            else:
1643
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
2039
                parent_pipe.send(('data', client_object
 
2040
                                  .__getattribute__(attrname)))
1644
2041
        
1645
2042
        if command == 'setattr':
1646
2043
            attrname = request[1]
1682
2079
            elif suffix == "w":
1683
2080
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1684
2081
            else:
1685
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2082
                raise ValueError("Unknown suffix {0!r}"
 
2083
                                 .format(suffix))
1686
2084
        except (ValueError, IndexError) as e:
1687
2085
            raise ValueError(*(e.args))
1688
2086
        timevalue += delta
1689
2087
    return timevalue
1690
2088
 
1691
2089
 
1692
 
def if_nametoindex(interface):
1693
 
    """Call the C function if_nametoindex(), or equivalent
1694
 
    
1695
 
    Note: This function cannot accept a unicode string."""
1696
 
    global if_nametoindex
1697
 
    try:
1698
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1699
 
                          (ctypes.util.find_library("c"))
1700
 
                          .if_nametoindex)
1701
 
    except (OSError, AttributeError):
1702
 
        logger.warning("Doing if_nametoindex the hard way")
1703
 
        def if_nametoindex(interface):
1704
 
            "Get an interface index the hard way, i.e. using fcntl()"
1705
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1706
 
            with contextlib.closing(socket.socket()) as s:
1707
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1708
 
                                    struct.pack(str("16s16x"),
1709
 
                                                interface))
1710
 
            interface_index = struct.unpack(str("I"),
1711
 
                                            ifreq[16:20])[0]
1712
 
            return interface_index
1713
 
    return if_nametoindex(interface)
1714
 
 
1715
 
 
1716
2090
def daemon(nochdir = False, noclose = False):
1717
2091
    """See daemon(3).  Standard BSD Unix function.
1718
2092
    
1726
2100
        sys.exit()
1727
2101
    if not noclose:
1728
2102
        # Close all standard open file descriptors
1729
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2103
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1730
2104
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1731
2105
            raise OSError(errno.ENODEV,
1732
 
                          "%s not a character device"
1733
 
                          % os.path.devnull)
 
2106
                          "{0} not a character device"
 
2107
                          .format(os.devnull))
1734
2108
        os.dup2(null, sys.stdin.fileno())
1735
2109
        os.dup2(null, sys.stdout.fileno())
1736
2110
        os.dup2(null, sys.stderr.fileno())
1745
2119
    
1746
2120
    parser = argparse.ArgumentParser()
1747
2121
    parser.add_argument("-v", "--version", action="version",
1748
 
                        version = "%%(prog)s %s" % version,
 
2122
                        version = "%(prog)s {0}".format(version),
1749
2123
                        help="show version number and exit")
1750
2124
    parser.add_argument("-i", "--interface", metavar="IF",
1751
2125
                        help="Bind to interface IF")
1773
2147
                        " system bus interface")
1774
2148
    parser.add_argument("--no-ipv6", action="store_false",
1775
2149
                        dest="use_ipv6", help="Do not use IPv6")
 
2150
    parser.add_argument("--no-restore", action="store_false",
 
2151
                        dest="restore", help="Do not restore stored"
 
2152
                        " state")
 
2153
    parser.add_argument("--statedir", metavar="DIR",
 
2154
                        help="Directory to save/restore state in")
 
2155
    
1776
2156
    options = parser.parse_args()
1777
2157
    
1778
2158
    if options.check:
1791
2171
                        "use_dbus": "True",
1792
2172
                        "use_ipv6": "True",
1793
2173
                        "debuglevel": "",
 
2174
                        "restore": "True",
 
2175
                        "statedir": "/var/lib/mandos"
1794
2176
                        }
1795
2177
    
1796
2178
    # Parse config file for server-global settings
1813
2195
    # options, if set.
1814
2196
    for option in ("interface", "address", "port", "debug",
1815
2197
                   "priority", "servicename", "configdir",
1816
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2198
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2199
                   "statedir"):
1817
2200
        value = getattr(options, option)
1818
2201
        if value is not None:
1819
2202
            server_settings[option] = value
1831
2214
    debuglevel = server_settings["debuglevel"]
1832
2215
    use_dbus = server_settings["use_dbus"]
1833
2216
    use_ipv6 = server_settings["use_ipv6"]
 
2217
    stored_state_path = os.path.join(server_settings["statedir"],
 
2218
                                     stored_state_file)
 
2219
    
 
2220
    if debug:
 
2221
        initlogger(debug, logging.DEBUG)
 
2222
    else:
 
2223
        if not debuglevel:
 
2224
            initlogger(debug)
 
2225
        else:
 
2226
            level = getattr(logging, debuglevel.upper())
 
2227
            initlogger(debug, level)
1834
2228
    
1835
2229
    if server_settings["servicename"] != "Mandos":
1836
2230
        syslogger.setFormatter(logging.Formatter
1837
 
                               ('Mandos (%s) [%%(process)d]:'
1838
 
                                ' %%(levelname)s: %%(message)s'
1839
 
                                % server_settings["servicename"]))
 
2231
                               ('Mandos ({0}) [%(process)d]:'
 
2232
                                ' %(levelname)s: %(message)s'
 
2233
                                .format(server_settings
 
2234
                                        ["servicename"])))
1840
2235
    
1841
2236
    # Parse config file with clients
1842
 
    client_defaults = { "timeout": "5m",
1843
 
                        "extended_timeout": "15m",
1844
 
                        "interval": "2m",
1845
 
                        "checker": "fping -q -- %%(host)s",
1846
 
                        "host": "",
1847
 
                        "approval_delay": "0s",
1848
 
                        "approval_duration": "1s",
1849
 
                        }
1850
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2237
    client_config = configparser.SafeConfigParser(Client
 
2238
                                                  .client_defaults)
1851
2239
    client_config.read(os.path.join(server_settings["configdir"],
1852
2240
                                    "clients.conf"))
1853
2241
    
1870
2258
        except IOError:
1871
2259
            logger.error("Could not open file %r", pidfilename)
1872
2260
    
1873
 
    try:
1874
 
        uid = pwd.getpwnam("_mandos").pw_uid
1875
 
        gid = pwd.getpwnam("_mandos").pw_gid
1876
 
    except KeyError:
 
2261
    for name in ("_mandos", "mandos", "nobody"):
1877
2262
        try:
1878
 
            uid = pwd.getpwnam("mandos").pw_uid
1879
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2263
            uid = pwd.getpwnam(name).pw_uid
 
2264
            gid = pwd.getpwnam(name).pw_gid
 
2265
            break
1880
2266
        except KeyError:
1881
 
            try:
1882
 
                uid = pwd.getpwnam("nobody").pw_uid
1883
 
                gid = pwd.getpwnam("nobody").pw_gid
1884
 
            except KeyError:
1885
 
                uid = 65534
1886
 
                gid = 65534
 
2267
            continue
 
2268
    else:
 
2269
        uid = 65534
 
2270
        gid = 65534
1887
2271
    try:
1888
2272
        os.setgid(gid)
1889
2273
        os.setuid(uid)
1891
2275
        if error[0] != errno.EPERM:
1892
2276
            raise error
1893
2277
    
1894
 
    if not debug and not debuglevel:
1895
 
        syslogger.setLevel(logging.WARNING)
1896
 
        console.setLevel(logging.WARNING)
1897
 
    if debuglevel:
1898
 
        level = getattr(logging, debuglevel.upper())
1899
 
        syslogger.setLevel(level)
1900
 
        console.setLevel(level)
1901
 
    
1902
2278
    if debug:
1903
2279
        # Enable all possible GnuTLS debugging
1904
2280
        
1914
2290
         .gnutls_global_set_log_function(debug_gnutls))
1915
2291
        
1916
2292
        # Redirect stdin so all checkers get /dev/null
1917
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2293
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1918
2294
        os.dup2(null, sys.stdin.fileno())
1919
2295
        if null > 2:
1920
2296
            os.close(null)
1921
 
    else:
1922
 
        # No console logging
1923
 
        logger.removeHandler(console)
1924
2297
    
1925
2298
    # Need to fork before connecting to D-Bus
1926
2299
    if not debug:
1927
2300
        # Close all input and output, do double fork, etc.
1928
2301
        daemon()
1929
2302
    
 
2303
    gobject.threads_init()
 
2304
    
1930
2305
    global main_loop
1931
2306
    # From the Avahi example code
1932
 
    DBusGMainLoop(set_as_default=True )
 
2307
    DBusGMainLoop(set_as_default=True)
1933
2308
    main_loop = gobject.MainLoop()
1934
2309
    bus = dbus.SystemBus()
1935
2310
    # End of Avahi example code
1936
2311
    if use_dbus:
1937
2312
        try:
1938
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1939
 
                                            bus, do_not_queue=True)
1940
 
            bus_name2 = dbus.service.BusName("se.recompile.Mandos",
1941
 
                                            bus, do_not_queue=True)
 
2313
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2314
                                            bus, do_not_queue=True)
 
2315
            old_bus_name = (dbus.service.BusName
 
2316
                            ("se.bsnet.fukt.Mandos", bus,
 
2317
                             do_not_queue=True))
1942
2318
        except dbus.exceptions.NameExistsException as e:
1943
2319
            logger.error(unicode(e) + ", disabling D-Bus")
1944
2320
            use_dbus = False
1945
2321
            server_settings["use_dbus"] = False
1946
2322
            tcp_server.use_dbus = False
1947
2323
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1948
 
    service = AvahiService(name = server_settings["servicename"],
1949
 
                           servicetype = "_mandos._tcp",
1950
 
                           protocol = protocol, bus = bus)
 
2324
    service = AvahiServiceToSyslog(name =
 
2325
                                   server_settings["servicename"],
 
2326
                                   servicetype = "_mandos._tcp",
 
2327
                                   protocol = protocol, bus = bus)
1951
2328
    if server_settings["interface"]:
1952
2329
        service.interface = (if_nametoindex
1953
2330
                             (str(server_settings["interface"])))
1957
2334
    
1958
2335
    client_class = Client
1959
2336
    if use_dbus:
1960
 
        client_class = functools.partial(ClientDBusTransitional, bus = bus)        
1961
 
    def client_config_items(config, section):
1962
 
        special_settings = {
1963
 
            "approved_by_default":
1964
 
                lambda: config.getboolean(section,
1965
 
                                          "approved_by_default"),
1966
 
            }
1967
 
        for name, value in config.items(section):
 
2337
        client_class = functools.partial(ClientDBusTransitional,
 
2338
                                         bus = bus)
 
2339
    
 
2340
    client_settings = Client.config_parser(client_config)
 
2341
    old_client_settings = {}
 
2342
    clients_data = {}
 
2343
    
 
2344
    # Get client data and settings from last running state.
 
2345
    if server_settings["restore"]:
 
2346
        try:
 
2347
            with open(stored_state_path, "rb") as stored_state:
 
2348
                clients_data, old_client_settings = (pickle.load
 
2349
                                                     (stored_state))
 
2350
            os.remove(stored_state_path)
 
2351
        except IOError as e:
 
2352
            logger.warning("Could not load persistent state: {0}"
 
2353
                           .format(e))
 
2354
            if e.errno != errno.ENOENT:
 
2355
                raise
 
2356
        except EOFError as e:
 
2357
            logger.warning("Could not load persistent state: "
 
2358
                           "EOFError: {0}".format(e))
 
2359
    
 
2360
    with PGPEngine() as pgp:
 
2361
        for client_name, client in clients_data.iteritems():
 
2362
            # Decide which value to use after restoring saved state.
 
2363
            # We have three different values: Old config file,
 
2364
            # new config file, and saved state.
 
2365
            # New config value takes precedence if it differs from old
 
2366
            # config value, otherwise use saved state.
 
2367
            for name, value in client_settings[client_name].items():
 
2368
                try:
 
2369
                    # For each value in new config, check if it
 
2370
                    # differs from the old config value (Except for
 
2371
                    # the "secret" attribute)
 
2372
                    if (name != "secret" and
 
2373
                        value != old_client_settings[client_name]
 
2374
                        [name]):
 
2375
                        client[name] = value
 
2376
                except KeyError:
 
2377
                    pass
 
2378
            
 
2379
            # Clients who has passed its expire date can still be
 
2380
            # enabled if its last checker was successful.  Clients
 
2381
            # whose checker succeeded before we stored its state is
 
2382
            # assumed to have successfully run all checkers during
 
2383
            # downtime.
 
2384
            if client["enabled"]:
 
2385
                if datetime.datetime.utcnow() >= client["expires"]:
 
2386
                    if not client["last_checked_ok"]:
 
2387
                        logger.warning(
 
2388
                            "disabling client {0} - Client never "
 
2389
                            "performed a successful checker"
 
2390
                            .format(client_name))
 
2391
                        client["enabled"] = False
 
2392
                    elif client["last_checker_status"] != 0:
 
2393
                        logger.warning(
 
2394
                            "disabling client {0} - Client "
 
2395
                            "last checker failed with error code {1}"
 
2396
                            .format(client_name,
 
2397
                                    client["last_checker_status"]))
 
2398
                        client["enabled"] = False
 
2399
                    else:
 
2400
                        client["expires"] = (datetime.datetime
 
2401
                                             .utcnow()
 
2402
                                             + client["timeout"])
 
2403
                        logger.debug("Last checker succeeded,"
 
2404
                                     " keeping {0} enabled"
 
2405
                                     .format(client_name))
1968
2406
            try:
1969
 
                yield (name, special_settings[name]())
1970
 
            except KeyError:
1971
 
                yield (name, value)
1972
 
    
1973
 
    tcp_server.clients.update(set(
1974
 
            client_class(name = section,
1975
 
                         config= dict(client_config_items(
1976
 
                        client_config, section)))
1977
 
            for section in client_config.sections()))
 
2407
                client["secret"] = (
 
2408
                    pgp.decrypt(client["encrypted_secret"],
 
2409
                                client_settings[client_name]
 
2410
                                ["secret"]))
 
2411
            except PGPError:
 
2412
                # If decryption fails, we use secret from new settings
 
2413
                logger.debug("Failed to decrypt {0} old secret"
 
2414
                             .format(client_name))
 
2415
                client["secret"] = (
 
2416
                    client_settings[client_name]["secret"])
 
2417
 
 
2418
    
 
2419
    # Add/remove clients based on new changes made to config
 
2420
    for client_name in (set(old_client_settings)
 
2421
                        - set(client_settings)):
 
2422
        del clients_data[client_name]
 
2423
    for client_name in (set(client_settings)
 
2424
                        - set(old_client_settings)):
 
2425
        clients_data[client_name] = client_settings[client_name]
 
2426
 
 
2427
    # Create all client objects
 
2428
    for client_name, client in clients_data.iteritems():
 
2429
        tcp_server.clients[client_name] = client_class(
 
2430
            name = client_name, settings = client)
 
2431
    
1978
2432
    if not tcp_server.clients:
1979
2433
        logger.warning("No clients defined")
1980
2434
        
1991
2445
            # "pidfile" was never created
1992
2446
            pass
1993
2447
        del pidfilename
1994
 
        
1995
2448
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1996
2449
    
1997
2450
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1998
2451
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1999
2452
    
2000
2453
    if use_dbus:
2001
 
        class MandosDBusService(dbus.service.Object):
 
2454
        class MandosDBusService(DBusObjectWithProperties):
2002
2455
            """A D-Bus proxy object"""
2003
2456
            def __init__(self):
2004
2457
                dbus.service.Object.__init__(self, bus, "/")
2005
 
            _interface = "se.bsnet.fukt.Mandos"
 
2458
            _interface = "se.recompile.Mandos"
 
2459
            
 
2460
            @dbus_interface_annotations(_interface)
 
2461
            def _foo(self):
 
2462
                return { "org.freedesktop.DBus.Property"
 
2463
                         ".EmitsChangedSignal":
 
2464
                             "false"}
2006
2465
            
2007
2466
            @dbus.service.signal(_interface, signature="o")
2008
2467
            def ClientAdded(self, objpath):
2023
2482
            def GetAllClients(self):
2024
2483
                "D-Bus method"
2025
2484
                return dbus.Array(c.dbus_object_path
2026
 
                                  for c in tcp_server.clients)
 
2485
                                  for c in
 
2486
                                  tcp_server.clients.itervalues())
2027
2487
            
2028
2488
            @dbus.service.method(_interface,
2029
2489
                                 out_signature="a{oa{sv}}")
2031
2491
                "D-Bus method"
2032
2492
                return dbus.Dictionary(
2033
2493
                    ((c.dbus_object_path, c.GetAll(""))
2034
 
                     for c in tcp_server.clients),
 
2494
                     for c in tcp_server.clients.itervalues()),
2035
2495
                    signature="oa{sv}")
2036
2496
            
2037
2497
            @dbus.service.method(_interface, in_signature="o")
2038
2498
            def RemoveClient(self, object_path):
2039
2499
                "D-Bus method"
2040
 
                for c in tcp_server.clients:
 
2500
                for c in tcp_server.clients.itervalues():
2041
2501
                    if c.dbus_object_path == object_path:
2042
 
                        tcp_server.clients.remove(c)
 
2502
                        del tcp_server.clients[c.name]
2043
2503
                        c.remove_from_connection()
2044
2504
                        # Don't signal anything except ClientRemoved
2045
2505
                        c.disable(quiet=True)
2051
2511
            del _interface
2052
2512
        
2053
2513
        class MandosDBusServiceTransitional(MandosDBusService):
2054
 
            __metaclass__ = transitional_dbus_metaclass
 
2514
            __metaclass__ = AlternateDBusNamesMetaclass
2055
2515
        mandos_dbus_service = MandosDBusServiceTransitional()
2056
2516
    
2057
2517
    def cleanup():
2058
2518
        "Cleanup function; run on exit"
2059
2519
        service.cleanup()
2060
2520
        
 
2521
        multiprocessing.active_children()
 
2522
        if not (tcp_server.clients or client_settings):
 
2523
            return
 
2524
        
 
2525
        # Store client before exiting. Secrets are encrypted with key
 
2526
        # based on what config file has. If config file is
 
2527
        # removed/edited, old secret will thus be unrecovable.
 
2528
        clients = {}
 
2529
        with PGPEngine() as pgp:
 
2530
            for client in tcp_server.clients.itervalues():
 
2531
                key = client_settings[client.name]["secret"]
 
2532
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2533
                                                      key)
 
2534
                client_dict = {}
 
2535
                
 
2536
                # A list of attributes that can not be pickled
 
2537
                # + secret.
 
2538
                exclude = set(("bus", "changedstate", "secret",
 
2539
                               "checker"))
 
2540
                for name, typ in (inspect.getmembers
 
2541
                                  (dbus.service.Object)):
 
2542
                    exclude.add(name)
 
2543
                
 
2544
                client_dict["encrypted_secret"] = (client
 
2545
                                                   .encrypted_secret)
 
2546
                for attr in client.client_structure:
 
2547
                    if attr not in exclude:
 
2548
                        client_dict[attr] = getattr(client, attr)
 
2549
                
 
2550
                clients[client.name] = client_dict
 
2551
                del client_settings[client.name]["secret"]
 
2552
        
 
2553
        try:
 
2554
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2555
                                                prefix="clients-",
 
2556
                                                dir=os.path.dirname
 
2557
                                                (stored_state_path))
 
2558
            with os.fdopen(tempfd, "wb") as stored_state:
 
2559
                pickle.dump((clients, client_settings), stored_state)
 
2560
            os.rename(tempname, stored_state_path)
 
2561
        except (IOError, OSError) as e:
 
2562
            logger.warning("Could not save persistent state: {0}"
 
2563
                           .format(e))
 
2564
            if not debug:
 
2565
                try:
 
2566
                    os.remove(tempname)
 
2567
                except NameError:
 
2568
                    pass
 
2569
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2570
                                   errno.EEXIST)):
 
2571
                raise e
 
2572
        
 
2573
        # Delete all clients, and settings from config
2061
2574
        while tcp_server.clients:
2062
 
            client = tcp_server.clients.pop()
 
2575
            name, client = tcp_server.clients.popitem()
2063
2576
            if use_dbus:
2064
2577
                client.remove_from_connection()
2065
 
            client.disable_hook = None
2066
2578
            # Don't signal anything except ClientRemoved
2067
2579
            client.disable(quiet=True)
2068
2580
            if use_dbus:
2069
2581
                # Emit D-Bus signal
2070
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2582
                mandos_dbus_service.ClientRemoved(client
 
2583
                                                  .dbus_object_path,
2071
2584
                                                  client.name)
 
2585
        client_settings.clear()
2072
2586
    
2073
2587
    atexit.register(cleanup)
2074
2588
    
2075
 
    for client in tcp_server.clients:
 
2589
    for client in tcp_server.clients.itervalues():
2076
2590
        if use_dbus:
2077
2591
            # Emit D-Bus signal
2078
2592
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2079
 
        client.enable()
 
2593
        # Need to initiate checking of clients
 
2594
        if client.enabled:
 
2595
            client.init_checker()
2080
2596
    
2081
2597
    tcp_server.enable()
2082
2598
    tcp_server.server_activate()
2085
2601
    service.port = tcp_server.socket.getsockname()[1]
2086
2602
    if use_ipv6:
2087
2603
        logger.info("Now listening on address %r, port %d,"
2088
 
                    " flowinfo %d, scope_id %d"
2089
 
                    % tcp_server.socket.getsockname())
 
2604
                    " flowinfo %d, scope_id %d",
 
2605
                    *tcp_server.socket.getsockname())
2090
2606
    else:                       # IPv4
2091
 
        logger.info("Now listening on address %r, port %d"
2092
 
                    % tcp_server.socket.getsockname())
 
2607
        logger.info("Now listening on address %r, port %d",
 
2608
                    *tcp_server.socket.getsockname())
2093
2609
    
2094
2610
    #service.interface = tcp_server.socket.getsockname()[3]
2095
2611
    
2098
2614
        try:
2099
2615
            service.activate()
2100
2616
        except dbus.exceptions.DBusException as error:
2101
 
            logger.critical("DBusException: %s", error)
 
2617
            logger.critical("D-Bus Exception", exc_info=error)
2102
2618
            cleanup()
2103
2619
            sys.exit(1)
2104
2620
        # End of Avahi example code
2111
2627
        logger.debug("Starting main loop")
2112
2628
        main_loop.run()
2113
2629
    except AvahiError as error:
2114
 
        logger.critical("AvahiError: %s", error)
 
2630
        logger.critical("Avahi Error", exc_info=error)
2115
2631
        cleanup()
2116
2632
        sys.exit(1)
2117
2633
    except KeyboardInterrupt:
2122
2638
    # Must run before the D-Bus bus name gets deregistered
2123
2639
    cleanup()
2124
2640
 
2125
 
 
2126
2641
if __name__ == '__main__':
2127
2642
    main()