/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-09-12 03:00:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh
Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

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