/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-10-18 16:09:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091018160905-ep07o5cwedsegz9x
* plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to
                            check its return code.  Use exit codes
                            from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
                       exec the "splashy_update" command.

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