/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos-ctl: Made work again after D-Bus API changes.
  (datetime_to_milliseconds): Renamed to "timedelta_to_milliseconds".
                              All callers changed.
  (milliseconds_to_string): Use clearer mapping string format.
  (string_to_delta): Add some comments.

Show diffs side-by-side

added added

removed removed

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