/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-03-08 19:12:56 UTC
  • mfrom: (237.7.20 trunk)
  • Revision ID: teddy@fukt.bsnet.se-20110308191256-mjcukty9on3z0yhd
Merge from trunk.

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
 
import argparse
 
39
import optparse
42
40
import datetime
43
41
import errno
44
42
import gnutls.crypto
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.8"
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.2.3"
 
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,
273
151
        self.group = None       # our entry group
274
152
        self.server = None
275
153
        self.bus = bus
276
 
        self.entry_group_state_changed_match = None
277
 
    
278
154
    def rename(self):
279
155
        """Derived from the Avahi example code"""
280
156
        if self.rename_count >= self.max_renames:
282
158
                            " after %i retries, exiting.",
283
159
                            self.rename_count)
284
160
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
161
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
287
162
        logger.info("Changing Zeroconf service name to %r ...",
288
163
                    self.name)
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               ('Mandos (%s) [%%(process)d]:'
 
166
                                ' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
289
168
        self.remove()
290
169
        try:
291
170
            self.add()
292
 
        except dbus.exceptions.DBusException as error:
293
 
            logger.critical("D-Bus Exception", exc_info=error)
 
171
        except dbus.exceptions.DBusException, error:
 
172
            logger.critical("DBusException: %s", error)
294
173
            self.cleanup()
295
174
            os._exit(1)
296
175
        self.rename_count += 1
297
 
    
298
176
    def remove(self):
299
177
        """Derived from the Avahi example code"""
300
 
        if self.entry_group_state_changed_match is not None:
301
 
            self.entry_group_state_changed_match.remove()
302
 
            self.entry_group_state_changed_match = None
303
178
        if self.group is not None:
304
179
            self.group.Reset()
305
 
    
306
180
    def add(self):
307
181
        """Derived from the Avahi example code"""
308
 
        self.remove()
309
182
        if self.group is None:
310
183
            self.group = dbus.Interface(
311
184
                self.bus.get_object(avahi.DBUS_NAME,
312
185
                                    self.server.EntryGroupNew()),
313
186
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
314
 
        self.entry_group_state_changed_match = (
315
 
            self.group.connect_to_signal(
316
 
                'StateChanged', self.entry_group_state_changed))
 
187
            self.group.connect_to_signal('StateChanged',
 
188
                                         self
 
189
                                         .entry_group_state_changed)
317
190
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
318
191
                     self.name, self.type)
319
192
        self.group.AddService(
325
198
            dbus.UInt16(self.port),
326
199
            avahi.string_array_to_txt_array(self.TXT))
327
200
        self.group.Commit()
328
 
    
329
201
    def entry_group_state_changed(self, state, error):
330
202
        """Derived from the Avahi example code"""
331
203
        logger.debug("Avahi entry group state change: %i", state)
337
209
            self.rename()
338
210
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
211
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
342
 
                                  .format(error))
343
 
    
 
212
                            unicode(error))
 
213
            raise AvahiGroupError("State changed: %s"
 
214
                                  % unicode(error))
344
215
    def cleanup(self):
345
216
        """Derived from the Avahi example code"""
346
217
        if self.group is not None:
347
 
            try:
348
 
                self.group.Free()
349
 
            except (dbus.exceptions.UnknownMethodException,
350
 
                    dbus.exceptions.DBusException):
351
 
                pass
 
218
            self.group.Free()
352
219
            self.group = None
353
 
        self.remove()
354
 
    
355
 
    def server_state_changed(self, state, error=None):
 
220
    def server_state_changed(self, state):
356
221
        """Derived from the Avahi example code"""
357
222
        logger.debug("Avahi server state change: %i", state)
358
 
        bad_states = { avahi.SERVER_INVALID:
359
 
                           "Zeroconf server invalid",
360
 
                       avahi.SERVER_REGISTERING: None,
361
 
                       avahi.SERVER_COLLISION:
362
 
                           "Zeroconf server name collision",
363
 
                       avahi.SERVER_FAILURE:
364
 
                           "Zeroconf server failure" }
365
 
        if state in bad_states:
366
 
            if bad_states[state] is not None:
367
 
                if error is None:
368
 
                    logger.error(bad_states[state])
369
 
                else:
370
 
                    logger.error(bad_states[state] + ": %r", error)
371
 
            self.cleanup()
 
223
        if state == avahi.SERVER_COLLISION:
 
224
            logger.error("Zeroconf server name collision")
 
225
            self.remove()
372
226
        elif state == avahi.SERVER_RUNNING:
373
227
            self.add()
374
 
        else:
375
 
            if error is None:
376
 
                logger.debug("Unknown state: %r", state)
377
 
            else:
378
 
                logger.debug("Unknown state: %r: %r", state, error)
379
 
    
380
228
    def activate(self):
381
229
        """Derived from the Avahi example code"""
382
230
        if self.server is None:
383
231
            self.server = dbus.Interface(
384
232
                self.bus.get_object(avahi.DBUS_NAME,
385
 
                                    avahi.DBUS_PATH_SERVER,
386
 
                                    follow_name_owner_changes=True),
 
233
                                    avahi.DBUS_PATH_SERVER),
387
234
                avahi.DBUS_INTERFACE_SERVER)
388
235
        self.server.connect_to_signal("StateChanged",
389
236
                                 self.server_state_changed)
390
237
        self.server_state_changed(self.server.GetState())
391
238
 
392
239
 
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
240
class Client(object):
405
241
    """A representation of a client host served by this server.
406
242
    
407
243
    Attributes:
408
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
244
    _approved:   bool(); 'None' if not yet approved/disapproved
409
245
    approval_delay: datetime.timedelta(); Time to wait for approval
410
246
    approval_duration: datetime.timedelta(); Duration of one approval
411
247
    checker:    subprocess.Popen(); a running checker process used
418
254
                     instance %(name)s can be used in the command.
419
255
    checker_initiator_tag: a gobject event source tag, or None
420
256
    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
257
    current_checker_command: string; current running checker_command
 
258
    disable_hook:  If set, called by disable() as disable_hook(self)
424
259
    disable_initiator_tag: a gobject event source tag, or None
425
260
    enabled:    bool()
426
261
    fingerprint: string (40 or 32 hexadecimal digits); used to
429
264
    interval:   datetime.timedelta(); How often to start a new checker
430
265
    last_approval_request: datetime.datetime(); (UTC) or None
431
266
    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
 
267
    last_enabled: datetime.datetime(); (UTC)
436
268
    name:       string; from the config file, used in log messages and
437
269
                        D-Bus identifiers
438
270
    secret:     bytestring; sent verbatim (over TLS) to client
439
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
440
272
                                      until this client is disabled
441
 
    extended_timeout:   extra long timeout when secret has been sent
442
273
    runtime_expansions: Allowed attributes for runtime expansion.
443
 
    expires:    datetime.datetime(); time (UTC) when a client will be
444
 
                disabled, or None
445
 
    server_settings: The server_settings dict from main()
446
274
    """
447
275
    
448
276
    runtime_expansions = ("approval_delay", "approval_duration",
449
 
                          "created", "enabled", "expires",
450
 
                          "fingerprint", "host", "interval",
451
 
                          "last_approval_request", "last_checked_ok",
 
277
                          "created", "enabled", "fingerprint",
 
278
                          "host", "interval", "last_checked_ok",
452
279
                          "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
280
    
464
281
    @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):
 
282
    def _timedelta_to_milliseconds(td):
 
283
        "Convert a datetime.timedelta() to milliseconds"
 
284
        return ((td.days * 24 * 60 * 60 * 1000)
 
285
                + (td.seconds * 1000)
 
286
                + (td.microseconds // 1000))
 
287
    
 
288
    def timeout_milliseconds(self):
 
289
        "Return the 'timeout' attribute in milliseconds"
 
290
        return self._timedelta_to_milliseconds(self.timeout)
 
291
    
 
292
    def interval_milliseconds(self):
 
293
        "Return the 'interval' attribute in milliseconds"
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
295
 
 
296
    def approval_delay_milliseconds(self):
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
 
298
    
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
 
300
        """Note: the 'checker' key in 'config' sets the
 
301
        'checker_command' attribute and *not* the 'checker'
 
302
        attribute."""
512
303
        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
 
        
 
304
        if config is None:
 
305
            config = {}
530
306
        logger.debug("Creating client %r", self.name)
531
307
        # Uppercase and remove spaces from fingerprint for later
532
308
        # comparison purposes with return value from the fingerprint()
533
309
        # function
 
310
        self.fingerprint = (config["fingerprint"].upper()
 
311
                            .replace(" ", ""))
534
312
        logger.debug("  Fingerprint: %s", self.fingerprint)
535
 
        self.created = settings.get("created",
536
 
                                    datetime.datetime.utcnow())
537
 
        
538
 
        # attributes specific for this server instance
 
313
        if "secret" in config:
 
314
            self.secret = config["secret"].decode("base64")
 
315
        elif "secfile" in config:
 
316
            with open(os.path.expanduser(os.path.expandvars
 
317
                                         (config["secfile"])),
 
318
                      "rb") as secfile:
 
319
                self.secret = secfile.read()
 
320
        else:
 
321
            raise TypeError("No secret or secfile for client %s"
 
322
                            % self.name)
 
323
        self.host = config.get("host", "")
 
324
        self.created = datetime.datetime.utcnow()
 
325
        self.enabled = False
 
326
        self.last_approval_request = None
 
327
        self.last_enabled = None
 
328
        self.last_checked_ok = None
 
329
        self.timeout = string_to_delta(config["timeout"])
 
330
        self.interval = string_to_delta(config["interval"])
 
331
        self.disable_hook = disable_hook
539
332
        self.checker = None
540
333
        self.checker_initiator_tag = None
541
334
        self.disable_initiator_tag = None
542
335
        self.checker_callback_tag = None
 
336
        self.checker_command = config["checker"]
543
337
        self.current_checker_command = None
544
 
        self.approved = None
 
338
        self.last_connect = None
 
339
        self._approved = None
 
340
        self.approved_by_default = config.get("approved_by_default",
 
341
                                              True)
545
342
        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)
 
343
        self.approval_delay = string_to_delta(
 
344
            config["approval_delay"])
 
345
        self.approval_duration = string_to_delta(
 
346
            config["approval_duration"])
 
347
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
560
348
    
561
 
    # Send notice to process children that client state has changed
562
349
    def send_changedstate(self):
563
 
        with self.changedstate:
564
 
            self.changedstate.notify_all()
565
 
    
 
350
        self.changedstate.acquire()
 
351
        self.changedstate.notify_all()
 
352
        self.changedstate.release()
 
353
        
566
354
    def enable(self):
567
355
        """Start this client's checker and timeout hooks"""
568
356
        if getattr(self, "enabled", False):
569
357
            # Already enabled
570
358
            return
571
 
        self.expires = datetime.datetime.utcnow() + self.timeout
572
 
        self.enabled = True
 
359
        self.send_changedstate()
573
360
        self.last_enabled = datetime.datetime.utcnow()
574
 
        self.init_checker()
575
 
        self.send_changedstate()
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
362
        # and every interval from then on.
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
364
                                      (self.interval_milliseconds(),
 
365
                                       self.start_checker))
 
366
        # Schedule a disable() when 'timeout' has passed
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
368
                                   (self.timeout_milliseconds(),
 
369
                                    self.disable))
 
370
        self.enabled = True
 
371
        # Also start a new checker *right now*.
 
372
        self.start_checker()
576
373
    
577
374
    def disable(self, quiet=True):
578
375
        """Disable this client."""
579
376
        if not getattr(self, "enabled", False):
580
377
            return False
581
378
        if not quiet:
 
379
            self.send_changedstate()
 
380
        if not quiet:
582
381
            logger.info("Disabling client %s", self.name)
583
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
382
        if getattr(self, "disable_initiator_tag", False):
584
383
            gobject.source_remove(self.disable_initiator_tag)
585
384
            self.disable_initiator_tag = None
586
 
        self.expires = None
587
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
385
        if getattr(self, "checker_initiator_tag", False):
588
386
            gobject.source_remove(self.checker_initiator_tag)
589
387
            self.checker_initiator_tag = None
590
388
        self.stop_checker()
 
389
        if self.disable_hook:
 
390
            self.disable_hook(self)
591
391
        self.enabled = False
592
 
        if not quiet:
593
 
            self.send_changedstate()
594
392
        # Do not run this again if called by a gobject.timeout_add
595
393
        return False
596
394
    
597
395
    def __del__(self):
 
396
        self.disable_hook = None
598
397
        self.disable()
599
398
    
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
399
    def checker_callback(self, pid, condition, command):
620
400
        """The checker has completed, so take appropriate actions."""
621
401
        self.checker_callback_tag = None
622
402
        self.checker = None
623
403
        if os.WIFEXITED(condition):
624
 
            self.last_checker_status = os.WEXITSTATUS(condition)
625
 
            if self.last_checker_status == 0:
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
405
            if exitstatus == 0:
626
406
                logger.info("Checker for %(name)s succeeded",
627
407
                            vars(self))
628
408
                self.checked_ok()
630
410
                logger.info("Checker for %(name)s failed",
631
411
                            vars(self))
632
412
        else:
633
 
            self.last_checker_status = -1
634
413
            logger.warning("Checker for %(name)s crashed?",
635
414
                           vars(self))
636
415
    
637
416
    def checked_ok(self):
638
 
        """Assert that the client has been seen, alive and well."""
 
417
        """Bump up the timeout for this client.
 
418
        
 
419
        This should only be called when the client has been seen,
 
420
        alive and well.
 
421
        """
639
422
        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."""
645
 
        if timeout is None:
646
 
            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
 
423
        gobject.source_remove(self.disable_initiator_tag)
 
424
        self.disable_initiator_tag = (gobject.timeout_add
 
425
                                      (self.timeout_milliseconds(),
 
426
                                       self.disable))
655
427
    
656
428
    def need_approval(self):
657
429
        self.last_approval_request = datetime.datetime.utcnow()
662
434
        If a checker already exists, leave it running and do
663
435
        nothing."""
664
436
        # 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
 
437
        # did that, then if a checker (for some reason) started
 
438
        # running slowly and taking more than 'interval' time, the
 
439
        # client would inevitably timeout, since no checker would get
 
440
        # a chance to run to completion.  If we instead leave running
669
441
        # checkers alone, the checker would have to take more time
670
442
        # than 'timeout' for the client to be disabled, which is as it
671
443
        # should be.
673
445
        # If a checker exists, make sure it is not a zombie
674
446
        try:
675
447
            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
 
448
        except (AttributeError, OSError), error:
 
449
            if (isinstance(error, OSError)
 
450
                and error.errno != errno.ECHILD):
 
451
                raise error
681
452
        else:
682
453
            if pid:
683
454
                logger.warning("Checker was a zombie")
686
457
                                      self.current_checker_command)
687
458
        # Start a new checker if needed
688
459
        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
460
            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
 
461
                # In case checker_command has exactly one % operator
 
462
                command = self.checker_command % self.host
 
463
            except TypeError:
 
464
                # Escape attributes for the shell
 
465
                escaped_attrs = dict(
 
466
                    (attr,
 
467
                     re.escape(unicode(str(getattr(self, attr, "")),
 
468
                                       errors=
 
469
                                       'replace')))
 
470
                    for attr in
 
471
                    self.runtime_expansions)
 
472
 
 
473
                try:
 
474
                    command = self.checker_command % escaped_attrs
 
475
                except TypeError, error:
 
476
                    logger.error('Could not format string "%s":'
 
477
                                 ' %s', self.checker_command, error)
 
478
                    return True # Try again later
699
479
            self.current_checker_command = command
700
480
            try:
701
481
                logger.info("Starting checker %r for %s",
704
484
                # in normal mode, that is already done by daemon(),
705
485
                # and in debug mode we don't want to.  (Stdin is
706
486
                # 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
487
                self.checker = subprocess.Popen(command,
716
488
                                                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:
 
489
                                                shell=True, cwd="/")
 
490
                self.checker_callback_tag = (gobject.child_watch_add
 
491
                                             (self.checker.pid,
 
492
                                              self.checker_callback,
 
493
                                              data=command))
 
494
                # The checker may have completed before the gobject
 
495
                # watch was added.  Check for this.
730
496
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
731
 
            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)
 
497
                if pid:
 
498
                    gobject.source_remove(self.checker_callback_tag)
 
499
                    self.checker_callback(pid, status, command)
 
500
            except OSError, error:
 
501
                logger.error("Failed to start subprocess: %s",
 
502
                             error)
741
503
        # Re-run this periodically if run by gobject.timeout_add
742
504
        return True
743
505
    
750
512
            return
751
513
        logger.debug("Stopping checker for %(name)s", vars(self))
752
514
        try:
753
 
            self.checker.terminate()
 
515
            os.kill(self.checker.pid, signal.SIGTERM)
754
516
            #time.sleep(0.5)
755
517
            #if self.checker.poll() is None:
756
 
            #    self.checker.kill()
757
 
        except OSError as error:
 
518
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
519
        except OSError, error:
758
520
            if error.errno != errno.ESRCH: # No such process
759
521
                raise
760
522
        self.checker = None
761
523
 
762
 
 
763
524
def dbus_service_property(dbus_interface, signature="v",
764
525
                          access="readwrite", byte_arrays=False):
765
526
    """Decorators for marking methods of a DBusObjectWithProperties to
776
537
    # "Set" method, so we fail early here:
777
538
    if byte_arrays and signature != "ay":
778
539
        raise ValueError("Byte arrays not supported for non-'ay'"
779
 
                         " signature {!r}".format(signature))
 
540
                         " signature %r" % signature)
780
541
    def decorator(func):
781
542
        func._dbus_is_property = True
782
543
        func._dbus_interface = dbus_interface
790
551
    return decorator
791
552
 
792
553
 
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
554
class DBusPropertyException(dbus.exceptions.DBusException):
831
555
    """A base class for D-Bus property-related exceptions
832
556
    """
833
 
    pass
 
557
    def __unicode__(self):
 
558
        return unicode(str(self))
 
559
 
834
560
 
835
561
class DBusPropertyAccessException(DBusPropertyException):
836
562
    """A property's access permissions disallows an operation.
846
572
 
847
573
class DBusObjectWithProperties(dbus.service.Object):
848
574
    """A D-Bus object with properties.
849
 
    
 
575
 
850
576
    Classes inheriting from this can use the dbus_service_property
851
577
    decorator to expose methods as D-Bus properties.  It exposes the
852
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
853
579
    """
854
580
    
855
581
    @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)
 
582
    def _is_dbus_property(obj):
 
583
        return getattr(obj, "_dbus_is_property", False)
864
584
    
865
 
    def _get_all_dbus_things(self, thing):
 
585
    def _get_all_dbus_properties(self):
866
586
        """Returns a generator of (name, attribute) pairs
867
587
        """
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)))
 
588
        return ((prop._dbus_name, prop)
 
589
                for name, prop in
 
590
                inspect.getmembers(self, self._is_dbus_property))
875
591
    
876
592
    def _get_dbus_property(self, interface_name, property_name):
877
593
        """Returns a bound method if one exists which is a D-Bus
878
594
        property with the specified name and interface.
879
595
        """
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
 
        
 
596
        for name in (property_name,
 
597
                     property_name + "_dbus_property"):
 
598
            prop = getattr(self, name, None)
 
599
            if (prop is None
 
600
                or not self._is_dbus_property(prop)
 
601
                or prop._dbus_name != property_name
 
602
                or (interface_name and prop._dbus_interface
 
603
                    and interface_name != prop._dbus_interface)):
 
604
                continue
 
605
            return prop
888
606
        # No such property
889
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
608
                                   + interface_name + "."
914
632
            # The byte_arrays option is not supported yet on
915
633
            # signatures other than "ay".
916
634
            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))
 
635
                raise ValueError
 
636
            value = dbus.ByteArray(''.join(unichr(byte)
 
637
                                           for byte in value))
922
638
        prop(value)
923
639
    
924
640
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
926
642
    def GetAll(self, interface_name):
927
643
        """Standard D-Bus property GetAll() method, see D-Bus
928
644
        standard.
929
 
        
 
645
 
930
646
        Note: Will not include properties with access="write".
931
647
        """
932
 
        properties = {}
933
 
        for name, prop in self._get_all_dbus_things("property"):
 
648
        all = {}
 
649
        for name, prop in self._get_all_dbus_properties():
934
650
            if (interface_name
935
651
                and interface_name != prop._dbus_interface):
936
652
                # Interface non-empty but did not match
940
656
                continue
941
657
            value = prop()
942
658
            if not hasattr(value, "variant_level"):
943
 
                properties[name] = value
 
659
                all[name] = value
944
660
                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
 
661
            all[name] = type(value)(value, variant_level=
 
662
                                    value.variant_level+1)
 
663
        return dbus.Dictionary(all, signature="sv")
956
664
    
957
665
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
958
666
                         out_signature="s",
959
667
                         path_keyword='object_path',
960
668
                         connection_keyword='connection')
961
669
    def Introspect(self, object_path, connection):
962
 
        """Overloading of standard D-Bus method.
963
 
        
964
 
        Inserts property tags and interface annotation tags.
 
670
        """Standard D-Bus method, overloaded to insert property tags.
965
671
        """
966
672
        xmlstring = dbus.service.Object.Introspect(self, object_path,
967
673
                                                   connection)
974
680
                e.setAttribute("access", prop._dbus_access)
975
681
                return e
976
682
            for if_tag in document.getElementsByTagName("interface"):
977
 
                # Add property tags
978
683
                for tag in (make_tag(document, name, prop)
979
684
                            for name, prop
980
 
                            in self._get_all_dbus_things("property")
 
685
                            in self._get_all_dbus_properties()
981
686
                            if prop._dbus_interface
982
687
                            == if_tag.getAttribute("name")):
983
688
                    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
689
                # Add the names to the return values for the
1016
690
                # "org.freedesktop.DBus.Properties" methods
1017
691
                if (if_tag.getAttribute("name")
1030
704
            xmlstring = document.toxml("utf-8")
1031
705
            document.unlink()
1032
706
        except (AttributeError, xml.dom.DOMException,
1033
 
                xml.parsers.expat.ExpatError) as error:
 
707
                xml.parsers.expat.ExpatError), error:
1034
708
            logger.error("Failed to override Introspection method",
1035
 
                         exc_info=error)
 
709
                         error)
1036
710
        return xmlstring
1037
711
 
1038
712
 
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
713
class ClientDBus(Client, DBusObjectWithProperties):
1219
714
    """A Client class using D-Bus
1220
715
    
1226
721
    runtime_expansions = (Client.runtime_expansions
1227
722
                          + ("dbus_object_path",))
1228
723
    
1229
 
    _interface = "se.recompile.Mandos.Client"
1230
 
    
1231
724
    # dbus.service.Object doesn't use super(), so we can't either.
1232
725
    
1233
726
    def __init__(self, bus = None, *args, **kwargs):
 
727
        self._approvals_pending = 0
1234
728
        self.bus = bus
1235
729
        Client.__init__(self, *args, **kwargs)
1236
730
        # Only now, when this client is initialized, can it show up on
1237
731
        # the D-Bus
1238
 
        client_object_name = str(self.name).translate(
 
732
        client_object_name = unicode(self.name).translate(
1239
733
            {ord("."): ord("_"),
1240
734
             ord("-"): ord("_")})
1241
735
        self.dbus_object_path = (dbus.ObjectPath
1242
736
                                 ("/clients/" + client_object_name))
1243
737
        DBusObjectWithProperties.__init__(self, self.bus,
1244
738
                                          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
 
739
        
 
740
    def _get_approvals_pending(self):
 
741
        return self._approvals_pending
 
742
    def _set_approvals_pending(self, value):
 
743
        old_value = self._approvals_pending
 
744
        self._approvals_pending = value
 
745
        bval = bool(value)
 
746
        if (hasattr(self, "dbus_object_path")
 
747
            and bval is not bool(old_value)):
 
748
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
749
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
750
                                 dbus_bool)
 
751
 
 
752
    approvals_pending = property(_get_approvals_pending,
 
753
                                 _set_approvals_pending)
 
754
    del _get_approvals_pending, _set_approvals_pending
 
755
    
 
756
    @staticmethod
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
759
        return dbus.String(dt.isoformat(),
 
760
                           variant_level=variant_level)
 
761
    
 
762
    def enable(self):
 
763
        oldstate = getattr(self, "enabled", False)
 
764
        r = Client.enable(self)
 
765
        if oldstate != self.enabled:
 
766
            # Emit D-Bus signals
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
768
                                 dbus.Boolean(True, variant_level=1))
 
769
            self.PropertyChanged(
 
770
                dbus.String("LastEnabled"),
 
771
                self._datetime_to_dbus(self.last_enabled,
 
772
                                       variant_level=1))
 
773
        return r
 
774
    
 
775
    def disable(self, quiet = False):
 
776
        oldstate = getattr(self, "enabled", False)
 
777
        r = Client.disable(self, quiet=quiet)
 
778
        if not quiet and oldstate != self.enabled:
 
779
            # Emit D-Bus signal
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
781
                                 dbus.Boolean(False, variant_level=1))
 
782
        return r
1328
783
    
1329
784
    def __del__(self, *args, **kwargs):
1330
785
        try:
1339
794
                         *args, **kwargs):
1340
795
        self.checker_callback_tag = None
1341
796
        self.checker = None
 
797
        # Emit D-Bus signal
 
798
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
799
                             dbus.Boolean(False, variant_level=1))
1342
800
        if os.WIFEXITED(condition):
1343
801
            exitstatus = os.WEXITSTATUS(condition)
1344
802
            # Emit D-Bus signal
1354
812
        return Client.checker_callback(self, pid, condition, command,
1355
813
                                       *args, **kwargs)
1356
814
    
 
815
    def checked_ok(self, *args, **kwargs):
 
816
        r = Client.checked_ok(self, *args, **kwargs)
 
817
        # Emit D-Bus signal
 
818
        self.PropertyChanged(
 
819
            dbus.String("LastCheckedOK"),
 
820
            (self._datetime_to_dbus(self.last_checked_ok,
 
821
                                    variant_level=1)))
 
822
        return r
 
823
    
 
824
    def need_approval(self, *args, **kwargs):
 
825
        r = Client.need_approval(self, *args, **kwargs)
 
826
        # Emit D-Bus signal
 
827
        self.PropertyChanged(
 
828
            dbus.String("LastApprovalRequest"),
 
829
            (self._datetime_to_dbus(self.last_approval_request,
 
830
                                    variant_level=1)))
 
831
        return r
 
832
    
1357
833
    def start_checker(self, *args, **kwargs):
1358
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
834
        old_checker = self.checker
 
835
        if self.checker is not None:
 
836
            old_checker_pid = self.checker.pid
 
837
        else:
 
838
            old_checker_pid = None
1359
839
        r = Client.start_checker(self, *args, **kwargs)
1360
840
        # Only if new checker process was started
1361
841
        if (self.checker is not None
1362
842
            and old_checker_pid != self.checker.pid):
1363
843
            # Emit D-Bus signal
1364
844
            self.CheckerStarted(self.current_checker_command)
 
845
            self.PropertyChanged(
 
846
                dbus.String("CheckerRunning"),
 
847
                dbus.Boolean(True, variant_level=1))
1365
848
        return r
1366
849
    
 
850
    def stop_checker(self, *args, **kwargs):
 
851
        old_checker = getattr(self, "checker", None)
 
852
        r = Client.stop_checker(self, *args, **kwargs)
 
853
        if (old_checker is not None
 
854
            and getattr(self, "checker", None) is None):
 
855
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
856
                                 dbus.Boolean(False, variant_level=1))
 
857
        return r
 
858
 
1367
859
    def _reset_approved(self):
1368
 
        self.approved = None
 
860
        self._approved = None
1369
861
        return False
1370
862
    
1371
863
    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
864
        self.send_changedstate()
 
865
        self._approved = value
 
866
        gobject.timeout_add(self._timedelta_to_milliseconds
 
867
                            (self.approval_duration),
 
868
                            self._reset_approved)
 
869
    
1376
870
    
1377
871
    ## D-Bus methods, signals & properties
1378
 
    
1379
 
    ## Interfaces
 
872
    _interface = "se.bsnet.fukt.Mandos.Client"
1380
873
    
1381
874
    ## Signals
1382
875
    
1393
886
        pass
1394
887
    
1395
888
    # PropertyChanged - signal
1396
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
889
    @dbus.service.signal(_interface, signature="sv")
1398
890
    def PropertyChanged(self, property, value):
1399
891
        "D-Bus signal"
1430
922
    # CheckedOK - method
1431
923
    @dbus.service.method(_interface)
1432
924
    def CheckedOK(self):
1433
 
        self.checked_ok()
 
925
        return self.checked_ok()
1434
926
    
1435
927
    # Enable - method
1436
928
    @dbus.service.method(_interface)
1469
961
        if value is None:       # get
1470
962
            return dbus.Boolean(self.approved_by_default)
1471
963
        self.approved_by_default = bool(value)
 
964
        # Emit D-Bus signal
 
965
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
966
                             dbus.Boolean(value, variant_level=1))
1472
967
    
1473
968
    # ApprovalDelay - property
1474
969
    @dbus_service_property(_interface, signature="t",
1475
970
                           access="readwrite")
1476
971
    def ApprovalDelay_dbus_property(self, value=None):
1477
972
        if value is None:       # get
1478
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1479
 
                               * 1000)
 
973
            return dbus.UInt64(self.approval_delay_milliseconds())
1480
974
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
975
        # Emit D-Bus signal
 
976
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
977
                             dbus.UInt64(value, variant_level=1))
1481
978
    
1482
979
    # ApprovalDuration - property
1483
980
    @dbus_service_property(_interface, signature="t",
1484
981
                           access="readwrite")
1485
982
    def ApprovalDuration_dbus_property(self, value=None):
1486
983
        if value is None:       # get
1487
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1488
 
                               * 1000)
 
984
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
985
                    self.approval_duration))
1489
986
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
987
        # Emit D-Bus signal
 
988
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
989
                             dbus.UInt64(value, variant_level=1))
1490
990
    
1491
991
    # Name - property
1492
992
    @dbus_service_property(_interface, signature="s", access="read")
1504
1004
    def Host_dbus_property(self, value=None):
1505
1005
        if value is None:       # get
1506
1006
            return dbus.String(self.host)
1507
 
        self.host = str(value)
 
1007
        self.host = value
 
1008
        # Emit D-Bus signal
 
1009
        self.PropertyChanged(dbus.String("Host"),
 
1010
                             dbus.String(value, variant_level=1))
1508
1011
    
1509
1012
    # Created - property
1510
1013
    @dbus_service_property(_interface, signature="s", access="read")
1511
1014
    def Created_dbus_property(self):
1512
 
        return datetime_to_dbus(self.created)
 
1015
        return dbus.String(self._datetime_to_dbus(self.created))
1513
1016
    
1514
1017
    # LastEnabled - property
1515
1018
    @dbus_service_property(_interface, signature="s", access="read")
1516
1019
    def LastEnabled_dbus_property(self):
1517
 
        return datetime_to_dbus(self.last_enabled)
 
1020
        if self.last_enabled is None:
 
1021
            return dbus.String("")
 
1022
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1518
1023
    
1519
1024
    # Enabled - property
1520
1025
    @dbus_service_property(_interface, signature="b",
1534
1039
        if value is not None:
1535
1040
            self.checked_ok()
1536
1041
            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)
1544
 
    
1545
 
    # Expires - property
1546
 
    @dbus_service_property(_interface, signature="s", access="read")
1547
 
    def Expires_dbus_property(self):
1548
 
        return datetime_to_dbus(self.expires)
 
1042
        if self.last_checked_ok is None:
 
1043
            return dbus.String("")
 
1044
        return dbus.String(self._datetime_to_dbus(self
 
1045
                                                  .last_checked_ok))
1549
1046
    
1550
1047
    # LastApprovalRequest - property
1551
1048
    @dbus_service_property(_interface, signature="s", access="read")
1552
1049
    def LastApprovalRequest_dbus_property(self):
1553
 
        return datetime_to_dbus(self.last_approval_request)
 
1050
        if self.last_approval_request is None:
 
1051
            return dbus.String("")
 
1052
        return dbus.String(self.
 
1053
                           _datetime_to_dbus(self
 
1054
                                             .last_approval_request))
1554
1055
    
1555
1056
    # Timeout - property
1556
1057
    @dbus_service_property(_interface, signature="t",
1557
1058
                           access="readwrite")
1558
1059
    def Timeout_dbus_property(self, value=None):
1559
1060
        if value is None:       # get
1560
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1561
 
        old_timeout = self.timeout
 
1061
            return dbus.UInt64(self.timeout_milliseconds())
1562
1062
        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
 
    
1580
 
    # ExtendedTimeout - property
1581
 
    @dbus_service_property(_interface, signature="t",
1582
 
                           access="readwrite")
1583
 
    def ExtendedTimeout_dbus_property(self, value=None):
1584
 
        if value is None:       # get
1585
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1586
 
                               * 1000)
1587
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1063
        # Emit D-Bus signal
 
1064
        self.PropertyChanged(dbus.String("Timeout"),
 
1065
                             dbus.UInt64(value, variant_level=1))
 
1066
        if getattr(self, "disable_initiator_tag", None) is None:
 
1067
            return
 
1068
        # Reschedule timeout
 
1069
        gobject.source_remove(self.disable_initiator_tag)
 
1070
        self.disable_initiator_tag = None
 
1071
        time_to_die = (self.
 
1072
                       _timedelta_to_milliseconds((self
 
1073
                                                   .last_checked_ok
 
1074
                                                   + self.timeout)
 
1075
                                                  - datetime.datetime
 
1076
                                                  .utcnow()))
 
1077
        if time_to_die <= 0:
 
1078
            # The timeout has passed
 
1079
            self.disable()
 
1080
        else:
 
1081
            self.disable_initiator_tag = (gobject.timeout_add
 
1082
                                          (time_to_die, self.disable))
1588
1083
    
1589
1084
    # Interval - property
1590
1085
    @dbus_service_property(_interface, signature="t",
1591
1086
                           access="readwrite")
1592
1087
    def Interval_dbus_property(self, value=None):
1593
1088
        if value is None:       # get
1594
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1089
            return dbus.UInt64(self.interval_milliseconds())
1595
1090
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1091
        # Emit D-Bus signal
 
1092
        self.PropertyChanged(dbus.String("Interval"),
 
1093
                             dbus.UInt64(value, variant_level=1))
1596
1094
        if getattr(self, "checker_initiator_tag", None) is None:
1597
1095
            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
 
    
 
1096
        # Reschedule checker run
 
1097
        gobject.source_remove(self.checker_initiator_tag)
 
1098
        self.checker_initiator_tag = (gobject.timeout_add
 
1099
                                      (value, self.start_checker))
 
1100
        self.start_checker()    # Start one now, too
 
1101
 
1605
1102
    # Checker - property
1606
1103
    @dbus_service_property(_interface, signature="s",
1607
1104
                           access="readwrite")
1608
1105
    def Checker_dbus_property(self, value=None):
1609
1106
        if value is None:       # get
1610
1107
            return dbus.String(self.checker_command)
1611
 
        self.checker_command = str(value)
 
1108
        self.checker_command = value
 
1109
        # Emit D-Bus signal
 
1110
        self.PropertyChanged(dbus.String("Checker"),
 
1111
                             dbus.String(self.checker_command,
 
1112
                                         variant_level=1))
1612
1113
    
1613
1114
    # CheckerRunning - property
1614
1115
    @dbus_service_property(_interface, signature="b",
1630
1131
    @dbus_service_property(_interface, signature="ay",
1631
1132
                           access="write", byte_arrays=True)
1632
1133
    def Secret_dbus_property(self, value):
1633
 
        self.secret = bytes(value)
 
1134
        self.secret = str(value)
1634
1135
    
1635
1136
    del _interface
1636
1137
 
1641
1142
        self._pipe.send(('init', fpr, address))
1642
1143
        if not self._pipe.recv():
1643
1144
            raise KeyError()
1644
 
    
 
1145
 
1645
1146
    def __getattribute__(self, name):
1646
 
        if name == '_pipe':
 
1147
        if(name == '_pipe'):
1647
1148
            return super(ProxyClient, self).__getattribute__(name)
1648
1149
        self._pipe.send(('getattr', name))
1649
1150
        data = self._pipe.recv()
1654
1155
                self._pipe.send(('funcall', name, args, kwargs))
1655
1156
                return self._pipe.recv()[1]
1656
1157
            return func
1657
 
    
 
1158
 
1658
1159
    def __setattr__(self, name, value):
1659
 
        if name == '_pipe':
 
1160
        if(name == '_pipe'):
1660
1161
            return super(ProxyClient, self).__setattr__(name, value)
1661
1162
        self._pipe.send(('setattr', name, value))
1662
1163
 
1670
1171
    def handle(self):
1671
1172
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
1173
            logger.info("TCP connection from: %s",
1673
 
                        str(self.client_address))
 
1174
                        unicode(self.client_address))
1674
1175
            logger.debug("Pipe FD: %d",
1675
1176
                         self.server.child_pipe.fileno())
1676
 
            
 
1177
 
1677
1178
            session = (gnutls.connection
1678
1179
                       .ClientSession(self.request,
1679
1180
                                      gnutls.connection
1680
1181
                                      .X509Credentials()))
1681
 
            
 
1182
 
1682
1183
            # Note: gnutls.connection.X509Credentials is really a
1683
1184
            # generic GnuTLS certificate credentials object so long as
1684
1185
            # no X.509 keys are added to it.  Therefore, we can use it
1685
1186
            # here despite using OpenPGP certificates.
1686
 
            
 
1187
 
1687
1188
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1688
1189
            #                      "+AES-256-CBC", "+SHA1",
1689
1190
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1695
1196
            (gnutls.library.functions
1696
1197
             .gnutls_priority_set_direct(session._c_object,
1697
1198
                                         priority, None))
1698
 
            
 
1199
 
1699
1200
            # Start communication using the Mandos protocol
1700
1201
            # Get protocol number
1701
1202
            line = self.request.makefile().readline()
1702
1203
            logger.debug("Protocol version: %r", line)
1703
1204
            try:
1704
1205
                if int(line.strip().split()[0]) > 1:
1705
 
                    raise RuntimeError(line)
1706
 
            except (ValueError, IndexError, RuntimeError) as error:
 
1206
                    raise RuntimeError
 
1207
            except (ValueError, IndexError, RuntimeError), error:
1707
1208
                logger.error("Unknown protocol version: %s", error)
1708
1209
                return
1709
 
            
 
1210
 
1710
1211
            # Start GnuTLS connection
1711
1212
            try:
1712
1213
                session.handshake()
1713
 
            except gnutls.errors.GNUTLSError as error:
 
1214
            except gnutls.errors.GNUTLSError, error:
1714
1215
                logger.warning("Handshake failed: %s", error)
1715
1216
                # Do not run session.bye() here: the session is not
1716
1217
                # established.  Just abandon the request.
1717
1218
                return
1718
1219
            logger.debug("Handshake succeeded")
1719
 
            
 
1220
 
1720
1221
            approval_required = False
1721
1222
            try:
1722
1223
                try:
1723
1224
                    fpr = self.fingerprint(self.peer_certificate
1724
1225
                                           (session))
1725
 
                except (TypeError,
1726
 
                        gnutls.errors.GNUTLSError) as error:
 
1226
                except (TypeError, gnutls.errors.GNUTLSError), error:
1727
1227
                    logger.warning("Bad certificate: %s", error)
1728
1228
                    return
1729
1229
                logger.debug("Fingerprint: %s", fpr)
1730
 
                
 
1230
 
1731
1231
                try:
1732
1232
                    client = ProxyClient(child_pipe, fpr,
1733
1233
                                         self.client_address)
1741
1241
                
1742
1242
                while True:
1743
1243
                    if not client.enabled:
1744
 
                        logger.info("Client %s is disabled",
 
1244
                        logger.warning("Client %s is disabled",
1745
1245
                                       client.name)
1746
1246
                        if self.server.use_dbus:
1747
1247
                            # Emit D-Bus signal
1748
 
                            client.Rejected("Disabled")
 
1248
                            client.Rejected("Disabled")                    
1749
1249
                        return
1750
1250
                    
1751
 
                    if client.approved or not client.approval_delay:
 
1251
                    if client._approved or not client.approval_delay:
1752
1252
                        #We are approved or approval is disabled
1753
1253
                        break
1754
 
                    elif client.approved is None:
 
1254
                    elif client._approved is None:
1755
1255
                        logger.info("Client %s needs approval",
1756
1256
                                    client.name)
1757
1257
                        if self.server.use_dbus:
1758
1258
                            # Emit D-Bus signal
1759
1259
                            client.NeedApproval(
1760
 
                                client.approval_delay.total_seconds()
1761
 
                                * 1000, client.approved_by_default)
 
1260
                                client.approval_delay_milliseconds(),
 
1261
                                client.approved_by_default)
1762
1262
                    else:
1763
1263
                        logger.warning("Client %s was not approved",
1764
1264
                                       client.name)
1768
1268
                        return
1769
1269
                    
1770
1270
                    #wait until timeout or approved
 
1271
                    #x = float(client._timedelta_to_milliseconds(delay))
1771
1272
                    time = datetime.datetime.now()
1772
1273
                    client.changedstate.acquire()
1773
 
                    client.changedstate.wait(delay.total_seconds())
 
1274
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1774
1275
                    client.changedstate.release()
1775
1276
                    time2 = datetime.datetime.now()
1776
1277
                    if (time2 - time) >= delay:
1791
1292
                while sent_size < len(client.secret):
1792
1293
                    try:
1793
1294
                        sent = session.send(client.secret[sent_size:])
1794
 
                    except gnutls.errors.GNUTLSError as error:
1795
 
                        logger.warning("gnutls send failed",
1796
 
                                       exc_info=error)
 
1295
                    except (gnutls.errors.GNUTLSError), error:
 
1296
                        logger.warning("gnutls send failed")
1797
1297
                        return
1798
1298
                    logger.debug("Sent: %d, remaining: %d",
1799
1299
                                 sent, len(client.secret)
1800
1300
                                 - (sent_size + sent))
1801
1301
                    sent_size += sent
1802
 
                
 
1302
 
1803
1303
                logger.info("Sending secret to %s", client.name)
1804
 
                # bump the timeout using extended_timeout
1805
 
                client.bump_timeout(client.extended_timeout)
 
1304
                # bump the timeout as if seen
 
1305
                client.checked_ok()
1806
1306
                if self.server.use_dbus:
1807
1307
                    # Emit D-Bus signal
1808
1308
                    client.GotSecret()
1812
1312
                    client.approvals_pending -= 1
1813
1313
                try:
1814
1314
                    session.bye()
1815
 
                except gnutls.errors.GNUTLSError as error:
1816
 
                    logger.warning("GnuTLS bye failed",
1817
 
                                   exc_info=error)
 
1315
                except (gnutls.errors.GNUTLSError), error:
 
1316
                    logger.warning("GnuTLS bye failed")
1818
1317
    
1819
1318
    @staticmethod
1820
1319
    def peer_certificate(session):
1876
1375
        # Convert the buffer to a Python bytestring
1877
1376
        fpr = ctypes.string_at(buf, buf_len.value)
1878
1377
        # Convert the bytestring to hexadecimal notation
1879
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1378
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1880
1379
        return hex_fpr
1881
1380
 
1882
1381
 
1885
1384
    def sub_process_main(self, request, address):
1886
1385
        try:
1887
1386
            self.finish_request(request, address)
1888
 
        except Exception:
 
1387
        except:
1889
1388
            self.handle_error(request, address)
1890
1389
        self.close_request(request)
1891
 
    
 
1390
            
1892
1391
    def process_request(self, request, address):
1893
1392
        """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
 
 
 
1393
        multiprocessing.Process(target = self.sub_process_main,
 
1394
                                args = (request, address)).start()
1899
1395
 
1900
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1901
1397
    """ adds a pipe to the MixIn """
1905
1401
        This function creates a new pipe in self.pipe
1906
1402
        """
1907
1403
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1908
 
        
1909
 
        proc = MultiprocessingMixIn.process_request(self, request,
1910
 
                                                    client_address)
 
1404
 
 
1405
        super(MultiprocessingMixInWithPipe,
 
1406
              self).process_request(request, client_address)
1911
1407
        self.child_pipe.close()
1912
 
        self.add_pipe(parent_pipe, proc)
1913
 
    
1914
 
    def add_pipe(self, parent_pipe, proc):
 
1408
        self.add_pipe(parent_pipe)
 
1409
 
 
1410
    def add_pipe(self, parent_pipe):
1915
1411
        """Dummy function; override as necessary"""
1916
 
        raise NotImplementedError()
1917
 
 
 
1412
        raise NotImplementedError
1918
1413
 
1919
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1920
1415
                     socketserver.TCPServer, object):
1926
1421
        use_ipv6:       Boolean; to use IPv6 or not
1927
1422
    """
1928
1423
    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
 
        """
 
1424
                 interface=None, use_ipv6=True):
1933
1425
        self.interface = interface
1934
1426
        if use_ipv6:
1935
1427
            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
1428
        socketserver.TCPServer.__init__(self, server_address,
1963
1429
                                        RequestHandlerClass)
1964
 
    
1965
1430
    def server_bind(self):
1966
1431
        """This overrides the normal server_bind() function
1967
1432
        to bind to an interface if one was specified, and also NOT to
1975
1440
                try:
1976
1441
                    self.socket.setsockopt(socket.SOL_SOCKET,
1977
1442
                                           SO_BINDTODEVICE,
1978
 
                                           (self.interface + "\0")
1979
 
                                           .encode("utf-8"))
1980
 
                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:
 
1443
                                           str(self.interface
 
1444
                                               + '\0'))
 
1445
                except socket.error, error:
 
1446
                    if error[0] == errno.EPERM:
 
1447
                        logger.error("No permission to"
 
1448
                                     " bind to interface %s",
 
1449
                                     self.interface)
 
1450
                    elif error[0] == errno.ENOPROTOOPT:
1985
1451
                        logger.error("SO_BINDTODEVICE not available;"
1986
1452
                                     " cannot bind to interface %s",
1987
1453
                                     self.interface)
1988
 
                    elif error.errno == errno.ENODEV:
1989
 
                        logger.error("Interface %s does not exist,"
1990
 
                                     " cannot bind", self.interface)
1991
1454
                    else:
1992
1455
                        raise
1993
1456
        # Only bind(2) the socket if we really need to.
1996
1459
                if self.address_family == socket.AF_INET6:
1997
1460
                    any_address = "::" # in6addr_any
1998
1461
                else:
1999
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1462
                    any_address = socket.INADDR_ANY
2000
1463
                self.server_address = (any_address,
2001
1464
                                       self.server_address[1])
2002
1465
            elif not self.server_address[1]:
2023
1486
    """
2024
1487
    def __init__(self, server_address, RequestHandlerClass,
2025
1488
                 interface=None, use_ipv6=True, clients=None,
2026
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1489
                 gnutls_priority=None, use_dbus=True):
2027
1490
        self.enabled = False
2028
1491
        self.clients = clients
2029
1492
        if self.clients is None:
2030
 
            self.clients = {}
 
1493
            self.clients = set()
2031
1494
        self.use_dbus = use_dbus
2032
1495
        self.gnutls_priority = gnutls_priority
2033
1496
        IPv6_TCPServer.__init__(self, server_address,
2034
1497
                                RequestHandlerClass,
2035
1498
                                interface = interface,
2036
 
                                use_ipv6 = use_ipv6,
2037
 
                                socketfd = socketfd)
 
1499
                                use_ipv6 = use_ipv6)
2038
1500
    def server_activate(self):
2039
1501
        if self.enabled:
2040
1502
            return socketserver.TCPServer.server_activate(self)
2041
 
    
2042
1503
    def enable(self):
2043
1504
        self.enabled = True
2044
 
    
2045
 
    def add_pipe(self, parent_pipe, proc):
 
1505
    def add_pipe(self, parent_pipe):
2046
1506
        # Call "handle_ipc" for both data and EOF events
2047
1507
        gobject.io_add_watch(parent_pipe.fileno(),
2048
1508
                             gobject.IO_IN | gobject.IO_HUP,
2049
1509
                             functools.partial(self.handle_ipc,
2050
 
                                               parent_pipe =
2051
 
                                               parent_pipe,
2052
 
                                               proc = proc))
2053
 
    
 
1510
                                               parent_pipe = parent_pipe))
 
1511
        
2054
1512
    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()
 
1513
                   client_object=None):
 
1514
        condition_names = {
 
1515
            gobject.IO_IN: "IN",   # There is data to read.
 
1516
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1517
                                    # blocking).
 
1518
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1519
            gobject.IO_ERR: "ERR", # Error condition.
 
1520
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1521
                                    # broken, usually for pipes and
 
1522
                                    # sockets).
 
1523
            }
 
1524
        conditions_string = ' | '.join(name
 
1525
                                       for cond, name in
 
1526
                                       condition_names.iteritems()
 
1527
                                       if cond & condition)
 
1528
        # error or the other end of multiprocessing.Pipe has closed
 
1529
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2060
1530
            return False
2061
1531
        
2062
1532
        # Read a request from the child
2067
1537
            fpr = request[1]
2068
1538
            address = request[2]
2069
1539
            
2070
 
            for c in self.clients.itervalues():
 
1540
            for c in self.clients:
2071
1541
                if c.fingerprint == fpr:
2072
1542
                    client = c
2073
1543
                    break
2074
1544
            else:
2075
 
                logger.info("Client not found for fingerprint: %s, ad"
2076
 
                            "dress: %s", fpr, address)
 
1545
                logger.warning("Client not found for fingerprint: %s, ad"
 
1546
                               "dress: %s", fpr, address)
2077
1547
                if self.use_dbus:
2078
1548
                    # Emit D-Bus signal
2079
 
                    mandos_dbus_service.ClientNotFound(fpr,
2080
 
                                                       address[0])
 
1549
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2081
1550
                parent_pipe.send(False)
2082
1551
                return False
2083
1552
            
2084
1553
            gobject.io_add_watch(parent_pipe.fileno(),
2085
1554
                                 gobject.IO_IN | gobject.IO_HUP,
2086
1555
                                 functools.partial(self.handle_ipc,
2087
 
                                                   parent_pipe =
2088
 
                                                   parent_pipe,
2089
 
                                                   proc = proc,
2090
 
                                                   client_object =
2091
 
                                                   client))
 
1556
                                                   parent_pipe = parent_pipe,
 
1557
                                                   client_object = client))
2092
1558
            parent_pipe.send(True)
2093
 
            # remove the old hook in favor of the new above hook on
2094
 
            # same fileno
 
1559
            # remove the old hook in favor of the new above hook on same fileno
2095
1560
            return False
2096
1561
        if command == 'funcall':
2097
1562
            funcname = request[1]
2098
1563
            args = request[2]
2099
1564
            kwargs = request[3]
2100
1565
            
2101
 
            parent_pipe.send(('data', getattr(client_object,
2102
 
                                              funcname)(*args,
2103
 
                                                         **kwargs)))
2104
 
        
 
1566
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1567
 
2105
1568
        if command == 'getattr':
2106
1569
            attrname = request[1]
2107
1570
            if callable(client_object.__getattribute__(attrname)):
2108
1571
                parent_pipe.send(('function',))
2109
1572
            else:
2110
 
                parent_pipe.send(('data', client_object
2111
 
                                  .__getattribute__(attrname)))
 
1573
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2112
1574
        
2113
1575
        if command == 'setattr':
2114
1576
            attrname = request[1]
2115
1577
            value = request[2]
2116
1578
            setattr(client_object, attrname, value)
2117
 
        
 
1579
 
2118
1580
        return True
2119
1581
 
2120
1582
 
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
1583
def string_to_delta(interval):
2221
1584
    """Parse a string and return a datetime.timedelta
2222
1585
    
2233
1596
    >>> string_to_delta('5m 30s')
2234
1597
    datetime.timedelta(0, 330)
2235
1598
    """
2236
 
    
2237
 
    try:
2238
 
        return rfc3339_duration_to_delta(interval)
2239
 
    except ValueError:
2240
 
        pass
2241
 
    
2242
1599
    timevalue = datetime.timedelta(0)
2243
1600
    for s in interval.split():
2244
1601
        try:
2245
 
            suffix = s[-1]
 
1602
            suffix = unicode(s[-1])
2246
1603
            value = int(s[:-1])
2247
1604
            if suffix == "d":
2248
1605
                delta = datetime.timedelta(value)
2255
1612
            elif suffix == "w":
2256
1613
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2257
1614
            else:
2258
 
                raise ValueError("Unknown suffix {!r}"
2259
 
                                 .format(suffix))
2260
 
        except IndexError as e:
 
1615
                raise ValueError("Unknown suffix %r" % suffix)
 
1616
        except (ValueError, IndexError), e:
2261
1617
            raise ValueError(*(e.args))
2262
1618
        timevalue += delta
2263
1619
    return timevalue
2264
1620
 
2265
1621
 
 
1622
def if_nametoindex(interface):
 
1623
    """Call the C function if_nametoindex(), or equivalent
 
1624
    
 
1625
    Note: This function cannot accept a unicode string."""
 
1626
    global if_nametoindex
 
1627
    try:
 
1628
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1629
                          (ctypes.util.find_library("c"))
 
1630
                          .if_nametoindex)
 
1631
    except (OSError, AttributeError):
 
1632
        logger.warning("Doing if_nametoindex the hard way")
 
1633
        def if_nametoindex(interface):
 
1634
            "Get an interface index the hard way, i.e. using fcntl()"
 
1635
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1636
            with contextlib.closing(socket.socket()) as s:
 
1637
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1638
                                    struct.pack(str("16s16x"),
 
1639
                                                interface))
 
1640
            interface_index = struct.unpack(str("I"),
 
1641
                                            ifreq[16:20])[0]
 
1642
            return interface_index
 
1643
    return if_nametoindex(interface)
 
1644
 
 
1645
 
2266
1646
def daemon(nochdir = False, noclose = False):
2267
1647
    """See daemon(3).  Standard BSD Unix function.
2268
1648
    
2276
1656
        sys.exit()
2277
1657
    if not noclose:
2278
1658
        # Close all standard open file descriptors
2279
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1659
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2280
1660
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2281
 
            raise OSError(errno.ENODEV, "{} not a character device"
2282
 
                          .format(os.devnull))
 
1661
            raise OSError(errno.ENODEV,
 
1662
                          "%s not a character device"
 
1663
                          % os.path.devnull)
2283
1664
        os.dup2(null, sys.stdin.fileno())
2284
1665
        os.dup2(null, sys.stdout.fileno())
2285
1666
        os.dup2(null, sys.stderr.fileno())
2292
1673
    ##################################################################
2293
1674
    # Parsing of options, both command line and config file
2294
1675
    
2295
 
    parser = argparse.ArgumentParser()
2296
 
    parser.add_argument("-v", "--version", action="version",
2297
 
                        version = "%(prog)s {}".format(version),
2298
 
                        help="show version number and exit")
2299
 
    parser.add_argument("-i", "--interface", metavar="IF",
2300
 
                        help="Bind to interface IF")
2301
 
    parser.add_argument("-a", "--address",
2302
 
                        help="Address to listen for requests on")
2303
 
    parser.add_argument("-p", "--port", type=int,
2304
 
                        help="Port number to receive requests on")
2305
 
    parser.add_argument("--check", action="store_true",
2306
 
                        help="Run self-test")
2307
 
    parser.add_argument("--debug", action="store_true",
2308
 
                        help="Debug mode; run in foreground and log"
2309
 
                        " to terminal", default=None)
2310
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
2311
 
                        help="Debug level for stdout output")
2312
 
    parser.add_argument("--priority", help="GnuTLS"
2313
 
                        " priority string (see GnuTLS documentation)")
2314
 
    parser.add_argument("--servicename",
2315
 
                        metavar="NAME", help="Zeroconf service name")
2316
 
    parser.add_argument("--configdir",
2317
 
                        default="/etc/mandos", metavar="DIR",
2318
 
                        help="Directory to search for configuration"
2319
 
                        " files")
2320
 
    parser.add_argument("--no-dbus", action="store_false",
2321
 
                        dest="use_dbus", help="Do not provide D-Bus"
2322
 
                        " system bus interface", default=None)
2323
 
    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
 
    
2340
 
    options = parser.parse_args()
 
1676
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1677
    parser.add_option("-i", "--interface", type="string",
 
1678
                      metavar="IF", help="Bind to interface IF")
 
1679
    parser.add_option("-a", "--address", type="string",
 
1680
                      help="Address to listen for requests on")
 
1681
    parser.add_option("-p", "--port", type="int",
 
1682
                      help="Port number to receive requests on")
 
1683
    parser.add_option("--check", action="store_true",
 
1684
                      help="Run self-test")
 
1685
    parser.add_option("--debug", action="store_true",
 
1686
                      help="Debug mode; run in foreground and log to"
 
1687
                      " terminal")
 
1688
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
 
1689
                      help="Debug level for stdout output")
 
1690
    parser.add_option("--priority", type="string", help="GnuTLS"
 
1691
                      " priority string (see GnuTLS documentation)")
 
1692
    parser.add_option("--servicename", type="string",
 
1693
                      metavar="NAME", help="Zeroconf service name")
 
1694
    parser.add_option("--configdir", type="string",
 
1695
                      default="/etc/mandos", metavar="DIR",
 
1696
                      help="Directory to search for configuration"
 
1697
                      " files")
 
1698
    parser.add_option("--no-dbus", action="store_false",
 
1699
                      dest="use_dbus", help="Do not provide D-Bus"
 
1700
                      " system bus interface")
 
1701
    parser.add_option("--no-ipv6", action="store_false",
 
1702
                      dest="use_ipv6", help="Do not use IPv6")
 
1703
    options = parser.parse_args()[0]
2341
1704
    
2342
1705
    if options.check:
2343
1706
        import doctest
2344
 
        fail_count, test_count = doctest.testmod()
2345
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1707
        doctest.testmod()
 
1708
        sys.exit()
2346
1709
    
2347
1710
    # Default values for config file for server-global settings
2348
1711
    server_defaults = { "interface": "",
2350
1713
                        "port": "",
2351
1714
                        "debug": "False",
2352
1715
                        "priority":
2353
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
1716
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2354
1717
                        "servicename": "Mandos",
2355
1718
                        "use_dbus": "True",
2356
1719
                        "use_ipv6": "True",
2357
1720
                        "debuglevel": "",
2358
 
                        "restore": "True",
2359
 
                        "socket": "",
2360
 
                        "statedir": "/var/lib/mandos",
2361
 
                        "foreground": "False",
2362
 
                        "zeroconf": "True",
2363
1721
                        }
2364
1722
    
2365
1723
    # Parse config file for server-global settings
2370
1728
    # Convert the SafeConfigParser object to a dict
2371
1729
    server_settings = server_config.defaults()
2372
1730
    # Use the appropriate methods on the non-string config options
2373
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1731
    for option in ("debug", "use_dbus", "use_ipv6"):
2374
1732
        server_settings[option] = server_config.getboolean("DEFAULT",
2375
1733
                                                           option)
2376
1734
    if server_settings["port"]:
2377
1735
        server_settings["port"] = server_config.getint("DEFAULT",
2378
1736
                                                       "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
1737
    del server_config
2389
1738
    
2390
1739
    # Override the settings from the config file with command line
2391
1740
    # options, if set.
2392
1741
    for option in ("interface", "address", "port", "debug",
2393
1742
                   "priority", "servicename", "configdir",
2394
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2395
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
1743
                   "use_dbus", "use_ipv6", "debuglevel"):
2396
1744
        value = getattr(options, option)
2397
1745
        if value is not None:
2398
1746
            server_settings[option] = value
2399
1747
    del options
2400
1748
    # Force all strings to be unicode
2401
1749
    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
 
1750
        if type(server_settings[option]) is str:
 
1751
            server_settings[option] = unicode(server_settings[option])
2412
1752
    # Now we have our good server settings in "server_settings"
2413
1753
    
2414
1754
    ##################################################################
2415
1755
    
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
1756
    # For convenience
2423
1757
    debug = server_settings["debug"]
2424
1758
    debuglevel = server_settings["debuglevel"]
2425
1759
    use_dbus = server_settings["use_dbus"]
2426
1760
    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
 
    
 
1761
 
2441
1762
    if server_settings["servicename"] != "Mandos":
2442
1763
        syslogger.setFormatter(logging.Formatter
2443
 
                               ('Mandos ({}) [%(process)d]:'
2444
 
                                ' %(levelname)s: %(message)s'
2445
 
                                .format(server_settings
2446
 
                                        ["servicename"])))
 
1764
                               ('Mandos (%s) [%%(process)d]:'
 
1765
                                ' %%(levelname)s: %%(message)s'
 
1766
                                % server_settings["servicename"]))
2447
1767
    
2448
1768
    # Parse config file with clients
2449
 
    client_config = configparser.SafeConfigParser(Client
2450
 
                                                  .client_defaults)
 
1769
    client_defaults = { "timeout": "1h",
 
1770
                        "interval": "5m",
 
1771
                        "checker": "fping -q -- %%(host)s",
 
1772
                        "host": "",
 
1773
                        "approval_delay": "0s",
 
1774
                        "approval_duration": "1s",
 
1775
                        }
 
1776
    client_config = configparser.SafeConfigParser(client_defaults)
2451
1777
    client_config.read(os.path.join(server_settings["configdir"],
2452
1778
                                    "clients.conf"))
2453
1779
    
2454
1780
    global mandos_dbus_service
2455
1781
    mandos_dbus_service = None
2456
1782
    
2457
 
    socketfd = None
2458
 
    if server_settings["socket"] != "":
2459
 
        socketfd = server_settings["socket"]
2460
1783
    tcp_server = MandosServer((server_settings["address"],
2461
1784
                               server_settings["port"]),
2462
1785
                              ClientHandler,
2465
1788
                              use_ipv6=use_ipv6,
2466
1789
                              gnutls_priority=
2467
1790
                              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
 
1791
                              use_dbus=use_dbus)
 
1792
    if not debug:
 
1793
        pidfilename = "/var/run/mandos.pid"
2475
1794
        try:
2476
1795
            pidfile = open(pidfilename, "w")
2477
 
        except IOError as e:
2478
 
            logger.error("Could not open file %r", pidfilename,
2479
 
                         exc_info=e)
 
1796
        except IOError:
 
1797
            logger.error("Could not open file %r", pidfilename)
2480
1798
    
2481
 
    for name in ("_mandos", "mandos", "nobody"):
 
1799
    try:
 
1800
        uid = pwd.getpwnam("_mandos").pw_uid
 
1801
        gid = pwd.getpwnam("_mandos").pw_gid
 
1802
    except KeyError:
2482
1803
        try:
2483
 
            uid = pwd.getpwnam(name).pw_uid
2484
 
            gid = pwd.getpwnam(name).pw_gid
2485
 
            break
 
1804
            uid = pwd.getpwnam("mandos").pw_uid
 
1805
            gid = pwd.getpwnam("mandos").pw_gid
2486
1806
        except KeyError:
2487
 
            continue
2488
 
    else:
2489
 
        uid = 65534
2490
 
        gid = 65534
 
1807
            try:
 
1808
                uid = pwd.getpwnam("nobody").pw_uid
 
1809
                gid = pwd.getpwnam("nobody").pw_gid
 
1810
            except KeyError:
 
1811
                uid = 65534
 
1812
                gid = 65534
2491
1813
    try:
2492
1814
        os.setgid(gid)
2493
1815
        os.setuid(uid)
2494
 
    except OSError as error:
2495
 
        if error.errno != errno.EPERM:
2496
 
            raise
 
1816
    except OSError, error:
 
1817
        if error[0] != errno.EPERM:
 
1818
            raise error
2497
1819
    
 
1820
    if not debug and not debuglevel:
 
1821
        syslogger.setLevel(logging.WARNING)
 
1822
        console.setLevel(logging.WARNING)
 
1823
    if debuglevel:
 
1824
        level = getattr(logging, debuglevel.upper())
 
1825
        syslogger.setLevel(level)
 
1826
        console.setLevel(level)
 
1827
 
2498
1828
    if debug:
2499
1829
        # Enable all possible GnuTLS debugging
2500
1830
        
2510
1840
         .gnutls_global_set_log_function(debug_gnutls))
2511
1841
        
2512
1842
        # Redirect stdin so all checkers get /dev/null
2513
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1843
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2514
1844
        os.dup2(null, sys.stdin.fileno())
2515
1845
        if null > 2:
2516
1846
            os.close(null)
 
1847
    else:
 
1848
        # No console logging
 
1849
        logger.removeHandler(console)
2517
1850
    
2518
1851
    # Need to fork before connecting to D-Bus
2519
 
    if not foreground:
 
1852
    if not debug:
2520
1853
        # Close all input and output, do double fork, etc.
2521
1854
        daemon()
2522
1855
    
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
1856
    global main_loop
2528
1857
    # From the Avahi example code
2529
 
    DBusGMainLoop(set_as_default=True)
 
1858
    DBusGMainLoop(set_as_default=True )
2530
1859
    main_loop = gobject.MainLoop()
2531
1860
    bus = dbus.SystemBus()
2532
1861
    # End of Avahi example code
2533
1862
    if use_dbus:
2534
1863
        try:
2535
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1864
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2536
1865
                                            bus, do_not_queue=True)
2537
 
            old_bus_name = (dbus.service.BusName
2538
 
                            ("se.bsnet.fukt.Mandos", bus,
2539
 
                             do_not_queue=True))
2540
 
        except dbus.exceptions.NameExistsException as e:
2541
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
1866
        except dbus.exceptions.NameExistsException, e:
 
1867
            logger.error(unicode(e) + ", disabling D-Bus")
2542
1868
            use_dbus = False
2543
1869
            server_settings["use_dbus"] = False
2544
1870
            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")))
 
1871
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1872
    service = AvahiService(name = server_settings["servicename"],
 
1873
                           servicetype = "_mandos._tcp",
 
1874
                           protocol = protocol, bus = bus)
 
1875
    if server_settings["interface"]:
 
1876
        service.interface = (if_nametoindex
 
1877
                             (str(server_settings["interface"])))
2555
1878
    
2556
1879
    global multiprocessing_manager
2557
1880
    multiprocessing_manager = multiprocessing.Manager()
2559
1882
    client_class = Client
2560
1883
    if use_dbus:
2561
1884
        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))
 
1885
    def client_config_items(config, section):
 
1886
        special_settings = {
 
1887
            "approved_by_default":
 
1888
                lambda: config.getboolean(section,
 
1889
                                          "approved_by_default"),
 
1890
            }
 
1891
        for name, value in config.items(section):
2644
1892
            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
 
    
 
1893
                yield (name, special_settings[name]())
 
1894
            except KeyError:
 
1895
                yield (name, value)
 
1896
    
 
1897
    tcp_server.clients.update(set(
 
1898
            client_class(name = section,
 
1899
                         config= dict(client_config_items(
 
1900
                        client_config, section)))
 
1901
            for section in client_config.sections()))
2670
1902
    if not tcp_server.clients:
2671
1903
        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
 
1904
        
 
1905
    if not debug:
 
1906
        try:
 
1907
            with pidfile:
 
1908
                pid = os.getpid()
 
1909
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1910
            del pidfile
 
1911
        except IOError:
 
1912
            logger.error("Could not write to file %r with PID %d",
 
1913
                         pidfilename, pid)
 
1914
        except NameError:
 
1915
            # "pidfile" was never created
 
1916
            pass
2683
1917
        del pidfilename
2684
 
    
 
1918
        
 
1919
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1920
 
2685
1921
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2686
1922
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2687
1923
    
2688
1924
    if use_dbus:
2689
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2690
 
                                        "se.bsnet.fukt.Mandos"})
2691
 
        class MandosDBusService(DBusObjectWithProperties):
 
1925
        class MandosDBusService(dbus.service.Object):
2692
1926
            """A D-Bus proxy object"""
2693
1927
            def __init__(self):
2694
1928
                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"}
 
1929
            _interface = "se.bsnet.fukt.Mandos"
2702
1930
            
2703
1931
            @dbus.service.signal(_interface, signature="o")
2704
1932
            def ClientAdded(self, objpath):
2719
1947
            def GetAllClients(self):
2720
1948
                "D-Bus method"
2721
1949
                return dbus.Array(c.dbus_object_path
2722
 
                                  for c in
2723
 
                                  tcp_server.clients.itervalues())
 
1950
                                  for c in tcp_server.clients)
2724
1951
            
2725
1952
            @dbus.service.method(_interface,
2726
1953
                                 out_signature="a{oa{sv}}")
2727
1954
            def GetAllClientsWithProperties(self):
2728
1955
                "D-Bus method"
2729
1956
                return dbus.Dictionary(
2730
 
                    { c.dbus_object_path: c.GetAll("")
2731
 
                      for c in tcp_server.clients.itervalues() },
 
1957
                    ((c.dbus_object_path, c.GetAll(""))
 
1958
                     for c in tcp_server.clients),
2732
1959
                    signature="oa{sv}")
2733
1960
            
2734
1961
            @dbus.service.method(_interface, in_signature="o")
2735
1962
            def RemoveClient(self, object_path):
2736
1963
                "D-Bus method"
2737
 
                for c in tcp_server.clients.itervalues():
 
1964
                for c in tcp_server.clients:
2738
1965
                    if c.dbus_object_path == object_path:
2739
 
                        del tcp_server.clients[c.name]
 
1966
                        tcp_server.clients.remove(c)
2740
1967
                        c.remove_from_connection()
2741
1968
                        # Don't signal anything except ClientRemoved
2742
1969
                        c.disable(quiet=True)
2751
1978
    
2752
1979
    def cleanup():
2753
1980
        "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
 
1981
        service.cleanup()
 
1982
        
2813
1983
        while tcp_server.clients:
2814
 
            name, client = tcp_server.clients.popitem()
 
1984
            client = tcp_server.clients.pop()
2815
1985
            if use_dbus:
2816
1986
                client.remove_from_connection()
 
1987
            client.disable_hook = None
2817
1988
            # Don't signal anything except ClientRemoved
2818
1989
            client.disable(quiet=True)
2819
1990
            if use_dbus:
2820
1991
                # Emit D-Bus signal
2821
 
                mandos_dbus_service.ClientRemoved(client
2822
 
                                                  .dbus_object_path,
 
1992
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2823
1993
                                                  client.name)
2824
 
        client_settings.clear()
2825
1994
    
2826
1995
    atexit.register(cleanup)
2827
1996
    
2828
 
    for client in tcp_server.clients.itervalues():
 
1997
    for client in tcp_server.clients:
2829
1998
        if use_dbus:
2830
1999
            # Emit D-Bus signal
2831
2000
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2832
 
        # Need to initiate checking of clients
2833
 
        if client.enabled:
2834
 
            client.init_checker()
 
2001
        client.enable()
2835
2002
    
2836
2003
    tcp_server.enable()
2837
2004
    tcp_server.server_activate()
2838
2005
    
2839
2006
    # Find out what port we got
2840
 
    if zeroconf:
2841
 
        service.port = tcp_server.socket.getsockname()[1]
 
2007
    service.port = tcp_server.socket.getsockname()[1]
2842
2008
    if use_ipv6:
2843
2009
        logger.info("Now listening on address %r, port %d,"
2844
 
                    " flowinfo %d, scope_id %d",
2845
 
                    *tcp_server.socket.getsockname())
 
2010
                    " flowinfo %d, scope_id %d"
 
2011
                    % tcp_server.socket.getsockname())
2846
2012
    else:                       # IPv4
2847
 
        logger.info("Now listening on address %r, port %d",
2848
 
                    *tcp_server.socket.getsockname())
 
2013
        logger.info("Now listening on address %r, port %d"
 
2014
                    % tcp_server.socket.getsockname())
2849
2015
    
2850
2016
    #service.interface = tcp_server.socket.getsockname()[3]
2851
2017
    
2852
2018
    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
 
2019
        # From the Avahi example code
 
2020
        try:
 
2021
            service.activate()
 
2022
        except dbus.exceptions.DBusException, error:
 
2023
            logger.critical("DBusException: %s", error)
 
2024
            cleanup()
 
2025
            sys.exit(1)
 
2026
        # End of Avahi example code
2862
2027
        
2863
2028
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2864
2029
                             lambda *args, **kwargs:
2867
2032
        
2868
2033
        logger.debug("Starting main loop")
2869
2034
        main_loop.run()
2870
 
    except AvahiError as error:
2871
 
        logger.critical("Avahi Error", exc_info=error)
 
2035
    except AvahiError, error:
 
2036
        logger.critical("AvahiError: %s", error)
2872
2037
        cleanup()
2873
2038
        sys.exit(1)
2874
2039
    except KeyboardInterrupt: