/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Consistent terminology; use the term "secret" for the
          client's stored data.
  (ClientDBus.__init__): Removed dead code.
  (Clienthandler.handle): Bug fix: send NewRequest signal with only IP
                          address, not str() of address tuple.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
 
try:
40
 
    import SocketServer as socketserver
41
 
except ImportError:
42
 
    import socketserver
 
37
import SocketServer as socketserver
43
38
import socket
44
39
import argparse
45
40
import datetime
50
45
import gnutls.library.functions
51
46
import gnutls.library.constants
52
47
import gnutls.library.types
53
 
try:
54
 
    import ConfigParser as configparser
55
 
except ImportError:
56
 
    import configparser
 
48
import ConfigParser as configparser
57
49
import sys
58
50
import re
59
51
import os
68
60
import struct
69
61
import fcntl
70
62
import functools
71
 
try:
72
 
    import cPickle as pickle
73
 
except ImportError:
74
 
    import pickle
 
63
import cPickle as pickle
75
64
import multiprocessing
76
65
import types
77
66
import binascii
78
67
import tempfile
79
 
import itertools
80
 
import collections
81
 
import codecs
82
68
 
83
69
import dbus
84
70
import dbus.service
85
 
try:
86
 
    import gobject
87
 
except ImportError:
88
 
    from gi.repository import GObject as gobject
 
71
import gobject
89
72
import avahi
90
73
from dbus.mainloop.glib import DBusGMainLoop
91
74
import ctypes
92
75
import ctypes.util
93
76
import xml.dom.minidom
94
77
import inspect
 
78
import GnuPGInterface
95
79
 
96
80
try:
97
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
101
85
    except ImportError:
102
86
        SO_BINDTODEVICE = None
103
87
 
104
 
if sys.version_info.major == 2:
105
 
    str = unicode
106
 
 
107
 
version = "1.6.9"
 
88
version = "1.5.1"
108
89
stored_state_file = "clients.pickle"
109
90
 
110
91
logger = logging.getLogger()
111
 
syslogger = None
 
92
syslogger = (logging.handlers.SysLogHandler
 
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
94
              address = str("/dev/log")))
112
95
 
113
96
try:
114
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
115
 
        ctypes.util.find_library("c")).if_nametoindex
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
116
100
except (OSError, AttributeError):
117
 
    
118
101
    def if_nametoindex(interface):
119
102
        "Get an interface index the hard way, i.e. using fcntl()"
120
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
121
104
        with contextlib.closing(socket.socket()) as s:
122
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
 
                                struct.pack(b"16s16x", interface))
124
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
125
110
        return interface_index
126
111
 
127
112
 
128
113
def initlogger(debug, level=logging.WARNING):
129
114
    """init logger and add loglevel"""
130
115
    
131
 
    global syslogger
132
 
    syslogger = (logging.handlers.SysLogHandler(
133
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
 
        address = "/dev/log"))
135
116
    syslogger.setFormatter(logging.Formatter
136
117
                           ('Mandos [%(process)d]: %(levelname)s:'
137
118
                            ' %(message)s'))
154
135
 
155
136
class PGPEngine(object):
156
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
157
 
    
158
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
159
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
 
        self.gnupgargs = ['--batch',
161
 
                          '--home', self.tempdir,
162
 
                          '--force-mdc',
163
 
                          '--quiet',
164
 
                          '--no-use-agent']
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
165
147
    
166
148
    def __enter__(self):
167
149
        return self
168
150
    
169
 
    def __exit__(self, exc_type, exc_value, traceback):
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
170
152
        self._cleanup()
171
153
        return False
172
154
    
189
171
    def password_encode(self, password):
190
172
        # Passphrase can not be empty and can not contain newlines or
191
173
        # NUL bytes.  So we prefix it and hex encode it.
192
 
        encoded = b"mandos" + binascii.hexlify(password)
193
 
        if len(encoded) > 2048:
194
 
            # GnuPG can't handle long passwords, so encode differently
195
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
 
                       .replace(b"\n", b"\\n")
197
 
                       .replace(b"\0", b"\\x00"))
198
 
        return encoded
 
174
        return b"mandos" + binascii.hexlify(password)
199
175
    
200
176
    def encrypt(self, data, password):
201
 
        passphrase = self.password_encode(password)
202
 
        with tempfile.NamedTemporaryFile(
203
 
                dir=self.tempdir) as passfile:
204
 
            passfile.write(passphrase)
205
 
            passfile.flush()
206
 
            proc = subprocess.Popen(['gpg', '--symmetric',
207
 
                                     '--passphrase-file',
208
 
                                     passfile.name]
209
 
                                    + self.gnupgargs,
210
 
                                    stdin = subprocess.PIPE,
211
 
                                    stdout = subprocess.PIPE,
212
 
                                    stderr = subprocess.PIPE)
213
 
            ciphertext, err = proc.communicate(input = data)
214
 
        if proc.returncode != 0:
215
 
            raise PGPError(err)
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
216
191
        return ciphertext
217
192
    
218
193
    def decrypt(self, data, password):
219
 
        passphrase = self.password_encode(password)
220
 
        with tempfile.NamedTemporaryFile(
221
 
                dir = self.tempdir) as passfile:
222
 
            passfile.write(passphrase)
223
 
            passfile.flush()
224
 
            proc = subprocess.Popen(['gpg', '--decrypt',
225
 
                                     '--passphrase-file',
226
 
                                     passfile.name]
227
 
                                    + self.gnupgargs,
228
 
                                    stdin = subprocess.PIPE,
229
 
                                    stdout = subprocess.PIPE,
230
 
                                    stderr = subprocess.PIPE)
231
 
            decrypted_plaintext, err = proc.communicate(input = data)
232
 
        if proc.returncode != 0:
233
 
            raise PGPError(err)
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
234
208
        return decrypted_plaintext
235
209
 
236
210
 
 
211
 
237
212
class AvahiError(Exception):
238
213
    def __init__(self, value, *args, **kwargs):
239
214
        self.value = value
240
 
        return super(AvahiError, self).__init__(value, *args,
241
 
                                                **kwargs)
242
 
 
 
215
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
216
    def __unicode__(self):
 
217
        return unicode(repr(self.value))
243
218
 
244
219
class AvahiServiceError(AvahiError):
245
220
    pass
246
221
 
247
 
 
248
222
class AvahiGroupError(AvahiError):
249
223
    pass
250
224
 
257
231
               Used to optionally bind to the specified interface.
258
232
    name: string; Example: 'Mandos'
259
233
    type: string; Example: '_mandos._tcp'.
260
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
261
235
    port: integer; what port to announce
262
236
    TXT: list of strings; TXT record for the service
263
237
    domain: string; Domain to publish on, default to .local if empty.
269
243
    server: D-Bus Server
270
244
    bus: dbus.SystemBus()
271
245
    """
272
 
    
273
 
    def __init__(self,
274
 
                 interface = avahi.IF_UNSPEC,
275
 
                 name = None,
276
 
                 servicetype = None,
277
 
                 port = None,
278
 
                 TXT = None,
279
 
                 domain = "",
280
 
                 host = "",
281
 
                 max_renames = 32768,
282
 
                 protocol = avahi.PROTO_UNSPEC,
283
 
                 bus = None):
 
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
247
                 servicetype = None, port = None, TXT = None,
 
248
                 domain = "", host = "", max_renames = 32768,
 
249
                 protocol = avahi.PROTO_UNSPEC, bus = None):
284
250
        self.interface = interface
285
251
        self.name = name
286
252
        self.type = servicetype
295
261
        self.server = None
296
262
        self.bus = bus
297
263
        self.entry_group_state_changed_match = None
298
 
    
299
 
    def rename(self, remove=True):
 
264
    def rename(self):
300
265
        """Derived from the Avahi example code"""
301
266
        if self.rename_count >= self.max_renames:
302
267
            logger.critical("No suitable Zeroconf service name found"
303
268
                            " after %i retries, exiting.",
304
269
                            self.rename_count)
305
270
            raise AvahiServiceError("Too many renames")
306
 
        self.name = str(
307
 
            self.server.GetAlternativeServiceName(self.name))
308
 
        self.rename_count += 1
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
309
273
        logger.info("Changing Zeroconf service name to %r ...",
310
274
                    self.name)
311
 
        if remove:
312
 
            self.remove()
 
275
        self.remove()
313
276
        try:
314
277
            self.add()
315
278
        except dbus.exceptions.DBusException as error:
316
 
            if (error.get_dbus_name()
317
 
                == "org.freedesktop.Avahi.CollisionError"):
318
 
                logger.info("Local Zeroconf service name collision.")
319
 
                return self.rename(remove=False)
320
 
            else:
321
 
                logger.critical("D-Bus Exception", exc_info=error)
322
 
                self.cleanup()
323
 
                os._exit(1)
324
 
    
 
279
            logger.critical("DBusException: %s", error)
 
280
            self.cleanup()
 
281
            os._exit(1)
 
282
        self.rename_count += 1
325
283
    def remove(self):
326
284
        """Derived from the Avahi example code"""
327
285
        if self.entry_group_state_changed_match is not None:
329
287
            self.entry_group_state_changed_match = None
330
288
        if self.group is not None:
331
289
            self.group.Reset()
332
 
    
333
290
    def add(self):
334
291
        """Derived from the Avahi example code"""
335
292
        self.remove()
352
309
            dbus.UInt16(self.port),
353
310
            avahi.string_array_to_txt_array(self.TXT))
354
311
        self.group.Commit()
355
 
    
356
312
    def entry_group_state_changed(self, state, error):
357
313
        """Derived from the Avahi example code"""
358
314
        logger.debug("Avahi entry group state change: %i", state)
364
320
            self.rename()
365
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
366
322
            logger.critical("Avahi: Error in group state changed %s",
367
 
                            str(error))
368
 
            raise AvahiGroupError("State changed: {!s}".format(error))
369
 
    
 
323
                            unicode(error))
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
370
326
    def cleanup(self):
371
327
        """Derived from the Avahi example code"""
372
328
        if self.group is not None:
377
333
                pass
378
334
            self.group = None
379
335
        self.remove()
380
 
    
381
336
    def server_state_changed(self, state, error=None):
382
337
        """Derived from the Avahi example code"""
383
338
        logger.debug("Avahi server state change: %i", state)
384
 
        bad_states = {
385
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
386
 
            avahi.SERVER_REGISTERING: None,
387
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
389
 
        }
 
339
        bad_states = { avahi.SERVER_INVALID:
 
340
                           "Zeroconf server invalid",
 
341
                       avahi.SERVER_REGISTERING: None,
 
342
                       avahi.SERVER_COLLISION:
 
343
                           "Zeroconf server name collision",
 
344
                       avahi.SERVER_FAILURE:
 
345
                           "Zeroconf server failure" }
390
346
        if state in bad_states:
391
347
            if bad_states[state] is not None:
392
348
                if error is None:
401
357
                logger.debug("Unknown state: %r", state)
402
358
            else:
403
359
                logger.debug("Unknown state: %r: %r", state, error)
404
 
    
405
360
    def activate(self):
406
361
        """Derived from the Avahi example code"""
407
362
        if self.server is None:
411
366
                                    follow_name_owner_changes=True),
412
367
                avahi.DBUS_INTERFACE_SERVER)
413
368
        self.server.connect_to_signal("StateChanged",
414
 
                                      self.server_state_changed)
 
369
                                 self.server_state_changed)
415
370
        self.server_state_changed(self.server.GetState())
416
371
 
417
 
 
418
372
class AvahiServiceToSyslog(AvahiService):
419
 
    def rename(self, *args, **kwargs):
 
373
    def rename(self):
420
374
        """Add the new name to the syslog messages"""
421
 
        ret = AvahiService.rename(self, *args, **kwargs)
422
 
        syslogger.setFormatter(logging.Formatter(
423
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
424
 
            .format(self.name)))
 
375
        ret = AvahiService.rename(self)
 
376
        syslogger.setFormatter(logging.Formatter
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
425
380
        return ret
426
381
 
427
 
def call_pipe(connection,       # : multiprocessing.Connection
428
 
              func, *args, **kwargs):
429
 
    """This function is meant to be called by multiprocessing.Process
430
 
    
431
 
    This function runs func(*args, **kwargs), and writes the resulting
432
 
    return value on the provided multiprocessing.Connection.
433
 
    """
434
 
    connection.send(func(*args, **kwargs))
435
 
    connection.close()
436
 
 
 
382
def timedelta_to_milliseconds(td):
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
            + (td.seconds * 1000)
 
386
            + (td.microseconds // 1000))
 
387
        
437
388
class Client(object):
438
389
    """A representation of a client host served by this server.
439
390
    
464
415
    last_checked_ok: datetime.datetime(); (UTC) or None
465
416
    last_checker_status: integer between 0 and 255 reflecting exit
466
417
                         status of last checker. -1 reflects crashed
467
 
                         checker, -2 means no checker completed yet.
468
 
    last_checker_signal: The signal which killed the last checker, if
469
 
                         last_checker_status is -1
 
418
                         checker, or None.
470
419
    last_enabled: datetime.datetime(); (UTC) or None
471
420
    name:       string; from the config file, used in log messages and
472
421
                        D-Bus identifiers
477
426
    runtime_expansions: Allowed attributes for runtime expansion.
478
427
    expires:    datetime.datetime(); time (UTC) when a client will be
479
428
                disabled, or None
480
 
    server_settings: The server_settings dict from main()
481
429
    """
482
430
    
483
431
    runtime_expansions = ("approval_delay", "approval_duration",
484
 
                          "created", "enabled", "expires",
485
 
                          "fingerprint", "host", "interval",
486
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
487
434
                          "last_enabled", "name", "timeout")
488
 
    client_defaults = {
489
 
        "timeout": "PT5M",
490
 
        "extended_timeout": "PT15M",
491
 
        "interval": "PT2M",
492
 
        "checker": "fping -q -- %%(host)s",
493
 
        "host": "",
494
 
        "approval_delay": "PT0S",
495
 
        "approval_duration": "PT1S",
496
 
        "approved_by_default": "True",
497
 
        "enabled": "True",
498
 
    }
499
 
    
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
 
438
                        "checker": "fping -q -- %%(host)s",
 
439
                        "host": "",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
 
442
                        "approved_by_default": "True",
 
443
                        "enabled": "True",
 
444
                        }
 
445
    
 
446
    def timeout_milliseconds(self):
 
447
        "Return the 'timeout' attribute in milliseconds"
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
 
450
    def extended_timeout_milliseconds(self):
 
451
        "Return the 'extended_timeout' attribute in milliseconds"
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
 
453
    
 
454
    def interval_milliseconds(self):
 
455
        "Return the 'interval' attribute in milliseconds"
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
 
458
    def approval_delay_milliseconds(self):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
500
461
    @staticmethod
501
462
    def config_parser(config):
502
463
        """Construct a new dict of client settings of this form:
517
478
            client["enabled"] = config.getboolean(client_name,
518
479
                                                  "enabled")
519
480
            
520
 
            # Uppercase and remove spaces from fingerprint for later
521
 
            # comparison purposes with return value from the
522
 
            # fingerprint() function
523
481
            client["fingerprint"] = (section["fingerprint"].upper()
524
482
                                     .replace(" ", ""))
525
483
            if "secret" in section:
530
488
                          "rb") as secfile:
531
489
                    client["secret"] = secfile.read()
532
490
            else:
533
 
                raise TypeError("No secret or secfile for section {}"
534
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
535
493
            client["timeout"] = string_to_delta(section["timeout"])
536
494
            client["extended_timeout"] = string_to_delta(
537
495
                section["extended_timeout"])
543
501
            client["checker_command"] = section["checker"]
544
502
            client["last_approval_request"] = None
545
503
            client["last_checked_ok"] = None
546
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
547
505
        
548
506
        return settings
549
 
    
550
 
    def __init__(self, settings, name = None, server_settings=None):
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
 
510
        """Note: the 'checker' key in 'config' sets the
 
511
        'checker_command' attribute and *not* the 'checker'
 
512
        attribute."""
551
513
        self.name = name
552
 
        if server_settings is None:
553
 
            server_settings = {}
554
 
        self.server_settings = server_settings
555
514
        # adding all client settings
556
 
        for setting, value in settings.items():
 
515
        for setting, value in settings.iteritems():
557
516
            setattr(self, setting, value)
558
517
        
559
518
        if self.enabled:
565
524
        else:
566
525
            self.last_enabled = None
567
526
            self.expires = None
568
 
        
 
527
       
569
528
        logger.debug("Creating client %r", self.name)
 
529
        # Uppercase and remove spaces from fingerprint for later
 
530
        # comparison purposes with return value from the fingerprint()
 
531
        # function
570
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
571
533
        self.created = settings.get("created",
572
534
                                    datetime.datetime.utcnow())
573
 
        
 
535
 
574
536
        # attributes specific for this server instance
575
537
        self.checker = None
576
538
        self.checker_initiator_tag = None
579
541
        self.current_checker_command = None
580
542
        self.approved = None
581
543
        self.approvals_pending = 0
582
 
        self.changedstate = multiprocessing_manager.Condition(
583
 
            multiprocessing_manager.Lock())
584
 
        self.client_structure = [attr
585
 
                                 for attr in self.__dict__.iterkeys()
 
544
        self.changedstate = (multiprocessing_manager
 
545
                             .Condition(multiprocessing_manager
 
546
                                        .Lock()))
 
547
        self.client_structure = [attr for attr in
 
548
                                 self.__dict__.iterkeys()
586
549
                                 if not attr.startswith("_")]
587
550
        self.client_structure.append("client_structure")
588
551
        
589
 
        for name, t in inspect.getmembers(
590
 
                type(self), lambda obj: isinstance(obj, property)):
 
552
        for name, t in inspect.getmembers(type(self),
 
553
                                          lambda obj:
 
554
                                              isinstance(obj,
 
555
                                                         property)):
591
556
            if not name.startswith("_"):
592
557
                self.client_structure.append(name)
593
558
    
601
566
        if getattr(self, "enabled", False):
602
567
            # Already enabled
603
568
            return
 
569
        self.send_changedstate()
604
570
        self.expires = datetime.datetime.utcnow() + self.timeout
605
571
        self.enabled = True
606
572
        self.last_enabled = datetime.datetime.utcnow()
607
573
        self.init_checker()
608
 
        self.send_changedstate()
609
574
    
610
575
    def disable(self, quiet=True):
611
576
        """Disable this client."""
612
577
        if not getattr(self, "enabled", False):
613
578
            return False
614
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
615
582
            logger.info("Disabling client %s", self.name)
616
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
617
584
            gobject.source_remove(self.disable_initiator_tag)
618
585
            self.disable_initiator_tag = None
619
586
        self.expires = None
620
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
621
588
            gobject.source_remove(self.checker_initiator_tag)
622
589
            self.checker_initiator_tag = None
623
590
        self.stop_checker()
624
591
        self.enabled = False
625
 
        if not quiet:
626
 
            self.send_changedstate()
627
592
        # Do not run this again if called by a gobject.timeout_add
628
593
        return False
629
594
    
633
598
    def init_checker(self):
634
599
        # Schedule a new checker to be started an 'interval' from now,
635
600
        # and every interval from then on.
636
 
        if self.checker_initiator_tag is not None:
637
 
            gobject.source_remove(self.checker_initiator_tag)
638
 
        self.checker_initiator_tag = gobject.timeout_add(
639
 
            int(self.interval.total_seconds() * 1000),
640
 
            self.start_checker)
 
601
        self.checker_initiator_tag = (gobject.timeout_add
 
602
                                      (self.interval_milliseconds(),
 
603
                                       self.start_checker))
641
604
        # Schedule a disable() when 'timeout' has passed
642
 
        if self.disable_initiator_tag is not None:
643
 
            gobject.source_remove(self.disable_initiator_tag)
644
 
        self.disable_initiator_tag = gobject.timeout_add(
645
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
605
        self.disable_initiator_tag = (gobject.timeout_add
 
606
                                   (self.timeout_milliseconds(),
 
607
                                    self.disable))
646
608
        # Also start a new checker *right now*.
647
609
        self.start_checker()
648
610
    
649
 
    def checker_callback(self, source, condition, connection,
650
 
                         command):
 
611
    def checker_callback(self, pid, condition, command):
651
612
        """The checker has completed, so take appropriate actions."""
652
613
        self.checker_callback_tag = None
653
614
        self.checker = None
654
 
        # Read return code from connection (see call_pipe)
655
 
        returncode = connection.recv()
656
 
        connection.close()
657
 
        
658
 
        if returncode >= 0:
659
 
            self.last_checker_status = returncode
660
 
            self.last_checker_signal = None
 
615
        if os.WIFEXITED(condition):
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
661
617
            if self.last_checker_status == 0:
662
618
                logger.info("Checker for %(name)s succeeded",
663
619
                            vars(self))
664
620
                self.checked_ok()
665
621
            else:
666
 
                logger.info("Checker for %(name)s failed", vars(self))
 
622
                logger.info("Checker for %(name)s failed",
 
623
                            vars(self))
667
624
        else:
668
625
            self.last_checker_status = -1
669
 
            self.last_checker_signal = -returncode
670
626
            logger.warning("Checker for %(name)s crashed?",
671
627
                           vars(self))
672
 
        return False
673
 
    
674
 
    def checked_ok(self):
675
 
        """Assert that the client has been seen, alive and well."""
676
 
        self.last_checked_ok = datetime.datetime.utcnow()
677
 
        self.last_checker_status = 0
678
 
        self.last_checker_signal = None
679
 
        self.bump_timeout()
680
 
    
681
 
    def bump_timeout(self, timeout=None):
682
 
        """Bump up the timeout for this client."""
 
628
    
 
629
    def checked_ok(self, timeout=None):
 
630
        """Bump up the timeout for this client.
 
631
        
 
632
        This should only be called when the client has been seen,
 
633
        alive and well.
 
634
        """
683
635
        if timeout is None:
684
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
685
638
        if self.disable_initiator_tag is not None:
686
639
            gobject.source_remove(self.disable_initiator_tag)
687
 
            self.disable_initiator_tag = None
688
640
        if getattr(self, "enabled", False):
689
 
            self.disable_initiator_tag = gobject.timeout_add(
690
 
                int(timeout.total_seconds() * 1000), self.disable)
 
641
            self.disable_initiator_tag = (gobject.timeout_add
 
642
                                          (timedelta_to_milliseconds
 
643
                                           (timeout), self.disable))
691
644
            self.expires = datetime.datetime.utcnow() + timeout
692
645
    
693
646
    def need_approval(self):
699
652
        If a checker already exists, leave it running and do
700
653
        nothing."""
701
654
        # The reason for not killing a running checker is that if we
702
 
        # did that, and if a checker (for some reason) started running
703
 
        # slowly and taking more than 'interval' time, then the client
704
 
        # would inevitably timeout, since no checker would get a
705
 
        # chance to run to completion.  If we instead leave running
 
655
        # did that, then if a checker (for some reason) started
 
656
        # running slowly and taking more than 'interval' time, the
 
657
        # client would inevitably timeout, since no checker would get
 
658
        # a chance to run to completion.  If we instead leave running
706
659
        # checkers alone, the checker would have to take more time
707
660
        # than 'timeout' for the client to be disabled, which is as it
708
661
        # should be.
709
662
        
710
 
        if self.checker is not None and not self.checker.is_alive():
711
 
            logger.warning("Checker was not alive; joining")
712
 
            self.checker.join()
713
 
            self.checker = None
 
663
        # If a checker exists, make sure it is not a zombie
 
664
        try:
 
665
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
666
        except (AttributeError, OSError) as error:
 
667
            if (isinstance(error, OSError)
 
668
                and error.errno != errno.ECHILD):
 
669
                raise error
 
670
        else:
 
671
            if pid:
 
672
                logger.warning("Checker was a zombie")
 
673
                gobject.source_remove(self.checker_callback_tag)
 
674
                self.checker_callback(pid, status,
 
675
                                      self.current_checker_command)
714
676
        # Start a new checker if needed
715
677
        if self.checker is None:
716
 
            # Escape attributes for the shell
717
 
            escaped_attrs = {
718
 
                attr: re.escape(str(getattr(self, attr)))
719
 
                for attr in self.runtime_expansions }
720
678
            try:
721
 
                command = self.checker_command % escaped_attrs
722
 
            except TypeError as error:
723
 
                logger.error('Could not format string "%s"',
724
 
                             self.checker_command,
725
 
                             exc_info=error)
726
 
                return True     # Try again later
 
679
                # In case checker_command has exactly one % operator
 
680
                command = self.checker_command % self.host
 
681
            except TypeError:
 
682
                # Escape attributes for the shell
 
683
                escaped_attrs = dict(
 
684
                    (attr,
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
686
                                       errors=
 
687
                                       'replace')))
 
688
                    for attr in
 
689
                    self.runtime_expansions)
 
690
                
 
691
                try:
 
692
                    command = self.checker_command % escaped_attrs
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
 
696
                    return True # Try again later
727
697
            self.current_checker_command = command
728
 
            logger.info("Starting checker %r for %s", command,
729
 
                        self.name)
730
 
            # We don't need to redirect stdout and stderr, since
731
 
            # in normal mode, that is already done by daemon(),
732
 
            # and in debug mode we don't want to.  (Stdin is
733
 
            # always replaced by /dev/null.)
734
 
            # The exception is when not debugging but nevertheless
735
 
            # running in the foreground; use the previously
736
 
            # created wnull.
737
 
            popen_args = { "close_fds": True,
738
 
                           "shell": True,
739
 
                           "cwd": "/" }
740
 
            if (not self.server_settings["debug"]
741
 
                and self.server_settings["foreground"]):
742
 
                popen_args.update({"stdout": wnull,
743
 
                                   "stderr": wnull })
744
 
            pipe = multiprocessing.Pipe(duplex = False)
745
 
            self.checker = multiprocessing.Process(
746
 
                target = call_pipe,
747
 
                args = (pipe[1], subprocess.call, command),
748
 
                kwargs = popen_args)
749
 
            self.checker.start()
750
 
            self.checker_callback_tag = gobject.io_add_watch(
751
 
                pipe[0].fileno(), gobject.IO_IN,
752
 
                self.checker_callback, pipe[0], command)
 
698
            try:
 
699
                logger.info("Starting checker %r for %s",
 
700
                            command, self.name)
 
701
                # We don't need to redirect stdout and stderr, since
 
702
                # in normal mode, that is already done by daemon(),
 
703
                # and in debug mode we don't want to.  (Stdin is
 
704
                # always replaced by /dev/null.)
 
705
                self.checker = subprocess.Popen(command,
 
706
                                                close_fds=True,
 
707
                                                shell=True, cwd="/")
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
709
                                             (self.checker.pid,
 
710
                                              self.checker_callback,
 
711
                                              data=command))
 
712
                # The checker may have completed before the gobject
 
713
                # watch was added.  Check for this.
 
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
715
                if pid:
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
717
                    self.checker_callback(pid, status, command)
 
718
            except OSError as error:
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
753
721
        # Re-run this periodically if run by gobject.timeout_add
754
722
        return True
755
723
    
761
729
        if getattr(self, "checker", None) is None:
762
730
            return
763
731
        logger.debug("Stopping checker for %(name)s", vars(self))
764
 
        self.checker.terminate()
 
732
        try:
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
 
734
            #time.sleep(0.5)
 
735
            #if self.checker.poll() is None:
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
737
        except OSError as error:
 
738
            if error.errno != errno.ESRCH: # No such process
 
739
                raise
765
740
        self.checker = None
766
741
 
767
742
 
768
 
def dbus_service_property(dbus_interface,
769
 
                          signature="v",
770
 
                          access="readwrite",
771
 
                          byte_arrays=False):
 
743
def dbus_service_property(dbus_interface, signature="v",
 
744
                          access="readwrite", byte_arrays=False):
772
745
    """Decorators for marking methods of a DBusObjectWithProperties to
773
746
    become properties on the D-Bus.
774
747
    
783
756
    # "Set" method, so we fail early here:
784
757
    if byte_arrays and signature != "ay":
785
758
        raise ValueError("Byte arrays not supported for non-'ay'"
786
 
                         " signature {!r}".format(signature))
787
 
    
 
759
                         " signature %r" % signature)
788
760
    def decorator(func):
789
761
        func._dbus_is_property = True
790
762
        func._dbus_interface = dbus_interface
795
767
            func._dbus_name = func._dbus_name[:-14]
796
768
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
797
769
        return func
798
 
    
799
 
    return decorator
800
 
 
801
 
 
802
 
def dbus_interface_annotations(dbus_interface):
803
 
    """Decorator for marking functions returning interface annotations
804
 
    
805
 
    Usage:
806
 
    
807
 
    @dbus_interface_annotations("org.example.Interface")
808
 
    def _foo(self):  # Function name does not matter
809
 
        return {"org.freedesktop.DBus.Deprecated": "true",
810
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
811
 
                    "false"}
812
 
    """
813
 
    
814
 
    def decorator(func):
815
 
        func._dbus_is_interface = True
816
 
        func._dbus_interface = dbus_interface
817
 
        func._dbus_name = dbus_interface
818
 
        return func
819
 
    
820
 
    return decorator
821
 
 
822
 
 
823
 
def dbus_annotations(annotations):
824
 
    """Decorator to annotate D-Bus methods, signals or properties
825
 
    Usage:
826
 
    
827
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
828
 
                       "org.freedesktop.DBus.Property."
829
 
                       "EmitsChangedSignal": "false"})
830
 
    @dbus_service_property("org.example.Interface", signature="b",
831
 
                           access="r")
832
 
    def Property_dbus_property(self):
833
 
        return dbus.Boolean(False)
834
 
    """
835
 
    
836
 
    def decorator(func):
837
 
        func._dbus_annotations = annotations
838
 
        return func
839
 
    
840
770
    return decorator
841
771
 
842
772
 
843
773
class DBusPropertyException(dbus.exceptions.DBusException):
844
774
    """A base class for D-Bus property-related exceptions
845
775
    """
846
 
    pass
 
776
    def __unicode__(self):
 
777
        return unicode(str(self))
847
778
 
848
779
 
849
780
class DBusPropertyAccessException(DBusPropertyException):
867
798
    """
868
799
    
869
800
    @staticmethod
870
 
    def _is_dbus_thing(thing):
871
 
        """Returns a function testing if an attribute is a D-Bus thing
872
 
        
873
 
        If called like _is_dbus_thing("method") it returns a function
874
 
        suitable for use as predicate to inspect.getmembers().
875
 
        """
876
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
877
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
878
803
    
879
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
880
805
        """Returns a generator of (name, attribute) pairs
881
806
        """
882
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
883
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
808
                for cls in self.__class__.__mro__
885
 
                for name, athing in
886
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
887
811
    
888
812
    def _get_dbus_property(self, interface_name, property_name):
889
813
        """Returns a bound method if one exists which is a D-Bus
890
814
        property with the specified name and interface.
891
815
        """
892
 
        for cls in self.__class__.__mro__:
893
 
            for name, value in inspect.getmembers(
894
 
                    cls, self._is_dbus_thing("property")):
 
816
        for cls in  self.__class__.__mro__:
 
817
            for name, value in (inspect.getmembers
 
818
                                (cls, self._is_dbus_property)):
895
819
                if (value._dbus_name == property_name
896
820
                    and value._dbus_interface == interface_name):
897
821
                    return value.__get__(self)
898
822
        
899
823
        # No such property
900
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
901
 
            self.dbus_object_path, interface_name, property_name))
 
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
825
                                   + interface_name + "."
 
826
                                   + property_name)
902
827
    
903
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
904
 
                         in_signature="ss",
 
828
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
829
                         out_signature="v")
906
830
    def Get(self, interface_name, property_name):
907
831
        """Standard D-Bus property Get() method, see D-Bus standard.
925
849
            # The byte_arrays option is not supported yet on
926
850
            # signatures other than "ay".
927
851
            if prop._dbus_signature != "ay":
928
 
                raise ValueError("Byte arrays not supported for non-"
929
 
                                 "'ay' signature {!r}"
930
 
                                 .format(prop._dbus_signature))
 
852
                raise ValueError
931
853
            value = dbus.ByteArray(b''.join(chr(byte)
932
854
                                            for byte in value))
933
855
        prop(value)
934
856
    
935
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
936
 
                         in_signature="s",
 
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
937
858
                         out_signature="a{sv}")
938
859
    def GetAll(self, interface_name):
939
860
        """Standard D-Bus property GetAll() method, see D-Bus
942
863
        Note: Will not include properties with access="write".
943
864
        """
944
865
        properties = {}
945
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
946
867
            if (interface_name
947
868
                and interface_name != prop._dbus_interface):
948
869
                # Interface non-empty but did not match
954
875
            if not hasattr(value, "variant_level"):
955
876
                properties[name] = value
956
877
                continue
957
 
            properties[name] = type(value)(
958
 
                value, variant_level = value.variant_level + 1)
 
878
            properties[name] = type(value)(value, variant_level=
 
879
                                           value.variant_level+1)
959
880
        return dbus.Dictionary(properties, signature="sv")
960
881
    
961
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
 
    def PropertiesChanged(self, interface_name, changed_properties,
963
 
                          invalidated_properties):
964
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
965
 
        standard.
966
 
        """
967
 
        pass
968
 
    
969
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
883
                         out_signature="s",
971
884
                         path_keyword='object_path',
972
885
                         connection_keyword='connection')
973
886
    def Introspect(self, object_path, connection):
974
 
        """Overloading of standard D-Bus method.
975
 
        
976
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
977
888
        """
978
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
979
890
                                                   connection)
980
891
        try:
981
892
            document = xml.dom.minidom.parseString(xmlstring)
982
 
            
983
893
            def make_tag(document, name, prop):
984
894
                e = document.createElement("property")
985
895
                e.setAttribute("name", name)
986
896
                e.setAttribute("type", prop._dbus_signature)
987
897
                e.setAttribute("access", prop._dbus_access)
988
898
                return e
989
 
            
990
899
            for if_tag in document.getElementsByTagName("interface"):
991
 
                # Add property tags
992
900
                for tag in (make_tag(document, name, prop)
993
901
                            for name, prop
994
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
995
903
                            if prop._dbus_interface
996
904
                            == if_tag.getAttribute("name")):
997
905
                    if_tag.appendChild(tag)
998
 
                # Add annotation tags
999
 
                for typ in ("method", "signal", "property"):
1000
 
                    for tag in if_tag.getElementsByTagName(typ):
1001
 
                        annots = dict()
1002
 
                        for name, prop in (self.
1003
 
                                           _get_all_dbus_things(typ)):
1004
 
                            if (name == tag.getAttribute("name")
1005
 
                                and prop._dbus_interface
1006
 
                                == if_tag.getAttribute("name")):
1007
 
                                annots.update(getattr(
1008
 
                                    prop, "_dbus_annotations", {}))
1009
 
                        for name, value in annots.items():
1010
 
                            ann_tag = document.createElement(
1011
 
                                "annotation")
1012
 
                            ann_tag.setAttribute("name", name)
1013
 
                            ann_tag.setAttribute("value", value)
1014
 
                            tag.appendChild(ann_tag)
1015
 
                # Add interface annotation tags
1016
 
                for annotation, value in dict(
1017
 
                    itertools.chain.from_iterable(
1018
 
                        annotations().items()
1019
 
                        for name, annotations
1020
 
                        in self._get_all_dbus_things("interface")
1021
 
                        if name == if_tag.getAttribute("name")
1022
 
                        )).items():
1023
 
                    ann_tag = document.createElement("annotation")
1024
 
                    ann_tag.setAttribute("name", annotation)
1025
 
                    ann_tag.setAttribute("value", value)
1026
 
                    if_tag.appendChild(ann_tag)
1027
906
                # Add the names to the return values for the
1028
907
                # "org.freedesktop.DBus.Properties" methods
1029
908
                if (if_tag.getAttribute("name")
1044
923
        except (AttributeError, xml.dom.DOMException,
1045
924
                xml.parsers.expat.ExpatError) as error:
1046
925
            logger.error("Failed to override Introspection method",
1047
 
                         exc_info=error)
 
926
                         error)
1048
927
        return xmlstring
1049
928
 
1050
929
 
1051
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1052
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
932
    if dt is None:
1054
933
        return dbus.String("", variant_level = variant_level)
1055
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
 
 
1057
 
 
1058
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1059
 
    """A class decorator; applied to a subclass of
1060
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1061
 
    interface names according to the "alt_interface_names" mapping.
1062
 
    Usage:
1063
 
    
1064
 
    @alternate_dbus_interfaces({"org.example.Interface":
1065
 
                                    "net.example.AlternateInterface"})
1066
 
    class SampleDBusObject(dbus.service.Object):
1067
 
        @dbus.service.method("org.example.Interface")
1068
 
        def SampleDBusMethod():
1069
 
            pass
1070
 
    
1071
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1072
 
    reachable via two interfaces: "org.example.Interface" and
1073
 
    "net.example.AlternateInterface", the latter of which will have
1074
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1075
 
    "true", unless "deprecate" is passed with a False value.
1076
 
    
1077
 
    This works for methods and signals, and also for D-Bus properties
1078
 
    (from DBusObjectWithProperties) and interfaces (from the
1079
 
    dbus_interface_annotations decorator).
 
934
    return dbus.String(dt.isoformat(),
 
935
                       variant_level=variant_level)
 
936
 
 
937
 
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
1080
942
    """
1081
 
    
1082
 
    def wrapper(cls):
1083
 
        for orig_interface_name, alt_interface_name in (
1084
 
                alt_interface_names.items()):
1085
 
            attr = {}
1086
 
            interface_names = set()
1087
 
            # Go though all attributes of the class
1088
 
            for attrname, attribute in inspect.getmembers(cls):
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
1089
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1090
951
                # with the wrong interface name
1091
952
                if (not hasattr(attribute, "_dbus_interface")
1092
 
                    or not attribute._dbus_interface.startswith(
1093
 
                        orig_interface_name)):
 
953
                    or not attribute._dbus_interface
 
954
                    .startswith("se.recompile.Mandos")):
1094
955
                    continue
1095
956
                # Create an alternate D-Bus interface name based on
1096
957
                # the current name
1097
 
                alt_interface = attribute._dbus_interface.replace(
1098
 
                    orig_interface_name, alt_interface_name)
1099
 
                interface_names.add(alt_interface)
 
958
                alt_interface = (attribute._dbus_interface
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1100
961
                # Is this a D-Bus signal?
1101
962
                if getattr(attribute, "_dbus_is_signal", False):
1102
 
                    if sys.version_info.major == 2:
1103
 
                        # Extract the original non-method undecorated
1104
 
                        # function by black magic
1105
 
                        nonmethod_func = (dict(
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
 
965
                    nonmethod_func = (dict(
1106
966
                            zip(attribute.func_code.co_freevars,
1107
 
                                attribute.__closure__))
1108
 
                                          ["func"].cell_contents)
1109
 
                    else:
1110
 
                        nonmethod_func = attribute
 
967
                                attribute.__closure__))["func"]
 
968
                                      .cell_contents)
1111
969
                    # Create a new, but exactly alike, function
1112
970
                    # object, and decorate it to be a new D-Bus signal
1113
971
                    # with the alternate D-Bus interface name
1114
 
                    if sys.version_info.major == 2:
1115
 
                        new_function = types.FunctionType(
1116
 
                            nonmethod_func.func_code,
1117
 
                            nonmethod_func.func_globals,
1118
 
                            nonmethod_func.func_name,
1119
 
                            nonmethod_func.func_defaults,
1120
 
                            nonmethod_func.func_closure)
1121
 
                    else:
1122
 
                        new_function = types.FunctionType(
1123
 
                            nonmethod_func.__code__,
1124
 
                            nonmethod_func.__globals__,
1125
 
                            nonmethod_func.__name__,
1126
 
                            nonmethod_func.__defaults__,
1127
 
                            nonmethod_func.__closure__)
1128
 
                    new_function = (dbus.service.signal(
1129
 
                        alt_interface,
1130
 
                        attribute._dbus_signature)(new_function))
1131
 
                    # Copy annotations, if any
1132
 
                    try:
1133
 
                        new_function._dbus_annotations = dict(
1134
 
                            attribute._dbus_annotations)
1135
 
                    except AttributeError:
1136
 
                        pass
 
972
                    new_function = (dbus.service.signal
 
973
                                    (alt_interface,
 
974
                                     attribute._dbus_signature)
 
975
                                    (types.FunctionType(
 
976
                                nonmethod_func.func_code,
 
977
                                nonmethod_func.func_globals,
 
978
                                nonmethod_func.func_name,
 
979
                                nonmethod_func.func_defaults,
 
980
                                nonmethod_func.func_closure)))
1137
981
                    # Define a creator of a function to call both the
1138
 
                    # original and alternate functions, so both the
1139
 
                    # original and alternate signals gets sent when
1140
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1141
984
                    def fixscope(func1, func2):
1142
985
                        """This function is a scope container to pass
1143
986
                        func1 and func2 to the "call_both" function
1144
987
                        outside of its arguments"""
1145
 
                        
1146
988
                        def call_both(*args, **kwargs):
1147
989
                            """This function will emit two D-Bus
1148
990
                            signals by calling func1 and func2"""
1149
991
                            func1(*args, **kwargs)
1150
992
                            func2(*args, **kwargs)
1151
 
                        
1152
993
                        return call_both
1153
994
                    # Create the "call_both" function and add it to
1154
995
                    # the class
1155
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1156
998
                # Is this a D-Bus method?
1157
999
                elif getattr(attribute, "_dbus_is_method", False):
1158
1000
                    # Create a new, but exactly alike, function
1159
1001
                    # object.  Decorate it to be a new D-Bus method
1160
1002
                    # with the alternate D-Bus interface name.  Add it
1161
1003
                    # to the class.
1162
 
                    attr[attrname] = (
1163
 
                        dbus.service.method(
1164
 
                            alt_interface,
1165
 
                            attribute._dbus_in_signature,
1166
 
                            attribute._dbus_out_signature)
1167
 
                        (types.FunctionType(attribute.func_code,
1168
 
                                            attribute.func_globals,
1169
 
                                            attribute.func_name,
1170
 
                                            attribute.func_defaults,
1171
 
                                            attribute.func_closure)))
1172
 
                    # Copy annotations, if any
1173
 
                    try:
1174
 
                        attr[attrname]._dbus_annotations = dict(
1175
 
                            attribute._dbus_annotations)
1176
 
                    except AttributeError:
1177
 
                        pass
 
1004
                    attr[attrname] = (dbus.service.method
 
1005
                                      (alt_interface,
 
1006
                                       attribute._dbus_in_signature,
 
1007
                                       attribute._dbus_out_signature)
 
1008
                                      (types.FunctionType
 
1009
                                       (attribute.func_code,
 
1010
                                        attribute.func_globals,
 
1011
                                        attribute.func_name,
 
1012
                                        attribute.func_defaults,
 
1013
                                        attribute.func_closure)))
1178
1014
                # Is this a D-Bus property?
1179
1015
                elif getattr(attribute, "_dbus_is_property", False):
1180
1016
                    # Create a new, but exactly alike, function
1181
1017
                    # object, and decorate it to be a new D-Bus
1182
1018
                    # property with the alternate D-Bus interface
1183
1019
                    # name.  Add it to the class.
1184
 
                    attr[attrname] = (dbus_service_property(
1185
 
                        alt_interface, attribute._dbus_signature,
1186
 
                        attribute._dbus_access,
1187
 
                        attribute._dbus_get_args_options
1188
 
                        ["byte_arrays"])
1189
 
                                      (types.FunctionType(
1190
 
                                          attribute.func_code,
1191
 
                                          attribute.func_globals,
1192
 
                                          attribute.func_name,
1193
 
                                          attribute.func_defaults,
1194
 
                                          attribute.func_closure)))
1195
 
                    # Copy annotations, if any
1196
 
                    try:
1197
 
                        attr[attrname]._dbus_annotations = dict(
1198
 
                            attribute._dbus_annotations)
1199
 
                    except AttributeError:
1200
 
                        pass
1201
 
                # Is this a D-Bus interface?
1202
 
                elif getattr(attribute, "_dbus_is_interface", False):
1203
 
                    # Create a new, but exactly alike, function
1204
 
                    # object.  Decorate it to be a new D-Bus interface
1205
 
                    # with the alternate D-Bus interface name.  Add it
1206
 
                    # to the class.
1207
 
                    attr[attrname] = (
1208
 
                        dbus_interface_annotations(alt_interface)
1209
 
                        (types.FunctionType(attribute.func_code,
1210
 
                                            attribute.func_globals,
1211
 
                                            attribute.func_name,
1212
 
                                            attribute.func_defaults,
1213
 
                                            attribute.func_closure)))
1214
 
            if deprecate:
1215
 
                # Deprecate all alternate interfaces
1216
 
                iname="_AlternateDBusNames_interface_annotation{}"
1217
 
                for interface_name in interface_names:
1218
 
                    
1219
 
                    @dbus_interface_annotations(interface_name)
1220
 
                    def func(self):
1221
 
                        return { "org.freedesktop.DBus.Deprecated":
1222
 
                                 "true" }
1223
 
                    # Find an unused name
1224
 
                    for aname in (iname.format(i)
1225
 
                                  for i in itertools.count()):
1226
 
                        if aname not in attr:
1227
 
                            attr[aname] = func
1228
 
                            break
1229
 
            if interface_names:
1230
 
                # Replace the class with a new subclass of it with
1231
 
                # methods, signals, etc. as created above.
1232
 
                cls = type(b"{}Alternate".format(cls.__name__),
1233
 
                           (cls, ), attr)
1234
 
        return cls
1235
 
    
1236
 
    return wrapper
1237
 
 
1238
 
 
1239
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
 
                            "se.bsnet.fukt.Mandos"})
 
1020
                    attr[attrname] = (dbus_service_property
 
1021
                                      (alt_interface,
 
1022
                                       attribute._dbus_signature,
 
1023
                                       attribute._dbus_access,
 
1024
                                       attribute
 
1025
                                       ._dbus_get_args_options
 
1026
                                       ["byte_arrays"])
 
1027
                                      (types.FunctionType
 
1028
                                       (attribute.func_code,
 
1029
                                        attribute.func_globals,
 
1030
                                        attribute.func_name,
 
1031
                                        attribute.func_defaults,
 
1032
                                        attribute.func_closure)))
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1241
1036
class ClientDBus(Client, DBusObjectWithProperties):
1242
1037
    """A Client class using D-Bus
1243
1038
    
1247
1042
    """
1248
1043
    
1249
1044
    runtime_expansions = (Client.runtime_expansions
1250
 
                          + ("dbus_object_path", ))
1251
 
    
1252
 
    _interface = "se.recompile.Mandos.Client"
 
1045
                          + ("dbus_object_path",))
1253
1046
    
1254
1047
    # dbus.service.Object doesn't use super(), so we can't either.
1255
1048
    
1258
1051
        Client.__init__(self, *args, **kwargs)
1259
1052
        # Only now, when this client is initialized, can it show up on
1260
1053
        # the D-Bus
1261
 
        client_object_name = str(self.name).translate(
 
1054
        client_object_name = unicode(self.name).translate(
1262
1055
            {ord("."): ord("_"),
1263
1056
             ord("-"): ord("_")})
1264
 
        self.dbus_object_path = dbus.ObjectPath(
1265
 
            "/clients/" + client_object_name)
 
1057
        self.dbus_object_path = (dbus.ObjectPath
 
1058
                                 ("/clients/" + client_object_name))
1266
1059
        DBusObjectWithProperties.__init__(self, self.bus,
1267
1060
                                          self.dbus_object_path)
1268
 
    
1269
 
    def notifychangeproperty(transform_func, dbus_name,
1270
 
                             type_func=lambda x: x,
1271
 
                             variant_level=1,
1272
 
                             invalidate_only=False,
1273
 
                             _interface=_interface):
 
1061
        
 
1062
    def notifychangeproperty(transform_func,
 
1063
                             dbus_name, type_func=lambda x: x,
 
1064
                             variant_level=1):
1274
1065
        """ Modify a variable so that it's a property which announces
1275
1066
        its changes to DBus.
1276
1067
        
1281
1072
                   to the D-Bus.  Default: no transform
1282
1073
        variant_level: D-Bus variant level.  Default: 1
1283
1074
        """
1284
 
        attrname = "_{}".format(dbus_name)
1285
 
        
 
1075
        attrname = "_{0}".format(dbus_name)
1286
1076
        def setter(self, value):
1287
1077
            if hasattr(self, "dbus_object_path"):
1288
1078
                if (not hasattr(self, attrname) or
1289
1079
                    type_func(getattr(self, attrname, None))
1290
1080
                    != type_func(value)):
1291
 
                    if invalidate_only:
1292
 
                        self.PropertiesChanged(
1293
 
                            _interface, dbus.Dictionary(),
1294
 
                            dbus.Array((dbus_name, )))
1295
 
                    else:
1296
 
                        dbus_value = transform_func(
1297
 
                            type_func(value),
1298
 
                            variant_level = variant_level)
1299
 
                        self.PropertyChanged(dbus.String(dbus_name),
1300
 
                                             dbus_value)
1301
 
                        self.PropertiesChanged(
1302
 
                            _interface,
1303
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1304
 
                                              dbus_value }),
1305
 
                            dbus.Array())
 
1081
                    dbus_value = transform_func(type_func(value),
 
1082
                                                variant_level
 
1083
                                                =variant_level)
 
1084
                    self.PropertyChanged(dbus.String(dbus_name),
 
1085
                                         dbus_value)
1306
1086
            setattr(self, attrname, value)
1307
1087
        
1308
1088
        return property(lambda self: getattr(self, attrname), setter)
1309
1089
    
 
1090
    
1310
1091
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1311
1092
    approvals_pending = notifychangeproperty(dbus.Boolean,
1312
1093
                                             "ApprovalPending",
1314
1095
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1096
    last_enabled = notifychangeproperty(datetime_to_dbus,
1316
1097
                                        "LastEnabled")
1317
 
    checker = notifychangeproperty(
1318
 
        dbus.Boolean, "CheckerRunning",
1319
 
        type_func = lambda checker: checker is not None)
 
1098
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1099
                                   type_func = lambda checker:
 
1100
                                       checker is not None)
1320
1101
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1102
                                           "LastCheckedOK")
1322
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1323
 
                                               "LastCheckerStatus")
1324
1103
    last_approval_request = notifychangeproperty(
1325
1104
        datetime_to_dbus, "LastApprovalRequest")
1326
1105
    approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1106
                                               "ApprovedByDefault")
1328
 
    approval_delay = notifychangeproperty(
1329
 
        dbus.UInt64, "ApprovalDelay",
1330
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1107
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1108
                                          "ApprovalDelay",
 
1109
                                          type_func =
 
1110
                                          timedelta_to_milliseconds)
1331
1111
    approval_duration = notifychangeproperty(
1332
1112
        dbus.UInt64, "ApprovalDuration",
1333
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1113
        type_func = timedelta_to_milliseconds)
1334
1114
    host = notifychangeproperty(dbus.String, "Host")
1335
 
    timeout = notifychangeproperty(
1336
 
        dbus.UInt64, "Timeout",
1337
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1115
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1116
                                   type_func =
 
1117
                                   timedelta_to_milliseconds)
1338
1118
    extended_timeout = notifychangeproperty(
1339
1119
        dbus.UInt64, "ExtendedTimeout",
1340
 
        type_func = lambda td: td.total_seconds() * 1000)
1341
 
    interval = notifychangeproperty(
1342
 
        dbus.UInt64, "Interval",
1343
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1120
        type_func = timedelta_to_milliseconds)
 
1121
    interval = notifychangeproperty(dbus.UInt64,
 
1122
                                    "Interval",
 
1123
                                    type_func =
 
1124
                                    timedelta_to_milliseconds)
1344
1125
    checker_command = notifychangeproperty(dbus.String, "Checker")
1345
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
 
                                  invalidate_only=True)
1347
1126
    
1348
1127
    del notifychangeproperty
1349
1128
    
1356
1135
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1136
        Client.__del__(self, *args, **kwargs)
1358
1137
    
1359
 
    def checker_callback(self, source, condition,
1360
 
                         connection, command, *args, **kwargs):
1361
 
        ret = Client.checker_callback(self, source, condition,
1362
 
                                      connection, command, *args,
1363
 
                                      **kwargs)
1364
 
        exitstatus = self.last_checker_status
1365
 
        if exitstatus >= 0:
 
1138
    def checker_callback(self, pid, condition, command,
 
1139
                         *args, **kwargs):
 
1140
        self.checker_callback_tag = None
 
1141
        self.checker = None
 
1142
        if os.WIFEXITED(condition):
 
1143
            exitstatus = os.WEXITSTATUS(condition)
1366
1144
            # Emit D-Bus signal
1367
1145
            self.CheckerCompleted(dbus.Int16(exitstatus),
1368
 
                                  dbus.Int64(0),
 
1146
                                  dbus.Int64(condition),
1369
1147
                                  dbus.String(command))
1370
1148
        else:
1371
1149
            # Emit D-Bus signal
1372
1150
            self.CheckerCompleted(dbus.Int16(-1),
1373
 
                                  dbus.Int64(
1374
 
                                      self.last_checker_signal),
 
1151
                                  dbus.Int64(condition),
1375
1152
                                  dbus.String(command))
1376
 
        return ret
 
1153
        
 
1154
        return Client.checker_callback(self, pid, condition, command,
 
1155
                                       *args, **kwargs)
1377
1156
    
1378
1157
    def start_checker(self, *args, **kwargs):
1379
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1158
        old_checker = self.checker
 
1159
        if self.checker is not None:
 
1160
            old_checker_pid = self.checker.pid
 
1161
        else:
 
1162
            old_checker_pid = None
1380
1163
        r = Client.start_checker(self, *args, **kwargs)
1381
1164
        # Only if new checker process was started
1382
1165
        if (self.checker is not None
1390
1173
        return False
1391
1174
    
1392
1175
    def approve(self, value=True):
 
1176
        self.send_changedstate()
1393
1177
        self.approved = value
1394
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
 
                                * 1000), self._reset_approved)
1396
 
        self.send_changedstate()
 
1178
        gobject.timeout_add(timedelta_to_milliseconds
 
1179
                            (self.approval_duration),
 
1180
                            self._reset_approved)
 
1181
    
1397
1182
    
1398
1183
    ## D-Bus methods, signals & properties
1399
 
    
1400
 
    ## Interfaces
 
1184
    _interface = "se.recompile.Mandos.Client"
1401
1185
    
1402
1186
    ## Signals
1403
1187
    
1414
1198
        pass
1415
1199
    
1416
1200
    # PropertyChanged - signal
1417
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1418
1201
    @dbus.service.signal(_interface, signature="sv")
1419
1202
    def PropertyChanged(self, property, value):
1420
1203
        "D-Bus signal"
1441
1224
        "D-Bus signal"
1442
1225
        return self.need_approval()
1443
1226
    
 
1227
    # NewRequest - signal
 
1228
    @dbus.service.signal(_interface, signature="s")
 
1229
    def NewRequest(self, ip):
 
1230
        """D-Bus signal
 
1231
        Is sent after a client request a secret.
 
1232
        """
 
1233
        pass
 
1234
    
1444
1235
    ## Methods
1445
1236
    
1446
1237
    # Approve - method
1484
1275
        return dbus.Boolean(bool(self.approvals_pending))
1485
1276
    
1486
1277
    # ApprovedByDefault - property
1487
 
    @dbus_service_property(_interface,
1488
 
                           signature="b",
 
1278
    @dbus_service_property(_interface, signature="b",
1489
1279
                           access="readwrite")
1490
1280
    def ApprovedByDefault_dbus_property(self, value=None):
1491
1281
        if value is None:       # get
1493
1283
        self.approved_by_default = bool(value)
1494
1284
    
1495
1285
    # ApprovalDelay - property
1496
 
    @dbus_service_property(_interface,
1497
 
                           signature="t",
 
1286
    @dbus_service_property(_interface, signature="t",
1498
1287
                           access="readwrite")
1499
1288
    def ApprovalDelay_dbus_property(self, value=None):
1500
1289
        if value is None:       # get
1501
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1502
 
                               * 1000)
 
1290
            return dbus.UInt64(self.approval_delay_milliseconds())
1503
1291
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1504
1292
    
1505
1293
    # ApprovalDuration - property
1506
 
    @dbus_service_property(_interface,
1507
 
                           signature="t",
 
1294
    @dbus_service_property(_interface, signature="t",
1508
1295
                           access="readwrite")
1509
1296
    def ApprovalDuration_dbus_property(self, value=None):
1510
1297
        if value is None:       # get
1511
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1512
 
                               * 1000)
 
1298
            return dbus.UInt64(timedelta_to_milliseconds(
 
1299
                    self.approval_duration))
1513
1300
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1514
1301
    
1515
1302
    # Name - property
1523
1310
        return dbus.String(self.fingerprint)
1524
1311
    
1525
1312
    # Host - property
1526
 
    @dbus_service_property(_interface,
1527
 
                           signature="s",
 
1313
    @dbus_service_property(_interface, signature="s",
1528
1314
                           access="readwrite")
1529
1315
    def Host_dbus_property(self, value=None):
1530
1316
        if value is None:       # get
1531
1317
            return dbus.String(self.host)
1532
 
        self.host = str(value)
 
1318
        self.host = unicode(value)
1533
1319
    
1534
1320
    # Created - property
1535
1321
    @dbus_service_property(_interface, signature="s", access="read")
1542
1328
        return datetime_to_dbus(self.last_enabled)
1543
1329
    
1544
1330
    # Enabled - property
1545
 
    @dbus_service_property(_interface,
1546
 
                           signature="b",
 
1331
    @dbus_service_property(_interface, signature="b",
1547
1332
                           access="readwrite")
1548
1333
    def Enabled_dbus_property(self, value=None):
1549
1334
        if value is None:       # get
1554
1339
            self.disable()
1555
1340
    
1556
1341
    # LastCheckedOK - property
1557
 
    @dbus_service_property(_interface,
1558
 
                           signature="s",
 
1342
    @dbus_service_property(_interface, signature="s",
1559
1343
                           access="readwrite")
1560
1344
    def LastCheckedOK_dbus_property(self, value=None):
1561
1345
        if value is not None:
1563
1347
            return
1564
1348
        return datetime_to_dbus(self.last_checked_ok)
1565
1349
    
1566
 
    # LastCheckerStatus - property
1567
 
    @dbus_service_property(_interface, signature="n", access="read")
1568
 
    def LastCheckerStatus_dbus_property(self):
1569
 
        return dbus.Int16(self.last_checker_status)
1570
 
    
1571
1350
    # Expires - property
1572
1351
    @dbus_service_property(_interface, signature="s", access="read")
1573
1352
    def Expires_dbus_property(self):
1579
1358
        return datetime_to_dbus(self.last_approval_request)
1580
1359
    
1581
1360
    # Timeout - property
1582
 
    @dbus_service_property(_interface,
1583
 
                           signature="t",
 
1361
    @dbus_service_property(_interface, signature="t",
1584
1362
                           access="readwrite")
1585
1363
    def Timeout_dbus_property(self, value=None):
1586
1364
        if value is None:       # get
1587
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1588
 
        old_timeout = self.timeout
 
1365
            return dbus.UInt64(self.timeout_milliseconds())
1589
1366
        self.timeout = datetime.timedelta(0, 0, 0, value)
1590
 
        # Reschedule disabling
 
1367
        # Reschedule timeout
1591
1368
        if self.enabled:
1592
1369
            now = datetime.datetime.utcnow()
1593
 
            self.expires += self.timeout - old_timeout
1594
 
            if self.expires <= now:
 
1370
            time_to_die = timedelta_to_milliseconds(
 
1371
                (self.last_checked_ok + self.timeout) - now)
 
1372
            if time_to_die <= 0:
1595
1373
                # The timeout has passed
1596
1374
                self.disable()
1597
1375
            else:
 
1376
                self.expires = (now +
 
1377
                                datetime.timedelta(milliseconds =
 
1378
                                                   time_to_die))
1598
1379
                if (getattr(self, "disable_initiator_tag", None)
1599
1380
                    is None):
1600
1381
                    return
1601
1382
                gobject.source_remove(self.disable_initiator_tag)
1602
 
                self.disable_initiator_tag = gobject.timeout_add(
1603
 
                    int((self.expires - now).total_seconds() * 1000),
1604
 
                    self.disable)
 
1383
                self.disable_initiator_tag = (gobject.timeout_add
 
1384
                                              (time_to_die,
 
1385
                                               self.disable))
1605
1386
    
1606
1387
    # ExtendedTimeout - property
1607
 
    @dbus_service_property(_interface,
1608
 
                           signature="t",
 
1388
    @dbus_service_property(_interface, signature="t",
1609
1389
                           access="readwrite")
1610
1390
    def ExtendedTimeout_dbus_property(self, value=None):
1611
1391
        if value is None:       # get
1612
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1613
 
                               * 1000)
 
1392
            return dbus.UInt64(self.extended_timeout_milliseconds())
1614
1393
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1615
1394
    
1616
1395
    # Interval - property
1617
 
    @dbus_service_property(_interface,
1618
 
                           signature="t",
 
1396
    @dbus_service_property(_interface, signature="t",
1619
1397
                           access="readwrite")
1620
1398
    def Interval_dbus_property(self, value=None):
1621
1399
        if value is None:       # get
1622
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1400
            return dbus.UInt64(self.interval_milliseconds())
1623
1401
        self.interval = datetime.timedelta(0, 0, 0, value)
1624
1402
        if getattr(self, "checker_initiator_tag", None) is None:
1625
1403
            return
1626
1404
        if self.enabled:
1627
1405
            # Reschedule checker run
1628
1406
            gobject.source_remove(self.checker_initiator_tag)
1629
 
            self.checker_initiator_tag = gobject.timeout_add(
1630
 
                value, self.start_checker)
1631
 
            self.start_checker() # Start one now, too
 
1407
            self.checker_initiator_tag = (gobject.timeout_add
 
1408
                                          (value, self.start_checker))
 
1409
            self.start_checker()    # Start one now, too
1632
1410
    
1633
1411
    # Checker - property
1634
 
    @dbus_service_property(_interface,
1635
 
                           signature="s",
 
1412
    @dbus_service_property(_interface, signature="s",
1636
1413
                           access="readwrite")
1637
1414
    def Checker_dbus_property(self, value=None):
1638
1415
        if value is None:       # get
1639
1416
            return dbus.String(self.checker_command)
1640
 
        self.checker_command = str(value)
 
1417
        self.checker_command = unicode(value)
1641
1418
    
1642
1419
    # CheckerRunning - property
1643
 
    @dbus_service_property(_interface,
1644
 
                           signature="b",
 
1420
    @dbus_service_property(_interface, signature="b",
1645
1421
                           access="readwrite")
1646
1422
    def CheckerRunning_dbus_property(self, value=None):
1647
1423
        if value is None:       # get
1657
1433
        return self.dbus_object_path # is already a dbus.ObjectPath
1658
1434
    
1659
1435
    # Secret = property
1660
 
    @dbus_service_property(_interface,
1661
 
                           signature="ay",
1662
 
                           access="write",
1663
 
                           byte_arrays=True)
 
1436
    @dbus_service_property(_interface, signature="ay",
 
1437
                           access="write", byte_arrays=True)
1664
1438
    def Secret_dbus_property(self, value):
1665
 
        self.secret = bytes(value)
 
1439
        self.secret = str(value)
1666
1440
    
1667
1441
    del _interface
1668
1442
 
1672
1446
        self._pipe = child_pipe
1673
1447
        self._pipe.send(('init', fpr, address))
1674
1448
        if not self._pipe.recv():
1675
 
            raise KeyError(fpr)
 
1449
            raise KeyError()
1676
1450
    
1677
1451
    def __getattribute__(self, name):
1678
1452
        if name == '_pipe':
1682
1456
        if data[0] == 'data':
1683
1457
            return data[1]
1684
1458
        if data[0] == 'function':
1685
 
            
1686
1459
            def func(*args, **kwargs):
1687
1460
                self._pipe.send(('funcall', name, args, kwargs))
1688
1461
                return self._pipe.recv()[1]
1689
 
            
1690
1462
            return func
1691
1463
    
1692
1464
    def __setattr__(self, name, value):
1695
1467
        self._pipe.send(('setattr', name, value))
1696
1468
 
1697
1469
 
 
1470
class ClientDBusTransitional(ClientDBus):
 
1471
    __metaclass__ = AlternateDBusNamesMetaclass
 
1472
 
 
1473
 
1698
1474
class ClientHandler(socketserver.BaseRequestHandler, object):
1699
1475
    """A class to handle client connections.
1700
1476
    
1704
1480
    def handle(self):
1705
1481
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
1482
            logger.info("TCP connection from: %s",
1707
 
                        str(self.client_address))
 
1483
                        unicode(self.client_address))
1708
1484
            logger.debug("Pipe FD: %d",
1709
1485
                         self.server.child_pipe.fileno())
1710
1486
            
1711
 
            session = gnutls.connection.ClientSession(
1712
 
                self.request, gnutls.connection .X509Credentials())
 
1487
            session = (gnutls.connection
 
1488
                       .ClientSession(self.request,
 
1489
                                      gnutls.connection
 
1490
                                      .X509Credentials()))
1713
1491
            
1714
1492
            # Note: gnutls.connection.X509Credentials is really a
1715
1493
            # generic GnuTLS certificate credentials object so long as
1724
1502
            priority = self.server.gnutls_priority
1725
1503
            if priority is None:
1726
1504
                priority = "NORMAL"
1727
 
            gnutls.library.functions.gnutls_priority_set_direct(
1728
 
                session._c_object, priority, None)
 
1505
            (gnutls.library.functions
 
1506
             .gnutls_priority_set_direct(session._c_object,
 
1507
                                         priority, None))
1729
1508
            
1730
1509
            # Start communication using the Mandos protocol
1731
1510
            # Get protocol number
1733
1512
            logger.debug("Protocol version: %r", line)
1734
1513
            try:
1735
1514
                if int(line.strip().split()[0]) > 1:
1736
 
                    raise RuntimeError(line)
 
1515
                    raise RuntimeError
1737
1516
            except (ValueError, IndexError, RuntimeError) as error:
1738
1517
                logger.error("Unknown protocol version: %s", error)
1739
1518
                return
1751
1530
            approval_required = False
1752
1531
            try:
1753
1532
                try:
1754
 
                    fpr = self.fingerprint(
1755
 
                        self.peer_certificate(session))
 
1533
                    fpr = self.fingerprint(self.peer_certificate
 
1534
                                           (session))
1756
1535
                except (TypeError,
1757
1536
                        gnutls.errors.GNUTLSError) as error:
1758
1537
                    logger.warning("Bad certificate: %s", error)
1765
1544
                except KeyError:
1766
1545
                    return
1767
1546
                
 
1547
                if self.server.use_dbus:
 
1548
                    # Emit D-Bus signal
 
1549
                    client.NewRequest(unicode(self.client_address)[0])
 
1550
                
1768
1551
                if client.approval_delay:
1769
1552
                    delay = client.approval_delay
1770
1553
                    client.approvals_pending += 1
1773
1556
                while True:
1774
1557
                    if not client.enabled:
1775
1558
                        logger.info("Client %s is disabled",
1776
 
                                    client.name)
 
1559
                                       client.name)
1777
1560
                        if self.server.use_dbus:
1778
1561
                            # Emit D-Bus signal
1779
1562
                            client.Rejected("Disabled")
1788
1571
                        if self.server.use_dbus:
1789
1572
                            # Emit D-Bus signal
1790
1573
                            client.NeedApproval(
1791
 
                                client.approval_delay.total_seconds()
1792
 
                                * 1000, client.approved_by_default)
 
1574
                                client.approval_delay_milliseconds(),
 
1575
                                client.approved_by_default)
1793
1576
                    else:
1794
1577
                        logger.warning("Client %s was not approved",
1795
1578
                                       client.name)
1801
1584
                    #wait until timeout or approved
1802
1585
                    time = datetime.datetime.now()
1803
1586
                    client.changedstate.acquire()
1804
 
                    client.changedstate.wait(delay.total_seconds())
 
1587
                    (client.changedstate.wait
 
1588
                     (float(client.timedelta_to_milliseconds(delay)
 
1589
                            / 1000)))
1805
1590
                    client.changedstate.release()
1806
1591
                    time2 = datetime.datetime.now()
1807
1592
                    if (time2 - time) >= delay:
1823
1608
                    try:
1824
1609
                        sent = session.send(client.secret[sent_size:])
1825
1610
                    except gnutls.errors.GNUTLSError as error:
1826
 
                        logger.warning("gnutls send failed",
1827
 
                                       exc_info=error)
 
1611
                        logger.warning("gnutls send failed")
1828
1612
                        return
1829
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1830
 
                                 len(client.secret) - (sent_size
1831
 
                                                       + sent))
 
1613
                    logger.debug("Sent: %d, remaining: %d",
 
1614
                                 sent, len(client.secret)
 
1615
                                 - (sent_size + sent))
1832
1616
                    sent_size += sent
1833
1617
                
1834
1618
                logger.info("Sending secret to %s", client.name)
1835
1619
                # bump the timeout using extended_timeout
1836
 
                client.bump_timeout(client.extended_timeout)
 
1620
                client.checked_ok(client.extended_timeout)
1837
1621
                if self.server.use_dbus:
1838
1622
                    # Emit D-Bus signal
1839
1623
                    client.GotSecret()
1844
1628
                try:
1845
1629
                    session.bye()
1846
1630
                except gnutls.errors.GNUTLSError as error:
1847
 
                    logger.warning("GnuTLS bye failed",
1848
 
                                   exc_info=error)
 
1631
                    logger.warning("GnuTLS bye failed")
1849
1632
    
1850
1633
    @staticmethod
1851
1634
    def peer_certificate(session):
1852
1635
        "Return the peer's OpenPGP certificate as a bytestring"
1853
1636
        # If not an OpenPGP certificate...
1854
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1855
 
                session._c_object)
 
1637
        if (gnutls.library.functions
 
1638
            .gnutls_certificate_type_get(session._c_object)
1856
1639
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1857
1640
            # ...do the normal thing
1858
1641
            return session.peer_certificate
1872
1655
    def fingerprint(openpgp):
1873
1656
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1657
        # New GnuTLS "datum" with the OpenPGP public key
1875
 
        datum = gnutls.library.types.gnutls_datum_t(
1876
 
            ctypes.cast(ctypes.c_char_p(openpgp),
1877
 
                        ctypes.POINTER(ctypes.c_ubyte)),
1878
 
            ctypes.c_uint(len(openpgp)))
 
1658
        datum = (gnutls.library.types
 
1659
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1660
                                             ctypes.POINTER
 
1661
                                             (ctypes.c_ubyte)),
 
1662
                                 ctypes.c_uint(len(openpgp))))
1879
1663
        # New empty GnuTLS certificate
1880
1664
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1882
 
            ctypes.byref(crt))
 
1665
        (gnutls.library.functions
 
1666
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1667
        # Import the OpenPGP public key into the certificate
1884
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1885
 
            crt, ctypes.byref(datum),
1886
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
1668
        (gnutls.library.functions
 
1669
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1670
                                    gnutls.library.constants
 
1671
                                    .GNUTLS_OPENPGP_FMT_RAW))
1887
1672
        # Verify the self signature in the key
1888
1673
        crtverify = ctypes.c_uint()
1889
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
 
            crt, 0, ctypes.byref(crtverify))
 
1674
        (gnutls.library.functions
 
1675
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1676
                                         ctypes.byref(crtverify)))
1891
1677
        if crtverify.value != 0:
1892
1678
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
 
            raise gnutls.errors.CertificateSecurityError(
1894
 
                "Verify failed")
 
1679
            raise (gnutls.errors.CertificateSecurityError
 
1680
                   ("Verify failed"))
1895
1681
        # New buffer for the fingerprint
1896
1682
        buf = ctypes.create_string_buffer(20)
1897
1683
        buf_len = ctypes.c_size_t()
1898
1684
        # Get the fingerprint from the certificate into the buffer
1899
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
1685
        (gnutls.library.functions
 
1686
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1687
                                             ctypes.byref(buf_len)))
1901
1688
        # Deinit the certificate
1902
1689
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1690
        # Convert the buffer to a Python bytestring
1909
1696
 
1910
1697
class MultiprocessingMixIn(object):
1911
1698
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1912
 
    
1913
1699
    def sub_process_main(self, request, address):
1914
1700
        try:
1915
1701
            self.finish_request(request, address)
1920
1706
    def process_request(self, request, address):
1921
1707
        """Start a new process to process the request."""
1922
1708
        proc = multiprocessing.Process(target = self.sub_process_main,
1923
 
                                       args = (request, address))
 
1709
                                       args = (request,
 
1710
                                               address))
1924
1711
        proc.start()
1925
1712
        return proc
1926
1713
 
1927
1714
 
1928
1715
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1929
1716
    """ adds a pipe to the MixIn """
1930
 
    
1931
1717
    def process_request(self, request, client_address):
1932
1718
        """Overrides and wraps the original process_request().
1933
1719
        
1942
1728
    
1943
1729
    def add_pipe(self, parent_pipe, proc):
1944
1730
        """Dummy function; override as necessary"""
1945
 
        raise NotImplementedError()
 
1731
        raise NotImplementedError
1946
1732
 
1947
1733
 
1948
1734
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1954
1740
        interface:      None or a network interface name (string)
1955
1741
        use_ipv6:       Boolean; to use IPv6 or not
1956
1742
    """
1957
 
    
1958
1743
    def __init__(self, server_address, RequestHandlerClass,
1959
 
                 interface=None,
1960
 
                 use_ipv6=True,
1961
 
                 socketfd=None):
1962
 
        """If socketfd is set, use that file descriptor instead of
1963
 
        creating a new one with socket.socket().
1964
 
        """
 
1744
                 interface=None, use_ipv6=True):
1965
1745
        self.interface = interface
1966
1746
        if use_ipv6:
1967
1747
            self.address_family = socket.AF_INET6
1968
 
        if socketfd is not None:
1969
 
            # Save the file descriptor
1970
 
            self.socketfd = socketfd
1971
 
            # Save the original socket.socket() function
1972
 
            self.socket_socket = socket.socket
1973
 
            # To implement --socket, we monkey patch socket.socket.
1974
 
            # 
1975
 
            # (When socketserver.TCPServer is a new-style class, we
1976
 
            # could make self.socket into a property instead of monkey
1977
 
            # patching socket.socket.)
1978
 
            # 
1979
 
            # Create a one-time-only replacement for socket.socket()
1980
 
            @functools.wraps(socket.socket)
1981
 
            def socket_wrapper(*args, **kwargs):
1982
 
                # Restore original function so subsequent calls are
1983
 
                # not affected.
1984
 
                socket.socket = self.socket_socket
1985
 
                del self.socket_socket
1986
 
                # This time only, return a new socket object from the
1987
 
                # saved file descriptor.
1988
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1989
 
            # Replace socket.socket() function with wrapper
1990
 
            socket.socket = socket_wrapper
1991
 
        # The socketserver.TCPServer.__init__ will call
1992
 
        # socket.socket(), which might be our replacement,
1993
 
        # socket_wrapper(), if socketfd was set.
1994
1748
        socketserver.TCPServer.__init__(self, server_address,
1995
1749
                                        RequestHandlerClass)
1996
 
    
1997
1750
    def server_bind(self):
1998
1751
        """This overrides the normal server_bind() function
1999
1752
        to bind to an interface if one was specified, and also NOT to
2005
1758
                             self.interface)
2006
1759
            else:
2007
1760
                try:
2008
 
                    self.socket.setsockopt(
2009
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
 
                        (self.interface + "\0").encode("utf-8"))
 
1761
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1762
                                           SO_BINDTODEVICE,
 
1763
                                           str(self.interface
 
1764
                                               + '\0'))
2011
1765
                except socket.error as error:
2012
 
                    if error.errno == errno.EPERM:
2013
 
                        logger.error("No permission to bind to"
2014
 
                                     " interface %s", self.interface)
2015
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1766
                    if error[0] == errno.EPERM:
 
1767
                        logger.error("No permission to"
 
1768
                                     " bind to interface %s",
 
1769
                                     self.interface)
 
1770
                    elif error[0] == errno.ENOPROTOOPT:
2016
1771
                        logger.error("SO_BINDTODEVICE not available;"
2017
1772
                                     " cannot bind to interface %s",
2018
1773
                                     self.interface)
2019
 
                    elif error.errno == errno.ENODEV:
2020
 
                        logger.error("Interface %s does not exist,"
2021
 
                                     " cannot bind", self.interface)
2022
1774
                    else:
2023
1775
                        raise
2024
1776
        # Only bind(2) the socket if we really need to.
2027
1779
                if self.address_family == socket.AF_INET6:
2028
1780
                    any_address = "::" # in6addr_any
2029
1781
                else:
2030
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1782
                    any_address = socket.INADDR_ANY
2031
1783
                self.server_address = (any_address,
2032
1784
                                       self.server_address[1])
2033
1785
            elif not self.server_address[1]:
2034
 
                self.server_address = (self.server_address[0], 0)
 
1786
                self.server_address = (self.server_address[0],
 
1787
                                       0)
2035
1788
#                 if self.interface:
2036
1789
#                     self.server_address = (self.server_address[0],
2037
1790
#                                            0, # port
2051
1804
    
2052
1805
    Assumes a gobject.MainLoop event loop.
2053
1806
    """
2054
 
    
2055
1807
    def __init__(self, server_address, RequestHandlerClass,
2056
 
                 interface=None,
2057
 
                 use_ipv6=True,
2058
 
                 clients=None,
2059
 
                 gnutls_priority=None,
2060
 
                 use_dbus=True,
2061
 
                 socketfd=None):
 
1808
                 interface=None, use_ipv6=True, clients=None,
 
1809
                 gnutls_priority=None, use_dbus=True):
2062
1810
        self.enabled = False
2063
1811
        self.clients = clients
2064
1812
        if self.clients is None:
2068
1816
        IPv6_TCPServer.__init__(self, server_address,
2069
1817
                                RequestHandlerClass,
2070
1818
                                interface = interface,
2071
 
                                use_ipv6 = use_ipv6,
2072
 
                                socketfd = socketfd)
2073
 
    
 
1819
                                use_ipv6 = use_ipv6)
2074
1820
    def server_activate(self):
2075
1821
        if self.enabled:
2076
1822
            return socketserver.TCPServer.server_activate(self)
2080
1826
    
2081
1827
    def add_pipe(self, parent_pipe, proc):
2082
1828
        # Call "handle_ipc" for both data and EOF events
2083
 
        gobject.io_add_watch(
2084
 
            parent_pipe.fileno(),
2085
 
            gobject.IO_IN | gobject.IO_HUP,
2086
 
            functools.partial(self.handle_ipc,
2087
 
                              parent_pipe = parent_pipe,
2088
 
                              proc = proc))
 
1829
        gobject.io_add_watch(parent_pipe.fileno(),
 
1830
                             gobject.IO_IN | gobject.IO_HUP,
 
1831
                             functools.partial(self.handle_ipc,
 
1832
                                               parent_pipe =
 
1833
                                               parent_pipe,
 
1834
                                               proc = proc))
2089
1835
    
2090
 
    def handle_ipc(self, source, condition,
2091
 
                   parent_pipe=None,
2092
 
                   proc = None,
2093
 
                   client_object=None):
 
1836
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1837
                   proc = None, client_object=None):
 
1838
        condition_names = {
 
1839
            gobject.IO_IN: "IN",   # There is data to read.
 
1840
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1841
                                    # blocking).
 
1842
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1843
            gobject.IO_ERR: "ERR", # Error condition.
 
1844
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1845
                                    # broken, usually for pipes and
 
1846
                                    # sockets).
 
1847
            }
 
1848
        conditions_string = ' | '.join(name
 
1849
                                       for cond, name in
 
1850
                                       condition_names.iteritems()
 
1851
                                       if cond & condition)
2094
1852
        # error, or the other end of multiprocessing.Pipe has closed
2095
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1853
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2096
1854
            # Wait for other process to exit
2097
1855
            proc.join()
2098
1856
            return False
2119
1877
                parent_pipe.send(False)
2120
1878
                return False
2121
1879
            
2122
 
            gobject.io_add_watch(
2123
 
                parent_pipe.fileno(),
2124
 
                gobject.IO_IN | gobject.IO_HUP,
2125
 
                functools.partial(self.handle_ipc,
2126
 
                                  parent_pipe = parent_pipe,
2127
 
                                  proc = proc,
2128
 
                                  client_object = client))
 
1880
            gobject.io_add_watch(parent_pipe.fileno(),
 
1881
                                 gobject.IO_IN | gobject.IO_HUP,
 
1882
                                 functools.partial(self.handle_ipc,
 
1883
                                                   parent_pipe =
 
1884
                                                   parent_pipe,
 
1885
                                                   proc = proc,
 
1886
                                                   client_object =
 
1887
                                                   client))
2129
1888
            parent_pipe.send(True)
2130
1889
            # remove the old hook in favor of the new above hook on
2131
1890
            # same fileno
2137
1896
            
2138
1897
            parent_pipe.send(('data', getattr(client_object,
2139
1898
                                              funcname)(*args,
2140
 
                                                        **kwargs)))
 
1899
                                                         **kwargs)))
2141
1900
        
2142
1901
        if command == 'getattr':
2143
1902
            attrname = request[1]
2144
 
            if isinstance(client_object.__getattribute__(attrname),
2145
 
                          collections.Callable):
2146
 
                parent_pipe.send(('function', ))
 
1903
            if callable(client_object.__getattribute__(attrname)):
 
1904
                parent_pipe.send(('function',))
2147
1905
            else:
2148
 
                parent_pipe.send((
2149
 
                    'data', client_object.__getattribute__(attrname)))
 
1906
                parent_pipe.send(('data', client_object
 
1907
                                  .__getattribute__(attrname)))
2150
1908
        
2151
1909
        if command == 'setattr':
2152
1910
            attrname = request[1]
2156
1914
        return True
2157
1915
 
2158
1916
 
2159
 
def rfc3339_duration_to_delta(duration):
2160
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2161
 
    
2162
 
    >>> rfc3339_duration_to_delta("P7D")
2163
 
    datetime.timedelta(7)
2164
 
    >>> rfc3339_duration_to_delta("PT60S")
2165
 
    datetime.timedelta(0, 60)
2166
 
    >>> rfc3339_duration_to_delta("PT60M")
2167
 
    datetime.timedelta(0, 3600)
2168
 
    >>> rfc3339_duration_to_delta("PT24H")
2169
 
    datetime.timedelta(1)
2170
 
    >>> rfc3339_duration_to_delta("P1W")
2171
 
    datetime.timedelta(7)
2172
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2173
 
    datetime.timedelta(0, 330)
2174
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2175
 
    datetime.timedelta(1, 200)
2176
 
    """
2177
 
    
2178
 
    # Parsing an RFC 3339 duration with regular expressions is not
2179
 
    # possible - there would have to be multiple places for the same
2180
 
    # values, like seconds.  The current code, while more esoteric, is
2181
 
    # cleaner without depending on a parsing library.  If Python had a
2182
 
    # built-in library for parsing we would use it, but we'd like to
2183
 
    # avoid excessive use of external libraries.
2184
 
    
2185
 
    # New type for defining tokens, syntax, and semantics all-in-one
2186
 
    Token = collections.namedtuple("Token", (
2187
 
        "regexp",  # To match token; if "value" is not None, must have
2188
 
                   # a "group" containing digits
2189
 
        "value",   # datetime.timedelta or None
2190
 
        "followers"))           # Tokens valid after this token
2191
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2193
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2194
 
    token_second = Token(re.compile(r"(\d+)S"),
2195
 
                         datetime.timedelta(seconds=1),
2196
 
                         frozenset((token_end, )))
2197
 
    token_minute = Token(re.compile(r"(\d+)M"),
2198
 
                         datetime.timedelta(minutes=1),
2199
 
                         frozenset((token_second, token_end)))
2200
 
    token_hour = Token(re.compile(r"(\d+)H"),
2201
 
                       datetime.timedelta(hours=1),
2202
 
                       frozenset((token_minute, token_end)))
2203
 
    token_time = Token(re.compile(r"T"),
2204
 
                       None,
2205
 
                       frozenset((token_hour, token_minute,
2206
 
                                  token_second)))
2207
 
    token_day = Token(re.compile(r"(\d+)D"),
2208
 
                      datetime.timedelta(days=1),
2209
 
                      frozenset((token_time, token_end)))
2210
 
    token_month = Token(re.compile(r"(\d+)M"),
2211
 
                        datetime.timedelta(weeks=4),
2212
 
                        frozenset((token_day, token_end)))
2213
 
    token_year = Token(re.compile(r"(\d+)Y"),
2214
 
                       datetime.timedelta(weeks=52),
2215
 
                       frozenset((token_month, token_end)))
2216
 
    token_week = Token(re.compile(r"(\d+)W"),
2217
 
                       datetime.timedelta(weeks=1),
2218
 
                       frozenset((token_end, )))
2219
 
    token_duration = Token(re.compile(r"P"), None,
2220
 
                           frozenset((token_year, token_month,
2221
 
                                      token_day, token_time,
2222
 
                                      token_week)))
2223
 
    # Define starting values
2224
 
    value = datetime.timedelta() # Value so far
2225
 
    found_token = None
2226
 
    followers = frozenset((token_duration, )) # Following valid tokens
2227
 
    s = duration                # String left to parse
2228
 
    # Loop until end token is found
2229
 
    while found_token is not token_end:
2230
 
        # Search for any currently valid tokens
2231
 
        for token in followers:
2232
 
            match = token.regexp.match(s)
2233
 
            if match is not None:
2234
 
                # Token found
2235
 
                if token.value is not None:
2236
 
                    # Value found, parse digits
2237
 
                    factor = int(match.group(1), 10)
2238
 
                    # Add to value so far
2239
 
                    value += factor * token.value
2240
 
                # Strip token from string
2241
 
                s = token.regexp.sub("", s, 1)
2242
 
                # Go to found token
2243
 
                found_token = token
2244
 
                # Set valid next tokens
2245
 
                followers = found_token.followers
2246
 
                break
2247
 
        else:
2248
 
            # No currently valid tokens were found
2249
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2250
 
                             .format(duration))
2251
 
    # End token found
2252
 
    return value
2253
 
 
2254
 
 
2255
1917
def string_to_delta(interval):
2256
1918
    """Parse a string and return a datetime.timedelta
2257
1919
    
2268
1930
    >>> string_to_delta('5m 30s')
2269
1931
    datetime.timedelta(0, 330)
2270
1932
    """
2271
 
    
2272
 
    try:
2273
 
        return rfc3339_duration_to_delta(interval)
2274
 
    except ValueError:
2275
 
        pass
2276
 
    
2277
1933
    timevalue = datetime.timedelta(0)
2278
1934
    for s in interval.split():
2279
1935
        try:
2280
 
            suffix = s[-1]
 
1936
            suffix = unicode(s[-1])
2281
1937
            value = int(s[:-1])
2282
1938
            if suffix == "d":
2283
1939
                delta = datetime.timedelta(value)
2290
1946
            elif suffix == "w":
2291
1947
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2292
1948
            else:
2293
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2294
 
        except IndexError as e:
 
1949
                raise ValueError("Unknown suffix %r" % suffix)
 
1950
        except (ValueError, IndexError) as e:
2295
1951
            raise ValueError(*(e.args))
2296
1952
        timevalue += delta
2297
1953
    return timevalue
2310
1966
        sys.exit()
2311
1967
    if not noclose:
2312
1968
        # Close all standard open file descriptors
2313
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1969
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2314
1970
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2315
1971
            raise OSError(errno.ENODEV,
2316
 
                          "{} not a character device"
2317
 
                          .format(os.devnull))
 
1972
                          "%s not a character device"
 
1973
                          % os.path.devnull)
2318
1974
        os.dup2(null, sys.stdin.fileno())
2319
1975
        os.dup2(null, sys.stdout.fileno())
2320
1976
        os.dup2(null, sys.stderr.fileno())
2329
1985
    
2330
1986
    parser = argparse.ArgumentParser()
2331
1987
    parser.add_argument("-v", "--version", action="version",
2332
 
                        version = "%(prog)s {}".format(version),
 
1988
                        version = "%%(prog)s %s" % version,
2333
1989
                        help="show version number and exit")
2334
1990
    parser.add_argument("-i", "--interface", metavar="IF",
2335
1991
                        help="Bind to interface IF")
2341
1997
                        help="Run self-test")
2342
1998
    parser.add_argument("--debug", action="store_true",
2343
1999
                        help="Debug mode; run in foreground and log"
2344
 
                        " to terminal", default=None)
 
2000
                        " to terminal")
2345
2001
    parser.add_argument("--debuglevel", metavar="LEVEL",
2346
2002
                        help="Debug level for stdout output")
2347
2003
    parser.add_argument("--priority", help="GnuTLS"
2354
2010
                        " files")
2355
2011
    parser.add_argument("--no-dbus", action="store_false",
2356
2012
                        dest="use_dbus", help="Do not provide D-Bus"
2357
 
                        " system bus interface", default=None)
 
2013
                        " system bus interface")
2358
2014
    parser.add_argument("--no-ipv6", action="store_false",
2359
 
                        dest="use_ipv6", help="Do not use IPv6",
2360
 
                        default=None)
 
2015
                        dest="use_ipv6", help="Do not use IPv6")
2361
2016
    parser.add_argument("--no-restore", action="store_false",
2362
2017
                        dest="restore", help="Do not restore stored"
2363
 
                        " state", default=None)
2364
 
    parser.add_argument("--socket", type=int,
2365
 
                        help="Specify a file descriptor to a network"
2366
 
                        " socket to use instead of creating one")
 
2018
                        " state")
2367
2019
    parser.add_argument("--statedir", metavar="DIR",
2368
2020
                        help="Directory to save/restore state in")
2369
 
    parser.add_argument("--foreground", action="store_true",
2370
 
                        help="Run in foreground", default=None)
2371
 
    parser.add_argument("--no-zeroconf", action="store_false",
2372
 
                        dest="zeroconf", help="Do not use Zeroconf",
2373
 
                        default=None)
2374
2021
    
2375
2022
    options = parser.parse_args()
2376
2023
    
2377
2024
    if options.check:
2378
2025
        import doctest
2379
 
        fail_count, test_count = doctest.testmod()
2380
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2026
        doctest.testmod()
 
2027
        sys.exit()
2381
2028
    
2382
2029
    # Default values for config file for server-global settings
2383
2030
    server_defaults = { "interface": "",
2385
2032
                        "port": "",
2386
2033
                        "debug": "False",
2387
2034
                        "priority":
2388
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2389
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2035
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2390
2036
                        "servicename": "Mandos",
2391
2037
                        "use_dbus": "True",
2392
2038
                        "use_ipv6": "True",
2393
2039
                        "debuglevel": "",
2394
2040
                        "restore": "True",
2395
 
                        "socket": "",
2396
 
                        "statedir": "/var/lib/mandos",
2397
 
                        "foreground": "False",
2398
 
                        "zeroconf": "True",
2399
 
                    }
 
2041
                        "statedir": "/var/lib/mandos"
 
2042
                        }
2400
2043
    
2401
2044
    # Parse config file for server-global settings
2402
2045
    server_config = configparser.SafeConfigParser(server_defaults)
2403
2046
    del server_defaults
2404
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2047
    server_config.read(os.path.join(options.configdir,
 
2048
                                    "mandos.conf"))
2405
2049
    # Convert the SafeConfigParser object to a dict
2406
2050
    server_settings = server_config.defaults()
2407
2051
    # Use the appropriate methods on the non-string config options
2408
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2052
    for option in ("debug", "use_dbus", "use_ipv6"):
2409
2053
        server_settings[option] = server_config.getboolean("DEFAULT",
2410
2054
                                                           option)
2411
2055
    if server_settings["port"]:
2412
2056
        server_settings["port"] = server_config.getint("DEFAULT",
2413
2057
                                                       "port")
2414
 
    if server_settings["socket"]:
2415
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2416
 
                                                         "socket")
2417
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2418
 
        # over with an opened os.devnull.  But we don't want this to
2419
 
        # happen with a supplied network socket.
2420
 
        if 0 <= server_settings["socket"] <= 2:
2421
 
            server_settings["socket"] = os.dup(server_settings
2422
 
                                               ["socket"])
2423
2058
    del server_config
2424
2059
    
2425
2060
    # Override the settings from the config file with command line
2426
2061
    # options, if set.
2427
2062
    for option in ("interface", "address", "port", "debug",
2428
 
                   "priority", "servicename", "configdir", "use_dbus",
2429
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2430
 
                   "socket", "foreground", "zeroconf"):
 
2063
                   "priority", "servicename", "configdir",
 
2064
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2065
                   "statedir"):
2431
2066
        value = getattr(options, option)
2432
2067
        if value is not None:
2433
2068
            server_settings[option] = value
2434
2069
    del options
2435
2070
    # Force all strings to be unicode
2436
2071
    for option in server_settings.keys():
2437
 
        if isinstance(server_settings[option], bytes):
2438
 
            server_settings[option] = (server_settings[option]
2439
 
                                       .decode("utf-8"))
2440
 
    # Force all boolean options to be boolean
2441
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
 
                   "foreground", "zeroconf"):
2443
 
        server_settings[option] = bool(server_settings[option])
2444
 
    # Debug implies foreground
2445
 
    if server_settings["debug"]:
2446
 
        server_settings["foreground"] = True
 
2072
        if type(server_settings[option]) is str:
 
2073
            server_settings[option] = unicode(server_settings[option])
2447
2074
    # Now we have our good server settings in "server_settings"
2448
2075
    
2449
2076
    ##################################################################
2450
2077
    
2451
 
    if (not server_settings["zeroconf"]
2452
 
        and not (server_settings["port"]
2453
 
                 or server_settings["socket"] != "")):
2454
 
        parser.error("Needs port or socket to work without Zeroconf")
2455
 
    
2456
2078
    # For convenience
2457
2079
    debug = server_settings["debug"]
2458
2080
    debuglevel = server_settings["debuglevel"]
2460
2082
    use_ipv6 = server_settings["use_ipv6"]
2461
2083
    stored_state_path = os.path.join(server_settings["statedir"],
2462
2084
                                     stored_state_file)
2463
 
    foreground = server_settings["foreground"]
2464
 
    zeroconf = server_settings["zeroconf"]
2465
2085
    
2466
2086
    if debug:
2467
2087
        initlogger(debug, logging.DEBUG)
2473
2093
            initlogger(debug, level)
2474
2094
    
2475
2095
    if server_settings["servicename"] != "Mandos":
2476
 
        syslogger.setFormatter(
2477
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2478
 
                              ' %(levelname)s: %(message)s'.format(
2479
 
                                  server_settings["servicename"])))
 
2096
        syslogger.setFormatter(logging.Formatter
 
2097
                               ('Mandos (%s) [%%(process)d]:'
 
2098
                                ' %%(levelname)s: %%(message)s'
 
2099
                                % server_settings["servicename"]))
2480
2100
    
2481
2101
    # Parse config file with clients
2482
2102
    client_config = configparser.SafeConfigParser(Client
2487
2107
    global mandos_dbus_service
2488
2108
    mandos_dbus_service = None
2489
2109
    
2490
 
    socketfd = None
2491
 
    if server_settings["socket"] != "":
2492
 
        socketfd = server_settings["socket"]
2493
 
    tcp_server = MandosServer(
2494
 
        (server_settings["address"], server_settings["port"]),
2495
 
        ClientHandler,
2496
 
        interface=(server_settings["interface"] or None),
2497
 
        use_ipv6=use_ipv6,
2498
 
        gnutls_priority=server_settings["priority"],
2499
 
        use_dbus=use_dbus,
2500
 
        socketfd=socketfd)
2501
 
    if not foreground:
2502
 
        pidfilename = "/run/mandos.pid"
2503
 
        if not os.path.isdir("/run/."):
2504
 
            pidfilename = "/var/run/mandos.pid"
2505
 
        pidfile = None
 
2110
    tcp_server = MandosServer((server_settings["address"],
 
2111
                               server_settings["port"]),
 
2112
                              ClientHandler,
 
2113
                              interface=(server_settings["interface"]
 
2114
                                         or None),
 
2115
                              use_ipv6=use_ipv6,
 
2116
                              gnutls_priority=
 
2117
                              server_settings["priority"],
 
2118
                              use_dbus=use_dbus)
 
2119
    if not debug:
 
2120
        pidfilename = "/var/run/mandos.pid"
2506
2121
        try:
2507
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2508
 
        except IOError as e:
2509
 
            logger.error("Could not open file %r", pidfilename,
2510
 
                         exc_info=e)
 
2122
            pidfile = open(pidfilename, "w")
 
2123
        except IOError:
 
2124
            logger.error("Could not open file %r", pidfilename)
2511
2125
    
2512
 
    for name in ("_mandos", "mandos", "nobody"):
 
2126
    try:
 
2127
        uid = pwd.getpwnam("_mandos").pw_uid
 
2128
        gid = pwd.getpwnam("_mandos").pw_gid
 
2129
    except KeyError:
2513
2130
        try:
2514
 
            uid = pwd.getpwnam(name).pw_uid
2515
 
            gid = pwd.getpwnam(name).pw_gid
2516
 
            break
 
2131
            uid = pwd.getpwnam("mandos").pw_uid
 
2132
            gid = pwd.getpwnam("mandos").pw_gid
2517
2133
        except KeyError:
2518
 
            continue
2519
 
    else:
2520
 
        uid = 65534
2521
 
        gid = 65534
 
2134
            try:
 
2135
                uid = pwd.getpwnam("nobody").pw_uid
 
2136
                gid = pwd.getpwnam("nobody").pw_gid
 
2137
            except KeyError:
 
2138
                uid = 65534
 
2139
                gid = 65534
2522
2140
    try:
2523
2141
        os.setgid(gid)
2524
2142
        os.setuid(uid)
2525
2143
    except OSError as error:
2526
 
        if error.errno != errno.EPERM:
2527
 
            raise
 
2144
        if error[0] != errno.EPERM:
 
2145
            raise error
2528
2146
    
2529
2147
    if debug:
2530
2148
        # Enable all possible GnuTLS debugging
2537
2155
        def debug_gnutls(level, string):
2538
2156
            logger.debug("GnuTLS: %s", string[:-1])
2539
2157
        
2540
 
        gnutls.library.functions.gnutls_global_set_log_function(
2541
 
            debug_gnutls)
 
2158
        (gnutls.library.functions
 
2159
         .gnutls_global_set_log_function(debug_gnutls))
2542
2160
        
2543
2161
        # Redirect stdin so all checkers get /dev/null
2544
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2162
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2545
2163
        os.dup2(null, sys.stdin.fileno())
2546
2164
        if null > 2:
2547
2165
            os.close(null)
2548
2166
    
2549
2167
    # Need to fork before connecting to D-Bus
2550
 
    if not foreground:
 
2168
    if not debug:
2551
2169
        # Close all input and output, do double fork, etc.
2552
2170
        daemon()
2553
2171
    
2554
 
    # multiprocessing will use threads, so before we use gobject we
2555
 
    # need to inform gobject that threads will be used.
2556
2172
    gobject.threads_init()
2557
2173
    
2558
2174
    global main_loop
2559
2175
    # From the Avahi example code
2560
 
    DBusGMainLoop(set_as_default=True)
 
2176
    DBusGMainLoop(set_as_default=True )
2561
2177
    main_loop = gobject.MainLoop()
2562
2178
    bus = dbus.SystemBus()
2563
2179
    # End of Avahi example code
2564
2180
    if use_dbus:
2565
2181
        try:
2566
2182
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2567
 
                                            bus,
2568
 
                                            do_not_queue=True)
2569
 
            old_bus_name = dbus.service.BusName(
2570
 
                "se.bsnet.fukt.Mandos", bus,
2571
 
                do_not_queue=True)
2572
 
        except dbus.exceptions.DBusException as e:
2573
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2183
                                            bus, do_not_queue=True)
 
2184
            old_bus_name = (dbus.service.BusName
 
2185
                            ("se.bsnet.fukt.Mandos", bus,
 
2186
                             do_not_queue=True))
 
2187
        except dbus.exceptions.NameExistsException as e:
 
2188
            logger.error(unicode(e) + ", disabling D-Bus")
2574
2189
            use_dbus = False
2575
2190
            server_settings["use_dbus"] = False
2576
2191
            tcp_server.use_dbus = False
2577
 
    if zeroconf:
2578
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
 
        service = AvahiServiceToSyslog(
2580
 
            name = server_settings["servicename"],
2581
 
            servicetype = "_mandos._tcp",
2582
 
            protocol = protocol,
2583
 
            bus = bus)
2584
 
        if server_settings["interface"]:
2585
 
            service.interface = if_nametoindex(
2586
 
                server_settings["interface"].encode("utf-8"))
 
2192
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2193
    service = AvahiServiceToSyslog(name =
 
2194
                                   server_settings["servicename"],
 
2195
                                   servicetype = "_mandos._tcp",
 
2196
                                   protocol = protocol, bus = bus)
 
2197
    if server_settings["interface"]:
 
2198
        service.interface = (if_nametoindex
 
2199
                             (str(server_settings["interface"])))
2587
2200
    
2588
2201
    global multiprocessing_manager
2589
2202
    multiprocessing_manager = multiprocessing.Manager()
2590
2203
    
2591
2204
    client_class = Client
2592
2205
    if use_dbus:
2593
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2206
        client_class = functools.partial(ClientDBusTransitional,
 
2207
                                         bus = bus)
2594
2208
    
2595
2209
    client_settings = Client.config_parser(client_config)
2596
2210
    old_client_settings = {}
2597
2211
    clients_data = {}
2598
2212
    
2599
 
    # This is used to redirect stdout and stderr for checker processes
2600
 
    global wnull
2601
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2602
 
    # Only used if server is running in foreground but not in debug
2603
 
    # mode
2604
 
    if debug or not foreground:
2605
 
        wnull.close()
2606
 
    
2607
2213
    # Get client data and settings from last running state.
2608
2214
    if server_settings["restore"]:
2609
2215
        try:
2610
2216
            with open(stored_state_path, "rb") as stored_state:
2611
 
                clients_data, old_client_settings = pickle.load(
2612
 
                    stored_state)
 
2217
                clients_data, old_client_settings = (pickle.load
 
2218
                                                     (stored_state))
2613
2219
            os.remove(stored_state_path)
2614
2220
        except IOError as e:
2615
 
            if e.errno == errno.ENOENT:
2616
 
                logger.warning("Could not load persistent state:"
2617
 
                               " {}".format(os.strerror(e.errno)))
2618
 
            else:
2619
 
                logger.critical("Could not load persistent state:",
2620
 
                                exc_info=e)
 
2221
            logger.warning("Could not load persistent state: {0}"
 
2222
                           .format(e))
 
2223
            if e.errno != errno.ENOENT:
2621
2224
                raise
2622
2225
        except EOFError as e:
2623
2226
            logger.warning("Could not load persistent state: "
2624
 
                           "EOFError:",
2625
 
                           exc_info=e)
 
2227
                           "EOFError: {0}".format(e))
2626
2228
    
2627
2229
    with PGPEngine() as pgp:
2628
 
        for client_name, client in clients_data.items():
2629
 
            # Skip removed clients
2630
 
            if client_name not in client_settings:
2631
 
                continue
2632
 
            
 
2230
        for client_name, client in clients_data.iteritems():
2633
2231
            # Decide which value to use after restoring saved state.
2634
2232
            # We have three different values: Old config file,
2635
2233
            # new config file, and saved state.
2640
2238
                    # For each value in new config, check if it
2641
2239
                    # differs from the old config value (Except for
2642
2240
                    # the "secret" attribute)
2643
 
                    if (name != "secret"
2644
 
                        and (value !=
2645
 
                             old_client_settings[client_name][name])):
 
2241
                    if (name != "secret" and
 
2242
                        value != old_client_settings[client_name]
 
2243
                        [name]):
2646
2244
                        client[name] = value
2647
2245
                except KeyError:
2648
2246
                    pass
2649
2247
            
2650
2248
            # Clients who has passed its expire date can still be
2651
 
            # enabled if its last checker was successful.  A Client
 
2249
            # enabled if its last checker was successful.  Clients
2652
2250
            # whose checker succeeded before we stored its state is
2653
2251
            # assumed to have successfully run all checkers during
2654
2252
            # downtime.
2656
2254
                if datetime.datetime.utcnow() >= client["expires"]:
2657
2255
                    if not client["last_checked_ok"]:
2658
2256
                        logger.warning(
2659
 
                            "disabling client {} - Client never "
2660
 
                            "performed a successful checker".format(
2661
 
                                client_name))
 
2257
                            "disabling client {0} - Client never "
 
2258
                            "performed a successful checker"
 
2259
                            .format(client_name))
2662
2260
                        client["enabled"] = False
2663
2261
                    elif client["last_checker_status"] != 0:
2664
2262
                        logger.warning(
2665
 
                            "disabling client {} - Client last"
2666
 
                            " checker failed with error code"
2667
 
                            " {}".format(
2668
 
                                client_name,
2669
 
                                client["last_checker_status"]))
 
2263
                            "disabling client {0} - Client "
 
2264
                            "last checker failed with error code {1}"
 
2265
                            .format(client_name,
 
2266
                                    client["last_checker_status"]))
2670
2267
                        client["enabled"] = False
2671
2268
                    else:
2672
 
                        client["expires"] = (
2673
 
                            datetime.datetime.utcnow()
2674
 
                            + client["timeout"])
 
2269
                        client["expires"] = (datetime.datetime
 
2270
                                             .utcnow()
 
2271
                                             + client["timeout"])
2675
2272
                        logger.debug("Last checker succeeded,"
2676
 
                                     " keeping {} enabled".format(
2677
 
                                         client_name))
 
2273
                                     " keeping {0} enabled"
 
2274
                                     .format(client_name))
2678
2275
            try:
2679
 
                client["secret"] = pgp.decrypt(
2680
 
                    client["encrypted_secret"],
2681
 
                    client_settings[client_name]["secret"])
 
2276
                client["secret"] = (
 
2277
                    pgp.decrypt(client["encrypted_secret"],
 
2278
                                client_settings[client_name]
 
2279
                                ["secret"]))
2682
2280
            except PGPError:
2683
2281
                # If decryption fails, we use secret from new settings
2684
 
                logger.debug("Failed to decrypt {} old secret".format(
2685
 
                    client_name))
2686
 
                client["secret"] = (client_settings[client_name]
2687
 
                                    ["secret"])
 
2282
                logger.debug("Failed to decrypt {0} old secret"
 
2283
                             .format(client_name))
 
2284
                client["secret"] = (
 
2285
                    client_settings[client_name]["secret"])
 
2286
 
2688
2287
    
2689
2288
    # Add/remove clients based on new changes made to config
2690
2289
    for client_name in (set(old_client_settings)
2693
2292
    for client_name in (set(client_settings)
2694
2293
                        - set(old_client_settings)):
2695
2294
        clients_data[client_name] = client_settings[client_name]
2696
 
    
 
2295
 
2697
2296
    # Create all client objects
2698
 
    for client_name, client in clients_data.items():
 
2297
    for client_name, client in clients_data.iteritems():
2699
2298
        tcp_server.clients[client_name] = client_class(
2700
 
            name = client_name,
2701
 
            settings = client,
2702
 
            server_settings = server_settings)
 
2299
            name = client_name, settings = client)
2703
2300
    
2704
2301
    if not tcp_server.clients:
2705
2302
        logger.warning("No clients defined")
2706
 
    
2707
 
    if not foreground:
2708
 
        if pidfile is not None:
2709
 
            pid = os.getpid()
2710
 
            try:
2711
 
                with pidfile:
2712
 
                    print(pid, file=pidfile)
2713
 
            except IOError:
2714
 
                logger.error("Could not write to file %r with PID %d",
2715
 
                             pidfilename, pid)
2716
 
        del pidfile
 
2303
        
 
2304
    if not debug:
 
2305
        try:
 
2306
            with pidfile:
 
2307
                pid = os.getpid()
 
2308
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2309
            del pidfile
 
2310
        except IOError:
 
2311
            logger.error("Could not write to file %r with PID %d",
 
2312
                         pidfilename, pid)
 
2313
        except NameError:
 
2314
            # "pidfile" was never created
 
2315
            pass
2717
2316
        del pidfilename
 
2317
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2718
2318
    
2719
2319
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2720
2320
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2721
2321
    
2722
2322
    if use_dbus:
2723
 
        
2724
 
        @alternate_dbus_interfaces(
2725
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2726
 
        class MandosDBusService(DBusObjectWithProperties):
 
2323
        class MandosDBusService(dbus.service.Object):
2727
2324
            """A D-Bus proxy object"""
2728
 
            
2729
2325
            def __init__(self):
2730
2326
                dbus.service.Object.__init__(self, bus, "/")
2731
 
            
2732
2327
            _interface = "se.recompile.Mandos"
2733
2328
            
2734
 
            @dbus_interface_annotations(_interface)
2735
 
            def _foo(self):
2736
 
                return {
2737
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2738
 
                    "false" }
2739
 
            
2740
2329
            @dbus.service.signal(_interface, signature="o")
2741
2330
            def ClientAdded(self, objpath):
2742
2331
                "D-Bus signal"
2755
2344
            @dbus.service.method(_interface, out_signature="ao")
2756
2345
            def GetAllClients(self):
2757
2346
                "D-Bus method"
2758
 
                return dbus.Array(c.dbus_object_path for c in
 
2347
                return dbus.Array(c.dbus_object_path
 
2348
                                  for c in
2759
2349
                                  tcp_server.clients.itervalues())
2760
2350
            
2761
2351
            @dbus.service.method(_interface,
2763
2353
            def GetAllClientsWithProperties(self):
2764
2354
                "D-Bus method"
2765
2355
                return dbus.Dictionary(
2766
 
                    { c.dbus_object_path: c.GetAll("")
2767
 
                      for c in tcp_server.clients.itervalues() },
 
2356
                    ((c.dbus_object_path, c.GetAll(""))
 
2357
                     for c in tcp_server.clients.itervalues()),
2768
2358
                    signature="oa{sv}")
2769
2359
            
2770
2360
            @dbus.service.method(_interface, in_signature="o")
2783
2373
            
2784
2374
            del _interface
2785
2375
        
2786
 
        mandos_dbus_service = MandosDBusService()
 
2376
        class MandosDBusServiceTransitional(MandosDBusService):
 
2377
            __metaclass__ = AlternateDBusNamesMetaclass
 
2378
        mandos_dbus_service = MandosDBusServiceTransitional()
2787
2379
    
2788
2380
    def cleanup():
2789
2381
        "Cleanup function; run on exit"
2790
 
        if zeroconf:
2791
 
            service.cleanup()
 
2382
        service.cleanup()
2792
2383
        
2793
2384
        multiprocessing.active_children()
2794
 
        wnull.close()
2795
2385
        if not (tcp_server.clients or client_settings):
2796
2386
            return
2797
2387
        
2808
2398
                
2809
2399
                # A list of attributes that can not be pickled
2810
2400
                # + secret.
2811
 
                exclude = { "bus", "changedstate", "secret",
2812
 
                            "checker", "server_settings" }
2813
 
                for name, typ in inspect.getmembers(dbus.service
2814
 
                                                    .Object):
 
2401
                exclude = set(("bus", "changedstate", "secret",
 
2402
                               "checker"))
 
2403
                for name, typ in (inspect.getmembers
 
2404
                                  (dbus.service.Object)):
2815
2405
                    exclude.add(name)
2816
2406
                
2817
2407
                client_dict["encrypted_secret"] = (client
2824
2414
                del client_settings[client.name]["secret"]
2825
2415
        
2826
2416
        try:
2827
 
            with tempfile.NamedTemporaryFile(
2828
 
                    mode='wb',
2829
 
                    suffix=".pickle",
2830
 
                    prefix='clients-',
2831
 
                    dir=os.path.dirname(stored_state_path),
2832
 
                    delete=False) as stored_state:
 
2417
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2418
                                                prefix="clients-",
 
2419
                                                dir=os.path.dirname
 
2420
                                                (stored_state_path))
 
2421
            with os.fdopen(tempfd, "wb") as stored_state:
2833
2422
                pickle.dump((clients, client_settings), stored_state)
2834
 
                tempname = stored_state.name
2835
2423
            os.rename(tempname, stored_state_path)
2836
2424
        except (IOError, OSError) as e:
 
2425
            logger.warning("Could not save persistent state: {0}"
 
2426
                           .format(e))
2837
2427
            if not debug:
2838
2428
                try:
2839
2429
                    os.remove(tempname)
2840
2430
                except NameError:
2841
2431
                    pass
2842
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2843
 
                logger.warning("Could not save persistent state: {}"
2844
 
                               .format(os.strerror(e.errno)))
2845
 
            else:
2846
 
                logger.warning("Could not save persistent state:",
2847
 
                               exc_info=e)
2848
 
                raise
 
2432
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2433
                                   errno.EEXIST)):
 
2434
                raise e
2849
2435
        
2850
2436
        # Delete all clients, and settings from config
2851
2437
        while tcp_server.clients:
2856
2442
            client.disable(quiet=True)
2857
2443
            if use_dbus:
2858
2444
                # Emit D-Bus signal
2859
 
                mandos_dbus_service.ClientRemoved(
2860
 
                    client.dbus_object_path, client.name)
 
2445
                mandos_dbus_service.ClientRemoved(client
 
2446
                                                  .dbus_object_path,
 
2447
                                                  client.name)
2861
2448
        client_settings.clear()
2862
2449
    
2863
2450
    atexit.register(cleanup)
2874
2461
    tcp_server.server_activate()
2875
2462
    
2876
2463
    # Find out what port we got
2877
 
    if zeroconf:
2878
 
        service.port = tcp_server.socket.getsockname()[1]
 
2464
    service.port = tcp_server.socket.getsockname()[1]
2879
2465
    if use_ipv6:
2880
2466
        logger.info("Now listening on address %r, port %d,"
2881
 
                    " flowinfo %d, scope_id %d",
2882
 
                    *tcp_server.socket.getsockname())
 
2467
                    " flowinfo %d, scope_id %d"
 
2468
                    % tcp_server.socket.getsockname())
2883
2469
    else:                       # IPv4
2884
 
        logger.info("Now listening on address %r, port %d",
2885
 
                    *tcp_server.socket.getsockname())
 
2470
        logger.info("Now listening on address %r, port %d"
 
2471
                    % tcp_server.socket.getsockname())
2886
2472
    
2887
2473
    #service.interface = tcp_server.socket.getsockname()[3]
2888
2474
    
2889
2475
    try:
2890
 
        if zeroconf:
2891
 
            # From the Avahi example code
2892
 
            try:
2893
 
                service.activate()
2894
 
            except dbus.exceptions.DBusException as error:
2895
 
                logger.critical("D-Bus Exception", exc_info=error)
2896
 
                cleanup()
2897
 
                sys.exit(1)
2898
 
            # End of Avahi example code
 
2476
        # From the Avahi example code
 
2477
        try:
 
2478
            service.activate()
 
2479
        except dbus.exceptions.DBusException as error:
 
2480
            logger.critical("DBusException: %s", error)
 
2481
            cleanup()
 
2482
            sys.exit(1)
 
2483
        # End of Avahi example code
2899
2484
        
2900
2485
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2901
2486
                             lambda *args, **kwargs:
2905
2490
        logger.debug("Starting main loop")
2906
2491
        main_loop.run()
2907
2492
    except AvahiError as error:
2908
 
        logger.critical("Avahi Error", exc_info=error)
 
2493
        logger.critical("AvahiError: %s", error)
2909
2494
        cleanup()
2910
2495
        sys.exit(1)
2911
2496
    except KeyboardInterrupt:
2916
2501
    # Must run before the D-Bus bus name gets deregistered
2917
2502
    cleanup()
2918
2503
 
2919
 
 
2920
2504
if __name__ == '__main__':
2921
2505
    main()