/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.1"
 
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
297
268
    secret:     bytestring; sent verbatim (over TLS) to client
298
269
    timeout:    datetime.timedelta(); How long from last_checked_ok
299
270
                                      until this client is disabled
300
 
    extended_timeout:   extra long timeout when password has been sent
301
271
    runtime_expansions: Allowed attributes for runtime expansion.
302
 
    expires:    datetime.datetime(); time (UTC) when a client will be
303
 
                disabled, or None
304
272
    """
305
273
    
306
 
    runtime_expansions = ("approval_delay", "approval_duration",
307
 
                          "created", "enabled", "fingerprint",
308
 
                          "host", "interval", "last_checked_ok",
309
 
                          "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")
310
278
    
311
279
    @staticmethod
312
280
    def _timedelta_to_milliseconds(td):
318
286
    def timeout_milliseconds(self):
319
287
        "Return the 'timeout' attribute in milliseconds"
320
288
        return self._timedelta_to_milliseconds(self.timeout)
321
 
 
322
 
    def extended_timeout_milliseconds(self):
323
 
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return self._timedelta_to_milliseconds(self.extended_timeout)    
325
289
    
326
290
    def interval_milliseconds(self):
327
291
        "Return the 'interval' attribute in milliseconds"
337
301
        self.name = name
338
302
        if config is None:
339
303
            config = {}
340
 
        logger.debug("Creating client %r", self.name)
 
304
        logger.debug(u"Creating client %r", self.name)
341
305
        # Uppercase and remove spaces from fingerprint for later
342
306
        # comparison purposes with return value from the fingerprint()
343
307
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
347
 
        if "secret" in config:
348
 
            self.secret = config["secret"].decode("base64")
349
 
        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:
350
314
            with open(os.path.expanduser(os.path.expandvars
351
 
                                         (config["secfile"])),
 
315
                                         (config[u"secfile"])),
352
316
                      "rb") as secfile:
353
317
                self.secret = secfile.read()
354
318
        else:
355
 
            raise TypeError("No secret or secfile for client %s"
 
319
            raise TypeError(u"No secret or secfile for client %s"
356
320
                            % self.name)
357
 
        self.host = config.get("host", "")
 
321
        self.host = config.get(u"host", u"")
358
322
        self.created = datetime.datetime.utcnow()
359
323
        self.enabled = False
360
 
        self.last_approval_request = None
361
324
        self.last_enabled = None
362
325
        self.last_checked_ok = None
363
 
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
365
 
        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"])
366
328
        self.disable_hook = disable_hook
367
329
        self.checker = None
368
330
        self.checker_initiator_tag = None
369
331
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
332
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
 
333
        self.checker_command = config[u"checker"]
373
334
        self.current_checker_command = None
374
335
        self.last_connect = None
375
336
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
 
337
        self.approved_by_default = config.get(u"approved_by_default",
377
338
                                              True)
378
339
        self.approvals_pending = 0
379
340
        self.approval_delay = string_to_delta(
380
 
            config["approval_delay"])
 
341
            config[u"approval_delay"])
381
342
        self.approval_duration = string_to_delta(
382
 
            config["approval_duration"])
 
343
            config[u"approval_duration"])
383
344
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
384
345
    
385
346
    def send_changedstate(self):
389
350
        
390
351
    def enable(self):
391
352
        """Start this client's checker and timeout hooks"""
392
 
        if getattr(self, "enabled", False):
 
353
        if getattr(self, u"enabled", False):
393
354
            # Already enabled
394
355
            return
395
356
        self.send_changedstate()
400
361
                                      (self.interval_milliseconds(),
401
362
                                       self.start_checker))
402
363
        # Schedule a disable() when 'timeout' has passed
403
 
        self.expires = datetime.datetime.utcnow() + self.timeout
404
364
        self.disable_initiator_tag = (gobject.timeout_add
405
365
                                   (self.timeout_milliseconds(),
406
366
                                    self.disable))
415
375
        if not quiet:
416
376
            self.send_changedstate()
417
377
        if not quiet:
418
 
            logger.info("Disabling client %s", self.name)
419
 
        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):
420
380
            gobject.source_remove(self.disable_initiator_tag)
421
381
            self.disable_initiator_tag = None
422
 
        self.expires = None
423
 
        if getattr(self, "checker_initiator_tag", False):
 
382
        if getattr(self, u"checker_initiator_tag", False):
424
383
            gobject.source_remove(self.checker_initiator_tag)
425
384
            self.checker_initiator_tag = None
426
385
        self.stop_checker()
441
400
        if os.WIFEXITED(condition):
442
401
            exitstatus = os.WEXITSTATUS(condition)
443
402
            if exitstatus == 0:
444
 
                logger.info("Checker for %(name)s succeeded",
 
403
                logger.info(u"Checker for %(name)s succeeded",
445
404
                            vars(self))
446
405
                self.checked_ok()
447
406
            else:
448
 
                logger.info("Checker for %(name)s failed",
 
407
                logger.info(u"Checker for %(name)s failed",
449
408
                            vars(self))
450
409
        else:
451
 
            logger.warning("Checker for %(name)s crashed?",
 
410
            logger.warning(u"Checker for %(name)s crashed?",
452
411
                           vars(self))
453
412
    
454
 
    def checked_ok(self, timeout=None):
 
413
    def checked_ok(self):
455
414
        """Bump up the timeout for this client.
456
415
        
457
416
        This should only be called when the client has been seen,
458
417
        alive and well.
459
418
        """
460
 
        if timeout is None:
461
 
            timeout = self.timeout
462
419
        self.last_checked_ok = datetime.datetime.utcnow()
463
420
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
421
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (self._timedelta_to_milliseconds(timeout),
 
422
                                      (self.timeout_milliseconds(),
467
423
                                       self.disable))
468
424
    
469
 
    def need_approval(self):
470
 
        self.last_approval_request = datetime.datetime.utcnow()
471
 
    
472
425
    def start_checker(self):
473
426
        """Start a new checker subprocess if one is not running.
474
427
        
486
439
        # If a checker exists, make sure it is not a zombie
487
440
        try:
488
441
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
489
 
        except (AttributeError, OSError) as error:
 
442
        except (AttributeError, OSError), error:
490
443
            if (isinstance(error, OSError)
491
444
                and error.errno != errno.ECHILD):
492
445
                raise error
493
446
        else:
494
447
            if pid:
495
 
                logger.warning("Checker was a zombie")
 
448
                logger.warning(u"Checker was a zombie")
496
449
                gobject.source_remove(self.checker_callback_tag)
497
450
                self.checker_callback(pid, status,
498
451
                                      self.current_checker_command)
505
458
                # Escape attributes for the shell
506
459
                escaped_attrs = dict(
507
460
                    (attr,
508
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
461
                     re.escape(unicode(str(getattr(self, attr, u"")),
509
462
                                       errors=
510
 
                                       'replace')))
 
463
                                       u'replace')))
511
464
                    for attr in
512
465
                    self.runtime_expansions)
513
466
 
514
467
                try:
515
468
                    command = self.checker_command % escaped_attrs
516
 
                except TypeError as error:
517
 
                    logger.error('Could not format string "%s":'
518
 
                                 ' %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)
519
472
                    return True # Try again later
520
473
            self.current_checker_command = command
521
474
            try:
522
 
                logger.info("Starting checker %r for %s",
 
475
                logger.info(u"Starting checker %r for %s",
523
476
                            command, self.name)
524
477
                # We don't need to redirect stdout and stderr, since
525
478
                # in normal mode, that is already done by daemon(),
527
480
                # always replaced by /dev/null.)
528
481
                self.checker = subprocess.Popen(command,
529
482
                                                close_fds=True,
530
 
                                                shell=True, cwd="/")
 
483
                                                shell=True, cwd=u"/")
531
484
                self.checker_callback_tag = (gobject.child_watch_add
532
485
                                             (self.checker.pid,
533
486
                                              self.checker_callback,
538
491
                if pid:
539
492
                    gobject.source_remove(self.checker_callback_tag)
540
493
                    self.checker_callback(pid, status, command)
541
 
            except OSError as error:
542
 
                logger.error("Failed to start subprocess: %s",
 
494
            except OSError, error:
 
495
                logger.error(u"Failed to start subprocess: %s",
543
496
                             error)
544
497
        # Re-run this periodically if run by gobject.timeout_add
545
498
        return True
549
502
        if self.checker_callback_tag:
550
503
            gobject.source_remove(self.checker_callback_tag)
551
504
            self.checker_callback_tag = None
552
 
        if getattr(self, "checker", None) is None:
 
505
        if getattr(self, u"checker", None) is None:
553
506
            return
554
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
507
        logger.debug(u"Stopping checker for %(name)s", vars(self))
555
508
        try:
556
509
            os.kill(self.checker.pid, signal.SIGTERM)
557
510
            #time.sleep(0.5)
558
511
            #if self.checker.poll() is None:
559
512
            #    os.kill(self.checker.pid, signal.SIGKILL)
560
 
        except OSError as error:
 
513
        except OSError, error:
561
514
            if error.errno != errno.ESRCH: # No such process
562
515
                raise
563
516
        self.checker = None
564
517
 
565
 
def dbus_service_property(dbus_interface, signature="v",
566
 
                          access="readwrite", byte_arrays=False):
 
518
def dbus_service_property(dbus_interface, signature=u"v",
 
519
                          access=u"readwrite", byte_arrays=False):
567
520
    """Decorators for marking methods of a DBusObjectWithProperties to
568
521
    become properties on the D-Bus.
569
522
    
576
529
    """
577
530
    # Encoding deeply encoded byte arrays is not supported yet by the
578
531
    # "Set" method, so we fail early here:
579
 
    if byte_arrays and signature != "ay":
580
 
        raise ValueError("Byte arrays not supported for non-'ay'"
581
 
                         " 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)
582
535
    def decorator(func):
583
536
        func._dbus_is_property = True
584
537
        func._dbus_interface = dbus_interface
585
538
        func._dbus_signature = signature
586
539
        func._dbus_access = access
587
540
        func._dbus_name = func.__name__
588
 
        if func._dbus_name.endswith("_dbus_property"):
 
541
        if func._dbus_name.endswith(u"_dbus_property"):
589
542
            func._dbus_name = func._dbus_name[:-14]
590
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
543
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
591
544
        return func
592
545
    return decorator
593
546
 
621
574
    
622
575
    @staticmethod
623
576
    def _is_dbus_property(obj):
624
 
        return getattr(obj, "_dbus_is_property", False)
 
577
        return getattr(obj, u"_dbus_is_property", False)
625
578
    
626
579
    def _get_all_dbus_properties(self):
627
580
        """Returns a generator of (name, attribute) pairs
635
588
        property with the specified name and interface.
636
589
        """
637
590
        for name in (property_name,
638
 
                     property_name + "_dbus_property"):
 
591
                     property_name + u"_dbus_property"):
639
592
            prop = getattr(self, name, None)
640
593
            if (prop is None
641
594
                or not self._is_dbus_property(prop)
645
598
                continue
646
599
            return prop
647
600
        # No such property
648
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
 
                                   + interface_name + "."
 
601
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
602
                                   + interface_name + u"."
650
603
                                   + property_name)
651
604
    
652
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
653
 
                         out_signature="v")
 
605
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
606
                         out_signature=u"v")
654
607
    def Get(self, interface_name, property_name):
655
608
        """Standard D-Bus property Get() method, see D-Bus standard.
656
609
        """
657
610
        prop = self._get_dbus_property(interface_name, property_name)
658
 
        if prop._dbus_access == "write":
 
611
        if prop._dbus_access == u"write":
659
612
            raise DBusPropertyAccessException(property_name)
660
613
        value = prop()
661
 
        if not hasattr(value, "variant_level"):
 
614
        if not hasattr(value, u"variant_level"):
662
615
            return value
663
616
        return type(value)(value, variant_level=value.variant_level+1)
664
617
    
665
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
618
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
666
619
    def Set(self, interface_name, property_name, value):
667
620
        """Standard D-Bus property Set() method, see D-Bus standard.
668
621
        """
669
622
        prop = self._get_dbus_property(interface_name, property_name)
670
 
        if prop._dbus_access == "read":
 
623
        if prop._dbus_access == u"read":
671
624
            raise DBusPropertyAccessException(property_name)
672
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
625
        if prop._dbus_get_args_options[u"byte_arrays"]:
673
626
            # The byte_arrays option is not supported yet on
674
627
            # signatures other than "ay".
675
 
            if prop._dbus_signature != "ay":
 
628
            if prop._dbus_signature != u"ay":
676
629
                raise ValueError
677
630
            value = dbus.ByteArray(''.join(unichr(byte)
678
631
                                           for byte in value))
679
632
        prop(value)
680
633
    
681
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
 
                         out_signature="a{sv}")
 
634
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
635
                         out_signature=u"a{sv}")
683
636
    def GetAll(self, interface_name):
684
637
        """Standard D-Bus property GetAll() method, see D-Bus
685
638
        standard.
693
646
                # Interface non-empty but did not match
694
647
                continue
695
648
            # Ignore write-only properties
696
 
            if prop._dbus_access == "write":
 
649
            if prop._dbus_access == u"write":
697
650
                continue
698
651
            value = prop()
699
 
            if not hasattr(value, "variant_level"):
 
652
            if not hasattr(value, u"variant_level"):
700
653
                all[name] = value
701
654
                continue
702
655
            all[name] = type(value)(value, variant_level=
703
656
                                    value.variant_level+1)
704
 
        return dbus.Dictionary(all, signature="sv")
 
657
        return dbus.Dictionary(all, signature=u"sv")
705
658
    
706
659
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
 
                         out_signature="s",
 
660
                         out_signature=u"s",
708
661
                         path_keyword='object_path',
709
662
                         connection_keyword='connection')
710
663
    def Introspect(self, object_path, connection):
715
668
        try:
716
669
            document = xml.dom.minidom.parseString(xmlstring)
717
670
            def make_tag(document, name, prop):
718
 
                e = document.createElement("property")
719
 
                e.setAttribute("name", name)
720
 
                e.setAttribute("type", prop._dbus_signature)
721
 
                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)
722
675
                return e
723
 
            for if_tag in document.getElementsByTagName("interface"):
 
676
            for if_tag in document.getElementsByTagName(u"interface"):
724
677
                for tag in (make_tag(document, name, prop)
725
678
                            for name, prop
726
679
                            in self._get_all_dbus_properties()
727
680
                            if prop._dbus_interface
728
 
                            == if_tag.getAttribute("name")):
 
681
                            == if_tag.getAttribute(u"name")):
729
682
                    if_tag.appendChild(tag)
730
683
                # Add the names to the return values for the
731
684
                # "org.freedesktop.DBus.Properties" methods
732
 
                if (if_tag.getAttribute("name")
733
 
                    == "org.freedesktop.DBus.Properties"):
734
 
                    for cn in if_tag.getElementsByTagName("method"):
735
 
                        if cn.getAttribute("name") == "Get":
736
 
                            for arg in cn.getElementsByTagName("arg"):
737
 
                                if (arg.getAttribute("direction")
738
 
                                    == "out"):
739
 
                                    arg.setAttribute("name", "value")
740
 
                        elif cn.getAttribute("name") == "GetAll":
741
 
                            for arg in cn.getElementsByTagName("arg"):
742
 
                                if (arg.getAttribute("direction")
743
 
                                    == "out"):
744
 
                                    arg.setAttribute("name", "props")
745
 
            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")
746
699
            document.unlink()
747
700
        except (AttributeError, xml.dom.DOMException,
748
 
                xml.parsers.expat.ExpatError) as error:
749
 
            logger.error("Failed to override Introspection method",
 
701
                xml.parsers.expat.ExpatError), error:
 
702
            logger.error(u"Failed to override Introspection method",
750
703
                         error)
751
704
        return xmlstring
752
705
 
760
713
    """
761
714
    
762
715
    runtime_expansions = (Client.runtime_expansions
763
 
                          + ("dbus_object_path",))
 
716
                          + (u"dbus_object_path",))
764
717
    
765
718
    # dbus.service.Object doesn't use super(), so we can't either.
766
719
    
771
724
        # Only now, when this client is initialized, can it show up on
772
725
        # the D-Bus
773
726
        client_object_name = unicode(self.name).translate(
774
 
            {ord("."): ord("_"),
775
 
             ord("-"): ord("_")})
 
727
            {ord(u"."): ord(u"_"),
 
728
             ord(u"-"): ord(u"_")})
776
729
        self.dbus_object_path = (dbus.ObjectPath
777
 
                                 ("/clients/" + client_object_name))
 
730
                                 (u"/clients/" + client_object_name))
778
731
        DBusObjectWithProperties.__init__(self, self.bus,
779
732
                                          self.dbus_object_path)
780
 
    def _set_expires(self, value):
781
 
        old_value = getattr(self, "_expires", None)
782
 
        self._expires = value
783
 
        if hasattr(self, "dbus_object_path") and old_value != value:
784
 
            dbus_time = (self._datetime_to_dbus(self._expires,
785
 
                                                variant_level=1))
786
 
            self.PropertyChanged(dbus.String("Expires"),
787
 
                                 dbus_time)
788
 
    expires = property(lambda self: self._expires, _set_expires)
789
 
    del _set_expires
790
733
        
791
734
    def _get_approvals_pending(self):
792
735
        return self._approvals_pending
797
740
        if (hasattr(self, "dbus_object_path")
798
741
            and bval is not bool(old_value)):
799
742
            dbus_bool = dbus.Boolean(bval, variant_level=1)
800
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
743
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
801
744
                                 dbus_bool)
802
745
 
803
746
    approvals_pending = property(_get_approvals_pending,
807
750
    @staticmethod
808
751
    def _datetime_to_dbus(dt, variant_level=0):
809
752
        """Convert a UTC datetime.datetime() to a D-Bus type."""
810
 
        if dt is None:
811
 
            return dbus.String("", variant_level = variant_level)
812
753
        return dbus.String(dt.isoformat(),
813
754
                           variant_level=variant_level)
814
755
    
815
756
    def enable(self):
816
 
        oldstate = getattr(self, "enabled", False)
 
757
        oldstate = getattr(self, u"enabled", False)
817
758
        r = Client.enable(self)
818
759
        if oldstate != self.enabled:
819
760
            # Emit D-Bus signals
820
 
            self.PropertyChanged(dbus.String("Enabled"),
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
821
762
                                 dbus.Boolean(True, variant_level=1))
822
763
            self.PropertyChanged(
823
 
                dbus.String("LastEnabled"),
 
764
                dbus.String(u"LastEnabled"),
824
765
                self._datetime_to_dbus(self.last_enabled,
825
766
                                       variant_level=1))
826
767
        return r
827
768
    
828
769
    def disable(self, quiet = False):
829
 
        oldstate = getattr(self, "enabled", False)
 
770
        oldstate = getattr(self, u"enabled", False)
830
771
        r = Client.disable(self, quiet=quiet)
831
772
        if not quiet and oldstate != self.enabled:
832
773
            # Emit D-Bus signal
833
 
            self.PropertyChanged(dbus.String("Enabled"),
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
834
775
                                 dbus.Boolean(False, variant_level=1))
835
776
        return r
836
777
    
839
780
            self.remove_from_connection()
840
781
        except LookupError:
841
782
            pass
842
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
783
        if hasattr(DBusObjectWithProperties, u"__del__"):
843
784
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
844
785
        Client.__del__(self, *args, **kwargs)
845
786
    
848
789
        self.checker_callback_tag = None
849
790
        self.checker = None
850
791
        # Emit D-Bus signal
851
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
852
793
                             dbus.Boolean(False, variant_level=1))
853
794
        if os.WIFEXITED(condition):
854
795
            exitstatus = os.WEXITSTATUS(condition)
866
807
                                       *args, **kwargs)
867
808
    
868
809
    def checked_ok(self, *args, **kwargs):
869
 
        Client.checked_ok(self, *args, **kwargs)
 
810
        r = Client.checked_ok(self, *args, **kwargs)
870
811
        # Emit D-Bus signal
871
812
        self.PropertyChanged(
872
 
            dbus.String("LastCheckedOK"),
 
813
            dbus.String(u"LastCheckedOK"),
873
814
            (self._datetime_to_dbus(self.last_checked_ok,
874
815
                                    variant_level=1)))
875
 
    
876
 
    def need_approval(self, *args, **kwargs):
877
 
        r = Client.need_approval(self, *args, **kwargs)
878
 
        # Emit D-Bus signal
879
 
        self.PropertyChanged(
880
 
            dbus.String("LastApprovalRequest"),
881
 
            (self._datetime_to_dbus(self.last_approval_request,
882
 
                                    variant_level=1)))
883
816
        return r
884
817
    
885
818
    def start_checker(self, *args, **kwargs):
895
828
            # Emit D-Bus signal
896
829
            self.CheckerStarted(self.current_checker_command)
897
830
            self.PropertyChanged(
898
 
                dbus.String("CheckerRunning"),
 
831
                dbus.String(u"CheckerRunning"),
899
832
                dbus.Boolean(True, variant_level=1))
900
833
        return r
901
834
    
902
835
    def stop_checker(self, *args, **kwargs):
903
 
        old_checker = getattr(self, "checker", None)
 
836
        old_checker = getattr(self, u"checker", None)
904
837
        r = Client.stop_checker(self, *args, **kwargs)
905
838
        if (old_checker is not None
906
 
            and getattr(self, "checker", None) is None):
907
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
839
            and getattr(self, u"checker", None) is None):
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
908
841
                                 dbus.Boolean(False, variant_level=1))
909
842
        return r
910
843
 
921
854
    
922
855
    
923
856
    ## D-Bus methods, signals & properties
924
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
857
    _interface = u"se.bsnet.fukt.Mandos.Client"
925
858
    
926
859
    ## Signals
927
860
    
928
861
    # CheckerCompleted - signal
929
 
    @dbus.service.signal(_interface, signature="nxs")
 
862
    @dbus.service.signal(_interface, signature=u"nxs")
930
863
    def CheckerCompleted(self, exitcode, waitstatus, command):
931
864
        "D-Bus signal"
932
865
        pass
933
866
    
934
867
    # CheckerStarted - signal
935
 
    @dbus.service.signal(_interface, signature="s")
 
868
    @dbus.service.signal(_interface, signature=u"s")
936
869
    def CheckerStarted(self, command):
937
870
        "D-Bus signal"
938
871
        pass
939
872
    
940
873
    # PropertyChanged - signal
941
 
    @dbus.service.signal(_interface, signature="sv")
 
874
    @dbus.service.signal(_interface, signature=u"sv")
942
875
    def PropertyChanged(self, property, value):
943
876
        "D-Bus signal"
944
877
        pass
953
886
        pass
954
887
    
955
888
    # Rejected - signal
956
 
    @dbus.service.signal(_interface, signature="s")
 
889
    @dbus.service.signal(_interface, signature=u"s")
957
890
    def Rejected(self, reason):
958
891
        "D-Bus signal"
959
892
        pass
960
893
    
961
894
    # NeedApproval - signal
962
 
    @dbus.service.signal(_interface, signature="tb")
 
895
    @dbus.service.signal(_interface, signature=u"tb")
963
896
    def NeedApproval(self, timeout, default):
964
897
        "D-Bus signal"
965
 
        return self.need_approval()
 
898
        pass
966
899
    
967
900
    ## Methods
968
 
    
 
901
 
969
902
    # Approve - method
970
 
    @dbus.service.method(_interface, in_signature="b")
 
903
    @dbus.service.method(_interface, in_signature=u"b")
971
904
    def Approve(self, value):
972
905
        self.approve(value)
973
 
    
 
906
 
974
907
    # CheckedOK - method
975
908
    @dbus.service.method(_interface)
976
909
    def CheckedOK(self):
977
 
        self.checked_ok()
 
910
        return self.checked_ok()
978
911
    
979
912
    # Enable - method
980
913
    @dbus.service.method(_interface)
1002
935
    ## Properties
1003
936
    
1004
937
    # ApprovalPending - property
1005
 
    @dbus_service_property(_interface, signature="b", access="read")
 
938
    @dbus_service_property(_interface, signature=u"b", access=u"read")
1006
939
    def ApprovalPending_dbus_property(self):
1007
940
        return dbus.Boolean(bool(self.approvals_pending))
1008
941
    
1009
942
    # ApprovedByDefault - property
1010
 
    @dbus_service_property(_interface, signature="b",
1011
 
                           access="readwrite")
 
943
    @dbus_service_property(_interface, signature=u"b",
 
944
                           access=u"readwrite")
1012
945
    def ApprovedByDefault_dbus_property(self, value=None):
1013
946
        if value is None:       # get
1014
947
            return dbus.Boolean(self.approved_by_default)
1015
 
        old_value = self.approved_by_default
1016
948
        self.approved_by_default = bool(value)
1017
949
        # Emit D-Bus signal
1018
 
        if old_value != self.approved_by_default:
1019
 
            self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
 
                                 dbus.Boolean(value, variant_level=1))
 
950
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
951
                             dbus.Boolean(value, variant_level=1))
1021
952
    
1022
953
    # ApprovalDelay - property
1023
 
    @dbus_service_property(_interface, signature="t",
1024
 
                           access="readwrite")
 
954
    @dbus_service_property(_interface, signature=u"t",
 
955
                           access=u"readwrite")
1025
956
    def ApprovalDelay_dbus_property(self, value=None):
1026
957
        if value is None:       # get
1027
958
            return dbus.UInt64(self.approval_delay_milliseconds())
1028
 
        old_value = self.approval_delay
1029
959
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
960
        # Emit D-Bus signal
1031
 
        if old_value != self.approval_delay:
1032
 
            self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
 
                                 dbus.UInt64(value, variant_level=1))
 
961
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
962
                             dbus.UInt64(value, variant_level=1))
1034
963
    
1035
964
    # ApprovalDuration - property
1036
 
    @dbus_service_property(_interface, signature="t",
1037
 
                           access="readwrite")
 
965
    @dbus_service_property(_interface, signature=u"t",
 
966
                           access=u"readwrite")
1038
967
    def ApprovalDuration_dbus_property(self, value=None):
1039
968
        if value is None:       # get
1040
969
            return dbus.UInt64(self._timedelta_to_milliseconds(
1041
970
                    self.approval_duration))
1042
 
        old_value = self.approval_duration
1043
971
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
972
        # Emit D-Bus signal
1045
 
        if old_value != self.approval_duration:
1046
 
            self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
 
                                 dbus.UInt64(value, variant_level=1))
 
973
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
974
                             dbus.UInt64(value, variant_level=1))
1048
975
    
1049
976
    # Name - property
1050
 
    @dbus_service_property(_interface, signature="s", access="read")
 
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1051
978
    def Name_dbus_property(self):
1052
979
        return dbus.String(self.name)
1053
980
    
1054
981
    # Fingerprint - property
1055
 
    @dbus_service_property(_interface, signature="s", access="read")
 
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1056
983
    def Fingerprint_dbus_property(self):
1057
984
        return dbus.String(self.fingerprint)
1058
985
    
1059
986
    # Host - property
1060
 
    @dbus_service_property(_interface, signature="s",
1061
 
                           access="readwrite")
 
987
    @dbus_service_property(_interface, signature=u"s",
 
988
                           access=u"readwrite")
1062
989
    def Host_dbus_property(self, value=None):
1063
990
        if value is None:       # get
1064
991
            return dbus.String(self.host)
1065
 
        old_value = self.host
1066
992
        self.host = value
1067
993
        # Emit D-Bus signal
1068
 
        if old_value != self.host:
1069
 
            self.PropertyChanged(dbus.String("Host"),
1070
 
                                 dbus.String(value, variant_level=1))
 
994
        self.PropertyChanged(dbus.String(u"Host"),
 
995
                             dbus.String(value, variant_level=1))
1071
996
    
1072
997
    # Created - property
1073
 
    @dbus_service_property(_interface, signature="s", access="read")
 
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1074
999
    def Created_dbus_property(self):
1075
1000
        return dbus.String(self._datetime_to_dbus(self.created))
1076
1001
    
1077
1002
    # LastEnabled - property
1078
 
    @dbus_service_property(_interface, signature="s", access="read")
 
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1079
1004
    def LastEnabled_dbus_property(self):
1080
 
        return self._datetime_to_dbus(self.last_enabled)
 
1005
        if self.last_enabled is None:
 
1006
            return dbus.String(u"")
 
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1081
1008
    
1082
1009
    # Enabled - property
1083
 
    @dbus_service_property(_interface, signature="b",
1084
 
                           access="readwrite")
 
1010
    @dbus_service_property(_interface, signature=u"b",
 
1011
                           access=u"readwrite")
1085
1012
    def Enabled_dbus_property(self, value=None):
1086
1013
        if value is None:       # get
1087
1014
            return dbus.Boolean(self.enabled)
1091
1018
            self.disable()
1092
1019
    
1093
1020
    # LastCheckedOK - property
1094
 
    @dbus_service_property(_interface, signature="s",
1095
 
                           access="readwrite")
 
1021
    @dbus_service_property(_interface, signature=u"s",
 
1022
                           access=u"readwrite")
1096
1023
    def LastCheckedOK_dbus_property(self, value=None):
1097
1024
        if value is not None:
1098
1025
            self.checked_ok()
1099
1026
            return
1100
 
        return self._datetime_to_dbus(self.last_checked_ok)
1101
 
    
1102
 
    # Expires - property
1103
 
    @dbus_service_property(_interface, signature="s", access="read")
1104
 
    def Expires_dbus_property(self):
1105
 
        return self._datetime_to_dbus(self.expires)
1106
 
    
1107
 
    # LastApprovalRequest - property
1108
 
    @dbus_service_property(_interface, signature="s", access="read")
1109
 
    def LastApprovalRequest_dbus_property(self):
1110
 
        return self._datetime_to_dbus(self.last_approval_request)
 
1027
        if self.last_checked_ok is None:
 
1028
            return dbus.String(u"")
 
1029
        return dbus.String(self._datetime_to_dbus(self
 
1030
                                                  .last_checked_ok))
1111
1031
    
1112
1032
    # Timeout - property
1113
 
    @dbus_service_property(_interface, signature="t",
1114
 
                           access="readwrite")
 
1033
    @dbus_service_property(_interface, signature=u"t",
 
1034
                           access=u"readwrite")
1115
1035
    def Timeout_dbus_property(self, value=None):
1116
1036
        if value is None:       # get
1117
1037
            return dbus.UInt64(self.timeout_milliseconds())
1118
 
        old_value = self.timeout
1119
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
1120
1039
        # Emit D-Bus signal
1121
 
        if old_value != self.timeout:
1122
 
            self.PropertyChanged(dbus.String("Timeout"),
1123
 
                                 dbus.UInt64(value, variant_level=1))
1124
 
        if getattr(self, "disable_initiator_tag", None) is None:
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
 
1041
                             dbus.UInt64(value, variant_level=1))
 
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
1125
1043
            return
1126
1044
        # Reschedule timeout
1127
1045
        gobject.source_remove(self.disable_initiator_tag)
1128
1046
        self.disable_initiator_tag = None
1129
 
        self.expires = None
1130
1047
        time_to_die = (self.
1131
1048
                       _timedelta_to_milliseconds((self
1132
1049
                                                   .last_checked_ok
1137
1054
            # The timeout has passed
1138
1055
            self.disable()
1139
1056
        else:
1140
 
            self.expires = (datetime.datetime.utcnow()
1141
 
                            + datetime.timedelta(milliseconds = time_to_die))
1142
1057
            self.disable_initiator_tag = (gobject.timeout_add
1143
1058
                                          (time_to_die, self.disable))
1144
 
 
1145
 
    # ExtendedTimeout - property
1146
 
    @dbus_service_property(_interface, signature="t",
1147
 
                           access="readwrite")
1148
 
    def ExtendedTimeout_dbus_property(self, value=None):
1149
 
        if value is None:       # get
1150
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1151
 
        old_value = self.extended_timeout
1152
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1153
 
        # Emit D-Bus signal
1154
 
        if old_value != self.extended_timeout:
1155
 
            self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
 
                                 dbus.UInt64(value, variant_level=1))
1157
 
 
 
1059
    
1158
1060
    # Interval - property
1159
 
    @dbus_service_property(_interface, signature="t",
1160
 
                           access="readwrite")
 
1061
    @dbus_service_property(_interface, signature=u"t",
 
1062
                           access=u"readwrite")
1161
1063
    def Interval_dbus_property(self, value=None):
1162
1064
        if value is None:       # get
1163
1065
            return dbus.UInt64(self.interval_milliseconds())
1164
 
        old_value = self.interval
1165
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
1166
1067
        # Emit D-Bus signal
1167
 
        if old_value != self.interval:
1168
 
            self.PropertyChanged(dbus.String("Interval"),
1169
 
                                 dbus.UInt64(value, variant_level=1))
1170
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
 
1069
                             dbus.UInt64(value, variant_level=1))
 
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
1171
1071
            return
1172
1072
        # Reschedule checker run
1173
1073
        gobject.source_remove(self.checker_initiator_tag)
1176
1076
        self.start_checker()    # Start one now, too
1177
1077
 
1178
1078
    # Checker - property
1179
 
    @dbus_service_property(_interface, signature="s",
1180
 
                           access="readwrite")
 
1079
    @dbus_service_property(_interface, signature=u"s",
 
1080
                           access=u"readwrite")
1181
1081
    def Checker_dbus_property(self, value=None):
1182
1082
        if value is None:       # get
1183
1083
            return dbus.String(self.checker_command)
1184
 
        old_value = self.checker_command
1185
1084
        self.checker_command = value
1186
1085
        # Emit D-Bus signal
1187
 
        if old_value != self.checker_command:
1188
 
            self.PropertyChanged(dbus.String("Checker"),
1189
 
                                 dbus.String(self.checker_command,
1190
 
                                             variant_level=1))
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
 
1087
                             dbus.String(self.checker_command,
 
1088
                                         variant_level=1))
1191
1089
    
1192
1090
    # CheckerRunning - property
1193
 
    @dbus_service_property(_interface, signature="b",
1194
 
                           access="readwrite")
 
1091
    @dbus_service_property(_interface, signature=u"b",
 
1092
                           access=u"readwrite")
1195
1093
    def CheckerRunning_dbus_property(self, value=None):
1196
1094
        if value is None:       # get
1197
1095
            return dbus.Boolean(self.checker is not None)
1201
1099
            self.stop_checker()
1202
1100
    
1203
1101
    # ObjectPath - property
1204
 
    @dbus_service_property(_interface, signature="o", access="read")
 
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1205
1103
    def ObjectPath_dbus_property(self):
1206
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
1207
1105
    
1208
1106
    # Secret = property
1209
 
    @dbus_service_property(_interface, signature="ay",
1210
 
                           access="write", byte_arrays=True)
 
1107
    @dbus_service_property(_interface, signature=u"ay",
 
1108
                           access=u"write", byte_arrays=True)
1211
1109
    def Secret_dbus_property(self, value):
1212
1110
        self.secret = str(value)
1213
1111
    
1248
1146
    
1249
1147
    def handle(self):
1250
1148
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1251
 
            logger.info("TCP connection from: %s",
 
1149
            logger.info(u"TCP connection from: %s",
1252
1150
                        unicode(self.client_address))
1253
 
            logger.debug("Pipe FD: %d",
 
1151
            logger.debug(u"Pipe FD: %d",
1254
1152
                         self.server.child_pipe.fileno())
1255
1153
 
1256
1154
            session = (gnutls.connection
1263
1161
            # no X.509 keys are added to it.  Therefore, we can use it
1264
1162
            # here despite using OpenPGP certificates.
1265
1163
 
1266
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
 
            #                      "+AES-256-CBC", "+SHA1",
1268
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1269
 
            #                      "+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"))
1270
1168
            # Use a fallback default, since this MUST be set.
1271
1169
            priority = self.server.gnutls_priority
1272
1170
            if priority is None:
1273
 
                priority = "NORMAL"
 
1171
                priority = u"NORMAL"
1274
1172
            (gnutls.library.functions
1275
1173
             .gnutls_priority_set_direct(session._c_object,
1276
1174
                                         priority, None))
1278
1176
            # Start communication using the Mandos protocol
1279
1177
            # Get protocol number
1280
1178
            line = self.request.makefile().readline()
1281
 
            logger.debug("Protocol version: %r", line)
 
1179
            logger.debug(u"Protocol version: %r", line)
1282
1180
            try:
1283
1181
                if int(line.strip().split()[0]) > 1:
1284
1182
                    raise RuntimeError
1285
 
            except (ValueError, IndexError, RuntimeError) as error:
1286
 
                logger.error("Unknown protocol version: %s", error)
 
1183
            except (ValueError, IndexError, RuntimeError), error:
 
1184
                logger.error(u"Unknown protocol version: %s", error)
1287
1185
                return
1288
1186
 
1289
1187
            # Start GnuTLS connection
1290
1188
            try:
1291
1189
                session.handshake()
1292
 
            except gnutls.errors.GNUTLSError as error:
1293
 
                logger.warning("Handshake failed: %s", error)
 
1190
            except gnutls.errors.GNUTLSError, error:
 
1191
                logger.warning(u"Handshake failed: %s", error)
1294
1192
                # Do not run session.bye() here: the session is not
1295
1193
                # established.  Just abandon the request.
1296
1194
                return
1297
 
            logger.debug("Handshake succeeded")
 
1195
            logger.debug(u"Handshake succeeded")
1298
1196
 
1299
1197
            approval_required = False
1300
1198
            try:
1301
1199
                try:
1302
1200
                    fpr = self.fingerprint(self.peer_certificate
1303
1201
                                           (session))
1304
 
                except (TypeError,
1305
 
                        gnutls.errors.GNUTLSError) as error:
1306
 
                    logger.warning("Bad certificate: %s", error)
 
1202
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1203
                    logger.warning(u"Bad certificate: %s", error)
1307
1204
                    return
1308
 
                logger.debug("Fingerprint: %s", fpr)
 
1205
                logger.debug(u"Fingerprint: %s", fpr)
1309
1206
 
1310
1207
                try:
1311
1208
                    client = ProxyClient(child_pipe, fpr,
1320
1217
                
1321
1218
                while True:
1322
1219
                    if not client.enabled:
1323
 
                        logger.info("Client %s is disabled",
 
1220
                        logger.warning(u"Client %s is disabled",
1324
1221
                                       client.name)
1325
1222
                        if self.server.use_dbus:
1326
1223
                            # Emit D-Bus signal
1331
1228
                        #We are approved or approval is disabled
1332
1229
                        break
1333
1230
                    elif client._approved is None:
1334
 
                        logger.info("Client %s needs approval",
 
1231
                        logger.info(u"Client %s needs approval",
1335
1232
                                    client.name)
1336
1233
                        if self.server.use_dbus:
1337
1234
                            # Emit D-Bus signal
1339
1236
                                client.approval_delay_milliseconds(),
1340
1237
                                client.approved_by_default)
1341
1238
                    else:
1342
 
                        logger.warning("Client %s was not approved",
 
1239
                        logger.warning(u"Client %s was not approved",
1343
1240
                                       client.name)
1344
1241
                        if self.server.use_dbus:
1345
1242
                            # Emit D-Bus signal
1371
1268
                while sent_size < len(client.secret):
1372
1269
                    try:
1373
1270
                        sent = session.send(client.secret[sent_size:])
1374
 
                    except gnutls.errors.GNUTLSError as error:
 
1271
                    except (gnutls.errors.GNUTLSError), error:
1375
1272
                        logger.warning("gnutls send failed")
1376
1273
                        return
1377
 
                    logger.debug("Sent: %d, remaining: %d",
 
1274
                    logger.debug(u"Sent: %d, remaining: %d",
1378
1275
                                 sent, len(client.secret)
1379
1276
                                 - (sent_size + sent))
1380
1277
                    sent_size += sent
1381
1278
 
1382
 
                logger.info("Sending secret to %s", client.name)
 
1279
                logger.info(u"Sending secret to %s", client.name)
1383
1280
                # bump the timeout as if seen
1384
 
                client.checked_ok(client.extended_timeout)
 
1281
                client.checked_ok()
1385
1282
                if self.server.use_dbus:
1386
1283
                    # Emit D-Bus signal
1387
1284
                    client.GotSecret()
1391
1288
                    client.approvals_pending -= 1
1392
1289
                try:
1393
1290
                    session.bye()
1394
 
                except gnutls.errors.GNUTLSError as error:
 
1291
                except (gnutls.errors.GNUTLSError), error:
1395
1292
                    logger.warning("GnuTLS bye failed")
1396
1293
    
1397
1294
    @staticmethod
1408
1305
                     .gnutls_certificate_get_peers
1409
1306
                     (session._c_object, ctypes.byref(list_size)))
1410
1307
        if not bool(cert_list) and list_size.value != 0:
1411
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1412
 
                                            " certificate")
 
1308
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1309
                                            u" certificate")
1413
1310
        if list_size.value == 0:
1414
1311
            return None
1415
1312
        cert = cert_list[0]
1441
1338
        if crtverify.value != 0:
1442
1339
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1443
1340
            raise (gnutls.errors.CertificateSecurityError
1444
 
                   ("Verify failed"))
 
1341
                   (u"Verify failed"))
1445
1342
        # New buffer for the fingerprint
1446
1343
        buf = ctypes.create_string_buffer(20)
1447
1344
        buf_len = ctypes.c_size_t()
1454
1351
        # Convert the buffer to a Python bytestring
1455
1352
        fpr = ctypes.string_at(buf, buf_len.value)
1456
1353
        # Convert the bytestring to hexadecimal notation
1457
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1354
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1458
1355
        return hex_fpr
1459
1356
 
1460
1357
 
1488
1385
 
1489
1386
    def add_pipe(self, parent_pipe):
1490
1387
        """Dummy function; override as necessary"""
1491
 
        raise NotImplementedError
 
1388
        pass
1492
1389
 
1493
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1494
1391
                     socketserver.TCPServer, object):
1512
1409
        bind to an address or port if they were not specified."""
1513
1410
        if self.interface is not None:
1514
1411
            if SO_BINDTODEVICE is None:
1515
 
                logger.error("SO_BINDTODEVICE does not exist;"
1516
 
                             " cannot bind to interface %s",
 
1412
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1413
                             u" cannot bind to interface %s",
1517
1414
                             self.interface)
1518
1415
            else:
1519
1416
                try:
1520
1417
                    self.socket.setsockopt(socket.SOL_SOCKET,
1521
1418
                                           SO_BINDTODEVICE,
1522
1419
                                           str(self.interface
1523
 
                                               + '\0'))
1524
 
                except socket.error as error:
 
1420
                                               + u'\0'))
 
1421
                except socket.error, error:
1525
1422
                    if error[0] == errno.EPERM:
1526
 
                        logger.error("No permission to"
1527
 
                                     " bind to interface %s",
 
1423
                        logger.error(u"No permission to"
 
1424
                                     u" bind to interface %s",
1528
1425
                                     self.interface)
1529
1426
                    elif error[0] == errno.ENOPROTOOPT:
1530
 
                        logger.error("SO_BINDTODEVICE not available;"
1531
 
                                     " cannot bind to interface %s",
 
1427
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1428
                                     u" cannot bind to interface %s",
1532
1429
                                     self.interface)
1533
1430
                    else:
1534
1431
                        raise
1536
1433
        if self.server_address[0] or self.server_address[1]:
1537
1434
            if not self.server_address[0]:
1538
1435
                if self.address_family == socket.AF_INET6:
1539
 
                    any_address = "::" # in6addr_any
 
1436
                    any_address = u"::" # in6addr_any
1540
1437
                else:
1541
1438
                    any_address = socket.INADDR_ANY
1542
1439
                self.server_address = (any_address,
1591
1488
    def handle_ipc(self, source, condition, parent_pipe=None,
1592
1489
                   client_object=None):
1593
1490
        condition_names = {
1594
 
            gobject.IO_IN: "IN",   # There is data to read.
1595
 
            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
1596
1493
                                    # blocking).
1597
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1598
 
            gobject.IO_ERR: "ERR", # Error condition.
1599
 
            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
1600
1497
                                    # broken, usually for pipes and
1601
1498
                                    # sockets).
1602
1499
            }
1621
1518
                    client = c
1622
1519
                    break
1623
1520
            else:
1624
 
                logger.info("Client not found for fingerprint: %s, ad"
1625
 
                            "dress: %s", fpr, address)
 
1521
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1522
                               u"dress: %s", fpr, address)
1626
1523
                if self.use_dbus:
1627
1524
                    # Emit D-Bus signal
1628
1525
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1662
1559
def string_to_delta(interval):
1663
1560
    """Parse a string and return a datetime.timedelta
1664
1561
    
1665
 
    >>> string_to_delta('7d')
 
1562
    >>> string_to_delta(u'7d')
1666
1563
    datetime.timedelta(7)
1667
 
    >>> string_to_delta('60s')
 
1564
    >>> string_to_delta(u'60s')
1668
1565
    datetime.timedelta(0, 60)
1669
 
    >>> string_to_delta('60m')
 
1566
    >>> string_to_delta(u'60m')
1670
1567
    datetime.timedelta(0, 3600)
1671
 
    >>> string_to_delta('24h')
 
1568
    >>> string_to_delta(u'24h')
1672
1569
    datetime.timedelta(1)
1673
 
    >>> string_to_delta('1w')
 
1570
    >>> string_to_delta(u'1w')
1674
1571
    datetime.timedelta(7)
1675
 
    >>> string_to_delta('5m 30s')
 
1572
    >>> string_to_delta(u'5m 30s')
1676
1573
    datetime.timedelta(0, 330)
1677
1574
    """
1678
1575
    timevalue = datetime.timedelta(0)
1680
1577
        try:
1681
1578
            suffix = unicode(s[-1])
1682
1579
            value = int(s[:-1])
1683
 
            if suffix == "d":
 
1580
            if suffix == u"d":
1684
1581
                delta = datetime.timedelta(value)
1685
 
            elif suffix == "s":
 
1582
            elif suffix == u"s":
1686
1583
                delta = datetime.timedelta(0, value)
1687
 
            elif suffix == "m":
 
1584
            elif suffix == u"m":
1688
1585
                delta = datetime.timedelta(0, 0, 0, 0, value)
1689
 
            elif suffix == "h":
 
1586
            elif suffix == u"h":
1690
1587
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1691
 
            elif suffix == "w":
 
1588
            elif suffix == u"w":
1692
1589
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1693
1590
            else:
1694
 
                raise ValueError("Unknown suffix %r" % suffix)
1695
 
        except (ValueError, IndexError) as e:
1696
 
            raise ValueError(*(e.args))
 
1591
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1592
        except (ValueError, IndexError), e:
 
1593
            raise ValueError(e.message)
1697
1594
        timevalue += delta
1698
1595
    return timevalue
1699
1596
 
1705
1602
    global if_nametoindex
1706
1603
    try:
1707
1604
        if_nametoindex = (ctypes.cdll.LoadLibrary
1708
 
                          (ctypes.util.find_library("c"))
 
1605
                          (ctypes.util.find_library(u"c"))
1709
1606
                          .if_nametoindex)
1710
1607
    except (OSError, AttributeError):
1711
 
        logger.warning("Doing if_nametoindex the hard way")
 
1608
        logger.warning(u"Doing if_nametoindex the hard way")
1712
1609
        def if_nametoindex(interface):
1713
1610
            "Get an interface index the hard way, i.e. using fcntl()"
1714
1611
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1715
1612
            with contextlib.closing(socket.socket()) as s:
1716
1613
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
 
                                    struct.pack(str("16s16x"),
 
1614
                                    struct.pack(str(u"16s16x"),
1718
1615
                                                interface))
1719
 
            interface_index = struct.unpack(str("I"),
 
1616
            interface_index = struct.unpack(str(u"I"),
1720
1617
                                            ifreq[16:20])[0]
1721
1618
            return interface_index
1722
1619
    return if_nametoindex(interface)
1730
1627
        sys.exit()
1731
1628
    os.setsid()
1732
1629
    if not nochdir:
1733
 
        os.chdir("/")
 
1630
        os.chdir(u"/")
1734
1631
    if os.fork():
1735
1632
        sys.exit()
1736
1633
    if not noclose:
1738
1635
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1739
1636
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1740
1637
            raise OSError(errno.ENODEV,
1741
 
                          "%s not a character device"
 
1638
                          u"%s not a character device"
1742
1639
                          % os.path.devnull)
1743
1640
        os.dup2(null, sys.stdin.fileno())
1744
1641
        os.dup2(null, sys.stdout.fileno())
1752
1649
    ##################################################################
1753
1650
    # Parsing of options, both command line and config file
1754
1651
    
1755
 
    parser = argparse.ArgumentParser()
1756
 
    parser.add_argument("-v", "--version", action="version",
1757
 
                        version = "%%(prog)s %s" % version,
1758
 
                        help="show version number and exit")
1759
 
    parser.add_argument("-i", "--interface", metavar="IF",
1760
 
                        help="Bind to interface IF")
1761
 
    parser.add_argument("-a", "--address",
1762
 
                        help="Address to listen for requests on")
1763
 
    parser.add_argument("-p", "--port", type=int,
1764
 
                        help="Port number to receive requests on")
1765
 
    parser.add_argument("--check", action="store_true",
1766
 
                        help="Run self-test")
1767
 
    parser.add_argument("--debug", action="store_true",
1768
 
                        help="Debug mode; run in foreground and log"
1769
 
                        " to terminal")
1770
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
1771
 
                        help="Debug level for stdout output")
1772
 
    parser.add_argument("--priority", help="GnuTLS"
1773
 
                        " priority string (see GnuTLS documentation)")
1774
 
    parser.add_argument("--servicename",
1775
 
                        metavar="NAME", help="Zeroconf service name")
1776
 
    parser.add_argument("--configdir",
1777
 
                        default="/etc/mandos", metavar="DIR",
1778
 
                        help="Directory to search for configuration"
1779
 
                        " files")
1780
 
    parser.add_argument("--no-dbus", action="store_false",
1781
 
                        dest="use_dbus", help="Do not provide D-Bus"
1782
 
                        " system bus interface")
1783
 
    parser.add_argument("--no-ipv6", action="store_false",
1784
 
                        dest="use_ipv6", help="Do not use IPv6")
1785
 
    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]
1786
1680
    
1787
1681
    if options.check:
1788
1682
        import doctest
1790
1684
        sys.exit()
1791
1685
    
1792
1686
    # Default values for config file for server-global settings
1793
 
    server_defaults = { "interface": "",
1794
 
                        "address": "",
1795
 
                        "port": "",
1796
 
                        "debug": "False",
1797
 
                        "priority":
1798
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1799
 
                        "servicename": "Mandos",
1800
 
                        "use_dbus": "True",
1801
 
                        "use_ipv6": "True",
1802
 
                        "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"",
1803
1697
                        }
1804
1698
    
1805
1699
    # Parse config file for server-global settings
1806
1700
    server_config = configparser.SafeConfigParser(server_defaults)
1807
1701
    del server_defaults
1808
1702
    server_config.read(os.path.join(options.configdir,
1809
 
                                    "mandos.conf"))
 
1703
                                    u"mandos.conf"))
1810
1704
    # Convert the SafeConfigParser object to a dict
1811
1705
    server_settings = server_config.defaults()
1812
1706
    # Use the appropriate methods on the non-string config options
1813
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1814
 
        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",
1815
1709
                                                           option)
1816
1710
    if server_settings["port"]:
1817
 
        server_settings["port"] = server_config.getint("DEFAULT",
1818
 
                                                       "port")
 
1711
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1712
                                                       u"port")
1819
1713
    del server_config
1820
1714
    
1821
1715
    # Override the settings from the config file with command line
1822
1716
    # options, if set.
1823
 
    for option in ("interface", "address", "port", "debug",
1824
 
                   "priority", "servicename", "configdir",
1825
 
                   "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"):
1826
1720
        value = getattr(options, option)
1827
1721
        if value is not None:
1828
1722
            server_settings[option] = value
1836
1730
    ##################################################################
1837
1731
    
1838
1732
    # For convenience
1839
 
    debug = server_settings["debug"]
1840
 
    debuglevel = server_settings["debuglevel"]
1841
 
    use_dbus = server_settings["use_dbus"]
1842
 
    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"]
1843
1737
 
1844
 
    if server_settings["servicename"] != "Mandos":
 
1738
    if server_settings[u"servicename"] != u"Mandos":
1845
1739
        syslogger.setFormatter(logging.Formatter
1846
 
                               ('Mandos (%s) [%%(process)d]:'
1847
 
                                ' %%(levelname)s: %%(message)s'
1848
 
                                % server_settings["servicename"]))
 
1740
                               (u'Mandos (%s) [%%(process)d]:'
 
1741
                                u' %%(levelname)s: %%(message)s'
 
1742
                                % server_settings[u"servicename"]))
1849
1743
    
1850
1744
    # Parse config file with clients
1851
 
    client_defaults = { "timeout": "5m",
1852
 
                        "extended_timeout": "15m",
1853
 
                        "interval": "2m",
1854
 
                        "checker": "fping -q -- %%(host)s",
1855
 
                        "host": "",
1856
 
                        "approval_delay": "0s",
1857
 
                        "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",
1858
1751
                        }
1859
1752
    client_config = configparser.SafeConfigParser(client_defaults)
1860
 
    client_config.read(os.path.join(server_settings["configdir"],
1861
 
                                    "clients.conf"))
 
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1754
                                    u"clients.conf"))
1862
1755
    
1863
1756
    global mandos_dbus_service
1864
1757
    mandos_dbus_service = None
1865
1758
    
1866
 
    tcp_server = MandosServer((server_settings["address"],
1867
 
                               server_settings["port"]),
 
1759
    tcp_server = MandosServer((server_settings[u"address"],
 
1760
                               server_settings[u"port"]),
1868
1761
                              ClientHandler,
1869
 
                              interface=(server_settings["interface"]
 
1762
                              interface=(server_settings[u"interface"]
1870
1763
                                         or None),
1871
1764
                              use_ipv6=use_ipv6,
1872
1765
                              gnutls_priority=
1873
 
                              server_settings["priority"],
 
1766
                              server_settings[u"priority"],
1874
1767
                              use_dbus=use_dbus)
1875
1768
    if not debug:
1876
 
        pidfilename = "/var/run/mandos.pid"
 
1769
        pidfilename = u"/var/run/mandos.pid"
1877
1770
        try:
1878
 
            pidfile = open(pidfilename, "w")
 
1771
            pidfile = open(pidfilename, u"w")
1879
1772
        except IOError:
1880
 
            logger.error("Could not open file %r", pidfilename)
 
1773
            logger.error(u"Could not open file %r", pidfilename)
1881
1774
    
1882
1775
    try:
1883
 
        uid = pwd.getpwnam("_mandos").pw_uid
1884
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1777
        gid = pwd.getpwnam(u"_mandos").pw_gid
1885
1778
    except KeyError:
1886
1779
        try:
1887
 
            uid = pwd.getpwnam("mandos").pw_uid
1888
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1780
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1781
            gid = pwd.getpwnam(u"mandos").pw_gid
1889
1782
        except KeyError:
1890
1783
            try:
1891
 
                uid = pwd.getpwnam("nobody").pw_uid
1892
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1784
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1785
                gid = pwd.getpwnam(u"nobody").pw_gid
1893
1786
            except KeyError:
1894
1787
                uid = 65534
1895
1788
                gid = 65534
1896
1789
    try:
1897
1790
        os.setgid(gid)
1898
1791
        os.setuid(uid)
1899
 
    except OSError as error:
 
1792
    except OSError, error:
1900
1793
        if error[0] != errno.EPERM:
1901
1794
            raise error
1902
1795
    
1917
1810
        
1918
1811
        @gnutls.library.types.gnutls_log_func
1919
1812
        def debug_gnutls(level, string):
1920
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1813
            logger.debug(u"GnuTLS: %s", string[:-1])
1921
1814
        
1922
1815
        (gnutls.library.functions
1923
1816
         .gnutls_global_set_log_function(debug_gnutls))
1931
1824
        # No console logging
1932
1825
        logger.removeHandler(console)
1933
1826
    
1934
 
    # Need to fork before connecting to D-Bus
1935
 
    if not debug:
1936
 
        # Close all input and output, do double fork, etc.
1937
 
        daemon()
1938
1827
    
1939
1828
    global main_loop
1940
1829
    # From the Avahi example code
1944
1833
    # End of Avahi example code
1945
1834
    if use_dbus:
1946
1835
        try:
1947
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1836
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1948
1837
                                            bus, do_not_queue=True)
1949
 
        except dbus.exceptions.NameExistsException as e:
1950
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1838
        except dbus.exceptions.NameExistsException, e:
 
1839
            logger.error(unicode(e) + u", disabling D-Bus")
1951
1840
            use_dbus = False
1952
 
            server_settings["use_dbus"] = False
 
1841
            server_settings[u"use_dbus"] = False
1953
1842
            tcp_server.use_dbus = False
1954
1843
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
 
    service = AvahiService(name = server_settings["servicename"],
1956
 
                           servicetype = "_mandos._tcp",
 
1844
    service = AvahiService(name = server_settings[u"servicename"],
 
1845
                           servicetype = u"_mandos._tcp",
1957
1846
                           protocol = protocol, bus = bus)
1958
1847
    if server_settings["interface"]:
1959
1848
        service.interface = (if_nametoindex
1960
 
                             (str(server_settings["interface"])))
1961
 
    
 
1849
                             (str(server_settings[u"interface"])))
 
1850
 
 
1851
    if not debug:
 
1852
        # Close all input and output, do double fork, etc.
 
1853
        daemon()
 
1854
        
1962
1855
    global multiprocessing_manager
1963
1856
    multiprocessing_manager = multiprocessing.Manager()
1964
1857
    
1983
1876
                        client_config, section)))
1984
1877
            for section in client_config.sections()))
1985
1878
    if not tcp_server.clients:
1986
 
        logger.warning("No clients defined")
 
1879
        logger.warning(u"No clients defined")
1987
1880
        
1988
1881
    if not debug:
1989
1882
        try:
1990
1883
            with pidfile:
1991
1884
                pid = os.getpid()
1992
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1885
                pidfile.write(str(pid) + "\n")
1993
1886
            del pidfile
1994
1887
        except IOError:
1995
 
            logger.error("Could not write to file %r with PID %d",
 
1888
            logger.error(u"Could not write to file %r with PID %d",
1996
1889
                         pidfilename, pid)
1997
1890
        except NameError:
1998
1891
            # "pidfile" was never created
2008
1901
        class MandosDBusService(dbus.service.Object):
2009
1902
            """A D-Bus proxy object"""
2010
1903
            def __init__(self):
2011
 
                dbus.service.Object.__init__(self, bus, "/")
2012
 
            _interface = "se.bsnet.fukt.Mandos"
 
1904
                dbus.service.Object.__init__(self, bus, u"/")
 
1905
            _interface = u"se.bsnet.fukt.Mandos"
2013
1906
            
2014
 
            @dbus.service.signal(_interface, signature="o")
 
1907
            @dbus.service.signal(_interface, signature=u"o")
2015
1908
            def ClientAdded(self, objpath):
2016
1909
                "D-Bus signal"
2017
1910
                pass
2018
1911
            
2019
 
            @dbus.service.signal(_interface, signature="ss")
 
1912
            @dbus.service.signal(_interface, signature=u"ss")
2020
1913
            def ClientNotFound(self, fingerprint, address):
2021
1914
                "D-Bus signal"
2022
1915
                pass
2023
1916
            
2024
 
            @dbus.service.signal(_interface, signature="os")
 
1917
            @dbus.service.signal(_interface, signature=u"os")
2025
1918
            def ClientRemoved(self, objpath, name):
2026
1919
                "D-Bus signal"
2027
1920
                pass
2028
1921
            
2029
 
            @dbus.service.method(_interface, out_signature="ao")
 
1922
            @dbus.service.method(_interface, out_signature=u"ao")
2030
1923
            def GetAllClients(self):
2031
1924
                "D-Bus method"
2032
1925
                return dbus.Array(c.dbus_object_path
2033
1926
                                  for c in tcp_server.clients)
2034
1927
            
2035
1928
            @dbus.service.method(_interface,
2036
 
                                 out_signature="a{oa{sv}}")
 
1929
                                 out_signature=u"a{oa{sv}}")
2037
1930
            def GetAllClientsWithProperties(self):
2038
1931
                "D-Bus method"
2039
1932
                return dbus.Dictionary(
2040
 
                    ((c.dbus_object_path, c.GetAll(""))
 
1933
                    ((c.dbus_object_path, c.GetAll(u""))
2041
1934
                     for c in tcp_server.clients),
2042
 
                    signature="oa{sv}")
 
1935
                    signature=u"oa{sv}")
2043
1936
            
2044
 
            @dbus.service.method(_interface, in_signature="o")
 
1937
            @dbus.service.method(_interface, in_signature=u"o")
2045
1938
            def RemoveClient(self, object_path):
2046
1939
                "D-Bus method"
2047
1940
                for c in tcp_server.clients:
2089
1982
    # Find out what port we got
2090
1983
    service.port = tcp_server.socket.getsockname()[1]
2091
1984
    if use_ipv6:
2092
 
        logger.info("Now listening on address %r, port %d,"
 
1985
        logger.info(u"Now listening on address %r, port %d,"
2093
1986
                    " flowinfo %d, scope_id %d"
2094
1987
                    % tcp_server.socket.getsockname())
2095
1988
    else:                       # IPv4
2096
 
        logger.info("Now listening on address %r, port %d"
 
1989
        logger.info(u"Now listening on address %r, port %d"
2097
1990
                    % tcp_server.socket.getsockname())
2098
1991
    
2099
1992
    #service.interface = tcp_server.socket.getsockname()[3]
2102
1995
        # From the Avahi example code
2103
1996
        try:
2104
1997
            service.activate()
2105
 
        except dbus.exceptions.DBusException as error:
2106
 
            logger.critical("DBusException: %s", error)
 
1998
        except dbus.exceptions.DBusException, error:
 
1999
            logger.critical(u"DBusException: %s", error)
2107
2000
            cleanup()
2108
2001
            sys.exit(1)
2109
2002
        # End of Avahi example code
2113
2006
                             (tcp_server.handle_request
2114
2007
                              (*args[2:], **kwargs) or True))
2115
2008
        
2116
 
        logger.debug("Starting main loop")
 
2009
        logger.debug(u"Starting main loop")
2117
2010
        main_loop.run()
2118
 
    except AvahiError as error:
2119
 
        logger.critical("AvahiError: %s", error)
 
2011
    except AvahiError, error:
 
2012
        logger.critical(u"AvahiError: %s", error)
2120
2013
        cleanup()
2121
2014
        sys.exit(1)
2122
2015
    except KeyboardInterrupt:
2123
2016
        if debug:
2124
 
            print("", file=sys.stderr)
2125
 
        logger.debug("Server received KeyboardInterrupt")
2126
 
    logger.debug("Server exiting")
 
2017
            print >> sys.stderr
 
2018
        logger.debug(u"Server received KeyboardInterrupt")
 
2019
    logger.debug(u"Server exiting")
2127
2020
    # Must run before the D-Bus bus name gets deregistered
2128
2021
    cleanup()
2129
2022