/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: Teddy Hogeborn
  • Date: 2009-11-03 00:12:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091103001235-op9jfvtx6xvxch3h
* README (FAQ): Fix typo.
* mandos (main): Try to always do cleanup() before exit, since
                 otherwise the D-Bus bus name gets unregistered first.

Show diffs side-by-side

added added

removed removed

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