/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: 2011-04-02 06:37:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers.  Also Changed to new
          "except x as y" exception syntax.
  (AvahiService.entry_group_state_changed_match): New; contains the
                                                  SignalMatch object.
  (AvahiService.remove): Really remove the group and the signal
                         connection, if any.
  (AvahiService.add): Always create a new group and signal connection.
  (AvahiService.cleanup): Changed to simply call remove().
  (AvahiService.server_state_changed): Handle and log more bad states.
  (AvahiService.activate): Set "follow_name_owner_changes=True" on the
                           Avahi Server proxy object.
  (ClientDBus.checked_ok): Do not return anything.
  (ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.

Show diffs side-by-side

added added

removed removed

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