/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 at recompile
  • Date: 2011-12-27 14:15:40 UTC
  • Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries

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