/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-12-27 03:35:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091227033558-y57wv1u4cls3i8kq
TODO file changes.

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