/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

  • Committer: Teddy Hogeborn
  • Date: 2012-06-17 14:55:31 UTC
  • mto: (301.1.1 release) (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 302.
  • Revision ID: teddy@recompile.se-20120617145531-o24z982oerm6xb6s
* mandos: New "--foreground" option.

Show diffs side-by-side

added added

removed removed

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