/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-05 02:12:57 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091105021257-l2b5nb1v4pc2tupw
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
                               "signal" to "quiet".

Show diffs side-by-side

added added

removed removed

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