/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-09-26 21:06:14 UTC
  • mto: This revision was merged to the branch mainline in revision 503.
  • Revision ID: teddy@fukt.bsnet.se-20110926210614-tvxkpb6xfhkq3gc3
* mandos: White space fixes only.

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))
 
312
    runtime_expansions = ("approval_delay", "approval_duration",
 
313
                          "created", "enabled", "fingerprint",
 
314
                          "host", "interval", "last_checked_ok",
 
315
                          "last_enabled", "name", "timeout")
268
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
564
 
480
 
def dbus_service_property(dbus_interface, signature=u"v",
481
 
                          access=u"readwrite", byte_arrays=False):
 
565
def dbus_service_property(dbus_interface, signature="v",
 
566
                          access="readwrite", byte_arrays=False):
482
567
    """Decorators for marking methods of a DBusObjectWithProperties to
483
568
    become properties on the D-Bus.
484
569
    
491
576
    """
492
577
    # Encoding deeply encoded byte arrays is not supported yet by the
493
578
    # "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)
 
579
    if byte_arrays and signature != "ay":
 
580
        raise ValueError("Byte arrays not supported for non-'ay'"
 
581
                         " signature %r" % signature)
497
582
    def decorator(func):
498
583
        func._dbus_is_property = True
499
584
        func._dbus_interface = dbus_interface
500
585
        func._dbus_signature = signature
501
586
        func._dbus_access = access
502
587
        func._dbus_name = func.__name__
503
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
588
        if func._dbus_name.endswith("_dbus_property"):
504
589
            func._dbus_name = func._dbus_name[:-14]
505
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
590
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
506
591
        return func
507
592
    return decorator
508
593
 
528
613
 
529
614
class DBusObjectWithProperties(dbus.service.Object):
530
615
    """A D-Bus object with properties.
531
 
 
 
616
    
532
617
    Classes inheriting from this can use the dbus_service_property
533
618
    decorator to expose methods as D-Bus properties.  It exposes the
534
619
    standard Get(), Set(), and GetAll() methods on the D-Bus.
536
621
    
537
622
    @staticmethod
538
623
    def _is_dbus_property(obj):
539
 
        return getattr(obj, u"_dbus_is_property", False)
 
624
        return getattr(obj, "_dbus_is_property", False)
540
625
    
541
626
    def _get_all_dbus_properties(self):
542
627
        """Returns a generator of (name, attribute) pairs
550
635
        property with the specified name and interface.
551
636
        """
552
637
        for name in (property_name,
553
 
                     property_name + u"_dbus_property"):
 
638
                     property_name + "_dbus_property"):
554
639
            prop = getattr(self, name, None)
555
640
            if (prop is None
556
641
                or not self._is_dbus_property(prop)
560
645
                continue
561
646
            return prop
562
647
        # No such property
563
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
564
 
                                   + interface_name + u"."
 
648
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
649
                                   + interface_name + "."
565
650
                                   + property_name)
566
651
    
567
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
568
 
                         out_signature=u"v")
 
652
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
653
                         out_signature="v")
569
654
    def Get(self, interface_name, property_name):
570
655
        """Standard D-Bus property Get() method, see D-Bus standard.
571
656
        """
572
657
        prop = self._get_dbus_property(interface_name, property_name)
573
 
        if prop._dbus_access == u"write":
 
658
        if prop._dbus_access == "write":
574
659
            raise DBusPropertyAccessException(property_name)
575
660
        value = prop()
576
 
        if not hasattr(value, u"variant_level"):
 
661
        if not hasattr(value, "variant_level"):
577
662
            return value
578
663
        return type(value)(value, variant_level=value.variant_level+1)
579
664
    
580
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
665
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
581
666
    def Set(self, interface_name, property_name, value):
582
667
        """Standard D-Bus property Set() method, see D-Bus standard.
583
668
        """
584
669
        prop = self._get_dbus_property(interface_name, property_name)
585
 
        if prop._dbus_access == u"read":
 
670
        if prop._dbus_access == "read":
586
671
            raise DBusPropertyAccessException(property_name)
587
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
672
        if prop._dbus_get_args_options["byte_arrays"]:
588
673
            # The byte_arrays option is not supported yet on
589
674
            # signatures other than "ay".
590
 
            if prop._dbus_signature != u"ay":
 
675
            if prop._dbus_signature != "ay":
591
676
                raise ValueError
592
677
            value = dbus.ByteArray(''.join(unichr(byte)
593
678
                                           for byte in value))
594
679
        prop(value)
595
680
    
596
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
 
                         out_signature=u"a{sv}")
 
681
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
682
                         out_signature="a{sv}")
598
683
    def GetAll(self, interface_name):
599
684
        """Standard D-Bus property GetAll() method, see D-Bus
600
685
        standard.
601
 
 
 
686
        
602
687
        Note: Will not include properties with access="write".
603
688
        """
604
689
        all = {}
608
693
                # Interface non-empty but did not match
609
694
                continue
610
695
            # Ignore write-only properties
611
 
            if prop._dbus_access == u"write":
 
696
            if prop._dbus_access == "write":
612
697
                continue
613
698
            value = prop()
614
 
            if not hasattr(value, u"variant_level"):
 
699
            if not hasattr(value, "variant_level"):
615
700
                all[name] = value
616
701
                continue
617
702
            all[name] = type(value)(value, variant_level=
618
703
                                    value.variant_level+1)
619
 
        return dbus.Dictionary(all, signature=u"sv")
 
704
        return dbus.Dictionary(all, signature="sv")
620
705
    
621
706
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
622
 
                         out_signature=u"s",
 
707
                         out_signature="s",
623
708
                         path_keyword='object_path',
624
709
                         connection_keyword='connection')
625
710
    def Introspect(self, object_path, connection):
630
715
        try:
631
716
            document = xml.dom.minidom.parseString(xmlstring)
632
717
            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)
 
718
                e = document.createElement("property")
 
719
                e.setAttribute("name", name)
 
720
                e.setAttribute("type", prop._dbus_signature)
 
721
                e.setAttribute("access", prop._dbus_access)
637
722
                return e
638
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
723
            for if_tag in document.getElementsByTagName("interface"):
639
724
                for tag in (make_tag(document, name, prop)
640
725
                            for name, prop
641
726
                            in self._get_all_dbus_properties()
642
727
                            if prop._dbus_interface
643
 
                            == if_tag.getAttribute(u"name")):
 
728
                            == if_tag.getAttribute("name")):
644
729
                    if_tag.appendChild(tag)
645
730
                # Add the names to the return values for the
646
731
                # "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")
 
732
                if (if_tag.getAttribute("name")
 
733
                    == "org.freedesktop.DBus.Properties"):
 
734
                    for cn in if_tag.getElementsByTagName("method"):
 
735
                        if cn.getAttribute("name") == "Get":
 
736
                            for arg in cn.getElementsByTagName("arg"):
 
737
                                if (arg.getAttribute("direction")
 
738
                                    == "out"):
 
739
                                    arg.setAttribute("name", "value")
 
740
                        elif cn.getAttribute("name") == "GetAll":
 
741
                            for arg in cn.getElementsByTagName("arg"):
 
742
                                if (arg.getAttribute("direction")
 
743
                                    == "out"):
 
744
                                    arg.setAttribute("name", "props")
 
745
            xmlstring = document.toxml("utf-8")
661
746
            document.unlink()
662
747
        except (AttributeError, xml.dom.DOMException,
663
 
                xml.parsers.expat.ExpatError), error:
664
 
            logger.error(u"Failed to override Introspection method",
 
748
                xml.parsers.expat.ExpatError) as error:
 
749
            logger.error("Failed to override Introspection method",
665
750
                         error)
666
751
        return xmlstring
667
752
 
668
753
 
 
754
def datetime_to_dbus (dt, variant_level=0):
 
755
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
756
    if dt is None:
 
757
        return dbus.String("", variant_level = variant_level)
 
758
    return dbus.String(dt.isoformat(),
 
759
                       variant_level=variant_level)
 
760
 
 
761
 
669
762
class ClientDBus(Client, DBusObjectWithProperties):
670
763
    """A Client class using D-Bus
671
764
    
673
766
    dbus_object_path: dbus.ObjectPath
674
767
    bus: dbus.SystemBus()
675
768
    """
 
769
    
 
770
    runtime_expansions = (Client.runtime_expansions
 
771
                          + ("dbus_object_path",))
 
772
    
676
773
    # dbus.service.Object doesn't use super(), so we can't either.
677
774
    
678
775
    def __init__(self, bus = None, *args, **kwargs):
 
776
        self._approvals_pending = 0
679
777
        self.bus = bus
680
778
        Client.__init__(self, *args, **kwargs)
681
779
        # Only now, when this client is initialized, can it show up on
682
780
        # the D-Bus
 
781
        client_object_name = unicode(self.name).translate(
 
782
            {ord("."): ord("_"),
 
783
             ord("-"): ord("_")})
683
784
        self.dbus_object_path = (dbus.ObjectPath
684
 
                                 (u"/clients/"
685
 
                                  + self.name.replace(u".", u"_")))
 
785
                                 ("/clients/" + client_object_name))
686
786
        DBusObjectWithProperties.__init__(self, self.bus,
687
787
                                          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
 
788
        
 
789
    def notifychangeproperty(transform_func,
 
790
                             dbus_name, type_func=lambda x: x,
 
791
                             variant_level=1):
 
792
        """ Modify a variable so that its a property that announce its
 
793
        changes to DBus.
 
794
        transform_fun: Function that takes a value and transform it to
 
795
                       DBus type.
 
796
        dbus_name: DBus name of the variable
 
797
        type_func: Function that transform the value before sending it
 
798
                   to DBus
 
799
        variant_level: DBus variant level. default: 1
 
800
        """
 
801
        real_value = [None,]
 
802
        def setter(self, value):
 
803
            old_value = real_value[0]
 
804
            real_value[0] = value
 
805
            if hasattr(self, "dbus_object_path"):
 
806
                if type_func(old_value) != type_func(real_value[0]):
 
807
                    dbus_value = transform_func(type_func(real_value[0]),
 
808
                                                variant_level)
 
809
                    self.PropertyChanged(dbus.String(dbus_name),
 
810
                                         dbus_value)
 
811
        
 
812
        return property(lambda self: real_value[0], setter)
 
813
    
 
814
    
 
815
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
816
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
817
                                             "ApprovalPending",
 
818
                                             type_func = bool)
 
819
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
820
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
821
                                        "LastEnabled")
 
822
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
823
                                   type_func = lambda checker: checker is not None)
 
824
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
825
                                           "LastCheckedOK")
 
826
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
827
                                                 "LastApprovalRequest")
 
828
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
829
                                               "ApprovedByDefault")
 
830
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
 
831
                                          type_func = _timedelta_to_milliseconds)
 
832
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
 
833
                                             type_func = _timedelta_to_milliseconds)
 
834
    host = notifychangeproperty(dbus.String, "Host")
 
835
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
836
                                   type_func = _timedelta_to_milliseconds)
 
837
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
 
838
                                            type_func = _timedelta_to_milliseconds)
 
839
    interval = notifychangeproperty(dbus.UInt16, "Interval",
 
840
                                    type_func = _timedelta_to_milliseconds)
 
841
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
842
    
 
843
    del notifychangeproperty
716
844
    
717
845
    def __del__(self, *args, **kwargs):
718
846
        try:
719
847
            self.remove_from_connection()
720
848
        except LookupError:
721
849
            pass
722
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
850
        if hasattr(DBusObjectWithProperties, "__del__"):
723
851
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
724
852
        Client.__del__(self, *args, **kwargs)
725
853
    
727
855
                         *args, **kwargs):
728
856
        self.checker_callback_tag = None
729
857
        self.checker = None
730
 
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
732
 
                             dbus.Boolean(False, variant_level=1))
733
858
        if os.WIFEXITED(condition):
734
859
            exitstatus = os.WEXITSTATUS(condition)
735
860
            # Emit D-Bus signal
745
870
        return Client.checker_callback(self, pid, condition, command,
746
871
                                       *args, **kwargs)
747
872
    
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
 
    
757
873
    def start_checker(self, *args, **kwargs):
758
874
        old_checker = self.checker
759
875
        if self.checker is not None:
766
882
            and old_checker_pid != self.checker.pid):
767
883
            # Emit D-Bus signal
768
884
            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
782
 
    
783
 
    ## D-Bus methods & signals
784
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
 
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
885
        return r
 
886
    
 
887
    def _reset_approved(self):
 
888
        self._approved = None
 
889
        return False
 
890
    
 
891
    def approve(self, value=True):
 
892
        self.send_changedstate()
 
893
        self._approved = value
 
894
        gobject.timeout_add(_timedelta_to_milliseconds
 
895
                            (self.approval_duration),
 
896
                            self._reset_approved)
 
897
    
 
898
    
 
899
    ## D-Bus methods, signals & properties
 
900
    _interface = "se.bsnet.fukt.Mandos.Client"
 
901
    
 
902
    ## Signals
790
903
    
791
904
    # CheckerCompleted - signal
792
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
905
    @dbus.service.signal(_interface, signature="nxs")
793
906
    def CheckerCompleted(self, exitcode, waitstatus, command):
794
907
        "D-Bus signal"
795
908
        pass
796
909
    
797
910
    # CheckerStarted - signal
798
 
    @dbus.service.signal(_interface, signature=u"s")
 
911
    @dbus.service.signal(_interface, signature="s")
799
912
    def CheckerStarted(self, command):
800
913
        "D-Bus signal"
801
914
        pass
802
915
    
803
916
    # PropertyChanged - signal
804
 
    @dbus.service.signal(_interface, signature=u"sv")
 
917
    @dbus.service.signal(_interface, signature="sv")
805
918
    def PropertyChanged(self, property, value):
806
919
        "D-Bus signal"
807
920
        pass
809
922
    # GotSecret - signal
810
923
    @dbus.service.signal(_interface)
811
924
    def GotSecret(self):
812
 
        "D-Bus signal"
 
925
        """D-Bus signal
 
926
        Is sent after a successful transfer of secret from the Mandos
 
927
        server to mandos-client
 
928
        """
813
929
        pass
814
930
    
815
931
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
 
932
    @dbus.service.signal(_interface, signature="s")
 
933
    def Rejected(self, reason):
818
934
        "D-Bus signal"
819
935
        pass
820
936
    
 
937
    # NeedApproval - signal
 
938
    @dbus.service.signal(_interface, signature="tb")
 
939
    def NeedApproval(self, timeout, default):
 
940
        "D-Bus signal"
 
941
        return self.need_approval()
 
942
    
 
943
    ## Methods
 
944
    
 
945
    # Approve - method
 
946
    @dbus.service.method(_interface, in_signature="b")
 
947
    def Approve(self, value):
 
948
        self.approve(value)
 
949
    
 
950
    # CheckedOK - method
 
951
    @dbus.service.method(_interface)
 
952
    def CheckedOK(self):
 
953
        self.checked_ok()
 
954
    
821
955
    # Enable - method
822
956
    @dbus.service.method(_interface)
823
957
    def Enable(self):
841
975
    def StopChecker(self):
842
976
        self.stop_checker()
843
977
    
844
 
    # name - property
845
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
978
    ## Properties
 
979
    
 
980
    # ApprovalPending - property
 
981
    @dbus_service_property(_interface, signature="b", access="read")
 
982
    def ApprovalPending_dbus_property(self):
 
983
        return dbus.Boolean(bool(self.approvals_pending))
 
984
    
 
985
    # ApprovedByDefault - property
 
986
    @dbus_service_property(_interface, signature="b",
 
987
                           access="readwrite")
 
988
    def ApprovedByDefault_dbus_property(self, value=None):
 
989
        if value is None:       # get
 
990
            return dbus.Boolean(self.approved_by_default)
 
991
        self.approved_by_default = bool(value)
 
992
    
 
993
    # ApprovalDelay - property
 
994
    @dbus_service_property(_interface, signature="t",
 
995
                           access="readwrite")
 
996
    def ApprovalDelay_dbus_property(self, value=None):
 
997
        if value is None:       # get
 
998
            return dbus.UInt64(self.approval_delay_milliseconds())
 
999
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1000
    
 
1001
    # ApprovalDuration - property
 
1002
    @dbus_service_property(_interface, signature="t",
 
1003
                           access="readwrite")
 
1004
    def ApprovalDuration_dbus_property(self, value=None):
 
1005
        if value is None:       # get
 
1006
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1007
                    self.approval_duration))
 
1008
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1009
    
 
1010
    # Name - property
 
1011
    @dbus_service_property(_interface, signature="s", access="read")
 
1012
    def Name_dbus_property(self):
847
1013
        return dbus.String(self.name)
848
1014
    
849
 
    # fingerprint - property
850
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
1015
    # Fingerprint - property
 
1016
    @dbus_service_property(_interface, signature="s", access="read")
 
1017
    def Fingerprint_dbus_property(self):
852
1018
        return dbus.String(self.fingerprint)
853
1019
    
854
 
    # host - property
855
 
    @dbus_service_property(_interface, signature=u"s",
856
 
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
1020
    # Host - property
 
1021
    @dbus_service_property(_interface, signature="s",
 
1022
                           access="readwrite")
 
1023
    def Host_dbus_property(self, value=None):
858
1024
        if value is None:       # get
859
1025
            return dbus.String(self.host)
860
1026
        self.host = value
861
 
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
863
 
                             dbus.String(value, variant_level=1))
864
 
    
865
 
    # created - property
866
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
868
 
        return dbus.String(self._datetime_to_dbus(self.created))
869
 
    
870
 
    # last_enabled - property
871
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
873
 
        if self.last_enabled is None:
874
 
            return dbus.String(u"")
875
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
 
    
877
 
    # enabled - property
878
 
    @dbus_service_property(_interface, signature=u"b",
879
 
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
1027
    
 
1028
    # Created - property
 
1029
    @dbus_service_property(_interface, signature="s", access="read")
 
1030
    def Created_dbus_property(self):
 
1031
        return dbus.String(datetime_to_dbus(self.created))
 
1032
    
 
1033
    # LastEnabled - property
 
1034
    @dbus_service_property(_interface, signature="s", access="read")
 
1035
    def LastEnabled_dbus_property(self):
 
1036
        return datetime_to_dbus(self.last_enabled)
 
1037
    
 
1038
    # Enabled - property
 
1039
    @dbus_service_property(_interface, signature="b",
 
1040
                           access="readwrite")
 
1041
    def Enabled_dbus_property(self, value=None):
881
1042
        if value is None:       # get
882
1043
            return dbus.Boolean(self.enabled)
883
1044
        if value:
885
1046
        else:
886
1047
            self.disable()
887
1048
    
888
 
    # last_checked_ok - property
889
 
    @dbus_service_property(_interface, signature=u"s",
890
 
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1049
    # LastCheckedOK - property
 
1050
    @dbus_service_property(_interface, signature="s",
 
1051
                           access="readwrite")
 
1052
    def LastCheckedOK_dbus_property(self, value=None):
892
1053
        if value is not None:
893
1054
            self.checked_ok()
894
1055
            return
895
 
        if self.last_checked_ok is None:
896
 
            return dbus.String(u"")
897
 
        return dbus.String(self._datetime_to_dbus(self
898
 
                                                  .last_checked_ok))
899
 
    
900
 
    # timeout - property
901
 
    @dbus_service_property(_interface, signature=u"t",
902
 
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1056
        return datetime_to_dbus(self.last_checked_ok)
 
1057
    
 
1058
    # Expires - property
 
1059
    @dbus_service_property(_interface, signature="s", access="read")
 
1060
    def Expires_dbus_property(self):
 
1061
        return datetime_to_dbus(self.expires)
 
1062
    
 
1063
    # LastApprovalRequest - property
 
1064
    @dbus_service_property(_interface, signature="s", access="read")
 
1065
    def LastApprovalRequest_dbus_property(self):
 
1066
        return datetime_to_dbus(self.last_approval_request)
 
1067
    
 
1068
    # Timeout - property
 
1069
    @dbus_service_property(_interface, signature="t",
 
1070
                           access="readwrite")
 
1071
    def Timeout_dbus_property(self, value=None):
904
1072
        if value is None:       # get
905
1073
            return dbus.UInt64(self.timeout_milliseconds())
906
1074
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
 
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
909
 
                             dbus.UInt64(value, variant_level=1))
910
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1075
        if getattr(self, "disable_initiator_tag", None) is None:
911
1076
            return
912
1077
        # Reschedule timeout
913
1078
        gobject.source_remove(self.disable_initiator_tag)
914
1079
        self.disable_initiator_tag = None
 
1080
        self.expires = None
915
1081
        time_to_die = (self.
916
1082
                       _timedelta_to_milliseconds((self
917
1083
                                                   .last_checked_ok
922
1088
            # The timeout has passed
923
1089
            self.disable()
924
1090
        else:
 
1091
            self.expires = (datetime.datetime.utcnow()
 
1092
                            + datetime.timedelta(milliseconds = time_to_die))
925
1093
            self.disable_initiator_tag = (gobject.timeout_add
926
1094
                                          (time_to_die, self.disable))
927
1095
    
928
 
    # interval - property
929
 
    @dbus_service_property(_interface, signature=u"t",
930
 
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1096
    # ExtendedTimeout - property
 
1097
    @dbus_service_property(_interface, signature="t",
 
1098
                           access="readwrite")
 
1099
    def ExtendedTimeout_dbus_property(self, value=None):
 
1100
        if value is None:       # get
 
1101
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1102
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1103
    
 
1104
    # Interval - property
 
1105
    @dbus_service_property(_interface, signature="t",
 
1106
                           access="readwrite")
 
1107
    def Interval_dbus_property(self, value=None):
932
1108
        if value is None:       # get
933
1109
            return dbus.UInt64(self.interval_milliseconds())
934
1110
        self.interval = datetime.timedelta(0, 0, 0, value)
935
 
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
937
 
                             dbus.UInt64(value, variant_level=1))
938
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1111
        if getattr(self, "checker_initiator_tag", None) is None:
939
1112
            return
940
1113
        # Reschedule checker run
941
1114
        gobject.source_remove(self.checker_initiator_tag)
942
1115
        self.checker_initiator_tag = (gobject.timeout_add
943
1116
                                      (value, self.start_checker))
944
1117
        self.start_checker()    # Start one now, too
945
 
 
946
 
    # checker - property
947
 
    @dbus_service_property(_interface, signature=u"s",
948
 
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1118
    
 
1119
    # Checker - property
 
1120
    @dbus_service_property(_interface, signature="s",
 
1121
                           access="readwrite")
 
1122
    def Checker_dbus_property(self, value=None):
950
1123
        if value is None:       # get
951
1124
            return dbus.String(self.checker_command)
952
1125
        self.checker_command = value
953
 
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
955
 
                             dbus.String(self.checker_command,
956
 
                                         variant_level=1))
957
1126
    
958
 
    # checker_running - property
959
 
    @dbus_service_property(_interface, signature=u"b",
960
 
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1127
    # CheckerRunning - property
 
1128
    @dbus_service_property(_interface, signature="b",
 
1129
                           access="readwrite")
 
1130
    def CheckerRunning_dbus_property(self, value=None):
962
1131
        if value is None:       # get
963
1132
            return dbus.Boolean(self.checker is not None)
964
1133
        if value:
966
1135
        else:
967
1136
            self.stop_checker()
968
1137
    
969
 
    # object_path - property
970
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1138
    # ObjectPath - property
 
1139
    @dbus_service_property(_interface, signature="o", access="read")
 
1140
    def ObjectPath_dbus_property(self):
972
1141
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1142
    
974
 
    # secret = property
975
 
    @dbus_service_property(_interface, signature=u"ay",
976
 
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1143
    # Secret = property
 
1144
    @dbus_service_property(_interface, signature="ay",
 
1145
                           access="write", byte_arrays=True)
 
1146
    def Secret_dbus_property(self, value):
978
1147
        self.secret = str(value)
979
1148
    
980
1149
    del _interface
981
1150
 
982
1151
 
 
1152
class ProxyClient(object):
 
1153
    def __init__(self, child_pipe, fpr, address):
 
1154
        self._pipe = child_pipe
 
1155
        self._pipe.send(('init', fpr, address))
 
1156
        if not self._pipe.recv():
 
1157
            raise KeyError()
 
1158
    
 
1159
    def __getattribute__(self, name):
 
1160
        if(name == '_pipe'):
 
1161
            return super(ProxyClient, self).__getattribute__(name)
 
1162
        self._pipe.send(('getattr', name))
 
1163
        data = self._pipe.recv()
 
1164
        if data[0] == 'data':
 
1165
            return data[1]
 
1166
        if data[0] == 'function':
 
1167
            def func(*args, **kwargs):
 
1168
                self._pipe.send(('funcall', name, args, kwargs))
 
1169
                return self._pipe.recv()[1]
 
1170
            return func
 
1171
    
 
1172
    def __setattr__(self, name, value):
 
1173
        if(name == '_pipe'):
 
1174
            return super(ProxyClient, self).__setattr__(name, value)
 
1175
        self._pipe.send(('setattr', name, value))
 
1176
 
 
1177
 
983
1178
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1179
    """A class to handle client connections.
985
1180
    
987
1182
    Note: This will run in its own forked process."""
988
1183
    
989
1184
    def handle(self):
990
 
        logger.info(u"TCP connection from: %s",
991
 
                    unicode(self.client_address))
992
 
        logger.debug(u"IPC Pipe FD: %d", self.server.child_pipe[1])
993
 
        # Open IPC pipe to parent process
994
 
        with contextlib.nested(os.fdopen(self.server.child_pipe[1],
995
 
                                         u"w", 1),
996
 
                               os.fdopen(self.server.parent_pipe[0],
997
 
                                         u"r", 0)) as (ipc,
998
 
                                                       ipc_return):
 
1185
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1186
            logger.info("TCP connection from: %s",
 
1187
                        unicode(self.client_address))
 
1188
            logger.debug("Pipe FD: %d",
 
1189
                         self.server.child_pipe.fileno())
 
1190
            
999
1191
            session = (gnutls.connection
1000
1192
                       .ClientSession(self.request,
1001
1193
                                      gnutls.connection
1002
1194
                                      .X509Credentials()))
1003
1195
            
1004
 
            line = self.request.makefile().readline()
1005
 
            logger.debug(u"Protocol version: %r", line)
1006
 
            try:
1007
 
                if int(line.strip().split()[0]) > 1:
1008
 
                    raise RuntimeError
1009
 
            except (ValueError, IndexError, RuntimeError), error:
1010
 
                logger.error(u"Unknown protocol version: %s", error)
1011
 
                return
1012
 
            
1013
1196
            # Note: gnutls.connection.X509Credentials is really a
1014
1197
            # generic GnuTLS certificate credentials object so long as
1015
1198
            # no X.509 keys are added to it.  Therefore, we can use it
1016
1199
            # here despite using OpenPGP certificates.
1017
1200
            
1018
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1019
 
            #                      u"+AES-256-CBC", u"+SHA1",
1020
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1021
 
            #                      u"+DHE-DSS"))
 
1201
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1202
            #                      "+AES-256-CBC", "+SHA1",
 
1203
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1204
            #                      "+DHE-DSS"))
1022
1205
            # Use a fallback default, since this MUST be set.
1023
1206
            priority = self.server.gnutls_priority
1024
1207
            if priority is None:
1025
 
                priority = u"NORMAL"
 
1208
                priority = "NORMAL"
1026
1209
            (gnutls.library.functions
1027
1210
             .gnutls_priority_set_direct(session._c_object,
1028
1211
                                         priority, None))
1029
1212
            
 
1213
            # Start communication using the Mandos protocol
 
1214
            # Get protocol number
 
1215
            line = self.request.makefile().readline()
 
1216
            logger.debug("Protocol version: %r", line)
 
1217
            try:
 
1218
                if int(line.strip().split()[0]) > 1:
 
1219
                    raise RuntimeError
 
1220
            except (ValueError, IndexError, RuntimeError) as error:
 
1221
                logger.error("Unknown protocol version: %s", error)
 
1222
                return
 
1223
            
 
1224
            # Start GnuTLS connection
1030
1225
            try:
1031
1226
                session.handshake()
1032
 
            except gnutls.errors.GNUTLSError, error:
1033
 
                logger.warning(u"Handshake failed: %s", error)
 
1227
            except gnutls.errors.GNUTLSError as error:
 
1228
                logger.warning("Handshake failed: %s", error)
1034
1229
                # Do not run session.bye() here: the session is not
1035
1230
                # established.  Just abandon the request.
1036
1231
                return
1037
 
            logger.debug(u"Handshake succeeded")
 
1232
            logger.debug("Handshake succeeded")
 
1233
            
 
1234
            approval_required = False
1038
1235
            try:
1039
1236
                try:
1040
1237
                    fpr = self.fingerprint(self.peer_certificate
1041
1238
                                           (session))
1042
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1043
 
                    logger.warning(u"Bad certificate: %s", error)
1044
 
                    return
1045
 
                logger.debug(u"Fingerprint: %s", fpr)
1046
 
 
1047
 
                for c in self.server.clients:
1048
 
                    if c.fingerprint == fpr:
1049
 
                        client = c
 
1239
                except (TypeError,
 
1240
                        gnutls.errors.GNUTLSError) as error:
 
1241
                    logger.warning("Bad certificate: %s", error)
 
1242
                    return
 
1243
                logger.debug("Fingerprint: %s", fpr)
 
1244
                
 
1245
                try:
 
1246
                    client = ProxyClient(child_pipe, fpr,
 
1247
                                         self.client_address)
 
1248
                except KeyError:
 
1249
                    return
 
1250
                
 
1251
                if client.approval_delay:
 
1252
                    delay = client.approval_delay
 
1253
                    client.approvals_pending += 1
 
1254
                    approval_required = True
 
1255
                
 
1256
                while True:
 
1257
                    if not client.enabled:
 
1258
                        logger.info("Client %s is disabled",
 
1259
                                       client.name)
 
1260
                        if self.server.use_dbus:
 
1261
                            # Emit D-Bus signal
 
1262
                            client.Rejected("Disabled")                    
 
1263
                        return
 
1264
                    
 
1265
                    if client._approved or not client.approval_delay:
 
1266
                        #We are approved or approval is disabled
1050
1267
                        break
1051
 
                else:
1052
 
                    ipc.write(u"NOTFOUND %s %s\n"
1053
 
                              % (fpr, unicode(self.client_address)))
1054
 
                    return
1055
 
                # Have to check if client.enabled, since it is
1056
 
                # possible that the client was disabled since the
1057
 
                # GnuTLS session was established.
1058
 
                ipc.write(u"GETATTR enabled %s\n" % fpr)
1059
 
                enabled = pickle.load(ipc_return)
1060
 
                if not enabled:
1061
 
                    ipc.write(u"DISABLED %s\n" % client.name)
1062
 
                    return
1063
 
                ipc.write(u"SENDING %s\n" % client.name)
 
1268
                    elif client._approved is None:
 
1269
                        logger.info("Client %s needs approval",
 
1270
                                    client.name)
 
1271
                        if self.server.use_dbus:
 
1272
                            # Emit D-Bus signal
 
1273
                            client.NeedApproval(
 
1274
                                client.approval_delay_milliseconds(),
 
1275
                                client.approved_by_default)
 
1276
                    else:
 
1277
                        logger.warning("Client %s was not approved",
 
1278
                                       client.name)
 
1279
                        if self.server.use_dbus:
 
1280
                            # Emit D-Bus signal
 
1281
                            client.Rejected("Denied")
 
1282
                        return
 
1283
                    
 
1284
                    #wait until timeout or approved
 
1285
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1286
                    time = datetime.datetime.now()
 
1287
                    client.changedstate.acquire()
 
1288
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1289
                    client.changedstate.release()
 
1290
                    time2 = datetime.datetime.now()
 
1291
                    if (time2 - time) >= delay:
 
1292
                        if not client.approved_by_default:
 
1293
                            logger.warning("Client %s timed out while"
 
1294
                                           " waiting for approval",
 
1295
                                           client.name)
 
1296
                            if self.server.use_dbus:
 
1297
                                # Emit D-Bus signal
 
1298
                                client.Rejected("Approval timed out")
 
1299
                            return
 
1300
                        else:
 
1301
                            break
 
1302
                    else:
 
1303
                        delay -= time2 - time
 
1304
                
1064
1305
                sent_size = 0
1065
1306
                while sent_size < len(client.secret):
1066
 
                    sent = session.send(client.secret[sent_size:])
1067
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1307
                    try:
 
1308
                        sent = session.send(client.secret[sent_size:])
 
1309
                    except gnutls.errors.GNUTLSError as error:
 
1310
                        logger.warning("gnutls send failed")
 
1311
                        return
 
1312
                    logger.debug("Sent: %d, remaining: %d",
1068
1313
                                 sent, len(client.secret)
1069
1314
                                 - (sent_size + sent))
1070
1315
                    sent_size += sent
 
1316
                
 
1317
                logger.info("Sending secret to %s", client.name)
 
1318
                # bump the timeout as if seen
 
1319
                client.checked_ok(client.extended_timeout)
 
1320
                if self.server.use_dbus:
 
1321
                    # Emit D-Bus signal
 
1322
                    client.GotSecret()
 
1323
            
1071
1324
            finally:
1072
 
                session.bye()
 
1325
                if approval_required:
 
1326
                    client.approvals_pending -= 1
 
1327
                try:
 
1328
                    session.bye()
 
1329
                except gnutls.errors.GNUTLSError as error:
 
1330
                    logger.warning("GnuTLS bye failed")
1073
1331
    
1074
1332
    @staticmethod
1075
1333
    def peer_certificate(session):
1085
1343
                     .gnutls_certificate_get_peers
1086
1344
                     (session._c_object, ctypes.byref(list_size)))
1087
1345
        if not bool(cert_list) and list_size.value != 0:
1088
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1089
 
                                            u" certificate")
 
1346
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1347
                                            " certificate")
1090
1348
        if list_size.value == 0:
1091
1349
            return None
1092
1350
        cert = cert_list[0]
1118
1376
        if crtverify.value != 0:
1119
1377
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1120
1378
            raise (gnutls.errors.CertificateSecurityError
1121
 
                   (u"Verify failed"))
 
1379
                   ("Verify failed"))
1122
1380
        # New buffer for the fingerprint
1123
1381
        buf = ctypes.create_string_buffer(20)
1124
1382
        buf_len = ctypes.c_size_t()
1131
1389
        # Convert the buffer to a Python bytestring
1132
1390
        fpr = ctypes.string_at(buf, buf_len.value)
1133
1391
        # Convert the bytestring to hexadecimal notation
1134
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1392
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1135
1393
        return hex_fpr
1136
1394
 
1137
1395
 
1138
 
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1139
 
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
 
1396
class MultiprocessingMixIn(object):
 
1397
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1398
    def sub_process_main(self, request, address):
 
1399
        try:
 
1400
            self.finish_request(request, address)
 
1401
        except:
 
1402
            self.handle_error(request, address)
 
1403
        self.close_request(request)
 
1404
            
 
1405
    def process_request(self, request, address):
 
1406
        """Start a new process to process the request."""
 
1407
        multiprocessing.Process(target = self.sub_process_main,
 
1408
                                args = (request, address)).start()
 
1409
 
 
1410
 
 
1411
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1412
    """ adds a pipe to the MixIn """
1140
1413
    def process_request(self, request, client_address):
1141
1414
        """Overrides and wraps the original process_request().
1142
1415
        
1143
1416
        This function creates a new pipe in self.pipe
1144
1417
        """
1145
 
        self.child_pipe = os.pipe() # Child writes here
1146
 
        self.parent_pipe = os.pipe() # Parent writes here
1147
 
        super(ForkingMixInWithPipes,
 
1418
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1419
        
 
1420
        super(MultiprocessingMixInWithPipe,
1148
1421
              self).process_request(request, client_address)
1149
 
        # Close unused ends for parent
1150
 
        os.close(self.parent_pipe[0]) # close read end
1151
 
        os.close(self.child_pipe[1])  # close write end
1152
 
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1153
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1422
        self.child_pipe.close()
 
1423
        self.add_pipe(parent_pipe)
 
1424
    
 
1425
    def add_pipe(self, parent_pipe):
1154
1426
        """Dummy function; override as necessary"""
1155
 
        os.close(child_pipe_fd)
1156
 
        os.close(parent_pipe_fd)
1157
 
 
1158
 
 
1159
 
class IPv6_TCPServer(ForkingMixInWithPipes,
 
1427
        raise NotImplementedError
 
1428
 
 
1429
 
 
1430
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1160
1431
                     socketserver.TCPServer, object):
1161
1432
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1162
1433
    
1178
1449
        bind to an address or port if they were not specified."""
1179
1450
        if self.interface is not None:
1180
1451
            if SO_BINDTODEVICE is None:
1181
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1182
 
                             u" cannot bind to interface %s",
 
1452
                logger.error("SO_BINDTODEVICE does not exist;"
 
1453
                             " cannot bind to interface %s",
1183
1454
                             self.interface)
1184
1455
            else:
1185
1456
                try:
1186
1457
                    self.socket.setsockopt(socket.SOL_SOCKET,
1187
1458
                                           SO_BINDTODEVICE,
1188
1459
                                           str(self.interface
1189
 
                                               + u'\0'))
1190
 
                except socket.error, error:
 
1460
                                               + '\0'))
 
1461
                except socket.error as error:
1191
1462
                    if error[0] == errno.EPERM:
1192
 
                        logger.error(u"No permission to"
1193
 
                                     u" bind to interface %s",
 
1463
                        logger.error("No permission to"
 
1464
                                     " bind to interface %s",
1194
1465
                                     self.interface)
1195
1466
                    elif error[0] == errno.ENOPROTOOPT:
1196
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1197
 
                                     u" cannot bind to interface %s",
 
1467
                        logger.error("SO_BINDTODEVICE not available;"
 
1468
                                     " cannot bind to interface %s",
1198
1469
                                     self.interface)
1199
1470
                    else:
1200
1471
                        raise
1202
1473
        if self.server_address[0] or self.server_address[1]:
1203
1474
            if not self.server_address[0]:
1204
1475
                if self.address_family == socket.AF_INET6:
1205
 
                    any_address = u"::" # in6addr_any
 
1476
                    any_address = "::" # in6addr_any
1206
1477
                else:
1207
1478
                    any_address = socket.INADDR_ANY
1208
1479
                self.server_address = (any_address,
1247
1518
            return socketserver.TCPServer.server_activate(self)
1248
1519
    def enable(self):
1249
1520
        self.enabled = True
1250
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1521
    def add_pipe(self, parent_pipe):
1251
1522
        # Call "handle_ipc" for both data and EOF events
1252
 
        gobject.io_add_watch(child_pipe_fd,
 
1523
        gobject.io_add_watch(parent_pipe.fileno(),
1253
1524
                             gobject.IO_IN | gobject.IO_HUP,
1254
1525
                             functools.partial(self.handle_ipc,
1255
 
                                               reply_fd
1256
 
                                               =parent_pipe_fd))
1257
 
    def handle_ipc(self, source, condition, reply_fd=None,
1258
 
                   file_objects={}):
 
1526
                                               parent_pipe = parent_pipe))
 
1527
        
 
1528
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1529
                   client_object=None):
1259
1530
        condition_names = {
1260
 
            gobject.IO_IN: u"IN",   # There is data to read.
1261
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1531
            gobject.IO_IN: "IN",   # There is data to read.
 
1532
            gobject.IO_OUT: "OUT", # Data can be written (without
1262
1533
                                    # blocking).
1263
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1264
 
            gobject.IO_ERR: u"ERR", # Error condition.
1265
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1534
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1535
            gobject.IO_ERR: "ERR", # Error condition.
 
1536
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1266
1537
                                    # broken, usually for pipes and
1267
1538
                                    # sockets).
1268
1539
            }
1270
1541
                                       for cond, name in
1271
1542
                                       condition_names.iteritems()
1272
1543
                                       if cond & condition)
1273
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1274
 
                     conditions_string)
1275
 
        
1276
 
        # Turn the pipe file descriptors into Python file objects
1277
 
        if source not in file_objects:
1278
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1279
 
        if reply_fd not in file_objects:
1280
 
            file_objects[reply_fd] = os.fdopen(reply_fd, u"w", 0)
1281
 
        
1282
 
        # Read a line from the file object
1283
 
        cmdline = file_objects[source].readline()
1284
 
        if not cmdline:             # Empty line means end of file
1285
 
            # close the IPC pipes
1286
 
            file_objects[source].close()
1287
 
            del file_objects[source]
1288
 
            file_objects[reply_fd].close()
1289
 
            del file_objects[reply_fd]
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, file_objects[reply_fd])
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, file_objects[reply_fd])
1341
 
        else:
1342
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1343
 
        
1344
 
        # Keep calling this function
 
1544
        # error or the other end of multiprocessing.Pipe has closed
 
1545
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1546
            return False
 
1547
        
 
1548
        # Read a request from the child
 
1549
        request = parent_pipe.recv()
 
1550
        command = request[0]
 
1551
        
 
1552
        if command == 'init':
 
1553
            fpr = request[1]
 
1554
            address = request[2]
 
1555
            
 
1556
            for c in self.clients:
 
1557
                if c.fingerprint == fpr:
 
1558
                    client = c
 
1559
                    break
 
1560
            else:
 
1561
                logger.info("Client not found for fingerprint: %s, ad"
 
1562
                            "dress: %s", fpr, address)
 
1563
                if self.use_dbus:
 
1564
                    # Emit D-Bus signal
 
1565
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1566
                parent_pipe.send(False)
 
1567
                return False
 
1568
            
 
1569
            gobject.io_add_watch(parent_pipe.fileno(),
 
1570
                                 gobject.IO_IN | gobject.IO_HUP,
 
1571
                                 functools.partial(self.handle_ipc,
 
1572
                                                   parent_pipe = parent_pipe,
 
1573
                                                   client_object = client))
 
1574
            parent_pipe.send(True)
 
1575
            # remove the old hook in favor of the new above hook on same fileno
 
1576
            return False
 
1577
        if command == 'funcall':
 
1578
            funcname = request[1]
 
1579
            args = request[2]
 
1580
            kwargs = request[3]
 
1581
            
 
1582
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1583
        
 
1584
        if command == 'getattr':
 
1585
            attrname = request[1]
 
1586
            if callable(client_object.__getattribute__(attrname)):
 
1587
                parent_pipe.send(('function',))
 
1588
            else:
 
1589
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1590
        
 
1591
        if command == 'setattr':
 
1592
            attrname = request[1]
 
1593
            value = request[2]
 
1594
            setattr(client_object, attrname, value)
 
1595
        
1345
1596
        return True
1346
1597
 
1347
1598
 
1348
1599
def string_to_delta(interval):
1349
1600
    """Parse a string and return a datetime.timedelta
1350
1601
    
1351
 
    >>> string_to_delta(u'7d')
 
1602
    >>> string_to_delta('7d')
1352
1603
    datetime.timedelta(7)
1353
 
    >>> string_to_delta(u'60s')
 
1604
    >>> string_to_delta('60s')
1354
1605
    datetime.timedelta(0, 60)
1355
 
    >>> string_to_delta(u'60m')
 
1606
    >>> string_to_delta('60m')
1356
1607
    datetime.timedelta(0, 3600)
1357
 
    >>> string_to_delta(u'24h')
 
1608
    >>> string_to_delta('24h')
1358
1609
    datetime.timedelta(1)
1359
 
    >>> string_to_delta(u'1w')
 
1610
    >>> string_to_delta('1w')
1360
1611
    datetime.timedelta(7)
1361
 
    >>> string_to_delta(u'5m 30s')
 
1612
    >>> string_to_delta('5m 30s')
1362
1613
    datetime.timedelta(0, 330)
1363
1614
    """
1364
1615
    timevalue = datetime.timedelta(0)
1366
1617
        try:
1367
1618
            suffix = unicode(s[-1])
1368
1619
            value = int(s[:-1])
1369
 
            if suffix == u"d":
 
1620
            if suffix == "d":
1370
1621
                delta = datetime.timedelta(value)
1371
 
            elif suffix == u"s":
 
1622
            elif suffix == "s":
1372
1623
                delta = datetime.timedelta(0, value)
1373
 
            elif suffix == u"m":
 
1624
            elif suffix == "m":
1374
1625
                delta = datetime.timedelta(0, 0, 0, 0, value)
1375
 
            elif suffix == u"h":
 
1626
            elif suffix == "h":
1376
1627
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1377
 
            elif suffix == u"w":
 
1628
            elif suffix == "w":
1378
1629
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1379
1630
            else:
1380
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1381
 
        except (ValueError, IndexError), e:
1382
 
            raise ValueError(e.message)
 
1631
                raise ValueError("Unknown suffix %r" % suffix)
 
1632
        except (ValueError, IndexError) as e:
 
1633
            raise ValueError(*(e.args))
1383
1634
        timevalue += delta
1384
1635
    return timevalue
1385
1636
 
1391
1642
    global if_nametoindex
1392
1643
    try:
1393
1644
        if_nametoindex = (ctypes.cdll.LoadLibrary
1394
 
                          (ctypes.util.find_library(u"c"))
 
1645
                          (ctypes.util.find_library("c"))
1395
1646
                          .if_nametoindex)
1396
1647
    except (OSError, AttributeError):
1397
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1648
        logger.warning("Doing if_nametoindex the hard way")
1398
1649
        def if_nametoindex(interface):
1399
1650
            "Get an interface index the hard way, i.e. using fcntl()"
1400
1651
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1401
1652
            with contextlib.closing(socket.socket()) as s:
1402
1653
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1403
 
                                    struct.pack(str(u"16s16x"),
 
1654
                                    struct.pack(str("16s16x"),
1404
1655
                                                interface))
1405
 
            interface_index = struct.unpack(str(u"I"),
 
1656
            interface_index = struct.unpack(str("I"),
1406
1657
                                            ifreq[16:20])[0]
1407
1658
            return interface_index
1408
1659
    return if_nametoindex(interface)
1416
1667
        sys.exit()
1417
1668
    os.setsid()
1418
1669
    if not nochdir:
1419
 
        os.chdir(u"/")
 
1670
        os.chdir("/")
1420
1671
    if os.fork():
1421
1672
        sys.exit()
1422
1673
    if not noclose:
1424
1675
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1425
1676
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1426
1677
            raise OSError(errno.ENODEV,
1427
 
                          u"%s not a character device"
 
1678
                          "%s not a character device"
1428
1679
                          % os.path.devnull)
1429
1680
        os.dup2(null, sys.stdin.fileno())
1430
1681
        os.dup2(null, sys.stdout.fileno())
1438
1689
    ##################################################################
1439
1690
    # Parsing of options, both command line and config file
1440
1691
    
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]
 
1692
    parser = argparse.ArgumentParser()
 
1693
    parser.add_argument("-v", "--version", action="version",
 
1694
                        version = "%%(prog)s %s" % version,
 
1695
                        help="show version number and exit")
 
1696
    parser.add_argument("-i", "--interface", metavar="IF",
 
1697
                        help="Bind to interface IF")
 
1698
    parser.add_argument("-a", "--address",
 
1699
                        help="Address to listen for requests on")
 
1700
    parser.add_argument("-p", "--port", type=int,
 
1701
                        help="Port number to receive requests on")
 
1702
    parser.add_argument("--check", action="store_true",
 
1703
                        help="Run self-test")
 
1704
    parser.add_argument("--debug", action="store_true",
 
1705
                        help="Debug mode; run in foreground and log"
 
1706
                        " to terminal")
 
1707
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
1708
                        help="Debug level for stdout output")
 
1709
    parser.add_argument("--priority", help="GnuTLS"
 
1710
                        " priority string (see GnuTLS documentation)")
 
1711
    parser.add_argument("--servicename",
 
1712
                        metavar="NAME", help="Zeroconf service name")
 
1713
    parser.add_argument("--configdir",
 
1714
                        default="/etc/mandos", metavar="DIR",
 
1715
                        help="Directory to search for configuration"
 
1716
                        " files")
 
1717
    parser.add_argument("--no-dbus", action="store_false",
 
1718
                        dest="use_dbus", help="Do not provide D-Bus"
 
1719
                        " system bus interface")
 
1720
    parser.add_argument("--no-ipv6", action="store_false",
 
1721
                        dest="use_ipv6", help="Do not use IPv6")
 
1722
    options = parser.parse_args()
1467
1723
    
1468
1724
    if options.check:
1469
1725
        import doctest
1471
1727
        sys.exit()
1472
1728
    
1473
1729
    # 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",
 
1730
    server_defaults = { "interface": "",
 
1731
                        "address": "",
 
1732
                        "port": "",
 
1733
                        "debug": "False",
 
1734
                        "priority":
 
1735
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1736
                        "servicename": "Mandos",
 
1737
                        "use_dbus": "True",
 
1738
                        "use_ipv6": "True",
 
1739
                        "debuglevel": "",
1483
1740
                        }
1484
1741
    
1485
1742
    # Parse config file for server-global settings
1486
1743
    server_config = configparser.SafeConfigParser(server_defaults)
1487
1744
    del server_defaults
1488
1745
    server_config.read(os.path.join(options.configdir,
1489
 
                                    u"mandos.conf"))
 
1746
                                    "mandos.conf"))
1490
1747
    # Convert the SafeConfigParser object to a dict
1491
1748
    server_settings = server_config.defaults()
1492
1749
    # 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",
 
1750
    for option in ("debug", "use_dbus", "use_ipv6"):
 
1751
        server_settings[option] = server_config.getboolean("DEFAULT",
1495
1752
                                                           option)
1496
1753
    if server_settings["port"]:
1497
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1498
 
                                                       u"port")
 
1754
        server_settings["port"] = server_config.getint("DEFAULT",
 
1755
                                                       "port")
1499
1756
    del server_config
1500
1757
    
1501
1758
    # Override the settings from the config file with command line
1502
1759
    # 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"):
 
1760
    for option in ("interface", "address", "port", "debug",
 
1761
                   "priority", "servicename", "configdir",
 
1762
                   "use_dbus", "use_ipv6", "debuglevel"):
1506
1763
        value = getattr(options, option)
1507
1764
        if value is not None:
1508
1765
            server_settings[option] = value
1516
1773
    ##################################################################
1517
1774
    
1518
1775
    # 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":
 
1776
    debug = server_settings["debug"]
 
1777
    debuglevel = server_settings["debuglevel"]
 
1778
    use_dbus = server_settings["use_dbus"]
 
1779
    use_ipv6 = server_settings["use_ipv6"]
 
1780
    
 
1781
    if server_settings["servicename"] != "Mandos":
1528
1782
        syslogger.setFormatter(logging.Formatter
1529
 
                               (u'Mandos (%s) [%%(process)d]:'
1530
 
                                u' %%(levelname)s: %%(message)s'
1531
 
                                % server_settings[u"servicename"]))
 
1783
                               ('Mandos (%s) [%%(process)d]:'
 
1784
                                ' %%(levelname)s: %%(message)s'
 
1785
                                % server_settings["servicename"]))
1532
1786
    
1533
1787
    # 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"",
 
1788
    client_defaults = { "timeout": "5m",
 
1789
                        "extended_timeout": "15m",
 
1790
                        "interval": "2m",
 
1791
                        "checker": "fping -q -- %%(host)s",
 
1792
                        "host": "",
 
1793
                        "approval_delay": "0s",
 
1794
                        "approval_duration": "1s",
1538
1795
                        }
1539
1796
    client_config = configparser.SafeConfigParser(client_defaults)
1540
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1541
 
                                    u"clients.conf"))
 
1797
    client_config.read(os.path.join(server_settings["configdir"],
 
1798
                                    "clients.conf"))
1542
1799
    
1543
1800
    global mandos_dbus_service
1544
1801
    mandos_dbus_service = None
1545
1802
    
1546
 
    tcp_server = MandosServer((server_settings[u"address"],
1547
 
                               server_settings[u"port"]),
 
1803
    tcp_server = MandosServer((server_settings["address"],
 
1804
                               server_settings["port"]),
1548
1805
                              ClientHandler,
1549
 
                              interface=server_settings[u"interface"],
 
1806
                              interface=(server_settings["interface"]
 
1807
                                         or None),
1550
1808
                              use_ipv6=use_ipv6,
1551
1809
                              gnutls_priority=
1552
 
                              server_settings[u"priority"],
 
1810
                              server_settings["priority"],
1553
1811
                              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)
 
1812
    if not debug:
 
1813
        pidfilename = "/var/run/mandos.pid"
 
1814
        try:
 
1815
            pidfile = open(pidfilename, "w")
 
1816
        except IOError:
 
1817
            logger.error("Could not open file %r", pidfilename)
1559
1818
    
1560
1819
    try:
1561
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1562
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1820
        uid = pwd.getpwnam("_mandos").pw_uid
 
1821
        gid = pwd.getpwnam("_mandos").pw_gid
1563
1822
    except KeyError:
1564
1823
        try:
1565
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1566
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1824
            uid = pwd.getpwnam("mandos").pw_uid
 
1825
            gid = pwd.getpwnam("mandos").pw_gid
1567
1826
        except KeyError:
1568
1827
            try:
1569
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1570
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1828
                uid = pwd.getpwnam("nobody").pw_uid
 
1829
                gid = pwd.getpwnam("nobody").pw_gid
1571
1830
            except KeyError:
1572
1831
                uid = 65534
1573
1832
                gid = 65534
1574
1833
    try:
1575
1834
        os.setgid(gid)
1576
1835
        os.setuid(uid)
1577
 
    except OSError, error:
 
1836
    except OSError as error:
1578
1837
        if error[0] != errno.EPERM:
1579
1838
            raise error
1580
1839
    
1581
 
    # Enable all possible GnuTLS debugging
 
1840
    if not debug and not debuglevel:
 
1841
        syslogger.setLevel(logging.WARNING)
 
1842
        console.setLevel(logging.WARNING)
 
1843
    if debuglevel:
 
1844
        level = getattr(logging, debuglevel.upper())
 
1845
        syslogger.setLevel(level)
 
1846
        console.setLevel(level)
 
1847
    
1582
1848
    if debug:
 
1849
        # Enable all possible GnuTLS debugging
 
1850
        
1583
1851
        # "Use a log level over 10 to enable all debugging options."
1584
1852
        # - GnuTLS manual
1585
1853
        gnutls.library.functions.gnutls_global_set_log_level(11)
1586
1854
        
1587
1855
        @gnutls.library.types.gnutls_log_func
1588
1856
        def debug_gnutls(level, string):
1589
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1857
            logger.debug("GnuTLS: %s", string[:-1])
1590
1858
        
1591
1859
        (gnutls.library.functions
1592
1860
         .gnutls_global_set_log_function(debug_gnutls))
 
1861
        
 
1862
        # Redirect stdin so all checkers get /dev/null
 
1863
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1864
        os.dup2(null, sys.stdin.fileno())
 
1865
        if null > 2:
 
1866
            os.close(null)
 
1867
    else:
 
1868
        # No console logging
 
1869
        logger.removeHandler(console)
 
1870
    
 
1871
    # Need to fork before connecting to D-Bus
 
1872
    if not debug:
 
1873
        # Close all input and output, do double fork, etc.
 
1874
        daemon()
1593
1875
    
1594
1876
    global main_loop
1595
1877
    # From the Avahi example code
1599
1881
    # End of Avahi example code
1600
1882
    if use_dbus:
1601
1883
        try:
1602
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1884
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1603
1885
                                            bus, do_not_queue=True)
1604
 
        except dbus.exceptions.NameExistsException, e:
1605
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
1886
        except dbus.exceptions.NameExistsException as e:
 
1887
            logger.error(unicode(e) + ", disabling D-Bus")
1606
1888
            use_dbus = False
1607
 
            server_settings[u"use_dbus"] = False
 
1889
            server_settings["use_dbus"] = False
1608
1890
            tcp_server.use_dbus = False
1609
1891
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1610
 
    service = AvahiService(name = server_settings[u"servicename"],
1611
 
                           servicetype = u"_mandos._tcp",
 
1892
    service = AvahiService(name = server_settings["servicename"],
 
1893
                           servicetype = "_mandos._tcp",
1612
1894
                           protocol = protocol, bus = bus)
1613
1895
    if server_settings["interface"]:
1614
1896
        service.interface = (if_nametoindex
1615
 
                             (str(server_settings[u"interface"])))
 
1897
                             (str(server_settings["interface"])))
 
1898
    
 
1899
    global multiprocessing_manager
 
1900
    multiprocessing_manager = multiprocessing.Manager()
1616
1901
    
1617
1902
    client_class = Client
1618
1903
    if use_dbus:
1619
1904
        client_class = functools.partial(ClientDBus, bus = bus)
 
1905
    def client_config_items(config, section):
 
1906
        special_settings = {
 
1907
            "approved_by_default":
 
1908
                lambda: config.getboolean(section,
 
1909
                                          "approved_by_default"),
 
1910
            }
 
1911
        for name, value in config.items(section):
 
1912
            try:
 
1913
                yield (name, special_settings[name]())
 
1914
            except KeyError:
 
1915
                yield (name, value)
 
1916
    
1620
1917
    tcp_server.clients.update(set(
1621
1918
            client_class(name = section,
1622
 
                         config= dict(client_config.items(section)))
 
1919
                         config= dict(client_config_items(
 
1920
                        client_config, section)))
1623
1921
            for section in client_config.sections()))
1624
1922
    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
 
    
 
1923
        logger.warning("No clients defined")
 
1924
        
1652
1925
    if not debug:
 
1926
        try:
 
1927
            with pidfile:
 
1928
                pid = os.getpid()
 
1929
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1930
            del pidfile
 
1931
        except IOError:
 
1932
            logger.error("Could not write to file %r with PID %d",
 
1933
                         pidfilename, pid)
 
1934
        except NameError:
 
1935
            # "pidfile" was never created
 
1936
            pass
 
1937
        del pidfilename
 
1938
        
1653
1939
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1940
    
1654
1941
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1655
1942
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1656
1943
    
1658
1945
        class MandosDBusService(dbus.service.Object):
1659
1946
            """A D-Bus proxy object"""
1660
1947
            def __init__(self):
1661
 
                dbus.service.Object.__init__(self, bus, u"/")
1662
 
            _interface = u"se.bsnet.fukt.Mandos"
 
1948
                dbus.service.Object.__init__(self, bus, "/")
 
1949
            _interface = "se.bsnet.fukt.Mandos"
1663
1950
            
1664
 
            @dbus.service.signal(_interface, signature=u"o")
 
1951
            @dbus.service.signal(_interface, signature="o")
1665
1952
            def ClientAdded(self, objpath):
1666
1953
                "D-Bus signal"
1667
1954
                pass
1668
1955
            
1669
 
            @dbus.service.signal(_interface, signature=u"ss")
 
1956
            @dbus.service.signal(_interface, signature="ss")
1670
1957
            def ClientNotFound(self, fingerprint, address):
1671
1958
                "D-Bus signal"
1672
1959
                pass
1673
1960
            
1674
 
            @dbus.service.signal(_interface, signature=u"os")
 
1961
            @dbus.service.signal(_interface, signature="os")
1675
1962
            def ClientRemoved(self, objpath, name):
1676
1963
                "D-Bus signal"
1677
1964
                pass
1678
1965
            
1679
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1966
            @dbus.service.method(_interface, out_signature="ao")
1680
1967
            def GetAllClients(self):
1681
1968
                "D-Bus method"
1682
1969
                return dbus.Array(c.dbus_object_path
1683
1970
                                  for c in tcp_server.clients)
1684
1971
            
1685
1972
            @dbus.service.method(_interface,
1686
 
                                 out_signature=u"a{oa{sv}}")
 
1973
                                 out_signature="a{oa{sv}}")
1687
1974
            def GetAllClientsWithProperties(self):
1688
1975
                "D-Bus method"
1689
1976
                return dbus.Dictionary(
1690
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1977
                    ((c.dbus_object_path, c.GetAll(""))
1691
1978
                     for c in tcp_server.clients),
1692
 
                    signature=u"oa{sv}")
 
1979
                    signature="oa{sv}")
1693
1980
            
1694
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1981
            @dbus.service.method(_interface, in_signature="o")
1695
1982
            def RemoveClient(self, object_path):
1696
1983
                "D-Bus method"
1697
1984
                for c in tcp_server.clients:
1739
2026
    # Find out what port we got
1740
2027
    service.port = tcp_server.socket.getsockname()[1]
1741
2028
    if use_ipv6:
1742
 
        logger.info(u"Now listening on address %r, port %d,"
 
2029
        logger.info("Now listening on address %r, port %d,"
1743
2030
                    " flowinfo %d, scope_id %d"
1744
2031
                    % tcp_server.socket.getsockname())
1745
2032
    else:                       # IPv4
1746
 
        logger.info(u"Now listening on address %r, port %d"
 
2033
        logger.info("Now listening on address %r, port %d"
1747
2034
                    % tcp_server.socket.getsockname())
1748
2035
    
1749
2036
    #service.interface = tcp_server.socket.getsockname()[3]
1752
2039
        # From the Avahi example code
1753
2040
        try:
1754
2041
            service.activate()
1755
 
        except dbus.exceptions.DBusException, error:
1756
 
            logger.critical(u"DBusException: %s", error)
 
2042
        except dbus.exceptions.DBusException as error:
 
2043
            logger.critical("DBusException: %s", error)
1757
2044
            cleanup()
1758
2045
            sys.exit(1)
1759
2046
        # End of Avahi example code
1763
2050
                             (tcp_server.handle_request
1764
2051
                              (*args[2:], **kwargs) or True))
1765
2052
        
1766
 
        logger.debug(u"Starting main loop")
 
2053
        logger.debug("Starting main loop")
1767
2054
        main_loop.run()
1768
 
    except AvahiError, error:
1769
 
        logger.critical(u"AvahiError: %s", error)
 
2055
    except AvahiError as error:
 
2056
        logger.critical("AvahiError: %s", error)
1770
2057
        cleanup()
1771
2058
        sys.exit(1)
1772
2059
    except KeyboardInterrupt:
1773
2060
        if debug:
1774
 
            print >> sys.stderr
1775
 
        logger.debug(u"Server received KeyboardInterrupt")
1776
 
    logger.debug(u"Server exiting")
 
2061
            print("", file=sys.stderr)
 
2062
        logger.debug("Server received KeyboardInterrupt")
 
2063
    logger.debug("Server exiting")
1777
2064
    # Must run before the D-Bus bus name gets deregistered
1778
2065
    cleanup()
1779
2066
 
 
2067
 
1780
2068
if __name__ == '__main__':
1781
2069
    main()