/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

* plugins.d/usplash.c (main): BUG FIX: allocate space for the final
                              NULL in cmdline_argv.

Show diffs side-by-side

added added

removed removed

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