/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* initramfs-tools-script: Bug fix: Add missing "--options" argument to
                          getopt.

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.0"
85
86
 
86
 
#logger = logging.getLogger(u'mandos')
87
 
logger = logging.Logger(u'mandos')
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
88
89
syslogger = (logging.handlers.SysLogHandler
89
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = "/dev/log"))
 
91
              address = str("/dev/log")))
91
92
syslogger.setFormatter(logging.Formatter
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
93
 
                        u' %(message)s'))
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
94
95
logger.addHandler(syslogger)
95
96
 
96
97
console = logging.StreamHandler()
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
 
                                       u' %(levelname)s:'
99
 
                                       u' %(message)s'))
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
100
101
logger.addHandler(console)
101
102
 
102
103
class AvahiError(Exception):
119
120
    Attributes:
120
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
121
122
               Used to optionally bind to the specified interface.
122
 
    name: string; Example: u'Mandos'
123
 
    type: string; Example: u'_mandos._tcp'.
 
123
    name: string; Example: 'Mandos'
 
124
    type: string; Example: '_mandos._tcp'.
124
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
125
126
    port: integer; what port to announce
126
127
    TXT: list of strings; TXT record for the service
135
136
    """
136
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
138
                 servicetype = None, port = None, TXT = None,
138
 
                 domain = u"", host = u"", max_renames = 32768,
 
139
                 domain = "", host = "", max_renames = 32768,
139
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
140
141
        self.interface = interface
141
142
        self.name = name
150
151
        self.group = None       # our entry group
151
152
        self.server = None
152
153
        self.bus = bus
 
154
        self.entry_group_state_changed_match = None
153
155
    def rename(self):
154
156
        """Derived from the Avahi example code"""
155
157
        if self.rename_count >= self.max_renames:
156
 
            logger.critical(u"No suitable Zeroconf service name found"
157
 
                            u" after %i retries, exiting.",
 
158
            logger.critical("No suitable Zeroconf service name found"
 
159
                            " after %i retries, exiting.",
158
160
                            self.rename_count)
159
 
            raise AvahiServiceError(u"Too many renames")
 
161
            raise AvahiServiceError("Too many renames")
160
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
 
        logger.info(u"Changing Zeroconf service name to %r ...",
 
163
        logger.info("Changing Zeroconf service name to %r ...",
162
164
                    self.name)
163
165
        syslogger.setFormatter(logging.Formatter
164
 
                               (u'Mandos (%s) [%%(process)d]:'
165
 
                                u' %%(levelname)s: %%(message)s'
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
166
168
                                % self.name))
167
169
        self.remove()
168
170
        try:
169
171
            self.add()
170
 
        except dbus.exceptions.DBusException, error:
171
 
            logger.critical(u"DBusException: %s", error)
 
172
        except dbus.exceptions.DBusException as error:
 
173
            logger.critical("DBusException: %s", error)
172
174
            self.cleanup()
173
175
            os._exit(1)
174
176
        self.rename_count += 1
175
177
    def remove(self):
176
178
        """Derived from the Avahi example code"""
 
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
 
240
268
    """A representation of a client host served by this server.
241
269
    
242
270
    Attributes:
243
 
    name:       string; from the config file, used in log messages and
244
 
                        D-Bus identifiers
 
271
    _approved:   bool(); 'None' if not yet approved/disapproved
 
272
    approval_delay: datetime.timedelta(); Time to wait for approval
 
273
    approval_duration: datetime.timedelta(); Duration of one approval
 
274
    checker:    subprocess.Popen(); a running checker process used
 
275
                                    to see if the client lives.
 
276
                                    'None' if no process is running.
 
277
    checker_callback_tag: a gobject event source tag, or None
 
278
    checker_command: string; External command which is run to check
 
279
                     if client lives.  %() expansions are done at
 
280
                     runtime with vars(self) as dict, so that for
 
281
                     instance %(name)s can be used in the command.
 
282
    checker_initiator_tag: a gobject event source tag, or None
 
283
    created:    datetime.datetime(); (UTC) object creation
 
284
    current_checker_command: string; current running checker_command
 
285
    disable_hook:  If set, called by disable() as disable_hook(self)
 
286
    disable_initiator_tag: a gobject event source tag, or None
 
287
    enabled:    bool()
245
288
    fingerprint: string (40 or 32 hexadecimal digits); used to
246
289
                 uniquely identify the client
247
 
    secret:     bytestring; sent verbatim (over TLS) to client
248
290
    host:       string; available for use by the checker command
249
 
    created:    datetime.datetime(); (UTC) object creation
 
291
    interval:   datetime.timedelta(); How often to start a new checker
 
292
    last_approval_request: datetime.datetime(); (UTC) or None
 
293
    last_checked_ok: datetime.datetime(); (UTC) or None
250
294
    last_enabled: datetime.datetime(); (UTC)
251
 
    enabled:    bool()
252
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
295
    name:       string; from the config file, used in log messages and
 
296
                        D-Bus identifiers
 
297
    secret:     bytestring; sent verbatim (over TLS) to client
253
298
    timeout:    datetime.timedelta(); How long from last_checked_ok
254
299
                                      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)
257
 
    checker:    subprocess.Popen(); a running checker process used
258
 
                                    to see if the client lives.
259
 
                                    'None' if no process is running.
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
265
 
                     runtime with vars(self) as dict, so that for
266
 
                     instance %(name)s can be used in the command.
267
 
    current_checker_command: string; current running checker_command
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
 
300
    runtime_expansions: Allowed attributes for runtime expansion.
271
301
    """
272
302
    
 
303
    runtime_expansions = ("approval_delay", "approval_duration",
 
304
                          "created", "enabled", "fingerprint",
 
305
                          "host", "interval", "last_checked_ok",
 
306
                          "last_enabled", "name", "timeout")
 
307
    
273
308
    @staticmethod
274
309
    def _timedelta_to_milliseconds(td):
275
310
        "Convert a datetime.timedelta() to milliseconds"
295
330
        self.name = name
296
331
        if config is None:
297
332
            config = {}
298
 
        logger.debug(u"Creating client %r", self.name)
 
333
        logger.debug("Creating client %r", self.name)
299
334
        # Uppercase and remove spaces from fingerprint for later
300
335
        # comparison purposes with return value from the fingerprint()
301
336
        # function
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:
 
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:
308
343
            with open(os.path.expanduser(os.path.expandvars
309
 
                                         (config[u"secfile"])),
 
344
                                         (config["secfile"])),
310
345
                      "rb") as secfile:
311
346
                self.secret = secfile.read()
312
347
        else:
313
 
            raise TypeError(u"No secret or secfile for client %s"
 
348
            raise TypeError("No secret or secfile for client %s"
314
349
                            % self.name)
315
 
        self.host = config.get(u"host", u"")
 
350
        self.host = config.get("host", "")
316
351
        self.created = datetime.datetime.utcnow()
317
352
        self.enabled = False
 
353
        self.last_approval_request = None
318
354
        self.last_enabled = None
319
355
        self.last_checked_ok = None
320
 
        self.timeout = string_to_delta(config[u"timeout"])
321
 
        self.interval = string_to_delta(config[u"interval"])
 
356
        self.timeout = string_to_delta(config["timeout"])
 
357
        self.interval = string_to_delta(config["interval"])
322
358
        self.disable_hook = disable_hook
323
359
        self.checker = None
324
360
        self.checker_initiator_tag = None
325
361
        self.disable_initiator_tag = None
326
362
        self.checker_callback_tag = None
327
 
        self.checker_command = config[u"checker"]
 
363
        self.checker_command = config["checker"]
328
364
        self.current_checker_command = None
329
365
        self.last_connect = None
330
366
        self._approved = None
331
 
        self.approved_by_default = config.get(u"approved_by_default",
 
367
        self.approved_by_default = config.get("approved_by_default",
332
368
                                              True)
333
369
        self.approvals_pending = 0
334
370
        self.approval_delay = string_to_delta(
335
 
            config[u"approval_delay"])
 
371
            config["approval_delay"])
336
372
        self.approval_duration = string_to_delta(
337
 
            config[u"approval_duration"])
 
373
            config["approval_duration"])
338
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
339
375
    
340
376
    def send_changedstate(self):
344
380
        
345
381
    def enable(self):
346
382
        """Start this client's checker and timeout hooks"""
347
 
        if getattr(self, u"enabled", False):
 
383
        if getattr(self, "enabled", False):
348
384
            # Already enabled
349
385
            return
350
386
        self.send_changedstate()
369
405
        if not quiet:
370
406
            self.send_changedstate()
371
407
        if not quiet:
372
 
            logger.info(u"Disabling client %s", self.name)
373
 
        if getattr(self, u"disable_initiator_tag", False):
 
408
            logger.info("Disabling client %s", self.name)
 
409
        if getattr(self, "disable_initiator_tag", False):
374
410
            gobject.source_remove(self.disable_initiator_tag)
375
411
            self.disable_initiator_tag = None
376
 
        if getattr(self, u"checker_initiator_tag", False):
 
412
        if getattr(self, "checker_initiator_tag", False):
377
413
            gobject.source_remove(self.checker_initiator_tag)
378
414
            self.checker_initiator_tag = None
379
415
        self.stop_checker()
394
430
        if os.WIFEXITED(condition):
395
431
            exitstatus = os.WEXITSTATUS(condition)
396
432
            if exitstatus == 0:
397
 
                logger.info(u"Checker for %(name)s succeeded",
 
433
                logger.info("Checker for %(name)s succeeded",
398
434
                            vars(self))
399
435
                self.checked_ok()
400
436
            else:
401
 
                logger.info(u"Checker for %(name)s failed",
 
437
                logger.info("Checker for %(name)s failed",
402
438
                            vars(self))
403
439
        else:
404
 
            logger.warning(u"Checker for %(name)s crashed?",
 
440
            logger.warning("Checker for %(name)s crashed?",
405
441
                           vars(self))
406
442
    
407
443
    def checked_ok(self):
416
452
                                      (self.timeout_milliseconds(),
417
453
                                       self.disable))
418
454
    
 
455
    def need_approval(self):
 
456
        self.last_approval_request = datetime.datetime.utcnow()
 
457
    
419
458
    def start_checker(self):
420
459
        """Start a new checker subprocess if one is not running.
421
460
        
433
472
        # If a checker exists, make sure it is not a zombie
434
473
        try:
435
474
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
436
 
        except (AttributeError, OSError), error:
 
475
        except (AttributeError, OSError) as error:
437
476
            if (isinstance(error, OSError)
438
477
                and error.errno != errno.ECHILD):
439
478
                raise error
440
479
        else:
441
480
            if pid:
442
 
                logger.warning(u"Checker was a zombie")
 
481
                logger.warning("Checker was a zombie")
443
482
                gobject.source_remove(self.checker_callback_tag)
444
483
                self.checker_callback(pid, status,
445
484
                                      self.current_checker_command)
450
489
                command = self.checker_command % self.host
451
490
            except TypeError:
452
491
                # Escape attributes for the shell
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())
 
492
                escaped_attrs = dict(
 
493
                    (attr,
 
494
                     re.escape(unicode(str(getattr(self, attr, "")),
 
495
                                       errors=
 
496
                                       'replace')))
 
497
                    for attr in
 
498
                    self.runtime_expansions)
 
499
 
459
500
                try:
460
501
                    command = self.checker_command % escaped_attrs
461
 
                except TypeError, error:
462
 
                    logger.error(u'Could not format string "%s":'
463
 
                                 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)
464
505
                    return True # Try again later
465
506
            self.current_checker_command = command
466
507
            try:
467
 
                logger.info(u"Starting checker %r for %s",
 
508
                logger.info("Starting checker %r for %s",
468
509
                            command, self.name)
469
510
                # We don't need to redirect stdout and stderr, since
470
511
                # in normal mode, that is already done by daemon(),
472
513
                # always replaced by /dev/null.)
473
514
                self.checker = subprocess.Popen(command,
474
515
                                                close_fds=True,
475
 
                                                shell=True, cwd=u"/")
 
516
                                                shell=True, cwd="/")
476
517
                self.checker_callback_tag = (gobject.child_watch_add
477
518
                                             (self.checker.pid,
478
519
                                              self.checker_callback,
483
524
                if pid:
484
525
                    gobject.source_remove(self.checker_callback_tag)
485
526
                    self.checker_callback(pid, status, command)
486
 
            except OSError, error:
487
 
                logger.error(u"Failed to start subprocess: %s",
 
527
            except OSError as error:
 
528
                logger.error("Failed to start subprocess: %s",
488
529
                             error)
489
530
        # Re-run this periodically if run by gobject.timeout_add
490
531
        return True
494
535
        if self.checker_callback_tag:
495
536
            gobject.source_remove(self.checker_callback_tag)
496
537
            self.checker_callback_tag = None
497
 
        if getattr(self, u"checker", None) is None:
 
538
        if getattr(self, "checker", None) is None:
498
539
            return
499
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
540
        logger.debug("Stopping checker for %(name)s", vars(self))
500
541
        try:
501
542
            os.kill(self.checker.pid, signal.SIGTERM)
502
543
            #time.sleep(0.5)
503
544
            #if self.checker.poll() is None:
504
545
            #    os.kill(self.checker.pid, signal.SIGKILL)
505
 
        except OSError, error:
 
546
        except OSError as error:
506
547
            if error.errno != errno.ESRCH: # No such process
507
548
                raise
508
549
        self.checker = None
509
550
 
510
 
def dbus_service_property(dbus_interface, signature=u"v",
511
 
                          access=u"readwrite", byte_arrays=False):
 
551
def dbus_service_property(dbus_interface, signature="v",
 
552
                          access="readwrite", byte_arrays=False):
512
553
    """Decorators for marking methods of a DBusObjectWithProperties to
513
554
    become properties on the D-Bus.
514
555
    
521
562
    """
522
563
    # Encoding deeply encoded byte arrays is not supported yet by the
523
564
    # "Set" method, so we fail early here:
524
 
    if byte_arrays and signature != u"ay":
525
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
526
 
                         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)
527
568
    def decorator(func):
528
569
        func._dbus_is_property = True
529
570
        func._dbus_interface = dbus_interface
530
571
        func._dbus_signature = signature
531
572
        func._dbus_access = access
532
573
        func._dbus_name = func.__name__
533
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
574
        if func._dbus_name.endswith("_dbus_property"):
534
575
            func._dbus_name = func._dbus_name[:-14]
535
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
576
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
536
577
        return func
537
578
    return decorator
538
579
 
566
607
    
567
608
    @staticmethod
568
609
    def _is_dbus_property(obj):
569
 
        return getattr(obj, u"_dbus_is_property", False)
 
610
        return getattr(obj, "_dbus_is_property", False)
570
611
    
571
612
    def _get_all_dbus_properties(self):
572
613
        """Returns a generator of (name, attribute) pairs
580
621
        property with the specified name and interface.
581
622
        """
582
623
        for name in (property_name,
583
 
                     property_name + u"_dbus_property"):
 
624
                     property_name + "_dbus_property"):
584
625
            prop = getattr(self, name, None)
585
626
            if (prop is None
586
627
                or not self._is_dbus_property(prop)
590
631
                continue
591
632
            return prop
592
633
        # No such property
593
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
 
                                   + interface_name + u"."
 
634
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
635
                                   + interface_name + "."
595
636
                                   + property_name)
596
637
    
597
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
598
 
                         out_signature=u"v")
 
638
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
639
                         out_signature="v")
599
640
    def Get(self, interface_name, property_name):
600
641
        """Standard D-Bus property Get() method, see D-Bus standard.
601
642
        """
602
643
        prop = self._get_dbus_property(interface_name, property_name)
603
 
        if prop._dbus_access == u"write":
 
644
        if prop._dbus_access == "write":
604
645
            raise DBusPropertyAccessException(property_name)
605
646
        value = prop()
606
 
        if not hasattr(value, u"variant_level"):
 
647
        if not hasattr(value, "variant_level"):
607
648
            return value
608
649
        return type(value)(value, variant_level=value.variant_level+1)
609
650
    
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
651
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
611
652
    def Set(self, interface_name, property_name, value):
612
653
        """Standard D-Bus property Set() method, see D-Bus standard.
613
654
        """
614
655
        prop = self._get_dbus_property(interface_name, property_name)
615
 
        if prop._dbus_access == u"read":
 
656
        if prop._dbus_access == "read":
616
657
            raise DBusPropertyAccessException(property_name)
617
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
658
        if prop._dbus_get_args_options["byte_arrays"]:
618
659
            # The byte_arrays option is not supported yet on
619
660
            # signatures other than "ay".
620
 
            if prop._dbus_signature != u"ay":
 
661
            if prop._dbus_signature != "ay":
621
662
                raise ValueError
622
663
            value = dbus.ByteArray(''.join(unichr(byte)
623
664
                                           for byte in value))
624
665
        prop(value)
625
666
    
626
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
 
                         out_signature=u"a{sv}")
 
667
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
668
                         out_signature="a{sv}")
628
669
    def GetAll(self, interface_name):
629
670
        """Standard D-Bus property GetAll() method, see D-Bus
630
671
        standard.
638
679
                # Interface non-empty but did not match
639
680
                continue
640
681
            # Ignore write-only properties
641
 
            if prop._dbus_access == u"write":
 
682
            if prop._dbus_access == "write":
642
683
                continue
643
684
            value = prop()
644
 
            if not hasattr(value, u"variant_level"):
 
685
            if not hasattr(value, "variant_level"):
645
686
                all[name] = value
646
687
                continue
647
688
            all[name] = type(value)(value, variant_level=
648
689
                                    value.variant_level+1)
649
 
        return dbus.Dictionary(all, signature=u"sv")
 
690
        return dbus.Dictionary(all, signature="sv")
650
691
    
651
692
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
652
 
                         out_signature=u"s",
 
693
                         out_signature="s",
653
694
                         path_keyword='object_path',
654
695
                         connection_keyword='connection')
655
696
    def Introspect(self, object_path, connection):
660
701
        try:
661
702
            document = xml.dom.minidom.parseString(xmlstring)
662
703
            def make_tag(document, name, prop):
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)
 
704
                e = document.createElement("property")
 
705
                e.setAttribute("name", name)
 
706
                e.setAttribute("type", prop._dbus_signature)
 
707
                e.setAttribute("access", prop._dbus_access)
667
708
                return e
668
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
709
            for if_tag in document.getElementsByTagName("interface"):
669
710
                for tag in (make_tag(document, name, prop)
670
711
                            for name, prop
671
712
                            in self._get_all_dbus_properties()
672
713
                            if prop._dbus_interface
673
 
                            == if_tag.getAttribute(u"name")):
 
714
                            == if_tag.getAttribute("name")):
674
715
                    if_tag.appendChild(tag)
675
716
                # Add the names to the return values for the
676
717
                # "org.freedesktop.DBus.Properties" methods
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")
 
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")
691
732
            document.unlink()
692
733
        except (AttributeError, xml.dom.DOMException,
693
 
                xml.parsers.expat.ExpatError), error:
694
 
            logger.error(u"Failed to override Introspection method",
 
734
                xml.parsers.expat.ExpatError) as error:
 
735
            logger.error("Failed to override Introspection method",
695
736
                         error)
696
737
        return xmlstring
697
738
 
703
744
    dbus_object_path: dbus.ObjectPath
704
745
    bus: dbus.SystemBus()
705
746
    """
 
747
    
 
748
    runtime_expansions = (Client.runtime_expansions
 
749
                          + ("dbus_object_path",))
 
750
    
706
751
    # dbus.service.Object doesn't use super(), so we can't either.
707
752
    
708
753
    def __init__(self, bus = None, *args, **kwargs):
711
756
        Client.__init__(self, *args, **kwargs)
712
757
        # Only now, when this client is initialized, can it show up on
713
758
        # the D-Bus
 
759
        client_object_name = unicode(self.name).translate(
 
760
            {ord("."): ord("_"),
 
761
             ord("-"): ord("_")})
714
762
        self.dbus_object_path = (dbus.ObjectPath
715
 
                                 (u"/clients/"
716
 
                                  + self.name.replace(u".", u"_")))
 
763
                                 ("/clients/" + client_object_name))
717
764
        DBusObjectWithProperties.__init__(self, self.bus,
718
765
                                          self.dbus_object_path)
719
766
        
726
773
        if (hasattr(self, "dbus_object_path")
727
774
            and bval is not bool(old_value)):
728
775
            dbus_bool = dbus.Boolean(bval, variant_level=1)
729
 
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
776
            self.PropertyChanged(dbus.String("ApprovalPending"),
730
777
                                 dbus_bool)
731
778
 
732
779
    approvals_pending = property(_get_approvals_pending,
740
787
                           variant_level=variant_level)
741
788
    
742
789
    def enable(self):
743
 
        oldstate = getattr(self, u"enabled", False)
 
790
        oldstate = getattr(self, "enabled", False)
744
791
        r = Client.enable(self)
745
792
        if oldstate != self.enabled:
746
793
            # Emit D-Bus signals
747
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
794
            self.PropertyChanged(dbus.String("Enabled"),
748
795
                                 dbus.Boolean(True, variant_level=1))
749
796
            self.PropertyChanged(
750
 
                dbus.String(u"LastEnabled"),
 
797
                dbus.String("LastEnabled"),
751
798
                self._datetime_to_dbus(self.last_enabled,
752
799
                                       variant_level=1))
753
800
        return r
754
801
    
755
802
    def disable(self, quiet = False):
756
 
        oldstate = getattr(self, u"enabled", False)
 
803
        oldstate = getattr(self, "enabled", False)
757
804
        r = Client.disable(self, quiet=quiet)
758
805
        if not quiet and oldstate != self.enabled:
759
806
            # Emit D-Bus signal
760
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
807
            self.PropertyChanged(dbus.String("Enabled"),
761
808
                                 dbus.Boolean(False, variant_level=1))
762
809
        return r
763
810
    
766
813
            self.remove_from_connection()
767
814
        except LookupError:
768
815
            pass
769
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
816
        if hasattr(DBusObjectWithProperties, "__del__"):
770
817
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
771
818
        Client.__del__(self, *args, **kwargs)
772
819
    
775
822
        self.checker_callback_tag = None
776
823
        self.checker = None
777
824
        # Emit D-Bus signal
778
 
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
825
        self.PropertyChanged(dbus.String("CheckerRunning"),
779
826
                             dbus.Boolean(False, variant_level=1))
780
827
        if os.WIFEXITED(condition):
781
828
            exitstatus = os.WEXITSTATUS(condition)
793
840
                                       *args, **kwargs)
794
841
    
795
842
    def checked_ok(self, *args, **kwargs):
796
 
        r = Client.checked_ok(self, *args, **kwargs)
 
843
        Client.checked_ok(self, *args, **kwargs)
797
844
        # Emit D-Bus signal
798
845
        self.PropertyChanged(
799
 
            dbus.String(u"LastCheckedOK"),
 
846
            dbus.String("LastCheckedOK"),
800
847
            (self._datetime_to_dbus(self.last_checked_ok,
801
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)))
802
857
        return r
803
858
    
804
859
    def start_checker(self, *args, **kwargs):
814
869
            # Emit D-Bus signal
815
870
            self.CheckerStarted(self.current_checker_command)
816
871
            self.PropertyChanged(
817
 
                dbus.String(u"CheckerRunning"),
 
872
                dbus.String("CheckerRunning"),
818
873
                dbus.Boolean(True, variant_level=1))
819
874
        return r
820
875
    
821
876
    def stop_checker(self, *args, **kwargs):
822
 
        old_checker = getattr(self, u"checker", None)
 
877
        old_checker = getattr(self, "checker", None)
823
878
        r = Client.stop_checker(self, *args, **kwargs)
824
879
        if (old_checker is not None
825
 
            and getattr(self, u"checker", None) is None):
826
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
880
            and getattr(self, "checker", None) is None):
 
881
            self.PropertyChanged(dbus.String("CheckerRunning"),
827
882
                                 dbus.Boolean(False, variant_level=1))
828
883
        return r
829
884
 
840
895
    
841
896
    
842
897
    ## D-Bus methods, signals & properties
843
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
844
899
    
845
900
    ## Signals
846
901
    
847
902
    # CheckerCompleted - signal
848
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
903
    @dbus.service.signal(_interface, signature="nxs")
849
904
    def CheckerCompleted(self, exitcode, waitstatus, command):
850
905
        "D-Bus signal"
851
906
        pass
852
907
    
853
908
    # CheckerStarted - signal
854
 
    @dbus.service.signal(_interface, signature=u"s")
 
909
    @dbus.service.signal(_interface, signature="s")
855
910
    def CheckerStarted(self, command):
856
911
        "D-Bus signal"
857
912
        pass
858
913
    
859
914
    # PropertyChanged - signal
860
 
    @dbus.service.signal(_interface, signature=u"sv")
 
915
    @dbus.service.signal(_interface, signature="sv")
861
916
    def PropertyChanged(self, property, value):
862
917
        "D-Bus signal"
863
918
        pass
872
927
        pass
873
928
    
874
929
    # Rejected - signal
875
 
    @dbus.service.signal(_interface, signature=u"s")
 
930
    @dbus.service.signal(_interface, signature="s")
876
931
    def Rejected(self, reason):
877
932
        "D-Bus signal"
878
933
        pass
879
934
    
880
935
    # NeedApproval - signal
881
 
    @dbus.service.signal(_interface, signature=u"tb")
 
936
    @dbus.service.signal(_interface, signature="tb")
882
937
    def NeedApproval(self, timeout, default):
883
938
        "D-Bus signal"
884
 
        pass
 
939
        return self.need_approval()
885
940
    
886
941
    ## Methods
887
 
 
 
942
    
888
943
    # Approve - method
889
 
    @dbus.service.method(_interface, in_signature=u"b")
 
944
    @dbus.service.method(_interface, in_signature="b")
890
945
    def Approve(self, value):
891
946
        self.approve(value)
892
 
 
 
947
    
893
948
    # CheckedOK - method
894
949
    @dbus.service.method(_interface)
895
950
    def CheckedOK(self):
896
 
        return self.checked_ok()
 
951
        self.checked_ok()
897
952
    
898
953
    # Enable - method
899
954
    @dbus.service.method(_interface)
921
976
    ## Properties
922
977
    
923
978
    # ApprovalPending - property
924
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
979
    @dbus_service_property(_interface, signature="b", access="read")
925
980
    def ApprovalPending_dbus_property(self):
926
981
        return dbus.Boolean(bool(self.approvals_pending))
927
982
    
928
983
    # ApprovedByDefault - property
929
 
    @dbus_service_property(_interface, signature=u"b",
930
 
                           access=u"readwrite")
 
984
    @dbus_service_property(_interface, signature="b",
 
985
                           access="readwrite")
931
986
    def ApprovedByDefault_dbus_property(self, value=None):
932
987
        if value is None:       # get
933
988
            return dbus.Boolean(self.approved_by_default)
934
989
        self.approved_by_default = bool(value)
935
990
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
991
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
937
992
                             dbus.Boolean(value, variant_level=1))
938
993
    
939
994
    # ApprovalDelay - property
940
 
    @dbus_service_property(_interface, signature=u"t",
941
 
                           access=u"readwrite")
 
995
    @dbus_service_property(_interface, signature="t",
 
996
                           access="readwrite")
942
997
    def ApprovalDelay_dbus_property(self, value=None):
943
998
        if value is None:       # get
944
999
            return dbus.UInt64(self.approval_delay_milliseconds())
945
1000
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
946
1001
        # Emit D-Bus signal
947
 
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
1002
        self.PropertyChanged(dbus.String("ApprovalDelay"),
948
1003
                             dbus.UInt64(value, variant_level=1))
949
1004
    
950
1005
    # ApprovalDuration - property
951
 
    @dbus_service_property(_interface, signature=u"t",
952
 
                           access=u"readwrite")
 
1006
    @dbus_service_property(_interface, signature="t",
 
1007
                           access="readwrite")
953
1008
    def ApprovalDuration_dbus_property(self, value=None):
954
1009
        if value is None:       # get
955
1010
            return dbus.UInt64(self._timedelta_to_milliseconds(
956
1011
                    self.approval_duration))
957
1012
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
958
1013
        # Emit D-Bus signal
959
 
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
1014
        self.PropertyChanged(dbus.String("ApprovalDuration"),
960
1015
                             dbus.UInt64(value, variant_level=1))
961
1016
    
962
1017
    # Name - property
963
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1018
    @dbus_service_property(_interface, signature="s", access="read")
964
1019
    def Name_dbus_property(self):
965
1020
        return dbus.String(self.name)
966
1021
    
967
1022
    # Fingerprint - property
968
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1023
    @dbus_service_property(_interface, signature="s", access="read")
969
1024
    def Fingerprint_dbus_property(self):
970
1025
        return dbus.String(self.fingerprint)
971
1026
    
972
1027
    # Host - property
973
 
    @dbus_service_property(_interface, signature=u"s",
974
 
                           access=u"readwrite")
 
1028
    @dbus_service_property(_interface, signature="s",
 
1029
                           access="readwrite")
975
1030
    def Host_dbus_property(self, value=None):
976
1031
        if value is None:       # get
977
1032
            return dbus.String(self.host)
978
1033
        self.host = value
979
1034
        # Emit D-Bus signal
980
 
        self.PropertyChanged(dbus.String(u"Host"),
 
1035
        self.PropertyChanged(dbus.String("Host"),
981
1036
                             dbus.String(value, variant_level=1))
982
1037
    
983
1038
    # Created - property
984
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1039
    @dbus_service_property(_interface, signature="s", access="read")
985
1040
    def Created_dbus_property(self):
986
1041
        return dbus.String(self._datetime_to_dbus(self.created))
987
1042
    
988
1043
    # LastEnabled - property
989
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1044
    @dbus_service_property(_interface, signature="s", access="read")
990
1045
    def LastEnabled_dbus_property(self):
991
1046
        if self.last_enabled is None:
992
 
            return dbus.String(u"")
 
1047
            return dbus.String("")
993
1048
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
994
1049
    
995
1050
    # Enabled - property
996
 
    @dbus_service_property(_interface, signature=u"b",
997
 
                           access=u"readwrite")
 
1051
    @dbus_service_property(_interface, signature="b",
 
1052
                           access="readwrite")
998
1053
    def Enabled_dbus_property(self, value=None):
999
1054
        if value is None:       # get
1000
1055
            return dbus.Boolean(self.enabled)
1004
1059
            self.disable()
1005
1060
    
1006
1061
    # LastCheckedOK - property
1007
 
    @dbus_service_property(_interface, signature=u"s",
1008
 
                           access=u"readwrite")
 
1062
    @dbus_service_property(_interface, signature="s",
 
1063
                           access="readwrite")
1009
1064
    def LastCheckedOK_dbus_property(self, value=None):
1010
1065
        if value is not None:
1011
1066
            self.checked_ok()
1012
1067
            return
1013
1068
        if self.last_checked_ok is None:
1014
 
            return dbus.String(u"")
 
1069
            return dbus.String("")
1015
1070
        return dbus.String(self._datetime_to_dbus(self
1016
1071
                                                  .last_checked_ok))
1017
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
    
1018
1082
    # Timeout - property
1019
 
    @dbus_service_property(_interface, signature=u"t",
1020
 
                           access=u"readwrite")
 
1083
    @dbus_service_property(_interface, signature="t",
 
1084
                           access="readwrite")
1021
1085
    def Timeout_dbus_property(self, value=None):
1022
1086
        if value is None:       # get
1023
1087
            return dbus.UInt64(self.timeout_milliseconds())
1024
1088
        self.timeout = datetime.timedelta(0, 0, 0, value)
1025
1089
        # Emit D-Bus signal
1026
 
        self.PropertyChanged(dbus.String(u"Timeout"),
 
1090
        self.PropertyChanged(dbus.String("Timeout"),
1027
1091
                             dbus.UInt64(value, variant_level=1))
1028
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1092
        if getattr(self, "disable_initiator_tag", None) is None:
1029
1093
            return
1030
1094
        # Reschedule timeout
1031
1095
        gobject.source_remove(self.disable_initiator_tag)
1044
1108
                                          (time_to_die, self.disable))
1045
1109
    
1046
1110
    # Interval - property
1047
 
    @dbus_service_property(_interface, signature=u"t",
1048
 
                           access=u"readwrite")
 
1111
    @dbus_service_property(_interface, signature="t",
 
1112
                           access="readwrite")
1049
1113
    def Interval_dbus_property(self, value=None):
1050
1114
        if value is None:       # get
1051
1115
            return dbus.UInt64(self.interval_milliseconds())
1052
1116
        self.interval = datetime.timedelta(0, 0, 0, value)
1053
1117
        # Emit D-Bus signal
1054
 
        self.PropertyChanged(dbus.String(u"Interval"),
 
1118
        self.PropertyChanged(dbus.String("Interval"),
1055
1119
                             dbus.UInt64(value, variant_level=1))
1056
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1120
        if getattr(self, "checker_initiator_tag", None) is None:
1057
1121
            return
1058
1122
        # Reschedule checker run
1059
1123
        gobject.source_remove(self.checker_initiator_tag)
1062
1126
        self.start_checker()    # Start one now, too
1063
1127
 
1064
1128
    # Checker - property
1065
 
    @dbus_service_property(_interface, signature=u"s",
1066
 
                           access=u"readwrite")
 
1129
    @dbus_service_property(_interface, signature="s",
 
1130
                           access="readwrite")
1067
1131
    def Checker_dbus_property(self, value=None):
1068
1132
        if value is None:       # get
1069
1133
            return dbus.String(self.checker_command)
1070
1134
        self.checker_command = value
1071
1135
        # Emit D-Bus signal
1072
 
        self.PropertyChanged(dbus.String(u"Checker"),
 
1136
        self.PropertyChanged(dbus.String("Checker"),
1073
1137
                             dbus.String(self.checker_command,
1074
1138
                                         variant_level=1))
1075
1139
    
1076
1140
    # CheckerRunning - property
1077
 
    @dbus_service_property(_interface, signature=u"b",
1078
 
                           access=u"readwrite")
 
1141
    @dbus_service_property(_interface, signature="b",
 
1142
                           access="readwrite")
1079
1143
    def CheckerRunning_dbus_property(self, value=None):
1080
1144
        if value is None:       # get
1081
1145
            return dbus.Boolean(self.checker is not None)
1085
1149
            self.stop_checker()
1086
1150
    
1087
1151
    # ObjectPath - property
1088
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1152
    @dbus_service_property(_interface, signature="o", access="read")
1089
1153
    def ObjectPath_dbus_property(self):
1090
1154
        return self.dbus_object_path # is already a dbus.ObjectPath
1091
1155
    
1092
1156
    # Secret = property
1093
 
    @dbus_service_property(_interface, signature=u"ay",
1094
 
                           access=u"write", byte_arrays=True)
 
1157
    @dbus_service_property(_interface, signature="ay",
 
1158
                           access="write", byte_arrays=True)
1095
1159
    def Secret_dbus_property(self, value):
1096
1160
        self.secret = str(value)
1097
1161
    
1132
1196
    
1133
1197
    def handle(self):
1134
1198
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1135
 
            logger.info(u"TCP connection from: %s",
 
1199
            logger.info("TCP connection from: %s",
1136
1200
                        unicode(self.client_address))
1137
 
            logger.debug(u"Pipe FD: %d",
 
1201
            logger.debug("Pipe FD: %d",
1138
1202
                         self.server.child_pipe.fileno())
1139
1203
 
1140
1204
            session = (gnutls.connection
1147
1211
            # no X.509 keys are added to it.  Therefore, we can use it
1148
1212
            # here despite using OpenPGP certificates.
1149
1213
 
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"))
 
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1215
            #                      "+AES-256-CBC", "+SHA1",
 
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1217
            #                      "+DHE-DSS"))
1154
1218
            # Use a fallback default, since this MUST be set.
1155
1219
            priority = self.server.gnutls_priority
1156
1220
            if priority is None:
1157
 
                priority = u"NORMAL"
 
1221
                priority = "NORMAL"
1158
1222
            (gnutls.library.functions
1159
1223
             .gnutls_priority_set_direct(session._c_object,
1160
1224
                                         priority, None))
1162
1226
            # Start communication using the Mandos protocol
1163
1227
            # Get protocol number
1164
1228
            line = self.request.makefile().readline()
1165
 
            logger.debug(u"Protocol version: %r", line)
 
1229
            logger.debug("Protocol version: %r", line)
1166
1230
            try:
1167
1231
                if int(line.strip().split()[0]) > 1:
1168
1232
                    raise RuntimeError
1169
 
            except (ValueError, IndexError, RuntimeError), error:
1170
 
                logger.error(u"Unknown protocol version: %s", error)
 
1233
            except (ValueError, IndexError, RuntimeError) as error:
 
1234
                logger.error("Unknown protocol version: %s", error)
1171
1235
                return
1172
1236
 
1173
1237
            # Start GnuTLS connection
1174
1238
            try:
1175
1239
                session.handshake()
1176
 
            except gnutls.errors.GNUTLSError, error:
1177
 
                logger.warning(u"Handshake failed: %s", error)
 
1240
            except gnutls.errors.GNUTLSError as error:
 
1241
                logger.warning("Handshake failed: %s", error)
1178
1242
                # Do not run session.bye() here: the session is not
1179
1243
                # established.  Just abandon the request.
1180
1244
                return
1181
 
            logger.debug(u"Handshake succeeded")
 
1245
            logger.debug("Handshake succeeded")
1182
1246
 
1183
1247
            approval_required = False
1184
1248
            try:
1185
1249
                try:
1186
1250
                    fpr = self.fingerprint(self.peer_certificate
1187
1251
                                           (session))
1188
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1189
 
                    logger.warning(u"Bad certificate: %s", error)
 
1252
                except (TypeError,
 
1253
                        gnutls.errors.GNUTLSError) as error:
 
1254
                    logger.warning("Bad certificate: %s", error)
1190
1255
                    return
1191
 
                logger.debug(u"Fingerprint: %s", fpr)
 
1256
                logger.debug("Fingerprint: %s", fpr)
1192
1257
 
1193
1258
                try:
1194
1259
                    client = ProxyClient(child_pipe, fpr,
1203
1268
                
1204
1269
                while True:
1205
1270
                    if not client.enabled:
1206
 
                        logger.warning(u"Client %s is disabled",
 
1271
                        logger.info("Client %s is disabled",
1207
1272
                                       client.name)
1208
1273
                        if self.server.use_dbus:
1209
1274
                            # Emit D-Bus signal
1214
1279
                        #We are approved or approval is disabled
1215
1280
                        break
1216
1281
                    elif client._approved is None:
1217
 
                        logger.info(u"Client %s needs approval",
 
1282
                        logger.info("Client %s needs approval",
1218
1283
                                    client.name)
1219
1284
                        if self.server.use_dbus:
1220
1285
                            # Emit D-Bus signal
1222
1287
                                client.approval_delay_milliseconds(),
1223
1288
                                client.approved_by_default)
1224
1289
                    else:
1225
 
                        logger.warning(u"Client %s was not approved",
 
1290
                        logger.warning("Client %s was not approved",
1226
1291
                                       client.name)
1227
1292
                        if self.server.use_dbus:
1228
1293
                            # Emit D-Bus signal
1243
1308
                                           client.name)
1244
1309
                            if self.server.use_dbus:
1245
1310
                                # Emit D-Bus signal
1246
 
                                client.Rejected("Timed out")
 
1311
                                client.Rejected("Approval timed out")
1247
1312
                            return
1248
1313
                        else:
1249
1314
                            break
1254
1319
                while sent_size < len(client.secret):
1255
1320
                    try:
1256
1321
                        sent = session.send(client.secret[sent_size:])
1257
 
                    except (gnutls.errors.GNUTLSError), error:
 
1322
                    except gnutls.errors.GNUTLSError as error:
1258
1323
                        logger.warning("gnutls send failed")
1259
1324
                        return
1260
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1325
                    logger.debug("Sent: %d, remaining: %d",
1261
1326
                                 sent, len(client.secret)
1262
1327
                                 - (sent_size + sent))
1263
1328
                    sent_size += sent
1264
1329
 
1265
 
                logger.info(u"Sending secret to %s", client.name)
 
1330
                logger.info("Sending secret to %s", client.name)
1266
1331
                # bump the timeout as if seen
1267
1332
                client.checked_ok()
1268
1333
                if self.server.use_dbus:
1274
1339
                    client.approvals_pending -= 1
1275
1340
                try:
1276
1341
                    session.bye()
1277
 
                except (gnutls.errors.GNUTLSError), error:
 
1342
                except gnutls.errors.GNUTLSError as error:
1278
1343
                    logger.warning("GnuTLS bye failed")
1279
1344
    
1280
1345
    @staticmethod
1291
1356
                     .gnutls_certificate_get_peers
1292
1357
                     (session._c_object, ctypes.byref(list_size)))
1293
1358
        if not bool(cert_list) and list_size.value != 0:
1294
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1295
 
                                            u" certificate")
 
1359
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1360
                                            " certificate")
1296
1361
        if list_size.value == 0:
1297
1362
            return None
1298
1363
        cert = cert_list[0]
1324
1389
        if crtverify.value != 0:
1325
1390
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1326
1391
            raise (gnutls.errors.CertificateSecurityError
1327
 
                   (u"Verify failed"))
 
1392
                   ("Verify failed"))
1328
1393
        # New buffer for the fingerprint
1329
1394
        buf = ctypes.create_string_buffer(20)
1330
1395
        buf_len = ctypes.c_size_t()
1337
1402
        # Convert the buffer to a Python bytestring
1338
1403
        fpr = ctypes.string_at(buf, buf_len.value)
1339
1404
        # Convert the bytestring to hexadecimal notation
1340
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1341
1406
        return hex_fpr
1342
1407
 
1343
1408
 
1371
1436
 
1372
1437
    def add_pipe(self, parent_pipe):
1373
1438
        """Dummy function; override as necessary"""
1374
 
        pass
 
1439
        raise NotImplementedError
1375
1440
 
1376
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1377
1442
                     socketserver.TCPServer, object):
1395
1460
        bind to an address or port if they were not specified."""
1396
1461
        if self.interface is not None:
1397
1462
            if SO_BINDTODEVICE is None:
1398
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1399
 
                             u" cannot bind to interface %s",
 
1463
                logger.error("SO_BINDTODEVICE does not exist;"
 
1464
                             " cannot bind to interface %s",
1400
1465
                             self.interface)
1401
1466
            else:
1402
1467
                try:
1403
1468
                    self.socket.setsockopt(socket.SOL_SOCKET,
1404
1469
                                           SO_BINDTODEVICE,
1405
1470
                                           str(self.interface
1406
 
                                               + u'\0'))
1407
 
                except socket.error, error:
 
1471
                                               + '\0'))
 
1472
                except socket.error as error:
1408
1473
                    if error[0] == errno.EPERM:
1409
 
                        logger.error(u"No permission to"
1410
 
                                     u" bind to interface %s",
 
1474
                        logger.error("No permission to"
 
1475
                                     " bind to interface %s",
1411
1476
                                     self.interface)
1412
1477
                    elif error[0] == errno.ENOPROTOOPT:
1413
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1414
 
                                     u" cannot bind to interface %s",
 
1478
                        logger.error("SO_BINDTODEVICE not available;"
 
1479
                                     " cannot bind to interface %s",
1415
1480
                                     self.interface)
1416
1481
                    else:
1417
1482
                        raise
1419
1484
        if self.server_address[0] or self.server_address[1]:
1420
1485
            if not self.server_address[0]:
1421
1486
                if self.address_family == socket.AF_INET6:
1422
 
                    any_address = u"::" # in6addr_any
 
1487
                    any_address = "::" # in6addr_any
1423
1488
                else:
1424
1489
                    any_address = socket.INADDR_ANY
1425
1490
                self.server_address = (any_address,
1474
1539
    def handle_ipc(self, source, condition, parent_pipe=None,
1475
1540
                   client_object=None):
1476
1541
        condition_names = {
1477
 
            gobject.IO_IN: u"IN",   # There is data to read.
1478
 
            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
1479
1544
                                    # blocking).
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
 
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
1483
1548
                                    # broken, usually for pipes and
1484
1549
                                    # sockets).
1485
1550
            }
1487
1552
                                       for cond, name in
1488
1553
                                       condition_names.iteritems()
1489
1554
                                       if cond & condition)
1490
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1491
 
                     conditions_string)
1492
 
 
1493
1555
        # error or the other end of multiprocessing.Pipe has closed
1494
1556
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1495
1557
            return False
1496
1558
        
1497
1559
        # Read a request from the child
1498
1560
        request = parent_pipe.recv()
1499
 
        logger.debug(u"IPC request: %s", repr(request))
1500
1561
        command = request[0]
1501
1562
        
1502
1563
        if command == 'init':
1508
1569
                    client = c
1509
1570
                    break
1510
1571
            else:
1511
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
1512
 
                               u"dress: %s", fpr, address)
 
1572
                logger.info("Client not found for fingerprint: %s, ad"
 
1573
                            "dress: %s", fpr, address)
1513
1574
                if self.use_dbus:
1514
1575
                    # Emit D-Bus signal
1515
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1576
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1516
1577
                parent_pipe.send(False)
1517
1578
                return False
1518
1579
            
1549
1610
def string_to_delta(interval):
1550
1611
    """Parse a string and return a datetime.timedelta
1551
1612
    
1552
 
    >>> string_to_delta(u'7d')
 
1613
    >>> string_to_delta('7d')
1553
1614
    datetime.timedelta(7)
1554
 
    >>> string_to_delta(u'60s')
 
1615
    >>> string_to_delta('60s')
1555
1616
    datetime.timedelta(0, 60)
1556
 
    >>> string_to_delta(u'60m')
 
1617
    >>> string_to_delta('60m')
1557
1618
    datetime.timedelta(0, 3600)
1558
 
    >>> string_to_delta(u'24h')
 
1619
    >>> string_to_delta('24h')
1559
1620
    datetime.timedelta(1)
1560
 
    >>> string_to_delta(u'1w')
 
1621
    >>> string_to_delta('1w')
1561
1622
    datetime.timedelta(7)
1562
 
    >>> string_to_delta(u'5m 30s')
 
1623
    >>> string_to_delta('5m 30s')
1563
1624
    datetime.timedelta(0, 330)
1564
1625
    """
1565
1626
    timevalue = datetime.timedelta(0)
1567
1628
        try:
1568
1629
            suffix = unicode(s[-1])
1569
1630
            value = int(s[:-1])
1570
 
            if suffix == u"d":
 
1631
            if suffix == "d":
1571
1632
                delta = datetime.timedelta(value)
1572
 
            elif suffix == u"s":
 
1633
            elif suffix == "s":
1573
1634
                delta = datetime.timedelta(0, value)
1574
 
            elif suffix == u"m":
 
1635
            elif suffix == "m":
1575
1636
                delta = datetime.timedelta(0, 0, 0, 0, value)
1576
 
            elif suffix == u"h":
 
1637
            elif suffix == "h":
1577
1638
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1578
 
            elif suffix == u"w":
 
1639
            elif suffix == "w":
1579
1640
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1580
1641
            else:
1581
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1582
 
        except (ValueError, IndexError), e:
1583
 
            raise ValueError(e.message)
 
1642
                raise ValueError("Unknown suffix %r" % suffix)
 
1643
        except (ValueError, IndexError) as e:
 
1644
            raise ValueError(*(e.args))
1584
1645
        timevalue += delta
1585
1646
    return timevalue
1586
1647
 
1592
1653
    global if_nametoindex
1593
1654
    try:
1594
1655
        if_nametoindex = (ctypes.cdll.LoadLibrary
1595
 
                          (ctypes.util.find_library(u"c"))
 
1656
                          (ctypes.util.find_library("c"))
1596
1657
                          .if_nametoindex)
1597
1658
    except (OSError, AttributeError):
1598
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1659
        logger.warning("Doing if_nametoindex the hard way")
1599
1660
        def if_nametoindex(interface):
1600
1661
            "Get an interface index the hard way, i.e. using fcntl()"
1601
1662
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1602
1663
            with contextlib.closing(socket.socket()) as s:
1603
1664
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1604
 
                                    struct.pack(str(u"16s16x"),
 
1665
                                    struct.pack(str("16s16x"),
1605
1666
                                                interface))
1606
 
            interface_index = struct.unpack(str(u"I"),
 
1667
            interface_index = struct.unpack(str("I"),
1607
1668
                                            ifreq[16:20])[0]
1608
1669
            return interface_index
1609
1670
    return if_nametoindex(interface)
1617
1678
        sys.exit()
1618
1679
    os.setsid()
1619
1680
    if not nochdir:
1620
 
        os.chdir(u"/")
 
1681
        os.chdir("/")
1621
1682
    if os.fork():
1622
1683
        sys.exit()
1623
1684
    if not noclose:
1625
1686
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1626
1687
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1627
1688
            raise OSError(errno.ENODEV,
1628
 
                          u"%s not a character device"
 
1689
                          "%s not a character device"
1629
1690
                          % os.path.devnull)
1630
1691
        os.dup2(null, sys.stdin.fileno())
1631
1692
        os.dup2(null, sys.stdout.fileno())
1639
1700
    ##################################################################
1640
1701
    # Parsing of options, both command line and config file
1641
1702
    
1642
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
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")
1669
 
    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()
1670
1734
    
1671
1735
    if options.check:
1672
1736
        import doctest
1674
1738
        sys.exit()
1675
1739
    
1676
1740
    # Default values for config file for server-global settings
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"",
 
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": "",
1687
1751
                        }
1688
1752
    
1689
1753
    # Parse config file for server-global settings
1690
1754
    server_config = configparser.SafeConfigParser(server_defaults)
1691
1755
    del server_defaults
1692
1756
    server_config.read(os.path.join(options.configdir,
1693
 
                                    u"mandos.conf"))
 
1757
                                    "mandos.conf"))
1694
1758
    # Convert the SafeConfigParser object to a dict
1695
1759
    server_settings = server_config.defaults()
1696
1760
    # Use the appropriate methods on the non-string config options
1697
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1698
 
        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",
1699
1763
                                                           option)
1700
1764
    if server_settings["port"]:
1701
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1702
 
                                                       u"port")
 
1765
        server_settings["port"] = server_config.getint("DEFAULT",
 
1766
                                                       "port")
1703
1767
    del server_config
1704
1768
    
1705
1769
    # Override the settings from the config file with command line
1706
1770
    # options, if set.
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"):
 
1771
    for option in ("interface", "address", "port", "debug",
 
1772
                   "priority", "servicename", "configdir",
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
1710
1774
        value = getattr(options, option)
1711
1775
        if value is not None:
1712
1776
            server_settings[option] = value
1720
1784
    ##################################################################
1721
1785
    
1722
1786
    # For convenience
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"]
 
1787
    debug = server_settings["debug"]
 
1788
    debuglevel = server_settings["debuglevel"]
 
1789
    use_dbus = server_settings["use_dbus"]
 
1790
    use_ipv6 = server_settings["use_ipv6"]
1727
1791
 
1728
 
    if server_settings[u"servicename"] != u"Mandos":
 
1792
    if server_settings["servicename"] != "Mandos":
1729
1793
        syslogger.setFormatter(logging.Formatter
1730
 
                               (u'Mandos (%s) [%%(process)d]:'
1731
 
                                u' %%(levelname)s: %%(message)s'
1732
 
                                % server_settings[u"servicename"]))
 
1794
                               ('Mandos (%s) [%%(process)d]:'
 
1795
                                ' %%(levelname)s: %%(message)s'
 
1796
                                % server_settings["servicename"]))
1733
1797
    
1734
1798
    # Parse config file with clients
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",
 
1799
    client_defaults = { "timeout": "1h",
 
1800
                        "interval": "5m",
 
1801
                        "checker": "fping -q -- %%(host)s",
 
1802
                        "host": "",
 
1803
                        "approval_delay": "0s",
 
1804
                        "approval_duration": "1s",
1741
1805
                        }
1742
1806
    client_config = configparser.SafeConfigParser(client_defaults)
1743
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1744
 
                                    u"clients.conf"))
 
1807
    client_config.read(os.path.join(server_settings["configdir"],
 
1808
                                    "clients.conf"))
1745
1809
    
1746
1810
    global mandos_dbus_service
1747
1811
    mandos_dbus_service = None
1748
1812
    
1749
 
    tcp_server = MandosServer((server_settings[u"address"],
1750
 
                               server_settings[u"port"]),
 
1813
    tcp_server = MandosServer((server_settings["address"],
 
1814
                               server_settings["port"]),
1751
1815
                              ClientHandler,
1752
 
                              interface=(server_settings[u"interface"]
 
1816
                              interface=(server_settings["interface"]
1753
1817
                                         or None),
1754
1818
                              use_ipv6=use_ipv6,
1755
1819
                              gnutls_priority=
1756
 
                              server_settings[u"priority"],
 
1820
                              server_settings["priority"],
1757
1821
                              use_dbus=use_dbus)
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)
 
1822
    if not debug:
 
1823
        pidfilename = "/var/run/mandos.pid"
 
1824
        try:
 
1825
            pidfile = open(pidfilename, "w")
 
1826
        except IOError:
 
1827
            logger.error("Could not open file %r", pidfilename)
1763
1828
    
1764
1829
    try:
1765
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1766
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1830
        uid = pwd.getpwnam("_mandos").pw_uid
 
1831
        gid = pwd.getpwnam("_mandos").pw_gid
1767
1832
    except KeyError:
1768
1833
        try:
1769
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1770
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1834
            uid = pwd.getpwnam("mandos").pw_uid
 
1835
            gid = pwd.getpwnam("mandos").pw_gid
1771
1836
        except KeyError:
1772
1837
            try:
1773
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1774
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1838
                uid = pwd.getpwnam("nobody").pw_uid
 
1839
                gid = pwd.getpwnam("nobody").pw_gid
1775
1840
            except KeyError:
1776
1841
                uid = 65534
1777
1842
                gid = 65534
1778
1843
    try:
1779
1844
        os.setgid(gid)
1780
1845
        os.setuid(uid)
1781
 
    except OSError, error:
 
1846
    except OSError as error:
1782
1847
        if error[0] != errno.EPERM:
1783
1848
            raise error
1784
1849
    
1799
1864
        
1800
1865
        @gnutls.library.types.gnutls_log_func
1801
1866
        def debug_gnutls(level, string):
1802
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1867
            logger.debug("GnuTLS: %s", string[:-1])
1803
1868
        
1804
1869
        (gnutls.library.functions
1805
1870
         .gnutls_global_set_log_function(debug_gnutls))
1813
1878
        # No console logging
1814
1879
        logger.removeHandler(console)
1815
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()
1816
1885
    
1817
1886
    global main_loop
1818
1887
    # From the Avahi example code
1822
1891
    # End of Avahi example code
1823
1892
    if use_dbus:
1824
1893
        try:
1825
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1826
1895
                                            bus, do_not_queue=True)
1827
 
        except dbus.exceptions.NameExistsException, e:
1828
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
1896
        except dbus.exceptions.NameExistsException as e:
 
1897
            logger.error(unicode(e) + ", disabling D-Bus")
1829
1898
            use_dbus = False
1830
 
            server_settings[u"use_dbus"] = False
 
1899
            server_settings["use_dbus"] = False
1831
1900
            tcp_server.use_dbus = False
1832
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1833
 
    service = AvahiService(name = server_settings[u"servicename"],
1834
 
                           servicetype = u"_mandos._tcp",
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
1903
                           servicetype = "_mandos._tcp",
1835
1904
                           protocol = protocol, bus = bus)
1836
1905
    if server_settings["interface"]:
1837
1906
        service.interface = (if_nametoindex
1838
 
                             (str(server_settings[u"interface"])))
1839
 
 
1840
 
    if not debug:
1841
 
        # Close all input and output, do double fork, etc.
1842
 
        daemon()
1843
 
        
 
1907
                             (str(server_settings["interface"])))
 
1908
    
1844
1909
    global multiprocessing_manager
1845
1910
    multiprocessing_manager = multiprocessing.Manager()
1846
1911
    
1865
1930
                        client_config, section)))
1866
1931
            for section in client_config.sections()))
1867
1932
    if not tcp_server.clients:
1868
 
        logger.warning(u"No clients defined")
 
1933
        logger.warning("No clients defined")
1869
1934
        
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
 
    
1883
1935
    if not debug:
 
1936
        try:
 
1937
            with pidfile:
 
1938
                pid = os.getpid()
 
1939
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1940
            del pidfile
 
1941
        except IOError:
 
1942
            logger.error("Could not write to file %r with PID %d",
 
1943
                         pidfilename, pid)
 
1944
        except NameError:
 
1945
            # "pidfile" was never created
 
1946
            pass
 
1947
        del pidfilename
 
1948
        
1884
1949
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1950
 
1885
1951
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1886
1952
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1887
1953
    
1889
1955
        class MandosDBusService(dbus.service.Object):
1890
1956
            """A D-Bus proxy object"""
1891
1957
            def __init__(self):
1892
 
                dbus.service.Object.__init__(self, bus, u"/")
1893
 
            _interface = u"se.bsnet.fukt.Mandos"
 
1958
                dbus.service.Object.__init__(self, bus, "/")
 
1959
            _interface = "se.bsnet.fukt.Mandos"
1894
1960
            
1895
 
            @dbus.service.signal(_interface, signature=u"o")
 
1961
            @dbus.service.signal(_interface, signature="o")
1896
1962
            def ClientAdded(self, objpath):
1897
1963
                "D-Bus signal"
1898
1964
                pass
1899
1965
            
1900
 
            @dbus.service.signal(_interface, signature=u"ss")
 
1966
            @dbus.service.signal(_interface, signature="ss")
1901
1967
            def ClientNotFound(self, fingerprint, address):
1902
1968
                "D-Bus signal"
1903
1969
                pass
1904
1970
            
1905
 
            @dbus.service.signal(_interface, signature=u"os")
 
1971
            @dbus.service.signal(_interface, signature="os")
1906
1972
            def ClientRemoved(self, objpath, name):
1907
1973
                "D-Bus signal"
1908
1974
                pass
1909
1975
            
1910
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1976
            @dbus.service.method(_interface, out_signature="ao")
1911
1977
            def GetAllClients(self):
1912
1978
                "D-Bus method"
1913
1979
                return dbus.Array(c.dbus_object_path
1914
1980
                                  for c in tcp_server.clients)
1915
1981
            
1916
1982
            @dbus.service.method(_interface,
1917
 
                                 out_signature=u"a{oa{sv}}")
 
1983
                                 out_signature="a{oa{sv}}")
1918
1984
            def GetAllClientsWithProperties(self):
1919
1985
                "D-Bus method"
1920
1986
                return dbus.Dictionary(
1921
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1987
                    ((c.dbus_object_path, c.GetAll(""))
1922
1988
                     for c in tcp_server.clients),
1923
 
                    signature=u"oa{sv}")
 
1989
                    signature="oa{sv}")
1924
1990
            
1925
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1991
            @dbus.service.method(_interface, in_signature="o")
1926
1992
            def RemoveClient(self, object_path):
1927
1993
                "D-Bus method"
1928
1994
                for c in tcp_server.clients:
1970
2036
    # Find out what port we got
1971
2037
    service.port = tcp_server.socket.getsockname()[1]
1972
2038
    if use_ipv6:
1973
 
        logger.info(u"Now listening on address %r, port %d,"
 
2039
        logger.info("Now listening on address %r, port %d,"
1974
2040
                    " flowinfo %d, scope_id %d"
1975
2041
                    % tcp_server.socket.getsockname())
1976
2042
    else:                       # IPv4
1977
 
        logger.info(u"Now listening on address %r, port %d"
 
2043
        logger.info("Now listening on address %r, port %d"
1978
2044
                    % tcp_server.socket.getsockname())
1979
2045
    
1980
2046
    #service.interface = tcp_server.socket.getsockname()[3]
1983
2049
        # From the Avahi example code
1984
2050
        try:
1985
2051
            service.activate()
1986
 
        except dbus.exceptions.DBusException, error:
1987
 
            logger.critical(u"DBusException: %s", error)
 
2052
        except dbus.exceptions.DBusException as error:
 
2053
            logger.critical("DBusException: %s", error)
1988
2054
            cleanup()
1989
2055
            sys.exit(1)
1990
2056
        # End of Avahi example code
1994
2060
                             (tcp_server.handle_request
1995
2061
                              (*args[2:], **kwargs) or True))
1996
2062
        
1997
 
        logger.debug(u"Starting main loop")
 
2063
        logger.debug("Starting main loop")
1998
2064
        main_loop.run()
1999
 
    except AvahiError, error:
2000
 
        logger.critical(u"AvahiError: %s", error)
 
2065
    except AvahiError as error:
 
2066
        logger.critical("AvahiError: %s", error)
2001
2067
        cleanup()
2002
2068
        sys.exit(1)
2003
2069
    except KeyboardInterrupt:
2004
2070
        if debug:
2005
 
            print >> sys.stderr
2006
 
        logger.debug(u"Server received KeyboardInterrupt")
2007
 
    logger.debug(u"Server exiting")
 
2071
            print("", file=sys.stderr)
 
2072
        logger.debug("Server received KeyboardInterrupt")
 
2073
    logger.debug("Server exiting")
2008
2074
    # Must run before the D-Bus bus name gets deregistered
2009
2075
    cleanup()
2010
2076