/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

Intermediate commit - this does *not* work yet.

* plugins.d/mandos-client.c (HOOKDIR): New.
  (up_interface): New.
  (runnable_hook): New.
  (main): Run network hooks with "start" argument.

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-2013 Teddy Hogeborn
15
 
# Copyright © 2008-2013 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
65
63
import cPickle as pickle
66
64
import multiprocessing
67
65
import types
68
 
import binascii
69
 
import tempfile
70
 
import itertools
71
 
import collections
72
66
 
73
67
import dbus
74
68
import dbus.service
88
82
    except ImportError:
89
83
        SO_BINDTODEVICE = None
90
84
 
91
 
version = "1.6.1"
92
 
stored_state_file = "clients.pickle"
93
 
 
94
 
logger = logging.getLogger()
 
85
 
 
86
version = "1.4.1"
 
87
 
 
88
#logger = logging.getLogger('mandos')
 
89
logger = logging.Logger('mandos')
95
90
syslogger = (logging.handlers.SysLogHandler
96
91
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
92
              address = str("/dev/log")))
98
 
 
99
 
try:
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
101
 
                      (ctypes.util.find_library("c"))
102
 
                      .if_nametoindex)
103
 
except (OSError, AttributeError):
104
 
    def if_nametoindex(interface):
105
 
        "Get an interface index the hard way, i.e. using fcntl()"
106
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
107
 
        with contextlib.closing(socket.socket()) as s:
108
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
 
                                struct.pack(str("16s16x"),
110
 
                                            interface))
111
 
        interface_index = struct.unpack(str("I"),
112
 
                                        ifreq[16:20])[0]
113
 
        return interface_index
114
 
 
115
 
 
116
 
def initlogger(debug, level=logging.WARNING):
117
 
    """init logger and add loglevel"""
118
 
    
119
 
    syslogger.setFormatter(logging.Formatter
120
 
                           ('Mandos [%(process)d]: %(levelname)s:'
121
 
                            ' %(message)s'))
122
 
    logger.addHandler(syslogger)
123
 
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
131
 
    logger.setLevel(level)
132
 
 
133
 
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
136
 
    pass
137
 
 
138
 
 
139
 
class PGPEngine(object):
140
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
 
    def __init__(self):
142
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--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
 
        passphrase = self.password_encode(password)
179
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
180
 
                                         ) as passfile:
181
 
            passfile.write(passphrase)
182
 
            passfile.flush()
183
 
            proc = subprocess.Popen(['gpg', '--symmetric',
184
 
                                     '--passphrase-file',
185
 
                                     passfile.name]
186
 
                                    + self.gnupgargs,
187
 
                                    stdin = subprocess.PIPE,
188
 
                                    stdout = subprocess.PIPE,
189
 
                                    stderr = subprocess.PIPE)
190
 
            ciphertext, err = proc.communicate(input = data)
191
 
        if proc.returncode != 0:
192
 
            raise PGPError(err)
193
 
        return ciphertext
194
 
    
195
 
    def decrypt(self, data, password):
196
 
        passphrase = self.password_encode(password)
197
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
198
 
                                         ) as passfile:
199
 
            passfile.write(passphrase)
200
 
            passfile.flush()
201
 
            proc = subprocess.Popen(['gpg', '--decrypt',
202
 
                                     '--passphrase-file',
203
 
                                     passfile.name]
204
 
                                    + self.gnupgargs,
205
 
                                    stdin = subprocess.PIPE,
206
 
                                    stdout = subprocess.PIPE,
207
 
                                    stderr = subprocess.PIPE)
208
 
            decrypted_plaintext, err = proc.communicate(input
209
 
                                                        = data)
210
 
        if proc.returncode != 0:
211
 
            raise PGPError(err)
212
 
        return decrypted_plaintext
213
 
 
 
93
syslogger.setFormatter(logging.Formatter
 
94
                       ('Mandos [%(process)d]: %(levelname)s:'
 
95
                        ' %(message)s'))
 
96
logger.addHandler(syslogger)
 
97
 
 
98
console = logging.StreamHandler()
 
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
100
                                       ' %(levelname)s:'
 
101
                                       ' %(message)s'))
 
102
logger.addHandler(console)
214
103
 
215
104
class AvahiError(Exception):
216
105
    def __init__(self, value, *args, **kwargs):
234
123
               Used to optionally bind to the specified interface.
235
124
    name: string; Example: 'Mandos'
236
125
    type: string; Example: '_mandos._tcp'.
237
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
126
                  See <http://www.dns-sd.org/ServiceTypes.html>
238
127
    port: integer; what port to announce
239
128
    TXT: list of strings; TXT record for the service
240
129
    domain: string; Domain to publish on, default to .local if empty.
246
135
    server: D-Bus Server
247
136
    bus: dbus.SystemBus()
248
137
    """
249
 
    
250
138
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
139
                 servicetype = None, port = None, TXT = None,
252
140
                 domain = "", host = "", max_renames = 32768,
265
153
        self.server = None
266
154
        self.bus = bus
267
155
        self.entry_group_state_changed_match = None
268
 
    
269
156
    def rename(self):
270
157
        """Derived from the Avahi example code"""
271
158
        if self.rename_count >= self.max_renames:
277
164
                            .GetAlternativeServiceName(self.name))
278
165
        logger.info("Changing Zeroconf service name to %r ...",
279
166
                    self.name)
 
167
        syslogger.setFormatter(logging.Formatter
 
168
                               ('Mandos (%s) [%%(process)d]:'
 
169
                                ' %%(levelname)s: %%(message)s'
 
170
                                % self.name))
280
171
        self.remove()
281
172
        try:
282
173
            self.add()
283
174
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
175
            logger.critical("DBusException: %s", error)
285
176
            self.cleanup()
286
177
            os._exit(1)
287
178
        self.rename_count += 1
288
 
    
289
179
    def remove(self):
290
180
        """Derived from the Avahi example code"""
291
181
        if self.entry_group_state_changed_match is not None:
293
183
            self.entry_group_state_changed_match = None
294
184
        if self.group is not None:
295
185
            self.group.Reset()
296
 
    
297
186
    def add(self):
298
187
        """Derived from the Avahi example code"""
299
188
        self.remove()
304
193
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
305
194
        self.entry_group_state_changed_match = (
306
195
            self.group.connect_to_signal(
307
 
                'StateChanged', self.entry_group_state_changed))
 
196
                'StateChanged', self .entry_group_state_changed))
308
197
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
309
198
                     self.name, self.type)
310
199
        self.group.AddService(
316
205
            dbus.UInt16(self.port),
317
206
            avahi.string_array_to_txt_array(self.TXT))
318
207
        self.group.Commit()
319
 
    
320
208
    def entry_group_state_changed(self, state, error):
321
209
        """Derived from the Avahi example code"""
322
210
        logger.debug("Avahi entry group state change: %i", state)
329
217
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
218
            logger.critical("Avahi: Error in group state changed %s",
331
219
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
220
            raise AvahiGroupError("State changed: %s"
 
221
                                  % unicode(error))
335
222
    def cleanup(self):
336
223
        """Derived from the Avahi example code"""
337
224
        if self.group is not None:
338
225
            try:
339
226
                self.group.Free()
340
227
            except (dbus.exceptions.UnknownMethodException,
341
 
                    dbus.exceptions.DBusException):
 
228
                    dbus.exceptions.DBusException) as e:
342
229
                pass
343
230
            self.group = None
344
231
        self.remove()
345
 
    
346
232
    def server_state_changed(self, state, error=None):
347
233
        """Derived from the Avahi example code"""
348
234
        logger.debug("Avahi server state change: %i", state)
367
253
                logger.debug("Unknown state: %r", state)
368
254
            else:
369
255
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
256
    def activate(self):
372
257
        """Derived from the Avahi example code"""
373
258
        if self.server is None:
381
266
        self.server_state_changed(self.server.GetState())
382
267
 
383
268
 
384
 
class AvahiServiceToSyslog(AvahiService):
385
 
    def rename(self):
386
 
        """Add the new name to the syslog messages"""
387
 
        ret = AvahiService.rename(self)
388
 
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
392
 
        return ret
393
 
 
394
 
 
395
 
def timedelta_to_milliseconds(td):
 
269
def _timedelta_to_milliseconds(td):
396
270
    "Convert a datetime.timedelta() to milliseconds"
397
271
    return ((td.days * 24 * 60 * 60 * 1000)
398
272
            + (td.seconds * 1000)
399
273
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
274
        
402
275
class Client(object):
403
276
    """A representation of a client host served by this server.
404
277
    
405
278
    Attributes:
406
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
279
    _approved:   bool(); 'None' if not yet approved/disapproved
407
280
    approval_delay: datetime.timedelta(); Time to wait for approval
408
281
    approval_duration: datetime.timedelta(); Duration of one approval
409
282
    checker:    subprocess.Popen(); a running checker process used
416
289
                     instance %(name)s can be used in the command.
417
290
    checker_initiator_tag: a gobject event source tag, or None
418
291
    created:    datetime.datetime(); (UTC) object creation
419
 
    client_structure: Object describing what attributes a client has
420
 
                      and is used for storing the client at exit
421
292
    current_checker_command: string; current running checker_command
 
293
    disable_hook:  If set, called by disable() as disable_hook(self)
422
294
    disable_initiator_tag: a gobject event source tag, or None
423
295
    enabled:    bool()
424
296
    fingerprint: string (40 or 32 hexadecimal digits); used to
427
299
    interval:   datetime.timedelta(); How often to start a new checker
428
300
    last_approval_request: datetime.datetime(); (UTC) or None
429
301
    last_checked_ok: datetime.datetime(); (UTC) or None
430
 
    last_checker_status: integer between 0 and 255 reflecting exit
431
 
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
433
 
    last_enabled: datetime.datetime(); (UTC) or None
 
302
    last_enabled: datetime.datetime(); (UTC)
434
303
    name:       string; from the config file, used in log messages and
435
304
                        D-Bus identifiers
436
305
    secret:     bytestring; sent verbatim (over TLS) to client
437
306
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
307
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
308
    extended_timeout:   extra long timeout when password has been sent
440
309
    runtime_expansions: Allowed attributes for runtime expansion.
441
310
    expires:    datetime.datetime(); time (UTC) when a client will be
442
311
                disabled, or None
443
 
    server_settings: The server_settings dict from main()
444
312
    """
445
313
    
446
314
    runtime_expansions = ("approval_delay", "approval_duration",
447
 
                          "created", "enabled", "expires",
448
 
                          "fingerprint", "host", "interval",
449
 
                          "last_approval_request", "last_checked_ok",
 
315
                          "created", "enabled", "fingerprint",
 
316
                          "host", "interval", "last_checked_ok",
450
317
                          "last_enabled", "name", "timeout")
451
 
    client_defaults = { "timeout": "PT5M",
452
 
                        "extended_timeout": "PT15M",
453
 
                        "interval": "PT2M",
454
 
                        "checker": "fping -q -- %%(host)s",
455
 
                        "host": "",
456
 
                        "approval_delay": "PT0S",
457
 
                        "approval_duration": "PT1S",
458
 
                        "approved_by_default": "True",
459
 
                        "enabled": "True",
460
 
                        }
461
318
    
462
319
    def timeout_milliseconds(self):
463
320
        "Return the 'timeout' attribute in milliseconds"
464
 
        return timedelta_to_milliseconds(self.timeout)
 
321
        return _timedelta_to_milliseconds(self.timeout)
465
322
    
466
323
    def extended_timeout_milliseconds(self):
467
324
        "Return the 'extended_timeout' attribute in milliseconds"
468
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
325
        return _timedelta_to_milliseconds(self.extended_timeout)
469
326
    
470
327
    def interval_milliseconds(self):
471
328
        "Return the 'interval' attribute in milliseconds"
472
 
        return timedelta_to_milliseconds(self.interval)
 
329
        return _timedelta_to_milliseconds(self.interval)
473
330
    
474
331
    def approval_delay_milliseconds(self):
475
 
        return timedelta_to_milliseconds(self.approval_delay)
476
 
    
477
 
    @staticmethod
478
 
    def config_parser(config):
479
 
        """Construct a new dict of client settings of this form:
480
 
        { client_name: {setting_name: value, ...}, ...}
481
 
        with exceptions for any special settings as defined above.
482
 
        NOTE: Must be a pure function. Must return the same result
483
 
        value given the same arguments.
484
 
        """
485
 
        settings = {}
486
 
        for client_name in config.sections():
487
 
            section = dict(config.items(client_name))
488
 
            client = settings[client_name] = {}
489
 
            
490
 
            client["host"] = section["host"]
491
 
            # Reformat values from string types to Python types
492
 
            client["approved_by_default"] = config.getboolean(
493
 
                client_name, "approved_by_default")
494
 
            client["enabled"] = config.getboolean(client_name,
495
 
                                                  "enabled")
496
 
            
497
 
            client["fingerprint"] = (section["fingerprint"].upper()
498
 
                                     .replace(" ", ""))
499
 
            if "secret" in section:
500
 
                client["secret"] = section["secret"].decode("base64")
501
 
            elif "secfile" in section:
502
 
                with open(os.path.expanduser(os.path.expandvars
503
 
                                             (section["secfile"])),
504
 
                          "rb") as secfile:
505
 
                    client["secret"] = secfile.read()
506
 
            else:
507
 
                raise TypeError("No secret or secfile for section {0}"
508
 
                                .format(section))
509
 
            client["timeout"] = string_to_delta(section["timeout"])
510
 
            client["extended_timeout"] = string_to_delta(
511
 
                section["extended_timeout"])
512
 
            client["interval"] = string_to_delta(section["interval"])
513
 
            client["approval_delay"] = string_to_delta(
514
 
                section["approval_delay"])
515
 
            client["approval_duration"] = string_to_delta(
516
 
                section["approval_duration"])
517
 
            client["checker_command"] = section["checker"]
518
 
            client["last_approval_request"] = None
519
 
            client["last_checked_ok"] = None
520
 
            client["last_checker_status"] = -2
521
 
        
522
 
        return settings
523
 
    
524
 
    def __init__(self, settings, name = None, server_settings=None):
 
332
        return _timedelta_to_milliseconds(self.approval_delay)
 
333
    
 
334
    def __init__(self, name = None, disable_hook=None, config=None):
 
335
        """Note: the 'checker' key in 'config' sets the
 
336
        'checker_command' attribute and *not* the 'checker'
 
337
        attribute."""
525
338
        self.name = name
526
 
        if server_settings is None:
527
 
            server_settings = {}
528
 
        self.server_settings = server_settings
529
 
        # adding all client settings
530
 
        for setting, value in settings.iteritems():
531
 
            setattr(self, setting, value)
532
 
        
533
 
        if self.enabled:
534
 
            if not hasattr(self, "last_enabled"):
535
 
                self.last_enabled = datetime.datetime.utcnow()
536
 
            if not hasattr(self, "expires"):
537
 
                self.expires = (datetime.datetime.utcnow()
538
 
                                + self.timeout)
539
 
        else:
540
 
            self.last_enabled = None
541
 
            self.expires = None
542
 
        
 
339
        if config is None:
 
340
            config = {}
543
341
        logger.debug("Creating client %r", self.name)
544
342
        # Uppercase and remove spaces from fingerprint for later
545
343
        # comparison purposes with return value from the fingerprint()
546
344
        # function
 
345
        self.fingerprint = (config["fingerprint"].upper()
 
346
                            .replace(" ", ""))
547
347
        logger.debug("  Fingerprint: %s", self.fingerprint)
548
 
        self.created = settings.get("created",
549
 
                                    datetime.datetime.utcnow())
550
 
        
551
 
        # attributes specific for this server instance
 
348
        if "secret" in config:
 
349
            self.secret = config["secret"].decode("base64")
 
350
        elif "secfile" in config:
 
351
            with open(os.path.expanduser(os.path.expandvars
 
352
                                         (config["secfile"])),
 
353
                      "rb") as secfile:
 
354
                self.secret = secfile.read()
 
355
        else:
 
356
            raise TypeError("No secret or secfile for client %s"
 
357
                            % self.name)
 
358
        self.host = config.get("host", "")
 
359
        self.created = datetime.datetime.utcnow()
 
360
        self.enabled = False
 
361
        self.last_approval_request = None
 
362
        self.last_enabled = None
 
363
        self.last_checked_ok = None
 
364
        self.timeout = string_to_delta(config["timeout"])
 
365
        self.extended_timeout = string_to_delta(config
 
366
                                                ["extended_timeout"])
 
367
        self.interval = string_to_delta(config["interval"])
 
368
        self.disable_hook = disable_hook
552
369
        self.checker = None
553
370
        self.checker_initiator_tag = None
554
371
        self.disable_initiator_tag = None
 
372
        self.expires = None
555
373
        self.checker_callback_tag = None
 
374
        self.checker_command = config["checker"]
556
375
        self.current_checker_command = None
557
 
        self.approved = None
 
376
        self.last_connect = None
 
377
        self._approved = None
 
378
        self.approved_by_default = config.get("approved_by_default",
 
379
                                              True)
558
380
        self.approvals_pending = 0
 
381
        self.approval_delay = string_to_delta(
 
382
            config["approval_delay"])
 
383
        self.approval_duration = string_to_delta(
 
384
            config["approval_duration"])
559
385
        self.changedstate = (multiprocessing_manager
560
386
                             .Condition(multiprocessing_manager
561
387
                                        .Lock()))
562
 
        self.client_structure = [attr for attr in
563
 
                                 self.__dict__.iterkeys()
564
 
                                 if not attr.startswith("_")]
565
 
        self.client_structure.append("client_structure")
566
 
        
567
 
        for name, t in inspect.getmembers(type(self),
568
 
                                          lambda obj:
569
 
                                              isinstance(obj,
570
 
                                                         property)):
571
 
            if not name.startswith("_"):
572
 
                self.client_structure.append(name)
573
388
    
574
 
    # Send notice to process children that client state has changed
575
389
    def send_changedstate(self):
576
 
        with self.changedstate:
577
 
            self.changedstate.notify_all()
 
390
        self.changedstate.acquire()
 
391
        self.changedstate.notify_all()
 
392
        self.changedstate.release()
578
393
    
579
394
    def enable(self):
580
395
        """Start this client's checker and timeout hooks"""
581
396
        if getattr(self, "enabled", False):
582
397
            # Already enabled
583
398
            return
584
 
        self.expires = datetime.datetime.utcnow() + self.timeout
585
 
        self.enabled = True
586
 
        self.last_enabled = datetime.datetime.utcnow()
587
 
        self.init_checker()
588
399
        self.send_changedstate()
589
 
    
590
 
    def disable(self, quiet=True):
591
 
        """Disable this client."""
592
 
        if not getattr(self, "enabled", False):
593
 
            return False
594
 
        if not quiet:
595
 
            logger.info("Disabling client %s", self.name)
596
 
        if getattr(self, "disable_initiator_tag", None) is not None:
597
 
            gobject.source_remove(self.disable_initiator_tag)
598
 
            self.disable_initiator_tag = None
599
 
        self.expires = None
600
 
        if getattr(self, "checker_initiator_tag", None) is not None:
601
 
            gobject.source_remove(self.checker_initiator_tag)
602
 
            self.checker_initiator_tag = None
603
 
        self.stop_checker()
604
 
        self.enabled = False
605
 
        if not quiet:
606
 
            self.send_changedstate()
607
 
        # Do not run this again if called by a gobject.timeout_add
608
 
        return False
609
 
    
610
 
    def __del__(self):
611
 
        self.disable()
612
 
    
613
 
    def init_checker(self):
614
400
        # Schedule a new checker to be started an 'interval' from now,
615
401
        # and every interval from then on.
616
 
        if self.checker_initiator_tag is not None:
617
 
            gobject.source_remove(self.checker_initiator_tag)
618
402
        self.checker_initiator_tag = (gobject.timeout_add
619
403
                                      (self.interval_milliseconds(),
620
404
                                       self.start_checker))
621
405
        # Schedule a disable() when 'timeout' has passed
622
 
        if self.disable_initiator_tag is not None:
623
 
            gobject.source_remove(self.disable_initiator_tag)
 
406
        self.expires = datetime.datetime.utcnow() + self.timeout
624
407
        self.disable_initiator_tag = (gobject.timeout_add
625
408
                                   (self.timeout_milliseconds(),
626
409
                                    self.disable))
 
410
        self.enabled = True
 
411
        self.last_enabled = datetime.datetime.utcnow()
627
412
        # Also start a new checker *right now*.
628
413
        self.start_checker()
629
414
    
 
415
    def disable(self, quiet=True):
 
416
        """Disable this client."""
 
417
        if not getattr(self, "enabled", False):
 
418
            return False
 
419
        if not quiet:
 
420
            self.send_changedstate()
 
421
        if not quiet:
 
422
            logger.info("Disabling client %s", self.name)
 
423
        if getattr(self, "disable_initiator_tag", False):
 
424
            gobject.source_remove(self.disable_initiator_tag)
 
425
            self.disable_initiator_tag = None
 
426
        self.expires = None
 
427
        if getattr(self, "checker_initiator_tag", False):
 
428
            gobject.source_remove(self.checker_initiator_tag)
 
429
            self.checker_initiator_tag = None
 
430
        self.stop_checker()
 
431
        if self.disable_hook:
 
432
            self.disable_hook(self)
 
433
        self.enabled = False
 
434
        # Do not run this again if called by a gobject.timeout_add
 
435
        return False
 
436
    
 
437
    def __del__(self):
 
438
        self.disable_hook = None
 
439
        self.disable()
 
440
    
630
441
    def checker_callback(self, pid, condition, command):
631
442
        """The checker has completed, so take appropriate actions."""
632
443
        self.checker_callback_tag = None
633
444
        self.checker = None
634
445
        if os.WIFEXITED(condition):
635
 
            self.last_checker_status = os.WEXITSTATUS(condition)
636
 
            if self.last_checker_status == 0:
 
446
            exitstatus = os.WEXITSTATUS(condition)
 
447
            if exitstatus == 0:
637
448
                logger.info("Checker for %(name)s succeeded",
638
449
                            vars(self))
639
450
                self.checked_ok()
641
452
                logger.info("Checker for %(name)s failed",
642
453
                            vars(self))
643
454
        else:
644
 
            self.last_checker_status = -1
645
455
            logger.warning("Checker for %(name)s crashed?",
646
456
                           vars(self))
647
457
    
648
 
    def checked_ok(self):
649
 
        """Assert that the client has been seen, alive and well."""
650
 
        self.last_checked_ok = datetime.datetime.utcnow()
651
 
        self.last_checker_status = 0
652
 
        self.bump_timeout()
653
 
    
654
 
    def bump_timeout(self, timeout=None):
655
 
        """Bump up the timeout for this client."""
 
458
    def checked_ok(self, timeout=None):
 
459
        """Bump up the timeout for this client.
 
460
        
 
461
        This should only be called when the client has been seen,
 
462
        alive and well.
 
463
        """
656
464
        if timeout is None:
657
465
            timeout = self.timeout
 
466
        self.last_checked_ok = datetime.datetime.utcnow()
658
467
        if self.disable_initiator_tag is not None:
659
468
            gobject.source_remove(self.disable_initiator_tag)
660
 
            self.disable_initiator_tag = None
661
469
        if getattr(self, "enabled", False):
662
470
            self.disable_initiator_tag = (gobject.timeout_add
663
 
                                          (timedelta_to_milliseconds
 
471
                                          (_timedelta_to_milliseconds
664
472
                                           (timeout), self.disable))
665
473
            self.expires = datetime.datetime.utcnow() + timeout
666
474
    
673
481
        If a checker already exists, leave it running and do
674
482
        nothing."""
675
483
        # The reason for not killing a running checker is that if we
676
 
        # did that, and if a checker (for some reason) started running
677
 
        # slowly and taking more than 'interval' time, then the client
678
 
        # would inevitably timeout, since no checker would get a
679
 
        # chance to run to completion.  If we instead leave running
 
484
        # did that, then if a checker (for some reason) started
 
485
        # running slowly and taking more than 'interval' time, the
 
486
        # client would inevitably timeout, since no checker would get
 
487
        # a chance to run to completion.  If we instead leave running
680
488
        # checkers alone, the checker would have to take more time
681
489
        # than 'timeout' for the client to be disabled, which is as it
682
490
        # should be.
696
504
                                      self.current_checker_command)
697
505
        # Start a new checker if needed
698
506
        if self.checker is None:
699
 
            # Escape attributes for the shell
700
 
            escaped_attrs = dict(
701
 
                (attr, re.escape(unicode(getattr(self, attr))))
702
 
                for attr in
703
 
                self.runtime_expansions)
704
507
            try:
705
 
                command = self.checker_command % escaped_attrs
706
 
            except TypeError as error:
707
 
                logger.error('Could not format string "%s"',
708
 
                             self.checker_command, exc_info=error)
709
 
                return True # Try again later
 
508
                # In case checker_command has exactly one % operator
 
509
                command = self.checker_command % self.host
 
510
            except TypeError:
 
511
                # Escape attributes for the shell
 
512
                escaped_attrs = dict(
 
513
                    (attr,
 
514
                     re.escape(unicode(str(getattr(self, attr, "")),
 
515
                                       errors=
 
516
                                       'replace')))
 
517
                    for attr in
 
518
                    self.runtime_expansions)
 
519
                
 
520
                try:
 
521
                    command = self.checker_command % escaped_attrs
 
522
                except TypeError as error:
 
523
                    logger.error('Could not format string "%s":'
 
524
                                 ' %s', self.checker_command, error)
 
525
                    return True # Try again later
710
526
            self.current_checker_command = command
711
527
            try:
712
528
                logger.info("Starting checker %r for %s",
715
531
                # in normal mode, that is already done by daemon(),
716
532
                # and in debug mode we don't want to.  (Stdin is
717
533
                # always replaced by /dev/null.)
718
 
                # The exception is when not debugging but nevertheless
719
 
                # running in the foreground; use the previously
720
 
                # created wnull.
721
 
                popen_args = {}
722
 
                if (not self.server_settings["debug"]
723
 
                    and self.server_settings["foreground"]):
724
 
                    popen_args.update({"stdout": wnull,
725
 
                                       "stderr": wnull })
726
534
                self.checker = subprocess.Popen(command,
727
535
                                                close_fds=True,
728
 
                                                shell=True, cwd="/",
729
 
                                                **popen_args)
730
 
            except OSError as error:
731
 
                logger.error("Failed to start subprocess",
732
 
                             exc_info=error)
733
 
                return True
734
 
            self.checker_callback_tag = (gobject.child_watch_add
735
 
                                         (self.checker.pid,
736
 
                                          self.checker_callback,
737
 
                                          data=command))
738
 
            # The checker may have completed before the gobject
739
 
            # watch was added.  Check for this.
740
 
            try:
 
536
                                                shell=True, cwd="/")
 
537
                self.checker_callback_tag = (gobject.child_watch_add
 
538
                                             (self.checker.pid,
 
539
                                              self.checker_callback,
 
540
                                              data=command))
 
541
                # The checker may have completed before the gobject
 
542
                # watch was added.  Check for this.
741
543
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
544
                if pid:
 
545
                    gobject.source_remove(self.checker_callback_tag)
 
546
                    self.checker_callback(pid, status, command)
742
547
            except OSError as error:
743
 
                if error.errno == errno.ECHILD:
744
 
                    # This should never happen
745
 
                    logger.error("Child process vanished",
746
 
                                 exc_info=error)
747
 
                    return True
748
 
                raise
749
 
            if pid:
750
 
                gobject.source_remove(self.checker_callback_tag)
751
 
                self.checker_callback(pid, status, command)
 
548
                logger.error("Failed to start subprocess: %s",
 
549
                             error)
752
550
        # Re-run this periodically if run by gobject.timeout_add
753
551
        return True
754
552
    
761
559
            return
762
560
        logger.debug("Stopping checker for %(name)s", vars(self))
763
561
        try:
764
 
            self.checker.terminate()
 
562
            os.kill(self.checker.pid, signal.SIGTERM)
765
563
            #time.sleep(0.5)
766
564
            #if self.checker.poll() is None:
767
 
            #    self.checker.kill()
 
565
            #    os.kill(self.checker.pid, signal.SIGKILL)
768
566
        except OSError as error:
769
567
            if error.errno != errno.ESRCH: # No such process
770
568
                raise
787
585
    # "Set" method, so we fail early here:
788
586
    if byte_arrays and signature != "ay":
789
587
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
588
                         " signature %r" % signature)
791
589
    def decorator(func):
792
590
        func._dbus_is_property = True
793
591
        func._dbus_interface = dbus_interface
801
599
    return decorator
802
600
 
803
601
 
804
 
def dbus_interface_annotations(dbus_interface):
805
 
    """Decorator for marking functions returning interface annotations
806
 
    
807
 
    Usage:
808
 
    
809
 
    @dbus_interface_annotations("org.example.Interface")
810
 
    def _foo(self):  # Function name does not matter
811
 
        return {"org.freedesktop.DBus.Deprecated": "true",
812
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
813
 
                    "false"}
814
 
    """
815
 
    def decorator(func):
816
 
        func._dbus_is_interface = True
817
 
        func._dbus_interface = dbus_interface
818
 
        func._dbus_name = dbus_interface
819
 
        return func
820
 
    return decorator
821
 
 
822
 
 
823
 
def dbus_annotations(annotations):
824
 
    """Decorator to annotate D-Bus methods, signals or properties
825
 
    Usage:
826
 
    
827
 
    @dbus_service_property("org.example.Interface", signature="b",
828
 
                           access="r")
829
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
 
                        "org.freedesktop.DBus.Property."
831
 
                        "EmitsChangedSignal": "false"})
832
 
    def Property_dbus_property(self):
833
 
        return dbus.Boolean(False)
834
 
    """
835
 
    def decorator(func):
836
 
        func._dbus_annotations = annotations
837
 
        return func
838
 
    return decorator
839
 
 
840
 
 
841
602
class DBusPropertyException(dbus.exceptions.DBusException):
842
603
    """A base class for D-Bus property-related exceptions
843
604
    """
866
627
    """
867
628
    
868
629
    @staticmethod
869
 
    def _is_dbus_thing(thing):
870
 
        """Returns a function testing if an attribute is a D-Bus thing
871
 
        
872
 
        If called like _is_dbus_thing("method") it returns a function
873
 
        suitable for use as predicate to inspect.getmembers().
874
 
        """
875
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
876
 
                                   False)
 
630
    def _is_dbus_property(obj):
 
631
        return getattr(obj, "_dbus_is_property", False)
877
632
    
878
 
    def _get_all_dbus_things(self, thing):
 
633
    def _get_all_dbus_properties(self):
879
634
        """Returns a generator of (name, attribute) pairs
880
635
        """
881
 
        return ((getattr(athing.__get__(self), "_dbus_name",
882
 
                         name),
883
 
                 athing.__get__(self))
 
636
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
637
                for cls in self.__class__.__mro__
885
 
                for name, athing in
886
 
                inspect.getmembers(cls,
887
 
                                   self._is_dbus_thing(thing)))
 
638
                for name, prop in
 
639
                inspect.getmembers(cls, self._is_dbus_property))
888
640
    
889
641
    def _get_dbus_property(self, interface_name, property_name):
890
642
        """Returns a bound method if one exists which is a D-Bus
892
644
        """
893
645
        for cls in  self.__class__.__mro__:
894
646
            for name, value in (inspect.getmembers
895
 
                                (cls,
896
 
                                 self._is_dbus_thing("property"))):
 
647
                                (cls, self._is_dbus_property)):
897
648
                if (value._dbus_name == property_name
898
649
                    and value._dbus_interface == interface_name):
899
650
                    return value.__get__(self)
928
679
            # signatures other than "ay".
929
680
            if prop._dbus_signature != "ay":
930
681
                raise ValueError
931
 
            value = dbus.ByteArray(b''.join(chr(byte)
932
 
                                            for byte in value))
 
682
            value = dbus.ByteArray(''.join(unichr(byte)
 
683
                                           for byte in value))
933
684
        prop(value)
934
685
    
935
686
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
940
691
        
941
692
        Note: Will not include properties with access="write".
942
693
        """
943
 
        properties = {}
944
 
        for name, prop in self._get_all_dbus_things("property"):
 
694
        all = {}
 
695
        for name, prop in self._get_all_dbus_properties():
945
696
            if (interface_name
946
697
                and interface_name != prop._dbus_interface):
947
698
                # Interface non-empty but did not match
951
702
                continue
952
703
            value = prop()
953
704
            if not hasattr(value, "variant_level"):
954
 
                properties[name] = value
 
705
                all[name] = value
955
706
                continue
956
 
            properties[name] = type(value)(value, variant_level=
957
 
                                           value.variant_level+1)
958
 
        return dbus.Dictionary(properties, signature="sv")
 
707
            all[name] = type(value)(value, variant_level=
 
708
                                    value.variant_level+1)
 
709
        return dbus.Dictionary(all, signature="sv")
959
710
    
960
711
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
961
712
                         out_signature="s",
962
713
                         path_keyword='object_path',
963
714
                         connection_keyword='connection')
964
715
    def Introspect(self, object_path, connection):
965
 
        """Overloading of standard D-Bus method.
966
 
        
967
 
        Inserts property tags and interface annotation tags.
 
716
        """Standard D-Bus method, overloaded to insert property tags.
968
717
        """
969
718
        xmlstring = dbus.service.Object.Introspect(self, object_path,
970
719
                                                   connection)
977
726
                e.setAttribute("access", prop._dbus_access)
978
727
                return e
979
728
            for if_tag in document.getElementsByTagName("interface"):
980
 
                # Add property tags
981
729
                for tag in (make_tag(document, name, prop)
982
730
                            for name, prop
983
 
                            in self._get_all_dbus_things("property")
 
731
                            in self._get_all_dbus_properties()
984
732
                            if prop._dbus_interface
985
733
                            == if_tag.getAttribute("name")):
986
734
                    if_tag.appendChild(tag)
987
 
                # Add annotation tags
988
 
                for typ in ("method", "signal", "property"):
989
 
                    for tag in if_tag.getElementsByTagName(typ):
990
 
                        annots = dict()
991
 
                        for name, prop in (self.
992
 
                                           _get_all_dbus_things(typ)):
993
 
                            if (name == tag.getAttribute("name")
994
 
                                and prop._dbus_interface
995
 
                                == if_tag.getAttribute("name")):
996
 
                                annots.update(getattr
997
 
                                              (prop,
998
 
                                               "_dbus_annotations",
999
 
                                               {}))
1000
 
                        for name, value in annots.iteritems():
1001
 
                            ann_tag = document.createElement(
1002
 
                                "annotation")
1003
 
                            ann_tag.setAttribute("name", name)
1004
 
                            ann_tag.setAttribute("value", value)
1005
 
                            tag.appendChild(ann_tag)
1006
 
                # Add interface annotation tags
1007
 
                for annotation, value in dict(
1008
 
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
1010
 
                        for name, annotations in
1011
 
                        self._get_all_dbus_things("interface")
1012
 
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
1014
 
                    ann_tag = document.createElement("annotation")
1015
 
                    ann_tag.setAttribute("name", annotation)
1016
 
                    ann_tag.setAttribute("value", value)
1017
 
                    if_tag.appendChild(ann_tag)
1018
735
                # Add the names to the return values for the
1019
736
                # "org.freedesktop.DBus.Properties" methods
1020
737
                if (if_tag.getAttribute("name")
1035
752
        except (AttributeError, xml.dom.DOMException,
1036
753
                xml.parsers.expat.ExpatError) as error:
1037
754
            logger.error("Failed to override Introspection method",
1038
 
                         exc_info=error)
 
755
                         error)
1039
756
        return xmlstring
1040
757
 
1041
758
 
1042
 
def datetime_to_dbus(dt, variant_level=0):
 
759
def datetime_to_dbus (dt, variant_level=0):
1043
760
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
761
    if dt is None:
1045
762
        return dbus.String("", variant_level = variant_level)
1046
763
    return dbus.String(dt.isoformat(),
1047
764
                       variant_level=variant_level)
1048
765
 
1049
 
 
1050
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1051
 
    """A class decorator; applied to a subclass of
1052
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1053
 
    interface names according to the "alt_interface_names" mapping.
1054
 
    Usage:
1055
 
    
1056
 
    @alternate_dbus_interfaces({"org.example.Interface":
1057
 
                                    "net.example.AlternateInterface"})
1058
 
    class SampleDBusObject(dbus.service.Object):
1059
 
        @dbus.service.method("org.example.Interface")
1060
 
        def SampleDBusMethod():
1061
 
            pass
1062
 
    
1063
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1064
 
    reachable via two interfaces: "org.example.Interface" and
1065
 
    "net.example.AlternateInterface", the latter of which will have
1066
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1067
 
    "true", unless "deprecate" is passed with a False value.
1068
 
    
1069
 
    This works for methods and signals, and also for D-Bus properties
1070
 
    (from DBusObjectWithProperties) and interfaces (from the
1071
 
    dbus_interface_annotations decorator).
 
766
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
767
                                  .__metaclass__):
 
768
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
769
    will add additional D-Bus attributes matching a certain pattern.
1072
770
    """
1073
 
    def wrapper(cls):
1074
 
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
1076
 
            attr = {}
1077
 
            interface_names = set()
1078
 
            # Go though all attributes of the class
1079
 
            for attrname, attribute in inspect.getmembers(cls):
 
771
    def __new__(mcs, name, bases, attr):
 
772
        # Go through all the base classes which could have D-Bus
 
773
        # methods, signals, or properties in them
 
774
        for base in (b for b in bases
 
775
                     if issubclass(b, dbus.service.Object)):
 
776
            # Go though all attributes of the base class
 
777
            for attrname, attribute in inspect.getmembers(base):
1080
778
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
779
                # with the wrong interface name
1082
780
                if (not hasattr(attribute, "_dbus_interface")
1083
781
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
782
                    .startswith("se.recompile.Mandos")):
1085
783
                    continue
1086
784
                # Create an alternate D-Bus interface name based on
1087
785
                # the current name
1088
786
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
1091
 
                interface_names.add(alt_interface)
 
787
                                 .replace("se.recompile.Mandos",
 
788
                                          "se.bsnet.fukt.Mandos"))
1092
789
                # Is this a D-Bus signal?
1093
790
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
 
791
                    # Extract the original non-method function by
 
792
                    # black magic
1096
793
                    nonmethod_func = (dict(
1097
794
                            zip(attribute.func_code.co_freevars,
1098
795
                                attribute.__closure__))["func"]
1109
806
                                nonmethod_func.func_name,
1110
807
                                nonmethod_func.func_defaults,
1111
808
                                nonmethod_func.func_closure)))
1112
 
                    # Copy annotations, if any
1113
 
                    try:
1114
 
                        new_function._dbus_annotations = (
1115
 
                            dict(attribute._dbus_annotations))
1116
 
                    except AttributeError:
1117
 
                        pass
1118
809
                    # Define a creator of a function to call both the
1119
 
                    # original and alternate functions, so both the
1120
 
                    # original and alternate signals gets sent when
1121
 
                    # the function is called
 
810
                    # old and new functions, so both the old and new
 
811
                    # signals gets sent when the function is called
1122
812
                    def fixscope(func1, func2):
1123
813
                        """This function is a scope container to pass
1124
814
                        func1 and func2 to the "call_both" function
1131
821
                        return call_both
1132
822
                    # Create the "call_both" function and add it to
1133
823
                    # the class
1134
 
                    attr[attrname] = fixscope(attribute, new_function)
 
824
                    attr[attrname] = fixscope(attribute,
 
825
                                              new_function)
1135
826
                # Is this a D-Bus method?
1136
827
                elif getattr(attribute, "_dbus_is_method", False):
1137
828
                    # Create a new, but exactly alike, function
1148
839
                                        attribute.func_name,
1149
840
                                        attribute.func_defaults,
1150
841
                                        attribute.func_closure)))
1151
 
                    # Copy annotations, if any
1152
 
                    try:
1153
 
                        attr[attrname]._dbus_annotations = (
1154
 
                            dict(attribute._dbus_annotations))
1155
 
                    except AttributeError:
1156
 
                        pass
1157
842
                # Is this a D-Bus property?
1158
843
                elif getattr(attribute, "_dbus_is_property", False):
1159
844
                    # Create a new, but exactly alike, function
1173
858
                                        attribute.func_name,
1174
859
                                        attribute.func_defaults,
1175
860
                                        attribute.func_closure)))
1176
 
                    # Copy annotations, if any
1177
 
                    try:
1178
 
                        attr[attrname]._dbus_annotations = (
1179
 
                            dict(attribute._dbus_annotations))
1180
 
                    except AttributeError:
1181
 
                        pass
1182
 
                # Is this a D-Bus interface?
1183
 
                elif getattr(attribute, "_dbus_is_interface", False):
1184
 
                    # Create a new, but exactly alike, function
1185
 
                    # object.  Decorate it to be a new D-Bus interface
1186
 
                    # with the alternate D-Bus interface name.  Add it
1187
 
                    # to the class.
1188
 
                    attr[attrname] = (dbus_interface_annotations
1189
 
                                      (alt_interface)
1190
 
                                      (types.FunctionType
1191
 
                                       (attribute.func_code,
1192
 
                                        attribute.func_globals,
1193
 
                                        attribute.func_name,
1194
 
                                        attribute.func_defaults,
1195
 
                                        attribute.func_closure)))
1196
 
            if deprecate:
1197
 
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1199
 
                for interface_name in interface_names:
1200
 
                    @dbus_interface_annotations(interface_name)
1201
 
                    def func(self):
1202
 
                        return { "org.freedesktop.DBus.Deprecated":
1203
 
                                     "true" }
1204
 
                    # Find an unused name
1205
 
                    for aname in (iname.format(i)
1206
 
                                  for i in itertools.count()):
1207
 
                        if aname not in attr:
1208
 
                            attr[aname] = func
1209
 
                            break
1210
 
            if interface_names:
1211
 
                # Replace the class with a new subclass of it with
1212
 
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1214
 
                           (cls,), attr)
1215
 
        return cls
1216
 
    return wrapper
1217
 
 
1218
 
 
1219
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
 
                                "se.bsnet.fukt.Mandos"})
 
861
        return type.__new__(mcs, name, bases, attr)
 
862
 
1221
863
class ClientDBus(Client, DBusObjectWithProperties):
1222
864
    """A Client class using D-Bus
1223
865
    
1232
874
    # dbus.service.Object doesn't use super(), so we can't either.
1233
875
    
1234
876
    def __init__(self, bus = None, *args, **kwargs):
 
877
        self._approvals_pending = 0
1235
878
        self.bus = bus
1236
879
        Client.__init__(self, *args, **kwargs)
1237
880
        # Only now, when this client is initialized, can it show up on
1243
886
                                 ("/clients/" + client_object_name))
1244
887
        DBusObjectWithProperties.__init__(self, self.bus,
1245
888
                                          self.dbus_object_path)
1246
 
    
 
889
        
1247
890
    def notifychangeproperty(transform_func,
1248
891
                             dbus_name, type_func=lambda x: x,
1249
892
                             variant_level=1):
1250
893
        """ Modify a variable so that it's a property which announces
1251
894
        its changes to DBus.
1252
 
        
 
895
 
1253
896
        transform_fun: Function that takes a value and a variant_level
1254
897
                       and transforms it to a D-Bus type.
1255
898
        dbus_name: D-Bus name of the variable
1272
915
        
1273
916
        return property(lambda self: getattr(self, attrname), setter)
1274
917
    
 
918
    
1275
919
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1276
920
    approvals_pending = notifychangeproperty(dbus.Boolean,
1277
921
                                             "ApprovalPending",
1284
928
                                       checker is not None)
1285
929
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
930
                                           "LastCheckedOK")
1287
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1288
 
                                               "LastCheckerStatus")
1289
931
    last_approval_request = notifychangeproperty(
1290
932
        datetime_to_dbus, "LastApprovalRequest")
1291
933
    approved_by_default = notifychangeproperty(dbus.Boolean,
1292
934
                                               "ApprovedByDefault")
1293
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
935
    approval_delay = notifychangeproperty(dbus.UInt16,
1294
936
                                          "ApprovalDelay",
1295
937
                                          type_func =
1296
 
                                          timedelta_to_milliseconds)
 
938
                                          _timedelta_to_milliseconds)
1297
939
    approval_duration = notifychangeproperty(
1298
 
        dbus.UInt64, "ApprovalDuration",
1299
 
        type_func = timedelta_to_milliseconds)
 
940
        dbus.UInt16, "ApprovalDuration",
 
941
        type_func = _timedelta_to_milliseconds)
1300
942
    host = notifychangeproperty(dbus.String, "Host")
1301
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
943
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1302
944
                                   type_func =
1303
 
                                   timedelta_to_milliseconds)
 
945
                                   _timedelta_to_milliseconds)
1304
946
    extended_timeout = notifychangeproperty(
1305
 
        dbus.UInt64, "ExtendedTimeout",
1306
 
        type_func = timedelta_to_milliseconds)
1307
 
    interval = notifychangeproperty(dbus.UInt64,
 
947
        dbus.UInt16, "ExtendedTimeout",
 
948
        type_func = _timedelta_to_milliseconds)
 
949
    interval = notifychangeproperty(dbus.UInt16,
1308
950
                                    "Interval",
1309
951
                                    type_func =
1310
 
                                    timedelta_to_milliseconds)
 
952
                                    _timedelta_to_milliseconds)
1311
953
    checker_command = notifychangeproperty(dbus.String, "Checker")
1312
954
    
1313
955
    del notifychangeproperty
1355
997
        return r
1356
998
    
1357
999
    def _reset_approved(self):
1358
 
        self.approved = None
 
1000
        self._approved = None
1359
1001
        return False
1360
1002
    
1361
1003
    def approve(self, value=True):
1362
 
        self.approved = value
1363
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1004
        self.send_changedstate()
 
1005
        self._approved = value
 
1006
        gobject.timeout_add(_timedelta_to_milliseconds
1364
1007
                            (self.approval_duration),
1365
1008
                            self._reset_approved)
1366
 
        self.send_changedstate()
 
1009
    
1367
1010
    
1368
1011
    ## D-Bus methods, signals & properties
1369
1012
    _interface = "se.recompile.Mandos.Client"
1370
1013
    
1371
 
    ## Interfaces
1372
 
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1014
    ## Signals
1379
1015
    
1380
1016
    # CheckerCompleted - signal
1479
1115
                           access="readwrite")
1480
1116
    def ApprovalDuration_dbus_property(self, value=None):
1481
1117
        if value is None:       # get
1482
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1118
            return dbus.UInt64(_timedelta_to_milliseconds(
1483
1119
                    self.approval_duration))
1484
1120
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1485
1121
    
1499
1135
    def Host_dbus_property(self, value=None):
1500
1136
        if value is None:       # get
1501
1137
            return dbus.String(self.host)
1502
 
        self.host = unicode(value)
 
1138
        self.host = value
1503
1139
    
1504
1140
    # Created - property
1505
1141
    @dbus_service_property(_interface, signature="s", access="read")
1506
1142
    def Created_dbus_property(self):
1507
 
        return datetime_to_dbus(self.created)
 
1143
        return dbus.String(datetime_to_dbus(self.created))
1508
1144
    
1509
1145
    # LastEnabled - property
1510
1146
    @dbus_service_property(_interface, signature="s", access="read")
1531
1167
            return
1532
1168
        return datetime_to_dbus(self.last_checked_ok)
1533
1169
    
1534
 
    # LastCheckerStatus - property
1535
 
    @dbus_service_property(_interface, signature="n",
1536
 
                           access="read")
1537
 
    def LastCheckerStatus_dbus_property(self):
1538
 
        return dbus.Int16(self.last_checker_status)
1539
 
    
1540
1170
    # Expires - property
1541
1171
    @dbus_service_property(_interface, signature="s", access="read")
1542
1172
    def Expires_dbus_property(self):
1553
1183
    def Timeout_dbus_property(self, value=None):
1554
1184
        if value is None:       # get
1555
1185
            return dbus.UInt64(self.timeout_milliseconds())
1556
 
        old_timeout = self.timeout
1557
1186
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
 
        # Reschedule disabling
1559
 
        if self.enabled:
1560
 
            now = datetime.datetime.utcnow()
1561
 
            self.expires += self.timeout - old_timeout
1562
 
            if self.expires <= now:
1563
 
                # The timeout has passed
1564
 
                self.disable()
1565
 
            else:
1566
 
                if (getattr(self, "disable_initiator_tag", None)
1567
 
                    is None):
1568
 
                    return
1569
 
                gobject.source_remove(self.disable_initiator_tag)
1570
 
                self.disable_initiator_tag = (
1571
 
                    gobject.timeout_add(
1572
 
                        timedelta_to_milliseconds(self.expires - now),
1573
 
                        self.disable))
 
1187
        if getattr(self, "disable_initiator_tag", None) is None:
 
1188
            return
 
1189
        # Reschedule timeout
 
1190
        gobject.source_remove(self.disable_initiator_tag)
 
1191
        self.disable_initiator_tag = None
 
1192
        self.expires = None
 
1193
        time_to_die = _timedelta_to_milliseconds((self
 
1194
                                                  .last_checked_ok
 
1195
                                                  + self.timeout)
 
1196
                                                 - datetime.datetime
 
1197
                                                 .utcnow())
 
1198
        if time_to_die <= 0:
 
1199
            # The timeout has passed
 
1200
            self.disable()
 
1201
        else:
 
1202
            self.expires = (datetime.datetime.utcnow()
 
1203
                            + datetime.timedelta(milliseconds =
 
1204
                                                 time_to_die))
 
1205
            self.disable_initiator_tag = (gobject.timeout_add
 
1206
                                          (time_to_die, self.disable))
1574
1207
    
1575
1208
    # ExtendedTimeout - property
1576
1209
    @dbus_service_property(_interface, signature="t",
1589
1222
        self.interval = datetime.timedelta(0, 0, 0, value)
1590
1223
        if getattr(self, "checker_initiator_tag", None) is None:
1591
1224
            return
1592
 
        if self.enabled:
1593
 
            # Reschedule checker run
1594
 
            gobject.source_remove(self.checker_initiator_tag)
1595
 
            self.checker_initiator_tag = (gobject.timeout_add
1596
 
                                          (value, self.start_checker))
1597
 
            self.start_checker()    # Start one now, too
 
1225
        # Reschedule checker run
 
1226
        gobject.source_remove(self.checker_initiator_tag)
 
1227
        self.checker_initiator_tag = (gobject.timeout_add
 
1228
                                      (value, self.start_checker))
 
1229
        self.start_checker()    # Start one now, too
1598
1230
    
1599
1231
    # Checker - property
1600
1232
    @dbus_service_property(_interface, signature="s",
1602
1234
    def Checker_dbus_property(self, value=None):
1603
1235
        if value is None:       # get
1604
1236
            return dbus.String(self.checker_command)
1605
 
        self.checker_command = unicode(value)
 
1237
        self.checker_command = value
1606
1238
    
1607
1239
    # CheckerRunning - property
1608
1240
    @dbus_service_property(_interface, signature="b",
1637
1269
            raise KeyError()
1638
1270
    
1639
1271
    def __getattribute__(self, name):
1640
 
        if name == '_pipe':
 
1272
        if(name == '_pipe'):
1641
1273
            return super(ProxyClient, self).__getattribute__(name)
1642
1274
        self._pipe.send(('getattr', name))
1643
1275
        data = self._pipe.recv()
1650
1282
            return func
1651
1283
    
1652
1284
    def __setattr__(self, name, value):
1653
 
        if name == '_pipe':
 
1285
        if(name == '_pipe'):
1654
1286
            return super(ProxyClient, self).__setattr__(name, value)
1655
1287
        self._pipe.send(('setattr', name, value))
1656
1288
 
 
1289
class ClientDBusTransitional(ClientDBus):
 
1290
    __metaclass__ = AlternateDBusNamesMetaclass
1657
1291
 
1658
1292
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
1293
    """A class to handle client connections.
1742
1376
                            client.Rejected("Disabled")
1743
1377
                        return
1744
1378
                    
1745
 
                    if client.approved or not client.approval_delay:
 
1379
                    if client._approved or not client.approval_delay:
1746
1380
                        #We are approved or approval is disabled
1747
1381
                        break
1748
 
                    elif client.approved is None:
 
1382
                    elif client._approved is None:
1749
1383
                        logger.info("Client %s needs approval",
1750
1384
                                    client.name)
1751
1385
                        if self.server.use_dbus:
1764
1398
                    #wait until timeout or approved
1765
1399
                    time = datetime.datetime.now()
1766
1400
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1401
                    (client.changedstate.wait
 
1402
                     (float(client._timedelta_to_milliseconds(delay)
 
1403
                            / 1000)))
1770
1404
                    client.changedstate.release()
1771
1405
                    time2 = datetime.datetime.now()
1772
1406
                    if (time2 - time) >= delay:
1788
1422
                    try:
1789
1423
                        sent = session.send(client.secret[sent_size:])
1790
1424
                    except gnutls.errors.GNUTLSError as error:
1791
 
                        logger.warning("gnutls send failed",
1792
 
                                       exc_info=error)
 
1425
                        logger.warning("gnutls send failed")
1793
1426
                        return
1794
1427
                    logger.debug("Sent: %d, remaining: %d",
1795
1428
                                 sent, len(client.secret)
1798
1431
                
1799
1432
                logger.info("Sending secret to %s", client.name)
1800
1433
                # bump the timeout using extended_timeout
1801
 
                client.bump_timeout(client.extended_timeout)
 
1434
                client.checked_ok(client.extended_timeout)
1802
1435
                if self.server.use_dbus:
1803
1436
                    # Emit D-Bus signal
1804
1437
                    client.GotSecret()
1809
1442
                try:
1810
1443
                    session.bye()
1811
1444
                except gnutls.errors.GNUTLSError as error:
1812
 
                    logger.warning("GnuTLS bye failed",
1813
 
                                   exc_info=error)
 
1445
                    logger.warning("GnuTLS bye failed")
1814
1446
    
1815
1447
    @staticmethod
1816
1448
    def peer_certificate(session):
1872
1504
        # Convert the buffer to a Python bytestring
1873
1505
        fpr = ctypes.string_at(buf, buf_len.value)
1874
1506
        # Convert the bytestring to hexadecimal notation
1875
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1507
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1876
1508
        return hex_fpr
1877
1509
 
1878
1510
 
1881
1513
    def sub_process_main(self, request, address):
1882
1514
        try:
1883
1515
            self.finish_request(request, address)
1884
 
        except Exception:
 
1516
        except:
1885
1517
            self.handle_error(request, address)
1886
1518
        self.close_request(request)
1887
1519
    
1888
1520
    def process_request(self, request, address):
1889
1521
        """Start a new process to process the request."""
1890
1522
        proc = multiprocessing.Process(target = self.sub_process_main,
1891
 
                                       args = (request, address))
 
1523
                                       args = (request,
 
1524
                                               address))
1892
1525
        proc.start()
1893
1526
        return proc
1894
1527
 
1922
1555
        use_ipv6:       Boolean; to use IPv6 or not
1923
1556
    """
1924
1557
    def __init__(self, server_address, RequestHandlerClass,
1925
 
                 interface=None, use_ipv6=True, socketfd=None):
1926
 
        """If socketfd is set, use that file descriptor instead of
1927
 
        creating a new one with socket.socket().
1928
 
        """
 
1558
                 interface=None, use_ipv6=True):
1929
1559
        self.interface = interface
1930
1560
        if use_ipv6:
1931
1561
            self.address_family = socket.AF_INET6
1932
 
        if socketfd is not None:
1933
 
            # Save the file descriptor
1934
 
            self.socketfd = socketfd
1935
 
            # Save the original socket.socket() function
1936
 
            self.socket_socket = socket.socket
1937
 
            # To implement --socket, we monkey patch socket.socket.
1938
 
            # 
1939
 
            # (When socketserver.TCPServer is a new-style class, we
1940
 
            # could make self.socket into a property instead of monkey
1941
 
            # patching socket.socket.)
1942
 
            # 
1943
 
            # Create a one-time-only replacement for socket.socket()
1944
 
            @functools.wraps(socket.socket)
1945
 
            def socket_wrapper(*args, **kwargs):
1946
 
                # Restore original function so subsequent calls are
1947
 
                # not affected.
1948
 
                socket.socket = self.socket_socket
1949
 
                del self.socket_socket
1950
 
                # This time only, return a new socket object from the
1951
 
                # saved file descriptor.
1952
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1953
 
            # Replace socket.socket() function with wrapper
1954
 
            socket.socket = socket_wrapper
1955
 
        # The socketserver.TCPServer.__init__ will call
1956
 
        # socket.socket(), which might be our replacement,
1957
 
        # socket_wrapper(), if socketfd was set.
1958
1562
        socketserver.TCPServer.__init__(self, server_address,
1959
1563
                                        RequestHandlerClass)
1960
 
    
1961
1564
    def server_bind(self):
1962
1565
        """This overrides the normal server_bind() function
1963
1566
        to bind to an interface if one was specified, and also NOT to
1971
1574
                try:
1972
1575
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1576
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1577
                                           str(self.interface
 
1578
                                               + '\0'))
1975
1579
                except socket.error as error:
1976
 
                    if error.errno == errno.EPERM:
1977
 
                        logger.error("No permission to bind to"
1978
 
                                     " interface %s", self.interface)
1979
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1580
                    if error[0] == errno.EPERM:
 
1581
                        logger.error("No permission to"
 
1582
                                     " bind to interface %s",
 
1583
                                     self.interface)
 
1584
                    elif error[0] == errno.ENOPROTOOPT:
1980
1585
                        logger.error("SO_BINDTODEVICE not available;"
1981
1586
                                     " cannot bind to interface %s",
1982
1587
                                     self.interface)
1983
 
                    elif error.errno == errno.ENODEV:
1984
 
                        logger.error("Interface %s does not exist,"
1985
 
                                     " cannot bind", self.interface)
1986
1588
                    else:
1987
1589
                        raise
1988
1590
        # Only bind(2) the socket if we really need to.
1991
1593
                if self.address_family == socket.AF_INET6:
1992
1594
                    any_address = "::" # in6addr_any
1993
1595
                else:
1994
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1596
                    any_address = socket.INADDR_ANY
1995
1597
                self.server_address = (any_address,
1996
1598
                                       self.server_address[1])
1997
1599
            elif not self.server_address[1]:
2018
1620
    """
2019
1621
    def __init__(self, server_address, RequestHandlerClass,
2020
1622
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1623
                 gnutls_priority=None, use_dbus=True):
2022
1624
        self.enabled = False
2023
1625
        self.clients = clients
2024
1626
        if self.clients is None:
2025
 
            self.clients = {}
 
1627
            self.clients = set()
2026
1628
        self.use_dbus = use_dbus
2027
1629
        self.gnutls_priority = gnutls_priority
2028
1630
        IPv6_TCPServer.__init__(self, server_address,
2029
1631
                                RequestHandlerClass,
2030
1632
                                interface = interface,
2031
 
                                use_ipv6 = use_ipv6,
2032
 
                                socketfd = socketfd)
 
1633
                                use_ipv6 = use_ipv6)
2033
1634
    def server_activate(self):
2034
1635
        if self.enabled:
2035
1636
            return socketserver.TCPServer.server_activate(self)
2048
1649
    
2049
1650
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
1651
                   proc = None, client_object=None):
 
1652
        condition_names = {
 
1653
            gobject.IO_IN: "IN",   # There is data to read.
 
1654
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1655
                                    # blocking).
 
1656
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1657
            gobject.IO_ERR: "ERR", # Error condition.
 
1658
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1659
                                    # broken, usually for pipes and
 
1660
                                    # sockets).
 
1661
            }
 
1662
        conditions_string = ' | '.join(name
 
1663
                                       for cond, name in
 
1664
                                       condition_names.iteritems()
 
1665
                                       if cond & condition)
2051
1666
        # error, or the other end of multiprocessing.Pipe has closed
2052
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1667
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2053
1668
            # Wait for other process to exit
2054
1669
            proc.join()
2055
1670
            return False
2062
1677
            fpr = request[1]
2063
1678
            address = request[2]
2064
1679
            
2065
 
            for c in self.clients.itervalues():
 
1680
            for c in self.clients:
2066
1681
                if c.fingerprint == fpr:
2067
1682
                    client = c
2068
1683
                    break
2113
1728
        return True
2114
1729
 
2115
1730
 
2116
 
def rfc3339_duration_to_delta(duration):
2117
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2118
 
    
2119
 
    >>> rfc3339_duration_to_delta("P7D")
2120
 
    datetime.timedelta(7)
2121
 
    >>> rfc3339_duration_to_delta("PT60S")
2122
 
    datetime.timedelta(0, 60)
2123
 
    >>> rfc3339_duration_to_delta("PT60M")
2124
 
    datetime.timedelta(0, 3600)
2125
 
    >>> rfc3339_duration_to_delta("PT24H")
2126
 
    datetime.timedelta(1)
2127
 
    >>> rfc3339_duration_to_delta("P1W")
2128
 
    datetime.timedelta(7)
2129
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2130
 
    datetime.timedelta(0, 330)
2131
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2132
 
    datetime.timedelta(1, 200)
2133
 
    """
2134
 
    
2135
 
    # Parsing an RFC 3339 duration with regular expressions is not
2136
 
    # possible - there would have to be multiple places for the same
2137
 
    # values, like seconds.  The current code, while more esoteric, is
2138
 
    # cleaner without depending on a parsing library.  If Python had a
2139
 
    # built-in library for parsing we would use it, but we'd like to
2140
 
    # avoid excessive use of external libraries.
2141
 
    
2142
 
    # New type for defining tokens, syntax, and semantics all-in-one
2143
 
    Token = collections.namedtuple("Token",
2144
 
                                   ("regexp", # To match token; if
2145
 
                                              # "value" is not None,
2146
 
                                              # must have a "group"
2147
 
                                              # containing digits
2148
 
                                    "value",  # datetime.timedelta or
2149
 
                                              # None
2150
 
                                    "followers")) # Tokens valid after
2151
 
                                                  # this token
2152
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2154
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2155
 
    token_second = Token(re.compile(r"(\d+)S"),
2156
 
                         datetime.timedelta(seconds=1),
2157
 
                         frozenset((token_end,)))
2158
 
    token_minute = Token(re.compile(r"(\d+)M"),
2159
 
                         datetime.timedelta(minutes=1),
2160
 
                         frozenset((token_second, token_end)))
2161
 
    token_hour = Token(re.compile(r"(\d+)H"),
2162
 
                       datetime.timedelta(hours=1),
2163
 
                       frozenset((token_minute, token_end)))
2164
 
    token_time = Token(re.compile(r"T"),
2165
 
                       None,
2166
 
                       frozenset((token_hour, token_minute,
2167
 
                                  token_second)))
2168
 
    token_day = Token(re.compile(r"(\d+)D"),
2169
 
                      datetime.timedelta(days=1),
2170
 
                      frozenset((token_time, token_end)))
2171
 
    token_month = Token(re.compile(r"(\d+)M"),
2172
 
                        datetime.timedelta(weeks=4),
2173
 
                        frozenset((token_day, token_end)))
2174
 
    token_year = Token(re.compile(r"(\d+)Y"),
2175
 
                       datetime.timedelta(weeks=52),
2176
 
                       frozenset((token_month, token_end)))
2177
 
    token_week = Token(re.compile(r"(\d+)W"),
2178
 
                       datetime.timedelta(weeks=1),
2179
 
                       frozenset((token_end,)))
2180
 
    token_duration = Token(re.compile(r"P"), None,
2181
 
                           frozenset((token_year, token_month,
2182
 
                                      token_day, token_time,
2183
 
                                      token_week))),
2184
 
    # Define starting values
2185
 
    value = datetime.timedelta() # Value so far
2186
 
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
2188
 
    s = duration                # String left to parse
2189
 
    # Loop until end token is found
2190
 
    while found_token is not token_end:
2191
 
        # Search for any currently valid tokens
2192
 
        for token in followers:
2193
 
            match = token.regexp.match(s)
2194
 
            if match is not None:
2195
 
                # Token found
2196
 
                if token.value is not None:
2197
 
                    # Value found, parse digits
2198
 
                    factor = int(match.group(1), 10)
2199
 
                    # Add to value so far
2200
 
                    value += factor * token.value
2201
 
                # Strip token from string
2202
 
                s = token.regexp.sub("", s, 1)
2203
 
                # Go to found token
2204
 
                found_token = token
2205
 
                # Set valid next tokens
2206
 
                followers = found_token.followers
2207
 
                break
2208
 
        else:
2209
 
            # No currently valid tokens were found
2210
 
            raise ValueError("Invalid RFC 3339 duration")
2211
 
    # End token found
2212
 
    return value
2213
 
 
2214
 
 
2215
1731
def string_to_delta(interval):
2216
1732
    """Parse a string and return a datetime.timedelta
2217
1733
    
2228
1744
    >>> string_to_delta('5m 30s')
2229
1745
    datetime.timedelta(0, 330)
2230
1746
    """
2231
 
    
2232
 
    try:
2233
 
        return rfc3339_duration_to_delta(interval)
2234
 
    except ValueError:
2235
 
        pass
2236
 
    
2237
1747
    timevalue = datetime.timedelta(0)
2238
1748
    for s in interval.split():
2239
1749
        try:
2250
1760
            elif suffix == "w":
2251
1761
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
1762
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
2254
 
                                 .format(suffix))
 
1763
                raise ValueError("Unknown suffix %r" % suffix)
2255
1764
        except (ValueError, IndexError) as e:
2256
1765
            raise ValueError(*(e.args))
2257
1766
        timevalue += delta
2258
1767
    return timevalue
2259
1768
 
2260
1769
 
 
1770
def if_nametoindex(interface):
 
1771
    """Call the C function if_nametoindex(), or equivalent
 
1772
    
 
1773
    Note: This function cannot accept a unicode string."""
 
1774
    global if_nametoindex
 
1775
    try:
 
1776
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1777
                          (ctypes.util.find_library("c"))
 
1778
                          .if_nametoindex)
 
1779
    except (OSError, AttributeError):
 
1780
        logger.warning("Doing if_nametoindex the hard way")
 
1781
        def if_nametoindex(interface):
 
1782
            "Get an interface index the hard way, i.e. using fcntl()"
 
1783
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1784
            with contextlib.closing(socket.socket()) as s:
 
1785
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1786
                                    struct.pack(str("16s16x"),
 
1787
                                                interface))
 
1788
            interface_index = struct.unpack(str("I"),
 
1789
                                            ifreq[16:20])[0]
 
1790
            return interface_index
 
1791
    return if_nametoindex(interface)
 
1792
 
 
1793
 
2261
1794
def daemon(nochdir = False, noclose = False):
2262
1795
    """See daemon(3).  Standard BSD Unix function.
2263
1796
    
2271
1804
        sys.exit()
2272
1805
    if not noclose:
2273
1806
        # Close all standard open file descriptors
2274
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1807
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2275
1808
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
1809
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
2278
 
                          .format(os.devnull))
 
1810
                          "%s not a character device"
 
1811
                          % os.path.devnull)
2279
1812
        os.dup2(null, sys.stdin.fileno())
2280
1813
        os.dup2(null, sys.stdout.fileno())
2281
1814
        os.dup2(null, sys.stderr.fileno())
2290
1823
    
2291
1824
    parser = argparse.ArgumentParser()
2292
1825
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
1826
                        version = "%%(prog)s %s" % version,
2294
1827
                        help="show version number and exit")
2295
1828
    parser.add_argument("-i", "--interface", metavar="IF",
2296
1829
                        help="Bind to interface IF")
2302
1835
                        help="Run self-test")
2303
1836
    parser.add_argument("--debug", action="store_true",
2304
1837
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal", default=None)
 
1838
                        " to terminal")
2306
1839
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
1840
                        help="Debug level for stdout output")
2308
1841
    parser.add_argument("--priority", help="GnuTLS"
2315
1848
                        " files")
2316
1849
    parser.add_argument("--no-dbus", action="store_false",
2317
1850
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface", default=None)
 
1851
                        " system bus interface")
2319
1852
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6",
2321
 
                        default=None)
2322
 
    parser.add_argument("--no-restore", action="store_false",
2323
 
                        dest="restore", help="Do not restore stored"
2324
 
                        " state", default=None)
2325
 
    parser.add_argument("--socket", type=int,
2326
 
                        help="Specify a file descriptor to a network"
2327
 
                        " socket to use instead of creating one")
2328
 
    parser.add_argument("--statedir", metavar="DIR",
2329
 
                        help="Directory to save/restore state in")
2330
 
    parser.add_argument("--foreground", action="store_true",
2331
 
                        help="Run in foreground", default=None)
2332
 
    
 
1853
                        dest="use_ipv6", help="Do not use IPv6")
2333
1854
    options = parser.parse_args()
2334
1855
    
2335
1856
    if options.check:
2348
1869
                        "use_dbus": "True",
2349
1870
                        "use_ipv6": "True",
2350
1871
                        "debuglevel": "",
2351
 
                        "restore": "True",
2352
 
                        "socket": "",
2353
 
                        "statedir": "/var/lib/mandos",
2354
 
                        "foreground": "False",
2355
1872
                        }
2356
1873
    
2357
1874
    # Parse config file for server-global settings
2362
1879
    # Convert the SafeConfigParser object to a dict
2363
1880
    server_settings = server_config.defaults()
2364
1881
    # Use the appropriate methods on the non-string config options
2365
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1882
    for option in ("debug", "use_dbus", "use_ipv6"):
2366
1883
        server_settings[option] = server_config.getboolean("DEFAULT",
2367
1884
                                                           option)
2368
1885
    if server_settings["port"]:
2369
1886
        server_settings["port"] = server_config.getint("DEFAULT",
2370
1887
                                                       "port")
2371
 
    if server_settings["socket"]:
2372
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2373
 
                                                         "socket")
2374
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2375
 
        # over with an opened os.devnull.  But we don't want this to
2376
 
        # happen with a supplied network socket.
2377
 
        if 0 <= server_settings["socket"] <= 2:
2378
 
            server_settings["socket"] = os.dup(server_settings
2379
 
                                               ["socket"])
2380
1888
    del server_config
2381
1889
    
2382
1890
    # Override the settings from the config file with command line
2383
1891
    # options, if set.
2384
1892
    for option in ("interface", "address", "port", "debug",
2385
1893
                   "priority", "servicename", "configdir",
2386
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
1894
                   "use_dbus", "use_ipv6", "debuglevel"):
2388
1895
        value = getattr(options, option)
2389
1896
        if value is not None:
2390
1897
            server_settings[option] = value
2393
1900
    for option in server_settings.keys():
2394
1901
        if type(server_settings[option]) is str:
2395
1902
            server_settings[option] = unicode(server_settings[option])
2396
 
    # Force all boolean options to be boolean
2397
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
2399
 
        server_settings[option] = bool(server_settings[option])
2400
 
    # Debug implies foreground
2401
 
    if server_settings["debug"]:
2402
 
        server_settings["foreground"] = True
2403
1903
    # Now we have our good server settings in "server_settings"
2404
1904
    
2405
1905
    ##################################################################
2409
1909
    debuglevel = server_settings["debuglevel"]
2410
1910
    use_dbus = server_settings["use_dbus"]
2411
1911
    use_ipv6 = server_settings["use_ipv6"]
2412
 
    stored_state_path = os.path.join(server_settings["statedir"],
2413
 
                                     stored_state_file)
2414
 
    foreground = server_settings["foreground"]
2415
 
    
2416
 
    if debug:
2417
 
        initlogger(debug, logging.DEBUG)
2418
 
    else:
2419
 
        if not debuglevel:
2420
 
            initlogger(debug)
2421
 
        else:
2422
 
            level = getattr(logging, debuglevel.upper())
2423
 
            initlogger(debug, level)
2424
1912
    
2425
1913
    if server_settings["servicename"] != "Mandos":
2426
1914
        syslogger.setFormatter(logging.Formatter
2427
 
                               ('Mandos ({0}) [%(process)d]:'
2428
 
                                ' %(levelname)s: %(message)s'
2429
 
                                .format(server_settings
2430
 
                                        ["servicename"])))
 
1915
                               ('Mandos (%s) [%%(process)d]:'
 
1916
                                ' %%(levelname)s: %%(message)s'
 
1917
                                % server_settings["servicename"]))
2431
1918
    
2432
1919
    # Parse config file with clients
2433
 
    client_config = configparser.SafeConfigParser(Client
2434
 
                                                  .client_defaults)
 
1920
    client_defaults = { "timeout": "5m",
 
1921
                        "extended_timeout": "15m",
 
1922
                        "interval": "2m",
 
1923
                        "checker": "fping -q -- %%(host)s",
 
1924
                        "host": "",
 
1925
                        "approval_delay": "0s",
 
1926
                        "approval_duration": "1s",
 
1927
                        }
 
1928
    client_config = configparser.SafeConfigParser(client_defaults)
2435
1929
    client_config.read(os.path.join(server_settings["configdir"],
2436
1930
                                    "clients.conf"))
2437
1931
    
2446
1940
                              use_ipv6=use_ipv6,
2447
1941
                              gnutls_priority=
2448
1942
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
2452
 
    if not foreground:
2453
 
        pidfilename = "/run/mandos.pid"
2454
 
        pidfile = None
 
1943
                              use_dbus=use_dbus)
 
1944
    if not debug:
 
1945
        pidfilename = "/var/run/mandos.pid"
2455
1946
        try:
2456
1947
            pidfile = open(pidfilename, "w")
2457
 
        except IOError as e:
2458
 
            logger.error("Could not open file %r", pidfilename,
2459
 
                         exc_info=e)
 
1948
        except IOError:
 
1949
            logger.error("Could not open file %r", pidfilename)
2460
1950
    
2461
 
    for name in ("_mandos", "mandos", "nobody"):
 
1951
    try:
 
1952
        uid = pwd.getpwnam("_mandos").pw_uid
 
1953
        gid = pwd.getpwnam("_mandos").pw_gid
 
1954
    except KeyError:
2462
1955
        try:
2463
 
            uid = pwd.getpwnam(name).pw_uid
2464
 
            gid = pwd.getpwnam(name).pw_gid
2465
 
            break
 
1956
            uid = pwd.getpwnam("mandos").pw_uid
 
1957
            gid = pwd.getpwnam("mandos").pw_gid
2466
1958
        except KeyError:
2467
 
            continue
2468
 
    else:
2469
 
        uid = 65534
2470
 
        gid = 65534
 
1959
            try:
 
1960
                uid = pwd.getpwnam("nobody").pw_uid
 
1961
                gid = pwd.getpwnam("nobody").pw_gid
 
1962
            except KeyError:
 
1963
                uid = 65534
 
1964
                gid = 65534
2471
1965
    try:
2472
1966
        os.setgid(gid)
2473
1967
        os.setuid(uid)
2474
1968
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
 
1969
        if error[0] != errno.EPERM:
2476
1970
            raise error
2477
1971
    
 
1972
    if not debug and not debuglevel:
 
1973
        syslogger.setLevel(logging.WARNING)
 
1974
        console.setLevel(logging.WARNING)
 
1975
    if debuglevel:
 
1976
        level = getattr(logging, debuglevel.upper())
 
1977
        syslogger.setLevel(level)
 
1978
        console.setLevel(level)
 
1979
    
2478
1980
    if debug:
2479
1981
        # Enable all possible GnuTLS debugging
2480
1982
        
2490
1992
         .gnutls_global_set_log_function(debug_gnutls))
2491
1993
        
2492
1994
        # Redirect stdin so all checkers get /dev/null
2493
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1995
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
1996
        os.dup2(null, sys.stdin.fileno())
2495
1997
        if null > 2:
2496
1998
            os.close(null)
 
1999
    else:
 
2000
        # No console logging
 
2001
        logger.removeHandler(console)
2497
2002
    
2498
2003
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2004
    if not debug:
2500
2005
        # Close all input and output, do double fork, etc.
2501
2006
        daemon()
2502
2007
    
2503
 
    # multiprocessing will use threads, so before we use gobject we
2504
 
    # need to inform gobject that threads will be used.
2505
 
    gobject.threads_init()
2506
 
    
2507
2008
    global main_loop
2508
2009
    # From the Avahi example code
2509
 
    DBusGMainLoop(set_as_default=True)
 
2010
    DBusGMainLoop(set_as_default=True )
2510
2011
    main_loop = gobject.MainLoop()
2511
2012
    bus = dbus.SystemBus()
2512
2013
    # End of Avahi example code
2518
2019
                            ("se.bsnet.fukt.Mandos", bus,
2519
2020
                             do_not_queue=True))
2520
2021
        except dbus.exceptions.NameExistsException as e:
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2022
            logger.error(unicode(e) + ", disabling D-Bus")
2522
2023
            use_dbus = False
2523
2024
            server_settings["use_dbus"] = False
2524
2025
            tcp_server.use_dbus = False
2525
2026
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
 
    service = AvahiServiceToSyslog(name =
2527
 
                                   server_settings["servicename"],
2528
 
                                   servicetype = "_mandos._tcp",
2529
 
                                   protocol = protocol, bus = bus)
 
2027
    service = AvahiService(name = server_settings["servicename"],
 
2028
                           servicetype = "_mandos._tcp",
 
2029
                           protocol = protocol, bus = bus)
2530
2030
    if server_settings["interface"]:
2531
2031
        service.interface = (if_nametoindex
2532
2032
                             (str(server_settings["interface"])))
2536
2036
    
2537
2037
    client_class = Client
2538
2038
    if use_dbus:
2539
 
        client_class = functools.partial(ClientDBus, bus = bus)
2540
 
    
2541
 
    client_settings = Client.config_parser(client_config)
2542
 
    old_client_settings = {}
2543
 
    clients_data = {}
2544
 
    
2545
 
    # This is used to redirect stdout and stderr for checker processes
2546
 
    global wnull
2547
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2548
 
    # Only used if server is running in foreground but not in debug
2549
 
    # mode
2550
 
    if debug or not foreground:
2551
 
        wnull.close()
2552
 
    
2553
 
    # Get client data and settings from last running state.
2554
 
    if server_settings["restore"]:
2555
 
        try:
2556
 
            with open(stored_state_path, "rb") as stored_state:
2557
 
                clients_data, old_client_settings = (pickle.load
2558
 
                                                     (stored_state))
2559
 
            os.remove(stored_state_path)
2560
 
        except IOError as e:
2561
 
            if e.errno == errno.ENOENT:
2562
 
                logger.warning("Could not load persistent state: {0}"
2563
 
                                .format(os.strerror(e.errno)))
2564
 
            else:
2565
 
                logger.critical("Could not load persistent state:",
2566
 
                                exc_info=e)
2567
 
                raise
2568
 
        except EOFError as e:
2569
 
            logger.warning("Could not load persistent state: "
2570
 
                           "EOFError:", exc_info=e)
2571
 
    
2572
 
    with PGPEngine() as pgp:
2573
 
        for client_name, client in clients_data.iteritems():
2574
 
            # Skip removed clients
2575
 
            if client_name not in client_settings:
2576
 
                continue
2577
 
            
2578
 
            # Decide which value to use after restoring saved state.
2579
 
            # We have three different values: Old config file,
2580
 
            # new config file, and saved state.
2581
 
            # New config value takes precedence if it differs from old
2582
 
            # config value, otherwise use saved state.
2583
 
            for name, value in client_settings[client_name].items():
2584
 
                try:
2585
 
                    # For each value in new config, check if it
2586
 
                    # differs from the old config value (Except for
2587
 
                    # the "secret" attribute)
2588
 
                    if (name != "secret" and
2589
 
                        value != old_client_settings[client_name]
2590
 
                        [name]):
2591
 
                        client[name] = value
2592
 
                except KeyError:
2593
 
                    pass
2594
 
            
2595
 
            # Clients who has passed its expire date can still be
2596
 
            # enabled if its last checker was successful.  Clients
2597
 
            # whose checker succeeded before we stored its state is
2598
 
            # assumed to have successfully run all checkers during
2599
 
            # downtime.
2600
 
            if client["enabled"]:
2601
 
                if datetime.datetime.utcnow() >= client["expires"]:
2602
 
                    if not client["last_checked_ok"]:
2603
 
                        logger.warning(
2604
 
                            "disabling client {0} - Client never "
2605
 
                            "performed a successful checker"
2606
 
                            .format(client_name))
2607
 
                        client["enabled"] = False
2608
 
                    elif client["last_checker_status"] != 0:
2609
 
                        logger.warning(
2610
 
                            "disabling client {0} - Client "
2611
 
                            "last checker failed with error code {1}"
2612
 
                            .format(client_name,
2613
 
                                    client["last_checker_status"]))
2614
 
                        client["enabled"] = False
2615
 
                    else:
2616
 
                        client["expires"] = (datetime.datetime
2617
 
                                             .utcnow()
2618
 
                                             + client["timeout"])
2619
 
                        logger.debug("Last checker succeeded,"
2620
 
                                     " keeping {0} enabled"
2621
 
                                     .format(client_name))
 
2039
        client_class = functools.partial(ClientDBusTransitional,
 
2040
                                         bus = bus)
 
2041
    def client_config_items(config, section):
 
2042
        special_settings = {
 
2043
            "approved_by_default":
 
2044
                lambda: config.getboolean(section,
 
2045
                                          "approved_by_default"),
 
2046
            }
 
2047
        for name, value in config.items(section):
2622
2048
            try:
2623
 
                client["secret"] = (
2624
 
                    pgp.decrypt(client["encrypted_secret"],
2625
 
                                client_settings[client_name]
2626
 
                                ["secret"]))
2627
 
            except PGPError:
2628
 
                # If decryption fails, we use secret from new settings
2629
 
                logger.debug("Failed to decrypt {0} old secret"
2630
 
                             .format(client_name))
2631
 
                client["secret"] = (
2632
 
                    client_settings[client_name]["secret"])
2633
 
    
2634
 
    # Add/remove clients based on new changes made to config
2635
 
    for client_name in (set(old_client_settings)
2636
 
                        - set(client_settings)):
2637
 
        del clients_data[client_name]
2638
 
    for client_name in (set(client_settings)
2639
 
                        - set(old_client_settings)):
2640
 
        clients_data[client_name] = client_settings[client_name]
2641
 
    
2642
 
    # Create all client objects
2643
 
    for client_name, client in clients_data.iteritems():
2644
 
        tcp_server.clients[client_name] = client_class(
2645
 
            name = client_name, settings = client,
2646
 
            server_settings = server_settings)
2647
 
    
 
2049
                yield (name, special_settings[name]())
 
2050
            except KeyError:
 
2051
                yield (name, value)
 
2052
    
 
2053
    tcp_server.clients.update(set(
 
2054
            client_class(name = section,
 
2055
                         config= dict(client_config_items(
 
2056
                        client_config, section)))
 
2057
            for section in client_config.sections()))
2648
2058
    if not tcp_server.clients:
2649
2059
        logger.warning("No clients defined")
2650
 
    
2651
 
    if not foreground:
2652
 
        if pidfile is not None:
2653
 
            try:
2654
 
                with pidfile:
2655
 
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2657
 
            except IOError:
2658
 
                logger.error("Could not write to file %r with PID %d",
2659
 
                             pidfilename, pid)
2660
 
        del pidfile
 
2060
        
 
2061
    if not debug:
 
2062
        try:
 
2063
            with pidfile:
 
2064
                pid = os.getpid()
 
2065
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2066
            del pidfile
 
2067
        except IOError:
 
2068
            logger.error("Could not write to file %r with PID %d",
 
2069
                         pidfilename, pid)
 
2070
        except NameError:
 
2071
            # "pidfile" was never created
 
2072
            pass
2661
2073
        del pidfilename
 
2074
        
 
2075
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2662
2076
    
2663
2077
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
2078
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2079
    
2666
2080
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
2669
 
        class MandosDBusService(DBusObjectWithProperties):
 
2081
        class MandosDBusService(dbus.service.Object):
2670
2082
            """A D-Bus proxy object"""
2671
2083
            def __init__(self):
2672
2084
                dbus.service.Object.__init__(self, bus, "/")
2673
2085
            _interface = "se.recompile.Mandos"
2674
2086
            
2675
 
            @dbus_interface_annotations(_interface)
2676
 
            def _foo(self):
2677
 
                return { "org.freedesktop.DBus.Property"
2678
 
                         ".EmitsChangedSignal":
2679
 
                             "false"}
2680
 
            
2681
2087
            @dbus.service.signal(_interface, signature="o")
2682
2088
            def ClientAdded(self, objpath):
2683
2089
                "D-Bus signal"
2697
2103
            def GetAllClients(self):
2698
2104
                "D-Bus method"
2699
2105
                return dbus.Array(c.dbus_object_path
2700
 
                                  for c in
2701
 
                                  tcp_server.clients.itervalues())
 
2106
                                  for c in tcp_server.clients)
2702
2107
            
2703
2108
            @dbus.service.method(_interface,
2704
2109
                                 out_signature="a{oa{sv}}")
2706
2111
                "D-Bus method"
2707
2112
                return dbus.Dictionary(
2708
2113
                    ((c.dbus_object_path, c.GetAll(""))
2709
 
                     for c in tcp_server.clients.itervalues()),
 
2114
                     for c in tcp_server.clients),
2710
2115
                    signature="oa{sv}")
2711
2116
            
2712
2117
            @dbus.service.method(_interface, in_signature="o")
2713
2118
            def RemoveClient(self, object_path):
2714
2119
                "D-Bus method"
2715
 
                for c in tcp_server.clients.itervalues():
 
2120
                for c in tcp_server.clients:
2716
2121
                    if c.dbus_object_path == object_path:
2717
 
                        del tcp_server.clients[c.name]
 
2122
                        tcp_server.clients.remove(c)
2718
2123
                        c.remove_from_connection()
2719
2124
                        # Don't signal anything except ClientRemoved
2720
2125
                        c.disable(quiet=True)
2725
2130
            
2726
2131
            del _interface
2727
2132
        
2728
 
        mandos_dbus_service = MandosDBusService()
 
2133
        class MandosDBusServiceTransitional(MandosDBusService):
 
2134
            __metaclass__ = AlternateDBusNamesMetaclass
 
2135
        mandos_dbus_service = MandosDBusServiceTransitional()
2729
2136
    
2730
2137
    def cleanup():
2731
2138
        "Cleanup function; run on exit"
2732
2139
        service.cleanup()
2733
2140
        
2734
2141
        multiprocessing.active_children()
2735
 
        wnull.close()
2736
 
        if not (tcp_server.clients or client_settings):
2737
 
            return
2738
 
        
2739
 
        # Store client before exiting. Secrets are encrypted with key
2740
 
        # based on what config file has. If config file is
2741
 
        # removed/edited, old secret will thus be unrecovable.
2742
 
        clients = {}
2743
 
        with PGPEngine() as pgp:
2744
 
            for client in tcp_server.clients.itervalues():
2745
 
                key = client_settings[client.name]["secret"]
2746
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2747
 
                                                      key)
2748
 
                client_dict = {}
2749
 
                
2750
 
                # A list of attributes that can not be pickled
2751
 
                # + secret.
2752
 
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
2754
 
                for name, typ in (inspect.getmembers
2755
 
                                  (dbus.service.Object)):
2756
 
                    exclude.add(name)
2757
 
                
2758
 
                client_dict["encrypted_secret"] = (client
2759
 
                                                   .encrypted_secret)
2760
 
                for attr in client.client_structure:
2761
 
                    if attr not in exclude:
2762
 
                        client_dict[attr] = getattr(client, attr)
2763
 
                
2764
 
                clients[client.name] = client_dict
2765
 
                del client_settings[client.name]["secret"]
2766
 
        
2767
 
        try:
2768
 
            with (tempfile.NamedTemporaryFile
2769
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2770
 
                   dir=os.path.dirname(stored_state_path),
2771
 
                   delete=False)) as stored_state:
2772
 
                pickle.dump((clients, client_settings), stored_state)
2773
 
                tempname=stored_state.name
2774
 
            os.rename(tempname, stored_state_path)
2775
 
        except (IOError, OSError) as e:
2776
 
            if not debug:
2777
 
                try:
2778
 
                    os.remove(tempname)
2779
 
                except NameError:
2780
 
                    pass
2781
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
 
                logger.warning("Could not save persistent state: {0}"
2783
 
                               .format(os.strerror(e.errno)))
2784
 
            else:
2785
 
                logger.warning("Could not save persistent state:",
2786
 
                               exc_info=e)
2787
 
                raise e
2788
 
        
2789
 
        # Delete all clients, and settings from config
2790
2142
        while tcp_server.clients:
2791
 
            name, client = tcp_server.clients.popitem()
 
2143
            client = tcp_server.clients.pop()
2792
2144
            if use_dbus:
2793
2145
                client.remove_from_connection()
 
2146
            client.disable_hook = None
2794
2147
            # Don't signal anything except ClientRemoved
2795
2148
            client.disable(quiet=True)
2796
2149
            if use_dbus:
2798
2151
                mandos_dbus_service.ClientRemoved(client
2799
2152
                                                  .dbus_object_path,
2800
2153
                                                  client.name)
2801
 
        client_settings.clear()
2802
2154
    
2803
2155
    atexit.register(cleanup)
2804
2156
    
2805
 
    for client in tcp_server.clients.itervalues():
 
2157
    for client in tcp_server.clients:
2806
2158
        if use_dbus:
2807
2159
            # Emit D-Bus signal
2808
2160
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2809
 
        # Need to initiate checking of clients
2810
 
        if client.enabled:
2811
 
            client.init_checker()
 
2161
        client.enable()
2812
2162
    
2813
2163
    tcp_server.enable()
2814
2164
    tcp_server.server_activate()
2817
2167
    service.port = tcp_server.socket.getsockname()[1]
2818
2168
    if use_ipv6:
2819
2169
        logger.info("Now listening on address %r, port %d,"
2820
 
                    " flowinfo %d, scope_id %d",
2821
 
                    *tcp_server.socket.getsockname())
 
2170
                    " flowinfo %d, scope_id %d"
 
2171
                    % tcp_server.socket.getsockname())
2822
2172
    else:                       # IPv4
2823
 
        logger.info("Now listening on address %r, port %d",
2824
 
                    *tcp_server.socket.getsockname())
 
2173
        logger.info("Now listening on address %r, port %d"
 
2174
                    % tcp_server.socket.getsockname())
2825
2175
    
2826
2176
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2177
    
2830
2180
        try:
2831
2181
            service.activate()
2832
2182
        except dbus.exceptions.DBusException as error:
2833
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2183
            logger.critical("DBusException: %s", error)
2834
2184
            cleanup()
2835
2185
            sys.exit(1)
2836
2186
        # End of Avahi example code
2843
2193
        logger.debug("Starting main loop")
2844
2194
        main_loop.run()
2845
2195
    except AvahiError as error:
2846
 
        logger.critical("Avahi Error", exc_info=error)
 
2196
        logger.critical("AvahiError: %s", error)
2847
2197
        cleanup()
2848
2198
        sys.exit(1)
2849
2199
    except KeyboardInterrupt:
2854
2204
    # Must run before the D-Bus bus name gets deregistered
2855
2205
    cleanup()
2856
2206
 
 
2207
 
2857
2208
if __name__ == '__main__':
2858
2209
    main()