/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

  • Committer: Björn Påhlsson
  • Date: 2010-09-01 13:04:23 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100901130423-bkn4j4vukasa1d27
New graphical boot supported: Plymouth

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import (division, absolute_import, print_function,
35
 
                        unicode_literals)
36
 
 
37
 
from future_builtins import *
38
 
 
39
 
try:
40
 
    import SocketServer as socketserver
41
 
except ImportError:
42
 
    import socketserver
 
34
from __future__ import division, with_statement, absolute_import
 
35
 
 
36
import SocketServer as socketserver
43
37
import socket
44
 
import argparse
 
38
import optparse
45
39
import datetime
46
40
import errno
47
41
import gnutls.crypto
50
44
import gnutls.library.functions
51
45
import gnutls.library.constants
52
46
import gnutls.library.types
53
 
try:
54
 
    import ConfigParser as configparser
55
 
except ImportError:
56
 
    import configparser
 
47
import ConfigParser as configparser
57
48
import sys
58
49
import re
59
50
import os
68
59
import struct
69
60
import fcntl
70
61
import functools
71
 
try:
72
 
    import cPickle as pickle
73
 
except ImportError:
74
 
    import pickle
 
62
import cPickle as pickle
75
63
import multiprocessing
76
 
import types
77
 
import binascii
78
 
import tempfile
79
 
import itertools
80
 
import collections
81
 
import codecs
82
64
 
83
65
import dbus
84
66
import dbus.service
85
 
try:
86
 
    import gobject
87
 
except ImportError:
88
 
    from gi.repository import GObject as gobject
 
67
import gobject
89
68
import avahi
90
69
from dbus.mainloop.glib import DBusGMainLoop
91
70
import ctypes
101
80
    except ImportError:
102
81
        SO_BINDTODEVICE = None
103
82
 
104
 
if sys.version_info.major == 2:
105
 
    str = unicode
106
 
 
107
 
version = "1.6.9"
108
 
stored_state_file = "clients.pickle"
109
 
 
110
 
logger = logging.getLogger()
111
 
syslogger = None
112
 
 
113
 
try:
114
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
115
 
        ctypes.util.find_library("c")).if_nametoindex
116
 
except (OSError, AttributeError):
117
 
    
118
 
    def if_nametoindex(interface):
119
 
        "Get an interface index the hard way, i.e. using fcntl()"
120
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
121
 
        with contextlib.closing(socket.socket()) as s:
122
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
 
                                struct.pack(b"16s16x", interface))
124
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
125
 
        return interface_index
126
 
 
127
 
 
128
 
def initlogger(debug, level=logging.WARNING):
129
 
    """init logger and add loglevel"""
130
 
    
131
 
    global syslogger
132
 
    syslogger = (logging.handlers.SysLogHandler(
133
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
 
        address = "/dev/log"))
135
 
    syslogger.setFormatter(logging.Formatter
136
 
                           ('Mandos [%(process)d]: %(levelname)s:'
137
 
                            ' %(message)s'))
138
 
    logger.addHandler(syslogger)
139
 
    
140
 
    if debug:
141
 
        console = logging.StreamHandler()
142
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
143
 
                                               ' [%(process)d]:'
144
 
                                               ' %(levelname)s:'
145
 
                                               ' %(message)s'))
146
 
        logger.addHandler(console)
147
 
    logger.setLevel(level)
148
 
 
149
 
 
150
 
class PGPError(Exception):
151
 
    """Exception if encryption/decryption fails"""
152
 
    pass
153
 
 
154
 
 
155
 
class PGPEngine(object):
156
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
157
 
    
158
 
    def __init__(self):
159
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
 
        self.gnupgargs = ['--batch',
161
 
                          '--home', self.tempdir,
162
 
                          '--force-mdc',
163
 
                          '--quiet',
164
 
                          '--no-use-agent']
165
 
    
166
 
    def __enter__(self):
167
 
        return self
168
 
    
169
 
    def __exit__(self, exc_type, exc_value, traceback):
170
 
        self._cleanup()
171
 
        return False
172
 
    
173
 
    def __del__(self):
174
 
        self._cleanup()
175
 
    
176
 
    def _cleanup(self):
177
 
        if self.tempdir is not None:
178
 
            # Delete contents of tempdir
179
 
            for root, dirs, files in os.walk(self.tempdir,
180
 
                                             topdown = False):
181
 
                for filename in files:
182
 
                    os.remove(os.path.join(root, filename))
183
 
                for dirname in dirs:
184
 
                    os.rmdir(os.path.join(root, dirname))
185
 
            # Remove tempdir
186
 
            os.rmdir(self.tempdir)
187
 
            self.tempdir = None
188
 
    
189
 
    def password_encode(self, password):
190
 
        # Passphrase can not be empty and can not contain newlines or
191
 
        # NUL bytes.  So we prefix it and hex encode it.
192
 
        encoded = b"mandos" + binascii.hexlify(password)
193
 
        if len(encoded) > 2048:
194
 
            # GnuPG can't handle long passwords, so encode differently
195
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
 
                       .replace(b"\n", b"\\n")
197
 
                       .replace(b"\0", b"\\x00"))
198
 
        return encoded
199
 
    
200
 
    def encrypt(self, data, password):
201
 
        passphrase = self.password_encode(password)
202
 
        with tempfile.NamedTemporaryFile(
203
 
                dir=self.tempdir) as passfile:
204
 
            passfile.write(passphrase)
205
 
            passfile.flush()
206
 
            proc = subprocess.Popen(['gpg', '--symmetric',
207
 
                                     '--passphrase-file',
208
 
                                     passfile.name]
209
 
                                    + self.gnupgargs,
210
 
                                    stdin = subprocess.PIPE,
211
 
                                    stdout = subprocess.PIPE,
212
 
                                    stderr = subprocess.PIPE)
213
 
            ciphertext, err = proc.communicate(input = data)
214
 
        if proc.returncode != 0:
215
 
            raise PGPError(err)
216
 
        return ciphertext
217
 
    
218
 
    def decrypt(self, data, password):
219
 
        passphrase = self.password_encode(password)
220
 
        with tempfile.NamedTemporaryFile(
221
 
                dir = self.tempdir) as passfile:
222
 
            passfile.write(passphrase)
223
 
            passfile.flush()
224
 
            proc = subprocess.Popen(['gpg', '--decrypt',
225
 
                                     '--passphrase-file',
226
 
                                     passfile.name]
227
 
                                    + self.gnupgargs,
228
 
                                    stdin = subprocess.PIPE,
229
 
                                    stdout = subprocess.PIPE,
230
 
                                    stderr = subprocess.PIPE)
231
 
            decrypted_plaintext, err = proc.communicate(input = data)
232
 
        if proc.returncode != 0:
233
 
            raise PGPError(err)
234
 
        return decrypted_plaintext
235
 
 
 
83
 
 
84
version = "1.0.14"
 
85
 
 
86
logger = logging.Logger(u'mandos')
 
87
syslogger = (logging.handlers.SysLogHandler
 
88
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
89
              address = "/dev/log"))
 
90
syslogger.setFormatter(logging.Formatter
 
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
92
                        u' %(message)s'))
 
93
logger.addHandler(syslogger)
 
94
 
 
95
console = logging.StreamHandler()
 
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
97
                                       u' %(levelname)s:'
 
98
                                       u' %(message)s'))
 
99
logger.addHandler(console)
 
100
 
 
101
multiprocessing_manager = multiprocessing.Manager()
236
102
 
237
103
class AvahiError(Exception):
238
104
    def __init__(self, value, *args, **kwargs):
239
105
        self.value = value
240
 
        return super(AvahiError, self).__init__(value, *args,
241
 
                                                **kwargs)
242
 
 
 
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
107
    def __unicode__(self):
 
108
        return unicode(repr(self.value))
243
109
 
244
110
class AvahiServiceError(AvahiError):
245
111
    pass
246
112
 
247
 
 
248
113
class AvahiGroupError(AvahiError):
249
114
    pass
250
115
 
255
120
    Attributes:
256
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
257
122
               Used to optionally bind to the specified interface.
258
 
    name: string; Example: 'Mandos'
259
 
    type: string; Example: '_mandos._tcp'.
260
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
123
    name: string; Example: u'Mandos'
 
124
    type: string; Example: u'_mandos._tcp'.
 
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
261
126
    port: integer; what port to announce
262
127
    TXT: list of strings; TXT record for the service
263
128
    domain: string; Domain to publish on, default to .local if empty.
269
134
    server: D-Bus Server
270
135
    bus: dbus.SystemBus()
271
136
    """
272
 
    
273
 
    def __init__(self,
274
 
                 interface = avahi.IF_UNSPEC,
275
 
                 name = None,
276
 
                 servicetype = None,
277
 
                 port = None,
278
 
                 TXT = None,
279
 
                 domain = "",
280
 
                 host = "",
281
 
                 max_renames = 32768,
282
 
                 protocol = avahi.PROTO_UNSPEC,
283
 
                 bus = None):
 
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
138
                 servicetype = None, port = None, TXT = None,
 
139
                 domain = u"", host = u"", max_renames = 32768,
 
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
284
141
        self.interface = interface
285
142
        self.name = name
286
143
        self.type = servicetype
294
151
        self.group = None       # our entry group
295
152
        self.server = None
296
153
        self.bus = bus
297
 
        self.entry_group_state_changed_match = None
298
 
    
299
 
    def rename(self, remove=True):
 
154
    def rename(self):
300
155
        """Derived from the Avahi example code"""
301
156
        if self.rename_count >= self.max_renames:
302
 
            logger.critical("No suitable Zeroconf service name found"
303
 
                            " after %i retries, exiting.",
 
157
            logger.critical(u"No suitable Zeroconf service name found"
 
158
                            u" after %i retries, exiting.",
304
159
                            self.rename_count)
305
 
            raise AvahiServiceError("Too many renames")
306
 
        self.name = str(
307
 
            self.server.GetAlternativeServiceName(self.name))
 
160
            raise AvahiServiceError(u"Too many renames")
 
161
        self.name = self.server.GetAlternativeServiceName(self.name)
 
162
        logger.info(u"Changing Zeroconf service name to %r ...",
 
163
                    unicode(self.name))
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               (u'Mandos (%s) [%%(process)d]:'
 
166
                                u' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
 
168
        self.remove()
 
169
        self.add()
308
170
        self.rename_count += 1
309
 
        logger.info("Changing Zeroconf service name to %r ...",
310
 
                    self.name)
311
 
        if remove:
312
 
            self.remove()
313
 
        try:
314
 
            self.add()
315
 
        except dbus.exceptions.DBusException as error:
316
 
            if (error.get_dbus_name()
317
 
                == "org.freedesktop.Avahi.CollisionError"):
318
 
                logger.info("Local Zeroconf service name collision.")
319
 
                return self.rename(remove=False)
320
 
            else:
321
 
                logger.critical("D-Bus Exception", exc_info=error)
322
 
                self.cleanup()
323
 
                os._exit(1)
324
 
    
325
171
    def remove(self):
326
172
        """Derived from the Avahi example code"""
327
 
        if self.entry_group_state_changed_match is not None:
328
 
            self.entry_group_state_changed_match.remove()
329
 
            self.entry_group_state_changed_match = None
330
173
        if self.group is not None:
331
174
            self.group.Reset()
332
 
    
333
175
    def add(self):
334
176
        """Derived from the Avahi example code"""
335
 
        self.remove()
336
177
        if self.group is None:
337
178
            self.group = dbus.Interface(
338
179
                self.bus.get_object(avahi.DBUS_NAME,
339
180
                                    self.server.EntryGroupNew()),
340
181
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
341
 
        self.entry_group_state_changed_match = (
342
 
            self.group.connect_to_signal(
343
 
                'StateChanged', self.entry_group_state_changed))
344
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
182
            self.group.connect_to_signal('StateChanged',
 
183
                                         self
 
184
                                         .entry_group_state_changed)
 
185
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
345
186
                     self.name, self.type)
346
187
        self.group.AddService(
347
188
            self.interface,
352
193
            dbus.UInt16(self.port),
353
194
            avahi.string_array_to_txt_array(self.TXT))
354
195
        self.group.Commit()
355
 
    
356
196
    def entry_group_state_changed(self, state, error):
357
197
        """Derived from the Avahi example code"""
358
 
        logger.debug("Avahi entry group state change: %i", state)
 
198
        logger.debug(u"Avahi state change: %i", state)
359
199
        
360
200
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
361
 
            logger.debug("Zeroconf service established.")
 
201
            logger.debug(u"Zeroconf service established.")
362
202
        elif state == avahi.ENTRY_GROUP_COLLISION:
363
 
            logger.info("Zeroconf service name collision.")
 
203
            logger.warning(u"Zeroconf service name collision.")
364
204
            self.rename()
365
205
        elif state == avahi.ENTRY_GROUP_FAILURE:
366
 
            logger.critical("Avahi: Error in group state changed %s",
367
 
                            str(error))
368
 
            raise AvahiGroupError("State changed: {!s}".format(error))
369
 
    
 
206
            logger.critical(u"Avahi: Error in group state changed %s",
 
207
                            unicode(error))
 
208
            raise AvahiGroupError(u"State changed: %s"
 
209
                                  % unicode(error))
370
210
    def cleanup(self):
371
211
        """Derived from the Avahi example code"""
372
212
        if self.group is not None:
373
 
            try:
374
 
                self.group.Free()
375
 
            except (dbus.exceptions.UnknownMethodException,
376
 
                    dbus.exceptions.DBusException):
377
 
                pass
 
213
            self.group.Free()
378
214
            self.group = None
379
 
        self.remove()
380
 
    
381
 
    def server_state_changed(self, state, error=None):
 
215
    def server_state_changed(self, state):
382
216
        """Derived from the Avahi example code"""
383
 
        logger.debug("Avahi server state change: %i", state)
384
 
        bad_states = {
385
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
386
 
            avahi.SERVER_REGISTERING: None,
387
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
389
 
        }
390
 
        if state in bad_states:
391
 
            if bad_states[state] is not None:
392
 
                if error is None:
393
 
                    logger.error(bad_states[state])
394
 
                else:
395
 
                    logger.error(bad_states[state] + ": %r", error)
396
 
            self.cleanup()
 
217
        if state == avahi.SERVER_COLLISION:
 
218
            logger.error(u"Zeroconf server name collision")
 
219
            self.remove()
397
220
        elif state == avahi.SERVER_RUNNING:
398
 
            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
 
    
 
221
            self.add()
416
222
    def activate(self):
417
223
        """Derived from the Avahi example code"""
418
224
        if self.server is None:
419
225
            self.server = dbus.Interface(
420
226
                self.bus.get_object(avahi.DBUS_NAME,
421
 
                                    avahi.DBUS_PATH_SERVER,
422
 
                                    follow_name_owner_changes=True),
 
227
                                    avahi.DBUS_PATH_SERVER),
423
228
                avahi.DBUS_INTERFACE_SERVER)
424
 
        self.server.connect_to_signal("StateChanged",
425
 
                                      self.server_state_changed)
 
229
        self.server.connect_to_signal(u"StateChanged",
 
230
                                 self.server_state_changed)
426
231
        self.server_state_changed(self.server.GetState())
427
232
 
428
233
 
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
234
class Client(object):
449
235
    """A representation of a client host served by this server.
450
236
    
451
237
    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
 
238
    name:       string; from the config file, used in log messages and
 
239
                        D-Bus identifiers
 
240
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
241
                 uniquely identify the client
 
242
    secret:     bytestring; sent verbatim (over TLS) to client
 
243
    host:       string; available for use by the checker command
 
244
    created:    datetime.datetime(); (UTC) object creation
 
245
    last_enabled: datetime.datetime(); (UTC)
 
246
    enabled:    bool()
 
247
    last_checked_ok: datetime.datetime(); (UTC) or None
 
248
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
249
                                      until this client is disabled
 
250
    interval:   datetime.timedelta(); How often to start a new checker
 
251
    disable_hook:  If set, called by disable() as disable_hook(self)
455
252
    checker:    subprocess.Popen(); a running checker process used
456
253
                                    to see if the client lives.
457
254
                                    '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
 
255
    checker_initiator_tag: a gobject event source tag, or None
 
256
    disable_initiator_tag: - '' -
 
257
    checker_callback_tag:  - '' -
 
258
    checker_command: string; External command which is run to check if
 
259
                     client lives.  %() expansions are done at
461
260
                     runtime with vars(self) as dict, so that for
462
261
                     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
262
    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()
 
263
    approved_delay: datetime.timedelta(); Time to wait for approval
 
264
    _approved:   bool(); 'None' if not yet approved/disapproved
 
265
    approved_duration: datetime.timedelta(); Duration of one approval
492
266
    """
493
267
    
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
268
    @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):
 
269
    def _timedelta_to_milliseconds(td):
 
270
        "Convert a datetime.timedelta() to milliseconds"
 
271
        return ((td.days * 24 * 60 * 60 * 1000)
 
272
                + (td.seconds * 1000)
 
273
                + (td.microseconds // 1000))
 
274
    
 
275
    def timeout_milliseconds(self):
 
276
        "Return the 'timeout' attribute in milliseconds"
 
277
        return self._timedelta_to_milliseconds(self.timeout)
 
278
    
 
279
    def interval_milliseconds(self):
 
280
        "Return the 'interval' attribute in milliseconds"
 
281
        return self._timedelta_to_milliseconds(self.interval)
 
282
 
 
283
    def approved_delay_milliseconds(self):
 
284
        return self._timedelta_to_milliseconds(self.approved_delay)
 
285
    
 
286
    def __init__(self, name = None, disable_hook=None, config=None):
 
287
        """Note: the 'checker' key in 'config' sets the
 
288
        'checker_command' attribute and *not* the 'checker'
 
289
        attribute."""
562
290
        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)
 
291
        if config is None:
 
292
            config = {}
 
293
        logger.debug(u"Creating client %r", self.name)
 
294
        # Uppercase and remove spaces from fingerprint for later
 
295
        # comparison purposes with return value from the fingerprint()
 
296
        # function
 
297
        self.fingerprint = (config[u"fingerprint"].upper()
 
298
                            .replace(u" ", u""))
 
299
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
300
        if u"secret" in config:
 
301
            self.secret = config[u"secret"].decode(u"base64")
 
302
        elif u"secfile" in config:
 
303
            with open(os.path.expanduser(os.path.expandvars
 
304
                                         (config[u"secfile"])),
 
305
                      "rb") as secfile:
 
306
                self.secret = secfile.read()
576
307
        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
 
308
            #XXX Need to allow secret on demand!
 
309
            raise TypeError(u"No secret or secfile for client %s"
 
310
                            % self.name)
 
311
        self.host = config.get(u"host", u"")
 
312
        self.created = datetime.datetime.utcnow()
 
313
        self.enabled = False
 
314
        self.last_enabled = None
 
315
        self.last_checked_ok = None
 
316
        self.timeout = string_to_delta(config[u"timeout"])
 
317
        self.interval = string_to_delta(config[u"interval"])
 
318
        self.disable_hook = disable_hook
586
319
        self.checker = None
587
320
        self.checker_initiator_tag = None
588
321
        self.disable_initiator_tag = None
589
322
        self.checker_callback_tag = None
 
323
        self.checker_command = config[u"checker"]
590
324
        self.current_checker_command = None
591
 
        self.approved = None
 
325
        self.last_connect = None
592
326
        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
 
327
        self._approved = None
 
328
        self.approved_by_default = config.get(u"approved_by_default",
 
329
                                              False)
 
330
        self.approved_delay = string_to_delta(
 
331
            config[u"approved_delay"])
 
332
        self.approved_duration = string_to_delta(
 
333
            config[u"approved_duration"])
 
334
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
335
 
606
336
    def send_changedstate(self):
607
 
        with self.changedstate:
608
 
            self.changedstate.notify_all()
609
 
    
 
337
        self.changedstate.acquire()
 
338
        self.changedstate.notify_all()
 
339
        self.changedstate.release()
 
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
 
346
        self.send_changedstate()
617
347
        self.last_enabled = datetime.datetime.utcnow()
618
 
        self.init_checker()
619
 
        self.send_changedstate()
 
348
        # Schedule a new checker to be started an 'interval' from now,
 
349
        # and every interval from then on.
 
350
        self.checker_initiator_tag = (gobject.timeout_add
 
351
                                      (self.interval_milliseconds(),
 
352
                                       self.start_checker))
 
353
        # Schedule a disable() when 'timeout' has passed
 
354
        self.disable_initiator_tag = (gobject.timeout_add
 
355
                                   (self.timeout_milliseconds(),
 
356
                                    self.disable))
 
357
        self.enabled = True
 
358
        # Also start a new checker *right now*.
 
359
        self.start_checker()
620
360
    
621
361
    def disable(self, quiet=True):
622
362
        """Disable this client."""
623
363
        if not getattr(self, "enabled", False):
624
364
            return False
625
365
        if not quiet:
626
 
            logger.info("Disabling client %s", self.name)
627
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
366
            self.send_changedstate()
 
367
        if not quiet:
 
368
            logger.info(u"Disabling client %s", self.name)
 
369
        if getattr(self, u"disable_initiator_tag", False):
628
370
            gobject.source_remove(self.disable_initiator_tag)
629
371
            self.disable_initiator_tag = None
630
 
        self.expires = None
631
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
372
        if getattr(self, u"checker_initiator_tag", False):
632
373
            gobject.source_remove(self.checker_initiator_tag)
633
374
            self.checker_initiator_tag = None
634
375
        self.stop_checker()
 
376
        if self.disable_hook:
 
377
            self.disable_hook(self)
635
378
        self.enabled = False
636
 
        if not quiet:
637
 
            self.send_changedstate()
638
379
        # Do not run this again if called by a gobject.timeout_add
639
380
        return False
640
381
    
641
382
    def __del__(self):
 
383
        self.disable_hook = None
642
384
        self.disable()
643
385
    
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):
 
386
    def checker_callback(self, pid, condition, command):
662
387
        """The checker has completed, so take appropriate actions."""
663
388
        self.checker_callback_tag = None
664
389
        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",
 
390
        if os.WIFEXITED(condition):
 
391
            exitstatus = os.WEXITSTATUS(condition)
 
392
            if exitstatus == 0:
 
393
                logger.info(u"Checker for %(name)s succeeded",
674
394
                            vars(self))
675
395
                self.checked_ok()
676
396
            else:
677
 
                logger.info("Checker for %(name)s failed", vars(self))
 
397
                logger.info(u"Checker for %(name)s failed",
 
398
                            vars(self))
678
399
        else:
679
 
            self.last_checker_status = -1
680
 
            self.last_checker_signal = -returncode
681
 
            logger.warning("Checker for %(name)s crashed?",
 
400
            logger.warning(u"Checker for %(name)s crashed?",
682
401
                           vars(self))
683
 
        return False
684
402
    
685
403
    def checked_ok(self):
686
 
        """Assert that the client has been seen, alive and well."""
 
404
        """Bump up the timeout for this client.
 
405
        
 
406
        This should only be called when the client has been seen,
 
407
        alive and well.
 
408
        """
687
409
        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()
 
410
        gobject.source_remove(self.disable_initiator_tag)
 
411
        self.disable_initiator_tag = (gobject.timeout_add
 
412
                                      (self.timeout_milliseconds(),
 
413
                                       self.disable))
706
414
    
707
415
    def start_checker(self):
708
416
        """Start a new checker subprocess if one is not running.
710
418
        If a checker already exists, leave it running and do
711
419
        nothing."""
712
420
        # 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
 
421
        # did that, then if a checker (for some reason) started
 
422
        # running slowly and taking more than 'interval' time, the
 
423
        # client would inevitably timeout, since no checker would get
 
424
        # a chance to run to completion.  If we instead leave running
717
425
        # checkers alone, the checker would have to take more time
718
426
        # than 'timeout' for the client to be disabled, which is as it
719
427
        # should be.
720
428
        
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
 
429
        # If a checker exists, make sure it is not a zombie
 
430
        try:
 
431
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
432
        except (AttributeError, OSError), error:
 
433
            if (isinstance(error, OSError)
 
434
                and error.errno != errno.ECHILD):
 
435
                raise error
 
436
        else:
 
437
            if pid:
 
438
                logger.warning(u"Checker was a zombie")
 
439
                gobject.source_remove(self.checker_callback_tag)
 
440
                self.checker_callback(pid, status,
 
441
                                      self.current_checker_command)
725
442
        # Start a new checker if needed
726
443
        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
444
            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
 
445
                # In case checker_command has exactly one % operator
 
446
                command = self.checker_command % self.host
 
447
            except TypeError:
 
448
                # Escape attributes for the shell
 
449
                escaped_attrs = dict((key,
 
450
                                      re.escape(unicode(str(val),
 
451
                                                        errors=
 
452
                                                        u'replace')))
 
453
                                     for key, val in
 
454
                                     vars(self).iteritems())
 
455
                try:
 
456
                    command = self.checker_command % escaped_attrs
 
457
                except TypeError, error:
 
458
                    logger.error(u'Could not format string "%s":'
 
459
                                 u' %s', self.checker_command, error)
 
460
                    return True # Try again later
738
461
            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)
 
462
            try:
 
463
                logger.info(u"Starting checker %r for %s",
 
464
                            command, self.name)
 
465
                # We don't need to redirect stdout and stderr, since
 
466
                # in normal mode, that is already done by daemon(),
 
467
                # and in debug mode we don't want to.  (Stdin is
 
468
                # always replaced by /dev/null.)
 
469
                self.checker = subprocess.Popen(command,
 
470
                                                close_fds=True,
 
471
                                                shell=True, cwd=u"/")
 
472
                self.checker_callback_tag = (gobject.child_watch_add
 
473
                                             (self.checker.pid,
 
474
                                              self.checker_callback,
 
475
                                              data=command))
 
476
                # The checker may have completed before the gobject
 
477
                # watch was added.  Check for this.
 
478
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
479
                if pid:
 
480
                    gobject.source_remove(self.checker_callback_tag)
 
481
                    self.checker_callback(pid, status, command)
 
482
            except OSError, error:
 
483
                logger.error(u"Failed to start subprocess: %s",
 
484
                             error)
764
485
        # Re-run this periodically if run by gobject.timeout_add
765
486
        return True
766
487
    
769
490
        if self.checker_callback_tag:
770
491
            gobject.source_remove(self.checker_callback_tag)
771
492
            self.checker_callback_tag = None
772
 
        if getattr(self, "checker", None) is None:
 
493
        if getattr(self, u"checker", None) is None:
773
494
            return
774
 
        logger.debug("Stopping checker for %(name)s", vars(self))
775
 
        self.checker.terminate()
 
495
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
496
        try:
 
497
            os.kill(self.checker.pid, signal.SIGTERM)
 
498
            #time.sleep(0.5)
 
499
            #if self.checker.poll() is None:
 
500
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
501
        except OSError, error:
 
502
            if error.errno != errno.ESRCH: # No such process
 
503
                raise
776
504
        self.checker = None
777
505
 
778
 
 
779
 
def dbus_service_property(dbus_interface,
780
 
                          signature="v",
781
 
                          access="readwrite",
782
 
                          byte_arrays=False):
 
506
def dbus_service_property(dbus_interface, signature=u"v",
 
507
                          access=u"readwrite", byte_arrays=False):
783
508
    """Decorators for marking methods of a DBusObjectWithProperties to
784
509
    become properties on the D-Bus.
785
510
    
792
517
    """
793
518
    # Encoding deeply encoded byte arrays is not supported yet by the
794
519
    # "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
 
    
 
520
    if byte_arrays and signature != u"ay":
 
521
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
522
                         u" signature %r" % signature)
799
523
    def decorator(func):
800
524
        func._dbus_is_property = True
801
525
        func._dbus_interface = dbus_interface
802
526
        func._dbus_signature = signature
803
527
        func._dbus_access = access
804
528
        func._dbus_name = func.__name__
805
 
        if func._dbus_name.endswith("_dbus_property"):
 
529
        if func._dbus_name.endswith(u"_dbus_property"):
806
530
            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
 
    
 
531
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
532
        return func
851
533
    return decorator
852
534
 
853
535
 
854
536
class DBusPropertyException(dbus.exceptions.DBusException):
855
537
    """A base class for D-Bus property-related exceptions
856
538
    """
857
 
    pass
 
539
    def __unicode__(self):
 
540
        return unicode(str(self))
858
541
 
859
542
 
860
543
class DBusPropertyAccessException(DBusPropertyException):
871
554
 
872
555
class DBusObjectWithProperties(dbus.service.Object):
873
556
    """A D-Bus object with properties.
874
 
    
 
557
 
875
558
    Classes inheriting from this can use the dbus_service_property
876
559
    decorator to expose methods as D-Bus properties.  It exposes the
877
560
    standard Get(), Set(), and GetAll() methods on the D-Bus.
878
561
    """
879
562
    
880
563
    @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)
 
564
    def _is_dbus_property(obj):
 
565
        return getattr(obj, u"_dbus_is_property", False)
889
566
    
890
 
    def _get_all_dbus_things(self, thing):
 
567
    def _get_all_dbus_properties(self):
891
568
        """Returns a generator of (name, attribute) pairs
892
569
        """
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)))
 
570
        return ((prop._dbus_name, prop)
 
571
                for name, prop in
 
572
                inspect.getmembers(self, self._is_dbus_property))
898
573
    
899
574
    def _get_dbus_property(self, interface_name, property_name):
900
575
        """Returns a bound method if one exists which is a D-Bus
901
576
        property with the specified name and interface.
902
577
        """
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
 
        
 
578
        for name in (property_name,
 
579
                     property_name + u"_dbus_property"):
 
580
            prop = getattr(self, name, None)
 
581
            if (prop is None
 
582
                or not self._is_dbus_property(prop)
 
583
                or prop._dbus_name != property_name
 
584
                or (interface_name and prop._dbus_interface
 
585
                    and interface_name != prop._dbus_interface)):
 
586
                continue
 
587
            return prop
910
588
        # No such property
911
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
912
 
            self.dbus_object_path, interface_name, property_name))
 
589
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
590
                                   + interface_name + u"."
 
591
                                   + property_name)
913
592
    
914
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
915
 
                         in_signature="ss",
916
 
                         out_signature="v")
 
593
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
594
                         out_signature=u"v")
917
595
    def Get(self, interface_name, property_name):
918
596
        """Standard D-Bus property Get() method, see D-Bus standard.
919
597
        """
920
598
        prop = self._get_dbus_property(interface_name, property_name)
921
 
        if prop._dbus_access == "write":
 
599
        if prop._dbus_access == u"write":
922
600
            raise DBusPropertyAccessException(property_name)
923
601
        value = prop()
924
 
        if not hasattr(value, "variant_level"):
 
602
        if not hasattr(value, u"variant_level"):
925
603
            return value
926
604
        return type(value)(value, variant_level=value.variant_level+1)
927
605
    
928
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
606
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
929
607
    def Set(self, interface_name, property_name, value):
930
608
        """Standard D-Bus property Set() method, see D-Bus standard.
931
609
        """
932
610
        prop = self._get_dbus_property(interface_name, property_name)
933
 
        if prop._dbus_access == "read":
 
611
        if prop._dbus_access == u"read":
934
612
            raise DBusPropertyAccessException(property_name)
935
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
613
        if prop._dbus_get_args_options[u"byte_arrays"]:
936
614
            # The byte_arrays option is not supported yet on
937
615
            # 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))
 
616
            if prop._dbus_signature != u"ay":
 
617
                raise ValueError
 
618
            value = dbus.ByteArray(''.join(unichr(byte)
 
619
                                           for byte in value))
944
620
        prop(value)
945
621
    
946
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
947
 
                         in_signature="s",
948
 
                         out_signature="a{sv}")
 
622
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
623
                         out_signature=u"a{sv}")
949
624
    def GetAll(self, interface_name):
950
625
        """Standard D-Bus property GetAll() method, see D-Bus
951
626
        standard.
952
 
        
 
627
 
953
628
        Note: Will not include properties with access="write".
954
629
        """
955
 
        properties = {}
956
 
        for name, prop in self._get_all_dbus_things("property"):
 
630
        all = {}
 
631
        for name, prop in self._get_all_dbus_properties():
957
632
            if (interface_name
958
633
                and interface_name != prop._dbus_interface):
959
634
                # Interface non-empty but did not match
960
635
                continue
961
636
            # Ignore write-only properties
962
 
            if prop._dbus_access == "write":
 
637
            if prop._dbus_access == u"write":
963
638
                continue
964
639
            value = prop()
965
 
            if not hasattr(value, "variant_level"):
966
 
                properties[name] = value
 
640
            if not hasattr(value, u"variant_level"):
 
641
                all[name] = value
967
642
                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
 
643
            all[name] = type(value)(value, variant_level=
 
644
                                    value.variant_level+1)
 
645
        return dbus.Dictionary(all, signature=u"sv")
979
646
    
980
647
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
 
                         out_signature="s",
 
648
                         out_signature=u"s",
982
649
                         path_keyword='object_path',
983
650
                         connection_keyword='connection')
984
651
    def Introspect(self, object_path, connection):
985
 
        """Overloading of standard D-Bus method.
986
 
        
987
 
        Inserts property tags and interface annotation tags.
 
652
        """Standard D-Bus method, overloaded to insert property tags.
988
653
        """
989
654
        xmlstring = dbus.service.Object.Introspect(self, object_path,
990
655
                                                   connection)
991
656
        try:
992
657
            document = xml.dom.minidom.parseString(xmlstring)
993
 
            
994
658
            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)
 
659
                e = document.createElement(u"property")
 
660
                e.setAttribute(u"name", name)
 
661
                e.setAttribute(u"type", prop._dbus_signature)
 
662
                e.setAttribute(u"access", prop._dbus_access)
999
663
                return e
1000
 
            
1001
 
            for if_tag in document.getElementsByTagName("interface"):
1002
 
                # Add property tags
 
664
            for if_tag in document.getElementsByTagName(u"interface"):
1003
665
                for tag in (make_tag(document, name, prop)
1004
666
                            for name, prop
1005
 
                            in self._get_all_dbus_things("property")
 
667
                            in self._get_all_dbus_properties()
1006
668
                            if prop._dbus_interface
1007
 
                            == if_tag.getAttribute("name")):
 
669
                            == if_tag.getAttribute(u"name")):
1008
670
                    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
671
                # Add the names to the return values for the
1039
672
                # "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")
 
673
                if (if_tag.getAttribute(u"name")
 
674
                    == u"org.freedesktop.DBus.Properties"):
 
675
                    for cn in if_tag.getElementsByTagName(u"method"):
 
676
                        if cn.getAttribute(u"name") == u"Get":
 
677
                            for arg in cn.getElementsByTagName(u"arg"):
 
678
                                if (arg.getAttribute(u"direction")
 
679
                                    == u"out"):
 
680
                                    arg.setAttribute(u"name", u"value")
 
681
                        elif cn.getAttribute(u"name") == u"GetAll":
 
682
                            for arg in cn.getElementsByTagName(u"arg"):
 
683
                                if (arg.getAttribute(u"direction")
 
684
                                    == u"out"):
 
685
                                    arg.setAttribute(u"name", u"props")
 
686
            xmlstring = document.toxml(u"utf-8")
1054
687
            document.unlink()
1055
688
        except (AttributeError, xml.dom.DOMException,
1056
 
                xml.parsers.expat.ExpatError) as error:
1057
 
            logger.error("Failed to override Introspection method",
1058
 
                         exc_info=error)
 
689
                xml.parsers.expat.ExpatError), error:
 
690
            logger.error(u"Failed to override Introspection method",
 
691
                         error)
1059
692
        return xmlstring
1060
693
 
1061
694
 
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
695
class ClientDBus(Client, DBusObjectWithProperties):
1253
696
    """A Client class using D-Bus
1254
697
    
1256
699
    dbus_object_path: dbus.ObjectPath
1257
700
    bus: dbus.SystemBus()
1258
701
    """
1259
 
    
1260
 
    runtime_expansions = (Client.runtime_expansions
1261
 
                          + ("dbus_object_path", ))
1262
 
    
1263
 
    _interface = "se.recompile.Mandos.Client"
1264
 
    
1265
702
    # dbus.service.Object doesn't use super(), so we can't either.
1266
703
    
1267
704
    def __init__(self, bus = None, *args, **kwargs):
1269
706
        Client.__init__(self, *args, **kwargs)
1270
707
        # Only now, when this client is initialized, can it show up on
1271
708
        # 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)
 
709
        self.dbus_object_path = (dbus.ObjectPath
 
710
                                 (u"/clients/"
 
711
                                  + self.name.replace(u".", u"_")))
1277
712
        DBusObjectWithProperties.__init__(self, self.bus,
1278
713
                                          self.dbus_object_path)
1279
714
    
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
 
715
    @staticmethod
 
716
    def _datetime_to_dbus(dt, variant_level=0):
 
717
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
718
        return dbus.String(dt.isoformat(),
 
719
                           variant_level=variant_level)
 
720
    
 
721
    def enable(self):
 
722
        oldstate = getattr(self, u"enabled", False)
 
723
        r = Client.enable(self)
 
724
        if oldstate != self.enabled:
 
725
            # Emit D-Bus signals
 
726
            self.PropertyChanged(dbus.String(u"enabled"),
 
727
                                 dbus.Boolean(True, variant_level=1))
 
728
            self.PropertyChanged(
 
729
                dbus.String(u"last_enabled"),
 
730
                self._datetime_to_dbus(self.last_enabled,
 
731
                                       variant_level=1))
 
732
        return r
 
733
    
 
734
    def disable(self, quiet = False):
 
735
        oldstate = getattr(self, u"enabled", False)
 
736
        r = Client.disable(self, quiet=quiet)
 
737
        if not quiet and oldstate != self.enabled:
 
738
            # Emit D-Bus signal
 
739
            self.PropertyChanged(dbus.String(u"enabled"),
 
740
                                 dbus.Boolean(False, variant_level=1))
 
741
        return r
1360
742
    
1361
743
    def __del__(self, *args, **kwargs):
1362
744
        try:
1363
745
            self.remove_from_connection()
1364
746
        except LookupError:
1365
747
            pass
1366
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
748
        if hasattr(DBusObjectWithProperties, u"__del__"):
1367
749
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
750
        Client.__del__(self, *args, **kwargs)
1369
751
    
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:
 
752
    def checker_callback(self, pid, condition, command,
 
753
                         *args, **kwargs):
 
754
        self.checker_callback_tag = None
 
755
        self.checker = None
 
756
        # Emit D-Bus signal
 
757
        self.PropertyChanged(dbus.String(u"checker_running"),
 
758
                             dbus.Boolean(False, variant_level=1))
 
759
        if os.WIFEXITED(condition):
 
760
            exitstatus = os.WEXITSTATUS(condition)
1377
761
            # Emit D-Bus signal
1378
762
            self.CheckerCompleted(dbus.Int16(exitstatus),
1379
 
                                  dbus.Int64(0),
 
763
                                  dbus.Int64(condition),
1380
764
                                  dbus.String(command))
1381
765
        else:
1382
766
            # Emit D-Bus signal
1383
767
            self.CheckerCompleted(dbus.Int16(-1),
1384
 
                                  dbus.Int64(
1385
 
                                      self.last_checker_signal),
 
768
                                  dbus.Int64(condition),
1386
769
                                  dbus.String(command))
1387
 
        return ret
 
770
        
 
771
        return Client.checker_callback(self, pid, condition, command,
 
772
                                       *args, **kwargs)
 
773
    
 
774
    def checked_ok(self, *args, **kwargs):
 
775
        r = Client.checked_ok(self, *args, **kwargs)
 
776
        # Emit D-Bus signal
 
777
        self.PropertyChanged(
 
778
            dbus.String(u"last_checked_ok"),
 
779
            (self._datetime_to_dbus(self.last_checked_ok,
 
780
                                    variant_level=1)))
 
781
        return r
1388
782
    
1389
783
    def start_checker(self, *args, **kwargs):
1390
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
784
        old_checker = self.checker
 
785
        if self.checker is not None:
 
786
            old_checker_pid = self.checker.pid
 
787
        else:
 
788
            old_checker_pid = None
1391
789
        r = Client.start_checker(self, *args, **kwargs)
1392
790
        # Only if new checker process was started
1393
791
        if (self.checker is not None
1394
792
            and old_checker_pid != self.checker.pid):
1395
793
            # Emit D-Bus signal
1396
794
            self.CheckerStarted(self.current_checker_command)
 
795
            self.PropertyChanged(
 
796
                dbus.String(u"checker_running"),
 
797
                dbus.Boolean(True, variant_level=1))
1397
798
        return r
1398
799
    
 
800
    def stop_checker(self, *args, **kwargs):
 
801
        old_checker = getattr(self, u"checker", None)
 
802
        r = Client.stop_checker(self, *args, **kwargs)
 
803
        if (old_checker is not None
 
804
            and getattr(self, u"checker", None) is None):
 
805
            self.PropertyChanged(dbus.String(u"checker_running"),
 
806
                                 dbus.Boolean(False, variant_level=1))
 
807
        return r
 
808
 
1399
809
    def _reset_approved(self):
1400
 
        self.approved = None
 
810
        self._approved = None
1401
811
        return False
1402
812
    
1403
813
    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()
 
814
        self._approved = value
 
815
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
 
816
 
 
817
    def approved_pending(self):
 
818
        return self.approvals_pending > 0
 
819
 
1408
820
    
1409
821
    ## D-Bus methods, signals & properties
1410
 
    
1411
 
    ## Interfaces
 
822
    _interface = u"se.bsnet.fukt.Mandos.Client"
1412
823
    
1413
824
    ## Signals
1414
825
    
1415
826
    # CheckerCompleted - signal
1416
 
    @dbus.service.signal(_interface, signature="nxs")
 
827
    @dbus.service.signal(_interface, signature=u"nxs")
1417
828
    def CheckerCompleted(self, exitcode, waitstatus, command):
1418
829
        "D-Bus signal"
1419
830
        pass
1420
831
    
1421
832
    # CheckerStarted - signal
1422
 
    @dbus.service.signal(_interface, signature="s")
 
833
    @dbus.service.signal(_interface, signature=u"s")
1423
834
    def CheckerStarted(self, command):
1424
835
        "D-Bus signal"
1425
836
        pass
1426
837
    
1427
838
    # PropertyChanged - signal
1428
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
 
    @dbus.service.signal(_interface, signature="sv")
 
839
    @dbus.service.signal(_interface, signature=u"sv")
1430
840
    def PropertyChanged(self, property, value):
1431
841
        "D-Bus signal"
1432
842
        pass
1434
844
    # GotSecret - signal
1435
845
    @dbus.service.signal(_interface)
1436
846
    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
 
        """
 
847
        "D-Bus signal"
1441
848
        pass
1442
849
    
1443
850
    # Rejected - signal
1444
 
    @dbus.service.signal(_interface, signature="s")
 
851
    @dbus.service.signal(_interface, signature=u"s")
1445
852
    def Rejected(self, reason):
1446
853
        "D-Bus signal"
1447
854
        pass
1448
855
    
1449
856
    # NeedApproval - signal
1450
 
    @dbus.service.signal(_interface, signature="tb")
 
857
    @dbus.service.signal(_interface, signature=u"db")
1451
858
    def NeedApproval(self, timeout, default):
1452
859
        "D-Bus signal"
1453
 
        return self.need_approval()
 
860
        pass
1454
861
    
1455
862
    ## Methods
1456
 
    
 
863
 
1457
864
    # Approve - method
1458
 
    @dbus.service.method(_interface, in_signature="b")
 
865
    @dbus.service.method(_interface, in_signature=u"b")
1459
866
    def Approve(self, value):
1460
867
        self.approve(value)
1461
 
    
 
868
 
1462
869
    # CheckedOK - method
1463
870
    @dbus.service.method(_interface)
1464
871
    def CheckedOK(self):
1465
 
        self.checked_ok()
 
872
        return self.checked_ok()
1466
873
    
1467
874
    # Enable - method
1468
875
    @dbus.service.method(_interface)
1489
896
    
1490
897
    ## Properties
1491
898
    
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):
 
899
    # approved_pending - property
 
900
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
901
    def approved_pending_dbus_property(self):
 
902
        return dbus.Boolean(self.approved_pending())
 
903
    
 
904
    # approved_by_default - property
 
905
    @dbus_service_property(_interface, signature=u"b",
 
906
                           access=u"readwrite")
 
907
    def approved_by_default_dbus_property(self):
 
908
        return dbus.Boolean(self.approved_by_default)
 
909
    
 
910
    # approved_delay - property
 
911
    @dbus_service_property(_interface, signature=u"t",
 
912
                           access=u"readwrite")
 
913
    def approved_delay_dbus_property(self):
 
914
        return dbus.UInt64(self.approved_delay_milliseconds())
 
915
    
 
916
    # approved_duration - property
 
917
    @dbus_service_property(_interface, signature=u"t",
 
918
                           access=u"readwrite")
 
919
    def approved_duration_dbus_property(self):
 
920
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
921
                self.approved_duration))
 
922
    
 
923
    # name - property
 
924
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
925
    def name_dbus_property(self):
1529
926
        return dbus.String(self.name)
1530
927
    
1531
 
    # Fingerprint - property
1532
 
    @dbus_service_property(_interface, signature="s", access="read")
1533
 
    def Fingerprint_dbus_property(self):
 
928
    # fingerprint - property
 
929
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
930
    def fingerprint_dbus_property(self):
1534
931
        return dbus.String(self.fingerprint)
1535
932
    
1536
 
    # Host - property
1537
 
    @dbus_service_property(_interface,
1538
 
                           signature="s",
1539
 
                           access="readwrite")
1540
 
    def Host_dbus_property(self, value=None):
 
933
    # host - property
 
934
    @dbus_service_property(_interface, signature=u"s",
 
935
                           access=u"readwrite")
 
936
    def host_dbus_property(self, value=None):
1541
937
        if value is None:       # get
1542
938
            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):
 
939
        self.host = value
 
940
        # Emit D-Bus signal
 
941
        self.PropertyChanged(dbus.String(u"host"),
 
942
                             dbus.String(value, variant_level=1))
 
943
    
 
944
    # created - property
 
945
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
946
    def created_dbus_property(self):
 
947
        return dbus.String(self._datetime_to_dbus(self.created))
 
948
    
 
949
    # last_enabled - property
 
950
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
951
    def last_enabled_dbus_property(self):
 
952
        if self.last_enabled is None:
 
953
            return dbus.String(u"")
 
954
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
955
    
 
956
    # enabled - property
 
957
    @dbus_service_property(_interface, signature=u"b",
 
958
                           access=u"readwrite")
 
959
    def enabled_dbus_property(self, value=None):
1560
960
        if value is None:       # get
1561
961
            return dbus.Boolean(self.enabled)
1562
962
        if value:
1564
964
        else:
1565
965
            self.disable()
1566
966
    
1567
 
    # LastCheckedOK - property
1568
 
    @dbus_service_property(_interface,
1569
 
                           signature="s",
1570
 
                           access="readwrite")
1571
 
    def LastCheckedOK_dbus_property(self, value=None):
 
967
    # last_checked_ok - property
 
968
    @dbus_service_property(_interface, signature=u"s",
 
969
                           access=u"readwrite")
 
970
    def last_checked_ok_dbus_property(self, value=None):
1572
971
        if value is not None:
1573
972
            self.checked_ok()
1574
973
            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):
 
974
        if self.last_checked_ok is None:
 
975
            return dbus.String(u"")
 
976
        return dbus.String(self._datetime_to_dbus(self
 
977
                                                  .last_checked_ok))
 
978
    
 
979
    # timeout - property
 
980
    @dbus_service_property(_interface, signature=u"t",
 
981
                           access=u"readwrite")
 
982
    def timeout_dbus_property(self, value=None):
1597
983
        if value is None:       # get
1598
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1599
 
        old_timeout = self.timeout
 
984
            return dbus.UInt64(self.timeout_milliseconds())
1600
985
        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)
 
986
        # Emit D-Bus signal
 
987
        self.PropertyChanged(dbus.String(u"timeout"),
 
988
                             dbus.UInt64(value, variant_level=1))
 
989
        if getattr(self, u"disable_initiator_tag", None) is None:
 
990
            return
 
991
        # Reschedule timeout
 
992
        gobject.source_remove(self.disable_initiator_tag)
 
993
        self.disable_initiator_tag = None
 
994
        time_to_die = (self.
 
995
                       _timedelta_to_milliseconds((self
 
996
                                                   .last_checked_ok
 
997
                                                   + self.timeout)
 
998
                                                  - datetime.datetime
 
999
                                                  .utcnow()))
 
1000
        if time_to_die <= 0:
 
1001
            # The timeout has passed
 
1002
            self.disable()
 
1003
        else:
 
1004
            self.disable_initiator_tag = (gobject.timeout_add
 
1005
                                          (time_to_die, self.disable))
 
1006
    
 
1007
    # interval - property
 
1008
    @dbus_service_property(_interface, signature=u"t",
 
1009
                           access=u"readwrite")
 
1010
    def interval_dbus_property(self, value=None):
 
1011
        if value is None:       # get
 
1012
            return dbus.UInt64(self.interval_milliseconds())
1634
1013
        self.interval = datetime.timedelta(0, 0, 0, value)
1635
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1014
        # Emit D-Bus signal
 
1015
        self.PropertyChanged(dbus.String(u"interval"),
 
1016
                             dbus.UInt64(value, variant_level=1))
 
1017
        if getattr(self, u"checker_initiator_tag", None) is None:
1636
1018
            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):
 
1019
        # Reschedule checker run
 
1020
        gobject.source_remove(self.checker_initiator_tag)
 
1021
        self.checker_initiator_tag = (gobject.timeout_add
 
1022
                                      (value, self.start_checker))
 
1023
        self.start_checker()    # Start one now, too
 
1024
 
 
1025
    # checker - property
 
1026
    @dbus_service_property(_interface, signature=u"s",
 
1027
                           access=u"readwrite")
 
1028
    def checker_dbus_property(self, value=None):
1649
1029
        if value is None:       # get
1650
1030
            return dbus.String(self.checker_command)
1651
 
        self.checker_command = str(value)
 
1031
        self.checker_command = value
 
1032
        # Emit D-Bus signal
 
1033
        self.PropertyChanged(dbus.String(u"checker"),
 
1034
                             dbus.String(self.checker_command,
 
1035
                                         variant_level=1))
1652
1036
    
1653
 
    # CheckerRunning - property
1654
 
    @dbus_service_property(_interface,
1655
 
                           signature="b",
1656
 
                           access="readwrite")
1657
 
    def CheckerRunning_dbus_property(self, value=None):
 
1037
    # checker_running - property
 
1038
    @dbus_service_property(_interface, signature=u"b",
 
1039
                           access=u"readwrite")
 
1040
    def checker_running_dbus_property(self, value=None):
1658
1041
        if value is None:       # get
1659
1042
            return dbus.Boolean(self.checker is not None)
1660
1043
        if value:
1662
1045
        else:
1663
1046
            self.stop_checker()
1664
1047
    
1665
 
    # ObjectPath - property
1666
 
    @dbus_service_property(_interface, signature="o", access="read")
1667
 
    def ObjectPath_dbus_property(self):
 
1048
    # object_path - property
 
1049
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1050
    def object_path_dbus_property(self):
1668
1051
        return self.dbus_object_path # is already a dbus.ObjectPath
1669
1052
    
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)
 
1053
    # secret = property
 
1054
    @dbus_service_property(_interface, signature=u"ay",
 
1055
                           access=u"write", byte_arrays=True)
 
1056
    def secret_dbus_property(self, value):
 
1057
        self.secret = str(value)
1677
1058
    
1678
1059
    del _interface
1679
1060
 
1683
1064
        self._pipe = child_pipe
1684
1065
        self._pipe.send(('init', fpr, address))
1685
1066
        if not self._pipe.recv():
1686
 
            raise KeyError(fpr)
1687
 
    
 
1067
            raise KeyError()
 
1068
 
1688
1069
    def __getattribute__(self, name):
1689
 
        if name == '_pipe':
 
1070
        if(name == '_pipe'):
1690
1071
            return super(ProxyClient, self).__getattribute__(name)
1691
1072
        self._pipe.send(('getattr', name))
1692
1073
        data = self._pipe.recv()
1693
1074
        if data[0] == 'data':
1694
1075
            return data[1]
1695
1076
        if data[0] == 'function':
1696
 
            
1697
1077
            def func(*args, **kwargs):
1698
1078
                self._pipe.send(('funcall', name, args, kwargs))
1699
1079
                return self._pipe.recv()[1]
1700
 
            
1701
1080
            return func
1702
 
    
 
1081
 
1703
1082
    def __setattr__(self, name, value):
1704
 
        if name == '_pipe':
 
1083
        if(name == '_pipe'):
1705
1084
            return super(ProxyClient, self).__setattr__(name, value)
1706
1085
        self._pipe.send(('setattr', name, value))
1707
1086
 
1714
1093
    
1715
1094
    def handle(self):
1716
1095
        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",
 
1096
            logger.info(u"TCP connection from: %s",
 
1097
                        unicode(self.client_address))
 
1098
            logger.debug(u"Pipe FD: %d",
1720
1099
                         self.server.child_pipe.fileno())
1721
 
            
1722
 
            session = gnutls.connection.ClientSession(
1723
 
                self.request, gnutls.connection .X509Credentials())
1724
 
            
 
1100
 
 
1101
            session = (gnutls.connection
 
1102
                       .ClientSession(self.request,
 
1103
                                      gnutls.connection
 
1104
                                      .X509Credentials()))
 
1105
 
1725
1106
            # Note: gnutls.connection.X509Credentials is really a
1726
1107
            # generic GnuTLS certificate credentials object so long as
1727
1108
            # no X.509 keys are added to it.  Therefore, we can use it
1728
1109
            # here despite using OpenPGP certificates.
1729
 
            
1730
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1731
 
            #                      "+AES-256-CBC", "+SHA1",
1732
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1733
 
            #                      "+DHE-DSS"))
 
1110
 
 
1111
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1112
            #                      u"+AES-256-CBC", u"+SHA1",
 
1113
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1114
            #                      u"+DHE-DSS"))
1734
1115
            # Use a fallback default, since this MUST be set.
1735
1116
            priority = self.server.gnutls_priority
1736
1117
            if priority is None:
1737
 
                priority = "NORMAL"
1738
 
            gnutls.library.functions.gnutls_priority_set_direct(
1739
 
                session._c_object, priority, None)
1740
 
            
 
1118
                priority = u"NORMAL"
 
1119
            (gnutls.library.functions
 
1120
             .gnutls_priority_set_direct(session._c_object,
 
1121
                                         priority, None))
 
1122
 
1741
1123
            # Start communication using the Mandos protocol
1742
1124
            # Get protocol number
1743
1125
            line = self.request.makefile().readline()
1744
 
            logger.debug("Protocol version: %r", line)
 
1126
            logger.debug(u"Protocol version: %r", line)
1745
1127
            try:
1746
1128
                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)
 
1129
                    raise RuntimeError
 
1130
            except (ValueError, IndexError, RuntimeError), error:
 
1131
                logger.error(u"Unknown protocol version: %s", error)
1750
1132
                return
1751
 
            
 
1133
 
1752
1134
            # Start GnuTLS connection
1753
1135
            try:
1754
1136
                session.handshake()
1755
 
            except gnutls.errors.GNUTLSError as error:
1756
 
                logger.warning("Handshake failed: %s", error)
 
1137
            except gnutls.errors.GNUTLSError, error:
 
1138
                logger.warning(u"Handshake failed: %s", error)
1757
1139
                # Do not run session.bye() here: the session is not
1758
1140
                # established.  Just abandon the request.
1759
1141
                return
1760
 
            logger.debug("Handshake succeeded")
1761
 
            
 
1142
            logger.debug(u"Handshake succeeded")
 
1143
 
1762
1144
            approval_required = False
1763
1145
            try:
1764
1146
                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)
 
1147
                    fpr = self.fingerprint(self.peer_certificate
 
1148
                                           (session))
 
1149
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1150
                    logger.warning(u"Bad certificate: %s", error)
1770
1151
                    return
1771
 
                logger.debug("Fingerprint: %s", fpr)
1772
 
                
 
1152
                logger.debug(u"Fingerprint: %s", fpr)
 
1153
 
1773
1154
                try:
1774
1155
                    client = ProxyClient(child_pipe, fpr,
1775
1156
                                         self.client_address)
1776
1157
                except KeyError:
1777
1158
                    return
1778
1159
                
1779
 
                if client.approval_delay:
1780
 
                    delay = client.approval_delay
 
1160
                if client.approved_delay:
 
1161
                    delay = client.approved_delay
1781
1162
                    client.approvals_pending += 1
1782
1163
                    approval_required = True
1783
1164
                
1784
1165
                while True:
1785
1166
                    if not client.enabled:
1786
 
                        logger.info("Client %s is disabled",
1787
 
                                    client.name)
 
1167
                        logger.warning(u"Client %s is disabled",
 
1168
                                       client.name)
1788
1169
                        if self.server.use_dbus:
1789
1170
                            # Emit D-Bus signal
1790
 
                            client.Rejected("Disabled")
 
1171
                            client.Rejected("Disabled")                    
1791
1172
                        return
1792
1173
                    
1793
 
                    if client.approved or not client.approval_delay:
 
1174
                    if client._approved or not client.approved_delay:
1794
1175
                        #We are approved or approval is disabled
1795
1176
                        break
1796
 
                    elif client.approved is None:
1797
 
                        logger.info("Client %s needs approval",
 
1177
                    elif client._approved is None:
 
1178
                        logger.info(u"Client %s need approval",
1798
1179
                                    client.name)
1799
1180
                        if self.server.use_dbus:
1800
1181
                            # Emit D-Bus signal
1801
1182
                            client.NeedApproval(
1802
 
                                client.approval_delay.total_seconds()
1803
 
                                * 1000, client.approved_by_default)
 
1183
                                client.approved_delay_milliseconds(),
 
1184
                                client.approved_by_default)
1804
1185
                    else:
1805
 
                        logger.warning("Client %s was not approved",
 
1186
                        logger.warning(u"Client %s was not approved",
1806
1187
                                       client.name)
1807
1188
                        if self.server.use_dbus:
1808
1189
                            # Emit D-Bus signal
1809
 
                            client.Rejected("Denied")
 
1190
                            client.Rejected("Disapproved")
1810
1191
                        return
1811
1192
                    
1812
1193
                    #wait until timeout or approved
 
1194
                    #x = float(client._timedelta_to_milliseconds(delay))
1813
1195
                    time = datetime.datetime.now()
1814
1196
                    client.changedstate.acquire()
1815
 
                    client.changedstate.wait(delay.total_seconds())
 
1197
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1816
1198
                    client.changedstate.release()
1817
1199
                    time2 = datetime.datetime.now()
1818
1200
                    if (time2 - time) >= delay:
1822
1204
                                           client.name)
1823
1205
                            if self.server.use_dbus:
1824
1206
                                # Emit D-Bus signal
1825
 
                                client.Rejected("Approval timed out")
 
1207
                                client.Rejected("Time out")
1826
1208
                            return
1827
1209
                        else:
1828
1210
                            break
1831
1213
                
1832
1214
                sent_size = 0
1833
1215
                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))
 
1216
                    # XXX handle session exception
 
1217
                    sent = session.send(client.secret[sent_size:])
 
1218
                    logger.debug(u"Sent: %d, remaining: %d",
 
1219
                                 sent, len(client.secret)
 
1220
                                 - (sent_size + sent))
1843
1221
                    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)
 
1222
 
 
1223
                logger.info(u"Sending secret to %s", client.name)
 
1224
                # bump the timeout as if seen
 
1225
                client.checked_ok()
1848
1226
                if self.server.use_dbus:
1849
1227
                    # Emit D-Bus signal
1850
1228
                    client.GotSecret()
1852
1230
            finally:
1853
1231
                if approval_required:
1854
1232
                    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)
 
1233
                session.bye()
1860
1234
    
1861
1235
    @staticmethod
1862
1236
    def peer_certificate(session):
1863
1237
        "Return the peer's OpenPGP certificate as a bytestring"
1864
1238
        # If not an OpenPGP certificate...
1865
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1866
 
                session._c_object)
 
1239
        if (gnutls.library.functions
 
1240
            .gnutls_certificate_type_get(session._c_object)
1867
1241
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1868
1242
            # ...do the normal thing
1869
1243
            return session.peer_certificate
1872
1246
                     .gnutls_certificate_get_peers
1873
1247
                     (session._c_object, ctypes.byref(list_size)))
1874
1248
        if not bool(cert_list) and list_size.value != 0:
1875
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1876
 
                                            " certificate")
 
1249
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1250
                                            u" certificate")
1877
1251
        if list_size.value == 0:
1878
1252
            return None
1879
1253
        cert = cert_list[0]
1883
1257
    def fingerprint(openpgp):
1884
1258
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1259
        # 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)))
 
1260
        datum = (gnutls.library.types
 
1261
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1262
                                             ctypes.POINTER
 
1263
                                             (ctypes.c_ubyte)),
 
1264
                                 ctypes.c_uint(len(openpgp))))
1890
1265
        # New empty GnuTLS certificate
1891
1266
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1893
 
            ctypes.byref(crt))
 
1267
        (gnutls.library.functions
 
1268
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1269
        # 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)
 
1270
        (gnutls.library.functions
 
1271
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1272
                                    gnutls.library.constants
 
1273
                                    .GNUTLS_OPENPGP_FMT_RAW))
1898
1274
        # Verify the self signature in the key
1899
1275
        crtverify = ctypes.c_uint()
1900
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
 
            crt, 0, ctypes.byref(crtverify))
 
1276
        (gnutls.library.functions
 
1277
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1278
                                         ctypes.byref(crtverify)))
1902
1279
        if crtverify.value != 0:
1903
1280
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
 
            raise gnutls.errors.CertificateSecurityError(
1905
 
                "Verify failed")
 
1281
            raise (gnutls.errors.CertificateSecurityError
 
1282
                   (u"Verify failed"))
1906
1283
        # New buffer for the fingerprint
1907
1284
        buf = ctypes.create_string_buffer(20)
1908
1285
        buf_len = ctypes.c_size_t()
1909
1286
        # 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))
 
1287
        (gnutls.library.functions
 
1288
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1289
                                             ctypes.byref(buf_len)))
1912
1290
        # Deinit the certificate
1913
1291
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1292
        # Convert the buffer to a Python bytestring
1915
1293
        fpr = ctypes.string_at(buf, buf_len.value)
1916
1294
        # Convert the bytestring to hexadecimal notation
1917
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1295
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1918
1296
        return hex_fpr
1919
1297
 
1920
1298
 
1921
1299
class MultiprocessingMixIn(object):
1922
1300
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1923
 
    
1924
1301
    def sub_process_main(self, request, address):
1925
1302
        try:
1926
1303
            self.finish_request(request, address)
1927
 
        except Exception:
 
1304
        except:
1928
1305
            self.handle_error(request, address)
1929
1306
        self.close_request(request)
1930
 
    
 
1307
            
1931
1308
    def process_request(self, request, address):
1932
1309
        """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
 
 
 
1310
        multiprocessing.Process(target = self.sub_process_main,
 
1311
                                args = (request, address)).start()
1938
1312
 
1939
1313
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1940
1314
    """ adds a pipe to the MixIn """
1941
 
    
1942
1315
    def process_request(self, request, client_address):
1943
1316
        """Overrides and wraps the original process_request().
1944
1317
        
1945
1318
        This function creates a new pipe in self.pipe
1946
1319
        """
1947
1320
        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):
 
1321
 
 
1322
        super(MultiprocessingMixInWithPipe,
 
1323
              self).process_request(request, client_address)
 
1324
        self.add_pipe(parent_pipe)
 
1325
    def add_pipe(self, parent_pipe):
1955
1326
        """Dummy function; override as necessary"""
1956
 
        raise NotImplementedError()
1957
 
 
 
1327
        pass
1958
1328
 
1959
1329
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1960
1330
                     socketserver.TCPServer, object):
1965
1335
        interface:      None or a network interface name (string)
1966
1336
        use_ipv6:       Boolean; to use IPv6 or not
1967
1337
    """
1968
 
    
1969
1338
    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
 
        """
 
1339
                 interface=None, use_ipv6=True):
1976
1340
        self.interface = interface
1977
1341
        if use_ipv6:
1978
1342
            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
1343
        socketserver.TCPServer.__init__(self, server_address,
2006
1344
                                        RequestHandlerClass)
2007
 
    
2008
1345
    def server_bind(self):
2009
1346
        """This overrides the normal server_bind() function
2010
1347
        to bind to an interface if one was specified, and also NOT to
2011
1348
        bind to an address or port if they were not specified."""
2012
1349
        if self.interface is not None:
2013
1350
            if SO_BINDTODEVICE is None:
2014
 
                logger.error("SO_BINDTODEVICE does not exist;"
2015
 
                             " cannot bind to interface %s",
 
1351
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1352
                             u" cannot bind to interface %s",
2016
1353
                             self.interface)
2017
1354
            else:
2018
1355
                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)
 
1356
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1357
                                           SO_BINDTODEVICE,
 
1358
                                           str(self.interface
 
1359
                                               + u'\0'))
 
1360
                except socket.error, error:
 
1361
                    if error[0] == errno.EPERM:
 
1362
                        logger.error(u"No permission to"
 
1363
                                     u" bind to interface %s",
 
1364
                                     self.interface)
 
1365
                    elif error[0] == errno.ENOPROTOOPT:
 
1366
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1367
                                     u" cannot bind to interface %s",
 
1368
                                     self.interface)
2033
1369
                    else:
2034
1370
                        raise
2035
1371
        # Only bind(2) the socket if we really need to.
2036
1372
        if self.server_address[0] or self.server_address[1]:
2037
1373
            if not self.server_address[0]:
2038
1374
                if self.address_family == socket.AF_INET6:
2039
 
                    any_address = "::" # in6addr_any
 
1375
                    any_address = u"::" # in6addr_any
2040
1376
                else:
2041
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1377
                    any_address = socket.INADDR_ANY
2042
1378
                self.server_address = (any_address,
2043
1379
                                       self.server_address[1])
2044
1380
            elif not self.server_address[1]:
2045
 
                self.server_address = (self.server_address[0], 0)
 
1381
                self.server_address = (self.server_address[0],
 
1382
                                       0)
2046
1383
#                 if self.interface:
2047
1384
#                     self.server_address = (self.server_address[0],
2048
1385
#                                            0, # port
2062
1399
    
2063
1400
    Assumes a gobject.MainLoop event loop.
2064
1401
    """
2065
 
    
2066
1402
    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):
 
1403
                 interface=None, use_ipv6=True, clients=None,
 
1404
                 gnutls_priority=None, use_dbus=True):
2073
1405
        self.enabled = False
2074
1406
        self.clients = clients
2075
1407
        if self.clients is None:
2076
 
            self.clients = {}
 
1408
            self.clients = set()
2077
1409
        self.use_dbus = use_dbus
2078
1410
        self.gnutls_priority = gnutls_priority
2079
1411
        IPv6_TCPServer.__init__(self, server_address,
2080
1412
                                RequestHandlerClass,
2081
1413
                                interface = interface,
2082
 
                                use_ipv6 = use_ipv6,
2083
 
                                socketfd = socketfd)
2084
 
    
 
1414
                                use_ipv6 = use_ipv6)
2085
1415
    def server_activate(self):
2086
1416
        if self.enabled:
2087
1417
            return socketserver.TCPServer.server_activate(self)
2088
 
    
2089
1418
    def enable(self):
2090
1419
        self.enabled = True
2091
 
    
2092
 
    def add_pipe(self, parent_pipe, proc):
 
1420
    def add_pipe(self, parent_pipe):
2093
1421
        # 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,
 
1422
        gobject.io_add_watch(parent_pipe.fileno(),
 
1423
                             gobject.IO_IN | gobject.IO_HUP,
 
1424
                             functools.partial(self.handle_ipc,
 
1425
                                               parent_pipe = parent_pipe))
 
1426
        
 
1427
    def handle_ipc(self, source, condition, parent_pipe=None,
2104
1428
                   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
 
1429
        condition_names = {
 
1430
            gobject.IO_IN: u"IN",   # There is data to read.
 
1431
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1432
                                    # blocking).
 
1433
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1434
            gobject.IO_ERR: u"ERR", # Error condition.
 
1435
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1436
                                    # broken, usually for pipes and
 
1437
                                    # sockets).
 
1438
            }
 
1439
        conditions_string = ' | '.join(name
 
1440
                                       for cond, name in
 
1441
                                       condition_names.iteritems()
 
1442
                                       if cond & condition)
 
1443
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1444
                     conditions_string)
2110
1445
        
2111
1446
        # Read a request from the child
2112
1447
        request = parent_pipe.recv()
2116
1451
            fpr = request[1]
2117
1452
            address = request[2]
2118
1453
            
2119
 
            for c in self.clients.itervalues():
 
1454
            for c in self.clients:
2120
1455
                if c.fingerprint == fpr:
2121
1456
                    client = c
2122
1457
                    break
2123
1458
            else:
2124
 
                logger.info("Client not found for fingerprint: %s, ad"
2125
 
                            "dress: %s", fpr, address)
 
1459
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1460
                               u"dress: %s", fpr, address)
2126
1461
                if self.use_dbus:
2127
1462
                    # Emit D-Bus signal
2128
 
                    mandos_dbus_service.ClientNotFound(fpr,
2129
 
                                                       address[0])
 
1463
                    mandos_dbus_service.ClientNotFound(fpr, address)
2130
1464
                parent_pipe.send(False)
2131
1465
                return False
2132
1466
            
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))
 
1467
            gobject.io_add_watch(parent_pipe.fileno(),
 
1468
                                 gobject.IO_IN | gobject.IO_HUP,
 
1469
                                 functools.partial(self.handle_ipc,
 
1470
                                                   parent_pipe = parent_pipe,
 
1471
                                                   client_object = client))
2140
1472
            parent_pipe.send(True)
2141
 
            # remove the old hook in favor of the new above hook on
2142
 
            # same fileno
 
1473
            # remove the old hook in favor of the new above hook on same fileno
2143
1474
            return False
2144
1475
        if command == 'funcall':
2145
1476
            funcname = request[1]
2146
1477
            args = request[2]
2147
1478
            kwargs = request[3]
2148
1479
            
2149
 
            parent_pipe.send(('data', getattr(client_object,
2150
 
                                              funcname)(*args,
2151
 
                                                        **kwargs)))
2152
 
        
 
1480
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1481
 
2153
1482
        if command == 'getattr':
2154
1483
            attrname = request[1]
2155
 
            if isinstance(client_object.__getattribute__(attrname),
2156
 
                          collections.Callable):
2157
 
                parent_pipe.send(('function', ))
 
1484
            if callable(client_object.__getattribute__(attrname)):
 
1485
                parent_pipe.send(('function',))
2158
1486
            else:
2159
 
                parent_pipe.send((
2160
 
                    'data', client_object.__getattribute__(attrname)))
2161
 
        
 
1487
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1488
 
2162
1489
        if command == 'setattr':
2163
1490
            attrname = request[1]
2164
1491
            value = request[2]
2165
1492
            setattr(client_object, attrname, value)
2166
 
        
 
1493
            
2167
1494
        return True
2168
1495
 
2169
1496
 
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
1497
def string_to_delta(interval):
2267
1498
    """Parse a string and return a datetime.timedelta
2268
1499
    
2269
 
    >>> string_to_delta('7d')
 
1500
    >>> string_to_delta(u'7d')
2270
1501
    datetime.timedelta(7)
2271
 
    >>> string_to_delta('60s')
 
1502
    >>> string_to_delta(u'60s')
2272
1503
    datetime.timedelta(0, 60)
2273
 
    >>> string_to_delta('60m')
 
1504
    >>> string_to_delta(u'60m')
2274
1505
    datetime.timedelta(0, 3600)
2275
 
    >>> string_to_delta('24h')
 
1506
    >>> string_to_delta(u'24h')
2276
1507
    datetime.timedelta(1)
2277
 
    >>> string_to_delta('1w')
 
1508
    >>> string_to_delta(u'1w')
2278
1509
    datetime.timedelta(7)
2279
 
    >>> string_to_delta('5m 30s')
 
1510
    >>> string_to_delta(u'5m 30s')
2280
1511
    datetime.timedelta(0, 330)
2281
1512
    """
2282
 
    
2283
 
    try:
2284
 
        return rfc3339_duration_to_delta(interval)
2285
 
    except ValueError:
2286
 
        pass
2287
 
    
2288
1513
    timevalue = datetime.timedelta(0)
2289
1514
    for s in interval.split():
2290
1515
        try:
2291
 
            suffix = s[-1]
 
1516
            suffix = unicode(s[-1])
2292
1517
            value = int(s[:-1])
2293
 
            if suffix == "d":
 
1518
            if suffix == u"d":
2294
1519
                delta = datetime.timedelta(value)
2295
 
            elif suffix == "s":
 
1520
            elif suffix == u"s":
2296
1521
                delta = datetime.timedelta(0, value)
2297
 
            elif suffix == "m":
 
1522
            elif suffix == u"m":
2298
1523
                delta = datetime.timedelta(0, 0, 0, 0, value)
2299
 
            elif suffix == "h":
 
1524
            elif suffix == u"h":
2300
1525
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
2301
 
            elif suffix == "w":
 
1526
            elif suffix == u"w":
2302
1527
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2303
1528
            else:
2304
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2305
 
        except IndexError as e:
2306
 
            raise ValueError(*(e.args))
 
1529
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1530
        except (ValueError, IndexError), e:
 
1531
            raise ValueError(e.message)
2307
1532
        timevalue += delta
2308
1533
    return timevalue
2309
1534
 
2310
1535
 
 
1536
def if_nametoindex(interface):
 
1537
    """Call the C function if_nametoindex(), or equivalent
 
1538
    
 
1539
    Note: This function cannot accept a unicode string."""
 
1540
    global if_nametoindex
 
1541
    try:
 
1542
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1543
                          (ctypes.util.find_library(u"c"))
 
1544
                          .if_nametoindex)
 
1545
    except (OSError, AttributeError):
 
1546
        logger.warning(u"Doing if_nametoindex the hard way")
 
1547
        def if_nametoindex(interface):
 
1548
            "Get an interface index the hard way, i.e. using fcntl()"
 
1549
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1550
            with contextlib.closing(socket.socket()) as s:
 
1551
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1552
                                    struct.pack(str(u"16s16x"),
 
1553
                                                interface))
 
1554
            interface_index = struct.unpack(str(u"I"),
 
1555
                                            ifreq[16:20])[0]
 
1556
            return interface_index
 
1557
    return if_nametoindex(interface)
 
1558
 
 
1559
 
2311
1560
def daemon(nochdir = False, noclose = False):
2312
1561
    """See daemon(3).  Standard BSD Unix function.
2313
1562
    
2316
1565
        sys.exit()
2317
1566
    os.setsid()
2318
1567
    if not nochdir:
2319
 
        os.chdir("/")
 
1568
        os.chdir(u"/")
2320
1569
    if os.fork():
2321
1570
        sys.exit()
2322
1571
    if not noclose:
2323
1572
        # Close all standard open file descriptors
2324
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1573
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2325
1574
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2326
1575
            raise OSError(errno.ENODEV,
2327
 
                          "{} not a character device"
2328
 
                          .format(os.devnull))
 
1576
                          u"%s not a character device"
 
1577
                          % os.path.devnull)
2329
1578
        os.dup2(null, sys.stdin.fileno())
2330
1579
        os.dup2(null, sys.stdout.fileno())
2331
1580
        os.dup2(null, sys.stderr.fileno())
2338
1587
    ##################################################################
2339
1588
    # Parsing of options, both command line and config file
2340
1589
    
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()
 
1590
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1591
    parser.add_option("-i", u"--interface", type=u"string",
 
1592
                      metavar="IF", help=u"Bind to interface IF")
 
1593
    parser.add_option("-a", u"--address", type=u"string",
 
1594
                      help=u"Address to listen for requests on")
 
1595
    parser.add_option("-p", u"--port", type=u"int",
 
1596
                      help=u"Port number to receive requests on")
 
1597
    parser.add_option("--check", action=u"store_true",
 
1598
                      help=u"Run self-test")
 
1599
    parser.add_option("--debug", action=u"store_true",
 
1600
                      help=u"Debug mode; run in foreground and log to"
 
1601
                      u" terminal")
 
1602
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1603
                      u" priority string (see GnuTLS documentation)")
 
1604
    parser.add_option("--servicename", type=u"string",
 
1605
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1606
    parser.add_option("--configdir", type=u"string",
 
1607
                      default=u"/etc/mandos", metavar=u"DIR",
 
1608
                      help=u"Directory to search for configuration"
 
1609
                      u" files")
 
1610
    parser.add_option("--no-dbus", action=u"store_false",
 
1611
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1612
                      u" system bus interface")
 
1613
    parser.add_option("--no-ipv6", action=u"store_false",
 
1614
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1615
    options = parser.parse_args()[0]
2387
1616
    
2388
1617
    if options.check:
2389
1618
        import doctest
2390
 
        fail_count, test_count = doctest.testmod()
2391
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1619
        doctest.testmod()
 
1620
        sys.exit()
2392
1621
    
2393
1622
    # 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-DSA-SHA256",
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
 
                    }
 
1623
    server_defaults = { u"interface": u"",
 
1624
                        u"address": u"",
 
1625
                        u"port": u"",
 
1626
                        u"debug": u"False",
 
1627
                        u"priority":
 
1628
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1629
                        u"servicename": u"Mandos",
 
1630
                        u"use_dbus": u"True",
 
1631
                        u"use_ipv6": u"True",
 
1632
                        }
2411
1633
    
2412
1634
    # Parse config file for server-global settings
2413
1635
    server_config = configparser.SafeConfigParser(server_defaults)
2414
1636
    del server_defaults
2415
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
1637
    server_config.read(os.path.join(options.configdir,
 
1638
                                    u"mandos.conf"))
2416
1639
    # Convert the SafeConfigParser object to a dict
2417
1640
    server_settings = server_config.defaults()
2418
1641
    # 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",
 
1642
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1643
        server_settings[option] = server_config.getboolean(u"DEFAULT",
2421
1644
                                                           option)
2422
1645
    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"])
 
1646
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1647
                                                       u"port")
2434
1648
    del server_config
2435
1649
    
2436
1650
    # Override the settings from the config file with command line
2437
1651
    # 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"):
 
1652
    for option in (u"interface", u"address", u"port", u"debug",
 
1653
                   u"priority", u"servicename", u"configdir",
 
1654
                   u"use_dbus", u"use_ipv6"):
2442
1655
        value = getattr(options, option)
2443
1656
        if value is not None:
2444
1657
            server_settings[option] = value
2445
1658
    del options
2446
1659
    # Force all strings to be unicode
2447
1660
    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
 
1661
        if type(server_settings[option]) is str:
 
1662
            server_settings[option] = unicode(server_settings[option])
2458
1663
    # Now we have our good server settings in "server_settings"
2459
1664
    
2460
1665
    ##################################################################
2461
1666
    
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
1667
    # 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"])))
 
1668
    debug = server_settings[u"debug"]
 
1669
    use_dbus = server_settings[u"use_dbus"]
 
1670
    use_ipv6 = server_settings[u"use_ipv6"]
 
1671
    
 
1672
    if not debug:
 
1673
        syslogger.setLevel(logging.WARNING)
 
1674
        console.setLevel(logging.WARNING)
 
1675
    
 
1676
    if server_settings[u"servicename"] != u"Mandos":
 
1677
        syslogger.setFormatter(logging.Formatter
 
1678
                               (u'Mandos (%s) [%%(process)d]:'
 
1679
                                u' %%(levelname)s: %%(message)s'
 
1680
                                % server_settings[u"servicename"]))
2491
1681
    
2492
1682
    # 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"))
 
1683
    client_defaults = { u"timeout": u"1h",
 
1684
                        u"interval": u"5m",
 
1685
                        u"checker": u"fping -q -- %%(host)s",
 
1686
                        u"host": u"",
 
1687
                        u"approved_delay": u"5m",
 
1688
                        u"approved_duration": u"1s",
 
1689
                        }
 
1690
    client_config = configparser.SafeConfigParser(client_defaults)
 
1691
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1692
                                    u"clients.conf"))
2497
1693
    
2498
1694
    global mandos_dbus_service
2499
1695
    mandos_dbus_service = None
2500
1696
    
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)
 
1697
    tcp_server = MandosServer((server_settings[u"address"],
 
1698
                               server_settings[u"port"]),
 
1699
                              ClientHandler,
 
1700
                              interface=server_settings[u"interface"],
 
1701
                              use_ipv6=use_ipv6,
 
1702
                              gnutls_priority=
 
1703
                              server_settings[u"priority"],
 
1704
                              use_dbus=use_dbus)
 
1705
    pidfilename = u"/var/run/mandos.pid"
 
1706
    try:
 
1707
        pidfile = open(pidfilename, u"w")
 
1708
    except IOError:
 
1709
        logger.error(u"Could not open file %r", pidfilename)
2522
1710
    
2523
 
    for name in ("_mandos", "mandos", "nobody"):
 
1711
    try:
 
1712
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1713
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1714
    except KeyError:
2524
1715
        try:
2525
 
            uid = pwd.getpwnam(name).pw_uid
2526
 
            gid = pwd.getpwnam(name).pw_gid
2527
 
            break
 
1716
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1717
            gid = pwd.getpwnam(u"mandos").pw_gid
2528
1718
        except KeyError:
2529
 
            continue
2530
 
    else:
2531
 
        uid = 65534
2532
 
        gid = 65534
 
1719
            try:
 
1720
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1721
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1722
            except KeyError:
 
1723
                uid = 65534
 
1724
                gid = 65534
2533
1725
    try:
2534
1726
        os.setgid(gid)
2535
1727
        os.setuid(uid)
2536
 
    except OSError as error:
2537
 
        if error.errno != errno.EPERM:
2538
 
            raise
 
1728
    except OSError, error:
 
1729
        if error[0] != errno.EPERM:
 
1730
            raise error
2539
1731
    
 
1732
    # Enable all possible GnuTLS debugging
2540
1733
    if debug:
2541
 
        # Enable all possible GnuTLS debugging
2542
 
        
2543
1734
        # "Use a log level over 10 to enable all debugging options."
2544
1735
        # - GnuTLS manual
2545
1736
        gnutls.library.functions.gnutls_global_set_log_level(11)
2546
1737
        
2547
1738
        @gnutls.library.types.gnutls_log_func
2548
1739
        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()
 
1740
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1741
        
 
1742
        (gnutls.library.functions
 
1743
         .gnutls_global_set_log_function(debug_gnutls))
2568
1744
    
2569
1745
    global main_loop
2570
1746
    # From the Avahi example code
2571
 
    DBusGMainLoop(set_as_default=True)
 
1747
    DBusGMainLoop(set_as_default=True )
2572
1748
    main_loop = gobject.MainLoop()
2573
1749
    bus = dbus.SystemBus()
2574
1750
    # End of Avahi example code
2575
1751
    if use_dbus:
2576
1752
        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)
 
1753
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1754
                                            bus, do_not_queue=True)
 
1755
        except dbus.exceptions.NameExistsException, e:
 
1756
            logger.error(unicode(e) + u", disabling D-Bus")
2585
1757
            use_dbus = False
2586
 
            server_settings["use_dbus"] = False
 
1758
            server_settings[u"use_dbus"] = False
2587
1759
            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()
 
1760
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1761
    service = AvahiService(name = server_settings[u"servicename"],
 
1762
                           servicetype = u"_mandos._tcp",
 
1763
                           protocol = protocol, bus = bus)
 
1764
    if server_settings["interface"]:
 
1765
        service.interface = (if_nametoindex
 
1766
                             (str(server_settings[u"interface"])))
2601
1767
    
2602
1768
    client_class = Client
2603
1769
    if use_dbus:
2604
1770
        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))
 
1771
    def client_config_items(config, section):
 
1772
        special_settings = {
 
1773
            "approved_by_default":
 
1774
                lambda: config.getboolean(section,
 
1775
                                          "approved_by_default"),
 
1776
            }
 
1777
        for name, value in config.items(section):
2689
1778
            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
 
    
 
1779
                yield (name, special_settings[name]())
 
1780
            except KeyError:
 
1781
                yield (name, value)
 
1782
    
 
1783
    tcp_server.clients.update(set(
 
1784
            client_class(name = section,
 
1785
                         config= dict(client_config_items(
 
1786
                        client_config, section)))
 
1787
            for section in client_config.sections()))
2715
1788
    if not tcp_server.clients:
2716
 
        logger.warning("No clients defined")
2717
 
    
2718
 
    if not foreground:
2719
 
        if pidfile is not None:
 
1789
        logger.warning(u"No clients defined")
 
1790
    
 
1791
    if debug:
 
1792
        # Redirect stdin so all checkers get /dev/null
 
1793
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1794
        os.dup2(null, sys.stdin.fileno())
 
1795
        if null > 2:
 
1796
            os.close(null)
 
1797
    else:
 
1798
        # No console logging
 
1799
        logger.removeHandler(console)
 
1800
        # Close all input and output, do double fork, etc.
 
1801
        daemon()
 
1802
    
 
1803
    try:
 
1804
        with pidfile:
2720
1805
            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)
 
1806
            pidfile.write(str(pid) + "\n")
2727
1807
        del pidfile
2728
 
        del pidfilename
 
1808
    except IOError:
 
1809
        logger.error(u"Could not write to file %r with PID %d",
 
1810
                     pidfilename, pid)
 
1811
    except NameError:
 
1812
        # "pidfile" was never created
 
1813
        pass
 
1814
    del pidfilename
2729
1815
    
 
1816
    if not debug:
 
1817
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2730
1818
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2731
1819
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2732
1820
    
2733
1821
    if use_dbus:
2734
 
        
2735
 
        @alternate_dbus_interfaces(
2736
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2737
 
        class MandosDBusService(DBusObjectWithProperties):
 
1822
        class MandosDBusService(dbus.service.Object):
2738
1823
            """A D-Bus proxy object"""
2739
 
            
2740
1824
            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")
 
1825
                dbus.service.Object.__init__(self, bus, u"/")
 
1826
            _interface = u"se.bsnet.fukt.Mandos"
 
1827
            
 
1828
            @dbus.service.signal(_interface, signature=u"o")
2752
1829
            def ClientAdded(self, objpath):
2753
1830
                "D-Bus signal"
2754
1831
                pass
2755
1832
            
2756
 
            @dbus.service.signal(_interface, signature="ss")
 
1833
            @dbus.service.signal(_interface, signature=u"ss")
2757
1834
            def ClientNotFound(self, fingerprint, address):
2758
1835
                "D-Bus signal"
2759
1836
                pass
2760
1837
            
2761
 
            @dbus.service.signal(_interface, signature="os")
 
1838
            @dbus.service.signal(_interface, signature=u"os")
2762
1839
            def ClientRemoved(self, objpath, name):
2763
1840
                "D-Bus signal"
2764
1841
                pass
2765
1842
            
2766
 
            @dbus.service.method(_interface, out_signature="ao")
 
1843
            @dbus.service.method(_interface, out_signature=u"ao")
2767
1844
            def GetAllClients(self):
2768
1845
                "D-Bus method"
2769
 
                return dbus.Array(c.dbus_object_path for c in
2770
 
                                  tcp_server.clients.itervalues())
 
1846
                return dbus.Array(c.dbus_object_path
 
1847
                                  for c in tcp_server.clients)
2771
1848
            
2772
1849
            @dbus.service.method(_interface,
2773
 
                                 out_signature="a{oa{sv}}")
 
1850
                                 out_signature=u"a{oa{sv}}")
2774
1851
            def GetAllClientsWithProperties(self):
2775
1852
                "D-Bus method"
2776
1853
                return dbus.Dictionary(
2777
 
                    { c.dbus_object_path: c.GetAll("")
2778
 
                      for c in tcp_server.clients.itervalues() },
2779
 
                    signature="oa{sv}")
 
1854
                    ((c.dbus_object_path, c.GetAll(u""))
 
1855
                     for c in tcp_server.clients),
 
1856
                    signature=u"oa{sv}")
2780
1857
            
2781
 
            @dbus.service.method(_interface, in_signature="o")
 
1858
            @dbus.service.method(_interface, in_signature=u"o")
2782
1859
            def RemoveClient(self, object_path):
2783
1860
                "D-Bus method"
2784
 
                for c in tcp_server.clients.itervalues():
 
1861
                for c in tcp_server.clients:
2785
1862
                    if c.dbus_object_path == object_path:
2786
 
                        del tcp_server.clients[c.name]
 
1863
                        tcp_server.clients.remove(c)
2787
1864
                        c.remove_from_connection()
2788
1865
                        # Don't signal anything except ClientRemoved
2789
1866
                        c.disable(quiet=True)
2798
1875
    
2799
1876
    def cleanup():
2800
1877
        "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
 
1878
        service.cleanup()
 
1879
        
2862
1880
        while tcp_server.clients:
2863
 
            name, client = tcp_server.clients.popitem()
 
1881
            client = tcp_server.clients.pop()
2864
1882
            if use_dbus:
2865
1883
                client.remove_from_connection()
 
1884
            client.disable_hook = None
2866
1885
            # Don't signal anything except ClientRemoved
2867
1886
            client.disable(quiet=True)
2868
1887
            if use_dbus:
2869
1888
                # Emit D-Bus signal
2870
 
                mandos_dbus_service.ClientRemoved(
2871
 
                    client.dbus_object_path, client.name)
2872
 
        client_settings.clear()
 
1889
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1890
                                                  client.name)
2873
1891
    
2874
1892
    atexit.register(cleanup)
2875
1893
    
2876
 
    for client in tcp_server.clients.itervalues():
 
1894
    for client in tcp_server.clients:
2877
1895
        if use_dbus:
2878
1896
            # Emit D-Bus signal
2879
1897
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2880
 
        # Need to initiate checking of clients
2881
 
        if client.enabled:
2882
 
            client.init_checker()
 
1898
        client.enable()
2883
1899
    
2884
1900
    tcp_server.enable()
2885
1901
    tcp_server.server_activate()
2886
1902
    
2887
1903
    # Find out what port we got
2888
 
    if zeroconf:
2889
 
        service.port = tcp_server.socket.getsockname()[1]
 
1904
    service.port = tcp_server.socket.getsockname()[1]
2890
1905
    if use_ipv6:
2891
 
        logger.info("Now listening on address %r, port %d,"
2892
 
                    " flowinfo %d, scope_id %d",
2893
 
                    *tcp_server.socket.getsockname())
 
1906
        logger.info(u"Now listening on address %r, port %d,"
 
1907
                    " flowinfo %d, scope_id %d"
 
1908
                    % tcp_server.socket.getsockname())
2894
1909
    else:                       # IPv4
2895
 
        logger.info("Now listening on address %r, port %d",
2896
 
                    *tcp_server.socket.getsockname())
 
1910
        logger.info(u"Now listening on address %r, port %d"
 
1911
                    % tcp_server.socket.getsockname())
2897
1912
    
2898
1913
    #service.interface = tcp_server.socket.getsockname()[3]
2899
1914
    
2900
1915
    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
 
1916
        # From the Avahi example code
 
1917
        try:
 
1918
            service.activate()
 
1919
        except dbus.exceptions.DBusException, error:
 
1920
            logger.critical(u"DBusException: %s", error)
 
1921
            cleanup()
 
1922
            sys.exit(1)
 
1923
        # End of Avahi example code
2910
1924
        
2911
1925
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
1926
                             lambda *args, **kwargs:
2913
1927
                             (tcp_server.handle_request
2914
1928
                              (*args[2:], **kwargs) or True))
2915
1929
        
2916
 
        logger.debug("Starting main loop")
 
1930
        logger.debug(u"Starting main loop")
2917
1931
        main_loop.run()
2918
 
    except AvahiError as error:
2919
 
        logger.critical("Avahi Error", exc_info=error)
 
1932
    except AvahiError, error:
 
1933
        logger.critical(u"AvahiError: %s", error)
2920
1934
        cleanup()
2921
1935
        sys.exit(1)
2922
1936
    except KeyboardInterrupt:
2923
1937
        if debug:
2924
 
            print("", file=sys.stderr)
2925
 
        logger.debug("Server received KeyboardInterrupt")
2926
 
    logger.debug("Server exiting")
 
1938
            print >> sys.stderr
 
1939
        logger.debug(u"Server received KeyboardInterrupt")
 
1940
    logger.debug(u"Server exiting")
2927
1941
    # Must run before the D-Bus bus name gets deregistered
2928
1942
    cleanup()
2929
1943
 
2930
 
 
2931
1944
if __name__ == '__main__':
2932
1945
    main()