/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

half working on-demand password and approved code

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