/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-11-05 02:12:57 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091105021257-l2b5nb1v4pc2tupw
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
                               "signal" to "quiet".

Show diffs side-by-side

added added

removed removed

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