/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: 2009-04-16 21:33:49 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416213349-dwtllm8tvh2i0xbk
* mandos: Minor doc string fixes.
  (SO_BINDTODEVICE): Do not guess if not found.
  (IPv6_TCPServer.server_bind): Handle case where SO_BINDTODEVICE is
                                not available.

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