/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: 2014-07-25 23:39:49 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725233949-rcg0bbj7q3uweh6p
Use the new .total_seconds() method on datetime.timedelta objects.

* mandos (timedelta_to_milliseconds): Removed.  All callers changed to
                                      use ".total_seconds() * 1000".
  (Client.timeout_milliseconds): - '' -
  (Client.extended_timeout_milliseconds): - '' -
  (Client.interval_milliseconds): - '' -
  (Client.approval_delay_milliseconds): - '' -
* mandos-ctl (timedelta_to_milliseconds): - '' -

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