/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2011-07-25 18:46:19 UTC
  • mfrom: (237.7.35 trunk)
  • mto: (237.7.37 trunk)
  • mto: This revision was merged to the branch mainline in revision 284.
  • Revision ID: belorn@fukt.bsnet.se-20110725184619-l7vfsobr0bh9fc3l
merge

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