/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-03 03:36:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090403033608-ftgzsnnuzo7gbvzc
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
                                          class.
  (TCP_handler.peer_certificate, TCP_handler.fingerprint): Moved here.
  (TCP_handler.handle): Do not log conditions also sent via IPC.
  (IPv6_TCPServer.handle_ipc): Bug fix: Remove extra newline from IPC
                               command log message.  Bug fix:  Strip
                               CR and NL from IPC line.  Log
                               conditions recieved via IPC.  Log error
                               if IPC recieved about unknown client.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
9
 
# methods "add", "remove", "server_state_changed",
10
 
# "entry_group_state_changed", "cleanup", and "activate" in the
11
 
# "AvahiService" class, and some lines in "main".
 
9
# methods "add" and "remove" in the "AvahiService" class, the
 
10
# "server_state_changed" and "entry_group_state_changed" functions,
 
11
# 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
 
import SocketServer as socketserver
 
36
import SocketServer
38
37
import socket
39
38
import optparse
40
39
import datetime
45
44
import gnutls.library.functions
46
45
import gnutls.library.constants
47
46
import gnutls.library.types
48
 
import ConfigParser as configparser
 
47
import ConfigParser
49
48
import sys
50
49
import re
51
50
import os
52
51
import signal
 
52
from sets import Set
53
53
import subprocess
54
54
import atexit
55
55
import stat
56
56
import logging
57
57
import logging.handlers
58
58
import pwd
59
 
import contextlib
60
 
import struct
61
 
import fcntl
62
 
import functools
63
 
import cPickle as pickle
64
 
import multiprocessing
 
59
from contextlib import closing
65
60
 
66
61
import dbus
67
62
import dbus.service
70
65
from dbus.mainloop.glib import DBusGMainLoop
71
66
import ctypes
72
67
import ctypes.util
73
 
import xml.dom.minidom
74
 
import inspect
75
 
 
76
 
try:
77
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
78
 
except AttributeError:
79
 
    try:
80
 
        from IN import SO_BINDTODEVICE
81
 
    except ImportError:
82
 
        SO_BINDTODEVICE = None
83
 
 
84
 
 
85
 
version = "1.2.3"
86
 
 
87
 
#logger = logging.getLogger('mandos')
 
68
 
 
69
version = "1.0.8"
 
70
 
88
71
logger = logging.Logger('mandos')
89
72
syslogger = (logging.handlers.SysLogHandler
90
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
 
74
              address = "/dev/log"))
92
75
syslogger.setFormatter(logging.Formatter
93
76
                       ('Mandos [%(process)d]: %(levelname)s:'
94
77
                        ' %(message)s'))
96
79
 
97
80
console = logging.StreamHandler()
98
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
 
82
                                       ' %(levelname)s: %(message)s'))
101
83
logger.addHandler(console)
102
84
 
103
85
class AvahiError(Exception):
116
98
 
117
99
class AvahiService(object):
118
100
    """An Avahi (Zeroconf) service.
119
 
    
120
101
    Attributes:
121
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
103
               Used to optionally bind to the specified interface.
130
111
    max_renames: integer; maximum number of renames
131
112
    rename_count: integer; counter so we only rename after collisions
132
113
                  a sensible number of times
133
 
    group: D-Bus Entry Group
134
 
    server: D-Bus Server
135
 
    bus: dbus.SystemBus()
136
114
    """
137
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
116
                 servicetype = None, port = None, TXT = None,
139
117
                 domain = "", host = "", max_renames = 32768,
140
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
118
                 protocol = avahi.PROTO_UNSPEC):
141
119
        self.interface = interface
142
120
        self.name = name
143
121
        self.type = servicetype
148
126
        self.rename_count = 0
149
127
        self.max_renames = max_renames
150
128
        self.protocol = protocol
151
 
        self.group = None       # our entry group
152
 
        self.server = None
153
 
        self.bus = bus
154
129
    def rename(self):
155
130
        """Derived from the Avahi example code"""
156
131
        if self.rename_count >= self.max_renames:
157
 
            logger.critical("No suitable Zeroconf service name found"
158
 
                            " after %i retries, exiting.",
 
132
            logger.critical(u"No suitable Zeroconf service name found"
 
133
                            u" after %i retries, exiting.",
159
134
                            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)
 
135
            raise AvahiServiceError(u"Too many renames")
 
136
        self.name = server.GetAlternativeServiceName(self.name)
 
137
        logger.info(u"Changing Zeroconf service name to %r ...",
 
138
                    str(self.name))
164
139
        syslogger.setFormatter(logging.Formatter
165
140
                               ('Mandos (%s) [%%(process)d]:'
166
141
                                ' %%(levelname)s: %%(message)s'
167
142
                                % self.name))
168
143
        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)
 
144
        self.add()
175
145
        self.rename_count += 1
176
146
    def remove(self):
177
147
        """Derived from the Avahi example code"""
178
 
        if self.group is not None:
179
 
            self.group.Reset()
 
148
        if group is not None:
 
149
            group.Reset()
180
150
    def add(self):
181
151
        """Derived from the Avahi example code"""
182
 
        if self.group is None:
183
 
            self.group = dbus.Interface(
184
 
                self.bus.get_object(avahi.DBUS_NAME,
185
 
                                    self.server.EntryGroupNew()),
186
 
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
187
 
            self.group.connect_to_signal('StateChanged',
188
 
                                         self
189
 
                                         .entry_group_state_changed)
190
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
191
 
                     self.name, self.type)
192
 
        self.group.AddService(
193
 
            self.interface,
194
 
            self.protocol,
195
 
            dbus.UInt32(0),     # flags
196
 
            self.name, self.type,
197
 
            self.domain, self.host,
198
 
            dbus.UInt16(self.port),
199
 
            avahi.string_array_to_txt_array(self.TXT))
200
 
        self.group.Commit()
201
 
    def entry_group_state_changed(self, state, error):
202
 
        """Derived from the Avahi example code"""
203
 
        logger.debug("Avahi entry group state change: %i", state)
204
 
        
205
 
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
 
            logger.debug("Zeroconf service established.")
207
 
        elif state == avahi.ENTRY_GROUP_COLLISION:
208
 
            logger.info("Zeroconf service name collision.")
209
 
            self.rename()
210
 
        elif state == avahi.ENTRY_GROUP_FAILURE:
211
 
            logger.critical("Avahi: Error in group state changed %s",
212
 
                            unicode(error))
213
 
            raise AvahiGroupError("State changed: %s"
214
 
                                  % unicode(error))
215
 
    def cleanup(self):
216
 
        """Derived from the Avahi example code"""
217
 
        if self.group is not None:
218
 
            self.group.Free()
219
 
            self.group = None
220
 
    def server_state_changed(self, state):
221
 
        """Derived from the Avahi example code"""
222
 
        logger.debug("Avahi server state change: %i", state)
223
 
        if state == avahi.SERVER_COLLISION:
224
 
            logger.error("Zeroconf server name collision")
225
 
            self.remove()
226
 
        elif state == avahi.SERVER_RUNNING:
227
 
            self.add()
228
 
    def activate(self):
229
 
        """Derived from the Avahi example code"""
230
 
        if self.server is None:
231
 
            self.server = dbus.Interface(
232
 
                self.bus.get_object(avahi.DBUS_NAME,
233
 
                                    avahi.DBUS_PATH_SERVER),
234
 
                avahi.DBUS_INTERFACE_SERVER)
235
 
        self.server.connect_to_signal("StateChanged",
236
 
                                 self.server_state_changed)
237
 
        self.server_state_changed(self.server.GetState())
 
152
        global group
 
153
        if group is None:
 
154
            group = dbus.Interface(bus.get_object
 
155
                                   (avahi.DBUS_NAME,
 
156
                                    server.EntryGroupNew()),
 
157
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
158
            group.connect_to_signal('StateChanged',
 
159
                                    entry_group_state_changed)
 
160
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
161
                     service.name, service.type)
 
162
        group.AddService(
 
163
                self.interface,         # interface
 
164
                self.protocol,          # protocol
 
165
                dbus.UInt32(0),         # flags
 
166
                self.name, self.type,
 
167
                self.domain, self.host,
 
168
                dbus.UInt16(self.port),
 
169
                avahi.string_array_to_txt_array(self.TXT))
 
170
        group.Commit()
 
171
 
 
172
# From the Avahi example code:
 
173
group = None                            # our entry group
 
174
# End of Avahi example code
 
175
 
 
176
 
 
177
def _datetime_to_dbus(dt, variant_level=0):
 
178
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
179
    return dbus.String(dt.isoformat(), variant_level=variant_level)
238
180
 
239
181
 
240
182
class Client(object):
241
183
    """A representation of a client host served by this server.
242
 
    
243
184
    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
 
185
    name:       string; from the config file, used in log messages and
 
186
                        D-Bus identifiers
 
187
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
188
                 uniquely identify the client
 
189
    secret:     bytestring; sent verbatim (over TLS) to client
 
190
    host:       string; available for use by the checker command
 
191
    created:    datetime.datetime(); (UTC) object creation
 
192
    last_enabled: datetime.datetime(); (UTC)
 
193
    enabled:    bool()
 
194
    last_checked_ok: datetime.datetime(); (UTC) or None
 
195
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
196
                                      until this client is invalid
 
197
    interval:   datetime.timedelta(); How often to start a new checker
 
198
    disable_hook:  If set, called by disable() as disable_hook(self)
247
199
    checker:    subprocess.Popen(); a running checker process used
248
200
                                    to see if the client lives.
249
201
                                    '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
 
202
    checker_initiator_tag: a gobject event source tag, or None
 
203
    disable_initiator_tag:    - '' -
 
204
    checker_callback_tag:  - '' -
 
205
    checker_command: string; External command which is run to check if
 
206
                     client lives.  %() expansions are done at
253
207
                     runtime with vars(self) as dict, so that for
254
208
                     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
209
    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
210
    """
275
 
    
276
 
    runtime_expansions = ("approval_delay", "approval_duration",
277
 
                          "created", "enabled", "fingerprint",
278
 
                          "host", "interval", "last_checked_ok",
279
 
                          "last_enabled", "name", "timeout")
280
 
    
281
 
    @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))
287
 
    
288
211
    def timeout_milliseconds(self):
289
212
        "Return the 'timeout' attribute in milliseconds"
290
 
        return self._timedelta_to_milliseconds(self.timeout)
 
213
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
214
                + (self.timeout.seconds * 1000)
 
215
                + (self.timeout.microseconds // 1000))
291
216
    
292
217
    def interval_milliseconds(self):
293
218
        "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)
 
219
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
220
                + (self.interval.seconds * 1000)
 
221
                + (self.interval.microseconds // 1000))
298
222
    
299
223
    def __init__(self, name = None, disable_hook=None, config=None):
300
224
        """Note: the 'checker' key in 'config' sets the
303
227
        self.name = name
304
228
        if config is None:
305
229
            config = {}
306
 
        logger.debug("Creating client %r", self.name)
 
230
        logger.debug(u"Creating client %r", self.name)
307
231
        # Uppercase and remove spaces from fingerprint for later
308
232
        # comparison purposes with return value from the fingerprint()
309
233
        # function
310
234
        self.fingerprint = (config["fingerprint"].upper()
311
 
                            .replace(" ", ""))
312
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
235
                            .replace(u" ", u""))
 
236
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
313
237
        if "secret" in config:
314
 
            self.secret = config["secret"].decode("base64")
 
238
            self.secret = config["secret"].decode(u"base64")
315
239
        elif "secfile" in config:
316
 
            with open(os.path.expanduser(os.path.expandvars
317
 
                                         (config["secfile"])),
318
 
                      "rb") as secfile:
 
240
            with closing(open(os.path.expanduser
 
241
                              (os.path.expandvars
 
242
                               (config["secfile"])))) as secfile:
319
243
                self.secret = secfile.read()
320
244
        else:
321
 
            raise TypeError("No secret or secfile for client %s"
 
245
            raise TypeError(u"No secret or secfile for client %s"
322
246
                            % self.name)
323
247
        self.host = config.get("host", "")
324
248
        self.created = datetime.datetime.utcnow()
325
249
        self.enabled = False
326
 
        self.last_approval_request = None
327
250
        self.last_enabled = None
328
251
        self.last_checked_ok = None
329
252
        self.timeout = string_to_delta(config["timeout"])
336
259
        self.checker_command = config["checker"]
337
260
        self.current_checker_command = None
338
261
        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
262
    
349
 
    def send_changedstate(self):
350
 
        self.changedstate.acquire()
351
 
        self.changedstate.notify_all()
352
 
        self.changedstate.release()
353
 
        
354
263
    def enable(self):
355
264
        """Start this client's checker and timeout hooks"""
356
 
        if getattr(self, "enabled", False):
357
 
            # Already enabled
358
 
            return
359
 
        self.send_changedstate()
360
265
        self.last_enabled = datetime.datetime.utcnow()
361
266
        # Schedule a new checker to be started an 'interval' from now,
362
267
        # and every interval from then on.
363
268
        self.checker_initiator_tag = (gobject.timeout_add
364
269
                                      (self.interval_milliseconds(),
365
270
                                       self.start_checker))
 
271
        # Also start a new checker *right now*.
 
272
        self.start_checker()
366
273
        # Schedule a disable() when 'timeout' has passed
367
274
        self.disable_initiator_tag = (gobject.timeout_add
368
275
                                   (self.timeout_milliseconds(),
369
276
                                    self.disable))
370
277
        self.enabled = True
371
 
        # Also start a new checker *right now*.
372
 
        self.start_checker()
373
278
    
374
 
    def disable(self, quiet=True):
 
279
    def disable(self):
375
280
        """Disable this client."""
376
281
        if not getattr(self, "enabled", False):
377
282
            return False
378
 
        if not quiet:
379
 
            self.send_changedstate()
380
 
        if not quiet:
381
 
            logger.info("Disabling client %s", self.name)
 
283
        logger.info(u"Disabling client %s", self.name)
382
284
        if getattr(self, "disable_initiator_tag", False):
383
285
            gobject.source_remove(self.disable_initiator_tag)
384
286
            self.disable_initiator_tag = None
403
305
        if os.WIFEXITED(condition):
404
306
            exitstatus = os.WEXITSTATUS(condition)
405
307
            if exitstatus == 0:
406
 
                logger.info("Checker for %(name)s succeeded",
 
308
                logger.info(u"Checker for %(name)s succeeded",
407
309
                            vars(self))
408
310
                self.checked_ok()
409
311
            else:
410
 
                logger.info("Checker for %(name)s failed",
 
312
                logger.info(u"Checker for %(name)s failed",
411
313
                            vars(self))
412
314
        else:
413
 
            logger.warning("Checker for %(name)s crashed?",
 
315
            logger.warning(u"Checker for %(name)s crashed?",
414
316
                           vars(self))
415
317
    
416
318
    def checked_ok(self):
417
319
        """Bump up the timeout for this client.
418
 
        
419
320
        This should only be called when the client has been seen,
420
321
        alive and well.
421
322
        """
425
326
                                      (self.timeout_milliseconds(),
426
327
                                       self.disable))
427
328
    
428
 
    def need_approval(self):
429
 
        self.last_approval_request = datetime.datetime.utcnow()
430
 
    
431
329
    def start_checker(self):
432
330
        """Start a new checker subprocess if one is not running.
433
 
        
434
331
        If a checker already exists, leave it running and do
435
332
        nothing."""
436
333
        # The reason for not killing a running checker is that if we
439
336
        # client would inevitably timeout, since no checker would get
440
337
        # a chance to run to completion.  If we instead leave running
441
338
        # 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.
 
339
        # than 'timeout' for the client to be declared invalid, which
 
340
        # is as it should be.
444
341
        
445
342
        # If a checker exists, make sure it is not a zombie
446
 
        try:
 
343
        if self.checker is not None:
447
344
            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
345
            if pid:
454
346
                logger.warning("Checker was a zombie")
455
347
                gobject.source_remove(self.checker_callback_tag)
462
354
                command = self.checker_command % self.host
463
355
            except TypeError:
464
356
                # 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
 
 
 
357
                escaped_attrs = dict((key, re.escape(str(val)))
 
358
                                     for key, val in
 
359
                                     vars(self).iteritems())
473
360
                try:
474
361
                    command = self.checker_command % escaped_attrs
475
362
                except TypeError, error:
476
 
                    logger.error('Could not format string "%s":'
477
 
                                 ' %s', self.checker_command, error)
 
363
                    logger.error(u'Could not format string "%s":'
 
364
                                 u' %s', self.checker_command, error)
478
365
                    return True # Try again later
479
366
            self.current_checker_command = command
480
367
            try:
481
 
                logger.info("Starting checker %r for %s",
 
368
                logger.info(u"Starting checker %r for %s",
482
369
                            command, self.name)
483
370
                # We don't need to redirect stdout and stderr, since
484
371
                # in normal mode, that is already done by daemon(),
498
385
                    gobject.source_remove(self.checker_callback_tag)
499
386
                    self.checker_callback(pid, status, command)
500
387
            except OSError, error:
501
 
                logger.error("Failed to start subprocess: %s",
 
388
                logger.error(u"Failed to start subprocess: %s",
502
389
                             error)
503
390
        # Re-run this periodically if run by gobject.timeout_add
504
391
        return True
510
397
            self.checker_callback_tag = None
511
398
        if getattr(self, "checker", None) is None:
512
399
            return
513
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
400
        logger.debug(u"Stopping checker for %(name)s", vars(self))
514
401
        try:
515
402
            os.kill(self.checker.pid, signal.SIGTERM)
516
 
            #time.sleep(0.5)
 
403
            #os.sleep(0.5)
517
404
            #if self.checker.poll() is None:
518
405
            #    os.kill(self.checker.pid, signal.SIGKILL)
519
406
        except OSError, error:
520
407
            if error.errno != errno.ESRCH: # No such process
521
408
                raise
522
409
        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):
 
410
    
 
411
    def still_valid(self):
 
412
        """Has the timeout not yet passed for this client?"""
 
413
        if not getattr(self, "enabled", False):
 
414
            return False
 
415
        now = datetime.datetime.utcnow()
 
416
        if self.last_checked_ok is None:
 
417
            return now < (self.created + self.timeout)
 
418
        else:
 
419
            return now < (self.last_checked_ok + self.timeout)
 
420
 
 
421
 
 
422
class ClientDBus(Client, dbus.service.Object):
714
423
    """A Client class using D-Bus
715
 
    
716
424
    Attributes:
717
 
    dbus_object_path: dbus.ObjectPath
718
 
    bus: dbus.SystemBus()
 
425
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
719
426
    """
720
 
    
721
 
    runtime_expansions = (Client.runtime_expansions
722
 
                          + ("dbus_object_path",))
723
 
    
724
427
    # dbus.service.Object doesn't use super(), so we can't either.
725
428
    
726
 
    def __init__(self, bus = None, *args, **kwargs):
727
 
        self._approvals_pending = 0
728
 
        self.bus = bus
 
429
    def __init__(self, *args, **kwargs):
729
430
        Client.__init__(self, *args, **kwargs)
730
431
        # Only now, when this client is initialized, can it show up on
731
432
        # the D-Bus
732
 
        client_object_name = unicode(self.name).translate(
733
 
            {ord("."): ord("_"),
734
 
             ord("-"): ord("_")})
735
433
        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
755
 
    
756
 
    @staticmethod
757
 
    def _datetime_to_dbus(dt, variant_level=0):
758
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
759
 
        return dbus.String(dt.isoformat(),
760
 
                           variant_level=variant_level)
761
 
    
 
434
                                 ("/clients/"
 
435
                                  + self.name.replace(".", "_")))
 
436
        dbus.service.Object.__init__(self, bus,
 
437
                                     self.dbus_object_path)
762
438
    def enable(self):
763
439
        oldstate = getattr(self, "enabled", False)
764
440
        r = Client.enable(self)
765
441
        if oldstate != self.enabled:
766
442
            # Emit D-Bus signals
767
 
            self.PropertyChanged(dbus.String("Enabled"),
 
443
            self.PropertyChanged(dbus.String(u"enabled"),
768
444
                                 dbus.Boolean(True, variant_level=1))
769
 
            self.PropertyChanged(
770
 
                dbus.String("LastEnabled"),
771
 
                self._datetime_to_dbus(self.last_enabled,
772
 
                                       variant_level=1))
 
445
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
446
                                 (_datetime_to_dbus(self.last_enabled,
 
447
                                                    variant_level=1)))
773
448
        return r
774
449
    
775
 
    def disable(self, quiet = False):
 
450
    def disable(self, signal = True):
776
451
        oldstate = getattr(self, "enabled", False)
777
 
        r = Client.disable(self, quiet=quiet)
778
 
        if not quiet and oldstate != self.enabled:
 
452
        r = Client.disable(self)
 
453
        if signal and oldstate != self.enabled:
779
454
            # Emit D-Bus signal
780
 
            self.PropertyChanged(dbus.String("Enabled"),
 
455
            self.PropertyChanged(dbus.String(u"enabled"),
781
456
                                 dbus.Boolean(False, variant_level=1))
782
457
        return r
783
458
    
786
461
            self.remove_from_connection()
787
462
        except LookupError:
788
463
            pass
789
 
        if hasattr(DBusObjectWithProperties, "__del__"):
790
 
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
464
        if hasattr(dbus.service.Object, "__del__"):
 
465
            dbus.service.Object.__del__(self, *args, **kwargs)
791
466
        Client.__del__(self, *args, **kwargs)
792
467
    
793
468
    def checker_callback(self, pid, condition, command,
795
470
        self.checker_callback_tag = None
796
471
        self.checker = None
797
472
        # Emit D-Bus signal
798
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
473
        self.PropertyChanged(dbus.String(u"checker_running"),
799
474
                             dbus.Boolean(False, variant_level=1))
800
475
        if os.WIFEXITED(condition):
801
476
            exitstatus = os.WEXITSTATUS(condition)
816
491
        r = Client.checked_ok(self, *args, **kwargs)
817
492
        # Emit D-Bus signal
818
493
        self.PropertyChanged(
819
 
            dbus.String("LastCheckedOK"),
820
 
            (self._datetime_to_dbus(self.last_checked_ok,
821
 
                                    variant_level=1)))
822
 
        return r
823
 
    
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)))
 
494
            dbus.String(u"last_checked_ok"),
 
495
            (_datetime_to_dbus(self.last_checked_ok,
 
496
                               variant_level=1)))
831
497
        return r
832
498
    
833
499
    def start_checker(self, *args, **kwargs):
843
509
            # Emit D-Bus signal
844
510
            self.CheckerStarted(self.current_checker_command)
845
511
            self.PropertyChanged(
846
 
                dbus.String("CheckerRunning"),
 
512
                dbus.String("checker_running"),
847
513
                dbus.Boolean(True, variant_level=1))
848
514
        return r
849
515
    
852
518
        r = Client.stop_checker(self, *args, **kwargs)
853
519
        if (old_checker is not None
854
520
            and getattr(self, "checker", None) is None):
855
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
521
            self.PropertyChanged(dbus.String(u"checker_running"),
856
522
                                 dbus.Boolean(False, variant_level=1))
857
523
        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
 
524
    
 
525
    ## D-Bus methods & signals
 
526
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
527
    
 
528
    # CheckedOK - method
 
529
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
530
    CheckedOK.__name__ = "CheckedOK"
875
531
    
876
532
    # CheckerCompleted - signal
877
533
    @dbus.service.signal(_interface, signature="nxs")
885
541
        "D-Bus signal"
886
542
        pass
887
543
    
 
544
    # GetAllProperties - method
 
545
    @dbus.service.method(_interface, out_signature="a{sv}")
 
546
    def GetAllProperties(self):
 
547
        "D-Bus method"
 
548
        return dbus.Dictionary({
 
549
                dbus.String("name"):
 
550
                    dbus.String(self.name, variant_level=1),
 
551
                dbus.String("fingerprint"):
 
552
                    dbus.String(self.fingerprint, variant_level=1),
 
553
                dbus.String("host"):
 
554
                    dbus.String(self.host, variant_level=1),
 
555
                dbus.String("created"):
 
556
                    _datetime_to_dbus(self.created, variant_level=1),
 
557
                dbus.String("last_enabled"):
 
558
                    (_datetime_to_dbus(self.last_enabled,
 
559
                                       variant_level=1)
 
560
                     if self.last_enabled is not None
 
561
                     else dbus.Boolean(False, variant_level=1)),
 
562
                dbus.String("enabled"):
 
563
                    dbus.Boolean(self.enabled, variant_level=1),
 
564
                dbus.String("last_checked_ok"):
 
565
                    (_datetime_to_dbus(self.last_checked_ok,
 
566
                                       variant_level=1)
 
567
                     if self.last_checked_ok is not None
 
568
                     else dbus.Boolean (False, variant_level=1)),
 
569
                dbus.String("timeout"):
 
570
                    dbus.UInt64(self.timeout_milliseconds(),
 
571
                                variant_level=1),
 
572
                dbus.String("interval"):
 
573
                    dbus.UInt64(self.interval_milliseconds(),
 
574
                                variant_level=1),
 
575
                dbus.String("checker"):
 
576
                    dbus.String(self.checker_command,
 
577
                                variant_level=1),
 
578
                dbus.String("checker_running"):
 
579
                    dbus.Boolean(self.checker is not None,
 
580
                                 variant_level=1),
 
581
                dbus.String("object_path"):
 
582
                    dbus.ObjectPath(self.dbus_object_path,
 
583
                                    variant_level=1)
 
584
                }, signature="sv")
 
585
    
 
586
    # IsStillValid - method
 
587
    @dbus.service.method(_interface, out_signature="b")
 
588
    def IsStillValid(self):
 
589
        return self.still_valid()
 
590
    
888
591
    # PropertyChanged - signal
889
592
    @dbus.service.signal(_interface, signature="sv")
890
593
    def PropertyChanged(self, property, value):
891
594
        "D-Bus signal"
892
595
        pass
893
596
    
894
 
    # GotSecret - signal
 
597
    # ReceivedSecret - signal
895
598
    @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
 
        """
 
599
    def ReceivedSecret(self):
 
600
        "D-Bus signal"
901
601
        pass
902
602
    
903
603
    # Rejected - signal
904
 
    @dbus.service.signal(_interface, signature="s")
905
 
    def Rejected(self, reason):
 
604
    @dbus.service.signal(_interface)
 
605
    def Rejected(self):
906
606
        "D-Bus signal"
907
607
        pass
908
608
    
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()
 
609
    # SetChecker - method
 
610
    @dbus.service.method(_interface, in_signature="s")
 
611
    def SetChecker(self, checker):
 
612
        "D-Bus setter method"
 
613
        self.checker_command = checker
 
614
        # Emit D-Bus signal
 
615
        self.PropertyChanged(dbus.String(u"checker"),
 
616
                             dbus.String(self.checker_command,
 
617
                                         variant_level=1))
 
618
    
 
619
    # SetHost - method
 
620
    @dbus.service.method(_interface, in_signature="s")
 
621
    def SetHost(self, host):
 
622
        "D-Bus setter method"
 
623
        self.host = host
 
624
        # Emit D-Bus signal
 
625
        self.PropertyChanged(dbus.String(u"host"),
 
626
                             dbus.String(self.host, variant_level=1))
 
627
    
 
628
    # SetInterval - method
 
629
    @dbus.service.method(_interface, in_signature="t")
 
630
    def SetInterval(self, milliseconds):
 
631
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
632
        # Emit D-Bus signal
 
633
        self.PropertyChanged(dbus.String(u"interval"),
 
634
                             (dbus.UInt64(self.interval_milliseconds(),
 
635
                                          variant_level=1)))
 
636
    
 
637
    # SetSecret - method
 
638
    @dbus.service.method(_interface, in_signature="ay",
 
639
                         byte_arrays=True)
 
640
    def SetSecret(self, secret):
 
641
        "D-Bus setter method"
 
642
        self.secret = str(secret)
 
643
    
 
644
    # SetTimeout - method
 
645
    @dbus.service.method(_interface, in_signature="t")
 
646
    def SetTimeout(self, milliseconds):
 
647
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
648
        # Emit D-Bus signal
 
649
        self.PropertyChanged(dbus.String(u"timeout"),
 
650
                             (dbus.UInt64(self.timeout_milliseconds(),
 
651
                                          variant_level=1)))
926
652
    
927
653
    # Enable - method
928
 
    @dbus.service.method(_interface)
929
 
    def Enable(self):
930
 
        "D-Bus method"
931
 
        self.enable()
 
654
    Enable = dbus.service.method(_interface)(enable)
 
655
    Enable.__name__ = "Enable"
932
656
    
933
657
    # StartChecker - method
934
658
    @dbus.service.method(_interface)
943
667
        self.disable()
944
668
    
945
669
    # StopChecker - method
946
 
    @dbus.service.method(_interface)
947
 
    def StopChecker(self):
948
 
        self.stop_checker()
949
 
    
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)
 
670
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
671
    StopChecker.__name__ = "StopChecker"
1135
672
    
1136
673
    del _interface
1137
674
 
1138
675
 
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
 
class ClientHandler(socketserver.BaseRequestHandler, object):
1166
 
    """A class to handle client connections.
1167
 
    
1168
 
    Instantiated once for each connection to handle it.
 
676
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
677
    """A TCP request handler class.
 
678
    Instantiated by IPv6_TCPServer for each request to handle it.
1169
679
    Note: This will run in its own forked process."""
1170
680
    
1171
681
    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
 
 
 
682
        logger.info(u"TCP connection from: %s",
 
683
                    unicode(self.client_address))
 
684
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
 
685
        # Open IPC pipe to parent process
 
686
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
1178
687
            session = (gnutls.connection
1179
688
                       .ClientSession(self.request,
1180
689
                                      gnutls.connection
1181
690
                                      .X509Credentials()))
1182
 
 
 
691
            
 
692
            line = self.request.makefile().readline()
 
693
            logger.debug(u"Protocol version: %r", line)
 
694
            try:
 
695
                if int(line.strip().split()[0]) > 1:
 
696
                    raise RuntimeError
 
697
            except (ValueError, IndexError, RuntimeError), error:
 
698
                logger.error(u"Unknown protocol version: %s", error)
 
699
                return
 
700
            
1183
701
            # Note: gnutls.connection.X509Credentials is really a
1184
702
            # generic GnuTLS certificate credentials object so long as
1185
703
            # no X.509 keys are added to it.  Therefore, we can use it
1186
704
            # here despite using OpenPGP certificates.
1187
 
 
 
705
            
1188
706
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
 
            #                      "+AES-256-CBC", "+SHA1",
1190
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1191
 
            #                      "+DHE-DSS"))
 
707
            #                     "+AES-256-CBC", "+SHA1",
 
708
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
 
709
            #                     "+DHE-DSS"))
1192
710
            # Use a fallback default, since this MUST be set.
1193
 
            priority = self.server.gnutls_priority
1194
 
            if priority is None:
1195
 
                priority = "NORMAL"
 
711
            priority = self.server.settings.get("priority", "NORMAL")
1196
712
            (gnutls.library.functions
1197
713
             .gnutls_priority_set_direct(session._c_object,
1198
714
                                         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
 
715
            
1212
716
            try:
1213
717
                session.handshake()
1214
718
            except gnutls.errors.GNUTLSError, error:
1215
 
                logger.warning("Handshake failed: %s", error)
 
719
                logger.warning(u"Handshake failed: %s", error)
1216
720
                # Do not run session.bye() here: the session is not
1217
721
                # established.  Just abandon the request.
1218
722
                return
1219
 
            logger.debug("Handshake succeeded")
1220
 
 
1221
 
            approval_required = False
 
723
            logger.debug(u"Handshake succeeded")
1222
724
            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()
 
725
                fpr = self.fingerprint(self.peer_certificate(session))
 
726
            except (TypeError, gnutls.errors.GNUTLSError), error:
 
727
                logger.warning(u"Bad certificate: %s", error)
 
728
                session.bye()
 
729
                return
 
730
            logger.debug(u"Fingerprint: %s", fpr)
1309
731
            
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")
 
732
            for c in self.server.clients:
 
733
                if c.fingerprint == fpr:
 
734
                    client = c
 
735
                    break
 
736
            else:
 
737
                ipc.write("NOTFOUND %s\n" % fpr)
 
738
                session.bye()
 
739
                return
 
740
            # Have to check if client.still_valid(), since it is
 
741
            # possible that the client timed out while establishing
 
742
            # the GnuTLS session.
 
743
            if not client.still_valid():
 
744
                ipc.write("INVALID %s\n" % client.name)
 
745
                session.bye()
 
746
                return
 
747
            ipc.write("SENDING %s\n" % client.name)
 
748
            sent_size = 0
 
749
            while sent_size < len(client.secret):
 
750
                sent = session.send(client.secret[sent_size:])
 
751
                logger.debug(u"Sent: %d, remaining: %d",
 
752
                             sent, len(client.secret)
 
753
                             - (sent_size + sent))
 
754
                sent_size += sent
 
755
            session.bye()
1317
756
    
1318
757
    @staticmethod
1319
758
    def peer_certificate(session):
1375
814
        # Convert the buffer to a Python bytestring
1376
815
        fpr = ctypes.string_at(buf, buf_len.value)
1377
816
        # Convert the bytestring to hexadecimal notation
1378
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
817
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1379
818
        return hex_fpr
1380
819
 
1381
820
 
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 """
 
821
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
 
822
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
 
823
    Assumes a gobject.MainLoop event loop.
 
824
    """
1398
825
    def process_request(self, request, client_address):
1399
 
        """Overrides and wraps the original process_request().
1400
 
        
1401
 
        This function creates a new pipe in self.pipe
 
826
        """This overrides and wraps the original process_request().
 
827
        This function creates a new pipe in self.pipe 
1402
828
        """
1403
 
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1404
 
 
1405
 
        super(MultiprocessingMixInWithPipe,
 
829
        self.pipe = os.pipe()
 
830
        super(ForkingMixInWithPipe,
1406
831
              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):
 
832
        os.close(self.pipe[1])  # close write end
 
833
        # Call "handle_ipc" for both data and EOF events
 
834
        gobject.io_add_watch(self.pipe[0],
 
835
                             gobject.IO_IN | gobject.IO_HUP,
 
836
                             self.handle_ipc)
 
837
    def handle_ipc(source, condition):
1411
838
        """Dummy function; override as necessary"""
1412
 
        raise NotImplementedError
1413
 
 
1414
 
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1415
 
                     socketserver.TCPServer, object):
 
839
        os.close(source)
 
840
        return False
 
841
 
 
842
 
 
843
class IPv6_TCPServer(ForkingMixInWithPipe,
 
844
                     SocketServer.TCPServer, object):
1416
845
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1417
 
    
1418
846
    Attributes:
 
847
        settings:       Server settings
 
848
        clients:        Set() of Client objects
1419
849
        enabled:        Boolean; whether this server is activated yet
1420
 
        interface:      None or a network interface name (string)
1421
 
        use_ipv6:       Boolean; to use IPv6 or not
1422
850
    """
1423
 
    def __init__(self, server_address, RequestHandlerClass,
1424
 
                 interface=None, use_ipv6=True):
1425
 
        self.interface = interface
1426
 
        if use_ipv6:
1427
 
            self.address_family = socket.AF_INET6
1428
 
        socketserver.TCPServer.__init__(self, server_address,
1429
 
                                        RequestHandlerClass)
 
851
    address_family = socket.AF_INET6
 
852
    def __init__(self, *args, **kwargs):
 
853
        if "settings" in kwargs:
 
854
            self.settings = kwargs["settings"]
 
855
            del kwargs["settings"]
 
856
        if "clients" in kwargs:
 
857
            self.clients = kwargs["clients"]
 
858
            del kwargs["clients"]
 
859
        if "use_ipv6" in kwargs:
 
860
            if not kwargs["use_ipv6"]:
 
861
                self.address_family = socket.AF_INET
 
862
            del kwargs["use_ipv6"]
 
863
        self.enabled = False
 
864
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1430
865
    def server_bind(self):
1431
866
        """This overrides the normal server_bind() function
1432
867
        to bind to an interface if one was specified, and also NOT to
1433
868
        bind to an address or port if they were not specified."""
1434
 
        if self.interface is not None:
1435
 
            if SO_BINDTODEVICE is None:
1436
 
                logger.error("SO_BINDTODEVICE does not exist;"
1437
 
                             " cannot bind to interface %s",
1438
 
                             self.interface)
1439
 
            else:
1440
 
                try:
1441
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1442
 
                                           SO_BINDTODEVICE,
1443
 
                                           str(self.interface
1444
 
                                               + '\0'))
1445
 
                except socket.error, error:
1446
 
                    if error[0] == errno.EPERM:
1447
 
                        logger.error("No permission to"
1448
 
                                     " bind to interface %s",
1449
 
                                     self.interface)
1450
 
                    elif error[0] == errno.ENOPROTOOPT:
1451
 
                        logger.error("SO_BINDTODEVICE not available;"
1452
 
                                     " cannot bind to interface %s",
1453
 
                                     self.interface)
1454
 
                    else:
1455
 
                        raise
 
869
        if self.settings["interface"]:
 
870
            # 25 is from /usr/include/asm-i486/socket.h
 
871
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
 
872
            try:
 
873
                self.socket.setsockopt(socket.SOL_SOCKET,
 
874
                                       SO_BINDTODEVICE,
 
875
                                       self.settings["interface"])
 
876
            except socket.error, error:
 
877
                if error[0] == errno.EPERM:
 
878
                    logger.error(u"No permission to"
 
879
                                 u" bind to interface %s",
 
880
                                 self.settings["interface"])
 
881
                else:
 
882
                    raise
1456
883
        # Only bind(2) the socket if we really need to.
1457
884
        if self.server_address[0] or self.server_address[1]:
1458
885
            if not self.server_address[0]:
1465
892
            elif not self.server_address[1]:
1466
893
                self.server_address = (self.server_address[0],
1467
894
                                       0)
1468
 
#                 if self.interface:
 
895
#                 if self.settings["interface"]:
1469
896
#                     self.server_address = (self.server_address[0],
1470
897
#                                            0, # port
1471
898
#                                            0, # flowinfo
1472
899
#                                            if_nametoindex
1473
 
#                                            (self.interface))
1474
 
            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)
 
900
#                                            (self.settings
 
901
#                                             ["interface"]))
 
902
            return super(IPv6_TCPServer, self).server_bind()
1500
903
    def server_activate(self):
1501
904
        if self.enabled:
1502
 
            return socketserver.TCPServer.server_activate(self)
 
905
            return super(IPv6_TCPServer, self).server_activate()
1503
906
    def enable(self):
1504
907
        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):
 
908
    def handle_ipc(self, source, condition, file_objects={}):
1514
909
        condition_names = {
1515
 
            gobject.IO_IN: "IN",   # There is data to read.
 
910
            gobject.IO_IN: "IN", # There is data to read.
1516
911
            gobject.IO_OUT: "OUT", # Data can be written (without
1517
 
                                    # blocking).
 
912
                                   # blocking).
1518
913
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
914
            gobject.IO_ERR: "ERR", # Error condition.
1520
915
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1521
 
                                    # broken, usually for pipes and
1522
 
                                    # sockets).
 
916
                                   # broken, usually for pipes and
 
917
                                   # sockets).
1523
918
            }
1524
919
        conditions_string = ' | '.join(name
1525
920
                                       for cond, name in
1526
921
                                       condition_names.iteritems()
1527
922
                                       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
 
 
 
923
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
 
924
                     conditions_string)
 
925
        
 
926
        # Turn the pipe file descriptor into a Python file object
 
927
        if source not in file_objects:
 
928
            file_objects[source] = os.fdopen(source, "r", 1)
 
929
        
 
930
        # Read a line from the file object
 
931
        cmdline = file_objects[source].readline()
 
932
        if not cmdline:             # Empty line means end of file
 
933
            # close the IPC pipe
 
934
            file_objects[source].close()
 
935
            del file_objects[source]
 
936
            
 
937
            # Stop calling this function
 
938
            return False
 
939
        
 
940
        logger.debug("IPC command: %r", cmdline)
 
941
        
 
942
        # Parse and act on command
 
943
        cmd, args = cmdline.rstrip("\r\n").split(None, 1)
 
944
        
 
945
        if cmd == "NOTFOUND":
 
946
            logger.warning(u"Client not found for fingerprint: %s",
 
947
                           args)
 
948
            if self.settings["use_dbus"]:
 
949
                # Emit D-Bus signal
 
950
                mandos_dbus_service.ClientNotFound(args)
 
951
        elif cmd == "INVALID":
 
952
            for client in self.clients:
 
953
                if client.name == args:
 
954
                    logger.warning(u"Client %s is invalid", args)
 
955
                    if self.settings["use_dbus"]:
 
956
                        # Emit D-Bus signal
 
957
                        client.Rejected()
 
958
                    break
 
959
            else:
 
960
                logger.error(u"Unknown client %s is invalid", args)
 
961
        elif cmd == "SENDING":
 
962
            for client in self.clients:
 
963
                if client.name == args:
 
964
                    logger.info(u"Sending secret to %s", client.name)
 
965
                    client.checked_ok()
 
966
                    if self.settings["use_dbus"]:
 
967
                        # Emit D-Bus signal
 
968
                        client.ReceivedSecret()
 
969
                    break
 
970
            else:
 
971
                logger.error(u"Sending secret to unknown client %s",
 
972
                             args)
 
973
        else:
 
974
            logger.error("Unknown IPC command: %r", cmdline)
 
975
        
 
976
        # Keep calling this function
1580
977
        return True
1581
978
 
1582
979
 
1591
988
    datetime.timedelta(0, 3600)
1592
989
    >>> string_to_delta('24h')
1593
990
    datetime.timedelta(1)
1594
 
    >>> string_to_delta('1w')
 
991
    >>> string_to_delta(u'1w')
1595
992
    datetime.timedelta(7)
1596
993
    >>> string_to_delta('5m 30s')
1597
994
    datetime.timedelta(0, 330)
1601
998
        try:
1602
999
            suffix = unicode(s[-1])
1603
1000
            value = int(s[:-1])
1604
 
            if suffix == "d":
 
1001
            if suffix == u"d":
1605
1002
                delta = datetime.timedelta(value)
1606
 
            elif suffix == "s":
 
1003
            elif suffix == u"s":
1607
1004
                delta = datetime.timedelta(0, value)
1608
 
            elif suffix == "m":
 
1005
            elif suffix == u"m":
1609
1006
                delta = datetime.timedelta(0, 0, 0, 0, value)
1610
 
            elif suffix == "h":
 
1007
            elif suffix == u"h":
1611
1008
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1612
 
            elif suffix == "w":
 
1009
            elif suffix == u"w":
1613
1010
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1614
1011
            else:
1615
 
                raise ValueError("Unknown suffix %r" % suffix)
1616
 
        except (ValueError, IndexError), e:
1617
 
            raise ValueError(*(e.args))
 
1012
                raise ValueError
 
1013
        except (ValueError, IndexError):
 
1014
            raise ValueError
1618
1015
        timevalue += delta
1619
1016
    return timevalue
1620
1017
 
1621
1018
 
 
1019
def server_state_changed(state):
 
1020
    """Derived from the Avahi example code"""
 
1021
    if state == avahi.SERVER_COLLISION:
 
1022
        logger.error(u"Zeroconf server name collision")
 
1023
        service.remove()
 
1024
    elif state == avahi.SERVER_RUNNING:
 
1025
        service.add()
 
1026
 
 
1027
 
 
1028
def entry_group_state_changed(state, error):
 
1029
    """Derived from the Avahi example code"""
 
1030
    logger.debug(u"Avahi state change: %i", state)
 
1031
    
 
1032
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
1033
        logger.debug(u"Zeroconf service established.")
 
1034
    elif state == avahi.ENTRY_GROUP_COLLISION:
 
1035
        logger.warning(u"Zeroconf service name collision.")
 
1036
        service.rename()
 
1037
    elif state == avahi.ENTRY_GROUP_FAILURE:
 
1038
        logger.critical(u"Avahi: Error in group state changed %s",
 
1039
                        unicode(error))
 
1040
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
1041
 
1622
1042
def if_nametoindex(interface):
1623
 
    """Call the C function if_nametoindex(), or equivalent
1624
 
    
1625
 
    Note: This function cannot accept a unicode string."""
 
1043
    """Call the C function if_nametoindex(), or equivalent"""
1626
1044
    global if_nametoindex
1627
1045
    try:
1628
1046
        if_nametoindex = (ctypes.cdll.LoadLibrary
1629
1047
                          (ctypes.util.find_library("c"))
1630
1048
                          .if_nametoindex)
1631
1049
    except (OSError, AttributeError):
1632
 
        logger.warning("Doing if_nametoindex the hard way")
 
1050
        if "struct" not in sys.modules:
 
1051
            import struct
 
1052
        if "fcntl" not in sys.modules:
 
1053
            import fcntl
1633
1054
        def if_nametoindex(interface):
1634
1055
            "Get an interface index the hard way, i.e. using fcntl()"
1635
1056
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1636
 
            with contextlib.closing(socket.socket()) as s:
 
1057
            with closing(socket.socket()) as s:
1637
1058
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
 
                                    struct.pack(str("16s16x"),
1639
 
                                                interface))
1640
 
            interface_index = struct.unpack(str("I"),
1641
 
                                            ifreq[16:20])[0]
 
1059
                                    struct.pack("16s16x", interface))
 
1060
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1642
1061
            return interface_index
1643
1062
    return if_nametoindex(interface)
1644
1063
 
1645
1064
 
1646
1065
def daemon(nochdir = False, noclose = False):
1647
1066
    """See daemon(3).  Standard BSD Unix function.
1648
 
    
1649
1067
    This should really exist as os.daemon, but it doesn't (yet)."""
1650
1068
    if os.fork():
1651
1069
        sys.exit()
1659
1077
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1660
1078
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1661
1079
            raise OSError(errno.ENODEV,
1662
 
                          "%s not a character device"
1663
 
                          % os.path.devnull)
 
1080
                          "/dev/null not a character device")
1664
1081
        os.dup2(null, sys.stdin.fileno())
1665
1082
        os.dup2(null, sys.stdout.fileno())
1666
1083
        os.dup2(null, sys.stderr.fileno())
1670
1087
 
1671
1088
def main():
1672
1089
    
1673
 
    ##################################################################
 
1090
    ######################################################################
1674
1091
    # Parsing of options, both command line and config file
1675
1092
    
1676
1093
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1685
1102
    parser.add_option("--debug", action="store_true",
1686
1103
                      help="Debug mode; run in foreground and log to"
1687
1104
                      " terminal")
1688
 
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
 
                      help="Debug level for stdout output")
1690
1105
    parser.add_option("--priority", type="string", help="GnuTLS"
1691
1106
                      " priority string (see GnuTLS documentation)")
1692
 
    parser.add_option("--servicename", type="string",
1693
 
                      metavar="NAME", help="Zeroconf service name")
 
1107
    parser.add_option("--servicename", type="string", metavar="NAME",
 
1108
                      help="Zeroconf service name")
1694
1109
    parser.add_option("--configdir", type="string",
1695
1110
                      default="/etc/mandos", metavar="DIR",
1696
1111
                      help="Directory to search for configuration"
1697
1112
                      " files")
1698
1113
    parser.add_option("--no-dbus", action="store_false",
1699
 
                      dest="use_dbus", help="Do not provide D-Bus"
1700
 
                      " system bus interface")
 
1114
                      dest="use_dbus",
 
1115
                      help="Do not provide D-Bus system bus"
 
1116
                      " interface")
1701
1117
    parser.add_option("--no-ipv6", action="store_false",
1702
1118
                      dest="use_ipv6", help="Do not use IPv6")
1703
1119
    options = parser.parse_args()[0]
1717
1133
                        "servicename": "Mandos",
1718
1134
                        "use_dbus": "True",
1719
1135
                        "use_ipv6": "True",
1720
 
                        "debuglevel": "",
1721
1136
                        }
1722
1137
    
1723
1138
    # Parse config file for server-global settings
1724
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
1139
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1725
1140
    del server_defaults
1726
 
    server_config.read(os.path.join(options.configdir,
1727
 
                                    "mandos.conf"))
 
1141
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1728
1142
    # Convert the SafeConfigParser object to a dict
1729
1143
    server_settings = server_config.defaults()
1730
1144
    # 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",
1733
 
                                                           option)
 
1145
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
1146
                                                        "debug")
 
1147
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
1148
                                                           "use_dbus")
 
1149
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
1150
                                                           "use_ipv6")
1734
1151
    if server_settings["port"]:
1735
1152
        server_settings["port"] = server_config.getint("DEFAULT",
1736
1153
                                                       "port")
1740
1157
    # options, if set.
1741
1158
    for option in ("interface", "address", "port", "debug",
1742
1159
                   "priority", "servicename", "configdir",
1743
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1160
                   "use_dbus", "use_ipv6"):
1744
1161
        value = getattr(options, option)
1745
1162
        if value is not None:
1746
1163
            server_settings[option] = value
1747
1164
    del options
1748
 
    # Force all strings to be unicode
1749
 
    for option in server_settings.keys():
1750
 
        if type(server_settings[option]) is str:
1751
 
            server_settings[option] = unicode(server_settings[option])
1752
1165
    # Now we have our good server settings in "server_settings"
1753
1166
    
1754
1167
    ##################################################################
1755
1168
    
1756
1169
    # For convenience
1757
1170
    debug = server_settings["debug"]
1758
 
    debuglevel = server_settings["debuglevel"]
1759
1171
    use_dbus = server_settings["use_dbus"]
1760
1172
    use_ipv6 = server_settings["use_ipv6"]
1761
 
 
 
1173
    
 
1174
    if not debug:
 
1175
        syslogger.setLevel(logging.WARNING)
 
1176
        console.setLevel(logging.WARNING)
 
1177
    
1762
1178
    if server_settings["servicename"] != "Mandos":
1763
1179
        syslogger.setFormatter(logging.Formatter
1764
1180
                               ('Mandos (%s) [%%(process)d]:'
1770
1186
                        "interval": "5m",
1771
1187
                        "checker": "fping -q -- %%(host)s",
1772
1188
                        "host": "",
1773
 
                        "approval_delay": "0s",
1774
 
                        "approval_duration": "1s",
1775
1189
                        }
1776
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
1190
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1777
1191
    client_config.read(os.path.join(server_settings["configdir"],
1778
1192
                                    "clients.conf"))
1779
 
    
 
1193
 
1780
1194
    global mandos_dbus_service
1781
1195
    mandos_dbus_service = None
1782
1196
    
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)
 
1197
    clients = Set()
 
1198
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
1199
                                 server_settings["port"]),
 
1200
                                TCP_handler,
 
1201
                                settings=server_settings,
 
1202
                                clients=clients, use_ipv6=use_ipv6)
 
1203
    pidfilename = "/var/run/mandos.pid"
 
1204
    try:
 
1205
        pidfile = open(pidfilename, "w")
 
1206
    except IOError:
 
1207
        logger.error("Could not open file %r", pidfilename)
1798
1208
    
1799
1209
    try:
1800
1210
        uid = pwd.getpwnam("_mandos").pw_uid
1806
1216
        except KeyError:
1807
1217
            try:
1808
1218
                uid = pwd.getpwnam("nobody").pw_uid
1809
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1219
                gid = pwd.getpwnam("nogroup").pw_gid
1810
1220
            except KeyError:
1811
1221
                uid = 65534
1812
1222
                gid = 65534
1817
1227
        if error[0] != errno.EPERM:
1818
1228
            raise error
1819
1229
    
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
 
 
 
1230
    # Enable all possible GnuTLS debugging
1828
1231
    if debug:
1829
 
        # Enable all possible GnuTLS debugging
1830
 
        
1831
1232
        # "Use a log level over 10 to enable all debugging options."
1832
1233
        # - GnuTLS manual
1833
1234
        gnutls.library.functions.gnutls_global_set_log_level(11)
1838
1239
        
1839
1240
        (gnutls.library.functions
1840
1241
         .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
1242
    
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()
 
1243
    global service
 
1244
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1245
    service = AvahiService(name = server_settings["servicename"],
 
1246
                           servicetype = "_mandos._tcp",
 
1247
                           protocol = protocol)
 
1248
    if server_settings["interface"]:
 
1249
        service.interface = (if_nametoindex
 
1250
                             (server_settings["interface"]))
1855
1251
    
1856
1252
    global main_loop
 
1253
    global bus
 
1254
    global server
1857
1255
    # From the Avahi example code
1858
1256
    DBusGMainLoop(set_as_default=True )
1859
1257
    main_loop = gobject.MainLoop()
1860
1258
    bus = dbus.SystemBus()
 
1259
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1260
                                           avahi.DBUS_PATH_SERVER),
 
1261
                            avahi.DBUS_INTERFACE_SERVER)
1861
1262
    # End of Avahi example code
1862
1263
    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
1871
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1872
 
    service = AvahiService(name = server_settings["servicename"],
1873
 
                           servicetype = "_mandos._tcp",
1874
 
                           protocol = protocol, bus = bus)
1875
 
    if server_settings["interface"]:
1876
 
        service.interface = (if_nametoindex
1877
 
                             (str(server_settings["interface"])))
1878
 
    
1879
 
    global multiprocessing_manager
1880
 
    multiprocessing_manager = multiprocessing.Manager()
 
1264
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1881
1265
    
1882
1266
    client_class = Client
1883
1267
    if use_dbus:
1884
 
        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(
 
1268
        client_class = ClientDBus
 
1269
    clients.update(Set(
1898
1270
            client_class(name = section,
1899
 
                         config= dict(client_config_items(
1900
 
                        client_config, section)))
 
1271
                         config= dict(client_config.items(section)))
1901
1272
            for section in client_config.sections()))
1902
 
    if not tcp_server.clients:
1903
 
        logger.warning("No clients defined")
 
1273
    if not clients:
 
1274
        logger.warning(u"No clients defined")
 
1275
    
 
1276
    if debug:
 
1277
        # Redirect stdin so all checkers get /dev/null
 
1278
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1279
        os.dup2(null, sys.stdin.fileno())
 
1280
        if null > 2:
 
1281
            os.close(null)
 
1282
    else:
 
1283
        # No console logging
 
1284
        logger.removeHandler(console)
 
1285
        # Close all input and output, do double fork, etc.
 
1286
        daemon()
 
1287
    
 
1288
    try:
 
1289
        with closing(pidfile):
 
1290
            pid = os.getpid()
 
1291
            pidfile.write(str(pid) + "\n")
 
1292
        del pidfile
 
1293
    except IOError:
 
1294
        logger.error(u"Could not write to file %r with PID %d",
 
1295
                     pidfilename, pid)
 
1296
    except NameError:
 
1297
        # "pidfile" was never created
 
1298
        pass
 
1299
    del pidfilename
 
1300
    
 
1301
    def cleanup():
 
1302
        "Cleanup function; run on exit"
 
1303
        global group
 
1304
        # From the Avahi example code
 
1305
        if not group is None:
 
1306
            group.Free()
 
1307
            group = None
 
1308
        # End of Avahi example code
1904
1309
        
 
1310
        while clients:
 
1311
            client = clients.pop()
 
1312
            client.disable_hook = None
 
1313
            client.disable()
 
1314
    
 
1315
    atexit.register(cleanup)
 
1316
    
1905
1317
    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
1318
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1920
 
 
1921
1319
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1922
1320
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1923
1321
    
1926
1324
            """A D-Bus proxy object"""
1927
1325
            def __init__(self):
1928
1326
                dbus.service.Object.__init__(self, bus, "/")
1929
 
            _interface = "se.bsnet.fukt.Mandos"
 
1327
            _interface = u"se.bsnet.fukt.Mandos"
1930
1328
            
1931
 
            @dbus.service.signal(_interface, signature="o")
1932
 
            def ClientAdded(self, objpath):
 
1329
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1330
            def ClientAdded(self, objpath, properties):
1933
1331
                "D-Bus signal"
1934
1332
                pass
1935
1333
            
1936
 
            @dbus.service.signal(_interface, signature="ss")
1937
 
            def ClientNotFound(self, fingerprint, address):
 
1334
            @dbus.service.signal(_interface, signature="s")
 
1335
            def ClientNotFound(self, fingerprint):
1938
1336
                "D-Bus signal"
1939
1337
                pass
1940
1338
            
1946
1344
            @dbus.service.method(_interface, out_signature="ao")
1947
1345
            def GetAllClients(self):
1948
1346
                "D-Bus method"
1949
 
                return dbus.Array(c.dbus_object_path
1950
 
                                  for c in tcp_server.clients)
 
1347
                return dbus.Array(c.dbus_object_path for c in clients)
1951
1348
            
1952
 
            @dbus.service.method(_interface,
1953
 
                                 out_signature="a{oa{sv}}")
 
1349
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1954
1350
            def GetAllClientsWithProperties(self):
1955
1351
                "D-Bus method"
1956
1352
                return dbus.Dictionary(
1957
 
                    ((c.dbus_object_path, c.GetAll(""))
1958
 
                     for c in tcp_server.clients),
 
1353
                    ((c.dbus_object_path, c.GetAllProperties())
 
1354
                     for c in clients),
1959
1355
                    signature="oa{sv}")
1960
1356
            
1961
1357
            @dbus.service.method(_interface, in_signature="o")
1962
1358
            def RemoveClient(self, object_path):
1963
1359
                "D-Bus method"
1964
 
                for c in tcp_server.clients:
 
1360
                for c in clients:
1965
1361
                    if c.dbus_object_path == object_path:
1966
 
                        tcp_server.clients.remove(c)
 
1362
                        clients.remove(c)
1967
1363
                        c.remove_from_connection()
1968
1364
                        # Don't signal anything except ClientRemoved
1969
 
                        c.disable(quiet=True)
 
1365
                        c.disable(signal=False)
1970
1366
                        # Emit D-Bus signal
1971
1367
                        self.ClientRemoved(object_path, c.name)
1972
1368
                        return
1973
 
                raise KeyError(object_path)
 
1369
                raise KeyError
1974
1370
            
1975
1371
            del _interface
1976
1372
        
1977
1373
        mandos_dbus_service = MandosDBusService()
1978
1374
    
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:
 
1375
    for client in clients:
1998
1376
        if use_dbus:
1999
1377
            # Emit D-Bus signal
2000
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
1378
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
 
1379
                                            client.GetAllProperties())
2001
1380
        client.enable()
2002
1381
    
2003
1382
    tcp_server.enable()
2006
1385
    # Find out what port we got
2007
1386
    service.port = tcp_server.socket.getsockname()[1]
2008
1387
    if use_ipv6:
2009
 
        logger.info("Now listening on address %r, port %d,"
 
1388
        logger.info(u"Now listening on address %r, port %d,"
2010
1389
                    " flowinfo %d, scope_id %d"
2011
1390
                    % tcp_server.socket.getsockname())
2012
1391
    else:                       # IPv4
2013
 
        logger.info("Now listening on address %r, port %d"
 
1392
        logger.info(u"Now listening on address %r, port %d"
2014
1393
                    % tcp_server.socket.getsockname())
2015
1394
    
2016
1395
    #service.interface = tcp_server.socket.getsockname()[3]
2017
1396
    
2018
1397
    try:
2019
1398
        # From the Avahi example code
 
1399
        server.connect_to_signal("StateChanged", server_state_changed)
2020
1400
        try:
2021
 
            service.activate()
 
1401
            server_state_changed(server.GetState())
2022
1402
        except dbus.exceptions.DBusException, error:
2023
 
            logger.critical("DBusException: %s", error)
2024
 
            cleanup()
 
1403
            logger.critical(u"DBusException: %s", error)
2025
1404
            sys.exit(1)
2026
1405
        # End of Avahi example code
2027
1406
        
2030
1409
                             (tcp_server.handle_request
2031
1410
                              (*args[2:], **kwargs) or True))
2032
1411
        
2033
 
        logger.debug("Starting main loop")
 
1412
        logger.debug(u"Starting main loop")
2034
1413
        main_loop.run()
2035
1414
    except AvahiError, error:
2036
 
        logger.critical("AvahiError: %s", error)
2037
 
        cleanup()
 
1415
        logger.critical(u"AvahiError: %s", error)
2038
1416
        sys.exit(1)
2039
1417
    except KeyboardInterrupt:
2040
1418
        if debug:
2041
 
            print("", file=sys.stderr)
 
1419
            print >> sys.stderr
2042
1420
        logger.debug("Server received KeyboardInterrupt")
2043
1421
    logger.debug("Server exiting")
2044
 
    # Must run before the D-Bus bus name gets deregistered
2045
 
    cleanup()
2046
1422
 
2047
1423
if __name__ == '__main__':
2048
1424
    main()