/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2011-07-31 13:05:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110731130534-v4d9hsvek80ms9uo
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
  (main): Disallow "--retry" arguments < 0.  Allow brackets [] around
          IPv6 addresses, as recommended by RFC 5952.  Bug fix: When
          using --connect, really use retry_interval, not 1 second.
* plugins.d/mandos-client.xml (DESCRIPTION): Add retry info.
  (--retry): Remove repeated word.

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