/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Added ClientDBus.approve_pending property.  Exposed
          approved_by_default, approved_delay, approved_duration as
          D-Bus properties.

Show diffs side-by-side

added added

removed removed

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