/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2011-09-24 14:19:06 UTC
  • mfrom: (500 trunk)
  • mto: This revision was merged to the branch mainline in revision 502.
  • Revision ID: belorn@fukt.bsnet.se-20110924141906-006qlpk9wy1x3kz5
Merge from teddy.

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