/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-05-22 20:00:18 UTC
  • Revision ID: teddy@recompile.se-20130522200018-xtbddz21pl7c69kw
* mandos: Bug fix: Don't print output from checkers when running in
          foreground.
          Bug fix: Do not fail when client is removed from
          clients.conf but saved settings remain.
  (Client.server_settings): New attribute.
  (Client.__init__): Take new "server_settings" keyword argument.  All
                     callers changed.
  (Client.start_checker): Redirect stdout and stderr for checkers when
                          running in foreground.
  (main): New "wnull" global variable for a writable /dev/null file.
          Do not restore settings for clients no longer in config file.
  (main/cleanup): Close wnull file object.  Do not save client
                  attribute "server_settings"
* mandos-monitor: Update to work in Urwid 1.0.1.
                  Adapt to work in both Python 3 and Python 2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
 
68
import binascii
 
69
import tempfile
 
70
import itertools
 
71
import collections
66
72
 
67
73
import dbus
68
74
import dbus.service
82
88
    except ImportError:
83
89
        SO_BINDTODEVICE = None
84
90
 
85
 
 
86
 
version = "1.4.1"
87
 
 
88
 
#logger = logging.getLogger('mandos')
89
 
logger = logging.Logger('mandos')
 
91
version = "1.6.0"
 
92
stored_state_file = "clients.pickle"
 
93
 
 
94
logger = logging.getLogger()
90
95
syslogger = (logging.handlers.SysLogHandler
91
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
97
              address = str("/dev/log")))
93
 
syslogger.setFormatter(logging.Formatter
94
 
                       ('Mandos [%(process)d]: %(levelname)s:'
95
 
                        ' %(message)s'))
96
 
logger.addHandler(syslogger)
97
 
 
98
 
console = logging.StreamHandler()
99
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
102
 
logger.addHandler(console)
 
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
 
103
214
 
104
215
class AvahiError(Exception):
105
216
    def __init__(self, value, *args, **kwargs):
123
234
               Used to optionally bind to the specified interface.
124
235
    name: string; Example: 'Mandos'
125
236
    type: string; Example: '_mandos._tcp'.
126
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
237
     See <https://www.iana.org/assignments/service-names-port-numbers>
127
238
    port: integer; what port to announce
128
239
    TXT: list of strings; TXT record for the service
129
240
    domain: string; Domain to publish on, default to .local if empty.
135
246
    server: D-Bus Server
136
247
    bus: dbus.SystemBus()
137
248
    """
 
249
    
138
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
139
251
                 servicetype = None, port = None, TXT = None,
140
252
                 domain = "", host = "", max_renames = 32768,
153
265
        self.server = None
154
266
        self.bus = bus
155
267
        self.entry_group_state_changed_match = None
 
268
    
156
269
    def rename(self):
157
270
        """Derived from the Avahi example code"""
158
271
        if self.rename_count >= self.max_renames:
164
277
                            .GetAlternativeServiceName(self.name))
165
278
        logger.info("Changing Zeroconf service name to %r ...",
166
279
                    self.name)
167
 
        syslogger.setFormatter(logging.Formatter
168
 
                               ('Mandos (%s) [%%(process)d]:'
169
 
                                ' %%(levelname)s: %%(message)s'
170
 
                                % self.name))
171
280
        self.remove()
172
281
        try:
173
282
            self.add()
174
283
        except dbus.exceptions.DBusException as error:
175
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
176
285
            self.cleanup()
177
286
            os._exit(1)
178
287
        self.rename_count += 1
 
288
    
179
289
    def remove(self):
180
290
        """Derived from the Avahi example code"""
181
291
        if self.entry_group_state_changed_match is not None:
183
293
            self.entry_group_state_changed_match = None
184
294
        if self.group is not None:
185
295
            self.group.Reset()
 
296
    
186
297
    def add(self):
187
298
        """Derived from the Avahi example code"""
188
299
        self.remove()
193
304
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
194
305
        self.entry_group_state_changed_match = (
195
306
            self.group.connect_to_signal(
196
 
                'StateChanged', self .entry_group_state_changed))
 
307
                'StateChanged', self.entry_group_state_changed))
197
308
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
198
309
                     self.name, self.type)
199
310
        self.group.AddService(
205
316
            dbus.UInt16(self.port),
206
317
            avahi.string_array_to_txt_array(self.TXT))
207
318
        self.group.Commit()
 
319
    
208
320
    def entry_group_state_changed(self, state, error):
209
321
        """Derived from the Avahi example code"""
210
322
        logger.debug("Avahi entry group state change: %i", state)
217
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
218
330
            logger.critical("Avahi: Error in group state changed %s",
219
331
                            unicode(error))
220
 
            raise AvahiGroupError("State changed: %s"
221
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
222
335
    def cleanup(self):
223
336
        """Derived from the Avahi example code"""
224
337
        if self.group is not None:
225
338
            try:
226
339
                self.group.Free()
227
340
            except (dbus.exceptions.UnknownMethodException,
228
 
                    dbus.exceptions.DBusException) as e:
 
341
                    dbus.exceptions.DBusException):
229
342
                pass
230
343
            self.group = None
231
344
        self.remove()
 
345
    
232
346
    def server_state_changed(self, state, error=None):
233
347
        """Derived from the Avahi example code"""
234
348
        logger.debug("Avahi server state change: %i", state)
253
367
                logger.debug("Unknown state: %r", state)
254
368
            else:
255
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
256
371
    def activate(self):
257
372
        """Derived from the Avahi example code"""
258
373
        if self.server is None:
266
381
        self.server_state_changed(self.server.GetState())
267
382
 
268
383
 
269
 
def _timedelta_to_milliseconds(td):
 
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):
270
396
    "Convert a datetime.timedelta() to milliseconds"
271
397
    return ((td.days * 24 * 60 * 60 * 1000)
272
398
            + (td.seconds * 1000)
273
399
            + (td.microseconds // 1000))
274
 
        
 
400
 
 
401
 
275
402
class Client(object):
276
403
    """A representation of a client host served by this server.
277
404
    
278
405
    Attributes:
279
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
406
    approved:   bool(); 'None' if not yet approved/disapproved
280
407
    approval_delay: datetime.timedelta(); Time to wait for approval
281
408
    approval_duration: datetime.timedelta(); Duration of one approval
282
409
    checker:    subprocess.Popen(); a running checker process used
289
416
                     instance %(name)s can be used in the command.
290
417
    checker_initiator_tag: a gobject event source tag, or None
291
418
    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
292
421
    current_checker_command: string; current running checker_command
293
 
    disable_hook:  If set, called by disable() as disable_hook(self)
294
422
    disable_initiator_tag: a gobject event source tag, or None
295
423
    enabled:    bool()
296
424
    fingerprint: string (40 or 32 hexadecimal digits); used to
299
427
    interval:   datetime.timedelta(); How often to start a new checker
300
428
    last_approval_request: datetime.datetime(); (UTC) or None
301
429
    last_checked_ok: datetime.datetime(); (UTC) or None
302
 
    last_enabled: datetime.datetime(); (UTC)
 
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
303
434
    name:       string; from the config file, used in log messages and
304
435
                        D-Bus identifiers
305
436
    secret:     bytestring; sent verbatim (over TLS) to client
306
437
    timeout:    datetime.timedelta(); How long from last_checked_ok
307
438
                                      until this client is disabled
308
 
    extended_timeout:   extra long timeout when password has been sent
 
439
    extended_timeout:   extra long timeout when secret has been sent
309
440
    runtime_expansions: Allowed attributes for runtime expansion.
310
441
    expires:    datetime.datetime(); time (UTC) when a client will be
311
442
                disabled, or None
 
443
    server_settings: The server_settings dict from main()
312
444
    """
313
445
    
314
446
    runtime_expansions = ("approval_delay", "approval_duration",
315
 
                          "created", "enabled", "fingerprint",
316
 
                          "host", "interval", "last_checked_ok",
 
447
                          "created", "enabled", "expires",
 
448
                          "fingerprint", "host", "interval",
 
449
                          "last_approval_request", "last_checked_ok",
317
450
                          "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
                        }
318
461
    
319
462
    def timeout_milliseconds(self):
320
463
        "Return the 'timeout' attribute in milliseconds"
321
 
        return _timedelta_to_milliseconds(self.timeout)
 
464
        return timedelta_to_milliseconds(self.timeout)
322
465
    
323
466
    def extended_timeout_milliseconds(self):
324
467
        "Return the 'extended_timeout' attribute in milliseconds"
325
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
468
        return timedelta_to_milliseconds(self.extended_timeout)
326
469
    
327
470
    def interval_milliseconds(self):
328
471
        "Return the 'interval' attribute in milliseconds"
329
 
        return _timedelta_to_milliseconds(self.interval)
 
472
        return timedelta_to_milliseconds(self.interval)
330
473
    
331
474
    def approval_delay_milliseconds(self):
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."""
 
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):
338
525
        self.name = name
339
 
        if config is None:
340
 
            config = {}
 
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
        
341
543
        logger.debug("Creating client %r", self.name)
342
544
        # Uppercase and remove spaces from fingerprint for later
343
545
        # comparison purposes with return value from the fingerprint()
344
546
        # function
345
 
        self.fingerprint = (config["fingerprint"].upper()
346
 
                            .replace(" ", ""))
347
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
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
 
548
        self.created = settings.get("created",
 
549
                                    datetime.datetime.utcnow())
 
550
        
 
551
        # attributes specific for this server instance
369
552
        self.checker = None
370
553
        self.checker_initiator_tag = None
371
554
        self.disable_initiator_tag = None
372
 
        self.expires = None
373
555
        self.checker_callback_tag = None
374
 
        self.checker_command = config["checker"]
375
556
        self.current_checker_command = None
376
 
        self.last_connect = None
377
 
        self._approved = None
378
 
        self.approved_by_default = config.get("approved_by_default",
379
 
                                              True)
 
557
        self.approved = None
380
558
        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"])
385
559
        self.changedstate = (multiprocessing_manager
386
560
                             .Condition(multiprocessing_manager
387
561
                                        .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)
388
573
    
 
574
    # Send notice to process children that client state has changed
389
575
    def send_changedstate(self):
390
 
        self.changedstate.acquire()
391
 
        self.changedstate.notify_all()
392
 
        self.changedstate.release()
 
576
        with self.changedstate:
 
577
            self.changedstate.notify_all()
393
578
    
394
579
    def enable(self):
395
580
        """Start this client's checker and timeout hooks"""
396
581
        if getattr(self, "enabled", False):
397
582
            # Already enabled
398
583
            return
 
584
        self.expires = datetime.datetime.utcnow() + self.timeout
 
585
        self.enabled = True
 
586
        self.last_enabled = datetime.datetime.utcnow()
 
587
        self.init_checker()
399
588
        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):
400
614
        # Schedule a new checker to be started an 'interval' from now,
401
615
        # and every interval from then on.
 
616
        if self.checker_initiator_tag is not None:
 
617
            gobject.source_remove(self.checker_initiator_tag)
402
618
        self.checker_initiator_tag = (gobject.timeout_add
403
619
                                      (self.interval_milliseconds(),
404
620
                                       self.start_checker))
405
621
        # Schedule a disable() when 'timeout' has passed
406
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
622
        if self.disable_initiator_tag is not None:
 
623
            gobject.source_remove(self.disable_initiator_tag)
407
624
        self.disable_initiator_tag = (gobject.timeout_add
408
625
                                   (self.timeout_milliseconds(),
409
626
                                    self.disable))
410
 
        self.enabled = True
411
 
        self.last_enabled = datetime.datetime.utcnow()
412
627
        # Also start a new checker *right now*.
413
628
        self.start_checker()
414
629
    
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
 
    
441
630
    def checker_callback(self, pid, condition, command):
442
631
        """The checker has completed, so take appropriate actions."""
443
632
        self.checker_callback_tag = None
444
633
        self.checker = None
445
634
        if os.WIFEXITED(condition):
446
 
            exitstatus = os.WEXITSTATUS(condition)
447
 
            if exitstatus == 0:
 
635
            self.last_checker_status = os.WEXITSTATUS(condition)
 
636
            if self.last_checker_status == 0:
448
637
                logger.info("Checker for %(name)s succeeded",
449
638
                            vars(self))
450
639
                self.checked_ok()
452
641
                logger.info("Checker for %(name)s failed",
453
642
                            vars(self))
454
643
        else:
 
644
            self.last_checker_status = -1
455
645
            logger.warning("Checker for %(name)s crashed?",
456
646
                           vars(self))
457
647
    
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
 
        """
 
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."""
464
656
        if timeout is None:
465
657
            timeout = self.timeout
466
 
        self.last_checked_ok = datetime.datetime.utcnow()
467
658
        if self.disable_initiator_tag is not None:
468
659
            gobject.source_remove(self.disable_initiator_tag)
 
660
            self.disable_initiator_tag = None
469
661
        if getattr(self, "enabled", False):
470
662
            self.disable_initiator_tag = (gobject.timeout_add
471
 
                                          (_timedelta_to_milliseconds
 
663
                                          (timedelta_to_milliseconds
472
664
                                           (timeout), self.disable))
473
665
            self.expires = datetime.datetime.utcnow() + timeout
474
666
    
481
673
        If a checker already exists, leave it running and do
482
674
        nothing."""
483
675
        # The reason for not killing a running checker is that if we
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
 
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
488
680
        # checkers alone, the checker would have to take more time
489
681
        # than 'timeout' for the client to be disabled, which is as it
490
682
        # should be.
504
696
                                      self.current_checker_command)
505
697
        # Start a new checker if needed
506
698
        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)
507
704
            try:
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
 
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
526
710
            self.current_checker_command = command
527
711
            try:
528
712
                logger.info("Starting checker %r for %s",
531
715
                # in normal mode, that is already done by daemon(),
532
716
                # and in debug mode we don't want to.  (Stdin is
533
717
                # 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 })
534
726
                self.checker = subprocess.Popen(command,
535
727
                                                close_fds=True,
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.
 
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:
543
741
                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)
547
742
            except OSError as error:
548
 
                logger.error("Failed to start subprocess: %s",
549
 
                             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)
550
752
        # Re-run this periodically if run by gobject.timeout_add
551
753
        return True
552
754
    
559
761
            return
560
762
        logger.debug("Stopping checker for %(name)s", vars(self))
561
763
        try:
562
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
764
            self.checker.terminate()
563
765
            #time.sleep(0.5)
564
766
            #if self.checker.poll() is None:
565
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
767
            #    self.checker.kill()
566
768
        except OSError as error:
567
769
            if error.errno != errno.ESRCH: # No such process
568
770
                raise
585
787
    # "Set" method, so we fail early here:
586
788
    if byte_arrays and signature != "ay":
587
789
        raise ValueError("Byte arrays not supported for non-'ay'"
588
 
                         " signature %r" % signature)
 
790
                         " signature {0!r}".format(signature))
589
791
    def decorator(func):
590
792
        func._dbus_is_property = True
591
793
        func._dbus_interface = dbus_interface
599
801
    return decorator
600
802
 
601
803
 
 
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
 
602
841
class DBusPropertyException(dbus.exceptions.DBusException):
603
842
    """A base class for D-Bus property-related exceptions
604
843
    """
627
866
    """
628
867
    
629
868
    @staticmethod
630
 
    def _is_dbus_property(obj):
631
 
        return getattr(obj, "_dbus_is_property", False)
 
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)
632
877
    
633
 
    def _get_all_dbus_properties(self):
 
878
    def _get_all_dbus_things(self, thing):
634
879
        """Returns a generator of (name, attribute) pairs
635
880
        """
636
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
 
883
                 athing.__get__(self))
637
884
                for cls in self.__class__.__mro__
638
 
                for name, prop in
639
 
                inspect.getmembers(cls, self._is_dbus_property))
 
885
                for name, athing in
 
886
                inspect.getmembers(cls,
 
887
                                   self._is_dbus_thing(thing)))
640
888
    
641
889
    def _get_dbus_property(self, interface_name, property_name):
642
890
        """Returns a bound method if one exists which is a D-Bus
644
892
        """
645
893
        for cls in  self.__class__.__mro__:
646
894
            for name, value in (inspect.getmembers
647
 
                                (cls, self._is_dbus_property)):
 
895
                                (cls,
 
896
                                 self._is_dbus_thing("property"))):
648
897
                if (value._dbus_name == property_name
649
898
                    and value._dbus_interface == interface_name):
650
899
                    return value.__get__(self)
679
928
            # signatures other than "ay".
680
929
            if prop._dbus_signature != "ay":
681
930
                raise ValueError
682
 
            value = dbus.ByteArray(''.join(unichr(byte)
683
 
                                           for byte in value))
 
931
            value = dbus.ByteArray(b''.join(chr(byte)
 
932
                                            for byte in value))
684
933
        prop(value)
685
934
    
686
935
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
691
940
        
692
941
        Note: Will not include properties with access="write".
693
942
        """
694
 
        all = {}
695
 
        for name, prop in self._get_all_dbus_properties():
 
943
        properties = {}
 
944
        for name, prop in self._get_all_dbus_things("property"):
696
945
            if (interface_name
697
946
                and interface_name != prop._dbus_interface):
698
947
                # Interface non-empty but did not match
702
951
                continue
703
952
            value = prop()
704
953
            if not hasattr(value, "variant_level"):
705
 
                all[name] = value
 
954
                properties[name] = value
706
955
                continue
707
 
            all[name] = type(value)(value, variant_level=
708
 
                                    value.variant_level+1)
709
 
        return dbus.Dictionary(all, signature="sv")
 
956
            properties[name] = type(value)(value, variant_level=
 
957
                                           value.variant_level+1)
 
958
        return dbus.Dictionary(properties, signature="sv")
710
959
    
711
960
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
712
961
                         out_signature="s",
713
962
                         path_keyword='object_path',
714
963
                         connection_keyword='connection')
715
964
    def Introspect(self, object_path, connection):
716
 
        """Standard D-Bus method, overloaded to insert property tags.
 
965
        """Overloading of standard D-Bus method.
 
966
        
 
967
        Inserts property tags and interface annotation tags.
717
968
        """
718
969
        xmlstring = dbus.service.Object.Introspect(self, object_path,
719
970
                                                   connection)
726
977
                e.setAttribute("access", prop._dbus_access)
727
978
                return e
728
979
            for if_tag in document.getElementsByTagName("interface"):
 
980
                # Add property tags
729
981
                for tag in (make_tag(document, name, prop)
730
982
                            for name, prop
731
 
                            in self._get_all_dbus_properties()
 
983
                            in self._get_all_dbus_things("property")
732
984
                            if prop._dbus_interface
733
985
                            == if_tag.getAttribute("name")):
734
986
                    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)
735
1018
                # Add the names to the return values for the
736
1019
                # "org.freedesktop.DBus.Properties" methods
737
1020
                if (if_tag.getAttribute("name")
752
1035
        except (AttributeError, xml.dom.DOMException,
753
1036
                xml.parsers.expat.ExpatError) as error:
754
1037
            logger.error("Failed to override Introspection method",
755
 
                         error)
 
1038
                         exc_info=error)
756
1039
        return xmlstring
757
1040
 
758
1041
 
759
 
def datetime_to_dbus (dt, variant_level=0):
 
1042
def datetime_to_dbus(dt, variant_level=0):
760
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
761
1044
    if dt is None:
762
1045
        return dbus.String("", variant_level = variant_level)
763
1046
    return dbus.String(dt.isoformat(),
764
1047
                       variant_level=variant_level)
765
1048
 
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.
 
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).
770
1072
    """
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):
 
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):
778
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
779
1081
                # with the wrong interface name
780
1082
                if (not hasattr(attribute, "_dbus_interface")
781
1083
                    or not attribute._dbus_interface
782
 
                    .startswith("se.recompile.Mandos")):
 
1084
                    .startswith(orig_interface_name)):
783
1085
                    continue
784
1086
                # Create an alternate D-Bus interface name based on
785
1087
                # the current name
786
1088
                alt_interface = (attribute._dbus_interface
787
 
                                 .replace("se.recompile.Mandos",
788
 
                                          "se.bsnet.fukt.Mandos"))
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
 
1091
                interface_names.add(alt_interface)
789
1092
                # Is this a D-Bus signal?
790
1093
                if getattr(attribute, "_dbus_is_signal", False):
791
 
                    # Extract the original non-method function by
792
 
                    # black magic
 
1094
                    # Extract the original non-method undecorated
 
1095
                    # function by black magic
793
1096
                    nonmethod_func = (dict(
794
1097
                            zip(attribute.func_code.co_freevars,
795
1098
                                attribute.__closure__))["func"]
806
1109
                                nonmethod_func.func_name,
807
1110
                                nonmethod_func.func_defaults,
808
1111
                                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
809
1118
                    # Define a creator of a function to call both the
810
 
                    # old and new functions, so both the old and new
811
 
                    # signals gets sent when the function is called
 
1119
                    # original and alternate functions, so both the
 
1120
                    # original and alternate signals gets sent when
 
1121
                    # the function is called
812
1122
                    def fixscope(func1, func2):
813
1123
                        """This function is a scope container to pass
814
1124
                        func1 and func2 to the "call_both" function
821
1131
                        return call_both
822
1132
                    # Create the "call_both" function and add it to
823
1133
                    # the class
824
 
                    attr[attrname] = fixscope(attribute,
825
 
                                              new_function)
 
1134
                    attr[attrname] = fixscope(attribute, new_function)
826
1135
                # Is this a D-Bus method?
827
1136
                elif getattr(attribute, "_dbus_is_method", False):
828
1137
                    # Create a new, but exactly alike, function
839
1148
                                        attribute.func_name,
840
1149
                                        attribute.func_defaults,
841
1150
                                        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
842
1157
                # Is this a D-Bus property?
843
1158
                elif getattr(attribute, "_dbus_is_property", False):
844
1159
                    # Create a new, but exactly alike, function
858
1173
                                        attribute.func_name,
859
1174
                                        attribute.func_defaults,
860
1175
                                        attribute.func_closure)))
861
 
        return type.__new__(mcs, name, bases, attr)
862
 
 
 
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"})
863
1221
class ClientDBus(Client, DBusObjectWithProperties):
864
1222
    """A Client class using D-Bus
865
1223
    
874
1232
    # dbus.service.Object doesn't use super(), so we can't either.
875
1233
    
876
1234
    def __init__(self, bus = None, *args, **kwargs):
877
 
        self._approvals_pending = 0
878
1235
        self.bus = bus
879
1236
        Client.__init__(self, *args, **kwargs)
880
1237
        # Only now, when this client is initialized, can it show up on
886
1243
                                 ("/clients/" + client_object_name))
887
1244
        DBusObjectWithProperties.__init__(self, self.bus,
888
1245
                                          self.dbus_object_path)
889
 
        
 
1246
    
890
1247
    def notifychangeproperty(transform_func,
891
1248
                             dbus_name, type_func=lambda x: x,
892
1249
                             variant_level=1):
893
1250
        """ Modify a variable so that it's a property which announces
894
1251
        its changes to DBus.
895
 
 
 
1252
        
896
1253
        transform_fun: Function that takes a value and a variant_level
897
1254
                       and transforms it to a D-Bus type.
898
1255
        dbus_name: D-Bus name of the variable
915
1272
        
916
1273
        return property(lambda self: getattr(self, attrname), setter)
917
1274
    
918
 
    
919
1275
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
920
1276
    approvals_pending = notifychangeproperty(dbus.Boolean,
921
1277
                                             "ApprovalPending",
928
1284
                                       checker is not None)
929
1285
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
930
1286
                                           "LastCheckedOK")
 
1287
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1288
                                               "LastCheckerStatus")
931
1289
    last_approval_request = notifychangeproperty(
932
1290
        datetime_to_dbus, "LastApprovalRequest")
933
1291
    approved_by_default = notifychangeproperty(dbus.Boolean,
934
1292
                                               "ApprovedByDefault")
935
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1293
    approval_delay = notifychangeproperty(dbus.UInt64,
936
1294
                                          "ApprovalDelay",
937
1295
                                          type_func =
938
 
                                          _timedelta_to_milliseconds)
 
1296
                                          timedelta_to_milliseconds)
939
1297
    approval_duration = notifychangeproperty(
940
 
        dbus.UInt16, "ApprovalDuration",
941
 
        type_func = _timedelta_to_milliseconds)
 
1298
        dbus.UInt64, "ApprovalDuration",
 
1299
        type_func = timedelta_to_milliseconds)
942
1300
    host = notifychangeproperty(dbus.String, "Host")
943
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1301
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
944
1302
                                   type_func =
945
 
                                   _timedelta_to_milliseconds)
 
1303
                                   timedelta_to_milliseconds)
946
1304
    extended_timeout = notifychangeproperty(
947
 
        dbus.UInt16, "ExtendedTimeout",
948
 
        type_func = _timedelta_to_milliseconds)
949
 
    interval = notifychangeproperty(dbus.UInt16,
 
1305
        dbus.UInt64, "ExtendedTimeout",
 
1306
        type_func = timedelta_to_milliseconds)
 
1307
    interval = notifychangeproperty(dbus.UInt64,
950
1308
                                    "Interval",
951
1309
                                    type_func =
952
 
                                    _timedelta_to_milliseconds)
 
1310
                                    timedelta_to_milliseconds)
953
1311
    checker_command = notifychangeproperty(dbus.String, "Checker")
954
1312
    
955
1313
    del notifychangeproperty
997
1355
        return r
998
1356
    
999
1357
    def _reset_approved(self):
1000
 
        self._approved = None
 
1358
        self.approved = None
1001
1359
        return False
1002
1360
    
1003
1361
    def approve(self, value=True):
1004
 
        self.send_changedstate()
1005
 
        self._approved = value
1006
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1362
        self.approved = value
 
1363
        gobject.timeout_add(timedelta_to_milliseconds
1007
1364
                            (self.approval_duration),
1008
1365
                            self._reset_approved)
1009
 
    
 
1366
        self.send_changedstate()
1010
1367
    
1011
1368
    ## D-Bus methods, signals & properties
1012
1369
    _interface = "se.recompile.Mandos.Client"
1013
1370
    
 
1371
    ## Interfaces
 
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1014
1378
    ## Signals
1015
1379
    
1016
1380
    # CheckerCompleted - signal
1115
1479
                           access="readwrite")
1116
1480
    def ApprovalDuration_dbus_property(self, value=None):
1117
1481
        if value is None:       # get
1118
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1482
            return dbus.UInt64(timedelta_to_milliseconds(
1119
1483
                    self.approval_duration))
1120
1484
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1121
1485
    
1135
1499
    def Host_dbus_property(self, value=None):
1136
1500
        if value is None:       # get
1137
1501
            return dbus.String(self.host)
1138
 
        self.host = value
 
1502
        self.host = unicode(value)
1139
1503
    
1140
1504
    # Created - property
1141
1505
    @dbus_service_property(_interface, signature="s", access="read")
1142
1506
    def Created_dbus_property(self):
1143
 
        return dbus.String(datetime_to_dbus(self.created))
 
1507
        return datetime_to_dbus(self.created)
1144
1508
    
1145
1509
    # LastEnabled - property
1146
1510
    @dbus_service_property(_interface, signature="s", access="read")
1167
1531
            return
1168
1532
        return datetime_to_dbus(self.last_checked_ok)
1169
1533
    
 
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
    
1170
1540
    # Expires - property
1171
1541
    @dbus_service_property(_interface, signature="s", access="read")
1172
1542
    def Expires_dbus_property(self):
1183
1553
    def Timeout_dbus_property(self, value=None):
1184
1554
        if value is None:       # get
1185
1555
            return dbus.UInt64(self.timeout_milliseconds())
 
1556
        old_timeout = self.timeout
1186
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
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))
 
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))
1207
1574
    
1208
1575
    # ExtendedTimeout - property
1209
1576
    @dbus_service_property(_interface, signature="t",
1222
1589
        self.interval = datetime.timedelta(0, 0, 0, value)
1223
1590
        if getattr(self, "checker_initiator_tag", None) is None:
1224
1591
            return
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
 
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
1230
1598
    
1231
1599
    # Checker - property
1232
1600
    @dbus_service_property(_interface, signature="s",
1234
1602
    def Checker_dbus_property(self, value=None):
1235
1603
        if value is None:       # get
1236
1604
            return dbus.String(self.checker_command)
1237
 
        self.checker_command = value
 
1605
        self.checker_command = unicode(value)
1238
1606
    
1239
1607
    # CheckerRunning - property
1240
1608
    @dbus_service_property(_interface, signature="b",
1269
1637
            raise KeyError()
1270
1638
    
1271
1639
    def __getattribute__(self, name):
1272
 
        if(name == '_pipe'):
 
1640
        if name == '_pipe':
1273
1641
            return super(ProxyClient, self).__getattribute__(name)
1274
1642
        self._pipe.send(('getattr', name))
1275
1643
        data = self._pipe.recv()
1282
1650
            return func
1283
1651
    
1284
1652
    def __setattr__(self, name, value):
1285
 
        if(name == '_pipe'):
 
1653
        if name == '_pipe':
1286
1654
            return super(ProxyClient, self).__setattr__(name, value)
1287
1655
        self._pipe.send(('setattr', name, value))
1288
1656
 
1289
 
class ClientDBusTransitional(ClientDBus):
1290
 
    __metaclass__ = AlternateDBusNamesMetaclass
1291
1657
 
1292
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
1293
1659
    """A class to handle client connections.
1376
1742
                            client.Rejected("Disabled")
1377
1743
                        return
1378
1744
                    
1379
 
                    if client._approved or not client.approval_delay:
 
1745
                    if client.approved or not client.approval_delay:
1380
1746
                        #We are approved or approval is disabled
1381
1747
                        break
1382
 
                    elif client._approved is None:
 
1748
                    elif client.approved is None:
1383
1749
                        logger.info("Client %s needs approval",
1384
1750
                                    client.name)
1385
1751
                        if self.server.use_dbus:
1398
1764
                    #wait until timeout or approved
1399
1765
                    time = datetime.datetime.now()
1400
1766
                    client.changedstate.acquire()
1401
 
                    (client.changedstate.wait
1402
 
                     (float(client._timedelta_to_milliseconds(delay)
1403
 
                            / 1000)))
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1404
1770
                    client.changedstate.release()
1405
1771
                    time2 = datetime.datetime.now()
1406
1772
                    if (time2 - time) >= delay:
1422
1788
                    try:
1423
1789
                        sent = session.send(client.secret[sent_size:])
1424
1790
                    except gnutls.errors.GNUTLSError as error:
1425
 
                        logger.warning("gnutls send failed")
 
1791
                        logger.warning("gnutls send failed",
 
1792
                                       exc_info=error)
1426
1793
                        return
1427
1794
                    logger.debug("Sent: %d, remaining: %d",
1428
1795
                                 sent, len(client.secret)
1431
1798
                
1432
1799
                logger.info("Sending secret to %s", client.name)
1433
1800
                # bump the timeout using extended_timeout
1434
 
                client.checked_ok(client.extended_timeout)
 
1801
                client.bump_timeout(client.extended_timeout)
1435
1802
                if self.server.use_dbus:
1436
1803
                    # Emit D-Bus signal
1437
1804
                    client.GotSecret()
1442
1809
                try:
1443
1810
                    session.bye()
1444
1811
                except gnutls.errors.GNUTLSError as error:
1445
 
                    logger.warning("GnuTLS bye failed")
 
1812
                    logger.warning("GnuTLS bye failed",
 
1813
                                   exc_info=error)
1446
1814
    
1447
1815
    @staticmethod
1448
1816
    def peer_certificate(session):
1504
1872
        # Convert the buffer to a Python bytestring
1505
1873
        fpr = ctypes.string_at(buf, buf_len.value)
1506
1874
        # Convert the bytestring to hexadecimal notation
1507
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1875
        hex_fpr = binascii.hexlify(fpr).upper()
1508
1876
        return hex_fpr
1509
1877
 
1510
1878
 
1513
1881
    def sub_process_main(self, request, address):
1514
1882
        try:
1515
1883
            self.finish_request(request, address)
1516
 
        except:
 
1884
        except Exception:
1517
1885
            self.handle_error(request, address)
1518
1886
        self.close_request(request)
1519
1887
    
1520
1888
    def process_request(self, request, address):
1521
1889
        """Start a new process to process the request."""
1522
1890
        proc = multiprocessing.Process(target = self.sub_process_main,
1523
 
                                       args = (request,
1524
 
                                               address))
 
1891
                                       args = (request, address))
1525
1892
        proc.start()
1526
1893
        return proc
1527
1894
 
1555
1922
        use_ipv6:       Boolean; to use IPv6 or not
1556
1923
    """
1557
1924
    def __init__(self, server_address, RequestHandlerClass,
1558
 
                 interface=None, use_ipv6=True):
 
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
        """
1559
1929
        self.interface = interface
1560
1930
        if use_ipv6:
1561
1931
            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.
1562
1958
        socketserver.TCPServer.__init__(self, server_address,
1563
1959
                                        RequestHandlerClass)
 
1960
    
1564
1961
    def server_bind(self):
1565
1962
        """This overrides the normal server_bind() function
1566
1963
        to bind to an interface if one was specified, and also NOT to
1574
1971
                try:
1575
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1576
1973
                                           SO_BINDTODEVICE,
1577
 
                                           str(self.interface
1578
 
                                               + '\0'))
 
1974
                                           str(self.interface + '\0'))
1579
1975
                except socket.error as error:
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:
 
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:
1585
1980
                        logger.error("SO_BINDTODEVICE not available;"
1586
1981
                                     " cannot bind to interface %s",
1587
1982
                                     self.interface)
 
1983
                    elif error.errno == errno.ENODEV:
 
1984
                        logger.error("Interface %s does not exist,"
 
1985
                                     " cannot bind", self.interface)
1588
1986
                    else:
1589
1987
                        raise
1590
1988
        # Only bind(2) the socket if we really need to.
1620
2018
    """
1621
2019
    def __init__(self, server_address, RequestHandlerClass,
1622
2020
                 interface=None, use_ipv6=True, clients=None,
1623
 
                 gnutls_priority=None, use_dbus=True):
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1624
2022
        self.enabled = False
1625
2023
        self.clients = clients
1626
2024
        if self.clients is None:
1627
 
            self.clients = set()
 
2025
            self.clients = {}
1628
2026
        self.use_dbus = use_dbus
1629
2027
        self.gnutls_priority = gnutls_priority
1630
2028
        IPv6_TCPServer.__init__(self, server_address,
1631
2029
                                RequestHandlerClass,
1632
2030
                                interface = interface,
1633
 
                                use_ipv6 = use_ipv6)
 
2031
                                use_ipv6 = use_ipv6,
 
2032
                                socketfd = socketfd)
1634
2033
    def server_activate(self):
1635
2034
        if self.enabled:
1636
2035
            return socketserver.TCPServer.server_activate(self)
1649
2048
    
1650
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
1651
2050
                   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)
1666
2051
        # error, or the other end of multiprocessing.Pipe has closed
1667
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1668
2053
            # Wait for other process to exit
1669
2054
            proc.join()
1670
2055
            return False
1677
2062
            fpr = request[1]
1678
2063
            address = request[2]
1679
2064
            
1680
 
            for c in self.clients:
 
2065
            for c in self.clients.itervalues():
1681
2066
                if c.fingerprint == fpr:
1682
2067
                    client = c
1683
2068
                    break
1728
2113
        return True
1729
2114
 
1730
2115
 
 
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
 
1731
2215
def string_to_delta(interval):
1732
2216
    """Parse a string and return a datetime.timedelta
1733
2217
    
1744
2228
    >>> string_to_delta('5m 30s')
1745
2229
    datetime.timedelta(0, 330)
1746
2230
    """
 
2231
    
 
2232
    try:
 
2233
        return rfc3339_duration_to_delta(interval)
 
2234
    except ValueError:
 
2235
        pass
 
2236
    
1747
2237
    timevalue = datetime.timedelta(0)
1748
2238
    for s in interval.split():
1749
2239
        try:
1760
2250
            elif suffix == "w":
1761
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1762
2252
            else:
1763
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
1764
2255
        except (ValueError, IndexError) as e:
1765
2256
            raise ValueError(*(e.args))
1766
2257
        timevalue += delta
1767
2258
    return timevalue
1768
2259
 
1769
2260
 
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
 
 
1794
2261
def daemon(nochdir = False, noclose = False):
1795
2262
    """See daemon(3).  Standard BSD Unix function.
1796
2263
    
1804
2271
        sys.exit()
1805
2272
    if not noclose:
1806
2273
        # Close all standard open file descriptors
1807
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1808
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1809
2276
            raise OSError(errno.ENODEV,
1810
 
                          "%s not a character device"
1811
 
                          % os.path.devnull)
 
2277
                          "{0} not a character device"
 
2278
                          .format(os.devnull))
1812
2279
        os.dup2(null, sys.stdin.fileno())
1813
2280
        os.dup2(null, sys.stdout.fileno())
1814
2281
        os.dup2(null, sys.stderr.fileno())
1823
2290
    
1824
2291
    parser = argparse.ArgumentParser()
1825
2292
    parser.add_argument("-v", "--version", action="version",
1826
 
                        version = "%%(prog)s %s" % version,
 
2293
                        version = "%(prog)s {0}".format(version),
1827
2294
                        help="show version number and exit")
1828
2295
    parser.add_argument("-i", "--interface", metavar="IF",
1829
2296
                        help="Bind to interface IF")
1851
2318
                        " system bus interface")
1852
2319
    parser.add_argument("--no-ipv6", action="store_false",
1853
2320
                        dest="use_ipv6", help="Do not use IPv6")
 
2321
    parser.add_argument("--no-restore", action="store_false",
 
2322
                        dest="restore", help="Do not restore stored"
 
2323
                        " state")
 
2324
    parser.add_argument("--socket", type=int,
 
2325
                        help="Specify a file descriptor to a network"
 
2326
                        " socket to use instead of creating one")
 
2327
    parser.add_argument("--statedir", metavar="DIR",
 
2328
                        help="Directory to save/restore state in")
 
2329
    parser.add_argument("--foreground", action="store_true",
 
2330
                        help="Run in foreground")
 
2331
    
1854
2332
    options = parser.parse_args()
1855
2333
    
1856
2334
    if options.check:
1869
2347
                        "use_dbus": "True",
1870
2348
                        "use_ipv6": "True",
1871
2349
                        "debuglevel": "",
 
2350
                        "restore": "True",
 
2351
                        "socket": "",
 
2352
                        "statedir": "/var/lib/mandos",
 
2353
                        "foreground": "False",
1872
2354
                        }
1873
2355
    
1874
2356
    # Parse config file for server-global settings
1879
2361
    # Convert the SafeConfigParser object to a dict
1880
2362
    server_settings = server_config.defaults()
1881
2363
    # Use the appropriate methods on the non-string config options
1882
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2364
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1883
2365
        server_settings[option] = server_config.getboolean("DEFAULT",
1884
2366
                                                           option)
1885
2367
    if server_settings["port"]:
1886
2368
        server_settings["port"] = server_config.getint("DEFAULT",
1887
2369
                                                       "port")
 
2370
    if server_settings["socket"]:
 
2371
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2372
                                                         "socket")
 
2373
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2374
        # over with an opened os.devnull.  But we don't want this to
 
2375
        # happen with a supplied network socket.
 
2376
        if 0 <= server_settings["socket"] <= 2:
 
2377
            server_settings["socket"] = os.dup(server_settings
 
2378
                                               ["socket"])
1888
2379
    del server_config
1889
2380
    
1890
2381
    # Override the settings from the config file with command line
1891
2382
    # options, if set.
1892
2383
    for option in ("interface", "address", "port", "debug",
1893
2384
                   "priority", "servicename", "configdir",
1894
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2385
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2386
                   "statedir", "socket", "foreground"):
1895
2387
        value = getattr(options, option)
1896
2388
        if value is not None:
1897
2389
            server_settings[option] = value
1900
2392
    for option in server_settings.keys():
1901
2393
        if type(server_settings[option]) is str:
1902
2394
            server_settings[option] = unicode(server_settings[option])
 
2395
    # Debug implies foreground
 
2396
    if server_settings["debug"]:
 
2397
        server_settings["foreground"] = True
1903
2398
    # Now we have our good server settings in "server_settings"
1904
2399
    
1905
2400
    ##################################################################
1909
2404
    debuglevel = server_settings["debuglevel"]
1910
2405
    use_dbus = server_settings["use_dbus"]
1911
2406
    use_ipv6 = server_settings["use_ipv6"]
 
2407
    stored_state_path = os.path.join(server_settings["statedir"],
 
2408
                                     stored_state_file)
 
2409
    foreground = server_settings["foreground"]
 
2410
    
 
2411
    if debug:
 
2412
        initlogger(debug, logging.DEBUG)
 
2413
    else:
 
2414
        if not debuglevel:
 
2415
            initlogger(debug)
 
2416
        else:
 
2417
            level = getattr(logging, debuglevel.upper())
 
2418
            initlogger(debug, level)
1912
2419
    
1913
2420
    if server_settings["servicename"] != "Mandos":
1914
2421
        syslogger.setFormatter(logging.Formatter
1915
 
                               ('Mandos (%s) [%%(process)d]:'
1916
 
                                ' %%(levelname)s: %%(message)s'
1917
 
                                % server_settings["servicename"]))
 
2422
                               ('Mandos ({0}) [%(process)d]:'
 
2423
                                ' %(levelname)s: %(message)s'
 
2424
                                .format(server_settings
 
2425
                                        ["servicename"])))
1918
2426
    
1919
2427
    # Parse config file with clients
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)
 
2428
    client_config = configparser.SafeConfigParser(Client
 
2429
                                                  .client_defaults)
1929
2430
    client_config.read(os.path.join(server_settings["configdir"],
1930
2431
                                    "clients.conf"))
1931
2432
    
1940
2441
                              use_ipv6=use_ipv6,
1941
2442
                              gnutls_priority=
1942
2443
                              server_settings["priority"],
1943
 
                              use_dbus=use_dbus)
1944
 
    if not debug:
 
2444
                              use_dbus=use_dbus,
 
2445
                              socketfd=(server_settings["socket"]
 
2446
                                        or None))
 
2447
    if not foreground:
1945
2448
        pidfilename = "/var/run/mandos.pid"
 
2449
        pidfile = None
1946
2450
        try:
1947
2451
            pidfile = open(pidfilename, "w")
1948
 
        except IOError:
1949
 
            logger.error("Could not open file %r", pidfilename)
 
2452
        except IOError as e:
 
2453
            logger.error("Could not open file %r", pidfilename,
 
2454
                         exc_info=e)
1950
2455
    
1951
 
    try:
1952
 
        uid = pwd.getpwnam("_mandos").pw_uid
1953
 
        gid = pwd.getpwnam("_mandos").pw_gid
1954
 
    except KeyError:
 
2456
    for name in ("_mandos", "mandos", "nobody"):
1955
2457
        try:
1956
 
            uid = pwd.getpwnam("mandos").pw_uid
1957
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2458
            uid = pwd.getpwnam(name).pw_uid
 
2459
            gid = pwd.getpwnam(name).pw_gid
 
2460
            break
1958
2461
        except KeyError:
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
 
2462
            continue
 
2463
    else:
 
2464
        uid = 65534
 
2465
        gid = 65534
1965
2466
    try:
1966
2467
        os.setgid(gid)
1967
2468
        os.setuid(uid)
1968
2469
    except OSError as error:
1969
 
        if error[0] != errno.EPERM:
 
2470
        if error.errno != errno.EPERM:
1970
2471
            raise error
1971
2472
    
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
 
    
1980
2473
    if debug:
1981
2474
        # Enable all possible GnuTLS debugging
1982
2475
        
1992
2485
         .gnutls_global_set_log_function(debug_gnutls))
1993
2486
        
1994
2487
        # Redirect stdin so all checkers get /dev/null
1995
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2488
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1996
2489
        os.dup2(null, sys.stdin.fileno())
1997
2490
        if null > 2:
1998
2491
            os.close(null)
1999
 
    else:
2000
 
        # No console logging
2001
 
        logger.removeHandler(console)
2002
2492
    
2003
2493
    # Need to fork before connecting to D-Bus
2004
 
    if not debug:
 
2494
    if not foreground:
2005
2495
        # Close all input and output, do double fork, etc.
2006
2496
        daemon()
2007
2497
    
 
2498
    # multiprocessing will use threads, so before we use gobject we
 
2499
    # need to inform gobject that threads will be used.
 
2500
    gobject.threads_init()
 
2501
    
2008
2502
    global main_loop
2009
2503
    # From the Avahi example code
2010
 
    DBusGMainLoop(set_as_default=True )
 
2504
    DBusGMainLoop(set_as_default=True)
2011
2505
    main_loop = gobject.MainLoop()
2012
2506
    bus = dbus.SystemBus()
2013
2507
    # End of Avahi example code
2019
2513
                            ("se.bsnet.fukt.Mandos", bus,
2020
2514
                             do_not_queue=True))
2021
2515
        except dbus.exceptions.NameExistsException as e:
2022
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2516
            logger.error("Disabling D-Bus:", exc_info=e)
2023
2517
            use_dbus = False
2024
2518
            server_settings["use_dbus"] = False
2025
2519
            tcp_server.use_dbus = False
2026
2520
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2027
 
    service = AvahiService(name = server_settings["servicename"],
2028
 
                           servicetype = "_mandos._tcp",
2029
 
                           protocol = protocol, bus = bus)
 
2521
    service = AvahiServiceToSyslog(name =
 
2522
                                   server_settings["servicename"],
 
2523
                                   servicetype = "_mandos._tcp",
 
2524
                                   protocol = protocol, bus = bus)
2030
2525
    if server_settings["interface"]:
2031
2526
        service.interface = (if_nametoindex
2032
2527
                             (str(server_settings["interface"])))
2036
2531
    
2037
2532
    client_class = Client
2038
2533
    if use_dbus:
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):
 
2534
        client_class = functools.partial(ClientDBus, bus = bus)
 
2535
    
 
2536
    client_settings = Client.config_parser(client_config)
 
2537
    old_client_settings = {}
 
2538
    clients_data = {}
 
2539
    
 
2540
    # This is used to redirect stdout and stderr for checker processes
 
2541
    global wnull
 
2542
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2543
    # Only used if server is running in foreground but not in debug
 
2544
    # mode
 
2545
    if debug or not foreground:
 
2546
        wnull.close()
 
2547
    
 
2548
    # Get client data and settings from last running state.
 
2549
    if server_settings["restore"]:
 
2550
        try:
 
2551
            with open(stored_state_path, "rb") as stored_state:
 
2552
                clients_data, old_client_settings = (pickle.load
 
2553
                                                     (stored_state))
 
2554
            os.remove(stored_state_path)
 
2555
        except IOError as e:
 
2556
            if e.errno == errno.ENOENT:
 
2557
                logger.warning("Could not load persistent state: {0}"
 
2558
                                .format(os.strerror(e.errno)))
 
2559
            else:
 
2560
                logger.critical("Could not load persistent state:",
 
2561
                                exc_info=e)
 
2562
                raise
 
2563
        except EOFError as e:
 
2564
            logger.warning("Could not load persistent state: "
 
2565
                           "EOFError:", exc_info=e)
 
2566
    
 
2567
    with PGPEngine() as pgp:
 
2568
        for client_name, client in clients_data.iteritems():
 
2569
            # Skip removed clients
 
2570
            if client_name not in client_settings:
 
2571
                continue
 
2572
            
 
2573
            # Decide which value to use after restoring saved state.
 
2574
            # We have three different values: Old config file,
 
2575
            # new config file, and saved state.
 
2576
            # New config value takes precedence if it differs from old
 
2577
            # config value, otherwise use saved state.
 
2578
            for name, value in client_settings[client_name].items():
 
2579
                try:
 
2580
                    # For each value in new config, check if it
 
2581
                    # differs from the old config value (Except for
 
2582
                    # the "secret" attribute)
 
2583
                    if (name != "secret" and
 
2584
                        value != old_client_settings[client_name]
 
2585
                        [name]):
 
2586
                        client[name] = value
 
2587
                except KeyError:
 
2588
                    pass
 
2589
            
 
2590
            # Clients who has passed its expire date can still be
 
2591
            # enabled if its last checker was successful.  Clients
 
2592
            # whose checker succeeded before we stored its state is
 
2593
            # assumed to have successfully run all checkers during
 
2594
            # downtime.
 
2595
            if client["enabled"]:
 
2596
                if datetime.datetime.utcnow() >= client["expires"]:
 
2597
                    if not client["last_checked_ok"]:
 
2598
                        logger.warning(
 
2599
                            "disabling client {0} - Client never "
 
2600
                            "performed a successful checker"
 
2601
                            .format(client_name))
 
2602
                        client["enabled"] = False
 
2603
                    elif client["last_checker_status"] != 0:
 
2604
                        logger.warning(
 
2605
                            "disabling client {0} - Client "
 
2606
                            "last checker failed with error code {1}"
 
2607
                            .format(client_name,
 
2608
                                    client["last_checker_status"]))
 
2609
                        client["enabled"] = False
 
2610
                    else:
 
2611
                        client["expires"] = (datetime.datetime
 
2612
                                             .utcnow()
 
2613
                                             + client["timeout"])
 
2614
                        logger.debug("Last checker succeeded,"
 
2615
                                     " keeping {0} enabled"
 
2616
                                     .format(client_name))
2048
2617
            try:
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()))
 
2618
                client["secret"] = (
 
2619
                    pgp.decrypt(client["encrypted_secret"],
 
2620
                                client_settings[client_name]
 
2621
                                ["secret"]))
 
2622
            except PGPError:
 
2623
                # If decryption fails, we use secret from new settings
 
2624
                logger.debug("Failed to decrypt {0} old secret"
 
2625
                             .format(client_name))
 
2626
                client["secret"] = (
 
2627
                    client_settings[client_name]["secret"])
 
2628
    
 
2629
    # Add/remove clients based on new changes made to config
 
2630
    for client_name in (set(old_client_settings)
 
2631
                        - set(client_settings)):
 
2632
        del clients_data[client_name]
 
2633
    for client_name in (set(client_settings)
 
2634
                        - set(old_client_settings)):
 
2635
        clients_data[client_name] = client_settings[client_name]
 
2636
    
 
2637
    # Create all client objects
 
2638
    for client_name, client in clients_data.iteritems():
 
2639
        tcp_server.clients[client_name] = client_class(
 
2640
            name = client_name, settings = client,
 
2641
            server_settings = server_settings)
 
2642
    
2058
2643
    if not tcp_server.clients:
2059
2644
        logger.warning("No clients defined")
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
 
2645
    
 
2646
    if not foreground:
 
2647
        if pidfile is not None:
 
2648
            try:
 
2649
                with pidfile:
 
2650
                    pid = os.getpid()
 
2651
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2652
            except IOError:
 
2653
                logger.error("Could not write to file %r with PID %d",
 
2654
                             pidfilename, pid)
 
2655
        del pidfile
2073
2656
        del pidfilename
2074
 
        
2075
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2076
2657
    
2077
2658
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2078
2659
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2079
2660
    
2080
2661
    if use_dbus:
2081
 
        class MandosDBusService(dbus.service.Object):
 
2662
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2663
                                        "se.bsnet.fukt.Mandos"})
 
2664
        class MandosDBusService(DBusObjectWithProperties):
2082
2665
            """A D-Bus proxy object"""
2083
2666
            def __init__(self):
2084
2667
                dbus.service.Object.__init__(self, bus, "/")
2085
2668
            _interface = "se.recompile.Mandos"
2086
2669
            
 
2670
            @dbus_interface_annotations(_interface)
 
2671
            def _foo(self):
 
2672
                return { "org.freedesktop.DBus.Property"
 
2673
                         ".EmitsChangedSignal":
 
2674
                             "false"}
 
2675
            
2087
2676
            @dbus.service.signal(_interface, signature="o")
2088
2677
            def ClientAdded(self, objpath):
2089
2678
                "D-Bus signal"
2103
2692
            def GetAllClients(self):
2104
2693
                "D-Bus method"
2105
2694
                return dbus.Array(c.dbus_object_path
2106
 
                                  for c in tcp_server.clients)
 
2695
                                  for c in
 
2696
                                  tcp_server.clients.itervalues())
2107
2697
            
2108
2698
            @dbus.service.method(_interface,
2109
2699
                                 out_signature="a{oa{sv}}")
2111
2701
                "D-Bus method"
2112
2702
                return dbus.Dictionary(
2113
2703
                    ((c.dbus_object_path, c.GetAll(""))
2114
 
                     for c in tcp_server.clients),
 
2704
                     for c in tcp_server.clients.itervalues()),
2115
2705
                    signature="oa{sv}")
2116
2706
            
2117
2707
            @dbus.service.method(_interface, in_signature="o")
2118
2708
            def RemoveClient(self, object_path):
2119
2709
                "D-Bus method"
2120
 
                for c in tcp_server.clients:
 
2710
                for c in tcp_server.clients.itervalues():
2121
2711
                    if c.dbus_object_path == object_path:
2122
 
                        tcp_server.clients.remove(c)
 
2712
                        del tcp_server.clients[c.name]
2123
2713
                        c.remove_from_connection()
2124
2714
                        # Don't signal anything except ClientRemoved
2125
2715
                        c.disable(quiet=True)
2130
2720
            
2131
2721
            del _interface
2132
2722
        
2133
 
        class MandosDBusServiceTransitional(MandosDBusService):
2134
 
            __metaclass__ = AlternateDBusNamesMetaclass
2135
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2723
        mandos_dbus_service = MandosDBusService()
2136
2724
    
2137
2725
    def cleanup():
2138
2726
        "Cleanup function; run on exit"
2139
2727
        service.cleanup()
2140
2728
        
2141
2729
        multiprocessing.active_children()
 
2730
        wnull.close()
 
2731
        if not (tcp_server.clients or client_settings):
 
2732
            return
 
2733
        
 
2734
        # Store client before exiting. Secrets are encrypted with key
 
2735
        # based on what config file has. If config file is
 
2736
        # removed/edited, old secret will thus be unrecovable.
 
2737
        clients = {}
 
2738
        with PGPEngine() as pgp:
 
2739
            for client in tcp_server.clients.itervalues():
 
2740
                key = client_settings[client.name]["secret"]
 
2741
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2742
                                                      key)
 
2743
                client_dict = {}
 
2744
                
 
2745
                # A list of attributes that can not be pickled
 
2746
                # + secret.
 
2747
                exclude = set(("bus", "changedstate", "secret",
 
2748
                               "checker", "server_settings"))
 
2749
                for name, typ in (inspect.getmembers
 
2750
                                  (dbus.service.Object)):
 
2751
                    exclude.add(name)
 
2752
                
 
2753
                client_dict["encrypted_secret"] = (client
 
2754
                                                   .encrypted_secret)
 
2755
                for attr in client.client_structure:
 
2756
                    if attr not in exclude:
 
2757
                        client_dict[attr] = getattr(client, attr)
 
2758
                
 
2759
                clients[client.name] = client_dict
 
2760
                del client_settings[client.name]["secret"]
 
2761
        
 
2762
        try:
 
2763
            with (tempfile.NamedTemporaryFile
 
2764
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2765
                   dir=os.path.dirname(stored_state_path),
 
2766
                   delete=False)) as stored_state:
 
2767
                pickle.dump((clients, client_settings), stored_state)
 
2768
                tempname=stored_state.name
 
2769
            os.rename(tempname, stored_state_path)
 
2770
        except (IOError, OSError) as e:
 
2771
            if not debug:
 
2772
                try:
 
2773
                    os.remove(tempname)
 
2774
                except NameError:
 
2775
                    pass
 
2776
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2777
                logger.warning("Could not save persistent state: {0}"
 
2778
                               .format(os.strerror(e.errno)))
 
2779
            else:
 
2780
                logger.warning("Could not save persistent state:",
 
2781
                               exc_info=e)
 
2782
                raise e
 
2783
        
 
2784
        # Delete all clients, and settings from config
2142
2785
        while tcp_server.clients:
2143
 
            client = tcp_server.clients.pop()
 
2786
            name, client = tcp_server.clients.popitem()
2144
2787
            if use_dbus:
2145
2788
                client.remove_from_connection()
2146
 
            client.disable_hook = None
2147
2789
            # Don't signal anything except ClientRemoved
2148
2790
            client.disable(quiet=True)
2149
2791
            if use_dbus:
2151
2793
                mandos_dbus_service.ClientRemoved(client
2152
2794
                                                  .dbus_object_path,
2153
2795
                                                  client.name)
 
2796
        client_settings.clear()
2154
2797
    
2155
2798
    atexit.register(cleanup)
2156
2799
    
2157
 
    for client in tcp_server.clients:
 
2800
    for client in tcp_server.clients.itervalues():
2158
2801
        if use_dbus:
2159
2802
            # Emit D-Bus signal
2160
2803
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2161
 
        client.enable()
 
2804
        # Need to initiate checking of clients
 
2805
        if client.enabled:
 
2806
            client.init_checker()
2162
2807
    
2163
2808
    tcp_server.enable()
2164
2809
    tcp_server.server_activate()
2167
2812
    service.port = tcp_server.socket.getsockname()[1]
2168
2813
    if use_ipv6:
2169
2814
        logger.info("Now listening on address %r, port %d,"
2170
 
                    " flowinfo %d, scope_id %d"
2171
 
                    % tcp_server.socket.getsockname())
 
2815
                    " flowinfo %d, scope_id %d",
 
2816
                    *tcp_server.socket.getsockname())
2172
2817
    else:                       # IPv4
2173
 
        logger.info("Now listening on address %r, port %d"
2174
 
                    % tcp_server.socket.getsockname())
 
2818
        logger.info("Now listening on address %r, port %d",
 
2819
                    *tcp_server.socket.getsockname())
2175
2820
    
2176
2821
    #service.interface = tcp_server.socket.getsockname()[3]
2177
2822
    
2180
2825
        try:
2181
2826
            service.activate()
2182
2827
        except dbus.exceptions.DBusException as error:
2183
 
            logger.critical("DBusException: %s", error)
 
2828
            logger.critical("D-Bus Exception", exc_info=error)
2184
2829
            cleanup()
2185
2830
            sys.exit(1)
2186
2831
        # End of Avahi example code
2193
2838
        logger.debug("Starting main loop")
2194
2839
        main_loop.run()
2195
2840
    except AvahiError as error:
2196
 
        logger.critical("AvahiError: %s", error)
 
2841
        logger.critical("Avahi Error", exc_info=error)
2197
2842
        cleanup()
2198
2843
        sys.exit(1)
2199
2844
    except KeyboardInterrupt:
2204
2849
    # Must run before the D-Bus bus name gets deregistered
2205
2850
    cleanup()
2206
2851
 
2207
 
 
2208
2852
if __name__ == '__main__':
2209
2853
    main()