/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-31 15:56:58 UTC
  • Revision ID: teddy@recompile.se-20150531155658-l7znu7zlqr2dmuwd
mandos: Generate better messages in exceptions.

mandos (ProxyClient.__init__): Include fingerprint in KeyError().
(rfc3339_duration_to_delta): Include duration in ValueError().

Show diffs side-by-side

added added

removed removed

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