/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-09-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

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