/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-06-19 00:37:04 UTC
  • mto: (24.1.149 mandos)
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: teddy@fukt.bsnet.se-20100619003704-vpicvssvv1ktg2om
* mandos (ClientHandler.handle): Set up the GnuTLS session object
                                 before reading the protocol number.
 (ClientHandler.handle/ProxyObject): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import (division, absolute_import, print_function,
35
 
                        unicode_literals)
 
34
from __future__ import division, with_statement, absolute_import
36
35
 
37
36
import SocketServer as socketserver
38
37
import socket
39
 
import argparse
 
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
61
60
import fcntl
62
61
import functools
63
62
import cPickle as pickle
64
 
import multiprocessing
 
63
import select
65
64
 
66
65
import dbus
67
66
import dbus.service
82
81
        SO_BINDTODEVICE = None
83
82
 
84
83
 
85
 
version = "1.3.0"
 
84
version = "1.0.14"
86
85
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
86
logger = logging.Logger(u'mandos')
89
87
syslogger = (logging.handlers.SysLogHandler
90
88
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
 
89
              address = "/dev/log"))
92
90
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
 
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
92
                        u' %(message)s'))
95
93
logger.addHandler(syslogger)
96
94
 
97
95
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
 
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
97
                                       u' %(levelname)s:'
 
98
                                       u' %(message)s'))
101
99
logger.addHandler(console)
102
100
 
103
101
class AvahiError(Exception):
120
118
    Attributes:
121
119
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
120
               Used to optionally bind to the specified interface.
123
 
    name: string; Example: 'Mandos'
124
 
    type: string; Example: '_mandos._tcp'.
 
121
    name: string; Example: u'Mandos'
 
122
    type: string; Example: u'_mandos._tcp'.
125
123
                  See <http://www.dns-sd.org/ServiceTypes.html>
126
124
    port: integer; what port to announce
127
125
    TXT: list of strings; TXT record for the service
136
134
    """
137
135
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
136
                 servicetype = None, port = None, TXT = None,
139
 
                 domain = "", host = "", max_renames = 32768,
 
137
                 domain = u"", host = u"", max_renames = 32768,
140
138
                 protocol = avahi.PROTO_UNSPEC, bus = None):
141
139
        self.interface = interface
142
140
        self.name = name
151
149
        self.group = None       # our entry group
152
150
        self.server = None
153
151
        self.bus = bus
154
 
        self.entry_group_state_changed_match = None
155
152
    def rename(self):
156
153
        """Derived from the Avahi example code"""
157
154
        if self.rename_count >= self.max_renames:
158
 
            logger.critical("No suitable Zeroconf service name found"
159
 
                            " after %i retries, exiting.",
 
155
            logger.critical(u"No suitable Zeroconf service name found"
 
156
                            u" after %i retries, exiting.",
160
157
                            self.rename_count)
161
 
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
 
        logger.info("Changing Zeroconf service name to %r ...",
164
 
                    self.name)
 
158
            raise AvahiServiceError(u"Too many renames")
 
159
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        logger.info(u"Changing Zeroconf service name to %r ...",
 
161
                    unicode(self.name))
165
162
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
 
163
                               (u'Mandos (%s) [%%(process)d]:'
 
164
                                u' %%(levelname)s: %%(message)s'
168
165
                                % self.name))
169
166
        self.remove()
170
 
        try:
171
 
            self.add()
172
 
        except dbus.exceptions.DBusException as error:
173
 
            logger.critical("DBusException: %s", error)
174
 
            self.cleanup()
175
 
            os._exit(1)
 
167
        self.add()
176
168
        self.rename_count += 1
177
169
    def remove(self):
178
170
        """Derived from the Avahi example code"""
179
 
        if self.entry_group_state_changed_match is not None:
180
 
            self.entry_group_state_changed_match.remove()
181
 
            self.entry_group_state_changed_match = None
182
171
        if self.group is not None:
183
172
            self.group.Reset()
184
173
    def add(self):
185
174
        """Derived from the Avahi example code"""
186
 
        self.remove()
187
175
        if self.group is None:
188
176
            self.group = dbus.Interface(
189
177
                self.bus.get_object(avahi.DBUS_NAME,
190
178
                                    self.server.EntryGroupNew()),
191
179
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
 
        self.entry_group_state_changed_match = (
193
 
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
195
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
180
            self.group.connect_to_signal('StateChanged',
 
181
                                         self
 
182
                                         .entry_group_state_changed)
 
183
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
196
184
                     self.name, self.type)
197
185
        self.group.AddService(
198
186
            self.interface,
205
193
        self.group.Commit()
206
194
    def entry_group_state_changed(self, state, error):
207
195
        """Derived from the Avahi example code"""
208
 
        logger.debug("Avahi entry group state change: %i", state)
 
196
        logger.debug(u"Avahi state change: %i", state)
209
197
        
210
198
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
211
 
            logger.debug("Zeroconf service established.")
 
199
            logger.debug(u"Zeroconf service established.")
212
200
        elif state == avahi.ENTRY_GROUP_COLLISION:
213
 
            logger.info("Zeroconf service name collision.")
 
201
            logger.warning(u"Zeroconf service name collision.")
214
202
            self.rename()
215
203
        elif state == avahi.ENTRY_GROUP_FAILURE:
216
 
            logger.critical("Avahi: Error in group state changed %s",
 
204
            logger.critical(u"Avahi: Error in group state changed %s",
217
205
                            unicode(error))
218
 
            raise AvahiGroupError("State changed: %s"
 
206
            raise AvahiGroupError(u"State changed: %s"
219
207
                                  % unicode(error))
220
208
    def cleanup(self):
221
209
        """Derived from the Avahi example code"""
222
210
        if self.group is not None:
223
 
            try:
224
 
                self.group.Free()
225
 
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
227
 
                pass
 
211
            self.group.Free()
228
212
            self.group = None
229
 
        self.remove()
230
 
    def server_state_changed(self, state, error=None):
 
213
    def server_state_changed(self, state):
231
214
        """Derived from the Avahi example code"""
232
 
        logger.debug("Avahi server state change: %i", state)
233
 
        bad_states = { avahi.SERVER_INVALID:
234
 
                           "Zeroconf server invalid",
235
 
                       avahi.SERVER_REGISTERING: None,
236
 
                       avahi.SERVER_COLLISION:
237
 
                           "Zeroconf server name collision",
238
 
                       avahi.SERVER_FAILURE:
239
 
                           "Zeroconf server failure" }
240
 
        if state in bad_states:
241
 
            if bad_states[state] is not None:
242
 
                if error is None:
243
 
                    logger.error(bad_states[state])
244
 
                else:
245
 
                    logger.error(bad_states[state] + ": %r", error)
246
 
            self.cleanup()
 
215
        if state == avahi.SERVER_COLLISION:
 
216
            logger.error(u"Zeroconf server name collision")
 
217
            self.remove()
247
218
        elif state == avahi.SERVER_RUNNING:
248
219
            self.add()
249
 
        else:
250
 
            if error is None:
251
 
                logger.debug("Unknown state: %r", state)
252
 
            else:
253
 
                logger.debug("Unknown state: %r: %r", state, error)
254
220
    def activate(self):
255
221
        """Derived from the Avahi example code"""
256
222
        if self.server is None:
257
223
            self.server = dbus.Interface(
258
224
                self.bus.get_object(avahi.DBUS_NAME,
259
 
                                    avahi.DBUS_PATH_SERVER,
260
 
                                    follow_name_owner_changes=True),
 
225
                                    avahi.DBUS_PATH_SERVER),
261
226
                avahi.DBUS_INTERFACE_SERVER)
262
 
        self.server.connect_to_signal("StateChanged",
 
227
        self.server.connect_to_signal(u"StateChanged",
263
228
                                 self.server_state_changed)
264
229
        self.server_state_changed(self.server.GetState())
265
230
 
268
233
    """A representation of a client host served by this server.
269
234
    
270
235
    Attributes:
271
 
    _approved:   bool(); 'None' if not yet approved/disapproved
272
 
    approval_delay: datetime.timedelta(); Time to wait for approval
273
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
236
    name:       string; from the config file, used in log messages and
 
237
                        D-Bus identifiers
 
238
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
239
                 uniquely identify the client
 
240
    secret:     bytestring; sent verbatim (over TLS) to client
 
241
    host:       string; available for use by the checker command
 
242
    created:    datetime.datetime(); (UTC) object creation
 
243
    last_enabled: datetime.datetime(); (UTC)
 
244
    enabled:    bool()
 
245
    last_checked_ok: datetime.datetime(); (UTC) or None
 
246
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
247
                                      until this client is disabled
 
248
    interval:   datetime.timedelta(); How often to start a new checker
 
249
    disable_hook:  If set, called by disable() as disable_hook(self)
274
250
    checker:    subprocess.Popen(); a running checker process used
275
251
                                    to see if the client lives.
276
252
                                    'None' if no process is running.
277
 
    checker_callback_tag: a gobject event source tag, or None
278
 
    checker_command: string; External command which is run to check
279
 
                     if client lives.  %() expansions are done at
 
253
    checker_initiator_tag: a gobject event source tag, or None
 
254
    disable_initiator_tag: - '' -
 
255
    checker_callback_tag:  - '' -
 
256
    checker_command: string; External command which is run to check if
 
257
                     client lives.  %() expansions are done at
280
258
                     runtime with vars(self) as dict, so that for
281
259
                     instance %(name)s can be used in the command.
282
 
    checker_initiator_tag: a gobject event source tag, or None
283
 
    created:    datetime.datetime(); (UTC) object creation
284
260
    current_checker_command: string; current running checker_command
285
 
    disable_hook:  If set, called by disable() as disable_hook(self)
286
 
    disable_initiator_tag: a gobject event source tag, or None
287
 
    enabled:    bool()
288
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
289
 
                 uniquely identify the client
290
 
    host:       string; available for use by the checker command
291
 
    interval:   datetime.timedelta(); How often to start a new checker
292
 
    last_approval_request: datetime.datetime(); (UTC) or None
293
 
    last_checked_ok: datetime.datetime(); (UTC) or None
294
 
    last_enabled: datetime.datetime(); (UTC)
295
 
    name:       string; from the config file, used in log messages and
296
 
                        D-Bus identifiers
297
 
    secret:     bytestring; sent verbatim (over TLS) to client
298
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
299
 
                                      until this client is disabled
300
 
    runtime_expansions: Allowed attributes for runtime expansion.
301
261
    """
302
262
    
303
 
    runtime_expansions = ("approval_delay", "approval_duration",
304
 
                          "created", "enabled", "fingerprint",
305
 
                          "host", "interval", "last_checked_ok",
306
 
                          "last_enabled", "name", "timeout")
307
 
    
308
263
    @staticmethod
309
264
    def _timedelta_to_milliseconds(td):
310
265
        "Convert a datetime.timedelta() to milliseconds"
319
274
    def interval_milliseconds(self):
320
275
        "Return the 'interval' attribute in milliseconds"
321
276
        return self._timedelta_to_milliseconds(self.interval)
322
 
 
323
 
    def approval_delay_milliseconds(self):
324
 
        return self._timedelta_to_milliseconds(self.approval_delay)
325
277
    
326
278
    def __init__(self, name = None, disable_hook=None, config=None):
327
279
        """Note: the 'checker' key in 'config' sets the
330
282
        self.name = name
331
283
        if config is None:
332
284
            config = {}
333
 
        logger.debug("Creating client %r", self.name)
 
285
        logger.debug(u"Creating client %r", self.name)
334
286
        # Uppercase and remove spaces from fingerprint for later
335
287
        # comparison purposes with return value from the fingerprint()
336
288
        # function
337
 
        self.fingerprint = (config["fingerprint"].upper()
338
 
                            .replace(" ", ""))
339
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
340
 
        if "secret" in config:
341
 
            self.secret = config["secret"].decode("base64")
342
 
        elif "secfile" in config:
 
289
        self.fingerprint = (config[u"fingerprint"].upper()
 
290
                            .replace(u" ", u""))
 
291
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
292
        if u"secret" in config:
 
293
            self.secret = config[u"secret"].decode(u"base64")
 
294
        elif u"secfile" in config:
343
295
            with open(os.path.expanduser(os.path.expandvars
344
 
                                         (config["secfile"])),
 
296
                                         (config[u"secfile"])),
345
297
                      "rb") as secfile:
346
298
                self.secret = secfile.read()
347
299
        else:
348
 
            raise TypeError("No secret or secfile for client %s"
 
300
            raise TypeError(u"No secret or secfile for client %s"
349
301
                            % self.name)
350
 
        self.host = config.get("host", "")
 
302
        self.host = config.get(u"host", u"")
351
303
        self.created = datetime.datetime.utcnow()
352
304
        self.enabled = False
353
 
        self.last_approval_request = None
354
305
        self.last_enabled = None
355
306
        self.last_checked_ok = None
356
 
        self.timeout = string_to_delta(config["timeout"])
357
 
        self.interval = string_to_delta(config["interval"])
 
307
        self.timeout = string_to_delta(config[u"timeout"])
 
308
        self.interval = string_to_delta(config[u"interval"])
358
309
        self.disable_hook = disable_hook
359
310
        self.checker = None
360
311
        self.checker_initiator_tag = None
361
312
        self.disable_initiator_tag = None
362
313
        self.checker_callback_tag = None
363
 
        self.checker_command = config["checker"]
 
314
        self.checker_command = config[u"checker"]
364
315
        self.current_checker_command = None
365
316
        self.last_connect = None
366
 
        self._approved = None
367
 
        self.approved_by_default = config.get("approved_by_default",
368
 
                                              True)
369
 
        self.approvals_pending = 0
370
 
        self.approval_delay = string_to_delta(
371
 
            config["approval_delay"])
372
 
        self.approval_duration = string_to_delta(
373
 
            config["approval_duration"])
374
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
375
317
    
376
 
    def send_changedstate(self):
377
 
        self.changedstate.acquire()
378
 
        self.changedstate.notify_all()
379
 
        self.changedstate.release()
380
 
        
381
318
    def enable(self):
382
319
        """Start this client's checker and timeout hooks"""
383
 
        if getattr(self, "enabled", False):
 
320
        if getattr(self, u"enabled", False):
384
321
            # Already enabled
385
322
            return
386
 
        self.send_changedstate()
387
323
        self.last_enabled = datetime.datetime.utcnow()
388
324
        # Schedule a new checker to be started an 'interval' from now,
389
325
        # and every interval from then on.
403
339
        if not getattr(self, "enabled", False):
404
340
            return False
405
341
        if not quiet:
406
 
            self.send_changedstate()
407
 
        if not quiet:
408
 
            logger.info("Disabling client %s", self.name)
409
 
        if getattr(self, "disable_initiator_tag", False):
 
342
            logger.info(u"Disabling client %s", self.name)
 
343
        if getattr(self, u"disable_initiator_tag", False):
410
344
            gobject.source_remove(self.disable_initiator_tag)
411
345
            self.disable_initiator_tag = None
412
 
        if getattr(self, "checker_initiator_tag", False):
 
346
        if getattr(self, u"checker_initiator_tag", False):
413
347
            gobject.source_remove(self.checker_initiator_tag)
414
348
            self.checker_initiator_tag = None
415
349
        self.stop_checker()
430
364
        if os.WIFEXITED(condition):
431
365
            exitstatus = os.WEXITSTATUS(condition)
432
366
            if exitstatus == 0:
433
 
                logger.info("Checker for %(name)s succeeded",
 
367
                logger.info(u"Checker for %(name)s succeeded",
434
368
                            vars(self))
435
369
                self.checked_ok()
436
370
            else:
437
 
                logger.info("Checker for %(name)s failed",
 
371
                logger.info(u"Checker for %(name)s failed",
438
372
                            vars(self))
439
373
        else:
440
 
            logger.warning("Checker for %(name)s crashed?",
 
374
            logger.warning(u"Checker for %(name)s crashed?",
441
375
                           vars(self))
442
376
    
443
377
    def checked_ok(self):
452
386
                                      (self.timeout_milliseconds(),
453
387
                                       self.disable))
454
388
    
455
 
    def need_approval(self):
456
 
        self.last_approval_request = datetime.datetime.utcnow()
457
 
    
458
389
    def start_checker(self):
459
390
        """Start a new checker subprocess if one is not running.
460
391
        
472
403
        # If a checker exists, make sure it is not a zombie
473
404
        try:
474
405
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
475
 
        except (AttributeError, OSError) as error:
 
406
        except (AttributeError, OSError), error:
476
407
            if (isinstance(error, OSError)
477
408
                and error.errno != errno.ECHILD):
478
409
                raise error
479
410
        else:
480
411
            if pid:
481
 
                logger.warning("Checker was a zombie")
 
412
                logger.warning(u"Checker was a zombie")
482
413
                gobject.source_remove(self.checker_callback_tag)
483
414
                self.checker_callback(pid, status,
484
415
                                      self.current_checker_command)
489
420
                command = self.checker_command % self.host
490
421
            except TypeError:
491
422
                # Escape attributes for the shell
492
 
                escaped_attrs = dict(
493
 
                    (attr,
494
 
                     re.escape(unicode(str(getattr(self, attr, "")),
495
 
                                       errors=
496
 
                                       'replace')))
497
 
                    for attr in
498
 
                    self.runtime_expansions)
499
 
 
 
423
                escaped_attrs = dict((key,
 
424
                                      re.escape(unicode(str(val),
 
425
                                                        errors=
 
426
                                                        u'replace')))
 
427
                                     for key, val in
 
428
                                     vars(self).iteritems())
500
429
                try:
501
430
                    command = self.checker_command % escaped_attrs
502
 
                except TypeError as error:
503
 
                    logger.error('Could not format string "%s":'
504
 
                                 ' %s', self.checker_command, error)
 
431
                except TypeError, error:
 
432
                    logger.error(u'Could not format string "%s":'
 
433
                                 u' %s', self.checker_command, error)
505
434
                    return True # Try again later
506
435
            self.current_checker_command = command
507
436
            try:
508
 
                logger.info("Starting checker %r for %s",
 
437
                logger.info(u"Starting checker %r for %s",
509
438
                            command, self.name)
510
439
                # We don't need to redirect stdout and stderr, since
511
440
                # in normal mode, that is already done by daemon(),
513
442
                # always replaced by /dev/null.)
514
443
                self.checker = subprocess.Popen(command,
515
444
                                                close_fds=True,
516
 
                                                shell=True, cwd="/")
 
445
                                                shell=True, cwd=u"/")
517
446
                self.checker_callback_tag = (gobject.child_watch_add
518
447
                                             (self.checker.pid,
519
448
                                              self.checker_callback,
524
453
                if pid:
525
454
                    gobject.source_remove(self.checker_callback_tag)
526
455
                    self.checker_callback(pid, status, command)
527
 
            except OSError as error:
528
 
                logger.error("Failed to start subprocess: %s",
 
456
            except OSError, error:
 
457
                logger.error(u"Failed to start subprocess: %s",
529
458
                             error)
530
459
        # Re-run this periodically if run by gobject.timeout_add
531
460
        return True
535
464
        if self.checker_callback_tag:
536
465
            gobject.source_remove(self.checker_callback_tag)
537
466
            self.checker_callback_tag = None
538
 
        if getattr(self, "checker", None) is None:
 
467
        if getattr(self, u"checker", None) is None:
539
468
            return
540
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
469
        logger.debug(u"Stopping checker for %(name)s", vars(self))
541
470
        try:
542
471
            os.kill(self.checker.pid, signal.SIGTERM)
543
472
            #time.sleep(0.5)
544
473
            #if self.checker.poll() is None:
545
474
            #    os.kill(self.checker.pid, signal.SIGKILL)
546
 
        except OSError as error:
 
475
        except OSError, error:
547
476
            if error.errno != errno.ESRCH: # No such process
548
477
                raise
549
478
        self.checker = None
550
479
 
551
 
def dbus_service_property(dbus_interface, signature="v",
552
 
                          access="readwrite", byte_arrays=False):
 
480
 
 
481
def dbus_service_property(dbus_interface, signature=u"v",
 
482
                          access=u"readwrite", byte_arrays=False):
553
483
    """Decorators for marking methods of a DBusObjectWithProperties to
554
484
    become properties on the D-Bus.
555
485
    
562
492
    """
563
493
    # Encoding deeply encoded byte arrays is not supported yet by the
564
494
    # "Set" method, so we fail early here:
565
 
    if byte_arrays and signature != "ay":
566
 
        raise ValueError("Byte arrays not supported for non-'ay'"
567
 
                         " signature %r" % signature)
 
495
    if byte_arrays and signature != u"ay":
 
496
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
497
                         u" signature %r" % signature)
568
498
    def decorator(func):
569
499
        func._dbus_is_property = True
570
500
        func._dbus_interface = dbus_interface
571
501
        func._dbus_signature = signature
572
502
        func._dbus_access = access
573
503
        func._dbus_name = func.__name__
574
 
        if func._dbus_name.endswith("_dbus_property"):
 
504
        if func._dbus_name.endswith(u"_dbus_property"):
575
505
            func._dbus_name = func._dbus_name[:-14]
576
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
506
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
577
507
        return func
578
508
    return decorator
579
509
 
607
537
    
608
538
    @staticmethod
609
539
    def _is_dbus_property(obj):
610
 
        return getattr(obj, "_dbus_is_property", False)
 
540
        return getattr(obj, u"_dbus_is_property", False)
611
541
    
612
542
    def _get_all_dbus_properties(self):
613
543
        """Returns a generator of (name, attribute) pairs
621
551
        property with the specified name and interface.
622
552
        """
623
553
        for name in (property_name,
624
 
                     property_name + "_dbus_property"):
 
554
                     property_name + u"_dbus_property"):
625
555
            prop = getattr(self, name, None)
626
556
            if (prop is None
627
557
                or not self._is_dbus_property(prop)
631
561
                continue
632
562
            return prop
633
563
        # No such property
634
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
 
                                   + interface_name + "."
 
564
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
565
                                   + interface_name + u"."
636
566
                                   + property_name)
637
567
    
638
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
639
 
                         out_signature="v")
 
568
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
569
                         out_signature=u"v")
640
570
    def Get(self, interface_name, property_name):
641
571
        """Standard D-Bus property Get() method, see D-Bus standard.
642
572
        """
643
573
        prop = self._get_dbus_property(interface_name, property_name)
644
 
        if prop._dbus_access == "write":
 
574
        if prop._dbus_access == u"write":
645
575
            raise DBusPropertyAccessException(property_name)
646
576
        value = prop()
647
 
        if not hasattr(value, "variant_level"):
 
577
        if not hasattr(value, u"variant_level"):
648
578
            return value
649
579
        return type(value)(value, variant_level=value.variant_level+1)
650
580
    
651
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
581
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
652
582
    def Set(self, interface_name, property_name, value):
653
583
        """Standard D-Bus property Set() method, see D-Bus standard.
654
584
        """
655
585
        prop = self._get_dbus_property(interface_name, property_name)
656
 
        if prop._dbus_access == "read":
 
586
        if prop._dbus_access == u"read":
657
587
            raise DBusPropertyAccessException(property_name)
658
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
588
        if prop._dbus_get_args_options[u"byte_arrays"]:
659
589
            # The byte_arrays option is not supported yet on
660
590
            # signatures other than "ay".
661
 
            if prop._dbus_signature != "ay":
 
591
            if prop._dbus_signature != u"ay":
662
592
                raise ValueError
663
593
            value = dbus.ByteArray(''.join(unichr(byte)
664
594
                                           for byte in value))
665
595
        prop(value)
666
596
    
667
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
668
 
                         out_signature="a{sv}")
 
597
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
598
                         out_signature=u"a{sv}")
669
599
    def GetAll(self, interface_name):
670
600
        """Standard D-Bus property GetAll() method, see D-Bus
671
601
        standard.
679
609
                # Interface non-empty but did not match
680
610
                continue
681
611
            # Ignore write-only properties
682
 
            if prop._dbus_access == "write":
 
612
            if prop._dbus_access == u"write":
683
613
                continue
684
614
            value = prop()
685
 
            if not hasattr(value, "variant_level"):
 
615
            if not hasattr(value, u"variant_level"):
686
616
                all[name] = value
687
617
                continue
688
618
            all[name] = type(value)(value, variant_level=
689
619
                                    value.variant_level+1)
690
 
        return dbus.Dictionary(all, signature="sv")
 
620
        return dbus.Dictionary(all, signature=u"sv")
691
621
    
692
622
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
693
 
                         out_signature="s",
 
623
                         out_signature=u"s",
694
624
                         path_keyword='object_path',
695
625
                         connection_keyword='connection')
696
626
    def Introspect(self, object_path, connection):
701
631
        try:
702
632
            document = xml.dom.minidom.parseString(xmlstring)
703
633
            def make_tag(document, name, prop):
704
 
                e = document.createElement("property")
705
 
                e.setAttribute("name", name)
706
 
                e.setAttribute("type", prop._dbus_signature)
707
 
                e.setAttribute("access", prop._dbus_access)
 
634
                e = document.createElement(u"property")
 
635
                e.setAttribute(u"name", name)
 
636
                e.setAttribute(u"type", prop._dbus_signature)
 
637
                e.setAttribute(u"access", prop._dbus_access)
708
638
                return e
709
 
            for if_tag in document.getElementsByTagName("interface"):
 
639
            for if_tag in document.getElementsByTagName(u"interface"):
710
640
                for tag in (make_tag(document, name, prop)
711
641
                            for name, prop
712
642
                            in self._get_all_dbus_properties()
713
643
                            if prop._dbus_interface
714
 
                            == if_tag.getAttribute("name")):
 
644
                            == if_tag.getAttribute(u"name")):
715
645
                    if_tag.appendChild(tag)
716
646
                # Add the names to the return values for the
717
647
                # "org.freedesktop.DBus.Properties" methods
718
 
                if (if_tag.getAttribute("name")
719
 
                    == "org.freedesktop.DBus.Properties"):
720
 
                    for cn in if_tag.getElementsByTagName("method"):
721
 
                        if cn.getAttribute("name") == "Get":
722
 
                            for arg in cn.getElementsByTagName("arg"):
723
 
                                if (arg.getAttribute("direction")
724
 
                                    == "out"):
725
 
                                    arg.setAttribute("name", "value")
726
 
                        elif cn.getAttribute("name") == "GetAll":
727
 
                            for arg in cn.getElementsByTagName("arg"):
728
 
                                if (arg.getAttribute("direction")
729
 
                                    == "out"):
730
 
                                    arg.setAttribute("name", "props")
731
 
            xmlstring = document.toxml("utf-8")
 
648
                if (if_tag.getAttribute(u"name")
 
649
                    == u"org.freedesktop.DBus.Properties"):
 
650
                    for cn in if_tag.getElementsByTagName(u"method"):
 
651
                        if cn.getAttribute(u"name") == u"Get":
 
652
                            for arg in cn.getElementsByTagName(u"arg"):
 
653
                                if (arg.getAttribute(u"direction")
 
654
                                    == u"out"):
 
655
                                    arg.setAttribute(u"name", u"value")
 
656
                        elif cn.getAttribute(u"name") == u"GetAll":
 
657
                            for arg in cn.getElementsByTagName(u"arg"):
 
658
                                if (arg.getAttribute(u"direction")
 
659
                                    == u"out"):
 
660
                                    arg.setAttribute(u"name", u"props")
 
661
            xmlstring = document.toxml(u"utf-8")
732
662
            document.unlink()
733
663
        except (AttributeError, xml.dom.DOMException,
734
 
                xml.parsers.expat.ExpatError) as error:
735
 
            logger.error("Failed to override Introspection method",
 
664
                xml.parsers.expat.ExpatError), error:
 
665
            logger.error(u"Failed to override Introspection method",
736
666
                         error)
737
667
        return xmlstring
738
668
 
744
674
    dbus_object_path: dbus.ObjectPath
745
675
    bus: dbus.SystemBus()
746
676
    """
747
 
    
748
 
    runtime_expansions = (Client.runtime_expansions
749
 
                          + ("dbus_object_path",))
750
 
    
751
677
    # dbus.service.Object doesn't use super(), so we can't either.
752
678
    
753
679
    def __init__(self, bus = None, *args, **kwargs):
754
 
        self._approvals_pending = 0
755
680
        self.bus = bus
756
681
        Client.__init__(self, *args, **kwargs)
757
682
        # Only now, when this client is initialized, can it show up on
758
683
        # the D-Bus
759
 
        client_object_name = unicode(self.name).translate(
760
 
            {ord("."): ord("_"),
761
 
             ord("-"): ord("_")})
762
684
        self.dbus_object_path = (dbus.ObjectPath
763
 
                                 ("/clients/" + client_object_name))
 
685
                                 (u"/clients/"
 
686
                                  + self.name.replace(u".", u"_")))
764
687
        DBusObjectWithProperties.__init__(self, self.bus,
765
688
                                          self.dbus_object_path)
766
 
        
767
 
    def _get_approvals_pending(self):
768
 
        return self._approvals_pending
769
 
    def _set_approvals_pending(self, value):
770
 
        old_value = self._approvals_pending
771
 
        self._approvals_pending = value
772
 
        bval = bool(value)
773
 
        if (hasattr(self, "dbus_object_path")
774
 
            and bval is not bool(old_value)):
775
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
776
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
777
 
                                 dbus_bool)
778
 
 
779
 
    approvals_pending = property(_get_approvals_pending,
780
 
                                 _set_approvals_pending)
781
 
    del _get_approvals_pending, _set_approvals_pending
782
689
    
783
690
    @staticmethod
784
691
    def _datetime_to_dbus(dt, variant_level=0):
787
694
                           variant_level=variant_level)
788
695
    
789
696
    def enable(self):
790
 
        oldstate = getattr(self, "enabled", False)
 
697
        oldstate = getattr(self, u"enabled", False)
791
698
        r = Client.enable(self)
792
699
        if oldstate != self.enabled:
793
700
            # Emit D-Bus signals
794
 
            self.PropertyChanged(dbus.String("Enabled"),
 
701
            self.PropertyChanged(dbus.String(u"enabled"),
795
702
                                 dbus.Boolean(True, variant_level=1))
796
703
            self.PropertyChanged(
797
 
                dbus.String("LastEnabled"),
 
704
                dbus.String(u"last_enabled"),
798
705
                self._datetime_to_dbus(self.last_enabled,
799
706
                                       variant_level=1))
800
707
        return r
801
708
    
802
709
    def disable(self, quiet = False):
803
 
        oldstate = getattr(self, "enabled", False)
 
710
        oldstate = getattr(self, u"enabled", False)
804
711
        r = Client.disable(self, quiet=quiet)
805
712
        if not quiet and oldstate != self.enabled:
806
713
            # Emit D-Bus signal
807
 
            self.PropertyChanged(dbus.String("Enabled"),
 
714
            self.PropertyChanged(dbus.String(u"enabled"),
808
715
                                 dbus.Boolean(False, variant_level=1))
809
716
        return r
810
717
    
813
720
            self.remove_from_connection()
814
721
        except LookupError:
815
722
            pass
816
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
723
        if hasattr(DBusObjectWithProperties, u"__del__"):
817
724
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
818
725
        Client.__del__(self, *args, **kwargs)
819
726
    
822
729
        self.checker_callback_tag = None
823
730
        self.checker = None
824
731
        # Emit D-Bus signal
825
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
732
        self.PropertyChanged(dbus.String(u"checker_running"),
826
733
                             dbus.Boolean(False, variant_level=1))
827
734
        if os.WIFEXITED(condition):
828
735
            exitstatus = os.WEXITSTATUS(condition)
840
747
                                       *args, **kwargs)
841
748
    
842
749
    def checked_ok(self, *args, **kwargs):
843
 
        Client.checked_ok(self, *args, **kwargs)
 
750
        r = Client.checked_ok(self, *args, **kwargs)
844
751
        # Emit D-Bus signal
845
752
        self.PropertyChanged(
846
 
            dbus.String("LastCheckedOK"),
 
753
            dbus.String(u"last_checked_ok"),
847
754
            (self._datetime_to_dbus(self.last_checked_ok,
848
755
                                    variant_level=1)))
849
 
    
850
 
    def need_approval(self, *args, **kwargs):
851
 
        r = Client.need_approval(self, *args, **kwargs)
852
 
        # Emit D-Bus signal
853
 
        self.PropertyChanged(
854
 
            dbus.String("LastApprovalRequest"),
855
 
            (self._datetime_to_dbus(self.last_approval_request,
856
 
                                    variant_level=1)))
857
756
        return r
858
757
    
859
758
    def start_checker(self, *args, **kwargs):
869
768
            # Emit D-Bus signal
870
769
            self.CheckerStarted(self.current_checker_command)
871
770
            self.PropertyChanged(
872
 
                dbus.String("CheckerRunning"),
 
771
                dbus.String(u"checker_running"),
873
772
                dbus.Boolean(True, variant_level=1))
874
773
        return r
875
774
    
876
775
    def stop_checker(self, *args, **kwargs):
877
 
        old_checker = getattr(self, "checker", None)
 
776
        old_checker = getattr(self, u"checker", None)
878
777
        r = Client.stop_checker(self, *args, **kwargs)
879
778
        if (old_checker is not None
880
 
            and getattr(self, "checker", None) is None):
881
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
779
            and getattr(self, u"checker", None) is None):
 
780
            self.PropertyChanged(dbus.String(u"checker_running"),
882
781
                                 dbus.Boolean(False, variant_level=1))
883
782
        return r
884
 
 
885
 
    def _reset_approved(self):
886
 
        self._approved = None
887
 
        return False
888
 
    
889
 
    def approve(self, value=True):
890
 
        self.send_changedstate()
891
 
        self._approved = value
892
 
        gobject.timeout_add(self._timedelta_to_milliseconds
893
 
                            (self.approval_duration),
894
 
                            self._reset_approved)
895
 
    
896
783
    
897
784
    ## D-Bus methods, signals & properties
898
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
785
    _interface = u"se.bsnet.fukt.Mandos.Client"
899
786
    
900
787
    ## Signals
901
788
    
902
789
    # CheckerCompleted - signal
903
 
    @dbus.service.signal(_interface, signature="nxs")
 
790
    @dbus.service.signal(_interface, signature=u"nxs")
904
791
    def CheckerCompleted(self, exitcode, waitstatus, command):
905
792
        "D-Bus signal"
906
793
        pass
907
794
    
908
795
    # CheckerStarted - signal
909
 
    @dbus.service.signal(_interface, signature="s")
 
796
    @dbus.service.signal(_interface, signature=u"s")
910
797
    def CheckerStarted(self, command):
911
798
        "D-Bus signal"
912
799
        pass
913
800
    
914
801
    # PropertyChanged - signal
915
 
    @dbus.service.signal(_interface, signature="sv")
 
802
    @dbus.service.signal(_interface, signature=u"sv")
916
803
    def PropertyChanged(self, property, value):
917
804
        "D-Bus signal"
918
805
        pass
920
807
    # GotSecret - signal
921
808
    @dbus.service.signal(_interface)
922
809
    def GotSecret(self):
923
 
        """D-Bus signal
924
 
        Is sent after a successful transfer of secret from the Mandos
925
 
        server to mandos-client
926
 
        """
 
810
        "D-Bus signal"
927
811
        pass
928
812
    
929
813
    # Rejected - signal
930
 
    @dbus.service.signal(_interface, signature="s")
931
 
    def Rejected(self, reason):
 
814
    @dbus.service.signal(_interface)
 
815
    def Rejected(self):
932
816
        "D-Bus signal"
933
817
        pass
934
818
    
935
 
    # NeedApproval - signal
936
 
    @dbus.service.signal(_interface, signature="tb")
937
 
    def NeedApproval(self, timeout, default):
938
 
        "D-Bus signal"
939
 
        return self.need_approval()
940
 
    
941
819
    ## Methods
942
820
    
943
 
    # Approve - method
944
 
    @dbus.service.method(_interface, in_signature="b")
945
 
    def Approve(self, value):
946
 
        self.approve(value)
947
 
    
948
821
    # CheckedOK - method
949
822
    @dbus.service.method(_interface)
950
823
    def CheckedOK(self):
951
 
        self.checked_ok()
 
824
        return self.checked_ok()
952
825
    
953
826
    # Enable - method
954
827
    @dbus.service.method(_interface)
975
848
    
976
849
    ## Properties
977
850
    
978
 
    # ApprovalPending - property
979
 
    @dbus_service_property(_interface, signature="b", access="read")
980
 
    def ApprovalPending_dbus_property(self):
981
 
        return dbus.Boolean(bool(self.approvals_pending))
982
 
    
983
 
    # ApprovedByDefault - property
984
 
    @dbus_service_property(_interface, signature="b",
985
 
                           access="readwrite")
986
 
    def ApprovedByDefault_dbus_property(self, value=None):
987
 
        if value is None:       # get
988
 
            return dbus.Boolean(self.approved_by_default)
989
 
        self.approved_by_default = bool(value)
990
 
        # Emit D-Bus signal
991
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
992
 
                             dbus.Boolean(value, variant_level=1))
993
 
    
994
 
    # ApprovalDelay - property
995
 
    @dbus_service_property(_interface, signature="t",
996
 
                           access="readwrite")
997
 
    def ApprovalDelay_dbus_property(self, value=None):
998
 
        if value is None:       # get
999
 
            return dbus.UInt64(self.approval_delay_milliseconds())
1000
 
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1001
 
        # Emit D-Bus signal
1002
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
1003
 
                             dbus.UInt64(value, variant_level=1))
1004
 
    
1005
 
    # ApprovalDuration - property
1006
 
    @dbus_service_property(_interface, signature="t",
1007
 
                           access="readwrite")
1008
 
    def ApprovalDuration_dbus_property(self, value=None):
1009
 
        if value is None:       # get
1010
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
1011
 
                    self.approval_duration))
1012
 
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1013
 
        # Emit D-Bus signal
1014
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
1015
 
                             dbus.UInt64(value, variant_level=1))
1016
 
    
1017
 
    # Name - property
1018
 
    @dbus_service_property(_interface, signature="s", access="read")
1019
 
    def Name_dbus_property(self):
 
851
    # name - property
 
852
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
853
    def name_dbus_property(self):
1020
854
        return dbus.String(self.name)
1021
855
    
1022
 
    # Fingerprint - property
1023
 
    @dbus_service_property(_interface, signature="s", access="read")
1024
 
    def Fingerprint_dbus_property(self):
 
856
    # fingerprint - property
 
857
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
858
    def fingerprint_dbus_property(self):
1025
859
        return dbus.String(self.fingerprint)
1026
860
    
1027
 
    # Host - property
1028
 
    @dbus_service_property(_interface, signature="s",
1029
 
                           access="readwrite")
1030
 
    def Host_dbus_property(self, value=None):
 
861
    # host - property
 
862
    @dbus_service_property(_interface, signature=u"s",
 
863
                           access=u"readwrite")
 
864
    def host_dbus_property(self, value=None):
1031
865
        if value is None:       # get
1032
866
            return dbus.String(self.host)
1033
867
        self.host = value
1034
868
        # Emit D-Bus signal
1035
 
        self.PropertyChanged(dbus.String("Host"),
 
869
        self.PropertyChanged(dbus.String(u"host"),
1036
870
                             dbus.String(value, variant_level=1))
1037
871
    
1038
 
    # Created - property
1039
 
    @dbus_service_property(_interface, signature="s", access="read")
1040
 
    def Created_dbus_property(self):
 
872
    # created - property
 
873
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
874
    def created_dbus_property(self):
1041
875
        return dbus.String(self._datetime_to_dbus(self.created))
1042
876
    
1043
 
    # LastEnabled - property
1044
 
    @dbus_service_property(_interface, signature="s", access="read")
1045
 
    def LastEnabled_dbus_property(self):
 
877
    # last_enabled - property
 
878
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
879
    def last_enabled_dbus_property(self):
1046
880
        if self.last_enabled is None:
1047
 
            return dbus.String("")
 
881
            return dbus.String(u"")
1048
882
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1049
883
    
1050
 
    # Enabled - property
1051
 
    @dbus_service_property(_interface, signature="b",
1052
 
                           access="readwrite")
1053
 
    def Enabled_dbus_property(self, value=None):
 
884
    # enabled - property
 
885
    @dbus_service_property(_interface, signature=u"b",
 
886
                           access=u"readwrite")
 
887
    def enabled_dbus_property(self, value=None):
1054
888
        if value is None:       # get
1055
889
            return dbus.Boolean(self.enabled)
1056
890
        if value:
1058
892
        else:
1059
893
            self.disable()
1060
894
    
1061
 
    # LastCheckedOK - property
1062
 
    @dbus_service_property(_interface, signature="s",
1063
 
                           access="readwrite")
1064
 
    def LastCheckedOK_dbus_property(self, value=None):
 
895
    # last_checked_ok - property
 
896
    @dbus_service_property(_interface, signature=u"s",
 
897
                           access=u"readwrite")
 
898
    def last_checked_ok_dbus_property(self, value=None):
1065
899
        if value is not None:
1066
900
            self.checked_ok()
1067
901
            return
1068
902
        if self.last_checked_ok is None:
1069
 
            return dbus.String("")
 
903
            return dbus.String(u"")
1070
904
        return dbus.String(self._datetime_to_dbus(self
1071
905
                                                  .last_checked_ok))
1072
906
    
1073
 
    # LastApprovalRequest - property
1074
 
    @dbus_service_property(_interface, signature="s", access="read")
1075
 
    def LastApprovalRequest_dbus_property(self):
1076
 
        if self.last_approval_request is None:
1077
 
            return dbus.String("")
1078
 
        return dbus.String(self.
1079
 
                           _datetime_to_dbus(self
1080
 
                                             .last_approval_request))
1081
 
    
1082
 
    # Timeout - property
1083
 
    @dbus_service_property(_interface, signature="t",
1084
 
                           access="readwrite")
1085
 
    def Timeout_dbus_property(self, value=None):
 
907
    # timeout - property
 
908
    @dbus_service_property(_interface, signature=u"t",
 
909
                           access=u"readwrite")
 
910
    def timeout_dbus_property(self, value=None):
1086
911
        if value is None:       # get
1087
912
            return dbus.UInt64(self.timeout_milliseconds())
1088
913
        self.timeout = datetime.timedelta(0, 0, 0, value)
1089
914
        # Emit D-Bus signal
1090
 
        self.PropertyChanged(dbus.String("Timeout"),
 
915
        self.PropertyChanged(dbus.String(u"timeout"),
1091
916
                             dbus.UInt64(value, variant_level=1))
1092
 
        if getattr(self, "disable_initiator_tag", None) is None:
 
917
        if getattr(self, u"disable_initiator_tag", None) is None:
1093
918
            return
1094
919
        # Reschedule timeout
1095
920
        gobject.source_remove(self.disable_initiator_tag)
1107
932
            self.disable_initiator_tag = (gobject.timeout_add
1108
933
                                          (time_to_die, self.disable))
1109
934
    
1110
 
    # Interval - property
1111
 
    @dbus_service_property(_interface, signature="t",
1112
 
                           access="readwrite")
1113
 
    def Interval_dbus_property(self, value=None):
 
935
    # interval - property
 
936
    @dbus_service_property(_interface, signature=u"t",
 
937
                           access=u"readwrite")
 
938
    def interval_dbus_property(self, value=None):
1114
939
        if value is None:       # get
1115
940
            return dbus.UInt64(self.interval_milliseconds())
1116
941
        self.interval = datetime.timedelta(0, 0, 0, value)
1117
942
        # Emit D-Bus signal
1118
 
        self.PropertyChanged(dbus.String("Interval"),
 
943
        self.PropertyChanged(dbus.String(u"interval"),
1119
944
                             dbus.UInt64(value, variant_level=1))
1120
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
945
        if getattr(self, u"checker_initiator_tag", None) is None:
1121
946
            return
1122
947
        # Reschedule checker run
1123
948
        gobject.source_remove(self.checker_initiator_tag)
1125
950
                                      (value, self.start_checker))
1126
951
        self.start_checker()    # Start one now, too
1127
952
 
1128
 
    # Checker - property
1129
 
    @dbus_service_property(_interface, signature="s",
1130
 
                           access="readwrite")
1131
 
    def Checker_dbus_property(self, value=None):
 
953
    # checker - property
 
954
    @dbus_service_property(_interface, signature=u"s",
 
955
                           access=u"readwrite")
 
956
    def checker_dbus_property(self, value=None):
1132
957
        if value is None:       # get
1133
958
            return dbus.String(self.checker_command)
1134
959
        self.checker_command = value
1135
960
        # Emit D-Bus signal
1136
 
        self.PropertyChanged(dbus.String("Checker"),
 
961
        self.PropertyChanged(dbus.String(u"checker"),
1137
962
                             dbus.String(self.checker_command,
1138
963
                                         variant_level=1))
1139
964
    
1140
 
    # CheckerRunning - property
1141
 
    @dbus_service_property(_interface, signature="b",
1142
 
                           access="readwrite")
1143
 
    def CheckerRunning_dbus_property(self, value=None):
 
965
    # checker_running - property
 
966
    @dbus_service_property(_interface, signature=u"b",
 
967
                           access=u"readwrite")
 
968
    def checker_running_dbus_property(self, value=None):
1144
969
        if value is None:       # get
1145
970
            return dbus.Boolean(self.checker is not None)
1146
971
        if value:
1148
973
        else:
1149
974
            self.stop_checker()
1150
975
    
1151
 
    # ObjectPath - property
1152
 
    @dbus_service_property(_interface, signature="o", access="read")
1153
 
    def ObjectPath_dbus_property(self):
 
976
    # object_path - property
 
977
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
978
    def object_path_dbus_property(self):
1154
979
        return self.dbus_object_path # is already a dbus.ObjectPath
1155
980
    
1156
 
    # Secret = property
1157
 
    @dbus_service_property(_interface, signature="ay",
1158
 
                           access="write", byte_arrays=True)
1159
 
    def Secret_dbus_property(self, value):
 
981
    # secret = property
 
982
    @dbus_service_property(_interface, signature=u"ay",
 
983
                           access=u"write", byte_arrays=True)
 
984
    def secret_dbus_property(self, value):
1160
985
        self.secret = str(value)
1161
986
    
1162
987
    del _interface
1163
988
 
1164
989
 
1165
 
class ProxyClient(object):
1166
 
    def __init__(self, child_pipe, fpr, address):
1167
 
        self._pipe = child_pipe
1168
 
        self._pipe.send(('init', fpr, address))
1169
 
        if not self._pipe.recv():
1170
 
            raise KeyError()
1171
 
 
1172
 
    def __getattribute__(self, name):
1173
 
        if(name == '_pipe'):
1174
 
            return super(ProxyClient, self).__getattribute__(name)
1175
 
        self._pipe.send(('getattr', name))
1176
 
        data = self._pipe.recv()
1177
 
        if data[0] == 'data':
1178
 
            return data[1]
1179
 
        if data[0] == 'function':
1180
 
            def func(*args, **kwargs):
1181
 
                self._pipe.send(('funcall', name, args, kwargs))
1182
 
                return self._pipe.recv()[1]
1183
 
            return func
1184
 
 
1185
 
    def __setattr__(self, name, value):
1186
 
        if(name == '_pipe'):
1187
 
            return super(ProxyClient, self).__setattr__(name, value)
1188
 
        self._pipe.send(('setattr', name, value))
1189
 
 
1190
 
 
1191
990
class ClientHandler(socketserver.BaseRequestHandler, object):
1192
991
    """A class to handle client connections.
1193
992
    
1195
994
    Note: This will run in its own forked process."""
1196
995
    
1197
996
    def handle(self):
1198
 
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1199
 
            logger.info("TCP connection from: %s",
1200
 
                        unicode(self.client_address))
1201
 
            logger.debug("Pipe FD: %d",
1202
 
                         self.server.child_pipe.fileno())
1203
 
 
 
997
        logger.info(u"TCP connection from: %s",
 
998
                    unicode(self.client_address))
 
999
        logger.debug(u"IPC Pipe FD: %d",
 
1000
                     self.server.child_pipe[1].fileno())
 
1001
        # Open IPC pipe to parent process
 
1002
        with contextlib.nested(self.server.child_pipe[1],
 
1003
                               self.server.parent_pipe[0]
 
1004
                               ) as (ipc, ipc_return):
1204
1005
            session = (gnutls.connection
1205
1006
                       .ClientSession(self.request,
1206
1007
                                      gnutls.connection
1207
1008
                                      .X509Credentials()))
1208
 
 
 
1009
            
1209
1010
            # Note: gnutls.connection.X509Credentials is really a
1210
1011
            # generic GnuTLS certificate credentials object so long as
1211
1012
            # no X.509 keys are added to it.  Therefore, we can use it
1212
1013
            # here despite using OpenPGP certificates.
1213
 
 
1214
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1215
 
            #                      "+AES-256-CBC", "+SHA1",
1216
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1217
 
            #                      "+DHE-DSS"))
 
1014
            
 
1015
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1016
            #                      u"+AES-256-CBC", u"+SHA1",
 
1017
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1018
            #                      u"+DHE-DSS"))
1218
1019
            # Use a fallback default, since this MUST be set.
1219
1020
            priority = self.server.gnutls_priority
1220
1021
            if priority is None:
1221
 
                priority = "NORMAL"
 
1022
                priority = u"NORMAL"
1222
1023
            (gnutls.library.functions
1223
1024
             .gnutls_priority_set_direct(session._c_object,
1224
1025
                                         priority, None))
1225
 
 
 
1026
            
1226
1027
            # Start communication using the Mandos protocol
1227
1028
            # Get protocol number
1228
1029
            line = self.request.makefile().readline()
1229
 
            logger.debug("Protocol version: %r", line)
 
1030
            logger.debug(u"Protocol version: %r", line)
1230
1031
            try:
1231
1032
                if int(line.strip().split()[0]) > 1:
1232
1033
                    raise RuntimeError
1233
 
            except (ValueError, IndexError, RuntimeError) as error:
1234
 
                logger.error("Unknown protocol version: %s", error)
 
1034
            except (ValueError, IndexError, RuntimeError), error:
 
1035
                logger.error(u"Unknown protocol version: %s", error)
1235
1036
                return
1236
 
 
 
1037
            
1237
1038
            # Start GnuTLS connection
1238
1039
            try:
1239
1040
                session.handshake()
1240
 
            except gnutls.errors.GNUTLSError as error:
1241
 
                logger.warning("Handshake failed: %s", error)
 
1041
            except gnutls.errors.GNUTLSError, error:
 
1042
                logger.warning(u"Handshake failed: %s", error)
1242
1043
                # Do not run session.bye() here: the session is not
1243
1044
                # established.  Just abandon the request.
1244
1045
                return
1245
 
            logger.debug("Handshake succeeded")
1246
 
 
1247
 
            approval_required = False
 
1046
            logger.debug(u"Handshake succeeded")
1248
1047
            try:
1249
1048
                try:
1250
1049
                    fpr = self.fingerprint(self.peer_certificate
1251
1050
                                           (session))
1252
 
                except (TypeError,
1253
 
                        gnutls.errors.GNUTLSError) as error:
1254
 
                    logger.warning("Bad certificate: %s", error)
 
1051
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1052
                    logger.warning(u"Bad certificate: %s", error)
1255
1053
                    return
1256
 
                logger.debug("Fingerprint: %s", fpr)
 
1054
                logger.debug(u"Fingerprint: %s", fpr)
1257
1055
 
1258
 
                try:
1259
 
                    client = ProxyClient(child_pipe, fpr,
1260
 
                                         self.client_address)
1261
 
                except KeyError:
1262
 
                    return
1263
 
                
1264
 
                if client.approval_delay:
1265
 
                    delay = client.approval_delay
1266
 
                    client.approvals_pending += 1
1267
 
                    approval_required = True
1268
 
                
1269
 
                while True:
1270
 
                    if not client.enabled:
1271
 
                        logger.info("Client %s is disabled",
1272
 
                                       client.name)
1273
 
                        if self.server.use_dbus:
1274
 
                            # Emit D-Bus signal
1275
 
                            client.Rejected("Disabled")                    
1276
 
                        return
1277
 
                    
1278
 
                    if client._approved or not client.approval_delay:
1279
 
                        #We are approved or approval is disabled
 
1056
                for c in self.server.clients:
 
1057
                    if c.fingerprint == fpr:
 
1058
                        client = c
1280
1059
                        break
1281
 
                    elif client._approved is None:
1282
 
                        logger.info("Client %s needs approval",
1283
 
                                    client.name)
1284
 
                        if self.server.use_dbus:
1285
 
                            # Emit D-Bus signal
1286
 
                            client.NeedApproval(
1287
 
                                client.approval_delay_milliseconds(),
1288
 
                                client.approved_by_default)
1289
 
                    else:
1290
 
                        logger.warning("Client %s was not approved",
1291
 
                                       client.name)
1292
 
                        if self.server.use_dbus:
1293
 
                            # Emit D-Bus signal
1294
 
                            client.Rejected("Denied")
1295
 
                        return
1296
 
                    
1297
 
                    #wait until timeout or approved
1298
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1299
 
                    time = datetime.datetime.now()
1300
 
                    client.changedstate.acquire()
1301
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1302
 
                    client.changedstate.release()
1303
 
                    time2 = datetime.datetime.now()
1304
 
                    if (time2 - time) >= delay:
1305
 
                        if not client.approved_by_default:
1306
 
                            logger.warning("Client %s timed out while"
1307
 
                                           " waiting for approval",
1308
 
                                           client.name)
1309
 
                            if self.server.use_dbus:
1310
 
                                # Emit D-Bus signal
1311
 
                                client.Rejected("Approval timed out")
1312
 
                            return
1313
 
                        else:
1314
 
                            break
1315
 
                    else:
1316
 
                        delay -= time2 - time
1317
 
                
 
1060
                else:
 
1061
                    ipc.write(u"NOTFOUND %s %s\n"
 
1062
                              % (fpr, unicode(self.client_address)))
 
1063
                    return
 
1064
                
 
1065
                class ClientProxy(object):
 
1066
                    """Client proxy object.  Not for calling methods."""
 
1067
                    def __init__(self, client):
 
1068
                        self.client = client
 
1069
                    def __getattr__(self, name):
 
1070
                        if name.startswith("ipc_"):
 
1071
                            def tempfunc():
 
1072
                                ipc.write("%s %s\n" % (name[4:].upper(),
 
1073
                                                       self.client.name))
 
1074
                            return tempfunc
 
1075
                        if not hasattr(self.client, name):
 
1076
                            raise AttributeError
 
1077
                        ipc.write(u"GETATTR %s %s\n"
 
1078
                                  % (name, self.client.fingerprint))
 
1079
                        return pickle.load(ipc_return)
 
1080
                clientproxy = ClientProxy(client)
 
1081
                # Have to check if client.enabled, since it is
 
1082
                # possible that the client was disabled since the
 
1083
                # GnuTLS session was established.
 
1084
                if not clientproxy.enabled:
 
1085
                    clientproxy.ipc_disabled()
 
1086
                    return
 
1087
                
 
1088
                clientproxy.ipc_sending()
1318
1089
                sent_size = 0
1319
1090
                while sent_size < len(client.secret):
1320
 
                    try:
1321
 
                        sent = session.send(client.secret[sent_size:])
1322
 
                    except gnutls.errors.GNUTLSError as error:
1323
 
                        logger.warning("gnutls send failed")
1324
 
                        return
1325
 
                    logger.debug("Sent: %d, remaining: %d",
 
1091
                    sent = session.send(client.secret[sent_size:])
 
1092
                    logger.debug(u"Sent: %d, remaining: %d",
1326
1093
                                 sent, len(client.secret)
1327
1094
                                 - (sent_size + sent))
1328
1095
                    sent_size += sent
1329
 
 
1330
 
                logger.info("Sending secret to %s", client.name)
1331
 
                # bump the timeout as if seen
1332
 
                client.checked_ok()
1333
 
                if self.server.use_dbus:
1334
 
                    # Emit D-Bus signal
1335
 
                    client.GotSecret()
1336
 
            
1337
1096
            finally:
1338
 
                if approval_required:
1339
 
                    client.approvals_pending -= 1
1340
 
                try:
1341
 
                    session.bye()
1342
 
                except gnutls.errors.GNUTLSError as error:
1343
 
                    logger.warning("GnuTLS bye failed")
 
1097
                session.bye()
1344
1098
    
1345
1099
    @staticmethod
1346
1100
    def peer_certificate(session):
1356
1110
                     .gnutls_certificate_get_peers
1357
1111
                     (session._c_object, ctypes.byref(list_size)))
1358
1112
        if not bool(cert_list) and list_size.value != 0:
1359
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1360
 
                                            " certificate")
 
1113
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1114
                                            u" certificate")
1361
1115
        if list_size.value == 0:
1362
1116
            return None
1363
1117
        cert = cert_list[0]
1389
1143
        if crtverify.value != 0:
1390
1144
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1391
1145
            raise (gnutls.errors.CertificateSecurityError
1392
 
                   ("Verify failed"))
 
1146
                   (u"Verify failed"))
1393
1147
        # New buffer for the fingerprint
1394
1148
        buf = ctypes.create_string_buffer(20)
1395
1149
        buf_len = ctypes.c_size_t()
1402
1156
        # Convert the buffer to a Python bytestring
1403
1157
        fpr = ctypes.string_at(buf, buf_len.value)
1404
1158
        # Convert the bytestring to hexadecimal notation
1405
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1159
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1406
1160
        return hex_fpr
1407
1161
 
1408
1162
 
1409
 
class MultiprocessingMixIn(object):
1410
 
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1411
 
    def sub_process_main(self, request, address):
1412
 
        try:
1413
 
            self.finish_request(request, address)
1414
 
        except:
1415
 
            self.handle_error(request, address)
1416
 
        self.close_request(request)
1417
 
            
1418
 
    def process_request(self, request, address):
1419
 
        """Start a new process to process the request."""
1420
 
        multiprocessing.Process(target = self.sub_process_main,
1421
 
                                args = (request, address)).start()
1422
 
 
1423
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1424
 
    """ adds a pipe to the MixIn """
 
1163
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
 
1164
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
1425
1165
    def process_request(self, request, client_address):
1426
1166
        """Overrides and wraps the original process_request().
1427
1167
        
1428
1168
        This function creates a new pipe in self.pipe
1429
1169
        """
1430
 
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1431
 
 
1432
 
        super(MultiprocessingMixInWithPipe,
 
1170
        # Child writes to child_pipe
 
1171
        self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
 
1172
        # Parent writes to parent_pipe
 
1173
        self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
 
1174
        super(ForkingMixInWithPipes,
1433
1175
              self).process_request(request, client_address)
1434
 
        self.child_pipe.close()
1435
 
        self.add_pipe(parent_pipe)
1436
 
 
1437
 
    def add_pipe(self, parent_pipe):
 
1176
        # Close unused ends for parent
 
1177
        self.parent_pipe[0].close() # close read end
 
1178
        self.child_pipe[1].close()  # close write end
 
1179
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
 
1180
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1438
1181
        """Dummy function; override as necessary"""
1439
 
        raise NotImplementedError
1440
 
 
1441
 
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1182
        child_pipe_fd.close()
 
1183
        parent_pipe_fd.close()
 
1184
 
 
1185
 
 
1186
class IPv6_TCPServer(ForkingMixInWithPipes,
1442
1187
                     socketserver.TCPServer, object):
1443
1188
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1444
1189
    
1460
1205
        bind to an address or port if they were not specified."""
1461
1206
        if self.interface is not None:
1462
1207
            if SO_BINDTODEVICE is None:
1463
 
                logger.error("SO_BINDTODEVICE does not exist;"
1464
 
                             " cannot bind to interface %s",
 
1208
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1209
                             u" cannot bind to interface %s",
1465
1210
                             self.interface)
1466
1211
            else:
1467
1212
                try:
1468
1213
                    self.socket.setsockopt(socket.SOL_SOCKET,
1469
1214
                                           SO_BINDTODEVICE,
1470
1215
                                           str(self.interface
1471
 
                                               + '\0'))
1472
 
                except socket.error as error:
 
1216
                                               + u'\0'))
 
1217
                except socket.error, error:
1473
1218
                    if error[0] == errno.EPERM:
1474
 
                        logger.error("No permission to"
1475
 
                                     " bind to interface %s",
 
1219
                        logger.error(u"No permission to"
 
1220
                                     u" bind to interface %s",
1476
1221
                                     self.interface)
1477
1222
                    elif error[0] == errno.ENOPROTOOPT:
1478
 
                        logger.error("SO_BINDTODEVICE not available;"
1479
 
                                     " cannot bind to interface %s",
 
1223
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1224
                                     u" cannot bind to interface %s",
1480
1225
                                     self.interface)
1481
1226
                    else:
1482
1227
                        raise
1484
1229
        if self.server_address[0] or self.server_address[1]:
1485
1230
            if not self.server_address[0]:
1486
1231
                if self.address_family == socket.AF_INET6:
1487
 
                    any_address = "::" # in6addr_any
 
1232
                    any_address = u"::" # in6addr_any
1488
1233
                else:
1489
1234
                    any_address = socket.INADDR_ANY
1490
1235
                self.server_address = (any_address,
1529
1274
            return socketserver.TCPServer.server_activate(self)
1530
1275
    def enable(self):
1531
1276
        self.enabled = True
1532
 
    def add_pipe(self, parent_pipe):
 
1277
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1533
1278
        # Call "handle_ipc" for both data and EOF events
1534
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
1279
        gobject.io_add_watch(child_pipe_fd.fileno(),
1535
1280
                             gobject.IO_IN | gobject.IO_HUP,
1536
1281
                             functools.partial(self.handle_ipc,
1537
 
                                               parent_pipe = parent_pipe))
1538
 
        
1539
 
    def handle_ipc(self, source, condition, parent_pipe=None,
1540
 
                   client_object=None):
 
1282
                                               reply = parent_pipe_fd,
 
1283
                                               sender= child_pipe_fd))
 
1284
    def handle_ipc(self, source, condition, reply=None, sender=None):
1541
1285
        condition_names = {
1542
 
            gobject.IO_IN: "IN",   # There is data to read.
1543
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1286
            gobject.IO_IN: u"IN",   # There is data to read.
 
1287
            gobject.IO_OUT: u"OUT", # Data can be written (without
1544
1288
                                    # blocking).
1545
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1546
 
            gobject.IO_ERR: "ERR", # Error condition.
1547
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1289
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1290
            gobject.IO_ERR: u"ERR", # Error condition.
 
1291
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1548
1292
                                    # broken, usually for pipes and
1549
1293
                                    # sockets).
1550
1294
            }
1552
1296
                                       for cond, name in
1553
1297
                                       condition_names.iteritems()
1554
1298
                                       if cond & condition)
1555
 
        # error or the other end of multiprocessing.Pipe has closed
1556
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1557
 
            return False
1558
 
        
1559
 
        # Read a request from the child
1560
 
        request = parent_pipe.recv()
1561
 
        command = request[0]
1562
 
        
1563
 
        if command == 'init':
1564
 
            fpr = request[1]
1565
 
            address = request[2]
1566
 
            
1567
 
            for c in self.clients:
1568
 
                if c.fingerprint == fpr:
1569
 
                    client = c
1570
 
                    break
1571
 
            else:
1572
 
                logger.info("Client not found for fingerprint: %s, ad"
1573
 
                            "dress: %s", fpr, address)
1574
 
                if self.use_dbus:
1575
 
                    # Emit D-Bus signal
1576
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1577
 
                parent_pipe.send(False)
1578
 
                return False
1579
 
            
1580
 
            gobject.io_add_watch(parent_pipe.fileno(),
1581
 
                                 gobject.IO_IN | gobject.IO_HUP,
1582
 
                                 functools.partial(self.handle_ipc,
1583
 
                                                   parent_pipe = parent_pipe,
1584
 
                                                   client_object = client))
1585
 
            parent_pipe.send(True)
1586
 
            # remove the old hook in favor of the new above hook on same fileno
1587
 
            return False
1588
 
        if command == 'funcall':
1589
 
            funcname = request[1]
1590
 
            args = request[2]
1591
 
            kwargs = request[3]
1592
 
            
1593
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1594
 
 
1595
 
        if command == 'getattr':
1596
 
            attrname = request[1]
1597
 
            if callable(client_object.__getattribute__(attrname)):
1598
 
                parent_pipe.send(('function',))
1599
 
            else:
1600
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1601
 
        
1602
 
        if command == 'setattr':
1603
 
            attrname = request[1]
1604
 
            value = request[2]
1605
 
            setattr(client_object, attrname, value)
1606
 
 
 
1299
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1300
                     conditions_string)
 
1301
        
 
1302
        # Read a line from the file object
 
1303
        cmdline = sender.readline()
 
1304
        if not cmdline:             # Empty line means end of file
 
1305
            # close the IPC pipes
 
1306
            sender.close()
 
1307
            reply.close()
 
1308
            
 
1309
            # Stop calling this function
 
1310
            return False
 
1311
        
 
1312
        logger.debug(u"IPC command: %r", cmdline)
 
1313
        
 
1314
        # Parse and act on command
 
1315
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
 
1316
        
 
1317
        if cmd == u"NOTFOUND":
 
1318
            fpr, address = args.split(None, 1)
 
1319
            logger.warning(u"Client not found for fingerprint: %s, ad"
 
1320
                           u"dress: %s", fpr, address)
 
1321
            if self.use_dbus:
 
1322
                # Emit D-Bus signal
 
1323
                mandos_dbus_service.ClientNotFound(fpr, address)
 
1324
        elif cmd == u"DISABLED":
 
1325
            for client in self.clients:
 
1326
                if client.name == args:
 
1327
                    logger.warning(u"Client %s is disabled", args)
 
1328
                    if self.use_dbus:
 
1329
                        # Emit D-Bus signal
 
1330
                        client.Rejected()
 
1331
                    break
 
1332
            else:
 
1333
                logger.error(u"Unknown client %s is disabled", args)
 
1334
        elif cmd == u"SENDING":
 
1335
            for client in self.clients:
 
1336
                if client.name == args:
 
1337
                    logger.info(u"Sending secret to %s", client.name)
 
1338
                    client.checked_ok()
 
1339
                    if self.use_dbus:
 
1340
                        # Emit D-Bus signal
 
1341
                        client.GotSecret()
 
1342
                    break
 
1343
            else:
 
1344
                logger.error(u"Sending secret to unknown client %s",
 
1345
                             args)
 
1346
        elif cmd == u"GETATTR":
 
1347
            attr_name, fpr = args.split(None, 1)
 
1348
            for client in self.clients:
 
1349
                if client.fingerprint == fpr:
 
1350
                    attr_value = getattr(client, attr_name, None)
 
1351
                    logger.debug("IPC reply: %r", attr_value)
 
1352
                    pickle.dump(attr_value, reply)
 
1353
                    break
 
1354
            else:
 
1355
                logger.error(u"Client %s on address %s requesting "
 
1356
                             u"attribute %s not found", fpr, address,
 
1357
                             attr_name)
 
1358
                pickle.dump(None, reply)
 
1359
        else:
 
1360
            logger.error(u"Unknown IPC command: %r", cmdline)
 
1361
        
 
1362
        # Keep calling this function
1607
1363
        return True
1608
1364
 
1609
1365
 
1610
1366
def string_to_delta(interval):
1611
1367
    """Parse a string and return a datetime.timedelta
1612
1368
    
1613
 
    >>> string_to_delta('7d')
 
1369
    >>> string_to_delta(u'7d')
1614
1370
    datetime.timedelta(7)
1615
 
    >>> string_to_delta('60s')
 
1371
    >>> string_to_delta(u'60s')
1616
1372
    datetime.timedelta(0, 60)
1617
 
    >>> string_to_delta('60m')
 
1373
    >>> string_to_delta(u'60m')
1618
1374
    datetime.timedelta(0, 3600)
1619
 
    >>> string_to_delta('24h')
 
1375
    >>> string_to_delta(u'24h')
1620
1376
    datetime.timedelta(1)
1621
 
    >>> string_to_delta('1w')
 
1377
    >>> string_to_delta(u'1w')
1622
1378
    datetime.timedelta(7)
1623
 
    >>> string_to_delta('5m 30s')
 
1379
    >>> string_to_delta(u'5m 30s')
1624
1380
    datetime.timedelta(0, 330)
1625
1381
    """
1626
1382
    timevalue = datetime.timedelta(0)
1628
1384
        try:
1629
1385
            suffix = unicode(s[-1])
1630
1386
            value = int(s[:-1])
1631
 
            if suffix == "d":
 
1387
            if suffix == u"d":
1632
1388
                delta = datetime.timedelta(value)
1633
 
            elif suffix == "s":
 
1389
            elif suffix == u"s":
1634
1390
                delta = datetime.timedelta(0, value)
1635
 
            elif suffix == "m":
 
1391
            elif suffix == u"m":
1636
1392
                delta = datetime.timedelta(0, 0, 0, 0, value)
1637
 
            elif suffix == "h":
 
1393
            elif suffix == u"h":
1638
1394
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1639
 
            elif suffix == "w":
 
1395
            elif suffix == u"w":
1640
1396
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1641
1397
            else:
1642
 
                raise ValueError("Unknown suffix %r" % suffix)
1643
 
        except (ValueError, IndexError) as e:
1644
 
            raise ValueError(*(e.args))
 
1398
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1399
        except (ValueError, IndexError), e:
 
1400
            raise ValueError(e.message)
1645
1401
        timevalue += delta
1646
1402
    return timevalue
1647
1403
 
1653
1409
    global if_nametoindex
1654
1410
    try:
1655
1411
        if_nametoindex = (ctypes.cdll.LoadLibrary
1656
 
                          (ctypes.util.find_library("c"))
 
1412
                          (ctypes.util.find_library(u"c"))
1657
1413
                          .if_nametoindex)
1658
1414
    except (OSError, AttributeError):
1659
 
        logger.warning("Doing if_nametoindex the hard way")
 
1415
        logger.warning(u"Doing if_nametoindex the hard way")
1660
1416
        def if_nametoindex(interface):
1661
1417
            "Get an interface index the hard way, i.e. using fcntl()"
1662
1418
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1663
1419
            with contextlib.closing(socket.socket()) as s:
1664
1420
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1665
 
                                    struct.pack(str("16s16x"),
 
1421
                                    struct.pack(str(u"16s16x"),
1666
1422
                                                interface))
1667
 
            interface_index = struct.unpack(str("I"),
 
1423
            interface_index = struct.unpack(str(u"I"),
1668
1424
                                            ifreq[16:20])[0]
1669
1425
            return interface_index
1670
1426
    return if_nametoindex(interface)
1678
1434
        sys.exit()
1679
1435
    os.setsid()
1680
1436
    if not nochdir:
1681
 
        os.chdir("/")
 
1437
        os.chdir(u"/")
1682
1438
    if os.fork():
1683
1439
        sys.exit()
1684
1440
    if not noclose:
1686
1442
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1687
1443
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1688
1444
            raise OSError(errno.ENODEV,
1689
 
                          "%s not a character device"
 
1445
                          u"%s not a character device"
1690
1446
                          % os.path.devnull)
1691
1447
        os.dup2(null, sys.stdin.fileno())
1692
1448
        os.dup2(null, sys.stdout.fileno())
1700
1456
    ##################################################################
1701
1457
    # Parsing of options, both command line and config file
1702
1458
    
1703
 
    parser = argparse.ArgumentParser()
1704
 
    parser.add_argument("-v", "--version", action="version",
1705
 
                        version = "%%(prog)s %s" % version,
1706
 
                        help="show version number and exit")
1707
 
    parser.add_argument("-i", "--interface", metavar="IF",
1708
 
                        help="Bind to interface IF")
1709
 
    parser.add_argument("-a", "--address",
1710
 
                        help="Address to listen for requests on")
1711
 
    parser.add_argument("-p", "--port", type=int,
1712
 
                        help="Port number to receive requests on")
1713
 
    parser.add_argument("--check", action="store_true",
1714
 
                        help="Run self-test")
1715
 
    parser.add_argument("--debug", action="store_true",
1716
 
                        help="Debug mode; run in foreground and log"
1717
 
                        " to terminal")
1718
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
1719
 
                        help="Debug level for stdout output")
1720
 
    parser.add_argument("--priority", help="GnuTLS"
1721
 
                        " priority string (see GnuTLS documentation)")
1722
 
    parser.add_argument("--servicename",
1723
 
                        metavar="NAME", help="Zeroconf service name")
1724
 
    parser.add_argument("--configdir",
1725
 
                        default="/etc/mandos", metavar="DIR",
1726
 
                        help="Directory to search for configuration"
1727
 
                        " files")
1728
 
    parser.add_argument("--no-dbus", action="store_false",
1729
 
                        dest="use_dbus", help="Do not provide D-Bus"
1730
 
                        " system bus interface")
1731
 
    parser.add_argument("--no-ipv6", action="store_false",
1732
 
                        dest="use_ipv6", help="Do not use IPv6")
1733
 
    options = parser.parse_args()
 
1459
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1460
    parser.add_option("-i", u"--interface", type=u"string",
 
1461
                      metavar="IF", help=u"Bind to interface IF")
 
1462
    parser.add_option("-a", u"--address", type=u"string",
 
1463
                      help=u"Address to listen for requests on")
 
1464
    parser.add_option("-p", u"--port", type=u"int",
 
1465
                      help=u"Port number to receive requests on")
 
1466
    parser.add_option("--check", action=u"store_true",
 
1467
                      help=u"Run self-test")
 
1468
    parser.add_option("--debug", action=u"store_true",
 
1469
                      help=u"Debug mode; run in foreground and log to"
 
1470
                      u" terminal")
 
1471
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1472
                      u" priority string (see GnuTLS documentation)")
 
1473
    parser.add_option("--servicename", type=u"string",
 
1474
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1475
    parser.add_option("--configdir", type=u"string",
 
1476
                      default=u"/etc/mandos", metavar=u"DIR",
 
1477
                      help=u"Directory to search for configuration"
 
1478
                      u" files")
 
1479
    parser.add_option("--no-dbus", action=u"store_false",
 
1480
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1481
                      u" system bus interface")
 
1482
    parser.add_option("--no-ipv6", action=u"store_false",
 
1483
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1484
    options = parser.parse_args()[0]
1734
1485
    
1735
1486
    if options.check:
1736
1487
        import doctest
1738
1489
        sys.exit()
1739
1490
    
1740
1491
    # Default values for config file for server-global settings
1741
 
    server_defaults = { "interface": "",
1742
 
                        "address": "",
1743
 
                        "port": "",
1744
 
                        "debug": "False",
1745
 
                        "priority":
1746
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1747
 
                        "servicename": "Mandos",
1748
 
                        "use_dbus": "True",
1749
 
                        "use_ipv6": "True",
1750
 
                        "debuglevel": "",
 
1492
    server_defaults = { u"interface": u"",
 
1493
                        u"address": u"",
 
1494
                        u"port": u"",
 
1495
                        u"debug": u"False",
 
1496
                        u"priority":
 
1497
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1498
                        u"servicename": u"Mandos",
 
1499
                        u"use_dbus": u"True",
 
1500
                        u"use_ipv6": u"True",
1751
1501
                        }
1752
1502
    
1753
1503
    # Parse config file for server-global settings
1754
1504
    server_config = configparser.SafeConfigParser(server_defaults)
1755
1505
    del server_defaults
1756
1506
    server_config.read(os.path.join(options.configdir,
1757
 
                                    "mandos.conf"))
 
1507
                                    u"mandos.conf"))
1758
1508
    # Convert the SafeConfigParser object to a dict
1759
1509
    server_settings = server_config.defaults()
1760
1510
    # Use the appropriate methods on the non-string config options
1761
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1762
 
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1511
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1512
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1763
1513
                                                           option)
1764
1514
    if server_settings["port"]:
1765
 
        server_settings["port"] = server_config.getint("DEFAULT",
1766
 
                                                       "port")
 
1515
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1516
                                                       u"port")
1767
1517
    del server_config
1768
1518
    
1769
1519
    # Override the settings from the config file with command line
1770
1520
    # options, if set.
1771
 
    for option in ("interface", "address", "port", "debug",
1772
 
                   "priority", "servicename", "configdir",
1773
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1521
    for option in (u"interface", u"address", u"port", u"debug",
 
1522
                   u"priority", u"servicename", u"configdir",
 
1523
                   u"use_dbus", u"use_ipv6"):
1774
1524
        value = getattr(options, option)
1775
1525
        if value is not None:
1776
1526
            server_settings[option] = value
1784
1534
    ##################################################################
1785
1535
    
1786
1536
    # For convenience
1787
 
    debug = server_settings["debug"]
1788
 
    debuglevel = server_settings["debuglevel"]
1789
 
    use_dbus = server_settings["use_dbus"]
1790
 
    use_ipv6 = server_settings["use_ipv6"]
1791
 
 
1792
 
    if server_settings["servicename"] != "Mandos":
 
1537
    debug = server_settings[u"debug"]
 
1538
    use_dbus = server_settings[u"use_dbus"]
 
1539
    use_ipv6 = server_settings[u"use_ipv6"]
 
1540
    
 
1541
    if not debug:
 
1542
        syslogger.setLevel(logging.WARNING)
 
1543
        console.setLevel(logging.WARNING)
 
1544
    
 
1545
    if server_settings[u"servicename"] != u"Mandos":
1793
1546
        syslogger.setFormatter(logging.Formatter
1794
 
                               ('Mandos (%s) [%%(process)d]:'
1795
 
                                ' %%(levelname)s: %%(message)s'
1796
 
                                % server_settings["servicename"]))
 
1547
                               (u'Mandos (%s) [%%(process)d]:'
 
1548
                                u' %%(levelname)s: %%(message)s'
 
1549
                                % server_settings[u"servicename"]))
1797
1550
    
1798
1551
    # Parse config file with clients
1799
 
    client_defaults = { "timeout": "1h",
1800
 
                        "interval": "5m",
1801
 
                        "checker": "fping -q -- %%(host)s",
1802
 
                        "host": "",
1803
 
                        "approval_delay": "0s",
1804
 
                        "approval_duration": "1s",
 
1552
    client_defaults = { u"timeout": u"1h",
 
1553
                        u"interval": u"5m",
 
1554
                        u"checker": u"fping -q -- %%(host)s",
 
1555
                        u"host": u"",
1805
1556
                        }
1806
1557
    client_config = configparser.SafeConfigParser(client_defaults)
1807
 
    client_config.read(os.path.join(server_settings["configdir"],
1808
 
                                    "clients.conf"))
 
1558
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1559
                                    u"clients.conf"))
1809
1560
    
1810
1561
    global mandos_dbus_service
1811
1562
    mandos_dbus_service = None
1812
1563
    
1813
 
    tcp_server = MandosServer((server_settings["address"],
1814
 
                               server_settings["port"]),
 
1564
    tcp_server = MandosServer((server_settings[u"address"],
 
1565
                               server_settings[u"port"]),
1815
1566
                              ClientHandler,
1816
 
                              interface=(server_settings["interface"]
1817
 
                                         or None),
 
1567
                              interface=server_settings[u"interface"],
1818
1568
                              use_ipv6=use_ipv6,
1819
1569
                              gnutls_priority=
1820
 
                              server_settings["priority"],
 
1570
                              server_settings[u"priority"],
1821
1571
                              use_dbus=use_dbus)
1822
 
    if not debug:
1823
 
        pidfilename = "/var/run/mandos.pid"
1824
 
        try:
1825
 
            pidfile = open(pidfilename, "w")
1826
 
        except IOError:
1827
 
            logger.error("Could not open file %r", pidfilename)
 
1572
    pidfilename = u"/var/run/mandos.pid"
 
1573
    try:
 
1574
        pidfile = open(pidfilename, u"w")
 
1575
    except IOError:
 
1576
        logger.error(u"Could not open file %r", pidfilename)
1828
1577
    
1829
1578
    try:
1830
 
        uid = pwd.getpwnam("_mandos").pw_uid
1831
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1579
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1580
        gid = pwd.getpwnam(u"_mandos").pw_gid
1832
1581
    except KeyError:
1833
1582
        try:
1834
 
            uid = pwd.getpwnam("mandos").pw_uid
1835
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1583
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1584
            gid = pwd.getpwnam(u"mandos").pw_gid
1836
1585
        except KeyError:
1837
1586
            try:
1838
 
                uid = pwd.getpwnam("nobody").pw_uid
1839
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1587
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1588
                gid = pwd.getpwnam(u"nobody").pw_gid
1840
1589
            except KeyError:
1841
1590
                uid = 65534
1842
1591
                gid = 65534
1843
1592
    try:
1844
1593
        os.setgid(gid)
1845
1594
        os.setuid(uid)
1846
 
    except OSError as error:
 
1595
    except OSError, error:
1847
1596
        if error[0] != errno.EPERM:
1848
1597
            raise error
1849
1598
    
1850
 
    if not debug and not debuglevel:
1851
 
        syslogger.setLevel(logging.WARNING)
1852
 
        console.setLevel(logging.WARNING)
1853
 
    if debuglevel:
1854
 
        level = getattr(logging, debuglevel.upper())
1855
 
        syslogger.setLevel(level)
1856
 
        console.setLevel(level)
1857
 
 
 
1599
    # Enable all possible GnuTLS debugging
1858
1600
    if debug:
1859
 
        # Enable all possible GnuTLS debugging
1860
 
        
1861
1601
        # "Use a log level over 10 to enable all debugging options."
1862
1602
        # - GnuTLS manual
1863
1603
        gnutls.library.functions.gnutls_global_set_log_level(11)
1864
1604
        
1865
1605
        @gnutls.library.types.gnutls_log_func
1866
1606
        def debug_gnutls(level, string):
1867
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1607
            logger.debug(u"GnuTLS: %s", string[:-1])
1868
1608
        
1869
1609
        (gnutls.library.functions
1870
1610
         .gnutls_global_set_log_function(debug_gnutls))
1871
 
        
1872
 
        # Redirect stdin so all checkers get /dev/null
1873
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1874
 
        os.dup2(null, sys.stdin.fileno())
1875
 
        if null > 2:
1876
 
            os.close(null)
1877
 
    else:
1878
 
        # No console logging
1879
 
        logger.removeHandler(console)
1880
 
    
1881
 
    # Need to fork before connecting to D-Bus
1882
 
    if not debug:
1883
 
        # Close all input and output, do double fork, etc.
1884
 
        daemon()
1885
1611
    
1886
1612
    global main_loop
1887
1613
    # From the Avahi example code
1891
1617
    # End of Avahi example code
1892
1618
    if use_dbus:
1893
1619
        try:
1894
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1620
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1895
1621
                                            bus, do_not_queue=True)
1896
 
        except dbus.exceptions.NameExistsException as e:
1897
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1622
        except dbus.exceptions.NameExistsException, e:
 
1623
            logger.error(unicode(e) + u", disabling D-Bus")
1898
1624
            use_dbus = False
1899
 
            server_settings["use_dbus"] = False
 
1625
            server_settings[u"use_dbus"] = False
1900
1626
            tcp_server.use_dbus = False
1901
1627
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1902
 
    service = AvahiService(name = server_settings["servicename"],
1903
 
                           servicetype = "_mandos._tcp",
 
1628
    service = AvahiService(name = server_settings[u"servicename"],
 
1629
                           servicetype = u"_mandos._tcp",
1904
1630
                           protocol = protocol, bus = bus)
1905
1631
    if server_settings["interface"]:
1906
1632
        service.interface = (if_nametoindex
1907
 
                             (str(server_settings["interface"])))
1908
 
    
1909
 
    global multiprocessing_manager
1910
 
    multiprocessing_manager = multiprocessing.Manager()
 
1633
                             (str(server_settings[u"interface"])))
1911
1634
    
1912
1635
    client_class = Client
1913
1636
    if use_dbus:
1914
1637
        client_class = functools.partial(ClientDBus, bus = bus)
1915
 
    def client_config_items(config, section):
1916
 
        special_settings = {
1917
 
            "approved_by_default":
1918
 
                lambda: config.getboolean(section,
1919
 
                                          "approved_by_default"),
1920
 
            }
1921
 
        for name, value in config.items(section):
1922
 
            try:
1923
 
                yield (name, special_settings[name]())
1924
 
            except KeyError:
1925
 
                yield (name, value)
1926
 
    
1927
1638
    tcp_server.clients.update(set(
1928
1639
            client_class(name = section,
1929
 
                         config= dict(client_config_items(
1930
 
                        client_config, section)))
 
1640
                         config= dict(client_config.items(section)))
1931
1641
            for section in client_config.sections()))
1932
1642
    if not tcp_server.clients:
1933
 
        logger.warning("No clients defined")
1934
 
        
 
1643
        logger.warning(u"No clients defined")
 
1644
    
 
1645
    if debug:
 
1646
        # Redirect stdin so all checkers get /dev/null
 
1647
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1648
        os.dup2(null, sys.stdin.fileno())
 
1649
        if null > 2:
 
1650
            os.close(null)
 
1651
    else:
 
1652
        # No console logging
 
1653
        logger.removeHandler(console)
 
1654
        # Close all input and output, do double fork, etc.
 
1655
        daemon()
 
1656
    
 
1657
    try:
 
1658
        with pidfile:
 
1659
            pid = os.getpid()
 
1660
            pidfile.write(str(pid) + "\n")
 
1661
        del pidfile
 
1662
    except IOError:
 
1663
        logger.error(u"Could not write to file %r with PID %d",
 
1664
                     pidfilename, pid)
 
1665
    except NameError:
 
1666
        # "pidfile" was never created
 
1667
        pass
 
1668
    del pidfilename
 
1669
    
1935
1670
    if not debug:
1936
 
        try:
1937
 
            with pidfile:
1938
 
                pid = os.getpid()
1939
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1940
 
            del pidfile
1941
 
        except IOError:
1942
 
            logger.error("Could not write to file %r with PID %d",
1943
 
                         pidfilename, pid)
1944
 
        except NameError:
1945
 
            # "pidfile" was never created
1946
 
            pass
1947
 
        del pidfilename
1948
 
        
1949
1671
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1950
 
 
1951
1672
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1952
1673
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1953
1674
    
1955
1676
        class MandosDBusService(dbus.service.Object):
1956
1677
            """A D-Bus proxy object"""
1957
1678
            def __init__(self):
1958
 
                dbus.service.Object.__init__(self, bus, "/")
1959
 
            _interface = "se.bsnet.fukt.Mandos"
 
1679
                dbus.service.Object.__init__(self, bus, u"/")
 
1680
            _interface = u"se.bsnet.fukt.Mandos"
1960
1681
            
1961
 
            @dbus.service.signal(_interface, signature="o")
 
1682
            @dbus.service.signal(_interface, signature=u"o")
1962
1683
            def ClientAdded(self, objpath):
1963
1684
                "D-Bus signal"
1964
1685
                pass
1965
1686
            
1966
 
            @dbus.service.signal(_interface, signature="ss")
 
1687
            @dbus.service.signal(_interface, signature=u"ss")
1967
1688
            def ClientNotFound(self, fingerprint, address):
1968
1689
                "D-Bus signal"
1969
1690
                pass
1970
1691
            
1971
 
            @dbus.service.signal(_interface, signature="os")
 
1692
            @dbus.service.signal(_interface, signature=u"os")
1972
1693
            def ClientRemoved(self, objpath, name):
1973
1694
                "D-Bus signal"
1974
1695
                pass
1975
1696
            
1976
 
            @dbus.service.method(_interface, out_signature="ao")
 
1697
            @dbus.service.method(_interface, out_signature=u"ao")
1977
1698
            def GetAllClients(self):
1978
1699
                "D-Bus method"
1979
1700
                return dbus.Array(c.dbus_object_path
1980
1701
                                  for c in tcp_server.clients)
1981
1702
            
1982
1703
            @dbus.service.method(_interface,
1983
 
                                 out_signature="a{oa{sv}}")
 
1704
                                 out_signature=u"a{oa{sv}}")
1984
1705
            def GetAllClientsWithProperties(self):
1985
1706
                "D-Bus method"
1986
1707
                return dbus.Dictionary(
1987
 
                    ((c.dbus_object_path, c.GetAll(""))
 
1708
                    ((c.dbus_object_path, c.GetAll(u""))
1988
1709
                     for c in tcp_server.clients),
1989
 
                    signature="oa{sv}")
 
1710
                    signature=u"oa{sv}")
1990
1711
            
1991
 
            @dbus.service.method(_interface, in_signature="o")
 
1712
            @dbus.service.method(_interface, in_signature=u"o")
1992
1713
            def RemoveClient(self, object_path):
1993
1714
                "D-Bus method"
1994
1715
                for c in tcp_server.clients:
2036
1757
    # Find out what port we got
2037
1758
    service.port = tcp_server.socket.getsockname()[1]
2038
1759
    if use_ipv6:
2039
 
        logger.info("Now listening on address %r, port %d,"
 
1760
        logger.info(u"Now listening on address %r, port %d,"
2040
1761
                    " flowinfo %d, scope_id %d"
2041
1762
                    % tcp_server.socket.getsockname())
2042
1763
    else:                       # IPv4
2043
 
        logger.info("Now listening on address %r, port %d"
 
1764
        logger.info(u"Now listening on address %r, port %d"
2044
1765
                    % tcp_server.socket.getsockname())
2045
1766
    
2046
1767
    #service.interface = tcp_server.socket.getsockname()[3]
2049
1770
        # From the Avahi example code
2050
1771
        try:
2051
1772
            service.activate()
2052
 
        except dbus.exceptions.DBusException as error:
2053
 
            logger.critical("DBusException: %s", error)
 
1773
        except dbus.exceptions.DBusException, error:
 
1774
            logger.critical(u"DBusException: %s", error)
2054
1775
            cleanup()
2055
1776
            sys.exit(1)
2056
1777
        # End of Avahi example code
2060
1781
                             (tcp_server.handle_request
2061
1782
                              (*args[2:], **kwargs) or True))
2062
1783
        
2063
 
        logger.debug("Starting main loop")
 
1784
        logger.debug(u"Starting main loop")
2064
1785
        main_loop.run()
2065
 
    except AvahiError as error:
2066
 
        logger.critical("AvahiError: %s", error)
 
1786
    except AvahiError, error:
 
1787
        logger.critical(u"AvahiError: %s", error)
2067
1788
        cleanup()
2068
1789
        sys.exit(1)
2069
1790
    except KeyboardInterrupt:
2070
1791
        if debug:
2071
 
            print("", file=sys.stderr)
2072
 
        logger.debug("Server received KeyboardInterrupt")
2073
 
    logger.debug("Server exiting")
 
1792
            print >> sys.stderr
 
1793
        logger.debug(u"Server received KeyboardInterrupt")
 
1794
    logger.debug(u"Server exiting")
2074
1795
    # Must run before the D-Bus bus name gets deregistered
2075
1796
    cleanup()
2076
1797