/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 at bsnet
  • Date: 2010-09-23 20:14:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100923201408-4vcvjmml000fr8y5
* Makefile (DOCS): Added "plymouth.8mandos".
  (install-server): Also install "mandos-monitor.8" and
                    "mandos-ctl.8".
  (install-client-nokey): Also install "plymouth.8mandos".
  (uninstall-server): Also remove "mandos-monitor.8" and
                      "mandos-ctl.8".
  (uninstall-client): Also remove "plymouth.8mandos".
* plugins.d/plymouth.xml: New.

Show diffs side-by-side

added added

removed removed

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