/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-23 12:07:07 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150523120707-t5fq0brh2kxkvw8g
mandos: Some more minor changes to prepare for Python 3.

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