/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 at bsnet
  • Date: 2011-02-11 19:37:28 UTC
  • mto: This revision was merged to the branch mainline in revision 465.
  • Revision ID: teddy@fukt.bsnet.se-20110211193728-q6n0lmqyz4k4ze2b
* mandos: Use unicode string literals.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import division, absolute_import, unicode_literals
35
35
 
36
36
import SocketServer as socketserver
37
37
import socket
81
81
        SO_BINDTODEVICE = None
82
82
 
83
83
 
84
 
version = u"1.2.3"
 
84
version = "1.2.3"
85
85
 
86
 
#logger = logging.getLogger(u'mandos')
87
 
logger = logging.Logger(u'mandos')
 
86
#logger = logging.getLogger('mandos')
 
87
logger = logging.Logger('mandos')
88
88
syslogger = (logging.handlers.SysLogHandler
89
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = u"/dev/log"))
 
90
              address = "/dev/log"))
91
91
syslogger.setFormatter(logging.Formatter
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
93
 
                        u' %(message)s'))
 
92
                       ('Mandos [%(process)d]: %(levelname)s:'
 
93
                        ' %(message)s'))
94
94
logger.addHandler(syslogger)
95
95
 
96
96
console = logging.StreamHandler()
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
 
                                       u' %(levelname)s:'
99
 
                                       u' %(message)s'))
 
97
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
98
                                       ' %(levelname)s:'
 
99
                                       ' %(message)s'))
100
100
logger.addHandler(console)
101
101
 
102
102
class AvahiError(Exception):
119
119
    Attributes:
120
120
    interface: integer; avahi.IF_UNSPEC or an interface index.
121
121
               Used to optionally bind to the specified interface.
122
 
    name: string; Example: u'Mandos'
123
 
    type: string; Example: u'_mandos._tcp'.
 
122
    name: string; Example: 'Mandos'
 
123
    type: string; Example: '_mandos._tcp'.
124
124
                  See <http://www.dns-sd.org/ServiceTypes.html>
125
125
    port: integer; what port to announce
126
126
    TXT: list of strings; TXT record for the service
135
135
    """
136
136
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
137
                 servicetype = None, port = None, TXT = None,
138
 
                 domain = u"", host = u"", max_renames = 32768,
 
138
                 domain = "", host = "", max_renames = 32768,
139
139
                 protocol = avahi.PROTO_UNSPEC, bus = None):
140
140
        self.interface = interface
141
141
        self.name = name
153
153
    def rename(self):
154
154
        """Derived from the Avahi example code"""
155
155
        if self.rename_count >= self.max_renames:
156
 
            logger.critical(u"No suitable Zeroconf service name found"
157
 
                            u" after %i retries, exiting.",
 
156
            logger.critical("No suitable Zeroconf service name found"
 
157
                            " after %i retries, exiting.",
158
158
                            self.rename_count)
159
 
            raise AvahiServiceError(u"Too many renames")
 
159
            raise AvahiServiceError("Too many renames")
160
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
 
        logger.info(u"Changing Zeroconf service name to %r ...",
 
161
        logger.info("Changing Zeroconf service name to %r ...",
162
162
                    self.name)
163
163
        syslogger.setFormatter(logging.Formatter
164
 
                               (u'Mandos (%s) [%%(process)d]:'
165
 
                                u' %%(levelname)s: %%(message)s'
 
164
                               ('Mandos (%s) [%%(process)d]:'
 
165
                                ' %%(levelname)s: %%(message)s'
166
166
                                % self.name))
167
167
        self.remove()
168
168
        try:
169
169
            self.add()
170
170
        except dbus.exceptions.DBusException, error:
171
 
            logger.critical(u"DBusException: %s", error)
 
171
            logger.critical("DBusException: %s", error)
172
172
            self.cleanup()
173
173
            os._exit(1)
174
174
        self.rename_count += 1
186
186
            self.group.connect_to_signal('StateChanged',
187
187
                                         self
188
188
                                         .entry_group_state_changed)
189
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
189
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
190
                     self.name, self.type)
191
191
        self.group.AddService(
192
192
            self.interface,
199
199
        self.group.Commit()
200
200
    def entry_group_state_changed(self, state, error):
201
201
        """Derived from the Avahi example code"""
202
 
        logger.debug(u"Avahi entry group state change: %i", state)
 
202
        logger.debug("Avahi entry group state change: %i", state)
203
203
        
204
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
 
            logger.debug(u"Zeroconf service established.")
 
205
            logger.debug("Zeroconf service established.")
206
206
        elif state == avahi.ENTRY_GROUP_COLLISION:
207
 
            logger.info(u"Zeroconf service name collision.")
 
207
            logger.info("Zeroconf service name collision.")
208
208
            self.rename()
209
209
        elif state == avahi.ENTRY_GROUP_FAILURE:
210
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
210
            logger.critical("Avahi: Error in group state changed %s",
211
211
                            unicode(error))
212
 
            raise AvahiGroupError(u"State changed: %s"
 
212
            raise AvahiGroupError("State changed: %s"
213
213
                                  % unicode(error))
214
214
    def cleanup(self):
215
215
        """Derived from the Avahi example code"""
218
218
            self.group = None
219
219
    def server_state_changed(self, state):
220
220
        """Derived from the Avahi example code"""
221
 
        logger.debug(u"Avahi server state change: %i", state)
 
221
        logger.debug("Avahi server state change: %i", state)
222
222
        if state == avahi.SERVER_COLLISION:
223
 
            logger.error(u"Zeroconf server name collision")
 
223
            logger.error("Zeroconf server name collision")
224
224
            self.remove()
225
225
        elif state == avahi.SERVER_RUNNING:
226
226
            self.add()
231
231
                self.bus.get_object(avahi.DBUS_NAME,
232
232
                                    avahi.DBUS_PATH_SERVER),
233
233
                avahi.DBUS_INTERFACE_SERVER)
234
 
        self.server.connect_to_signal(u"StateChanged",
 
234
        self.server.connect_to_signal("StateChanged",
235
235
                                 self.server_state_changed)
236
236
        self.server_state_changed(self.server.GetState())
237
237
 
272
272
    runtime_expansions: Allowed attributes for runtime expansion.
273
273
    """
274
274
    
275
 
    runtime_expansions = (u"approval_delay", u"approval_duration",
276
 
                          u"created", u"enabled", u"fingerprint",
277
 
                          u"host", u"interval", u"last_checked_ok",
278
 
                          u"last_enabled", u"name", u"timeout")
 
275
    runtime_expansions = ("approval_delay", "approval_duration",
 
276
                          "created", "enabled", "fingerprint",
 
277
                          "host", "interval", "last_checked_ok",
 
278
                          "last_enabled", "name", "timeout")
279
279
    
280
280
    @staticmethod
281
281
    def _timedelta_to_milliseconds(td):
302
302
        self.name = name
303
303
        if config is None:
304
304
            config = {}
305
 
        logger.debug(u"Creating client %r", self.name)
 
305
        logger.debug("Creating client %r", self.name)
306
306
        # Uppercase and remove spaces from fingerprint for later
307
307
        # comparison purposes with return value from the fingerprint()
308
308
        # function
309
 
        self.fingerprint = (config[u"fingerprint"].upper()
310
 
                            .replace(u" ", u""))
311
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
312
 
        if u"secret" in config:
313
 
            self.secret = config[u"secret"].decode(u"base64")
314
 
        elif u"secfile" in config:
 
309
        self.fingerprint = (config["fingerprint"].upper()
 
310
                            .replace(" ", ""))
 
311
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
312
        if "secret" in config:
 
313
            self.secret = config["secret"].decode("base64")
 
314
        elif "secfile" in config:
315
315
            with open(os.path.expanduser(os.path.expandvars
316
 
                                         (config[u"secfile"])),
317
 
                      u"rb") as secfile:
 
316
                                         (config["secfile"])),
 
317
                      "rb") as secfile:
318
318
                self.secret = secfile.read()
319
319
        else:
320
 
            raise TypeError(u"No secret or secfile for client %s"
 
320
            raise TypeError("No secret or secfile for client %s"
321
321
                            % self.name)
322
 
        self.host = config.get(u"host", u"")
 
322
        self.host = config.get("host", "")
323
323
        self.created = datetime.datetime.utcnow()
324
324
        self.enabled = False
325
325
        self.last_approval_request = None
326
326
        self.last_enabled = None
327
327
        self.last_checked_ok = None
328
 
        self.timeout = string_to_delta(config[u"timeout"])
329
 
        self.interval = string_to_delta(config[u"interval"])
 
328
        self.timeout = string_to_delta(config["timeout"])
 
329
        self.interval = string_to_delta(config["interval"])
330
330
        self.disable_hook = disable_hook
331
331
        self.checker = None
332
332
        self.checker_initiator_tag = None
333
333
        self.disable_initiator_tag = None
334
334
        self.checker_callback_tag = None
335
 
        self.checker_command = config[u"checker"]
 
335
        self.checker_command = config["checker"]
336
336
        self.current_checker_command = None
337
337
        self.last_connect = None
338
338
        self._approved = None
339
 
        self.approved_by_default = config.get(u"approved_by_default",
 
339
        self.approved_by_default = config.get("approved_by_default",
340
340
                                              True)
341
341
        self.approvals_pending = 0
342
342
        self.approval_delay = string_to_delta(
343
 
            config[u"approval_delay"])
 
343
            config["approval_delay"])
344
344
        self.approval_duration = string_to_delta(
345
 
            config[u"approval_duration"])
 
345
            config["approval_duration"])
346
346
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
347
347
    
348
348
    def send_changedstate(self):
352
352
        
353
353
    def enable(self):
354
354
        """Start this client's checker and timeout hooks"""
355
 
        if getattr(self, u"enabled", False):
 
355
        if getattr(self, "enabled", False):
356
356
            # Already enabled
357
357
            return
358
358
        self.send_changedstate()
372
372
    
373
373
    def disable(self, quiet=True):
374
374
        """Disable this client."""
375
 
        if not getattr(self, u"enabled", False):
 
375
        if not getattr(self, "enabled", False):
376
376
            return False
377
377
        if not quiet:
378
378
            self.send_changedstate()
379
379
        if not quiet:
380
 
            logger.info(u"Disabling client %s", self.name)
381
 
        if getattr(self, u"disable_initiator_tag", False):
 
380
            logger.info("Disabling client %s", self.name)
 
381
        if getattr(self, "disable_initiator_tag", False):
382
382
            gobject.source_remove(self.disable_initiator_tag)
383
383
            self.disable_initiator_tag = None
384
 
        if getattr(self, u"checker_initiator_tag", False):
 
384
        if getattr(self, "checker_initiator_tag", False):
385
385
            gobject.source_remove(self.checker_initiator_tag)
386
386
            self.checker_initiator_tag = None
387
387
        self.stop_checker()
402
402
        if os.WIFEXITED(condition):
403
403
            exitstatus = os.WEXITSTATUS(condition)
404
404
            if exitstatus == 0:
405
 
                logger.info(u"Checker for %(name)s succeeded",
 
405
                logger.info("Checker for %(name)s succeeded",
406
406
                            vars(self))
407
407
                self.checked_ok()
408
408
            else:
409
 
                logger.info(u"Checker for %(name)s failed",
 
409
                logger.info("Checker for %(name)s failed",
410
410
                            vars(self))
411
411
        else:
412
 
            logger.warning(u"Checker for %(name)s crashed?",
 
412
            logger.warning("Checker for %(name)s crashed?",
413
413
                           vars(self))
414
414
    
415
415
    def checked_ok(self):
450
450
                raise error
451
451
        else:
452
452
            if pid:
453
 
                logger.warning(u"Checker was a zombie")
 
453
                logger.warning("Checker was a zombie")
454
454
                gobject.source_remove(self.checker_callback_tag)
455
455
                self.checker_callback(pid, status,
456
456
                                      self.current_checker_command)
463
463
                # Escape attributes for the shell
464
464
                escaped_attrs = dict(
465
465
                    (attr,
466
 
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
466
                     re.escape(unicode(str(getattr(self, attr, "")),
467
467
                                       errors=
468
 
                                       u'replace')))
 
468
                                       'replace')))
469
469
                    for attr in
470
470
                    self.runtime_expansions)
471
471
 
472
472
                try:
473
473
                    command = self.checker_command % escaped_attrs
474
474
                except TypeError, error:
475
 
                    logger.error(u'Could not format string "%s":'
476
 
                                 u' %s', self.checker_command, error)
 
475
                    logger.error('Could not format string "%s":'
 
476
                                 ' %s', self.checker_command, error)
477
477
                    return True # Try again later
478
478
            self.current_checker_command = command
479
479
            try:
480
 
                logger.info(u"Starting checker %r for %s",
 
480
                logger.info("Starting checker %r for %s",
481
481
                            command, self.name)
482
482
                # We don't need to redirect stdout and stderr, since
483
483
                # in normal mode, that is already done by daemon(),
485
485
                # always replaced by /dev/null.)
486
486
                self.checker = subprocess.Popen(command,
487
487
                                                close_fds=True,
488
 
                                                shell=True, cwd=u"/")
 
488
                                                shell=True, cwd="/")
489
489
                self.checker_callback_tag = (gobject.child_watch_add
490
490
                                             (self.checker.pid,
491
491
                                              self.checker_callback,
497
497
                    gobject.source_remove(self.checker_callback_tag)
498
498
                    self.checker_callback(pid, status, command)
499
499
            except OSError, error:
500
 
                logger.error(u"Failed to start subprocess: %s",
 
500
                logger.error("Failed to start subprocess: %s",
501
501
                             error)
502
502
        # Re-run this periodically if run by gobject.timeout_add
503
503
        return True
507
507
        if self.checker_callback_tag:
508
508
            gobject.source_remove(self.checker_callback_tag)
509
509
            self.checker_callback_tag = None
510
 
        if getattr(self, u"checker", None) is None:
 
510
        if getattr(self, "checker", None) is None:
511
511
            return
512
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
512
        logger.debug("Stopping checker for %(name)s", vars(self))
513
513
        try:
514
514
            os.kill(self.checker.pid, signal.SIGTERM)
515
515
            #time.sleep(0.5)
520
520
                raise
521
521
        self.checker = None
522
522
 
523
 
def dbus_service_property(dbus_interface, signature=u"v",
524
 
                          access=u"readwrite", byte_arrays=False):
 
523
def dbus_service_property(dbus_interface, signature="v",
 
524
                          access="readwrite", byte_arrays=False):
525
525
    """Decorators for marking methods of a DBusObjectWithProperties to
526
526
    become properties on the D-Bus.
527
527
    
534
534
    """
535
535
    # Encoding deeply encoded byte arrays is not supported yet by the
536
536
    # "Set" method, so we fail early here:
537
 
    if byte_arrays and signature != u"ay":
538
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
539
 
                         u" signature %r" % signature)
 
537
    if byte_arrays and signature != "ay":
 
538
        raise ValueError("Byte arrays not supported for non-'ay'"
 
539
                         " signature %r" % signature)
540
540
    def decorator(func):
541
541
        func._dbus_is_property = True
542
542
        func._dbus_interface = dbus_interface
543
543
        func._dbus_signature = signature
544
544
        func._dbus_access = access
545
545
        func._dbus_name = func.__name__
546
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
546
        if func._dbus_name.endswith("_dbus_property"):
547
547
            func._dbus_name = func._dbus_name[:-14]
548
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
548
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
549
549
        return func
550
550
    return decorator
551
551
 
579
579
    
580
580
    @staticmethod
581
581
    def _is_dbus_property(obj):
582
 
        return getattr(obj, u"_dbus_is_property", False)
 
582
        return getattr(obj, "_dbus_is_property", False)
583
583
    
584
584
    def _get_all_dbus_properties(self):
585
585
        """Returns a generator of (name, attribute) pairs
593
593
        property with the specified name and interface.
594
594
        """
595
595
        for name in (property_name,
596
 
                     property_name + u"_dbus_property"):
 
596
                     property_name + "_dbus_property"):
597
597
            prop = getattr(self, name, None)
598
598
            if (prop is None
599
599
                or not self._is_dbus_property(prop)
603
603
                continue
604
604
            return prop
605
605
        # No such property
606
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
 
                                   + interface_name + u"."
 
606
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
607
                                   + interface_name + "."
608
608
                                   + property_name)
609
609
    
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
 
                         out_signature=u"v")
 
610
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
611
                         out_signature="v")
612
612
    def Get(self, interface_name, property_name):
613
613
        """Standard D-Bus property Get() method, see D-Bus standard.
614
614
        """
615
615
        prop = self._get_dbus_property(interface_name, property_name)
616
 
        if prop._dbus_access == u"write":
 
616
        if prop._dbus_access == "write":
617
617
            raise DBusPropertyAccessException(property_name)
618
618
        value = prop()
619
 
        if not hasattr(value, u"variant_level"):
 
619
        if not hasattr(value, "variant_level"):
620
620
            return value
621
621
        return type(value)(value, variant_level=value.variant_level+1)
622
622
    
623
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
623
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
624
624
    def Set(self, interface_name, property_name, value):
625
625
        """Standard D-Bus property Set() method, see D-Bus standard.
626
626
        """
627
627
        prop = self._get_dbus_property(interface_name, property_name)
628
 
        if prop._dbus_access == u"read":
 
628
        if prop._dbus_access == "read":
629
629
            raise DBusPropertyAccessException(property_name)
630
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
630
        if prop._dbus_get_args_options["byte_arrays"]:
631
631
            # The byte_arrays option is not supported yet on
632
632
            # signatures other than "ay".
633
 
            if prop._dbus_signature != u"ay":
 
633
            if prop._dbus_signature != "ay":
634
634
                raise ValueError
635
635
            value = dbus.ByteArray(''.join(unichr(byte)
636
636
                                           for byte in value))
637
637
        prop(value)
638
638
    
639
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
 
                         out_signature=u"a{sv}")
 
639
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
640
                         out_signature="a{sv}")
641
641
    def GetAll(self, interface_name):
642
642
        """Standard D-Bus property GetAll() method, see D-Bus
643
643
        standard.
651
651
                # Interface non-empty but did not match
652
652
                continue
653
653
            # Ignore write-only properties
654
 
            if prop._dbus_access == u"write":
 
654
            if prop._dbus_access == "write":
655
655
                continue
656
656
            value = prop()
657
 
            if not hasattr(value, u"variant_level"):
 
657
            if not hasattr(value, "variant_level"):
658
658
                all[name] = value
659
659
                continue
660
660
            all[name] = type(value)(value, variant_level=
661
661
                                    value.variant_level+1)
662
 
        return dbus.Dictionary(all, signature=u"sv")
 
662
        return dbus.Dictionary(all, signature="sv")
663
663
    
664
664
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
665
 
                         out_signature=u"s",
666
 
                         path_keyword=u'object_path',
667
 
                         connection_keyword=u'connection')
 
665
                         out_signature="s",
 
666
                         path_keyword='object_path',
 
667
                         connection_keyword='connection')
668
668
    def Introspect(self, object_path, connection):
669
669
        """Standard D-Bus method, overloaded to insert property tags.
670
670
        """
673
673
        try:
674
674
            document = xml.dom.minidom.parseString(xmlstring)
675
675
            def make_tag(document, name, prop):
676
 
                e = document.createElement(u"property")
677
 
                e.setAttribute(u"name", name)
678
 
                e.setAttribute(u"type", prop._dbus_signature)
679
 
                e.setAttribute(u"access", prop._dbus_access)
 
676
                e = document.createElement("property")
 
677
                e.setAttribute("name", name)
 
678
                e.setAttribute("type", prop._dbus_signature)
 
679
                e.setAttribute("access", prop._dbus_access)
680
680
                return e
681
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
681
            for if_tag in document.getElementsByTagName("interface"):
682
682
                for tag in (make_tag(document, name, prop)
683
683
                            for name, prop
684
684
                            in self._get_all_dbus_properties()
685
685
                            if prop._dbus_interface
686
 
                            == if_tag.getAttribute(u"name")):
 
686
                            == if_tag.getAttribute("name")):
687
687
                    if_tag.appendChild(tag)
688
688
                # Add the names to the return values for the
689
689
                # "org.freedesktop.DBus.Properties" methods
690
 
                if (if_tag.getAttribute(u"name")
691
 
                    == u"org.freedesktop.DBus.Properties"):
692
 
                    for cn in if_tag.getElementsByTagName(u"method"):
693
 
                        if cn.getAttribute(u"name") == u"Get":
694
 
                            for arg in cn.getElementsByTagName(u"arg"):
695
 
                                if (arg.getAttribute(u"direction")
696
 
                                    == u"out"):
697
 
                                    arg.setAttribute(u"name", u"value")
698
 
                        elif cn.getAttribute(u"name") == u"GetAll":
699
 
                            for arg in cn.getElementsByTagName(u"arg"):
700
 
                                if (arg.getAttribute(u"direction")
701
 
                                    == u"out"):
702
 
                                    arg.setAttribute(u"name", u"props")
703
 
            xmlstring = document.toxml(u"utf-8")
 
690
                if (if_tag.getAttribute("name")
 
691
                    == "org.freedesktop.DBus.Properties"):
 
692
                    for cn in if_tag.getElementsByTagName("method"):
 
693
                        if cn.getAttribute("name") == "Get":
 
694
                            for arg in cn.getElementsByTagName("arg"):
 
695
                                if (arg.getAttribute("direction")
 
696
                                    == "out"):
 
697
                                    arg.setAttribute("name", "value")
 
698
                        elif cn.getAttribute("name") == "GetAll":
 
699
                            for arg in cn.getElementsByTagName("arg"):
 
700
                                if (arg.getAttribute("direction")
 
701
                                    == "out"):
 
702
                                    arg.setAttribute("name", "props")
 
703
            xmlstring = document.toxml("utf-8")
704
704
            document.unlink()
705
705
        except (AttributeError, xml.dom.DOMException,
706
706
                xml.parsers.expat.ExpatError), error:
707
 
            logger.error(u"Failed to override Introspection method",
 
707
            logger.error("Failed to override Introspection method",
708
708
                         error)
709
709
        return xmlstring
710
710
 
718
718
    """
719
719
    
720
720
    runtime_expansions = (Client.runtime_expansions
721
 
                          + (u"dbus_object_path",))
 
721
                          + ("dbus_object_path",))
722
722
    
723
723
    # dbus.service.Object doesn't use super(), so we can't either.
724
724
    
729
729
        # Only now, when this client is initialized, can it show up on
730
730
        # the D-Bus
731
731
        client_object_name = unicode(self.name).translate(
732
 
            {ord(u"."): ord(u"_"),
733
 
             ord(u"-"): ord(u"_")})
 
732
            {ord("."): ord("_"),
 
733
             ord("-"): ord("_")})
734
734
        self.dbus_object_path = (dbus.ObjectPath
735
 
                                 (u"/clients/" + client_object_name))
 
735
                                 ("/clients/" + client_object_name))
736
736
        DBusObjectWithProperties.__init__(self, self.bus,
737
737
                                          self.dbus_object_path)
738
738
        
742
742
        old_value = self._approvals_pending
743
743
        self._approvals_pending = value
744
744
        bval = bool(value)
745
 
        if (hasattr(self, u"dbus_object_path")
 
745
        if (hasattr(self, "dbus_object_path")
746
746
            and bval is not bool(old_value)):
747
747
            dbus_bool = dbus.Boolean(bval, variant_level=1)
748
 
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
748
            self.PropertyChanged(dbus.String("ApprovalPending"),
749
749
                                 dbus_bool)
750
750
 
751
751
    approvals_pending = property(_get_approvals_pending,
759
759
                           variant_level=variant_level)
760
760
    
761
761
    def enable(self):
762
 
        oldstate = getattr(self, u"enabled", False)
 
762
        oldstate = getattr(self, "enabled", False)
763
763
        r = Client.enable(self)
764
764
        if oldstate != self.enabled:
765
765
            # Emit D-Bus signals
766
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
766
            self.PropertyChanged(dbus.String("Enabled"),
767
767
                                 dbus.Boolean(True, variant_level=1))
768
768
            self.PropertyChanged(
769
 
                dbus.String(u"LastEnabled"),
 
769
                dbus.String("LastEnabled"),
770
770
                self._datetime_to_dbus(self.last_enabled,
771
771
                                       variant_level=1))
772
772
        return r
773
773
    
774
774
    def disable(self, quiet = False):
775
 
        oldstate = getattr(self, u"enabled", False)
 
775
        oldstate = getattr(self, "enabled", False)
776
776
        r = Client.disable(self, quiet=quiet)
777
777
        if not quiet and oldstate != self.enabled:
778
778
            # Emit D-Bus signal
779
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
779
            self.PropertyChanged(dbus.String("Enabled"),
780
780
                                 dbus.Boolean(False, variant_level=1))
781
781
        return r
782
782
    
785
785
            self.remove_from_connection()
786
786
        except LookupError:
787
787
            pass
788
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
788
        if hasattr(DBusObjectWithProperties, "__del__"):
789
789
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
790
790
        Client.__del__(self, *args, **kwargs)
791
791
    
794
794
        self.checker_callback_tag = None
795
795
        self.checker = None
796
796
        # Emit D-Bus signal
797
 
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
797
        self.PropertyChanged(dbus.String("CheckerRunning"),
798
798
                             dbus.Boolean(False, variant_level=1))
799
799
        if os.WIFEXITED(condition):
800
800
            exitstatus = os.WEXITSTATUS(condition)
815
815
        r = Client.checked_ok(self, *args, **kwargs)
816
816
        # Emit D-Bus signal
817
817
        self.PropertyChanged(
818
 
            dbus.String(u"LastCheckedOK"),
 
818
            dbus.String("LastCheckedOK"),
819
819
            (self._datetime_to_dbus(self.last_checked_ok,
820
820
                                    variant_level=1)))
821
821
        return r
824
824
        r = Client.need_approval(self, *args, **kwargs)
825
825
        # Emit D-Bus signal
826
826
        self.PropertyChanged(
827
 
            dbus.String(u"LastApprovalRequest"),
 
827
            dbus.String("LastApprovalRequest"),
828
828
            (self._datetime_to_dbus(self.last_approval_request,
829
829
                                    variant_level=1)))
830
830
        return r
842
842
            # Emit D-Bus signal
843
843
            self.CheckerStarted(self.current_checker_command)
844
844
            self.PropertyChanged(
845
 
                dbus.String(u"CheckerRunning"),
 
845
                dbus.String("CheckerRunning"),
846
846
                dbus.Boolean(True, variant_level=1))
847
847
        return r
848
848
    
849
849
    def stop_checker(self, *args, **kwargs):
850
 
        old_checker = getattr(self, u"checker", None)
 
850
        old_checker = getattr(self, "checker", None)
851
851
        r = Client.stop_checker(self, *args, **kwargs)
852
852
        if (old_checker is not None
853
 
            and getattr(self, u"checker", None) is None):
854
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
853
            and getattr(self, "checker", None) is None):
 
854
            self.PropertyChanged(dbus.String("CheckerRunning"),
855
855
                                 dbus.Boolean(False, variant_level=1))
856
856
        return r
857
857
 
868
868
    
869
869
    
870
870
    ## D-Bus methods, signals & properties
871
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
871
    _interface = "se.bsnet.fukt.Mandos.Client"
872
872
    
873
873
    ## Signals
874
874
    
875
875
    # CheckerCompleted - signal
876
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
876
    @dbus.service.signal(_interface, signature="nxs")
877
877
    def CheckerCompleted(self, exitcode, waitstatus, command):
878
878
        "D-Bus signal"
879
879
        pass
880
880
    
881
881
    # CheckerStarted - signal
882
 
    @dbus.service.signal(_interface, signature=u"s")
 
882
    @dbus.service.signal(_interface, signature="s")
883
883
    def CheckerStarted(self, command):
884
884
        "D-Bus signal"
885
885
        pass
886
886
    
887
887
    # PropertyChanged - signal
888
 
    @dbus.service.signal(_interface, signature=u"sv")
 
888
    @dbus.service.signal(_interface, signature="sv")
889
889
    def PropertyChanged(self, property, value):
890
890
        "D-Bus signal"
891
891
        pass
900
900
        pass
901
901
    
902
902
    # Rejected - signal
903
 
    @dbus.service.signal(_interface, signature=u"s")
 
903
    @dbus.service.signal(_interface, signature="s")
904
904
    def Rejected(self, reason):
905
905
        "D-Bus signal"
906
906
        pass
907
907
    
908
908
    # NeedApproval - signal
909
 
    @dbus.service.signal(_interface, signature=u"tb")
 
909
    @dbus.service.signal(_interface, signature="tb")
910
910
    def NeedApproval(self, timeout, default):
911
911
        "D-Bus signal"
912
912
        return self.need_approval()
914
914
    ## Methods
915
915
    
916
916
    # Approve - method
917
 
    @dbus.service.method(_interface, in_signature=u"b")
 
917
    @dbus.service.method(_interface, in_signature="b")
918
918
    def Approve(self, value):
919
919
        self.approve(value)
920
920
    
949
949
    ## Properties
950
950
    
951
951
    # ApprovalPending - property
952
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
952
    @dbus_service_property(_interface, signature="b", access="read")
953
953
    def ApprovalPending_dbus_property(self):
954
954
        return dbus.Boolean(bool(self.approvals_pending))
955
955
    
956
956
    # ApprovedByDefault - property
957
 
    @dbus_service_property(_interface, signature=u"b",
958
 
                           access=u"readwrite")
 
957
    @dbus_service_property(_interface, signature="b",
 
958
                           access="readwrite")
959
959
    def ApprovedByDefault_dbus_property(self, value=None):
960
960
        if value is None:       # get
961
961
            return dbus.Boolean(self.approved_by_default)
962
962
        self.approved_by_default = bool(value)
963
963
        # Emit D-Bus signal
964
 
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
964
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
965
965
                             dbus.Boolean(value, variant_level=1))
966
966
    
967
967
    # ApprovalDelay - property
968
 
    @dbus_service_property(_interface, signature=u"t",
969
 
                           access=u"readwrite")
 
968
    @dbus_service_property(_interface, signature="t",
 
969
                           access="readwrite")
970
970
    def ApprovalDelay_dbus_property(self, value=None):
971
971
        if value is None:       # get
972
972
            return dbus.UInt64(self.approval_delay_milliseconds())
973
973
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
974
        # Emit D-Bus signal
975
 
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
975
        self.PropertyChanged(dbus.String("ApprovalDelay"),
976
976
                             dbus.UInt64(value, variant_level=1))
977
977
    
978
978
    # ApprovalDuration - property
979
 
    @dbus_service_property(_interface, signature=u"t",
980
 
                           access=u"readwrite")
 
979
    @dbus_service_property(_interface, signature="t",
 
980
                           access="readwrite")
981
981
    def ApprovalDuration_dbus_property(self, value=None):
982
982
        if value is None:       # get
983
983
            return dbus.UInt64(self._timedelta_to_milliseconds(
984
984
                    self.approval_duration))
985
985
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
986
        # Emit D-Bus signal
987
 
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
987
        self.PropertyChanged(dbus.String("ApprovalDuration"),
988
988
                             dbus.UInt64(value, variant_level=1))
989
989
    
990
990
    # Name - property
991
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
991
    @dbus_service_property(_interface, signature="s", access="read")
992
992
    def Name_dbus_property(self):
993
993
        return dbus.String(self.name)
994
994
    
995
995
    # Fingerprint - property
996
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
996
    @dbus_service_property(_interface, signature="s", access="read")
997
997
    def Fingerprint_dbus_property(self):
998
998
        return dbus.String(self.fingerprint)
999
999
    
1000
1000
    # Host - property
1001
 
    @dbus_service_property(_interface, signature=u"s",
1002
 
                           access=u"readwrite")
 
1001
    @dbus_service_property(_interface, signature="s",
 
1002
                           access="readwrite")
1003
1003
    def Host_dbus_property(self, value=None):
1004
1004
        if value is None:       # get
1005
1005
            return dbus.String(self.host)
1006
1006
        self.host = value
1007
1007
        # Emit D-Bus signal
1008
 
        self.PropertyChanged(dbus.String(u"Host"),
 
1008
        self.PropertyChanged(dbus.String("Host"),
1009
1009
                             dbus.String(value, variant_level=1))
1010
1010
    
1011
1011
    # Created - property
1012
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1012
    @dbus_service_property(_interface, signature="s", access="read")
1013
1013
    def Created_dbus_property(self):
1014
1014
        return dbus.String(self._datetime_to_dbus(self.created))
1015
1015
    
1016
1016
    # LastEnabled - property
1017
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1017
    @dbus_service_property(_interface, signature="s", access="read")
1018
1018
    def LastEnabled_dbus_property(self):
1019
1019
        if self.last_enabled is None:
1020
 
            return dbus.String(u"")
 
1020
            return dbus.String("")
1021
1021
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1022
1022
    
1023
1023
    # Enabled - property
1024
 
    @dbus_service_property(_interface, signature=u"b",
1025
 
                           access=u"readwrite")
 
1024
    @dbus_service_property(_interface, signature="b",
 
1025
                           access="readwrite")
1026
1026
    def Enabled_dbus_property(self, value=None):
1027
1027
        if value is None:       # get
1028
1028
            return dbus.Boolean(self.enabled)
1032
1032
            self.disable()
1033
1033
    
1034
1034
    # LastCheckedOK - property
1035
 
    @dbus_service_property(_interface, signature=u"s",
1036
 
                           access=u"readwrite")
 
1035
    @dbus_service_property(_interface, signature="s",
 
1036
                           access="readwrite")
1037
1037
    def LastCheckedOK_dbus_property(self, value=None):
1038
1038
        if value is not None:
1039
1039
            self.checked_ok()
1040
1040
            return
1041
1041
        if self.last_checked_ok is None:
1042
 
            return dbus.String(u"")
 
1042
            return dbus.String("")
1043
1043
        return dbus.String(self._datetime_to_dbus(self
1044
1044
                                                  .last_checked_ok))
1045
1045
    
1046
1046
    # LastApprovalRequest - property
1047
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1047
    @dbus_service_property(_interface, signature="s", access="read")
1048
1048
    def LastApprovalRequest_dbus_property(self):
1049
1049
        if self.last_approval_request is None:
1050
 
            return dbus.String(u"")
 
1050
            return dbus.String("")
1051
1051
        return dbus.String(self.
1052
1052
                           _datetime_to_dbus(self
1053
1053
                                             .last_approval_request))
1054
1054
    
1055
1055
    # Timeout - property
1056
 
    @dbus_service_property(_interface, signature=u"t",
1057
 
                           access=u"readwrite")
 
1056
    @dbus_service_property(_interface, signature="t",
 
1057
                           access="readwrite")
1058
1058
    def Timeout_dbus_property(self, value=None):
1059
1059
        if value is None:       # get
1060
1060
            return dbus.UInt64(self.timeout_milliseconds())
1061
1061
        self.timeout = datetime.timedelta(0, 0, 0, value)
1062
1062
        # Emit D-Bus signal
1063
 
        self.PropertyChanged(dbus.String(u"Timeout"),
 
1063
        self.PropertyChanged(dbus.String("Timeout"),
1064
1064
                             dbus.UInt64(value, variant_level=1))
1065
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1065
        if getattr(self, "disable_initiator_tag", None) is None:
1066
1066
            return
1067
1067
        # Reschedule timeout
1068
1068
        gobject.source_remove(self.disable_initiator_tag)
1081
1081
                                          (time_to_die, self.disable))
1082
1082
    
1083
1083
    # Interval - property
1084
 
    @dbus_service_property(_interface, signature=u"t",
1085
 
                           access=u"readwrite")
 
1084
    @dbus_service_property(_interface, signature="t",
 
1085
                           access="readwrite")
1086
1086
    def Interval_dbus_property(self, value=None):
1087
1087
        if value is None:       # get
1088
1088
            return dbus.UInt64(self.interval_milliseconds())
1089
1089
        self.interval = datetime.timedelta(0, 0, 0, value)
1090
1090
        # Emit D-Bus signal
1091
 
        self.PropertyChanged(dbus.String(u"Interval"),
 
1091
        self.PropertyChanged(dbus.String("Interval"),
1092
1092
                             dbus.UInt64(value, variant_level=1))
1093
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1093
        if getattr(self, "checker_initiator_tag", None) is None:
1094
1094
            return
1095
1095
        # Reschedule checker run
1096
1096
        gobject.source_remove(self.checker_initiator_tag)
1099
1099
        self.start_checker()    # Start one now, too
1100
1100
 
1101
1101
    # Checker - property
1102
 
    @dbus_service_property(_interface, signature=u"s",
1103
 
                           access=u"readwrite")
 
1102
    @dbus_service_property(_interface, signature="s",
 
1103
                           access="readwrite")
1104
1104
    def Checker_dbus_property(self, value=None):
1105
1105
        if value is None:       # get
1106
1106
            return dbus.String(self.checker_command)
1107
1107
        self.checker_command = value
1108
1108
        # Emit D-Bus signal
1109
 
        self.PropertyChanged(dbus.String(u"Checker"),
 
1109
        self.PropertyChanged(dbus.String("Checker"),
1110
1110
                             dbus.String(self.checker_command,
1111
1111
                                         variant_level=1))
1112
1112
    
1113
1113
    # CheckerRunning - property
1114
 
    @dbus_service_property(_interface, signature=u"b",
1115
 
                           access=u"readwrite")
 
1114
    @dbus_service_property(_interface, signature="b",
 
1115
                           access="readwrite")
1116
1116
    def CheckerRunning_dbus_property(self, value=None):
1117
1117
        if value is None:       # get
1118
1118
            return dbus.Boolean(self.checker is not None)
1122
1122
            self.stop_checker()
1123
1123
    
1124
1124
    # ObjectPath - property
1125
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1125
    @dbus_service_property(_interface, signature="o", access="read")
1126
1126
    def ObjectPath_dbus_property(self):
1127
1127
        return self.dbus_object_path # is already a dbus.ObjectPath
1128
1128
    
1129
1129
    # Secret = property
1130
 
    @dbus_service_property(_interface, signature=u"ay",
1131
 
                           access=u"write", byte_arrays=True)
 
1130
    @dbus_service_property(_interface, signature="ay",
 
1131
                           access="write", byte_arrays=True)
1132
1132
    def Secret_dbus_property(self, value):
1133
1133
        self.secret = str(value)
1134
1134
    
1138
1138
class ProxyClient(object):
1139
1139
    def __init__(self, child_pipe, fpr, address):
1140
1140
        self._pipe = child_pipe
1141
 
        self._pipe.send((u'init', fpr, address))
 
1141
        self._pipe.send(('init', fpr, address))
1142
1142
        if not self._pipe.recv():
1143
1143
            raise KeyError()
1144
1144
 
1145
1145
    def __getattribute__(self, name):
1146
 
        if(name == u'_pipe'):
 
1146
        if(name == '_pipe'):
1147
1147
            return super(ProxyClient, self).__getattribute__(name)
1148
 
        self._pipe.send((u'getattr', name))
 
1148
        self._pipe.send(('getattr', name))
1149
1149
        data = self._pipe.recv()
1150
 
        if data[0] == u'data':
 
1150
        if data[0] == 'data':
1151
1151
            return data[1]
1152
 
        if data[0] == u'function':
 
1152
        if data[0] == 'function':
1153
1153
            def func(*args, **kwargs):
1154
 
                self._pipe.send((u'funcall', name, args, kwargs))
 
1154
                self._pipe.send(('funcall', name, args, kwargs))
1155
1155
                return self._pipe.recv()[1]
1156
1156
            return func
1157
1157
 
1158
1158
    def __setattr__(self, name, value):
1159
 
        if(name == u'_pipe'):
 
1159
        if(name == '_pipe'):
1160
1160
            return super(ProxyClient, self).__setattr__(name, value)
1161
 
        self._pipe.send((u'setattr', name, value))
 
1161
        self._pipe.send(('setattr', name, value))
1162
1162
 
1163
1163
 
1164
1164
class ClientHandler(socketserver.BaseRequestHandler, object):
1169
1169
    
1170
1170
    def handle(self):
1171
1171
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1172
 
            logger.info(u"TCP connection from: %s",
 
1172
            logger.info("TCP connection from: %s",
1173
1173
                        unicode(self.client_address))
1174
 
            logger.debug(u"Pipe FD: %d",
 
1174
            logger.debug("Pipe FD: %d",
1175
1175
                         self.server.child_pipe.fileno())
1176
1176
 
1177
1177
            session = (gnutls.connection
1184
1184
            # no X.509 keys are added to it.  Therefore, we can use it
1185
1185
            # here despite using OpenPGP certificates.
1186
1186
 
1187
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
 
            #                      u"+AES-256-CBC", u"+SHA1",
1189
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1190
 
            #                      u"+DHE-DSS"))
 
1187
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1188
            #                      "+AES-256-CBC", "+SHA1",
 
1189
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1190
            #                      "+DHE-DSS"))
1191
1191
            # Use a fallback default, since this MUST be set.
1192
1192
            priority = self.server.gnutls_priority
1193
1193
            if priority is None:
1194
 
                priority = u"NORMAL"
 
1194
                priority = "NORMAL"
1195
1195
            (gnutls.library.functions
1196
1196
             .gnutls_priority_set_direct(session._c_object,
1197
1197
                                         priority, None))
1199
1199
            # Start communication using the Mandos protocol
1200
1200
            # Get protocol number
1201
1201
            line = self.request.makefile().readline()
1202
 
            logger.debug(u"Protocol version: %r", line)
 
1202
            logger.debug("Protocol version: %r", line)
1203
1203
            try:
1204
1204
                if int(line.strip().split()[0]) > 1:
1205
1205
                    raise RuntimeError
1206
1206
            except (ValueError, IndexError, RuntimeError), error:
1207
 
                logger.error(u"Unknown protocol version: %s", error)
 
1207
                logger.error("Unknown protocol version: %s", error)
1208
1208
                return
1209
1209
 
1210
1210
            # Start GnuTLS connection
1211
1211
            try:
1212
1212
                session.handshake()
1213
1213
            except gnutls.errors.GNUTLSError, error:
1214
 
                logger.warning(u"Handshake failed: %s", error)
 
1214
                logger.warning("Handshake failed: %s", error)
1215
1215
                # Do not run session.bye() here: the session is not
1216
1216
                # established.  Just abandon the request.
1217
1217
                return
1218
 
            logger.debug(u"Handshake succeeded")
 
1218
            logger.debug("Handshake succeeded")
1219
1219
 
1220
1220
            approval_required = False
1221
1221
            try:
1223
1223
                    fpr = self.fingerprint(self.peer_certificate
1224
1224
                                           (session))
1225
1225
                except (TypeError, gnutls.errors.GNUTLSError), error:
1226
 
                    logger.warning(u"Bad certificate: %s", error)
 
1226
                    logger.warning("Bad certificate: %s", error)
1227
1227
                    return
1228
 
                logger.debug(u"Fingerprint: %s", fpr)
 
1228
                logger.debug("Fingerprint: %s", fpr)
1229
1229
 
1230
1230
                try:
1231
1231
                    client = ProxyClient(child_pipe, fpr,
1240
1240
                
1241
1241
                while True:
1242
1242
                    if not client.enabled:
1243
 
                        logger.warning(u"Client %s is disabled",
 
1243
                        logger.warning("Client %s is disabled",
1244
1244
                                       client.name)
1245
1245
                        if self.server.use_dbus:
1246
1246
                            # Emit D-Bus signal
1247
 
                            client.Rejected(u"Disabled")                    
 
1247
                            client.Rejected("Disabled")                    
1248
1248
                        return
1249
1249
                    
1250
1250
                    if client._approved or not client.approval_delay:
1251
1251
                        #We are approved or approval is disabled
1252
1252
                        break
1253
1253
                    elif client._approved is None:
1254
 
                        logger.info(u"Client %s needs approval",
 
1254
                        logger.info("Client %s needs approval",
1255
1255
                                    client.name)
1256
1256
                        if self.server.use_dbus:
1257
1257
                            # Emit D-Bus signal
1259
1259
                                client.approval_delay_milliseconds(),
1260
1260
                                client.approved_by_default)
1261
1261
                    else:
1262
 
                        logger.warning(u"Client %s was not approved",
 
1262
                        logger.warning("Client %s was not approved",
1263
1263
                                       client.name)
1264
1264
                        if self.server.use_dbus:
1265
1265
                            # Emit D-Bus signal
1266
 
                            client.Rejected(u"Denied")
 
1266
                            client.Rejected("Denied")
1267
1267
                        return
1268
1268
                    
1269
1269
                    #wait until timeout or approved
1275
1275
                    time2 = datetime.datetime.now()
1276
1276
                    if (time2 - time) >= delay:
1277
1277
                        if not client.approved_by_default:
1278
 
                            logger.warning(u"Client %s timed out while"
1279
 
                                           u" waiting for approval",
 
1278
                            logger.warning("Client %s timed out while"
 
1279
                                           " waiting for approval",
1280
1280
                                           client.name)
1281
1281
                            if self.server.use_dbus:
1282
1282
                                # Emit D-Bus signal
1283
 
                                client.Rejected(u"Approval timed out")
 
1283
                                client.Rejected("Approval timed out")
1284
1284
                            return
1285
1285
                        else:
1286
1286
                            break
1292
1292
                    try:
1293
1293
                        sent = session.send(client.secret[sent_size:])
1294
1294
                    except (gnutls.errors.GNUTLSError), error:
1295
 
                        logger.warning(u"gnutls send failed")
 
1295
                        logger.warning("gnutls send failed")
1296
1296
                        return
1297
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1297
                    logger.debug("Sent: %d, remaining: %d",
1298
1298
                                 sent, len(client.secret)
1299
1299
                                 - (sent_size + sent))
1300
1300
                    sent_size += sent
1301
1301
 
1302
 
                logger.info(u"Sending secret to %s", client.name)
 
1302
                logger.info("Sending secret to %s", client.name)
1303
1303
                # bump the timeout as if seen
1304
1304
                client.checked_ok()
1305
1305
                if self.server.use_dbus:
1312
1312
                try:
1313
1313
                    session.bye()
1314
1314
                except (gnutls.errors.GNUTLSError), error:
1315
 
                    logger.warning(u"GnuTLS bye failed")
 
1315
                    logger.warning("GnuTLS bye failed")
1316
1316
    
1317
1317
    @staticmethod
1318
1318
    def peer_certificate(session):
1328
1328
                     .gnutls_certificate_get_peers
1329
1329
                     (session._c_object, ctypes.byref(list_size)))
1330
1330
        if not bool(cert_list) and list_size.value != 0:
1331
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1332
 
                                            u" certificate")
 
1331
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1332
                                            " certificate")
1333
1333
        if list_size.value == 0:
1334
1334
            return None
1335
1335
        cert = cert_list[0]
1361
1361
        if crtverify.value != 0:
1362
1362
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1363
1363
            raise (gnutls.errors.CertificateSecurityError
1364
 
                   (u"Verify failed"))
 
1364
                   ("Verify failed"))
1365
1365
        # New buffer for the fingerprint
1366
1366
        buf = ctypes.create_string_buffer(20)
1367
1367
        buf_len = ctypes.c_size_t()
1374
1374
        # Convert the buffer to a Python bytestring
1375
1375
        fpr = ctypes.string_at(buf, buf_len.value)
1376
1376
        # Convert the bytestring to hexadecimal notation
1377
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1377
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1378
1378
        return hex_fpr
1379
1379
 
1380
1380
 
1432
1432
        bind to an address or port if they were not specified."""
1433
1433
        if self.interface is not None:
1434
1434
            if SO_BINDTODEVICE is None:
1435
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1436
 
                             u" cannot bind to interface %s",
 
1435
                logger.error("SO_BINDTODEVICE does not exist;"
 
1436
                             " cannot bind to interface %s",
1437
1437
                             self.interface)
1438
1438
            else:
1439
1439
                try:
1440
1440
                    self.socket.setsockopt(socket.SOL_SOCKET,
1441
1441
                                           SO_BINDTODEVICE,
1442
1442
                                           str(self.interface
1443
 
                                               + u'\0'))
 
1443
                                               + '\0'))
1444
1444
                except socket.error, error:
1445
1445
                    if error[0] == errno.EPERM:
1446
 
                        logger.error(u"No permission to"
1447
 
                                     u" bind to interface %s",
 
1446
                        logger.error("No permission to"
 
1447
                                     " bind to interface %s",
1448
1448
                                     self.interface)
1449
1449
                    elif error[0] == errno.ENOPROTOOPT:
1450
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1451
 
                                     u" cannot bind to interface %s",
 
1450
                        logger.error("SO_BINDTODEVICE not available;"
 
1451
                                     " cannot bind to interface %s",
1452
1452
                                     self.interface)
1453
1453
                    else:
1454
1454
                        raise
1456
1456
        if self.server_address[0] or self.server_address[1]:
1457
1457
            if not self.server_address[0]:
1458
1458
                if self.address_family == socket.AF_INET6:
1459
 
                    any_address = u"::" # in6addr_any
 
1459
                    any_address = "::" # in6addr_any
1460
1460
                else:
1461
1461
                    any_address = socket.INADDR_ANY
1462
1462
                self.server_address = (any_address,
1511
1511
    def handle_ipc(self, source, condition, parent_pipe=None,
1512
1512
                   client_object=None):
1513
1513
        condition_names = {
1514
 
            gobject.IO_IN: u"IN",   # There is data to read.
1515
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1514
            gobject.IO_IN: "IN",   # There is data to read.
 
1515
            gobject.IO_OUT: "OUT", # Data can be written (without
1516
1516
                                    # blocking).
1517
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
 
            gobject.IO_ERR: u"ERR", # Error condition.
1519
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1517
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1518
            gobject.IO_ERR: "ERR", # Error condition.
 
1519
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1520
1520
                                    # broken, usually for pipes and
1521
1521
                                    # sockets).
1522
1522
            }
1523
 
        conditions_string = u' | '.join(name
 
1523
        conditions_string = ' | '.join(name
1524
1524
                                       for cond, name in
1525
1525
                                       condition_names.iteritems()
1526
1526
                                       if cond & condition)
1532
1532
        request = parent_pipe.recv()
1533
1533
        command = request[0]
1534
1534
        
1535
 
        if command == u'init':
 
1535
        if command == 'init':
1536
1536
            fpr = request[1]
1537
1537
            address = request[2]
1538
1538
            
1541
1541
                    client = c
1542
1542
                    break
1543
1543
            else:
1544
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
1545
 
                               u"dress: %s", fpr, address)
 
1544
                logger.warning("Client not found for fingerprint: %s, ad"
 
1545
                               "dress: %s", fpr, address)
1546
1546
                if self.use_dbus:
1547
1547
                    # Emit D-Bus signal
1548
1548
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1557
1557
            parent_pipe.send(True)
1558
1558
            # remove the old hook in favor of the new above hook on same fileno
1559
1559
            return False
1560
 
        if command == u'funcall':
 
1560
        if command == 'funcall':
1561
1561
            funcname = request[1]
1562
1562
            args = request[2]
1563
1563
            kwargs = request[3]
1564
1564
            
1565
 
            parent_pipe.send((u'data', getattr(client_object, funcname)(*args, **kwargs)))
 
1565
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1566
1566
 
1567
 
        if command == u'getattr':
 
1567
        if command == 'getattr':
1568
1568
            attrname = request[1]
1569
1569
            if callable(client_object.__getattribute__(attrname)):
1570
 
                parent_pipe.send((u'function',))
 
1570
                parent_pipe.send(('function',))
1571
1571
            else:
1572
 
                parent_pipe.send((u'data', client_object.__getattribute__(attrname)))
 
1572
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1573
1573
        
1574
 
        if command == u'setattr':
 
1574
        if command == 'setattr':
1575
1575
            attrname = request[1]
1576
1576
            value = request[2]
1577
1577
            setattr(client_object, attrname, value)
1582
1582
def string_to_delta(interval):
1583
1583
    """Parse a string and return a datetime.timedelta
1584
1584
    
1585
 
    >>> string_to_delta(u'7d')
 
1585
    >>> string_to_delta('7d')
1586
1586
    datetime.timedelta(7)
1587
 
    >>> string_to_delta(u'60s')
 
1587
    >>> string_to_delta('60s')
1588
1588
    datetime.timedelta(0, 60)
1589
 
    >>> string_to_delta(u'60m')
 
1589
    >>> string_to_delta('60m')
1590
1590
    datetime.timedelta(0, 3600)
1591
 
    >>> string_to_delta(u'24h')
 
1591
    >>> string_to_delta('24h')
1592
1592
    datetime.timedelta(1)
1593
 
    >>> string_to_delta(u'1w')
 
1593
    >>> string_to_delta('1w')
1594
1594
    datetime.timedelta(7)
1595
 
    >>> string_to_delta(u'5m 30s')
 
1595
    >>> string_to_delta('5m 30s')
1596
1596
    datetime.timedelta(0, 330)
1597
1597
    """
1598
1598
    timevalue = datetime.timedelta(0)
1600
1600
        try:
1601
1601
            suffix = unicode(s[-1])
1602
1602
            value = int(s[:-1])
1603
 
            if suffix == u"d":
 
1603
            if suffix == "d":
1604
1604
                delta = datetime.timedelta(value)
1605
 
            elif suffix == u"s":
 
1605
            elif suffix == "s":
1606
1606
                delta = datetime.timedelta(0, value)
1607
 
            elif suffix == u"m":
 
1607
            elif suffix == "m":
1608
1608
                delta = datetime.timedelta(0, 0, 0, 0, value)
1609
 
            elif suffix == u"h":
 
1609
            elif suffix == "h":
1610
1610
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
 
            elif suffix == u"w":
 
1611
            elif suffix == "w":
1612
1612
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1613
1613
            else:
1614
 
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1614
                raise ValueError("Unknown suffix %r" % suffix)
1615
1615
        except (ValueError, IndexError), e:
1616
1616
            raise ValueError(e.message)
1617
1617
        timevalue += delta
1625
1625
    global if_nametoindex
1626
1626
    try:
1627
1627
        if_nametoindex = (ctypes.cdll.LoadLibrary
1628
 
                          (ctypes.util.find_library(u"c"))
 
1628
                          (ctypes.util.find_library("c"))
1629
1629
                          .if_nametoindex)
1630
1630
    except (OSError, AttributeError):
1631
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1631
        logger.warning("Doing if_nametoindex the hard way")
1632
1632
        def if_nametoindex(interface):
1633
1633
            "Get an interface index the hard way, i.e. using fcntl()"
1634
1634
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1635
1635
            with contextlib.closing(socket.socket()) as s:
1636
1636
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
 
                                    struct.pack(str(u"16s16x"),
 
1637
                                    struct.pack(str("16s16x"),
1638
1638
                                                interface))
1639
 
            interface_index = struct.unpack(str(u"I"),
 
1639
            interface_index = struct.unpack(str("I"),
1640
1640
                                            ifreq[16:20])[0]
1641
1641
            return interface_index
1642
1642
    return if_nametoindex(interface)
1650
1650
        sys.exit()
1651
1651
    os.setsid()
1652
1652
    if not nochdir:
1653
 
        os.chdir(u"/")
 
1653
        os.chdir("/")
1654
1654
    if os.fork():
1655
1655
        sys.exit()
1656
1656
    if not noclose:
1658
1658
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1659
1659
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1660
1660
            raise OSError(errno.ENODEV,
1661
 
                          u"%s not a character device"
 
1661
                          "%s not a character device"
1662
1662
                          % os.path.devnull)
1663
1663
        os.dup2(null, sys.stdin.fileno())
1664
1664
        os.dup2(null, sys.stdout.fileno())
1672
1672
    ##################################################################
1673
1673
    # Parsing of options, both command line and config file
1674
1674
    
1675
 
    parser = optparse.OptionParser(version = u"%%prog %s" % version)
1676
 
    parser.add_option(u"-i", u"--interface", type=u"string",
1677
 
                      metavar=u"IF", help=u"Bind to interface IF")
1678
 
    parser.add_option(u"-a", u"--address", type=u"string",
1679
 
                      help=u"Address to listen for requests on")
1680
 
    parser.add_option(u"-p", u"--port", type=u"int",
1681
 
                      help=u"Port number to receive requests on")
1682
 
    parser.add_option(u"--check", action=u"store_true",
1683
 
                      help=u"Run self-test")
1684
 
    parser.add_option(u"--debug", action=u"store_true",
1685
 
                      help=u"Debug mode; run in foreground and log to"
1686
 
                      u" terminal")
1687
 
    parser.add_option(u"--debuglevel", type=u"string", metavar="LEVEL",
1688
 
                      help=u"Debug level for stdout output")
1689
 
    parser.add_option(u"--priority", type=u"string", help=u"GnuTLS"
1690
 
                      u" priority string (see GnuTLS documentation)")
1691
 
    parser.add_option(u"--servicename", type=u"string",
1692
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1693
 
    parser.add_option(u"--configdir", type=u"string",
1694
 
                      default=u"/etc/mandos", metavar=u"DIR",
1695
 
                      help=u"Directory to search for configuration"
1696
 
                      u" files")
1697
 
    parser.add_option(u"--no-dbus", action=u"store_false",
1698
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
 
                      u" system bus interface")
1700
 
    parser.add_option(u"--no-ipv6", action=u"store_false",
1701
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1675
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1676
    parser.add_option("-i", "--interface", type="string",
 
1677
                      metavar="IF", help="Bind to interface IF")
 
1678
    parser.add_option("-a", "--address", type="string",
 
1679
                      help="Address to listen for requests on")
 
1680
    parser.add_option("-p", "--port", type="int",
 
1681
                      help="Port number to receive requests on")
 
1682
    parser.add_option("--check", action="store_true",
 
1683
                      help="Run self-test")
 
1684
    parser.add_option("--debug", action="store_true",
 
1685
                      help="Debug mode; run in foreground and log to"
 
1686
                      " terminal")
 
1687
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
 
1688
                      help="Debug level for stdout output")
 
1689
    parser.add_option("--priority", type="string", help="GnuTLS"
 
1690
                      " priority string (see GnuTLS documentation)")
 
1691
    parser.add_option("--servicename", type="string",
 
1692
                      metavar="NAME", help="Zeroconf service name")
 
1693
    parser.add_option("--configdir", type="string",
 
1694
                      default="/etc/mandos", metavar="DIR",
 
1695
                      help="Directory to search for configuration"
 
1696
                      " files")
 
1697
    parser.add_option("--no-dbus", action="store_false",
 
1698
                      dest="use_dbus", help="Do not provide D-Bus"
 
1699
                      " system bus interface")
 
1700
    parser.add_option("--no-ipv6", action="store_false",
 
1701
                      dest="use_ipv6", help="Do not use IPv6")
1702
1702
    options = parser.parse_args()[0]
1703
1703
    
1704
1704
    if options.check:
1707
1707
        sys.exit()
1708
1708
    
1709
1709
    # Default values for config file for server-global settings
1710
 
    server_defaults = { u"interface": u"",
1711
 
                        u"address": u"",
1712
 
                        u"port": u"",
1713
 
                        u"debug": u"False",
1714
 
                        u"priority":
1715
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
 
                        u"servicename": u"Mandos",
1717
 
                        u"use_dbus": u"True",
1718
 
                        u"use_ipv6": u"True",
1719
 
                        u"debuglevel": u"",
 
1710
    server_defaults = { "interface": "",
 
1711
                        "address": "",
 
1712
                        "port": "",
 
1713
                        "debug": "False",
 
1714
                        "priority":
 
1715
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1716
                        "servicename": "Mandos",
 
1717
                        "use_dbus": "True",
 
1718
                        "use_ipv6": "True",
 
1719
                        "debuglevel": "",
1720
1720
                        }
1721
1721
    
1722
1722
    # Parse config file for server-global settings
1723
1723
    server_config = configparser.SafeConfigParser(server_defaults)
1724
1724
    del server_defaults
1725
1725
    server_config.read(os.path.join(options.configdir,
1726
 
                                    u"mandos.conf"))
 
1726
                                    "mandos.conf"))
1727
1727
    # Convert the SafeConfigParser object to a dict
1728
1728
    server_settings = server_config.defaults()
1729
1729
    # Use the appropriate methods on the non-string config options
1730
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
1730
    for option in ("debug", "use_dbus", "use_ipv6"):
 
1731
        server_settings[option] = server_config.getboolean("DEFAULT",
1732
1732
                                                           option)
1733
 
    if server_settings[u"port"]:
1734
 
        server_settings[u"port"] = server_config.getint(u"DEFAULT",
1735
 
                                                       u"port")
 
1733
    if server_settings["port"]:
 
1734
        server_settings["port"] = server_config.getint("DEFAULT",
 
1735
                                                       "port")
1736
1736
    del server_config
1737
1737
    
1738
1738
    # Override the settings from the config file with command line
1739
1739
    # options, if set.
1740
 
    for option in (u"interface", u"address", u"port", u"debug",
1741
 
                   u"priority", u"servicename", u"configdir",
1742
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
1740
    for option in ("interface", "address", "port", "debug",
 
1741
                   "priority", "servicename", "configdir",
 
1742
                   "use_dbus", "use_ipv6", "debuglevel"):
1743
1743
        value = getattr(options, option)
1744
1744
        if value is not None:
1745
1745
            server_settings[option] = value
1753
1753
    ##################################################################
1754
1754
    
1755
1755
    # For convenience
1756
 
    debug = server_settings[u"debug"]
1757
 
    debuglevel = server_settings[u"debuglevel"]
1758
 
    use_dbus = server_settings[u"use_dbus"]
1759
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1756
    debug = server_settings["debug"]
 
1757
    debuglevel = server_settings["debuglevel"]
 
1758
    use_dbus = server_settings["use_dbus"]
 
1759
    use_ipv6 = server_settings["use_ipv6"]
1760
1760
 
1761
 
    if server_settings[u"servicename"] != u"Mandos":
 
1761
    if server_settings["servicename"] != "Mandos":
1762
1762
        syslogger.setFormatter(logging.Formatter
1763
 
                               (u'Mandos (%s) [%%(process)d]:'
1764
 
                                u' %%(levelname)s: %%(message)s'
1765
 
                                % server_settings[u"servicename"]))
 
1763
                               ('Mandos (%s) [%%(process)d]:'
 
1764
                                ' %%(levelname)s: %%(message)s'
 
1765
                                % server_settings["servicename"]))
1766
1766
    
1767
1767
    # Parse config file with clients
1768
 
    client_defaults = { u"timeout": u"1h",
1769
 
                        u"interval": u"5m",
1770
 
                        u"checker": u"fping -q -- %%(host)s",
1771
 
                        u"host": u"",
1772
 
                        u"approval_delay": u"0s",
1773
 
                        u"approval_duration": u"1s",
 
1768
    client_defaults = { "timeout": "1h",
 
1769
                        "interval": "5m",
 
1770
                        "checker": "fping -q -- %%(host)s",
 
1771
                        "host": "",
 
1772
                        "approval_delay": "0s",
 
1773
                        "approval_duration": "1s",
1774
1774
                        }
1775
1775
    client_config = configparser.SafeConfigParser(client_defaults)
1776
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1777
 
                                    u"clients.conf"))
 
1776
    client_config.read(os.path.join(server_settings["configdir"],
 
1777
                                    "clients.conf"))
1778
1778
    
1779
1779
    global mandos_dbus_service
1780
1780
    mandos_dbus_service = None
1781
1781
    
1782
 
    tcp_server = MandosServer((server_settings[u"address"],
1783
 
                               server_settings[u"port"]),
 
1782
    tcp_server = MandosServer((server_settings["address"],
 
1783
                               server_settings["port"]),
1784
1784
                              ClientHandler,
1785
 
                              interface=(server_settings[u"interface"]
 
1785
                              interface=(server_settings["interface"]
1786
1786
                                         or None),
1787
1787
                              use_ipv6=use_ipv6,
1788
1788
                              gnutls_priority=
1789
 
                              server_settings[u"priority"],
 
1789
                              server_settings["priority"],
1790
1790
                              use_dbus=use_dbus)
1791
1791
    if not debug:
1792
 
        pidfilename = u"/var/run/mandos.pid"
 
1792
        pidfilename = "/var/run/mandos.pid"
1793
1793
        try:
1794
 
            pidfile = open(pidfilename, u"w")
 
1794
            pidfile = open(pidfilename, "w")
1795
1795
        except IOError:
1796
 
            logger.error(u"Could not open file %r", pidfilename)
 
1796
            logger.error("Could not open file %r", pidfilename)
1797
1797
    
1798
1798
    try:
1799
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1800
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1799
        uid = pwd.getpwnam("_mandos").pw_uid
 
1800
        gid = pwd.getpwnam("_mandos").pw_gid
1801
1801
    except KeyError:
1802
1802
        try:
1803
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1804
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1803
            uid = pwd.getpwnam("mandos").pw_uid
 
1804
            gid = pwd.getpwnam("mandos").pw_gid
1805
1805
        except KeyError:
1806
1806
            try:
1807
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1808
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1807
                uid = pwd.getpwnam("nobody").pw_uid
 
1808
                gid = pwd.getpwnam("nobody").pw_gid
1809
1809
            except KeyError:
1810
1810
                uid = 65534
1811
1811
                gid = 65534
1833
1833
        
1834
1834
        @gnutls.library.types.gnutls_log_func
1835
1835
        def debug_gnutls(level, string):
1836
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1836
            logger.debug("GnuTLS: %s", string[:-1])
1837
1837
        
1838
1838
        (gnutls.library.functions
1839
1839
         .gnutls_global_set_log_function(debug_gnutls))
1860
1860
    # End of Avahi example code
1861
1861
    if use_dbus:
1862
1862
        try:
1863
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1863
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1864
1864
                                            bus, do_not_queue=True)
1865
1865
        except dbus.exceptions.NameExistsException, e:
1866
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
1866
            logger.error(unicode(e) + ", disabling D-Bus")
1867
1867
            use_dbus = False
1868
 
            server_settings[u"use_dbus"] = False
 
1868
            server_settings["use_dbus"] = False
1869
1869
            tcp_server.use_dbus = False
1870
1870
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1871
 
    service = AvahiService(name = server_settings[u"servicename"],
1872
 
                           servicetype = u"_mandos._tcp",
 
1871
    service = AvahiService(name = server_settings["servicename"],
 
1872
                           servicetype = "_mandos._tcp",
1873
1873
                           protocol = protocol, bus = bus)
1874
 
    if server_settings[u"interface"]:
 
1874
    if server_settings["interface"]:
1875
1875
        service.interface = (if_nametoindex
1876
 
                             (str(server_settings[u"interface"])))
 
1876
                             (str(server_settings["interface"])))
1877
1877
    
1878
1878
    global multiprocessing_manager
1879
1879
    multiprocessing_manager = multiprocessing.Manager()
1883
1883
        client_class = functools.partial(ClientDBus, bus = bus)
1884
1884
    def client_config_items(config, section):
1885
1885
        special_settings = {
1886
 
            u"approved_by_default":
 
1886
            "approved_by_default":
1887
1887
                lambda: config.getboolean(section,
1888
 
                                          u"approved_by_default"),
 
1888
                                          "approved_by_default"),
1889
1889
            }
1890
1890
        for name, value in config.items(section):
1891
1891
            try:
1899
1899
                        client_config, section)))
1900
1900
            for section in client_config.sections()))
1901
1901
    if not tcp_server.clients:
1902
 
        logger.warning(u"No clients defined")
 
1902
        logger.warning("No clients defined")
1903
1903
        
1904
1904
    if not debug:
1905
1905
        try:
1906
1906
            with pidfile:
1907
1907
                pid = os.getpid()
1908
 
                pidfile.write(str(pid) + u"\n".encode("utf-8"))
 
1908
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1909
1909
            del pidfile
1910
1910
        except IOError:
1911
 
            logger.error(u"Could not write to file %r with PID %d",
 
1911
            logger.error("Could not write to file %r with PID %d",
1912
1912
                         pidfilename, pid)
1913
1913
        except NameError:
1914
1914
            # "pidfile" was never created
1924
1924
        class MandosDBusService(dbus.service.Object):
1925
1925
            """A D-Bus proxy object"""
1926
1926
            def __init__(self):
1927
 
                dbus.service.Object.__init__(self, bus, u"/")
1928
 
            _interface = u"se.bsnet.fukt.Mandos"
 
1927
                dbus.service.Object.__init__(self, bus, "/")
 
1928
            _interface = "se.bsnet.fukt.Mandos"
1929
1929
            
1930
 
            @dbus.service.signal(_interface, signature=u"o")
 
1930
            @dbus.service.signal(_interface, signature="o")
1931
1931
            def ClientAdded(self, objpath):
1932
1932
                "D-Bus signal"
1933
1933
                pass
1934
1934
            
1935
 
            @dbus.service.signal(_interface, signature=u"ss")
 
1935
            @dbus.service.signal(_interface, signature="ss")
1936
1936
            def ClientNotFound(self, fingerprint, address):
1937
1937
                "D-Bus signal"
1938
1938
                pass
1939
1939
            
1940
 
            @dbus.service.signal(_interface, signature=u"os")
 
1940
            @dbus.service.signal(_interface, signature="os")
1941
1941
            def ClientRemoved(self, objpath, name):
1942
1942
                "D-Bus signal"
1943
1943
                pass
1944
1944
            
1945
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1945
            @dbus.service.method(_interface, out_signature="ao")
1946
1946
            def GetAllClients(self):
1947
1947
                "D-Bus method"
1948
1948
                return dbus.Array(c.dbus_object_path
1949
1949
                                  for c in tcp_server.clients)
1950
1950
            
1951
1951
            @dbus.service.method(_interface,
1952
 
                                 out_signature=u"a{oa{sv}}")
 
1952
                                 out_signature="a{oa{sv}}")
1953
1953
            def GetAllClientsWithProperties(self):
1954
1954
                "D-Bus method"
1955
1955
                return dbus.Dictionary(
1956
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1956
                    ((c.dbus_object_path, c.GetAll(""))
1957
1957
                     for c in tcp_server.clients),
1958
 
                    signature=u"oa{sv}")
 
1958
                    signature="oa{sv}")
1959
1959
            
1960
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1960
            @dbus.service.method(_interface, in_signature="o")
1961
1961
            def RemoveClient(self, object_path):
1962
1962
                "D-Bus method"
1963
1963
                for c in tcp_server.clients:
2005
2005
    # Find out what port we got
2006
2006
    service.port = tcp_server.socket.getsockname()[1]
2007
2007
    if use_ipv6:
2008
 
        logger.info(u"Now listening on address %r, port %d,"
2009
 
                    u" flowinfo %d, scope_id %d"
 
2008
        logger.info("Now listening on address %r, port %d,"
 
2009
                    " flowinfo %d, scope_id %d"
2010
2010
                    % tcp_server.socket.getsockname())
2011
2011
    else:                       # IPv4
2012
 
        logger.info(u"Now listening on address %r, port %d"
 
2012
        logger.info("Now listening on address %r, port %d"
2013
2013
                    % tcp_server.socket.getsockname())
2014
2014
    
2015
2015
    #service.interface = tcp_server.socket.getsockname()[3]
2019
2019
        try:
2020
2020
            service.activate()
2021
2021
        except dbus.exceptions.DBusException, error:
2022
 
            logger.critical(u"DBusException: %s", error)
 
2022
            logger.critical("DBusException: %s", error)
2023
2023
            cleanup()
2024
2024
            sys.exit(1)
2025
2025
        # End of Avahi example code
2029
2029
                             (tcp_server.handle_request
2030
2030
                              (*args[2:], **kwargs) or True))
2031
2031
        
2032
 
        logger.debug(u"Starting main loop")
 
2032
        logger.debug("Starting main loop")
2033
2033
        main_loop.run()
2034
2034
    except AvahiError, error:
2035
 
        logger.critical(u"AvahiError: %s", error)
 
2035
        logger.critical("AvahiError: %s", error)
2036
2036
        cleanup()
2037
2037
        sys.exit(1)
2038
2038
    except KeyboardInterrupt:
2039
2039
        if debug:
2040
2040
            print >> sys.stderr
2041
 
        logger.debug(u"Server received KeyboardInterrupt")
2042
 
    logger.debug(u"Server exiting")
 
2041
        logger.debug("Server received KeyboardInterrupt")
 
2042
    logger.debug("Server exiting")
2043
2043
    # Must run before the D-Bus bus name gets deregistered
2044
2044
    cleanup()
2045
2045
 
2046
 
if __name__ == u'__main__':
 
2046
if __name__ == '__main__':
2047
2047
    main()