/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

* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
                                             full path.
  (mail): Take new "--network-hook-dir" option.

Show diffs side-by-side

added added

removed removed

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