/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: 2013-10-24 20:38:44 UTC
  • mto: This revision was merged to the branch mainline in revision 635.
  • Revision ID: teddy@recompile.se-20131024203844-j0y0ir6vnlj9mkix
Tags: version-1.6.2-1
* Makefile (version): Changed to "1.6.2".
* NEWS (Version 1.6.2): New entry.
* debian/changelog (1.6.2-1): - '' -

Show diffs side-by-side

added added

removed removed

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