/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-09-19 09:42:55 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110919094255-3lji3igz75uog8lh
* mandos-clients.conf.xml (OPTIONS): Moved up "extended_timeout" to
                                     order options alphabetically.
* clients.conf: Language change in comment.

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