/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: 2011-04-02 06:37:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers.  Also Changed to new
          "except x as y" exception syntax.
  (AvahiService.entry_group_state_changed_match): New; contains the
                                                  SignalMatch object.
  (AvahiService.remove): Really remove the group and the signal
                         connection, if any.
  (AvahiService.add): Always create a new group and signal connection.
  (AvahiService.cleanup): Changed to simply call remove().
  (AvahiService.server_state_changed): Handle and log more bad states.
  (AvahiService.activate): Set "follow_name_owner_changes=True" on the
                           Avahi Server proxy object.
  (ClientDBus.checked_ok): Do not return anything.
  (ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.

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