/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-04-16 10:41:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416104141-19m1kqbwr5v1q416
Code cleanup.

* mandos: Move some global stuff into classes.
  (server, group): Moved into "AvahiService".  All users changed.
  (AvahiService.group, AvahiService.server): New attributes.
  (entry_group_state_changed, server_state_changed): Moved into
                                                     "AvahiService".
                                                     All callers
                                                     changed.
  (AvahiService.cleanup, AvahiService.activate): New.
  (_datetime_to_dbus): Moved into "ClientDBus".  All callers changed.
  (ClientDBus._datetime_to_dbus): New.

Show diffs side-by-side

added added

removed removed

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