/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
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,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
 
68
import itertools
65
69
 
66
70
import dbus
67
71
import dbus.service
72
76
import ctypes.util
73
77
import xml.dom.minidom
74
78
import inspect
 
79
import GnuPGInterface
75
80
 
76
81
try:
77
82
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
86
    except ImportError:
82
87
        SO_BINDTODEVICE = None
83
88
 
84
 
 
85
 
version = "1.3.1"
86
 
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
89
version = "1.5.3"
 
90
stored_state_file = "clients.pickle"
 
91
 
 
92
logger = logging.getLogger()
89
93
syslogger = (logging.handlers.SysLogHandler
90
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
95
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
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
 
102
211
 
103
212
class AvahiError(Exception):
104
213
    def __init__(self, value, *args, **kwargs):
134
243
    server: D-Bus Server
135
244
    bus: dbus.SystemBus()
136
245
    """
 
246
    
137
247
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
248
                 servicetype = None, port = None, TXT = None,
139
249
                 domain = "", host = "", max_renames = 32768,
152
262
        self.server = None
153
263
        self.bus = bus
154
264
        self.entry_group_state_changed_match = None
 
265
    
155
266
    def rename(self):
156
267
        """Derived from the Avahi example code"""
157
268
        if self.rename_count >= self.max_renames:
159
270
                            " after %i retries, exiting.",
160
271
                            self.rename_count)
161
272
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
273
        self.name = unicode(self.server
 
274
                            .GetAlternativeServiceName(self.name))
163
275
        logger.info("Changing Zeroconf service name to %r ...",
164
276
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
277
        self.remove()
170
278
        try:
171
279
            self.add()
172
280
        except dbus.exceptions.DBusException as error:
173
 
            logger.critical("DBusException: %s", error)
 
281
            logger.critical("D-Bus Exception", exc_info=error)
174
282
            self.cleanup()
175
283
            os._exit(1)
176
284
        self.rename_count += 1
 
285
    
177
286
    def remove(self):
178
287
        """Derived from the Avahi example code"""
179
288
        if self.entry_group_state_changed_match is not None:
181
290
            self.entry_group_state_changed_match = None
182
291
        if self.group is not None:
183
292
            self.group.Reset()
 
293
    
184
294
    def add(self):
185
295
        """Derived from the Avahi example code"""
186
296
        self.remove()
191
301
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
302
        self.entry_group_state_changed_match = (
193
303
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
 
304
                'StateChanged', self.entry_group_state_changed))
195
305
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
196
306
                     self.name, self.type)
197
307
        self.group.AddService(
203
313
            dbus.UInt16(self.port),
204
314
            avahi.string_array_to_txt_array(self.TXT))
205
315
        self.group.Commit()
 
316
    
206
317
    def entry_group_state_changed(self, state, error):
207
318
        """Derived from the Avahi example code"""
208
319
        logger.debug("Avahi entry group state change: %i", state)
215
326
        elif state == avahi.ENTRY_GROUP_FAILURE:
216
327
            logger.critical("Avahi: Error in group state changed %s",
217
328
                            unicode(error))
218
 
            raise AvahiGroupError("State changed: %s"
219
 
                                  % unicode(error))
 
329
            raise AvahiGroupError("State changed: {0!s}"
 
330
                                  .format(error))
 
331
    
220
332
    def cleanup(self):
221
333
        """Derived from the Avahi example code"""
222
334
        if self.group is not None:
223
335
            try:
224
336
                self.group.Free()
225
337
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
 
338
                    dbus.exceptions.DBusException):
227
339
                pass
228
340
            self.group = None
229
341
        self.remove()
 
342
    
230
343
    def server_state_changed(self, state, error=None):
231
344
        """Derived from the Avahi example code"""
232
345
        logger.debug("Avahi server state change: %i", state)
251
364
                logger.debug("Unknown state: %r", state)
252
365
            else:
253
366
                logger.debug("Unknown state: %r: %r", state, error)
 
367
    
254
368
    def activate(self):
255
369
        """Derived from the Avahi example code"""
256
370
        if self.server is None:
263
377
                                 self.server_state_changed)
264
378
        self.server_state_changed(self.server.GetState())
265
379
 
 
380
class AvahiServiceToSyslog(AvahiService):
 
381
    def rename(self):
 
382
        """Add the new name to the syslog messages"""
 
383
        ret = AvahiService.rename(self)
 
384
        syslogger.setFormatter(logging.Formatter
 
385
                               ('Mandos ({0}) [%(process)d]:'
 
386
                                ' %(levelname)s: %(message)s'
 
387
                                .format(self.name)))
 
388
        return ret
 
389
 
 
390
def timedelta_to_milliseconds(td):
 
391
    "Convert a datetime.timedelta() to milliseconds"
 
392
    return ((td.days * 24 * 60 * 60 * 1000)
 
393
            + (td.seconds * 1000)
 
394
            + (td.microseconds // 1000))
266
395
 
267
396
class Client(object):
268
397
    """A representation of a client host served by this server.
269
398
    
270
399
    Attributes:
271
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
400
    approved:   bool(); 'None' if not yet approved/disapproved
272
401
    approval_delay: datetime.timedelta(); Time to wait for approval
273
402
    approval_duration: datetime.timedelta(); Duration of one approval
274
403
    checker:    subprocess.Popen(); a running checker process used
281
410
                     instance %(name)s can be used in the command.
282
411
    checker_initiator_tag: a gobject event source tag, or None
283
412
    created:    datetime.datetime(); (UTC) object creation
 
413
    client_structure: Object describing what attributes a client has
 
414
                      and is used for storing the client at exit
284
415
    current_checker_command: string; current running checker_command
285
 
    disable_hook:  If set, called by disable() as disable_hook(self)
286
416
    disable_initiator_tag: a gobject event source tag, or None
287
417
    enabled:    bool()
288
418
    fingerprint: string (40 or 32 hexadecimal digits); used to
291
421
    interval:   datetime.timedelta(); How often to start a new checker
292
422
    last_approval_request: datetime.datetime(); (UTC) or None
293
423
    last_checked_ok: datetime.datetime(); (UTC) or None
294
 
    last_enabled: datetime.datetime(); (UTC)
 
424
    last_checker_status: integer between 0 and 255 reflecting exit
 
425
                         status of last checker. -1 reflects crashed
 
426
                         checker, -2 means no checker completed yet.
 
427
    last_enabled: datetime.datetime(); (UTC) or None
295
428
    name:       string; from the config file, used in log messages and
296
429
                        D-Bus identifiers
297
430
    secret:     bytestring; sent verbatim (over TLS) to client
298
431
    timeout:    datetime.timedelta(); How long from last_checked_ok
299
432
                                      until this client is disabled
300
 
    extended_timeout:   extra long timeout when password has been sent
 
433
    extended_timeout:   extra long timeout when secret has been sent
301
434
    runtime_expansions: Allowed attributes for runtime expansion.
302
435
    expires:    datetime.datetime(); time (UTC) when a client will be
303
436
                disabled, or None
307
440
                          "created", "enabled", "fingerprint",
308
441
                          "host", "interval", "last_checked_ok",
309
442
                          "last_enabled", "name", "timeout")
310
 
    
311
 
    @staticmethod
312
 
    def _timedelta_to_milliseconds(td):
313
 
        "Convert a datetime.timedelta() to milliseconds"
314
 
        return ((td.days * 24 * 60 * 60 * 1000)
315
 
                + (td.seconds * 1000)
316
 
                + (td.microseconds // 1000))
 
443
    client_defaults = { "timeout": "5m",
 
444
                        "extended_timeout": "15m",
 
445
                        "interval": "2m",
 
446
                        "checker": "fping -q -- %%(host)s",
 
447
                        "host": "",
 
448
                        "approval_delay": "0s",
 
449
                        "approval_duration": "1s",
 
450
                        "approved_by_default": "True",
 
451
                        "enabled": "True",
 
452
                        }
317
453
    
318
454
    def timeout_milliseconds(self):
319
455
        "Return the 'timeout' attribute in milliseconds"
320
 
        return self._timedelta_to_milliseconds(self.timeout)
321
 
 
 
456
        return timedelta_to_milliseconds(self.timeout)
 
457
    
322
458
    def extended_timeout_milliseconds(self):
323
459
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return self._timedelta_to_milliseconds(self.extended_timeout)    
 
460
        return timedelta_to_milliseconds(self.extended_timeout)
325
461
    
326
462
    def interval_milliseconds(self):
327
463
        "Return the 'interval' attribute in milliseconds"
328
 
        return self._timedelta_to_milliseconds(self.interval)
329
 
 
 
464
        return timedelta_to_milliseconds(self.interval)
 
465
    
330
466
    def approval_delay_milliseconds(self):
331
 
        return self._timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
334
 
        """Note: the 'checker' key in 'config' sets the
335
 
        'checker_command' attribute and *not* the 'checker'
336
 
        attribute."""
 
467
        return timedelta_to_milliseconds(self.approval_delay)
 
468
    
 
469
    @staticmethod
 
470
    def config_parser(config):
 
471
        """Construct a new dict of client settings of this form:
 
472
        { client_name: {setting_name: value, ...}, ...}
 
473
        with exceptions for any special settings as defined above.
 
474
        NOTE: Must be a pure function. Must return the same result
 
475
        value given the same arguments.
 
476
        """
 
477
        settings = {}
 
478
        for client_name in config.sections():
 
479
            section = dict(config.items(client_name))
 
480
            client = settings[client_name] = {}
 
481
            
 
482
            client["host"] = section["host"]
 
483
            # Reformat values from string types to Python types
 
484
            client["approved_by_default"] = config.getboolean(
 
485
                client_name, "approved_by_default")
 
486
            client["enabled"] = config.getboolean(client_name,
 
487
                                                  "enabled")
 
488
            
 
489
            client["fingerprint"] = (section["fingerprint"].upper()
 
490
                                     .replace(" ", ""))
 
491
            if "secret" in section:
 
492
                client["secret"] = section["secret"].decode("base64")
 
493
            elif "secfile" in section:
 
494
                with open(os.path.expanduser(os.path.expandvars
 
495
                                             (section["secfile"])),
 
496
                          "rb") as secfile:
 
497
                    client["secret"] = secfile.read()
 
498
            else:
 
499
                raise TypeError("No secret or secfile for section {0}"
 
500
                                .format(section))
 
501
            client["timeout"] = string_to_delta(section["timeout"])
 
502
            client["extended_timeout"] = string_to_delta(
 
503
                section["extended_timeout"])
 
504
            client["interval"] = string_to_delta(section["interval"])
 
505
            client["approval_delay"] = string_to_delta(
 
506
                section["approval_delay"])
 
507
            client["approval_duration"] = string_to_delta(
 
508
                section["approval_duration"])
 
509
            client["checker_command"] = section["checker"]
 
510
            client["last_approval_request"] = None
 
511
            client["last_checked_ok"] = None
 
512
            client["last_checker_status"] = -2
 
513
        
 
514
        return settings
 
515
    
 
516
    def __init__(self, settings, name = None):
337
517
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
518
        # adding all client settings
 
519
        for setting, value in settings.iteritems():
 
520
            setattr(self, setting, value)
 
521
        
 
522
        if self.enabled:
 
523
            if not hasattr(self, "last_enabled"):
 
524
                self.last_enabled = datetime.datetime.utcnow()
 
525
            if not hasattr(self, "expires"):
 
526
                self.expires = (datetime.datetime.utcnow()
 
527
                                + self.timeout)
 
528
        else:
 
529
            self.last_enabled = None
 
530
            self.expires = None
 
531
        
340
532
        logger.debug("Creating client %r", self.name)
341
533
        # Uppercase and remove spaces from fingerprint for later
342
534
        # comparison purposes with return value from the fingerprint()
343
535
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
536
        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
 
537
        self.created = settings.get("created",
 
538
                                    datetime.datetime.utcnow())
 
539
        
 
540
        # attributes specific for this server instance
367
541
        self.checker = None
368
542
        self.checker_initiator_tag = None
369
543
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
544
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
545
        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)
 
546
        self.approved = None
378
547
        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())
 
548
        self.changedstate = (multiprocessing_manager
 
549
                             .Condition(multiprocessing_manager
 
550
                                        .Lock()))
 
551
        self.client_structure = [attr for attr in
 
552
                                 self.__dict__.iterkeys()
 
553
                                 if not attr.startswith("_")]
 
554
        self.client_structure.append("client_structure")
 
555
        
 
556
        for name, t in inspect.getmembers(type(self),
 
557
                                          lambda obj:
 
558
                                              isinstance(obj,
 
559
                                                         property)):
 
560
            if not name.startswith("_"):
 
561
                self.client_structure.append(name)
384
562
    
 
563
    # Send notice to process children that client state has changed
385
564
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
565
        with self.changedstate:
 
566
            self.changedstate.notify_all()
 
567
    
390
568
    def enable(self):
391
569
        """Start this client's checker and timeout hooks"""
392
570
        if getattr(self, "enabled", False):
393
571
            # Already enabled
394
572
            return
395
573
        self.send_changedstate()
 
574
        self.expires = datetime.datetime.utcnow() + self.timeout
 
575
        self.enabled = True
396
576
        self.last_enabled = datetime.datetime.utcnow()
397
 
        # Schedule a new checker to be started an 'interval' from now,
398
 
        # and every interval from then on.
399
 
        self.checker_initiator_tag = (gobject.timeout_add
400
 
                                      (self.interval_milliseconds(),
401
 
                                       self.start_checker))
402
 
        # Schedule a disable() when 'timeout' has passed
403
 
        self.expires = datetime.datetime.utcnow() + self.timeout
404
 
        self.disable_initiator_tag = (gobject.timeout_add
405
 
                                   (self.timeout_milliseconds(),
406
 
                                    self.disable))
407
 
        self.enabled = True
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
577
        self.init_checker()
410
578
    
411
579
    def disable(self, quiet=True):
412
580
        """Disable this client."""
424
592
            gobject.source_remove(self.checker_initiator_tag)
425
593
            self.checker_initiator_tag = None
426
594
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
595
        self.enabled = False
430
596
        # Do not run this again if called by a gobject.timeout_add
431
597
        return False
432
598
    
433
599
    def __del__(self):
434
 
        self.disable_hook = None
435
600
        self.disable()
436
601
    
 
602
    def init_checker(self):
 
603
        # Schedule a new checker to be started an 'interval' from now,
 
604
        # and every interval from then on.
 
605
        self.checker_initiator_tag = (gobject.timeout_add
 
606
                                      (self.interval_milliseconds(),
 
607
                                       self.start_checker))
 
608
        # Schedule a disable() when 'timeout' has passed
 
609
        self.disable_initiator_tag = (gobject.timeout_add
 
610
                                   (self.timeout_milliseconds(),
 
611
                                    self.disable))
 
612
        # Also start a new checker *right now*.
 
613
        self.start_checker()
 
614
    
437
615
    def checker_callback(self, pid, condition, command):
438
616
        """The checker has completed, so take appropriate actions."""
439
617
        self.checker_callback_tag = None
440
618
        self.checker = None
441
619
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
620
            self.last_checker_status = os.WEXITSTATUS(condition)
 
621
            if self.last_checker_status == 0:
444
622
                logger.info("Checker for %(name)s succeeded",
445
623
                            vars(self))
446
624
                self.checked_ok()
448
626
                logger.info("Checker for %(name)s failed",
449
627
                            vars(self))
450
628
        else:
 
629
            self.last_checker_status = -1
451
630
            logger.warning("Checker for %(name)s crashed?",
452
631
                           vars(self))
453
632
    
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
 
        """
 
633
    def checked_ok(self):
 
634
        """Assert that the client has been seen, alive and well."""
 
635
        self.last_checked_ok = datetime.datetime.utcnow()
 
636
        self.last_checker_status = 0
 
637
        self.bump_timeout()
 
638
    
 
639
    def bump_timeout(self, timeout=None):
 
640
        """Bump up the timeout for this client."""
460
641
        if timeout is None:
461
642
            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
 
                                      (self._timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
643
        if self.disable_initiator_tag is not None:
 
644
            gobject.source_remove(self.disable_initiator_tag)
 
645
        if getattr(self, "enabled", False):
 
646
            self.disable_initiator_tag = (gobject.timeout_add
 
647
                                          (timedelta_to_milliseconds
 
648
                                           (timeout), self.disable))
 
649
            self.expires = datetime.datetime.utcnow() + timeout
468
650
    
469
651
    def need_approval(self):
470
652
        self.last_approval_request = datetime.datetime.utcnow()
510
692
                                       'replace')))
511
693
                    for attr in
512
694
                    self.runtime_expansions)
513
 
 
 
695
                
514
696
                try:
515
697
                    command = self.checker_command % escaped_attrs
516
698
                except TypeError as error:
517
 
                    logger.error('Could not format string "%s":'
518
 
                                 ' %s', self.checker_command, error)
 
699
                    logger.error('Could not format string "%s"',
 
700
                                 self.checker_command, exc_info=error)
519
701
                    return True # Try again later
520
702
            self.current_checker_command = command
521
703
            try:
539
721
                    gobject.source_remove(self.checker_callback_tag)
540
722
                    self.checker_callback(pid, status, command)
541
723
            except OSError as error:
542
 
                logger.error("Failed to start subprocess: %s",
543
 
                             error)
 
724
                logger.error("Failed to start subprocess",
 
725
                             exc_info=error)
544
726
        # Re-run this periodically if run by gobject.timeout_add
545
727
        return True
546
728
    
553
735
            return
554
736
        logger.debug("Stopping checker for %(name)s", vars(self))
555
737
        try:
556
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
738
            self.checker.terminate()
557
739
            #time.sleep(0.5)
558
740
            #if self.checker.poll() is None:
559
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
741
            #    self.checker.kill()
560
742
        except OSError as error:
561
743
            if error.errno != errno.ESRCH: # No such process
562
744
                raise
563
745
        self.checker = None
564
746
 
 
747
 
565
748
def dbus_service_property(dbus_interface, signature="v",
566
749
                          access="readwrite", byte_arrays=False):
567
750
    """Decorators for marking methods of a DBusObjectWithProperties to
578
761
    # "Set" method, so we fail early here:
579
762
    if byte_arrays and signature != "ay":
580
763
        raise ValueError("Byte arrays not supported for non-'ay'"
581
 
                         " signature %r" % signature)
 
764
                         " signature {0!r}".format(signature))
582
765
    def decorator(func):
583
766
        func._dbus_is_property = True
584
767
        func._dbus_interface = dbus_interface
592
775
    return decorator
593
776
 
594
777
 
 
778
def dbus_interface_annotations(dbus_interface):
 
779
    """Decorator for marking functions returning interface annotations
 
780
    
 
781
    Usage:
 
782
    
 
783
    @dbus_interface_annotations("org.example.Interface")
 
784
    def _foo(self):  # Function name does not matter
 
785
        return {"org.freedesktop.DBus.Deprecated": "true",
 
786
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
787
                    "false"}
 
788
    """
 
789
    def decorator(func):
 
790
        func._dbus_is_interface = True
 
791
        func._dbus_interface = dbus_interface
 
792
        func._dbus_name = dbus_interface
 
793
        return func
 
794
    return decorator
 
795
 
 
796
 
 
797
def dbus_annotations(annotations):
 
798
    """Decorator to annotate D-Bus methods, signals or properties
 
799
    Usage:
 
800
    
 
801
    @dbus_service_property("org.example.Interface", signature="b",
 
802
                           access="r")
 
803
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
804
                        "org.freedesktop.DBus.Property."
 
805
                        "EmitsChangedSignal": "false"})
 
806
    def Property_dbus_property(self):
 
807
        return dbus.Boolean(False)
 
808
    """
 
809
    def decorator(func):
 
810
        func._dbus_annotations = annotations
 
811
        return func
 
812
    return decorator
 
813
 
 
814
 
595
815
class DBusPropertyException(dbus.exceptions.DBusException):
596
816
    """A base class for D-Bus property-related exceptions
597
817
    """
613
833
 
614
834
class DBusObjectWithProperties(dbus.service.Object):
615
835
    """A D-Bus object with properties.
616
 
 
 
836
    
617
837
    Classes inheriting from this can use the dbus_service_property
618
838
    decorator to expose methods as D-Bus properties.  It exposes the
619
839
    standard Get(), Set(), and GetAll() methods on the D-Bus.
620
840
    """
621
841
    
622
842
    @staticmethod
623
 
    def _is_dbus_property(obj):
624
 
        return getattr(obj, "_dbus_is_property", False)
 
843
    def _is_dbus_thing(thing):
 
844
        """Returns a function testing if an attribute is a D-Bus thing
 
845
        
 
846
        If called like _is_dbus_thing("method") it returns a function
 
847
        suitable for use as predicate to inspect.getmembers().
 
848
        """
 
849
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
850
                                   False)
625
851
    
626
 
    def _get_all_dbus_properties(self):
 
852
    def _get_all_dbus_things(self, thing):
627
853
        """Returns a generator of (name, attribute) pairs
628
854
        """
629
 
        return ((prop._dbus_name, prop)
630
 
                for name, prop in
631
 
                inspect.getmembers(self, self._is_dbus_property))
 
855
        return ((getattr(athing.__get__(self), "_dbus_name",
 
856
                         name),
 
857
                 athing.__get__(self))
 
858
                for cls in self.__class__.__mro__
 
859
                for name, athing in
 
860
                inspect.getmembers(cls,
 
861
                                   self._is_dbus_thing(thing)))
632
862
    
633
863
    def _get_dbus_property(self, interface_name, property_name):
634
864
        """Returns a bound method if one exists which is a D-Bus
635
865
        property with the specified name and interface.
636
866
        """
637
 
        for name in (property_name,
638
 
                     property_name + "_dbus_property"):
639
 
            prop = getattr(self, name, None)
640
 
            if (prop is None
641
 
                or not self._is_dbus_property(prop)
642
 
                or prop._dbus_name != property_name
643
 
                or (interface_name and prop._dbus_interface
644
 
                    and interface_name != prop._dbus_interface)):
645
 
                continue
646
 
            return prop
 
867
        for cls in  self.__class__.__mro__:
 
868
            for name, value in (inspect.getmembers
 
869
                                (cls,
 
870
                                 self._is_dbus_thing("property"))):
 
871
                if (value._dbus_name == property_name
 
872
                    and value._dbus_interface == interface_name):
 
873
                    return value.__get__(self)
 
874
        
647
875
        # No such property
648
876
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
877
                                   + interface_name + "."
674
902
            # signatures other than "ay".
675
903
            if prop._dbus_signature != "ay":
676
904
                raise ValueError
677
 
            value = dbus.ByteArray(''.join(unichr(byte)
678
 
                                           for byte in value))
 
905
            value = dbus.ByteArray(b''.join(chr(byte)
 
906
                                            for byte in value))
679
907
        prop(value)
680
908
    
681
909
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
683
911
    def GetAll(self, interface_name):
684
912
        """Standard D-Bus property GetAll() method, see D-Bus
685
913
        standard.
686
 
 
 
914
        
687
915
        Note: Will not include properties with access="write".
688
916
        """
689
 
        all = {}
690
 
        for name, prop in self._get_all_dbus_properties():
 
917
        properties = {}
 
918
        for name, prop in self._get_all_dbus_things("property"):
691
919
            if (interface_name
692
920
                and interface_name != prop._dbus_interface):
693
921
                # Interface non-empty but did not match
697
925
                continue
698
926
            value = prop()
699
927
            if not hasattr(value, "variant_level"):
700
 
                all[name] = value
 
928
                properties[name] = value
701
929
                continue
702
 
            all[name] = type(value)(value, variant_level=
703
 
                                    value.variant_level+1)
704
 
        return dbus.Dictionary(all, signature="sv")
 
930
            properties[name] = type(value)(value, variant_level=
 
931
                                           value.variant_level+1)
 
932
        return dbus.Dictionary(properties, signature="sv")
705
933
    
706
934
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
935
                         out_signature="s",
708
936
                         path_keyword='object_path',
709
937
                         connection_keyword='connection')
710
938
    def Introspect(self, object_path, connection):
711
 
        """Standard D-Bus method, overloaded to insert property tags.
 
939
        """Overloading of standard D-Bus method.
 
940
        
 
941
        Inserts property tags and interface annotation tags.
712
942
        """
713
943
        xmlstring = dbus.service.Object.Introspect(self, object_path,
714
944
                                                   connection)
721
951
                e.setAttribute("access", prop._dbus_access)
722
952
                return e
723
953
            for if_tag in document.getElementsByTagName("interface"):
 
954
                # Add property tags
724
955
                for tag in (make_tag(document, name, prop)
725
956
                            for name, prop
726
 
                            in self._get_all_dbus_properties()
 
957
                            in self._get_all_dbus_things("property")
727
958
                            if prop._dbus_interface
728
959
                            == if_tag.getAttribute("name")):
729
960
                    if_tag.appendChild(tag)
 
961
                # Add annotation tags
 
962
                for typ in ("method", "signal", "property"):
 
963
                    for tag in if_tag.getElementsByTagName(typ):
 
964
                        annots = dict()
 
965
                        for name, prop in (self.
 
966
                                           _get_all_dbus_things(typ)):
 
967
                            if (name == tag.getAttribute("name")
 
968
                                and prop._dbus_interface
 
969
                                == if_tag.getAttribute("name")):
 
970
                                annots.update(getattr
 
971
                                              (prop,
 
972
                                               "_dbus_annotations",
 
973
                                               {}))
 
974
                        for name, value in annots.iteritems():
 
975
                            ann_tag = document.createElement(
 
976
                                "annotation")
 
977
                            ann_tag.setAttribute("name", name)
 
978
                            ann_tag.setAttribute("value", value)
 
979
                            tag.appendChild(ann_tag)
 
980
                # Add interface annotation tags
 
981
                for annotation, value in dict(
 
982
                    itertools.chain(
 
983
                        *(annotations().iteritems()
 
984
                          for name, annotations in
 
985
                          self._get_all_dbus_things("interface")
 
986
                          if name == if_tag.getAttribute("name")
 
987
                          ))).iteritems():
 
988
                    ann_tag = document.createElement("annotation")
 
989
                    ann_tag.setAttribute("name", annotation)
 
990
                    ann_tag.setAttribute("value", value)
 
991
                    if_tag.appendChild(ann_tag)
730
992
                # Add the names to the return values for the
731
993
                # "org.freedesktop.DBus.Properties" methods
732
994
                if (if_tag.getAttribute("name")
747
1009
        except (AttributeError, xml.dom.DOMException,
748
1010
                xml.parsers.expat.ExpatError) as error:
749
1011
            logger.error("Failed to override Introspection method",
750
 
                         error)
 
1012
                         exc_info=error)
751
1013
        return xmlstring
752
1014
 
753
1015
 
 
1016
def datetime_to_dbus (dt, variant_level=0):
 
1017
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1018
    if dt is None:
 
1019
        return dbus.String("", variant_level = variant_level)
 
1020
    return dbus.String(dt.isoformat(),
 
1021
                       variant_level=variant_level)
 
1022
 
 
1023
 
 
1024
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1025
    """A class decorator; applied to a subclass of
 
1026
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1027
    interface names according to the "alt_interface_names" mapping.
 
1028
    Usage:
 
1029
    
 
1030
    @alternate_dbus_names({"org.example.Interface":
 
1031
                               "net.example.AlternateInterface"})
 
1032
    class SampleDBusObject(dbus.service.Object):
 
1033
        @dbus.service.method("org.example.Interface")
 
1034
        def SampleDBusMethod():
 
1035
            pass
 
1036
    
 
1037
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1038
    reachable via two interfaces: "org.example.Interface" and
 
1039
    "net.example.AlternateInterface", the latter of which will have
 
1040
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1041
    "true", unless "deprecate" is passed with a False value.
 
1042
    
 
1043
    This works for methods and signals, and also for D-Bus properties
 
1044
    (from DBusObjectWithProperties) and interfaces (from the
 
1045
    dbus_interface_annotations decorator).
 
1046
    """
 
1047
    def wrapper(cls):
 
1048
        for orig_interface_name, alt_interface_name in (
 
1049
            alt_interface_names.iteritems()):
 
1050
            attr = {}
 
1051
            interface_names = set()
 
1052
            # Go though all attributes of the class
 
1053
            for attrname, attribute in inspect.getmembers(cls):
 
1054
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1055
                # with the wrong interface name
 
1056
                if (not hasattr(attribute, "_dbus_interface")
 
1057
                    or not attribute._dbus_interface
 
1058
                    .startswith(orig_interface_name)):
 
1059
                    continue
 
1060
                # Create an alternate D-Bus interface name based on
 
1061
                # the current name
 
1062
                alt_interface = (attribute._dbus_interface
 
1063
                                 .replace(orig_interface_name,
 
1064
                                          alt_interface_name))
 
1065
                interface_names.add(alt_interface)
 
1066
                # Is this a D-Bus signal?
 
1067
                if getattr(attribute, "_dbus_is_signal", False):
 
1068
                    # Extract the original non-method function by
 
1069
                    # black magic
 
1070
                    nonmethod_func = (dict(
 
1071
                            zip(attribute.func_code.co_freevars,
 
1072
                                attribute.__closure__))["func"]
 
1073
                                      .cell_contents)
 
1074
                    # Create a new, but exactly alike, function
 
1075
                    # object, and decorate it to be a new D-Bus signal
 
1076
                    # with the alternate D-Bus interface name
 
1077
                    new_function = (dbus.service.signal
 
1078
                                    (alt_interface,
 
1079
                                     attribute._dbus_signature)
 
1080
                                    (types.FunctionType(
 
1081
                                nonmethod_func.func_code,
 
1082
                                nonmethod_func.func_globals,
 
1083
                                nonmethod_func.func_name,
 
1084
                                nonmethod_func.func_defaults,
 
1085
                                nonmethod_func.func_closure)))
 
1086
                    # Copy annotations, if any
 
1087
                    try:
 
1088
                        new_function._dbus_annotations = (
 
1089
                            dict(attribute._dbus_annotations))
 
1090
                    except AttributeError:
 
1091
                        pass
 
1092
                    # Define a creator of a function to call both the
 
1093
                    # original and alternate functions, so both the
 
1094
                    # original and alternate signals gets sent when
 
1095
                    # the function is called
 
1096
                    def fixscope(func1, func2):
 
1097
                        """This function is a scope container to pass
 
1098
                        func1 and func2 to the "call_both" function
 
1099
                        outside of its arguments"""
 
1100
                        def call_both(*args, **kwargs):
 
1101
                            """This function will emit two D-Bus
 
1102
                            signals by calling func1 and func2"""
 
1103
                            func1(*args, **kwargs)
 
1104
                            func2(*args, **kwargs)
 
1105
                        return call_both
 
1106
                    # Create the "call_both" function and add it to
 
1107
                    # the class
 
1108
                    attr[attrname] = fixscope(attribute, new_function)
 
1109
                # Is this a D-Bus method?
 
1110
                elif getattr(attribute, "_dbus_is_method", False):
 
1111
                    # Create a new, but exactly alike, function
 
1112
                    # object.  Decorate it to be a new D-Bus method
 
1113
                    # with the alternate D-Bus interface name.  Add it
 
1114
                    # to the class.
 
1115
                    attr[attrname] = (dbus.service.method
 
1116
                                      (alt_interface,
 
1117
                                       attribute._dbus_in_signature,
 
1118
                                       attribute._dbus_out_signature)
 
1119
                                      (types.FunctionType
 
1120
                                       (attribute.func_code,
 
1121
                                        attribute.func_globals,
 
1122
                                        attribute.func_name,
 
1123
                                        attribute.func_defaults,
 
1124
                                        attribute.func_closure)))
 
1125
                    # Copy annotations, if any
 
1126
                    try:
 
1127
                        attr[attrname]._dbus_annotations = (
 
1128
                            dict(attribute._dbus_annotations))
 
1129
                    except AttributeError:
 
1130
                        pass
 
1131
                # Is this a D-Bus property?
 
1132
                elif getattr(attribute, "_dbus_is_property", False):
 
1133
                    # Create a new, but exactly alike, function
 
1134
                    # object, and decorate it to be a new D-Bus
 
1135
                    # property with the alternate D-Bus interface
 
1136
                    # name.  Add it to the class.
 
1137
                    attr[attrname] = (dbus_service_property
 
1138
                                      (alt_interface,
 
1139
                                       attribute._dbus_signature,
 
1140
                                       attribute._dbus_access,
 
1141
                                       attribute
 
1142
                                       ._dbus_get_args_options
 
1143
                                       ["byte_arrays"])
 
1144
                                      (types.FunctionType
 
1145
                                       (attribute.func_code,
 
1146
                                        attribute.func_globals,
 
1147
                                        attribute.func_name,
 
1148
                                        attribute.func_defaults,
 
1149
                                        attribute.func_closure)))
 
1150
                    # Copy annotations, if any
 
1151
                    try:
 
1152
                        attr[attrname]._dbus_annotations = (
 
1153
                            dict(attribute._dbus_annotations))
 
1154
                    except AttributeError:
 
1155
                        pass
 
1156
                # Is this a D-Bus interface?
 
1157
                elif getattr(attribute, "_dbus_is_interface", False):
 
1158
                    # Create a new, but exactly alike, function
 
1159
                    # object.  Decorate it to be a new D-Bus interface
 
1160
                    # with the alternate D-Bus interface name.  Add it
 
1161
                    # to the class.
 
1162
                    attr[attrname] = (dbus_interface_annotations
 
1163
                                      (alt_interface)
 
1164
                                      (types.FunctionType
 
1165
                                       (attribute.func_code,
 
1166
                                        attribute.func_globals,
 
1167
                                        attribute.func_name,
 
1168
                                        attribute.func_defaults,
 
1169
                                        attribute.func_closure)))
 
1170
            if deprecate:
 
1171
                # Deprecate all alternate interfaces
 
1172
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1173
                for interface_name in interface_names:
 
1174
                    @dbus_interface_annotations(interface_name)
 
1175
                    def func(self):
 
1176
                        return { "org.freedesktop.DBus.Deprecated":
 
1177
                                     "true" }
 
1178
                    # Find an unused name
 
1179
                    for aname in (iname.format(i)
 
1180
                                  for i in itertools.count()):
 
1181
                        if aname not in attr:
 
1182
                            attr[aname] = func
 
1183
                            break
 
1184
            if interface_names:
 
1185
                # Replace the class with a new subclass of it with
 
1186
                # methods, signals, etc. as created above.
 
1187
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1188
                           (cls,), attr)
 
1189
        return cls
 
1190
    return wrapper
 
1191
 
 
1192
 
 
1193
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1194
                                "se.bsnet.fukt.Mandos"})
754
1195
class ClientDBus(Client, DBusObjectWithProperties):
755
1196
    """A Client class using D-Bus
756
1197
    
765
1206
    # dbus.service.Object doesn't use super(), so we can't either.
766
1207
    
767
1208
    def __init__(self, bus = None, *args, **kwargs):
768
 
        self._approvals_pending = 0
769
1209
        self.bus = bus
770
1210
        Client.__init__(self, *args, **kwargs)
771
1211
        # Only now, when this client is initialized, can it show up on
777
1217
                                 ("/clients/" + client_object_name))
778
1218
        DBusObjectWithProperties.__init__(self, self.bus,
779
1219
                                          self.dbus_object_path)
780
 
    def _set_expires(self, value):
781
 
        old_value = getattr(self, "_expires", None)
782
 
        self._expires = value
783
 
        if hasattr(self, "dbus_object_path") and old_value != value:
784
 
            dbus_time = (self._datetime_to_dbus(self._expires,
785
 
                                                variant_level=1))
786
 
            self.PropertyChanged(dbus.String("Expires"),
787
 
                                 dbus_time)
788
 
    expires = property(lambda self: self._expires, _set_expires)
789
 
    del _set_expires
790
 
        
791
 
    def _get_approvals_pending(self):
792
 
        return self._approvals_pending
793
 
    def _set_approvals_pending(self, value):
794
 
        old_value = self._approvals_pending
795
 
        self._approvals_pending = value
796
 
        bval = bool(value)
797
 
        if (hasattr(self, "dbus_object_path")
798
 
            and bval is not bool(old_value)):
799
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
800
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
801
 
                                 dbus_bool)
802
 
 
803
 
    approvals_pending = property(_get_approvals_pending,
804
 
                                 _set_approvals_pending)
805
 
    del _get_approvals_pending, _set_approvals_pending
806
 
    
807
 
    @staticmethod
808
 
    def _datetime_to_dbus(dt, variant_level=0):
809
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
810
 
        if dt is None:
811
 
            return dbus.String("", variant_level = variant_level)
812
 
        return dbus.String(dt.isoformat(),
813
 
                           variant_level=variant_level)
814
 
    
815
 
    def enable(self):
816
 
        oldstate = getattr(self, "enabled", False)
817
 
        r = Client.enable(self)
818
 
        if oldstate != self.enabled:
819
 
            # Emit D-Bus signals
820
 
            self.PropertyChanged(dbus.String("Enabled"),
821
 
                                 dbus.Boolean(True, variant_level=1))
822
 
            self.PropertyChanged(
823
 
                dbus.String("LastEnabled"),
824
 
                self._datetime_to_dbus(self.last_enabled,
825
 
                                       variant_level=1))
826
 
        return r
827
 
    
828
 
    def disable(self, quiet = False):
829
 
        oldstate = getattr(self, "enabled", False)
830
 
        r = Client.disable(self, quiet=quiet)
831
 
        if not quiet and oldstate != self.enabled:
832
 
            # Emit D-Bus signal
833
 
            self.PropertyChanged(dbus.String("Enabled"),
834
 
                                 dbus.Boolean(False, variant_level=1))
835
 
        return r
 
1220
    
 
1221
    def notifychangeproperty(transform_func,
 
1222
                             dbus_name, type_func=lambda x: x,
 
1223
                             variant_level=1):
 
1224
        """ Modify a variable so that it's a property which announces
 
1225
        its changes to DBus.
 
1226
        
 
1227
        transform_fun: Function that takes a value and a variant_level
 
1228
                       and transforms it to a D-Bus type.
 
1229
        dbus_name: D-Bus name of the variable
 
1230
        type_func: Function that transform the value before sending it
 
1231
                   to the D-Bus.  Default: no transform
 
1232
        variant_level: D-Bus variant level.  Default: 1
 
1233
        """
 
1234
        attrname = "_{0}".format(dbus_name)
 
1235
        def setter(self, value):
 
1236
            if hasattr(self, "dbus_object_path"):
 
1237
                if (not hasattr(self, attrname) or
 
1238
                    type_func(getattr(self, attrname, None))
 
1239
                    != type_func(value)):
 
1240
                    dbus_value = transform_func(type_func(value),
 
1241
                                                variant_level
 
1242
                                                =variant_level)
 
1243
                    self.PropertyChanged(dbus.String(dbus_name),
 
1244
                                         dbus_value)
 
1245
            setattr(self, attrname, value)
 
1246
        
 
1247
        return property(lambda self: getattr(self, attrname), setter)
 
1248
    
 
1249
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1250
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1251
                                             "ApprovalPending",
 
1252
                                             type_func = bool)
 
1253
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1254
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1255
                                        "LastEnabled")
 
1256
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1257
                                   type_func = lambda checker:
 
1258
                                       checker is not None)
 
1259
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1260
                                           "LastCheckedOK")
 
1261
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1262
                                               "LastCheckerStatus")
 
1263
    last_approval_request = notifychangeproperty(
 
1264
        datetime_to_dbus, "LastApprovalRequest")
 
1265
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1266
                                               "ApprovedByDefault")
 
1267
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1268
                                          "ApprovalDelay",
 
1269
                                          type_func =
 
1270
                                          timedelta_to_milliseconds)
 
1271
    approval_duration = notifychangeproperty(
 
1272
        dbus.UInt64, "ApprovalDuration",
 
1273
        type_func = timedelta_to_milliseconds)
 
1274
    host = notifychangeproperty(dbus.String, "Host")
 
1275
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1276
                                   type_func =
 
1277
                                   timedelta_to_milliseconds)
 
1278
    extended_timeout = notifychangeproperty(
 
1279
        dbus.UInt64, "ExtendedTimeout",
 
1280
        type_func = timedelta_to_milliseconds)
 
1281
    interval = notifychangeproperty(dbus.UInt64,
 
1282
                                    "Interval",
 
1283
                                    type_func =
 
1284
                                    timedelta_to_milliseconds)
 
1285
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1286
    
 
1287
    del notifychangeproperty
836
1288
    
837
1289
    def __del__(self, *args, **kwargs):
838
1290
        try:
847
1299
                         *args, **kwargs):
848
1300
        self.checker_callback_tag = None
849
1301
        self.checker = None
850
 
        # Emit D-Bus signal
851
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
852
 
                             dbus.Boolean(False, variant_level=1))
853
1302
        if os.WIFEXITED(condition):
854
1303
            exitstatus = os.WEXITSTATUS(condition)
855
1304
            # Emit D-Bus signal
865
1314
        return Client.checker_callback(self, pid, condition, command,
866
1315
                                       *args, **kwargs)
867
1316
    
868
 
    def checked_ok(self, *args, **kwargs):
869
 
        Client.checked_ok(self, *args, **kwargs)
870
 
        # Emit D-Bus signal
871
 
        self.PropertyChanged(
872
 
            dbus.String("LastCheckedOK"),
873
 
            (self._datetime_to_dbus(self.last_checked_ok,
874
 
                                    variant_level=1)))
875
 
    
876
 
    def need_approval(self, *args, **kwargs):
877
 
        r = Client.need_approval(self, *args, **kwargs)
878
 
        # Emit D-Bus signal
879
 
        self.PropertyChanged(
880
 
            dbus.String("LastApprovalRequest"),
881
 
            (self._datetime_to_dbus(self.last_approval_request,
882
 
                                    variant_level=1)))
883
 
        return r
884
 
    
885
1317
    def start_checker(self, *args, **kwargs):
886
1318
        old_checker = self.checker
887
1319
        if self.checker is not None:
894
1326
            and old_checker_pid != self.checker.pid):
895
1327
            # Emit D-Bus signal
896
1328
            self.CheckerStarted(self.current_checker_command)
897
 
            self.PropertyChanged(
898
 
                dbus.String("CheckerRunning"),
899
 
                dbus.Boolean(True, variant_level=1))
900
1329
        return r
901
1330
    
902
 
    def stop_checker(self, *args, **kwargs):
903
 
        old_checker = getattr(self, "checker", None)
904
 
        r = Client.stop_checker(self, *args, **kwargs)
905
 
        if (old_checker is not None
906
 
            and getattr(self, "checker", None) is None):
907
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
908
 
                                 dbus.Boolean(False, variant_level=1))
909
 
        return r
910
 
 
911
1331
    def _reset_approved(self):
912
 
        self._approved = None
 
1332
        self.approved = None
913
1333
        return False
914
1334
    
915
1335
    def approve(self, value=True):
916
1336
        self.send_changedstate()
917
 
        self._approved = value
918
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1337
        self.approved = value
 
1338
        gobject.timeout_add(timedelta_to_milliseconds
919
1339
                            (self.approval_duration),
920
1340
                            self._reset_approved)
921
1341
    
922
 
    
923
1342
    ## D-Bus methods, signals & properties
924
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1343
    _interface = "se.recompile.Mandos.Client"
 
1344
    
 
1345
    ## Interfaces
 
1346
    
 
1347
    @dbus_interface_annotations(_interface)
 
1348
    def _foo(self):
 
1349
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1350
                     "false"}
925
1351
    
926
1352
    ## Signals
927
1353
    
1012
1438
    def ApprovedByDefault_dbus_property(self, value=None):
1013
1439
        if value is None:       # get
1014
1440
            return dbus.Boolean(self.approved_by_default)
1015
 
        old_value = self.approved_by_default
1016
1441
        self.approved_by_default = bool(value)
1017
 
        # Emit D-Bus signal
1018
 
        if old_value != self.approved_by_default:
1019
 
            self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
 
                                 dbus.Boolean(value, variant_level=1))
1021
1442
    
1022
1443
    # ApprovalDelay - property
1023
1444
    @dbus_service_property(_interface, signature="t",
1025
1446
    def ApprovalDelay_dbus_property(self, value=None):
1026
1447
        if value is None:       # get
1027
1448
            return dbus.UInt64(self.approval_delay_milliseconds())
1028
 
        old_value = self.approval_delay
1029
1449
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
 
        # Emit D-Bus signal
1031
 
        if old_value != self.approval_delay:
1032
 
            self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
 
                                 dbus.UInt64(value, variant_level=1))
1034
1450
    
1035
1451
    # ApprovalDuration - property
1036
1452
    @dbus_service_property(_interface, signature="t",
1037
1453
                           access="readwrite")
1038
1454
    def ApprovalDuration_dbus_property(self, value=None):
1039
1455
        if value is None:       # get
1040
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1456
            return dbus.UInt64(timedelta_to_milliseconds(
1041
1457
                    self.approval_duration))
1042
 
        old_value = self.approval_duration
1043
1458
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
 
        # Emit D-Bus signal
1045
 
        if old_value != self.approval_duration:
1046
 
            self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
 
                                 dbus.UInt64(value, variant_level=1))
1048
1459
    
1049
1460
    # Name - property
1050
1461
    @dbus_service_property(_interface, signature="s", access="read")
1062
1473
    def Host_dbus_property(self, value=None):
1063
1474
        if value is None:       # get
1064
1475
            return dbus.String(self.host)
1065
 
        old_value = self.host
1066
 
        self.host = value
1067
 
        # Emit D-Bus signal
1068
 
        if old_value != self.host:
1069
 
            self.PropertyChanged(dbus.String("Host"),
1070
 
                                 dbus.String(value, variant_level=1))
 
1476
        self.host = unicode(value)
1071
1477
    
1072
1478
    # Created - property
1073
1479
    @dbus_service_property(_interface, signature="s", access="read")
1074
1480
    def Created_dbus_property(self):
1075
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1481
        return datetime_to_dbus(self.created)
1076
1482
    
1077
1483
    # LastEnabled - property
1078
1484
    @dbus_service_property(_interface, signature="s", access="read")
1079
1485
    def LastEnabled_dbus_property(self):
1080
 
        return self._datetime_to_dbus(self.last_enabled)
 
1486
        return datetime_to_dbus(self.last_enabled)
1081
1487
    
1082
1488
    # Enabled - property
1083
1489
    @dbus_service_property(_interface, signature="b",
1097
1503
        if value is not None:
1098
1504
            self.checked_ok()
1099
1505
            return
1100
 
        return self._datetime_to_dbus(self.last_checked_ok)
 
1506
        return datetime_to_dbus(self.last_checked_ok)
 
1507
    
 
1508
    # LastCheckerStatus - property
 
1509
    @dbus_service_property(_interface, signature="n",
 
1510
                           access="read")
 
1511
    def LastCheckerStatus_dbus_property(self):
 
1512
        return dbus.Int16(self.last_checker_status)
1101
1513
    
1102
1514
    # Expires - property
1103
1515
    @dbus_service_property(_interface, signature="s", access="read")
1104
1516
    def Expires_dbus_property(self):
1105
 
        return self._datetime_to_dbus(self.expires)
 
1517
        return datetime_to_dbus(self.expires)
1106
1518
    
1107
1519
    # LastApprovalRequest - property
1108
1520
    @dbus_service_property(_interface, signature="s", access="read")
1109
1521
    def LastApprovalRequest_dbus_property(self):
1110
 
        return self._datetime_to_dbus(self.last_approval_request)
 
1522
        return datetime_to_dbus(self.last_approval_request)
1111
1523
    
1112
1524
    # Timeout - property
1113
1525
    @dbus_service_property(_interface, signature="t",
1115
1527
    def Timeout_dbus_property(self, value=None):
1116
1528
        if value is None:       # get
1117
1529
            return dbus.UInt64(self.timeout_milliseconds())
1118
 
        old_value = self.timeout
1119
1530
        self.timeout = datetime.timedelta(0, 0, 0, value)
1120
 
        # Emit D-Bus signal
1121
 
        if old_value != self.timeout:
1122
 
            self.PropertyChanged(dbus.String("Timeout"),
1123
 
                                 dbus.UInt64(value, variant_level=1))
1124
 
        if getattr(self, "disable_initiator_tag", None) is None:
1125
 
            return
1126
1531
        # Reschedule timeout
1127
 
        gobject.source_remove(self.disable_initiator_tag)
1128
 
        self.disable_initiator_tag = None
1129
 
        self.expires = None
1130
 
        time_to_die = (self.
1131
 
                       _timedelta_to_milliseconds((self
1132
 
                                                   .last_checked_ok
1133
 
                                                   + self.timeout)
1134
 
                                                  - datetime.datetime
1135
 
                                                  .utcnow()))
1136
 
        if time_to_die <= 0:
1137
 
            # The timeout has passed
1138
 
            self.disable()
1139
 
        else:
1140
 
            self.expires = (datetime.datetime.utcnow()
1141
 
                            + datetime.timedelta(milliseconds = time_to_die))
1142
 
            self.disable_initiator_tag = (gobject.timeout_add
1143
 
                                          (time_to_die, self.disable))
1144
 
 
 
1532
        if self.enabled:
 
1533
            now = datetime.datetime.utcnow()
 
1534
            time_to_die = timedelta_to_milliseconds(
 
1535
                (self.last_checked_ok + self.timeout) - now)
 
1536
            if time_to_die <= 0:
 
1537
                # The timeout has passed
 
1538
                self.disable()
 
1539
            else:
 
1540
                self.expires = (now +
 
1541
                                datetime.timedelta(milliseconds =
 
1542
                                                   time_to_die))
 
1543
                if (getattr(self, "disable_initiator_tag", None)
 
1544
                    is None):
 
1545
                    return
 
1546
                gobject.source_remove(self.disable_initiator_tag)
 
1547
                self.disable_initiator_tag = (gobject.timeout_add
 
1548
                                              (time_to_die,
 
1549
                                               self.disable))
 
1550
    
1145
1551
    # ExtendedTimeout - property
1146
1552
    @dbus_service_property(_interface, signature="t",
1147
1553
                           access="readwrite")
1148
1554
    def ExtendedTimeout_dbus_property(self, value=None):
1149
1555
        if value is None:       # get
1150
1556
            return dbus.UInt64(self.extended_timeout_milliseconds())
1151
 
        old_value = self.extended_timeout
1152
1557
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1153
 
        # Emit D-Bus signal
1154
 
        if old_value != self.extended_timeout:
1155
 
            self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
 
                                 dbus.UInt64(value, variant_level=1))
1157
 
 
 
1558
    
1158
1559
    # Interval - property
1159
1560
    @dbus_service_property(_interface, signature="t",
1160
1561
                           access="readwrite")
1161
1562
    def Interval_dbus_property(self, value=None):
1162
1563
        if value is None:       # get
1163
1564
            return dbus.UInt64(self.interval_milliseconds())
1164
 
        old_value = self.interval
1165
1565
        self.interval = datetime.timedelta(0, 0, 0, value)
1166
 
        # Emit D-Bus signal
1167
 
        if old_value != self.interval:
1168
 
            self.PropertyChanged(dbus.String("Interval"),
1169
 
                                 dbus.UInt64(value, variant_level=1))
1170
1566
        if getattr(self, "checker_initiator_tag", None) is None:
1171
1567
            return
1172
 
        # Reschedule checker run
1173
 
        gobject.source_remove(self.checker_initiator_tag)
1174
 
        self.checker_initiator_tag = (gobject.timeout_add
1175
 
                                      (value, self.start_checker))
1176
 
        self.start_checker()    # Start one now, too
1177
 
 
 
1568
        if self.enabled:
 
1569
            # Reschedule checker run
 
1570
            gobject.source_remove(self.checker_initiator_tag)
 
1571
            self.checker_initiator_tag = (gobject.timeout_add
 
1572
                                          (value, self.start_checker))
 
1573
            self.start_checker()    # Start one now, too
 
1574
    
1178
1575
    # Checker - property
1179
1576
    @dbus_service_property(_interface, signature="s",
1180
1577
                           access="readwrite")
1181
1578
    def Checker_dbus_property(self, value=None):
1182
1579
        if value is None:       # get
1183
1580
            return dbus.String(self.checker_command)
1184
 
        old_value = self.checker_command
1185
 
        self.checker_command = value
1186
 
        # Emit D-Bus signal
1187
 
        if old_value != self.checker_command:
1188
 
            self.PropertyChanged(dbus.String("Checker"),
1189
 
                                 dbus.String(self.checker_command,
1190
 
                                             variant_level=1))
 
1581
        self.checker_command = unicode(value)
1191
1582
    
1192
1583
    # CheckerRunning - property
1193
1584
    @dbus_service_property(_interface, signature="b",
1220
1611
        self._pipe.send(('init', fpr, address))
1221
1612
        if not self._pipe.recv():
1222
1613
            raise KeyError()
1223
 
 
 
1614
    
1224
1615
    def __getattribute__(self, name):
1225
 
        if(name == '_pipe'):
 
1616
        if name == '_pipe':
1226
1617
            return super(ProxyClient, self).__getattribute__(name)
1227
1618
        self._pipe.send(('getattr', name))
1228
1619
        data = self._pipe.recv()
1233
1624
                self._pipe.send(('funcall', name, args, kwargs))
1234
1625
                return self._pipe.recv()[1]
1235
1626
            return func
1236
 
 
 
1627
    
1237
1628
    def __setattr__(self, name, value):
1238
 
        if(name == '_pipe'):
 
1629
        if name == '_pipe':
1239
1630
            return super(ProxyClient, self).__setattr__(name, value)
1240
1631
        self._pipe.send(('setattr', name, value))
1241
1632
 
1252
1643
                        unicode(self.client_address))
1253
1644
            logger.debug("Pipe FD: %d",
1254
1645
                         self.server.child_pipe.fileno())
1255
 
 
 
1646
            
1256
1647
            session = (gnutls.connection
1257
1648
                       .ClientSession(self.request,
1258
1649
                                      gnutls.connection
1259
1650
                                      .X509Credentials()))
1260
 
 
 
1651
            
1261
1652
            # Note: gnutls.connection.X509Credentials is really a
1262
1653
            # generic GnuTLS certificate credentials object so long as
1263
1654
            # no X.509 keys are added to it.  Therefore, we can use it
1264
1655
            # here despite using OpenPGP certificates.
1265
 
 
 
1656
            
1266
1657
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
1658
            #                      "+AES-256-CBC", "+SHA1",
1268
1659
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1274
1665
            (gnutls.library.functions
1275
1666
             .gnutls_priority_set_direct(session._c_object,
1276
1667
                                         priority, None))
1277
 
 
 
1668
            
1278
1669
            # Start communication using the Mandos protocol
1279
1670
            # Get protocol number
1280
1671
            line = self.request.makefile().readline()
1285
1676
            except (ValueError, IndexError, RuntimeError) as error:
1286
1677
                logger.error("Unknown protocol version: %s", error)
1287
1678
                return
1288
 
 
 
1679
            
1289
1680
            # Start GnuTLS connection
1290
1681
            try:
1291
1682
                session.handshake()
1295
1686
                # established.  Just abandon the request.
1296
1687
                return
1297
1688
            logger.debug("Handshake succeeded")
1298
 
 
 
1689
            
1299
1690
            approval_required = False
1300
1691
            try:
1301
1692
                try:
1306
1697
                    logger.warning("Bad certificate: %s", error)
1307
1698
                    return
1308
1699
                logger.debug("Fingerprint: %s", fpr)
1309
 
 
 
1700
                
1310
1701
                try:
1311
1702
                    client = ProxyClient(child_pipe, fpr,
1312
1703
                                         self.client_address)
1324
1715
                                       client.name)
1325
1716
                        if self.server.use_dbus:
1326
1717
                            # Emit D-Bus signal
1327
 
                            client.Rejected("Disabled")                    
 
1718
                            client.Rejected("Disabled")
1328
1719
                        return
1329
1720
                    
1330
 
                    if client._approved or not client.approval_delay:
 
1721
                    if client.approved or not client.approval_delay:
1331
1722
                        #We are approved or approval is disabled
1332
1723
                        break
1333
 
                    elif client._approved is None:
 
1724
                    elif client.approved is None:
1334
1725
                        logger.info("Client %s needs approval",
1335
1726
                                    client.name)
1336
1727
                        if self.server.use_dbus:
1347
1738
                        return
1348
1739
                    
1349
1740
                    #wait until timeout or approved
1350
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1351
1741
                    time = datetime.datetime.now()
1352
1742
                    client.changedstate.acquire()
1353
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1743
                    (client.changedstate.wait
 
1744
                     (float(client.timedelta_to_milliseconds(delay)
 
1745
                            / 1000)))
1354
1746
                    client.changedstate.release()
1355
1747
                    time2 = datetime.datetime.now()
1356
1748
                    if (time2 - time) >= delay:
1372
1764
                    try:
1373
1765
                        sent = session.send(client.secret[sent_size:])
1374
1766
                    except gnutls.errors.GNUTLSError as error:
1375
 
                        logger.warning("gnutls send failed")
 
1767
                        logger.warning("gnutls send failed",
 
1768
                                       exc_info=error)
1376
1769
                        return
1377
1770
                    logger.debug("Sent: %d, remaining: %d",
1378
1771
                                 sent, len(client.secret)
1379
1772
                                 - (sent_size + sent))
1380
1773
                    sent_size += sent
1381
 
 
 
1774
                
1382
1775
                logger.info("Sending secret to %s", client.name)
1383
 
                # bump the timeout as if seen
1384
 
                client.checked_ok(client.extended_timeout)
 
1776
                # bump the timeout using extended_timeout
 
1777
                client.bump_timeout(client.extended_timeout)
1385
1778
                if self.server.use_dbus:
1386
1779
                    # Emit D-Bus signal
1387
1780
                    client.GotSecret()
1392
1785
                try:
1393
1786
                    session.bye()
1394
1787
                except gnutls.errors.GNUTLSError as error:
1395
 
                    logger.warning("GnuTLS bye failed")
 
1788
                    logger.warning("GnuTLS bye failed",
 
1789
                                   exc_info=error)
1396
1790
    
1397
1791
    @staticmethod
1398
1792
    def peer_certificate(session):
1454
1848
        # Convert the buffer to a Python bytestring
1455
1849
        fpr = ctypes.string_at(buf, buf_len.value)
1456
1850
        # Convert the bytestring to hexadecimal notation
1457
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1851
        hex_fpr = binascii.hexlify(fpr).upper()
1458
1852
        return hex_fpr
1459
1853
 
1460
1854
 
1463
1857
    def sub_process_main(self, request, address):
1464
1858
        try:
1465
1859
            self.finish_request(request, address)
1466
 
        except:
 
1860
        except Exception:
1467
1861
            self.handle_error(request, address)
1468
1862
        self.close_request(request)
1469
 
            
 
1863
    
1470
1864
    def process_request(self, request, address):
1471
1865
        """Start a new process to process the request."""
1472
 
        multiprocessing.Process(target = self.sub_process_main,
1473
 
                                args = (request, address)).start()
 
1866
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1867
                                       args = (request,
 
1868
                                               address))
 
1869
        proc.start()
 
1870
        return proc
 
1871
 
1474
1872
 
1475
1873
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1476
1874
    """ adds a pipe to the MixIn """
1480
1878
        This function creates a new pipe in self.pipe
1481
1879
        """
1482
1880
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1483
 
 
1484
 
        super(MultiprocessingMixInWithPipe,
1485
 
              self).process_request(request, client_address)
 
1881
        
 
1882
        proc = MultiprocessingMixIn.process_request(self, request,
 
1883
                                                    client_address)
1486
1884
        self.child_pipe.close()
1487
 
        self.add_pipe(parent_pipe)
1488
 
 
1489
 
    def add_pipe(self, parent_pipe):
 
1885
        self.add_pipe(parent_pipe, proc)
 
1886
    
 
1887
    def add_pipe(self, parent_pipe, proc):
1490
1888
        """Dummy function; override as necessary"""
1491
1889
        raise NotImplementedError
1492
1890
 
 
1891
 
1493
1892
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1494
1893
                     socketserver.TCPServer, object):
1495
1894
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1569
1968
        self.enabled = False
1570
1969
        self.clients = clients
1571
1970
        if self.clients is None:
1572
 
            self.clients = set()
 
1971
            self.clients = {}
1573
1972
        self.use_dbus = use_dbus
1574
1973
        self.gnutls_priority = gnutls_priority
1575
1974
        IPv6_TCPServer.__init__(self, server_address,
1579
1978
    def server_activate(self):
1580
1979
        if self.enabled:
1581
1980
            return socketserver.TCPServer.server_activate(self)
 
1981
    
1582
1982
    def enable(self):
1583
1983
        self.enabled = True
1584
 
    def add_pipe(self, parent_pipe):
 
1984
    
 
1985
    def add_pipe(self, parent_pipe, proc):
1585
1986
        # Call "handle_ipc" for both data and EOF events
1586
1987
        gobject.io_add_watch(parent_pipe.fileno(),
1587
1988
                             gobject.IO_IN | gobject.IO_HUP,
1588
1989
                             functools.partial(self.handle_ipc,
1589
 
                                               parent_pipe = parent_pipe))
1590
 
        
 
1990
                                               parent_pipe =
 
1991
                                               parent_pipe,
 
1992
                                               proc = proc))
 
1993
    
1591
1994
    def handle_ipc(self, source, condition, parent_pipe=None,
1592
 
                   client_object=None):
 
1995
                   proc = None, client_object=None):
1593
1996
        condition_names = {
1594
1997
            gobject.IO_IN: "IN",   # There is data to read.
1595
1998
            gobject.IO_OUT: "OUT", # Data can be written (without
1604
2007
                                       for cond, name in
1605
2008
                                       condition_names.iteritems()
1606
2009
                                       if cond & condition)
1607
 
        # error or the other end of multiprocessing.Pipe has closed
 
2010
        # error, or the other end of multiprocessing.Pipe has closed
1608
2011
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2012
            # Wait for other process to exit
 
2013
            proc.join()
1609
2014
            return False
1610
2015
        
1611
2016
        # Read a request from the child
1616
2021
            fpr = request[1]
1617
2022
            address = request[2]
1618
2023
            
1619
 
            for c in self.clients:
 
2024
            for c in self.clients.itervalues():
1620
2025
                if c.fingerprint == fpr:
1621
2026
                    client = c
1622
2027
                    break
1625
2030
                            "dress: %s", fpr, address)
1626
2031
                if self.use_dbus:
1627
2032
                    # Emit D-Bus signal
1628
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
2033
                    mandos_dbus_service.ClientNotFound(fpr,
 
2034
                                                       address[0])
1629
2035
                parent_pipe.send(False)
1630
2036
                return False
1631
2037
            
1632
2038
            gobject.io_add_watch(parent_pipe.fileno(),
1633
2039
                                 gobject.IO_IN | gobject.IO_HUP,
1634
2040
                                 functools.partial(self.handle_ipc,
1635
 
                                                   parent_pipe = parent_pipe,
1636
 
                                                   client_object = client))
 
2041
                                                   parent_pipe =
 
2042
                                                   parent_pipe,
 
2043
                                                   proc = proc,
 
2044
                                                   client_object =
 
2045
                                                   client))
1637
2046
            parent_pipe.send(True)
1638
 
            # remove the old hook in favor of the new above hook on same fileno
 
2047
            # remove the old hook in favor of the new above hook on
 
2048
            # same fileno
1639
2049
            return False
1640
2050
        if command == 'funcall':
1641
2051
            funcname = request[1]
1642
2052
            args = request[2]
1643
2053
            kwargs = request[3]
1644
2054
            
1645
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1646
 
 
 
2055
            parent_pipe.send(('data', getattr(client_object,
 
2056
                                              funcname)(*args,
 
2057
                                                         **kwargs)))
 
2058
        
1647
2059
        if command == 'getattr':
1648
2060
            attrname = request[1]
1649
2061
            if callable(client_object.__getattribute__(attrname)):
1650
2062
                parent_pipe.send(('function',))
1651
2063
            else:
1652
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
2064
                parent_pipe.send(('data', client_object
 
2065
                                  .__getattribute__(attrname)))
1653
2066
        
1654
2067
        if command == 'setattr':
1655
2068
            attrname = request[1]
1656
2069
            value = request[2]
1657
2070
            setattr(client_object, attrname, value)
1658
 
 
 
2071
        
1659
2072
        return True
1660
2073
 
1661
2074
 
1691
2104
            elif suffix == "w":
1692
2105
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1693
2106
            else:
1694
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2107
                raise ValueError("Unknown suffix {0!r}"
 
2108
                                 .format(suffix))
1695
2109
        except (ValueError, IndexError) as e:
1696
2110
            raise ValueError(*(e.args))
1697
2111
        timevalue += delta
1698
2112
    return timevalue
1699
2113
 
1700
2114
 
1701
 
def if_nametoindex(interface):
1702
 
    """Call the C function if_nametoindex(), or equivalent
1703
 
    
1704
 
    Note: This function cannot accept a unicode string."""
1705
 
    global if_nametoindex
1706
 
    try:
1707
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1708
 
                          (ctypes.util.find_library("c"))
1709
 
                          .if_nametoindex)
1710
 
    except (OSError, AttributeError):
1711
 
        logger.warning("Doing if_nametoindex the hard way")
1712
 
        def if_nametoindex(interface):
1713
 
            "Get an interface index the hard way, i.e. using fcntl()"
1714
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1715
 
            with contextlib.closing(socket.socket()) as s:
1716
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
 
                                    struct.pack(str("16s16x"),
1718
 
                                                interface))
1719
 
            interface_index = struct.unpack(str("I"),
1720
 
                                            ifreq[16:20])[0]
1721
 
            return interface_index
1722
 
    return if_nametoindex(interface)
1723
 
 
1724
 
 
1725
2115
def daemon(nochdir = False, noclose = False):
1726
2116
    """See daemon(3).  Standard BSD Unix function.
1727
2117
    
1735
2125
        sys.exit()
1736
2126
    if not noclose:
1737
2127
        # Close all standard open file descriptors
1738
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2128
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1739
2129
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1740
2130
            raise OSError(errno.ENODEV,
1741
 
                          "%s not a character device"
1742
 
                          % os.path.devnull)
 
2131
                          "{0} not a character device"
 
2132
                          .format(os.devnull))
1743
2133
        os.dup2(null, sys.stdin.fileno())
1744
2134
        os.dup2(null, sys.stdout.fileno())
1745
2135
        os.dup2(null, sys.stderr.fileno())
1754
2144
    
1755
2145
    parser = argparse.ArgumentParser()
1756
2146
    parser.add_argument("-v", "--version", action="version",
1757
 
                        version = "%%(prog)s %s" % version,
 
2147
                        version = "%(prog)s {0}".format(version),
1758
2148
                        help="show version number and exit")
1759
2149
    parser.add_argument("-i", "--interface", metavar="IF",
1760
2150
                        help="Bind to interface IF")
1782
2172
                        " system bus interface")
1783
2173
    parser.add_argument("--no-ipv6", action="store_false",
1784
2174
                        dest="use_ipv6", help="Do not use IPv6")
 
2175
    parser.add_argument("--no-restore", action="store_false",
 
2176
                        dest="restore", help="Do not restore stored"
 
2177
                        " state")
 
2178
    parser.add_argument("--statedir", metavar="DIR",
 
2179
                        help="Directory to save/restore state in")
 
2180
    
1785
2181
    options = parser.parse_args()
1786
2182
    
1787
2183
    if options.check:
1800
2196
                        "use_dbus": "True",
1801
2197
                        "use_ipv6": "True",
1802
2198
                        "debuglevel": "",
 
2199
                        "restore": "True",
 
2200
                        "statedir": "/var/lib/mandos"
1803
2201
                        }
1804
2202
    
1805
2203
    # Parse config file for server-global settings
1822
2220
    # options, if set.
1823
2221
    for option in ("interface", "address", "port", "debug",
1824
2222
                   "priority", "servicename", "configdir",
1825
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2223
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2224
                   "statedir"):
1826
2225
        value = getattr(options, option)
1827
2226
        if value is not None:
1828
2227
            server_settings[option] = value
1840
2239
    debuglevel = server_settings["debuglevel"]
1841
2240
    use_dbus = server_settings["use_dbus"]
1842
2241
    use_ipv6 = server_settings["use_ipv6"]
1843
 
 
 
2242
    stored_state_path = os.path.join(server_settings["statedir"],
 
2243
                                     stored_state_file)
 
2244
    
 
2245
    if debug:
 
2246
        initlogger(debug, logging.DEBUG)
 
2247
    else:
 
2248
        if not debuglevel:
 
2249
            initlogger(debug)
 
2250
        else:
 
2251
            level = getattr(logging, debuglevel.upper())
 
2252
            initlogger(debug, level)
 
2253
    
1844
2254
    if server_settings["servicename"] != "Mandos":
1845
2255
        syslogger.setFormatter(logging.Formatter
1846
 
                               ('Mandos (%s) [%%(process)d]:'
1847
 
                                ' %%(levelname)s: %%(message)s'
1848
 
                                % server_settings["servicename"]))
 
2256
                               ('Mandos ({0}) [%(process)d]:'
 
2257
                                ' %(levelname)s: %(message)s'
 
2258
                                .format(server_settings
 
2259
                                        ["servicename"])))
1849
2260
    
1850
2261
    # Parse config file with clients
1851
 
    client_defaults = { "timeout": "5m",
1852
 
                        "extended_timeout": "15m",
1853
 
                        "interval": "2m",
1854
 
                        "checker": "fping -q -- %%(host)s",
1855
 
                        "host": "",
1856
 
                        "approval_delay": "0s",
1857
 
                        "approval_duration": "1s",
1858
 
                        }
1859
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2262
    client_config = configparser.SafeConfigParser(Client
 
2263
                                                  .client_defaults)
1860
2264
    client_config.read(os.path.join(server_settings["configdir"],
1861
2265
                                    "clients.conf"))
1862
2266
    
1876
2280
        pidfilename = "/var/run/mandos.pid"
1877
2281
        try:
1878
2282
            pidfile = open(pidfilename, "w")
1879
 
        except IOError:
1880
 
            logger.error("Could not open file %r", pidfilename)
 
2283
        except IOError as e:
 
2284
            logger.error("Could not open file %r", pidfilename,
 
2285
                         exc_info=e)
1881
2286
    
1882
 
    try:
1883
 
        uid = pwd.getpwnam("_mandos").pw_uid
1884
 
        gid = pwd.getpwnam("_mandos").pw_gid
1885
 
    except KeyError:
 
2287
    for name in ("_mandos", "mandos", "nobody"):
1886
2288
        try:
1887
 
            uid = pwd.getpwnam("mandos").pw_uid
1888
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2289
            uid = pwd.getpwnam(name).pw_uid
 
2290
            gid = pwd.getpwnam(name).pw_gid
 
2291
            break
1889
2292
        except KeyError:
1890
 
            try:
1891
 
                uid = pwd.getpwnam("nobody").pw_uid
1892
 
                gid = pwd.getpwnam("nobody").pw_gid
1893
 
            except KeyError:
1894
 
                uid = 65534
1895
 
                gid = 65534
 
2293
            continue
 
2294
    else:
 
2295
        uid = 65534
 
2296
        gid = 65534
1896
2297
    try:
1897
2298
        os.setgid(gid)
1898
2299
        os.setuid(uid)
1900
2301
        if error[0] != errno.EPERM:
1901
2302
            raise error
1902
2303
    
1903
 
    if not debug and not debuglevel:
1904
 
        syslogger.setLevel(logging.WARNING)
1905
 
        console.setLevel(logging.WARNING)
1906
 
    if debuglevel:
1907
 
        level = getattr(logging, debuglevel.upper())
1908
 
        syslogger.setLevel(level)
1909
 
        console.setLevel(level)
1910
 
 
1911
2304
    if debug:
1912
2305
        # Enable all possible GnuTLS debugging
1913
2306
        
1923
2316
         .gnutls_global_set_log_function(debug_gnutls))
1924
2317
        
1925
2318
        # Redirect stdin so all checkers get /dev/null
1926
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2319
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1927
2320
        os.dup2(null, sys.stdin.fileno())
1928
2321
        if null > 2:
1929
2322
            os.close(null)
1930
 
    else:
1931
 
        # No console logging
1932
 
        logger.removeHandler(console)
1933
2323
    
1934
2324
    # Need to fork before connecting to D-Bus
1935
2325
    if not debug:
1936
2326
        # Close all input and output, do double fork, etc.
1937
2327
        daemon()
1938
2328
    
 
2329
    gobject.threads_init()
 
2330
    
1939
2331
    global main_loop
1940
2332
    # From the Avahi example code
1941
 
    DBusGMainLoop(set_as_default=True )
 
2333
    DBusGMainLoop(set_as_default=True)
1942
2334
    main_loop = gobject.MainLoop()
1943
2335
    bus = dbus.SystemBus()
1944
2336
    # End of Avahi example code
1945
2337
    if use_dbus:
1946
2338
        try:
1947
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2339
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1948
2340
                                            bus, do_not_queue=True)
 
2341
            old_bus_name = (dbus.service.BusName
 
2342
                            ("se.bsnet.fukt.Mandos", bus,
 
2343
                             do_not_queue=True))
1949
2344
        except dbus.exceptions.NameExistsException as e:
1950
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2345
            logger.error("Disabling D-Bus:", exc_info=e)
1951
2346
            use_dbus = False
1952
2347
            server_settings["use_dbus"] = False
1953
2348
            tcp_server.use_dbus = False
1954
2349
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
 
    service = AvahiService(name = server_settings["servicename"],
1956
 
                           servicetype = "_mandos._tcp",
1957
 
                           protocol = protocol, bus = bus)
 
2350
    service = AvahiServiceToSyslog(name =
 
2351
                                   server_settings["servicename"],
 
2352
                                   servicetype = "_mandos._tcp",
 
2353
                                   protocol = protocol, bus = bus)
1958
2354
    if server_settings["interface"]:
1959
2355
        service.interface = (if_nametoindex
1960
2356
                             (str(server_settings["interface"])))
1965
2361
    client_class = Client
1966
2362
    if use_dbus:
1967
2363
        client_class = functools.partial(ClientDBus, bus = bus)
1968
 
    def client_config_items(config, section):
1969
 
        special_settings = {
1970
 
            "approved_by_default":
1971
 
                lambda: config.getboolean(section,
1972
 
                                          "approved_by_default"),
1973
 
            }
1974
 
        for name, value in config.items(section):
 
2364
    
 
2365
    client_settings = Client.config_parser(client_config)
 
2366
    old_client_settings = {}
 
2367
    clients_data = {}
 
2368
    
 
2369
    # Get client data and settings from last running state.
 
2370
    if server_settings["restore"]:
 
2371
        try:
 
2372
            with open(stored_state_path, "rb") as stored_state:
 
2373
                clients_data, old_client_settings = (pickle.load
 
2374
                                                     (stored_state))
 
2375
            os.remove(stored_state_path)
 
2376
        except IOError as e:
 
2377
            if e.errno == errno.ENOENT:
 
2378
                logger.warning("Could not load persistent state: {0}"
 
2379
                                .format(os.strerror(e.errno)))
 
2380
            else:
 
2381
                logger.critical("Could not load persistent state:",
 
2382
                                exc_info=e)
 
2383
                raise
 
2384
        except EOFError as e:
 
2385
            logger.warning("Could not load persistent state: "
 
2386
                           "EOFError:", exc_info=e)
 
2387
    
 
2388
    with PGPEngine() as pgp:
 
2389
        for client_name, client in clients_data.iteritems():
 
2390
            # Decide which value to use after restoring saved state.
 
2391
            # We have three different values: Old config file,
 
2392
            # new config file, and saved state.
 
2393
            # New config value takes precedence if it differs from old
 
2394
            # config value, otherwise use saved state.
 
2395
            for name, value in client_settings[client_name].items():
 
2396
                try:
 
2397
                    # For each value in new config, check if it
 
2398
                    # differs from the old config value (Except for
 
2399
                    # the "secret" attribute)
 
2400
                    if (name != "secret" and
 
2401
                        value != old_client_settings[client_name]
 
2402
                        [name]):
 
2403
                        client[name] = value
 
2404
                except KeyError:
 
2405
                    pass
 
2406
            
 
2407
            # Clients who has passed its expire date can still be
 
2408
            # enabled if its last checker was successful.  Clients
 
2409
            # whose checker succeeded before we stored its state is
 
2410
            # assumed to have successfully run all checkers during
 
2411
            # downtime.
 
2412
            if client["enabled"]:
 
2413
                if datetime.datetime.utcnow() >= client["expires"]:
 
2414
                    if not client["last_checked_ok"]:
 
2415
                        logger.warning(
 
2416
                            "disabling client {0} - Client never "
 
2417
                            "performed a successful checker"
 
2418
                            .format(client_name))
 
2419
                        client["enabled"] = False
 
2420
                    elif client["last_checker_status"] != 0:
 
2421
                        logger.warning(
 
2422
                            "disabling client {0} - Client "
 
2423
                            "last checker failed with error code {1}"
 
2424
                            .format(client_name,
 
2425
                                    client["last_checker_status"]))
 
2426
                        client["enabled"] = False
 
2427
                    else:
 
2428
                        client["expires"] = (datetime.datetime
 
2429
                                             .utcnow()
 
2430
                                             + client["timeout"])
 
2431
                        logger.debug("Last checker succeeded,"
 
2432
                                     " keeping {0} enabled"
 
2433
                                     .format(client_name))
1975
2434
            try:
1976
 
                yield (name, special_settings[name]())
1977
 
            except KeyError:
1978
 
                yield (name, value)
1979
 
    
1980
 
    tcp_server.clients.update(set(
1981
 
            client_class(name = section,
1982
 
                         config= dict(client_config_items(
1983
 
                        client_config, section)))
1984
 
            for section in client_config.sections()))
 
2435
                client["secret"] = (
 
2436
                    pgp.decrypt(client["encrypted_secret"],
 
2437
                                client_settings[client_name]
 
2438
                                ["secret"]))
 
2439
            except PGPError:
 
2440
                # If decryption fails, we use secret from new settings
 
2441
                logger.debug("Failed to decrypt {0} old secret"
 
2442
                             .format(client_name))
 
2443
                client["secret"] = (
 
2444
                    client_settings[client_name]["secret"])
 
2445
    
 
2446
    # Add/remove clients based on new changes made to config
 
2447
    for client_name in (set(old_client_settings)
 
2448
                        - set(client_settings)):
 
2449
        del clients_data[client_name]
 
2450
    for client_name in (set(client_settings)
 
2451
                        - set(old_client_settings)):
 
2452
        clients_data[client_name] = client_settings[client_name]
 
2453
    
 
2454
    # Create all client objects
 
2455
    for client_name, client in clients_data.iteritems():
 
2456
        tcp_server.clients[client_name] = client_class(
 
2457
            name = client_name, settings = client)
 
2458
    
1985
2459
    if not tcp_server.clients:
1986
2460
        logger.warning("No clients defined")
1987
 
        
 
2461
    
1988
2462
    if not debug:
1989
2463
        try:
1990
2464
            with pidfile:
1998
2472
            # "pidfile" was never created
1999
2473
            pass
2000
2474
        del pidfilename
2001
 
        
2002
2475
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2003
 
 
 
2476
    
2004
2477
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2005
2478
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2006
2479
    
2007
2480
    if use_dbus:
2008
 
        class MandosDBusService(dbus.service.Object):
 
2481
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2482
                                        "se.bsnet.fukt.Mandos"})
 
2483
        class MandosDBusService(DBusObjectWithProperties):
2009
2484
            """A D-Bus proxy object"""
2010
2485
            def __init__(self):
2011
2486
                dbus.service.Object.__init__(self, bus, "/")
2012
 
            _interface = "se.bsnet.fukt.Mandos"
 
2487
            _interface = "se.recompile.Mandos"
 
2488
            
 
2489
            @dbus_interface_annotations(_interface)
 
2490
            def _foo(self):
 
2491
                return { "org.freedesktop.DBus.Property"
 
2492
                         ".EmitsChangedSignal":
 
2493
                             "false"}
2013
2494
            
2014
2495
            @dbus.service.signal(_interface, signature="o")
2015
2496
            def ClientAdded(self, objpath):
2030
2511
            def GetAllClients(self):
2031
2512
                "D-Bus method"
2032
2513
                return dbus.Array(c.dbus_object_path
2033
 
                                  for c in tcp_server.clients)
 
2514
                                  for c in
 
2515
                                  tcp_server.clients.itervalues())
2034
2516
            
2035
2517
            @dbus.service.method(_interface,
2036
2518
                                 out_signature="a{oa{sv}}")
2038
2520
                "D-Bus method"
2039
2521
                return dbus.Dictionary(
2040
2522
                    ((c.dbus_object_path, c.GetAll(""))
2041
 
                     for c in tcp_server.clients),
 
2523
                     for c in tcp_server.clients.itervalues()),
2042
2524
                    signature="oa{sv}")
2043
2525
            
2044
2526
            @dbus.service.method(_interface, in_signature="o")
2045
2527
            def RemoveClient(self, object_path):
2046
2528
                "D-Bus method"
2047
 
                for c in tcp_server.clients:
 
2529
                for c in tcp_server.clients.itervalues():
2048
2530
                    if c.dbus_object_path == object_path:
2049
 
                        tcp_server.clients.remove(c)
 
2531
                        del tcp_server.clients[c.name]
2050
2532
                        c.remove_from_connection()
2051
2533
                        # Don't signal anything except ClientRemoved
2052
2534
                        c.disable(quiet=True)
2063
2545
        "Cleanup function; run on exit"
2064
2546
        service.cleanup()
2065
2547
        
 
2548
        multiprocessing.active_children()
 
2549
        if not (tcp_server.clients or client_settings):
 
2550
            return
 
2551
        
 
2552
        # Store client before exiting. Secrets are encrypted with key
 
2553
        # based on what config file has. If config file is
 
2554
        # removed/edited, old secret will thus be unrecovable.
 
2555
        clients = {}
 
2556
        with PGPEngine() as pgp:
 
2557
            for client in tcp_server.clients.itervalues():
 
2558
                key = client_settings[client.name]["secret"]
 
2559
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2560
                                                      key)
 
2561
                client_dict = {}
 
2562
                
 
2563
                # A list of attributes that can not be pickled
 
2564
                # + secret.
 
2565
                exclude = set(("bus", "changedstate", "secret",
 
2566
                               "checker"))
 
2567
                for name, typ in (inspect.getmembers
 
2568
                                  (dbus.service.Object)):
 
2569
                    exclude.add(name)
 
2570
                
 
2571
                client_dict["encrypted_secret"] = (client
 
2572
                                                   .encrypted_secret)
 
2573
                for attr in client.client_structure:
 
2574
                    if attr not in exclude:
 
2575
                        client_dict[attr] = getattr(client, attr)
 
2576
                
 
2577
                clients[client.name] = client_dict
 
2578
                del client_settings[client.name]["secret"]
 
2579
        
 
2580
        try:
 
2581
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2582
                                                prefix="clients-",
 
2583
                                                dir=os.path.dirname
 
2584
                                                (stored_state_path))
 
2585
            with os.fdopen(tempfd, "wb") as stored_state:
 
2586
                pickle.dump((clients, client_settings), stored_state)
 
2587
            os.rename(tempname, stored_state_path)
 
2588
        except (IOError, OSError) as e:
 
2589
            if not debug:
 
2590
                try:
 
2591
                    os.remove(tempname)
 
2592
                except NameError:
 
2593
                    pass
 
2594
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2595
                logger.warning("Could not save persistent state: {0}"
 
2596
                               .format(os.strerror(e.errno)))
 
2597
            else:
 
2598
                logger.warning("Could not save persistent state:",
 
2599
                               exc_info=e)
 
2600
                raise e
 
2601
        
 
2602
        # Delete all clients, and settings from config
2066
2603
        while tcp_server.clients:
2067
 
            client = tcp_server.clients.pop()
 
2604
            name, client = tcp_server.clients.popitem()
2068
2605
            if use_dbus:
2069
2606
                client.remove_from_connection()
2070
 
            client.disable_hook = None
2071
2607
            # Don't signal anything except ClientRemoved
2072
2608
            client.disable(quiet=True)
2073
2609
            if use_dbus:
2074
2610
                # Emit D-Bus signal
2075
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2611
                mandos_dbus_service.ClientRemoved(client
 
2612
                                                  .dbus_object_path,
2076
2613
                                                  client.name)
 
2614
        client_settings.clear()
2077
2615
    
2078
2616
    atexit.register(cleanup)
2079
2617
    
2080
 
    for client in tcp_server.clients:
 
2618
    for client in tcp_server.clients.itervalues():
2081
2619
        if use_dbus:
2082
2620
            # Emit D-Bus signal
2083
2621
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2084
 
        client.enable()
 
2622
        # Need to initiate checking of clients
 
2623
        if client.enabled:
 
2624
            client.init_checker()
2085
2625
    
2086
2626
    tcp_server.enable()
2087
2627
    tcp_server.server_activate()
2090
2630
    service.port = tcp_server.socket.getsockname()[1]
2091
2631
    if use_ipv6:
2092
2632
        logger.info("Now listening on address %r, port %d,"
2093
 
                    " flowinfo %d, scope_id %d"
2094
 
                    % tcp_server.socket.getsockname())
 
2633
                    " flowinfo %d, scope_id %d",
 
2634
                    *tcp_server.socket.getsockname())
2095
2635
    else:                       # IPv4
2096
 
        logger.info("Now listening on address %r, port %d"
2097
 
                    % tcp_server.socket.getsockname())
 
2636
        logger.info("Now listening on address %r, port %d",
 
2637
                    *tcp_server.socket.getsockname())
2098
2638
    
2099
2639
    #service.interface = tcp_server.socket.getsockname()[3]
2100
2640
    
2103
2643
        try:
2104
2644
            service.activate()
2105
2645
        except dbus.exceptions.DBusException as error:
2106
 
            logger.critical("DBusException: %s", error)
 
2646
            logger.critical("D-Bus Exception", exc_info=error)
2107
2647
            cleanup()
2108
2648
            sys.exit(1)
2109
2649
        # End of Avahi example code
2116
2656
        logger.debug("Starting main loop")
2117
2657
        main_loop.run()
2118
2658
    except AvahiError as error:
2119
 
        logger.critical("AvahiError: %s", error)
 
2659
        logger.critical("Avahi Error", exc_info=error)
2120
2660
        cleanup()
2121
2661
        sys.exit(1)
2122
2662
    except KeyboardInterrupt: