/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-09-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

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
82
81
        SO_BINDTODEVICE = None
83
82
 
84
83
 
85
 
version = "1.2.3"
 
84
version = "1.0.14"
86
85
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
86
#logger = logging.getLogger(u'mandos')
 
87
logger = logging.Logger(u'mandos')
89
88
syslogger = (logging.handlers.SysLogHandler
90
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
 
90
              address = "/dev/log"))
92
91
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
 
92
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
93
                        u' %(message)s'))
95
94
logger.addHandler(syslogger)
96
95
 
97
96
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
 
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
98
                                       u' %(levelname)s:'
 
99
                                       u' %(message)s'))
101
100
logger.addHandler(console)
102
101
 
103
102
class AvahiError(Exception):
120
119
    Attributes:
121
120
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
121
               Used to optionally bind to the specified interface.
123
 
    name: string; Example: 'Mandos'
124
 
    type: string; Example: '_mandos._tcp'.
 
122
    name: string; Example: u'Mandos'
 
123
    type: string; Example: u'_mandos._tcp'.
125
124
                  See <http://www.dns-sd.org/ServiceTypes.html>
126
125
    port: integer; what port to announce
127
126
    TXT: list of strings; TXT record for the service
136
135
    """
137
136
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
137
                 servicetype = None, port = None, TXT = None,
139
 
                 domain = "", host = "", max_renames = 32768,
 
138
                 domain = u"", host = u"", max_renames = 32768,
140
139
                 protocol = avahi.PROTO_UNSPEC, bus = None):
141
140
        self.interface = interface
142
141
        self.name = name
154
153
    def rename(self):
155
154
        """Derived from the Avahi example code"""
156
155
        if self.rename_count >= self.max_renames:
157
 
            logger.critical("No suitable Zeroconf service name found"
158
 
                            " after %i retries, exiting.",
 
156
            logger.critical(u"No suitable Zeroconf service name found"
 
157
                            u" after %i retries, exiting.",
159
158
                            self.rename_count)
160
 
            raise AvahiServiceError("Too many renames")
 
159
            raise AvahiServiceError(u"Too many renames")
161
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
162
 
        logger.info("Changing Zeroconf service name to %r ...",
 
161
        logger.info(u"Changing Zeroconf service name to %r ...",
163
162
                    self.name)
164
163
        syslogger.setFormatter(logging.Formatter
165
 
                               ('Mandos (%s) [%%(process)d]:'
166
 
                                ' %%(levelname)s: %%(message)s'
 
164
                               (u'Mandos (%s) [%%(process)d]:'
 
165
                                u' %%(levelname)s: %%(message)s'
167
166
                                % self.name))
168
167
        self.remove()
169
168
        try:
170
169
            self.add()
171
170
        except dbus.exceptions.DBusException, error:
172
 
            logger.critical("DBusException: %s", error)
 
171
            logger.critical(u"DBusException: %s", error)
173
172
            self.cleanup()
174
173
            os._exit(1)
175
174
        self.rename_count += 1
187
186
            self.group.connect_to_signal('StateChanged',
188
187
                                         self
189
188
                                         .entry_group_state_changed)
190
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
189
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
191
190
                     self.name, self.type)
192
191
        self.group.AddService(
193
192
            self.interface,
200
199
        self.group.Commit()
201
200
    def entry_group_state_changed(self, state, error):
202
201
        """Derived from the Avahi example code"""
203
 
        logger.debug("Avahi entry group state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
204
203
        
205
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
 
            logger.debug("Zeroconf service established.")
 
205
            logger.debug(u"Zeroconf service established.")
207
206
        elif state == avahi.ENTRY_GROUP_COLLISION:
208
 
            logger.info("Zeroconf service name collision.")
 
207
            logger.warning(u"Zeroconf service name collision.")
209
208
            self.rename()
210
209
        elif state == avahi.ENTRY_GROUP_FAILURE:
211
 
            logger.critical("Avahi: Error in group state changed %s",
 
210
            logger.critical(u"Avahi: Error in group state changed %s",
212
211
                            unicode(error))
213
 
            raise AvahiGroupError("State changed: %s"
 
212
            raise AvahiGroupError(u"State changed: %s"
214
213
                                  % unicode(error))
215
214
    def cleanup(self):
216
215
        """Derived from the Avahi example code"""
219
218
            self.group = None
220
219
    def server_state_changed(self, state):
221
220
        """Derived from the Avahi example code"""
222
 
        logger.debug("Avahi server state change: %i", state)
 
221
        logger.debug(u"Avahi server state change: %i", state)
223
222
        if state == avahi.SERVER_COLLISION:
224
 
            logger.error("Zeroconf server name collision")
 
223
            logger.error(u"Zeroconf server name collision")
225
224
            self.remove()
226
225
        elif state == avahi.SERVER_RUNNING:
227
226
            self.add()
232
231
                self.bus.get_object(avahi.DBUS_NAME,
233
232
                                    avahi.DBUS_PATH_SERVER),
234
233
                avahi.DBUS_INTERFACE_SERVER)
235
 
        self.server.connect_to_signal("StateChanged",
 
234
        self.server.connect_to_signal(u"StateChanged",
236
235
                                 self.server_state_changed)
237
236
        self.server_state_changed(self.server.GetState())
238
237
 
247
246
    checker:    subprocess.Popen(); a running checker process used
248
247
                                    to see if the client lives.
249
248
                                    'None' if no process is running.
250
 
    checker_callback_tag: a gobject event source tag, or None
 
249
    checker_callback_tag:  - '' -
251
250
    checker_command: string; External command which is run to check
252
251
                     if client lives.  %() expansions are done at
253
252
                     runtime with vars(self) as dict, so that for
256
255
    created:    datetime.datetime(); (UTC) object creation
257
256
    current_checker_command: string; current running checker_command
258
257
    disable_hook:  If set, called by disable() as disable_hook(self)
259
 
    disable_initiator_tag: a gobject event source tag, or None
 
258
    disable_initiator_tag: - '' -
260
259
    enabled:    bool()
261
260
    fingerprint: string (40 or 32 hexadecimal digits); used to
262
261
                 uniquely identify the client
263
262
    host:       string; available for use by the checker command
264
263
    interval:   datetime.timedelta(); How often to start a new checker
265
 
    last_approval_request: datetime.datetime(); (UTC) or None
266
264
    last_checked_ok: datetime.datetime(); (UTC) or None
267
265
    last_enabled: datetime.datetime(); (UTC)
268
266
    name:       string; from the config file, used in log messages and
273
271
    runtime_expansions: Allowed attributes for runtime expansion.
274
272
    """
275
273
    
276
 
    runtime_expansions = ("approval_delay", "approval_duration",
277
 
                          "created", "enabled", "fingerprint",
278
 
                          "host", "interval", "last_checked_ok",
279
 
                          "last_enabled", "name", "timeout")
 
274
    runtime_expansions = (u"approval_delay", u"approval_duration",
 
275
                          u"created", u"enabled", u"fingerprint",
 
276
                          u"host", u"interval", u"last_checked_ok",
 
277
                          u"last_enabled", u"name", u"timeout")
280
278
    
281
279
    @staticmethod
282
280
    def _timedelta_to_milliseconds(td):
303
301
        self.name = name
304
302
        if config is None:
305
303
            config = {}
306
 
        logger.debug("Creating client %r", self.name)
 
304
        logger.debug(u"Creating client %r", self.name)
307
305
        # Uppercase and remove spaces from fingerprint for later
308
306
        # comparison purposes with return value from the fingerprint()
309
307
        # function
310
 
        self.fingerprint = (config["fingerprint"].upper()
311
 
                            .replace(" ", ""))
312
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
313
 
        if "secret" in config:
314
 
            self.secret = config["secret"].decode("base64")
315
 
        elif "secfile" in config:
 
308
        self.fingerprint = (config[u"fingerprint"].upper()
 
309
                            .replace(u" ", u""))
 
310
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
311
        if u"secret" in config:
 
312
            self.secret = config[u"secret"].decode(u"base64")
 
313
        elif u"secfile" in config:
316
314
            with open(os.path.expanduser(os.path.expandvars
317
 
                                         (config["secfile"])),
 
315
                                         (config[u"secfile"])),
318
316
                      "rb") as secfile:
319
317
                self.secret = secfile.read()
320
318
        else:
321
 
            raise TypeError("No secret or secfile for client %s"
 
319
            raise TypeError(u"No secret or secfile for client %s"
322
320
                            % self.name)
323
 
        self.host = config.get("host", "")
 
321
        self.host = config.get(u"host", u"")
324
322
        self.created = datetime.datetime.utcnow()
325
323
        self.enabled = False
326
 
        self.last_approval_request = None
327
324
        self.last_enabled = None
328
325
        self.last_checked_ok = None
329
 
        self.timeout = string_to_delta(config["timeout"])
330
 
        self.interval = string_to_delta(config["interval"])
 
326
        self.timeout = string_to_delta(config[u"timeout"])
 
327
        self.interval = string_to_delta(config[u"interval"])
331
328
        self.disable_hook = disable_hook
332
329
        self.checker = None
333
330
        self.checker_initiator_tag = None
334
331
        self.disable_initiator_tag = None
335
332
        self.checker_callback_tag = None
336
 
        self.checker_command = config["checker"]
 
333
        self.checker_command = config[u"checker"]
337
334
        self.current_checker_command = None
338
335
        self.last_connect = None
339
336
        self._approved = None
340
 
        self.approved_by_default = config.get("approved_by_default",
 
337
        self.approved_by_default = config.get(u"approved_by_default",
341
338
                                              True)
342
339
        self.approvals_pending = 0
343
340
        self.approval_delay = string_to_delta(
344
 
            config["approval_delay"])
 
341
            config[u"approval_delay"])
345
342
        self.approval_duration = string_to_delta(
346
 
            config["approval_duration"])
 
343
            config[u"approval_duration"])
347
344
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
348
345
    
349
346
    def send_changedstate(self):
353
350
        
354
351
    def enable(self):
355
352
        """Start this client's checker and timeout hooks"""
356
 
        if getattr(self, "enabled", False):
 
353
        if getattr(self, u"enabled", False):
357
354
            # Already enabled
358
355
            return
359
356
        self.send_changedstate()
378
375
        if not quiet:
379
376
            self.send_changedstate()
380
377
        if not quiet:
381
 
            logger.info("Disabling client %s", self.name)
382
 
        if getattr(self, "disable_initiator_tag", False):
 
378
            logger.info(u"Disabling client %s", self.name)
 
379
        if getattr(self, u"disable_initiator_tag", False):
383
380
            gobject.source_remove(self.disable_initiator_tag)
384
381
            self.disable_initiator_tag = None
385
 
        if getattr(self, "checker_initiator_tag", False):
 
382
        if getattr(self, u"checker_initiator_tag", False):
386
383
            gobject.source_remove(self.checker_initiator_tag)
387
384
            self.checker_initiator_tag = None
388
385
        self.stop_checker()
403
400
        if os.WIFEXITED(condition):
404
401
            exitstatus = os.WEXITSTATUS(condition)
405
402
            if exitstatus == 0:
406
 
                logger.info("Checker for %(name)s succeeded",
 
403
                logger.info(u"Checker for %(name)s succeeded",
407
404
                            vars(self))
408
405
                self.checked_ok()
409
406
            else:
410
 
                logger.info("Checker for %(name)s failed",
 
407
                logger.info(u"Checker for %(name)s failed",
411
408
                            vars(self))
412
409
        else:
413
 
            logger.warning("Checker for %(name)s crashed?",
 
410
            logger.warning(u"Checker for %(name)s crashed?",
414
411
                           vars(self))
415
412
    
416
413
    def checked_ok(self):
425
422
                                      (self.timeout_milliseconds(),
426
423
                                       self.disable))
427
424
    
428
 
    def need_approval(self):
429
 
        self.last_approval_request = datetime.datetime.utcnow()
430
 
    
431
425
    def start_checker(self):
432
426
        """Start a new checker subprocess if one is not running.
433
427
        
451
445
                raise error
452
446
        else:
453
447
            if pid:
454
 
                logger.warning("Checker was a zombie")
 
448
                logger.warning(u"Checker was a zombie")
455
449
                gobject.source_remove(self.checker_callback_tag)
456
450
                self.checker_callback(pid, status,
457
451
                                      self.current_checker_command)
464
458
                # Escape attributes for the shell
465
459
                escaped_attrs = dict(
466
460
                    (attr,
467
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
461
                     re.escape(unicode(str(getattr(self, attr, u"")),
468
462
                                       errors=
469
 
                                       'replace')))
 
463
                                       u'replace')))
470
464
                    for attr in
471
465
                    self.runtime_expansions)
472
466
 
473
467
                try:
474
468
                    command = self.checker_command % escaped_attrs
475
469
                except TypeError, error:
476
 
                    logger.error('Could not format string "%s":'
477
 
                                 ' %s', self.checker_command, error)
 
470
                    logger.error(u'Could not format string "%s":'
 
471
                                 u' %s', self.checker_command, error)
478
472
                    return True # Try again later
479
473
            self.current_checker_command = command
480
474
            try:
481
 
                logger.info("Starting checker %r for %s",
 
475
                logger.info(u"Starting checker %r for %s",
482
476
                            command, self.name)
483
477
                # We don't need to redirect stdout and stderr, since
484
478
                # in normal mode, that is already done by daemon(),
486
480
                # always replaced by /dev/null.)
487
481
                self.checker = subprocess.Popen(command,
488
482
                                                close_fds=True,
489
 
                                                shell=True, cwd="/")
 
483
                                                shell=True, cwd=u"/")
490
484
                self.checker_callback_tag = (gobject.child_watch_add
491
485
                                             (self.checker.pid,
492
486
                                              self.checker_callback,
498
492
                    gobject.source_remove(self.checker_callback_tag)
499
493
                    self.checker_callback(pid, status, command)
500
494
            except OSError, error:
501
 
                logger.error("Failed to start subprocess: %s",
 
495
                logger.error(u"Failed to start subprocess: %s",
502
496
                             error)
503
497
        # Re-run this periodically if run by gobject.timeout_add
504
498
        return True
508
502
        if self.checker_callback_tag:
509
503
            gobject.source_remove(self.checker_callback_tag)
510
504
            self.checker_callback_tag = None
511
 
        if getattr(self, "checker", None) is None:
 
505
        if getattr(self, u"checker", None) is None:
512
506
            return
513
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
507
        logger.debug(u"Stopping checker for %(name)s", vars(self))
514
508
        try:
515
509
            os.kill(self.checker.pid, signal.SIGTERM)
516
510
            #time.sleep(0.5)
521
515
                raise
522
516
        self.checker = None
523
517
 
524
 
def dbus_service_property(dbus_interface, signature="v",
525
 
                          access="readwrite", byte_arrays=False):
 
518
def dbus_service_property(dbus_interface, signature=u"v",
 
519
                          access=u"readwrite", byte_arrays=False):
526
520
    """Decorators for marking methods of a DBusObjectWithProperties to
527
521
    become properties on the D-Bus.
528
522
    
535
529
    """
536
530
    # Encoding deeply encoded byte arrays is not supported yet by the
537
531
    # "Set" method, so we fail early here:
538
 
    if byte_arrays and signature != "ay":
539
 
        raise ValueError("Byte arrays not supported for non-'ay'"
540
 
                         " signature %r" % signature)
 
532
    if byte_arrays and signature != u"ay":
 
533
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
534
                         u" signature %r" % signature)
541
535
    def decorator(func):
542
536
        func._dbus_is_property = True
543
537
        func._dbus_interface = dbus_interface
544
538
        func._dbus_signature = signature
545
539
        func._dbus_access = access
546
540
        func._dbus_name = func.__name__
547
 
        if func._dbus_name.endswith("_dbus_property"):
 
541
        if func._dbus_name.endswith(u"_dbus_property"):
548
542
            func._dbus_name = func._dbus_name[:-14]
549
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
543
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
550
544
        return func
551
545
    return decorator
552
546
 
580
574
    
581
575
    @staticmethod
582
576
    def _is_dbus_property(obj):
583
 
        return getattr(obj, "_dbus_is_property", False)
 
577
        return getattr(obj, u"_dbus_is_property", False)
584
578
    
585
579
    def _get_all_dbus_properties(self):
586
580
        """Returns a generator of (name, attribute) pairs
594
588
        property with the specified name and interface.
595
589
        """
596
590
        for name in (property_name,
597
 
                     property_name + "_dbus_property"):
 
591
                     property_name + u"_dbus_property"):
598
592
            prop = getattr(self, name, None)
599
593
            if (prop is None
600
594
                or not self._is_dbus_property(prop)
604
598
                continue
605
599
            return prop
606
600
        # No such property
607
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
 
                                   + interface_name + "."
 
601
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
602
                                   + interface_name + u"."
609
603
                                   + property_name)
610
604
    
611
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
612
 
                         out_signature="v")
 
605
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
606
                         out_signature=u"v")
613
607
    def Get(self, interface_name, property_name):
614
608
        """Standard D-Bus property Get() method, see D-Bus standard.
615
609
        """
616
610
        prop = self._get_dbus_property(interface_name, property_name)
617
 
        if prop._dbus_access == "write":
 
611
        if prop._dbus_access == u"write":
618
612
            raise DBusPropertyAccessException(property_name)
619
613
        value = prop()
620
 
        if not hasattr(value, "variant_level"):
 
614
        if not hasattr(value, u"variant_level"):
621
615
            return value
622
616
        return type(value)(value, variant_level=value.variant_level+1)
623
617
    
624
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
618
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
625
619
    def Set(self, interface_name, property_name, value):
626
620
        """Standard D-Bus property Set() method, see D-Bus standard.
627
621
        """
628
622
        prop = self._get_dbus_property(interface_name, property_name)
629
 
        if prop._dbus_access == "read":
 
623
        if prop._dbus_access == u"read":
630
624
            raise DBusPropertyAccessException(property_name)
631
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
625
        if prop._dbus_get_args_options[u"byte_arrays"]:
632
626
            # The byte_arrays option is not supported yet on
633
627
            # signatures other than "ay".
634
 
            if prop._dbus_signature != "ay":
 
628
            if prop._dbus_signature != u"ay":
635
629
                raise ValueError
636
630
            value = dbus.ByteArray(''.join(unichr(byte)
637
631
                                           for byte in value))
638
632
        prop(value)
639
633
    
640
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
 
                         out_signature="a{sv}")
 
634
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
635
                         out_signature=u"a{sv}")
642
636
    def GetAll(self, interface_name):
643
637
        """Standard D-Bus property GetAll() method, see D-Bus
644
638
        standard.
652
646
                # Interface non-empty but did not match
653
647
                continue
654
648
            # Ignore write-only properties
655
 
            if prop._dbus_access == "write":
 
649
            if prop._dbus_access == u"write":
656
650
                continue
657
651
            value = prop()
658
 
            if not hasattr(value, "variant_level"):
 
652
            if not hasattr(value, u"variant_level"):
659
653
                all[name] = value
660
654
                continue
661
655
            all[name] = type(value)(value, variant_level=
662
656
                                    value.variant_level+1)
663
 
        return dbus.Dictionary(all, signature="sv")
 
657
        return dbus.Dictionary(all, signature=u"sv")
664
658
    
665
659
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
666
 
                         out_signature="s",
 
660
                         out_signature=u"s",
667
661
                         path_keyword='object_path',
668
662
                         connection_keyword='connection')
669
663
    def Introspect(self, object_path, connection):
674
668
        try:
675
669
            document = xml.dom.minidom.parseString(xmlstring)
676
670
            def make_tag(document, name, prop):
677
 
                e = document.createElement("property")
678
 
                e.setAttribute("name", name)
679
 
                e.setAttribute("type", prop._dbus_signature)
680
 
                e.setAttribute("access", prop._dbus_access)
 
671
                e = document.createElement(u"property")
 
672
                e.setAttribute(u"name", name)
 
673
                e.setAttribute(u"type", prop._dbus_signature)
 
674
                e.setAttribute(u"access", prop._dbus_access)
681
675
                return e
682
 
            for if_tag in document.getElementsByTagName("interface"):
 
676
            for if_tag in document.getElementsByTagName(u"interface"):
683
677
                for tag in (make_tag(document, name, prop)
684
678
                            for name, prop
685
679
                            in self._get_all_dbus_properties()
686
680
                            if prop._dbus_interface
687
 
                            == if_tag.getAttribute("name")):
 
681
                            == if_tag.getAttribute(u"name")):
688
682
                    if_tag.appendChild(tag)
689
683
                # Add the names to the return values for the
690
684
                # "org.freedesktop.DBus.Properties" methods
691
 
                if (if_tag.getAttribute("name")
692
 
                    == "org.freedesktop.DBus.Properties"):
693
 
                    for cn in if_tag.getElementsByTagName("method"):
694
 
                        if cn.getAttribute("name") == "Get":
695
 
                            for arg in cn.getElementsByTagName("arg"):
696
 
                                if (arg.getAttribute("direction")
697
 
                                    == "out"):
698
 
                                    arg.setAttribute("name", "value")
699
 
                        elif cn.getAttribute("name") == "GetAll":
700
 
                            for arg in cn.getElementsByTagName("arg"):
701
 
                                if (arg.getAttribute("direction")
702
 
                                    == "out"):
703
 
                                    arg.setAttribute("name", "props")
704
 
            xmlstring = document.toxml("utf-8")
 
685
                if (if_tag.getAttribute(u"name")
 
686
                    == u"org.freedesktop.DBus.Properties"):
 
687
                    for cn in if_tag.getElementsByTagName(u"method"):
 
688
                        if cn.getAttribute(u"name") == u"Get":
 
689
                            for arg in cn.getElementsByTagName(u"arg"):
 
690
                                if (arg.getAttribute(u"direction")
 
691
                                    == u"out"):
 
692
                                    arg.setAttribute(u"name", u"value")
 
693
                        elif cn.getAttribute(u"name") == u"GetAll":
 
694
                            for arg in cn.getElementsByTagName(u"arg"):
 
695
                                if (arg.getAttribute(u"direction")
 
696
                                    == u"out"):
 
697
                                    arg.setAttribute(u"name", u"props")
 
698
            xmlstring = document.toxml(u"utf-8")
705
699
            document.unlink()
706
700
        except (AttributeError, xml.dom.DOMException,
707
701
                xml.parsers.expat.ExpatError), error:
708
 
            logger.error("Failed to override Introspection method",
 
702
            logger.error(u"Failed to override Introspection method",
709
703
                         error)
710
704
        return xmlstring
711
705
 
719
713
    """
720
714
    
721
715
    runtime_expansions = (Client.runtime_expansions
722
 
                          + ("dbus_object_path",))
 
716
                          + (u"dbus_object_path",))
723
717
    
724
718
    # dbus.service.Object doesn't use super(), so we can't either.
725
719
    
730
724
        # Only now, when this client is initialized, can it show up on
731
725
        # the D-Bus
732
726
        client_object_name = unicode(self.name).translate(
733
 
            {ord("."): ord("_"),
734
 
             ord("-"): ord("_")})
 
727
            {ord(u"."): ord(u"_"),
 
728
             ord(u"-"): ord(u"_")})
735
729
        self.dbus_object_path = (dbus.ObjectPath
736
 
                                 ("/clients/" + client_object_name))
 
730
                                 (u"/clients/" + client_object_name))
737
731
        DBusObjectWithProperties.__init__(self, self.bus,
738
732
                                          self.dbus_object_path)
739
733
        
746
740
        if (hasattr(self, "dbus_object_path")
747
741
            and bval is not bool(old_value)):
748
742
            dbus_bool = dbus.Boolean(bval, variant_level=1)
749
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
743
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
750
744
                                 dbus_bool)
751
745
 
752
746
    approvals_pending = property(_get_approvals_pending,
760
754
                           variant_level=variant_level)
761
755
    
762
756
    def enable(self):
763
 
        oldstate = getattr(self, "enabled", False)
 
757
        oldstate = getattr(self, u"enabled", False)
764
758
        r = Client.enable(self)
765
759
        if oldstate != self.enabled:
766
760
            # Emit D-Bus signals
767
 
            self.PropertyChanged(dbus.String("Enabled"),
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
768
762
                                 dbus.Boolean(True, variant_level=1))
769
763
            self.PropertyChanged(
770
 
                dbus.String("LastEnabled"),
 
764
                dbus.String(u"LastEnabled"),
771
765
                self._datetime_to_dbus(self.last_enabled,
772
766
                                       variant_level=1))
773
767
        return r
774
768
    
775
769
    def disable(self, quiet = False):
776
 
        oldstate = getattr(self, "enabled", False)
 
770
        oldstate = getattr(self, u"enabled", False)
777
771
        r = Client.disable(self, quiet=quiet)
778
772
        if not quiet and oldstate != self.enabled:
779
773
            # Emit D-Bus signal
780
 
            self.PropertyChanged(dbus.String("Enabled"),
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
781
775
                                 dbus.Boolean(False, variant_level=1))
782
776
        return r
783
777
    
786
780
            self.remove_from_connection()
787
781
        except LookupError:
788
782
            pass
789
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
783
        if hasattr(DBusObjectWithProperties, u"__del__"):
790
784
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
791
785
        Client.__del__(self, *args, **kwargs)
792
786
    
795
789
        self.checker_callback_tag = None
796
790
        self.checker = None
797
791
        # Emit D-Bus signal
798
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
799
793
                             dbus.Boolean(False, variant_level=1))
800
794
        if os.WIFEXITED(condition):
801
795
            exitstatus = os.WEXITSTATUS(condition)
816
810
        r = Client.checked_ok(self, *args, **kwargs)
817
811
        # Emit D-Bus signal
818
812
        self.PropertyChanged(
819
 
            dbus.String("LastCheckedOK"),
 
813
            dbus.String(u"LastCheckedOK"),
820
814
            (self._datetime_to_dbus(self.last_checked_ok,
821
815
                                    variant_level=1)))
822
816
        return r
823
817
    
824
 
    def need_approval(self, *args, **kwargs):
825
 
        r = Client.need_approval(self, *args, **kwargs)
826
 
        # Emit D-Bus signal
827
 
        self.PropertyChanged(
828
 
            dbus.String("LastApprovalRequest"),
829
 
            (self._datetime_to_dbus(self.last_approval_request,
830
 
                                    variant_level=1)))
831
 
        return r
832
 
    
833
818
    def start_checker(self, *args, **kwargs):
834
819
        old_checker = self.checker
835
820
        if self.checker is not None:
843
828
            # Emit D-Bus signal
844
829
            self.CheckerStarted(self.current_checker_command)
845
830
            self.PropertyChanged(
846
 
                dbus.String("CheckerRunning"),
 
831
                dbus.String(u"CheckerRunning"),
847
832
                dbus.Boolean(True, variant_level=1))
848
833
        return r
849
834
    
850
835
    def stop_checker(self, *args, **kwargs):
851
 
        old_checker = getattr(self, "checker", None)
 
836
        old_checker = getattr(self, u"checker", None)
852
837
        r = Client.stop_checker(self, *args, **kwargs)
853
838
        if (old_checker is not None
854
 
            and getattr(self, "checker", None) is None):
855
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
839
            and getattr(self, u"checker", None) is None):
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
856
841
                                 dbus.Boolean(False, variant_level=1))
857
842
        return r
858
843
 
869
854
    
870
855
    
871
856
    ## D-Bus methods, signals & properties
872
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
857
    _interface = u"se.bsnet.fukt.Mandos.Client"
873
858
    
874
859
    ## Signals
875
860
    
876
861
    # CheckerCompleted - signal
877
 
    @dbus.service.signal(_interface, signature="nxs")
 
862
    @dbus.service.signal(_interface, signature=u"nxs")
878
863
    def CheckerCompleted(self, exitcode, waitstatus, command):
879
864
        "D-Bus signal"
880
865
        pass
881
866
    
882
867
    # CheckerStarted - signal
883
 
    @dbus.service.signal(_interface, signature="s")
 
868
    @dbus.service.signal(_interface, signature=u"s")
884
869
    def CheckerStarted(self, command):
885
870
        "D-Bus signal"
886
871
        pass
887
872
    
888
873
    # PropertyChanged - signal
889
 
    @dbus.service.signal(_interface, signature="sv")
 
874
    @dbus.service.signal(_interface, signature=u"sv")
890
875
    def PropertyChanged(self, property, value):
891
876
        "D-Bus signal"
892
877
        pass
901
886
        pass
902
887
    
903
888
    # Rejected - signal
904
 
    @dbus.service.signal(_interface, signature="s")
 
889
    @dbus.service.signal(_interface, signature=u"s")
905
890
    def Rejected(self, reason):
906
891
        "D-Bus signal"
907
892
        pass
908
893
    
909
894
    # NeedApproval - signal
910
 
    @dbus.service.signal(_interface, signature="tb")
 
895
    @dbus.service.signal(_interface, signature=u"tb")
911
896
    def NeedApproval(self, timeout, default):
912
897
        "D-Bus signal"
913
 
        return self.need_approval()
 
898
        pass
914
899
    
915
900
    ## Methods
916
 
    
 
901
 
917
902
    # Approve - method
918
 
    @dbus.service.method(_interface, in_signature="b")
 
903
    @dbus.service.method(_interface, in_signature=u"b")
919
904
    def Approve(self, value):
920
905
        self.approve(value)
921
 
    
 
906
 
922
907
    # CheckedOK - method
923
908
    @dbus.service.method(_interface)
924
909
    def CheckedOK(self):
950
935
    ## Properties
951
936
    
952
937
    # ApprovalPending - property
953
 
    @dbus_service_property(_interface, signature="b", access="read")
 
938
    @dbus_service_property(_interface, signature=u"b", access=u"read")
954
939
    def ApprovalPending_dbus_property(self):
955
940
        return dbus.Boolean(bool(self.approvals_pending))
956
941
    
957
942
    # ApprovedByDefault - property
958
 
    @dbus_service_property(_interface, signature="b",
959
 
                           access="readwrite")
 
943
    @dbus_service_property(_interface, signature=u"b",
 
944
                           access=u"readwrite")
960
945
    def ApprovedByDefault_dbus_property(self, value=None):
961
946
        if value is None:       # get
962
947
            return dbus.Boolean(self.approved_by_default)
963
948
        self.approved_by_default = bool(value)
964
949
        # Emit D-Bus signal
965
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
950
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
966
951
                             dbus.Boolean(value, variant_level=1))
967
952
    
968
953
    # ApprovalDelay - property
969
 
    @dbus_service_property(_interface, signature="t",
970
 
                           access="readwrite")
 
954
    @dbus_service_property(_interface, signature=u"t",
 
955
                           access=u"readwrite")
971
956
    def ApprovalDelay_dbus_property(self, value=None):
972
957
        if value is None:       # get
973
958
            return dbus.UInt64(self.approval_delay_milliseconds())
974
959
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
960
        # Emit D-Bus signal
976
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
961
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
977
962
                             dbus.UInt64(value, variant_level=1))
978
963
    
979
964
    # ApprovalDuration - property
980
 
    @dbus_service_property(_interface, signature="t",
981
 
                           access="readwrite")
 
965
    @dbus_service_property(_interface, signature=u"t",
 
966
                           access=u"readwrite")
982
967
    def ApprovalDuration_dbus_property(self, value=None):
983
968
        if value is None:       # get
984
969
            return dbus.UInt64(self._timedelta_to_milliseconds(
985
970
                    self.approval_duration))
986
971
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
972
        # Emit D-Bus signal
988
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
973
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
989
974
                             dbus.UInt64(value, variant_level=1))
990
975
    
991
976
    # Name - property
992
 
    @dbus_service_property(_interface, signature="s", access="read")
 
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
993
978
    def Name_dbus_property(self):
994
979
        return dbus.String(self.name)
995
980
    
996
981
    # Fingerprint - property
997
 
    @dbus_service_property(_interface, signature="s", access="read")
 
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
998
983
    def Fingerprint_dbus_property(self):
999
984
        return dbus.String(self.fingerprint)
1000
985
    
1001
986
    # Host - property
1002
 
    @dbus_service_property(_interface, signature="s",
1003
 
                           access="readwrite")
 
987
    @dbus_service_property(_interface, signature=u"s",
 
988
                           access=u"readwrite")
1004
989
    def Host_dbus_property(self, value=None):
1005
990
        if value is None:       # get
1006
991
            return dbus.String(self.host)
1007
992
        self.host = value
1008
993
        # Emit D-Bus signal
1009
 
        self.PropertyChanged(dbus.String("Host"),
 
994
        self.PropertyChanged(dbus.String(u"Host"),
1010
995
                             dbus.String(value, variant_level=1))
1011
996
    
1012
997
    # Created - property
1013
 
    @dbus_service_property(_interface, signature="s", access="read")
 
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1014
999
    def Created_dbus_property(self):
1015
1000
        return dbus.String(self._datetime_to_dbus(self.created))
1016
1001
    
1017
1002
    # LastEnabled - property
1018
 
    @dbus_service_property(_interface, signature="s", access="read")
 
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1019
1004
    def LastEnabled_dbus_property(self):
1020
1005
        if self.last_enabled is None:
1021
 
            return dbus.String("")
 
1006
            return dbus.String(u"")
1022
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1023
1008
    
1024
1009
    # Enabled - property
1025
 
    @dbus_service_property(_interface, signature="b",
1026
 
                           access="readwrite")
 
1010
    @dbus_service_property(_interface, signature=u"b",
 
1011
                           access=u"readwrite")
1027
1012
    def Enabled_dbus_property(self, value=None):
1028
1013
        if value is None:       # get
1029
1014
            return dbus.Boolean(self.enabled)
1033
1018
            self.disable()
1034
1019
    
1035
1020
    # LastCheckedOK - property
1036
 
    @dbus_service_property(_interface, signature="s",
1037
 
                           access="readwrite")
 
1021
    @dbus_service_property(_interface, signature=u"s",
 
1022
                           access=u"readwrite")
1038
1023
    def LastCheckedOK_dbus_property(self, value=None):
1039
1024
        if value is not None:
1040
1025
            self.checked_ok()
1041
1026
            return
1042
1027
        if self.last_checked_ok is None:
1043
 
            return dbus.String("")
 
1028
            return dbus.String(u"")
1044
1029
        return dbus.String(self._datetime_to_dbus(self
1045
1030
                                                  .last_checked_ok))
1046
1031
    
1047
 
    # LastApprovalRequest - property
1048
 
    @dbus_service_property(_interface, signature="s", access="read")
1049
 
    def LastApprovalRequest_dbus_property(self):
1050
 
        if self.last_approval_request is None:
1051
 
            return dbus.String("")
1052
 
        return dbus.String(self.
1053
 
                           _datetime_to_dbus(self
1054
 
                                             .last_approval_request))
1055
 
    
1056
1032
    # Timeout - property
1057
 
    @dbus_service_property(_interface, signature="t",
1058
 
                           access="readwrite")
 
1033
    @dbus_service_property(_interface, signature=u"t",
 
1034
                           access=u"readwrite")
1059
1035
    def Timeout_dbus_property(self, value=None):
1060
1036
        if value is None:       # get
1061
1037
            return dbus.UInt64(self.timeout_milliseconds())
1062
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
1063
1039
        # Emit D-Bus signal
1064
 
        self.PropertyChanged(dbus.String("Timeout"),
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
1065
1041
                             dbus.UInt64(value, variant_level=1))
1066
 
        if getattr(self, "disable_initiator_tag", None) is None:
 
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
1067
1043
            return
1068
1044
        # Reschedule timeout
1069
1045
        gobject.source_remove(self.disable_initiator_tag)
1082
1058
                                          (time_to_die, self.disable))
1083
1059
    
1084
1060
    # Interval - property
1085
 
    @dbus_service_property(_interface, signature="t",
1086
 
                           access="readwrite")
 
1061
    @dbus_service_property(_interface, signature=u"t",
 
1062
                           access=u"readwrite")
1087
1063
    def Interval_dbus_property(self, value=None):
1088
1064
        if value is None:       # get
1089
1065
            return dbus.UInt64(self.interval_milliseconds())
1090
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
1091
1067
        # Emit D-Bus signal
1092
 
        self.PropertyChanged(dbus.String("Interval"),
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
1093
1069
                             dbus.UInt64(value, variant_level=1))
1094
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
1095
1071
            return
1096
1072
        # Reschedule checker run
1097
1073
        gobject.source_remove(self.checker_initiator_tag)
1100
1076
        self.start_checker()    # Start one now, too
1101
1077
 
1102
1078
    # Checker - property
1103
 
    @dbus_service_property(_interface, signature="s",
1104
 
                           access="readwrite")
 
1079
    @dbus_service_property(_interface, signature=u"s",
 
1080
                           access=u"readwrite")
1105
1081
    def Checker_dbus_property(self, value=None):
1106
1082
        if value is None:       # get
1107
1083
            return dbus.String(self.checker_command)
1108
1084
        self.checker_command = value
1109
1085
        # Emit D-Bus signal
1110
 
        self.PropertyChanged(dbus.String("Checker"),
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
1111
1087
                             dbus.String(self.checker_command,
1112
1088
                                         variant_level=1))
1113
1089
    
1114
1090
    # CheckerRunning - property
1115
 
    @dbus_service_property(_interface, signature="b",
1116
 
                           access="readwrite")
 
1091
    @dbus_service_property(_interface, signature=u"b",
 
1092
                           access=u"readwrite")
1117
1093
    def CheckerRunning_dbus_property(self, value=None):
1118
1094
        if value is None:       # get
1119
1095
            return dbus.Boolean(self.checker is not None)
1123
1099
            self.stop_checker()
1124
1100
    
1125
1101
    # ObjectPath - property
1126
 
    @dbus_service_property(_interface, signature="o", access="read")
 
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1127
1103
    def ObjectPath_dbus_property(self):
1128
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
1129
1105
    
1130
1106
    # Secret = property
1131
 
    @dbus_service_property(_interface, signature="ay",
1132
 
                           access="write", byte_arrays=True)
 
1107
    @dbus_service_property(_interface, signature=u"ay",
 
1108
                           access=u"write", byte_arrays=True)
1133
1109
    def Secret_dbus_property(self, value):
1134
1110
        self.secret = str(value)
1135
1111
    
1170
1146
    
1171
1147
    def handle(self):
1172
1148
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1173
 
            logger.info("TCP connection from: %s",
 
1149
            logger.info(u"TCP connection from: %s",
1174
1150
                        unicode(self.client_address))
1175
 
            logger.debug("Pipe FD: %d",
 
1151
            logger.debug(u"Pipe FD: %d",
1176
1152
                         self.server.child_pipe.fileno())
1177
1153
 
1178
1154
            session = (gnutls.connection
1185
1161
            # no X.509 keys are added to it.  Therefore, we can use it
1186
1162
            # here despite using OpenPGP certificates.
1187
1163
 
1188
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
 
            #                      "+AES-256-CBC", "+SHA1",
1190
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1191
 
            #                      "+DHE-DSS"))
 
1164
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1165
            #                      u"+AES-256-CBC", u"+SHA1",
 
1166
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1167
            #                      u"+DHE-DSS"))
1192
1168
            # Use a fallback default, since this MUST be set.
1193
1169
            priority = self.server.gnutls_priority
1194
1170
            if priority is None:
1195
 
                priority = "NORMAL"
 
1171
                priority = u"NORMAL"
1196
1172
            (gnutls.library.functions
1197
1173
             .gnutls_priority_set_direct(session._c_object,
1198
1174
                                         priority, None))
1200
1176
            # Start communication using the Mandos protocol
1201
1177
            # Get protocol number
1202
1178
            line = self.request.makefile().readline()
1203
 
            logger.debug("Protocol version: %r", line)
 
1179
            logger.debug(u"Protocol version: %r", line)
1204
1180
            try:
1205
1181
                if int(line.strip().split()[0]) > 1:
1206
1182
                    raise RuntimeError
1207
1183
            except (ValueError, IndexError, RuntimeError), error:
1208
 
                logger.error("Unknown protocol version: %s", error)
 
1184
                logger.error(u"Unknown protocol version: %s", error)
1209
1185
                return
1210
1186
 
1211
1187
            # Start GnuTLS connection
1212
1188
            try:
1213
1189
                session.handshake()
1214
1190
            except gnutls.errors.GNUTLSError, error:
1215
 
                logger.warning("Handshake failed: %s", error)
 
1191
                logger.warning(u"Handshake failed: %s", error)
1216
1192
                # Do not run session.bye() here: the session is not
1217
1193
                # established.  Just abandon the request.
1218
1194
                return
1219
 
            logger.debug("Handshake succeeded")
 
1195
            logger.debug(u"Handshake succeeded")
1220
1196
 
1221
1197
            approval_required = False
1222
1198
            try:
1224
1200
                    fpr = self.fingerprint(self.peer_certificate
1225
1201
                                           (session))
1226
1202
                except (TypeError, gnutls.errors.GNUTLSError), error:
1227
 
                    logger.warning("Bad certificate: %s", error)
 
1203
                    logger.warning(u"Bad certificate: %s", error)
1228
1204
                    return
1229
 
                logger.debug("Fingerprint: %s", fpr)
 
1205
                logger.debug(u"Fingerprint: %s", fpr)
1230
1206
 
1231
1207
                try:
1232
1208
                    client = ProxyClient(child_pipe, fpr,
1241
1217
                
1242
1218
                while True:
1243
1219
                    if not client.enabled:
1244
 
                        logger.warning("Client %s is disabled",
 
1220
                        logger.warning(u"Client %s is disabled",
1245
1221
                                       client.name)
1246
1222
                        if self.server.use_dbus:
1247
1223
                            # Emit D-Bus signal
1252
1228
                        #We are approved or approval is disabled
1253
1229
                        break
1254
1230
                    elif client._approved is None:
1255
 
                        logger.info("Client %s needs approval",
 
1231
                        logger.info(u"Client %s needs approval",
1256
1232
                                    client.name)
1257
1233
                        if self.server.use_dbus:
1258
1234
                            # Emit D-Bus signal
1260
1236
                                client.approval_delay_milliseconds(),
1261
1237
                                client.approved_by_default)
1262
1238
                    else:
1263
 
                        logger.warning("Client %s was not approved",
 
1239
                        logger.warning(u"Client %s was not approved",
1264
1240
                                       client.name)
1265
1241
                        if self.server.use_dbus:
1266
1242
                            # Emit D-Bus signal
1295
1271
                    except (gnutls.errors.GNUTLSError), error:
1296
1272
                        logger.warning("gnutls send failed")
1297
1273
                        return
1298
 
                    logger.debug("Sent: %d, remaining: %d",
 
1274
                    logger.debug(u"Sent: %d, remaining: %d",
1299
1275
                                 sent, len(client.secret)
1300
1276
                                 - (sent_size + sent))
1301
1277
                    sent_size += sent
1302
1278
 
1303
 
                logger.info("Sending secret to %s", client.name)
 
1279
                logger.info(u"Sending secret to %s", client.name)
1304
1280
                # bump the timeout as if seen
1305
1281
                client.checked_ok()
1306
1282
                if self.server.use_dbus:
1329
1305
                     .gnutls_certificate_get_peers
1330
1306
                     (session._c_object, ctypes.byref(list_size)))
1331
1307
        if not bool(cert_list) and list_size.value != 0:
1332
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1333
 
                                            " certificate")
 
1308
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1309
                                            u" certificate")
1334
1310
        if list_size.value == 0:
1335
1311
            return None
1336
1312
        cert = cert_list[0]
1362
1338
        if crtverify.value != 0:
1363
1339
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1364
1340
            raise (gnutls.errors.CertificateSecurityError
1365
 
                   ("Verify failed"))
 
1341
                   (u"Verify failed"))
1366
1342
        # New buffer for the fingerprint
1367
1343
        buf = ctypes.create_string_buffer(20)
1368
1344
        buf_len = ctypes.c_size_t()
1375
1351
        # Convert the buffer to a Python bytestring
1376
1352
        fpr = ctypes.string_at(buf, buf_len.value)
1377
1353
        # Convert the bytestring to hexadecimal notation
1378
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1354
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1379
1355
        return hex_fpr
1380
1356
 
1381
1357
 
1409
1385
 
1410
1386
    def add_pipe(self, parent_pipe):
1411
1387
        """Dummy function; override as necessary"""
1412
 
        raise NotImplementedError
 
1388
        pass
1413
1389
 
1414
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1415
1391
                     socketserver.TCPServer, object):
1433
1409
        bind to an address or port if they were not specified."""
1434
1410
        if self.interface is not None:
1435
1411
            if SO_BINDTODEVICE is None:
1436
 
                logger.error("SO_BINDTODEVICE does not exist;"
1437
 
                             " cannot bind to interface %s",
 
1412
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1413
                             u" cannot bind to interface %s",
1438
1414
                             self.interface)
1439
1415
            else:
1440
1416
                try:
1441
1417
                    self.socket.setsockopt(socket.SOL_SOCKET,
1442
1418
                                           SO_BINDTODEVICE,
1443
1419
                                           str(self.interface
1444
 
                                               + '\0'))
 
1420
                                               + u'\0'))
1445
1421
                except socket.error, error:
1446
1422
                    if error[0] == errno.EPERM:
1447
 
                        logger.error("No permission to"
1448
 
                                     " bind to interface %s",
 
1423
                        logger.error(u"No permission to"
 
1424
                                     u" bind to interface %s",
1449
1425
                                     self.interface)
1450
1426
                    elif error[0] == errno.ENOPROTOOPT:
1451
 
                        logger.error("SO_BINDTODEVICE not available;"
1452
 
                                     " cannot bind to interface %s",
 
1427
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1428
                                     u" cannot bind to interface %s",
1453
1429
                                     self.interface)
1454
1430
                    else:
1455
1431
                        raise
1457
1433
        if self.server_address[0] or self.server_address[1]:
1458
1434
            if not self.server_address[0]:
1459
1435
                if self.address_family == socket.AF_INET6:
1460
 
                    any_address = "::" # in6addr_any
 
1436
                    any_address = u"::" # in6addr_any
1461
1437
                else:
1462
1438
                    any_address = socket.INADDR_ANY
1463
1439
                self.server_address = (any_address,
1512
1488
    def handle_ipc(self, source, condition, parent_pipe=None,
1513
1489
                   client_object=None):
1514
1490
        condition_names = {
1515
 
            gobject.IO_IN: "IN",   # There is data to read.
1516
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1491
            gobject.IO_IN: u"IN",   # There is data to read.
 
1492
            gobject.IO_OUT: u"OUT", # Data can be written (without
1517
1493
                                    # blocking).
1518
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
 
            gobject.IO_ERR: "ERR", # Error condition.
1520
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1494
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1495
            gobject.IO_ERR: u"ERR", # Error condition.
 
1496
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1521
1497
                                    # broken, usually for pipes and
1522
1498
                                    # sockets).
1523
1499
            }
1542
1518
                    client = c
1543
1519
                    break
1544
1520
            else:
1545
 
                logger.warning("Client not found for fingerprint: %s, ad"
1546
 
                               "dress: %s", fpr, address)
 
1521
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1522
                               u"dress: %s", fpr, address)
1547
1523
                if self.use_dbus:
1548
1524
                    # Emit D-Bus signal
1549
1525
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1583
1559
def string_to_delta(interval):
1584
1560
    """Parse a string and return a datetime.timedelta
1585
1561
    
1586
 
    >>> string_to_delta('7d')
 
1562
    >>> string_to_delta(u'7d')
1587
1563
    datetime.timedelta(7)
1588
 
    >>> string_to_delta('60s')
 
1564
    >>> string_to_delta(u'60s')
1589
1565
    datetime.timedelta(0, 60)
1590
 
    >>> string_to_delta('60m')
 
1566
    >>> string_to_delta(u'60m')
1591
1567
    datetime.timedelta(0, 3600)
1592
 
    >>> string_to_delta('24h')
 
1568
    >>> string_to_delta(u'24h')
1593
1569
    datetime.timedelta(1)
1594
 
    >>> string_to_delta('1w')
 
1570
    >>> string_to_delta(u'1w')
1595
1571
    datetime.timedelta(7)
1596
 
    >>> string_to_delta('5m 30s')
 
1572
    >>> string_to_delta(u'5m 30s')
1597
1573
    datetime.timedelta(0, 330)
1598
1574
    """
1599
1575
    timevalue = datetime.timedelta(0)
1601
1577
        try:
1602
1578
            suffix = unicode(s[-1])
1603
1579
            value = int(s[:-1])
1604
 
            if suffix == "d":
 
1580
            if suffix == u"d":
1605
1581
                delta = datetime.timedelta(value)
1606
 
            elif suffix == "s":
 
1582
            elif suffix == u"s":
1607
1583
                delta = datetime.timedelta(0, value)
1608
 
            elif suffix == "m":
 
1584
            elif suffix == u"m":
1609
1585
                delta = datetime.timedelta(0, 0, 0, 0, value)
1610
 
            elif suffix == "h":
 
1586
            elif suffix == u"h":
1611
1587
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1612
 
            elif suffix == "w":
 
1588
            elif suffix == u"w":
1613
1589
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1614
1590
            else:
1615
 
                raise ValueError("Unknown suffix %r" % suffix)
 
1591
                raise ValueError(u"Unknown suffix %r" % suffix)
1616
1592
        except (ValueError, IndexError), e:
1617
 
            raise ValueError(*(e.args))
 
1593
            raise ValueError(e.message)
1618
1594
        timevalue += delta
1619
1595
    return timevalue
1620
1596
 
1626
1602
    global if_nametoindex
1627
1603
    try:
1628
1604
        if_nametoindex = (ctypes.cdll.LoadLibrary
1629
 
                          (ctypes.util.find_library("c"))
 
1605
                          (ctypes.util.find_library(u"c"))
1630
1606
                          .if_nametoindex)
1631
1607
    except (OSError, AttributeError):
1632
 
        logger.warning("Doing if_nametoindex the hard way")
 
1608
        logger.warning(u"Doing if_nametoindex the hard way")
1633
1609
        def if_nametoindex(interface):
1634
1610
            "Get an interface index the hard way, i.e. using fcntl()"
1635
1611
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1636
1612
            with contextlib.closing(socket.socket()) as s:
1637
1613
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
 
                                    struct.pack(str("16s16x"),
 
1614
                                    struct.pack(str(u"16s16x"),
1639
1615
                                                interface))
1640
 
            interface_index = struct.unpack(str("I"),
 
1616
            interface_index = struct.unpack(str(u"I"),
1641
1617
                                            ifreq[16:20])[0]
1642
1618
            return interface_index
1643
1619
    return if_nametoindex(interface)
1651
1627
        sys.exit()
1652
1628
    os.setsid()
1653
1629
    if not nochdir:
1654
 
        os.chdir("/")
 
1630
        os.chdir(u"/")
1655
1631
    if os.fork():
1656
1632
        sys.exit()
1657
1633
    if not noclose:
1659
1635
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1660
1636
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1661
1637
            raise OSError(errno.ENODEV,
1662
 
                          "%s not a character device"
 
1638
                          u"%s not a character device"
1663
1639
                          % os.path.devnull)
1664
1640
        os.dup2(null, sys.stdin.fileno())
1665
1641
        os.dup2(null, sys.stdout.fileno())
1674
1650
    # Parsing of options, both command line and config file
1675
1651
    
1676
1652
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1677
 
    parser.add_option("-i", "--interface", type="string",
1678
 
                      metavar="IF", help="Bind to interface IF")
1679
 
    parser.add_option("-a", "--address", type="string",
1680
 
                      help="Address to listen for requests on")
1681
 
    parser.add_option("-p", "--port", type="int",
1682
 
                      help="Port number to receive requests on")
1683
 
    parser.add_option("--check", action="store_true",
1684
 
                      help="Run self-test")
1685
 
    parser.add_option("--debug", action="store_true",
1686
 
                      help="Debug mode; run in foreground and log to"
1687
 
                      " terminal")
1688
 
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
 
                      help="Debug level for stdout output")
1690
 
    parser.add_option("--priority", type="string", help="GnuTLS"
1691
 
                      " priority string (see GnuTLS documentation)")
1692
 
    parser.add_option("--servicename", type="string",
1693
 
                      metavar="NAME", help="Zeroconf service name")
1694
 
    parser.add_option("--configdir", type="string",
1695
 
                      default="/etc/mandos", metavar="DIR",
1696
 
                      help="Directory to search for configuration"
1697
 
                      " files")
1698
 
    parser.add_option("--no-dbus", action="store_false",
1699
 
                      dest="use_dbus", help="Do not provide D-Bus"
1700
 
                      " system bus interface")
1701
 
    parser.add_option("--no-ipv6", action="store_false",
1702
 
                      dest="use_ipv6", help="Do not use IPv6")
 
1653
    parser.add_option("-i", u"--interface", type=u"string",
 
1654
                      metavar="IF", help=u"Bind to interface IF")
 
1655
    parser.add_option("-a", u"--address", type=u"string",
 
1656
                      help=u"Address to listen for requests on")
 
1657
    parser.add_option("-p", u"--port", type=u"int",
 
1658
                      help=u"Port number to receive requests on")
 
1659
    parser.add_option("--check", action=u"store_true",
 
1660
                      help=u"Run self-test")
 
1661
    parser.add_option("--debug", action=u"store_true",
 
1662
                      help=u"Debug mode; run in foreground and log to"
 
1663
                      u" terminal")
 
1664
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1665
                      help=u"Debug level for stdout output")
 
1666
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1667
                      u" priority string (see GnuTLS documentation)")
 
1668
    parser.add_option("--servicename", type=u"string",
 
1669
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1670
    parser.add_option("--configdir", type=u"string",
 
1671
                      default=u"/etc/mandos", metavar=u"DIR",
 
1672
                      help=u"Directory to search for configuration"
 
1673
                      u" files")
 
1674
    parser.add_option("--no-dbus", action=u"store_false",
 
1675
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1676
                      u" system bus interface")
 
1677
    parser.add_option("--no-ipv6", action=u"store_false",
 
1678
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1703
1679
    options = parser.parse_args()[0]
1704
1680
    
1705
1681
    if options.check:
1708
1684
        sys.exit()
1709
1685
    
1710
1686
    # Default values for config file for server-global settings
1711
 
    server_defaults = { "interface": "",
1712
 
                        "address": "",
1713
 
                        "port": "",
1714
 
                        "debug": "False",
1715
 
                        "priority":
1716
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1717
 
                        "servicename": "Mandos",
1718
 
                        "use_dbus": "True",
1719
 
                        "use_ipv6": "True",
1720
 
                        "debuglevel": "",
 
1687
    server_defaults = { u"interface": u"",
 
1688
                        u"address": u"",
 
1689
                        u"port": u"",
 
1690
                        u"debug": u"False",
 
1691
                        u"priority":
 
1692
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1693
                        u"servicename": u"Mandos",
 
1694
                        u"use_dbus": u"True",
 
1695
                        u"use_ipv6": u"True",
 
1696
                        u"debuglevel": u"",
1721
1697
                        }
1722
1698
    
1723
1699
    # Parse config file for server-global settings
1724
1700
    server_config = configparser.SafeConfigParser(server_defaults)
1725
1701
    del server_defaults
1726
1702
    server_config.read(os.path.join(options.configdir,
1727
 
                                    "mandos.conf"))
 
1703
                                    u"mandos.conf"))
1728
1704
    # Convert the SafeConfigParser object to a dict
1729
1705
    server_settings = server_config.defaults()
1730
1706
    # Use the appropriate methods on the non-string config options
1731
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1732
 
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1707
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1708
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1733
1709
                                                           option)
1734
1710
    if server_settings["port"]:
1735
 
        server_settings["port"] = server_config.getint("DEFAULT",
1736
 
                                                       "port")
 
1711
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1712
                                                       u"port")
1737
1713
    del server_config
1738
1714
    
1739
1715
    # Override the settings from the config file with command line
1740
1716
    # options, if set.
1741
 
    for option in ("interface", "address", "port", "debug",
1742
 
                   "priority", "servicename", "configdir",
1743
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1717
    for option in (u"interface", u"address", u"port", u"debug",
 
1718
                   u"priority", u"servicename", u"configdir",
 
1719
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1744
1720
        value = getattr(options, option)
1745
1721
        if value is not None:
1746
1722
            server_settings[option] = value
1754
1730
    ##################################################################
1755
1731
    
1756
1732
    # For convenience
1757
 
    debug = server_settings["debug"]
1758
 
    debuglevel = server_settings["debuglevel"]
1759
 
    use_dbus = server_settings["use_dbus"]
1760
 
    use_ipv6 = server_settings["use_ipv6"]
 
1733
    debug = server_settings[u"debug"]
 
1734
    debuglevel = server_settings[u"debuglevel"]
 
1735
    use_dbus = server_settings[u"use_dbus"]
 
1736
    use_ipv6 = server_settings[u"use_ipv6"]
1761
1737
 
1762
 
    if server_settings["servicename"] != "Mandos":
 
1738
    if server_settings[u"servicename"] != u"Mandos":
1763
1739
        syslogger.setFormatter(logging.Formatter
1764
 
                               ('Mandos (%s) [%%(process)d]:'
1765
 
                                ' %%(levelname)s: %%(message)s'
1766
 
                                % server_settings["servicename"]))
 
1740
                               (u'Mandos (%s) [%%(process)d]:'
 
1741
                                u' %%(levelname)s: %%(message)s'
 
1742
                                % server_settings[u"servicename"]))
1767
1743
    
1768
1744
    # Parse config file with clients
1769
 
    client_defaults = { "timeout": "1h",
1770
 
                        "interval": "5m",
1771
 
                        "checker": "fping -q -- %%(host)s",
1772
 
                        "host": "",
1773
 
                        "approval_delay": "0s",
1774
 
                        "approval_duration": "1s",
 
1745
    client_defaults = { u"timeout": u"1h",
 
1746
                        u"interval": u"5m",
 
1747
                        u"checker": u"fping -q -- %%(host)s",
 
1748
                        u"host": u"",
 
1749
                        u"approval_delay": u"0s",
 
1750
                        u"approval_duration": u"1s",
1775
1751
                        }
1776
1752
    client_config = configparser.SafeConfigParser(client_defaults)
1777
 
    client_config.read(os.path.join(server_settings["configdir"],
1778
 
                                    "clients.conf"))
 
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1754
                                    u"clients.conf"))
1779
1755
    
1780
1756
    global mandos_dbus_service
1781
1757
    mandos_dbus_service = None
1782
1758
    
1783
 
    tcp_server = MandosServer((server_settings["address"],
1784
 
                               server_settings["port"]),
 
1759
    tcp_server = MandosServer((server_settings[u"address"],
 
1760
                               server_settings[u"port"]),
1785
1761
                              ClientHandler,
1786
 
                              interface=(server_settings["interface"]
 
1762
                              interface=(server_settings[u"interface"]
1787
1763
                                         or None),
1788
1764
                              use_ipv6=use_ipv6,
1789
1765
                              gnutls_priority=
1790
 
                              server_settings["priority"],
 
1766
                              server_settings[u"priority"],
1791
1767
                              use_dbus=use_dbus)
1792
1768
    if not debug:
1793
 
        pidfilename = "/var/run/mandos.pid"
 
1769
        pidfilename = u"/var/run/mandos.pid"
1794
1770
        try:
1795
 
            pidfile = open(pidfilename, "w")
 
1771
            pidfile = open(pidfilename, u"w")
1796
1772
        except IOError:
1797
 
            logger.error("Could not open file %r", pidfilename)
 
1773
            logger.error(u"Could not open file %r", pidfilename)
1798
1774
    
1799
1775
    try:
1800
 
        uid = pwd.getpwnam("_mandos").pw_uid
1801
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1777
        gid = pwd.getpwnam(u"_mandos").pw_gid
1802
1778
    except KeyError:
1803
1779
        try:
1804
 
            uid = pwd.getpwnam("mandos").pw_uid
1805
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1780
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1781
            gid = pwd.getpwnam(u"mandos").pw_gid
1806
1782
        except KeyError:
1807
1783
            try:
1808
 
                uid = pwd.getpwnam("nobody").pw_uid
1809
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1784
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1785
                gid = pwd.getpwnam(u"nobody").pw_gid
1810
1786
            except KeyError:
1811
1787
                uid = 65534
1812
1788
                gid = 65534
1834
1810
        
1835
1811
        @gnutls.library.types.gnutls_log_func
1836
1812
        def debug_gnutls(level, string):
1837
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1813
            logger.debug(u"GnuTLS: %s", string[:-1])
1838
1814
        
1839
1815
        (gnutls.library.functions
1840
1816
         .gnutls_global_set_log_function(debug_gnutls))
1848
1824
        # No console logging
1849
1825
        logger.removeHandler(console)
1850
1826
    
1851
 
    # Need to fork before connecting to D-Bus
1852
 
    if not debug:
1853
 
        # Close all input and output, do double fork, etc.
1854
 
        daemon()
1855
1827
    
1856
1828
    global main_loop
1857
1829
    # From the Avahi example code
1861
1833
    # End of Avahi example code
1862
1834
    if use_dbus:
1863
1835
        try:
1864
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1836
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1865
1837
                                            bus, do_not_queue=True)
1866
1838
        except dbus.exceptions.NameExistsException, e:
1867
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1839
            logger.error(unicode(e) + u", disabling D-Bus")
1868
1840
            use_dbus = False
1869
 
            server_settings["use_dbus"] = False
 
1841
            server_settings[u"use_dbus"] = False
1870
1842
            tcp_server.use_dbus = False
1871
1843
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1872
 
    service = AvahiService(name = server_settings["servicename"],
1873
 
                           servicetype = "_mandos._tcp",
 
1844
    service = AvahiService(name = server_settings[u"servicename"],
 
1845
                           servicetype = u"_mandos._tcp",
1874
1846
                           protocol = protocol, bus = bus)
1875
1847
    if server_settings["interface"]:
1876
1848
        service.interface = (if_nametoindex
1877
 
                             (str(server_settings["interface"])))
1878
 
    
 
1849
                             (str(server_settings[u"interface"])))
 
1850
 
 
1851
    if not debug:
 
1852
        # Close all input and output, do double fork, etc.
 
1853
        daemon()
 
1854
        
1879
1855
    global multiprocessing_manager
1880
1856
    multiprocessing_manager = multiprocessing.Manager()
1881
1857
    
1900
1876
                        client_config, section)))
1901
1877
            for section in client_config.sections()))
1902
1878
    if not tcp_server.clients:
1903
 
        logger.warning("No clients defined")
 
1879
        logger.warning(u"No clients defined")
1904
1880
        
1905
1881
    if not debug:
1906
1882
        try:
1907
1883
            with pidfile:
1908
1884
                pid = os.getpid()
1909
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1885
                pidfile.write(str(pid) + "\n")
1910
1886
            del pidfile
1911
1887
        except IOError:
1912
 
            logger.error("Could not write to file %r with PID %d",
 
1888
            logger.error(u"Could not write to file %r with PID %d",
1913
1889
                         pidfilename, pid)
1914
1890
        except NameError:
1915
1891
            # "pidfile" was never created
1925
1901
        class MandosDBusService(dbus.service.Object):
1926
1902
            """A D-Bus proxy object"""
1927
1903
            def __init__(self):
1928
 
                dbus.service.Object.__init__(self, bus, "/")
1929
 
            _interface = "se.bsnet.fukt.Mandos"
 
1904
                dbus.service.Object.__init__(self, bus, u"/")
 
1905
            _interface = u"se.bsnet.fukt.Mandos"
1930
1906
            
1931
 
            @dbus.service.signal(_interface, signature="o")
 
1907
            @dbus.service.signal(_interface, signature=u"o")
1932
1908
            def ClientAdded(self, objpath):
1933
1909
                "D-Bus signal"
1934
1910
                pass
1935
1911
            
1936
 
            @dbus.service.signal(_interface, signature="ss")
 
1912
            @dbus.service.signal(_interface, signature=u"ss")
1937
1913
            def ClientNotFound(self, fingerprint, address):
1938
1914
                "D-Bus signal"
1939
1915
                pass
1940
1916
            
1941
 
            @dbus.service.signal(_interface, signature="os")
 
1917
            @dbus.service.signal(_interface, signature=u"os")
1942
1918
            def ClientRemoved(self, objpath, name):
1943
1919
                "D-Bus signal"
1944
1920
                pass
1945
1921
            
1946
 
            @dbus.service.method(_interface, out_signature="ao")
 
1922
            @dbus.service.method(_interface, out_signature=u"ao")
1947
1923
            def GetAllClients(self):
1948
1924
                "D-Bus method"
1949
1925
                return dbus.Array(c.dbus_object_path
1950
1926
                                  for c in tcp_server.clients)
1951
1927
            
1952
1928
            @dbus.service.method(_interface,
1953
 
                                 out_signature="a{oa{sv}}")
 
1929
                                 out_signature=u"a{oa{sv}}")
1954
1930
            def GetAllClientsWithProperties(self):
1955
1931
                "D-Bus method"
1956
1932
                return dbus.Dictionary(
1957
 
                    ((c.dbus_object_path, c.GetAll(""))
 
1933
                    ((c.dbus_object_path, c.GetAll(u""))
1958
1934
                     for c in tcp_server.clients),
1959
 
                    signature="oa{sv}")
 
1935
                    signature=u"oa{sv}")
1960
1936
            
1961
 
            @dbus.service.method(_interface, in_signature="o")
 
1937
            @dbus.service.method(_interface, in_signature=u"o")
1962
1938
            def RemoveClient(self, object_path):
1963
1939
                "D-Bus method"
1964
1940
                for c in tcp_server.clients:
2006
1982
    # Find out what port we got
2007
1983
    service.port = tcp_server.socket.getsockname()[1]
2008
1984
    if use_ipv6:
2009
 
        logger.info("Now listening on address %r, port %d,"
 
1985
        logger.info(u"Now listening on address %r, port %d,"
2010
1986
                    " flowinfo %d, scope_id %d"
2011
1987
                    % tcp_server.socket.getsockname())
2012
1988
    else:                       # IPv4
2013
 
        logger.info("Now listening on address %r, port %d"
 
1989
        logger.info(u"Now listening on address %r, port %d"
2014
1990
                    % tcp_server.socket.getsockname())
2015
1991
    
2016
1992
    #service.interface = tcp_server.socket.getsockname()[3]
2020
1996
        try:
2021
1997
            service.activate()
2022
1998
        except dbus.exceptions.DBusException, error:
2023
 
            logger.critical("DBusException: %s", error)
 
1999
            logger.critical(u"DBusException: %s", error)
2024
2000
            cleanup()
2025
2001
            sys.exit(1)
2026
2002
        # End of Avahi example code
2030
2006
                             (tcp_server.handle_request
2031
2007
                              (*args[2:], **kwargs) or True))
2032
2008
        
2033
 
        logger.debug("Starting main loop")
 
2009
        logger.debug(u"Starting main loop")
2034
2010
        main_loop.run()
2035
2011
    except AvahiError, error:
2036
 
        logger.critical("AvahiError: %s", error)
 
2012
        logger.critical(u"AvahiError: %s", error)
2037
2013
        cleanup()
2038
2014
        sys.exit(1)
2039
2015
    except KeyboardInterrupt:
2040
2016
        if debug:
2041
 
            print("", file=sys.stderr)
2042
 
        logger.debug("Server received KeyboardInterrupt")
2043
 
    logger.debug("Server exiting")
 
2017
            print >> sys.stderr
 
2018
        logger.debug(u"Server received KeyboardInterrupt")
 
2019
    logger.debug(u"Server exiting")
2044
2020
    # Must run before the D-Bus bus name gets deregistered
2045
2021
    cleanup()
2046
2022