/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-08-09 13:18:46 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: teddy@recompile.se-20140809131846-2emd272mf9c9wihe
mandos: Replace unicode() with str().

This is in preparation for the coming Python 3 conversion.

* mandos: Replace "str" with "unicode".  All callers changed.

Show diffs side-by-side

added added

removed removed

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