/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: 2012-01-01 20:45:53 UTC
  • Revision ID: teddy@recompile.se-20120101204553-f1zlty873gswtf5n
* README: Hint that the intro(8mandos) manual page is in the server
          package.

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