/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-02-07 04:50:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090207045039-xkr6b80vtqwqrq8l
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
                                   "/scripts/local-top/mandos" to
                                   "/scripts/init-premount/mandos".
  (uninstall-client): - '' -
* debian/mandos-client.dirs: - '' -
* initramfs-tools-script (PREREQ): Added "udev".

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
9
 
# methods "add", "remove", "server_state_changed",
10
 
# "entry_group_state_changed", "cleanup", and "activate" in the
11
 
# "AvahiService" class, and some lines in "main".
 
9
# methods "add" and "remove" in the "AvahiService" class, the
 
10
# "server_state_changed" and "entry_group_state_changed" functions,
 
11
# and some lines in "main".
12
12
13
13
# Everything else is
14
14
# Copyright © 2008,2009 Teddy Hogeborn
33
33
 
34
34
from __future__ import division, with_statement, absolute_import
35
35
 
36
 
import SocketServer as socketserver
 
36
import 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 as configparser
 
47
import ConfigParser
48
48
import sys
49
49
import re
50
50
import os
51
51
import signal
 
52
from sets import Set
52
53
import subprocess
53
54
import atexit
54
55
import stat
56
57
import logging.handlers
57
58
import pwd
58
59
from contextlib import closing
59
 
import struct
60
 
import fcntl
61
 
import functools
62
60
 
63
61
import dbus
64
62
import dbus.service
68
66
import ctypes
69
67
import ctypes.util
70
68
 
71
 
try:
72
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
73
 
except AttributeError:
74
 
    try:
75
 
        from IN import SO_BINDTODEVICE
76
 
    except ImportError:
77
 
        SO_BINDTODEVICE = None
78
 
 
79
 
 
80
 
version = "1.0.12"
81
 
 
82
 
logger = logging.Logger(u'mandos')
 
69
version = "1.0.5"
 
70
 
 
71
logger = logging.Logger('mandos')
83
72
syslogger = (logging.handlers.SysLogHandler
84
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
85
74
              address = "/dev/log"))
86
75
syslogger.setFormatter(logging.Formatter
87
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
88
 
                        u' %(message)s'))
 
76
                       ('Mandos [%(process)d]: %(levelname)s:'
 
77
                        ' %(message)s'))
89
78
logger.addHandler(syslogger)
90
79
 
91
80
console = logging.StreamHandler()
92
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
 
                                       u' %(levelname)s:'
94
 
                                       u' %(message)s'))
 
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
82
                                       ' %(levelname)s: %(message)s'))
95
83
logger.addHandler(console)
96
84
 
97
85
class AvahiError(Exception):
110
98
 
111
99
class AvahiService(object):
112
100
    """An Avahi (Zeroconf) service.
113
 
    
114
101
    Attributes:
115
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
116
103
               Used to optionally bind to the specified interface.
117
 
    name: string; Example: u'Mandos'
118
 
    type: string; Example: u'_mandos._tcp'.
 
104
    name: string; Example: 'Mandos'
 
105
    type: string; Example: '_mandos._tcp'.
119
106
                  See <http://www.dns-sd.org/ServiceTypes.html>
120
107
    port: integer; what port to announce
121
108
    TXT: list of strings; TXT record for the service
124
111
    max_renames: integer; maximum number of renames
125
112
    rename_count: integer; counter so we only rename after collisions
126
113
                  a sensible number of times
127
 
    group: D-Bus Entry Group
128
 
    server: D-Bus Server
129
 
    bus: dbus.SystemBus()
130
114
    """
131
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
132
116
                 servicetype = None, port = None, TXT = None,
133
 
                 domain = u"", host = u"", max_renames = 32768,
134
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
117
                 domain = "", host = "", max_renames = 32768):
135
118
        self.interface = interface
136
119
        self.name = name
137
120
        self.type = servicetype
141
124
        self.host = host
142
125
        self.rename_count = 0
143
126
        self.max_renames = max_renames
144
 
        self.protocol = protocol
145
 
        self.group = None       # our entry group
146
 
        self.server = None
147
 
        self.bus = bus
148
127
    def rename(self):
149
128
        """Derived from the Avahi example code"""
150
129
        if self.rename_count >= self.max_renames:
152
131
                            u" after %i retries, exiting.",
153
132
                            self.rename_count)
154
133
            raise AvahiServiceError(u"Too many renames")
155
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
134
        self.name = server.GetAlternativeServiceName(self.name)
156
135
        logger.info(u"Changing Zeroconf service name to %r ...",
157
 
                    unicode(self.name))
 
136
                    str(self.name))
158
137
        syslogger.setFormatter(logging.Formatter
159
 
                               (u'Mandos (%s) [%%(process)d]:'
160
 
                                u' %%(levelname)s: %%(message)s'
161
 
                                % self.name))
 
138
                               ('Mandos (%s): %%(levelname)s:'
 
139
                                ' %%(message)s' % self.name))
162
140
        self.remove()
163
141
        self.add()
164
142
        self.rename_count += 1
165
143
    def remove(self):
166
144
        """Derived from the Avahi example code"""
167
 
        if self.group is not None:
168
 
            self.group.Reset()
 
145
        if group is not None:
 
146
            group.Reset()
169
147
    def add(self):
170
148
        """Derived from the Avahi example code"""
171
 
        if self.group is None:
172
 
            self.group = dbus.Interface(
173
 
                self.bus.get_object(avahi.DBUS_NAME,
174
 
                                    self.server.EntryGroupNew()),
175
 
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
 
            self.group.connect_to_signal('StateChanged',
177
 
                                         self.entry_group_state_changed)
 
149
        global group
 
150
        if group is None:
 
151
            group = dbus.Interface(bus.get_object
 
152
                                   (avahi.DBUS_NAME,
 
153
                                    server.EntryGroupNew()),
 
154
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
155
            group.connect_to_signal('StateChanged',
 
156
                                    entry_group_state_changed)
178
157
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
179
 
                     self.name, self.type)
180
 
        self.group.AddService(
181
 
            self.interface,
182
 
            self.protocol,
183
 
            dbus.UInt32(0),     # flags
184
 
            self.name, self.type,
185
 
            self.domain, self.host,
186
 
            dbus.UInt16(self.port),
187
 
            avahi.string_array_to_txt_array(self.TXT))
188
 
        self.group.Commit()
189
 
    def entry_group_state_changed(self, state, error):
190
 
        """Derived from the Avahi example code"""
191
 
        logger.debug(u"Avahi state change: %i", state)
192
 
        
193
 
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
 
            logger.debug(u"Zeroconf service established.")
195
 
        elif state == avahi.ENTRY_GROUP_COLLISION:
196
 
            logger.warning(u"Zeroconf service name collision.")
197
 
            self.rename()
198
 
        elif state == avahi.ENTRY_GROUP_FAILURE:
199
 
            logger.critical(u"Avahi: Error in group state changed %s",
200
 
                            unicode(error))
201
 
            raise AvahiGroupError(u"State changed: %s"
202
 
                                  % unicode(error))
203
 
    def cleanup(self):
204
 
        """Derived from the Avahi example code"""
205
 
        if self.group is not None:
206
 
            self.group.Free()
207
 
            self.group = None
208
 
    def server_state_changed(self, state):
209
 
        """Derived from the Avahi example code"""
210
 
        if state == avahi.SERVER_COLLISION:
211
 
            logger.error(u"Zeroconf server name collision")
212
 
            self.remove()
213
 
        elif state == avahi.SERVER_RUNNING:
214
 
            self.add()
215
 
    def activate(self):
216
 
        """Derived from the Avahi example code"""
217
 
        if self.server is None:
218
 
            self.server = dbus.Interface(
219
 
                self.bus.get_object(avahi.DBUS_NAME,
220
 
                                    avahi.DBUS_PATH_SERVER),
221
 
                avahi.DBUS_INTERFACE_SERVER)
222
 
        self.server.connect_to_signal(u"StateChanged",
223
 
                                 self.server_state_changed)
224
 
        self.server_state_changed(self.server.GetState())
225
 
 
226
 
 
227
 
class Client(object):
 
158
                     service.name, service.type)
 
159
        group.AddService(
 
160
                self.interface,         # interface
 
161
                avahi.PROTO_INET6,      # protocol
 
162
                dbus.UInt32(0),         # flags
 
163
                self.name, self.type,
 
164
                self.domain, self.host,
 
165
                dbus.UInt16(self.port),
 
166
                avahi.string_array_to_txt_array(self.TXT))
 
167
        group.Commit()
 
168
 
 
169
# From the Avahi example code:
 
170
group = None                            # our entry group
 
171
# End of Avahi example code
 
172
 
 
173
 
 
174
def _datetime_to_dbus(dt, variant_level=0):
 
175
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
176
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
177
 
 
178
 
 
179
class Client(dbus.service.Object):
228
180
    """A representation of a client host served by this server.
229
 
    
230
181
    Attributes:
231
182
    name:       string; from the config file, used in log messages and
232
183
                        D-Bus identifiers
252
203
                     client lives.  %() expansions are done at
253
204
                     runtime with vars(self) as dict, so that for
254
205
                     instance %(name)s can be used in the command.
255
 
    current_checker_command: string; current running checker_command
 
206
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
207
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
256
208
    """
257
 
    
258
 
    @staticmethod
259
 
    def _datetime_to_milliseconds(dt):
260
 
        "Convert a datetime.datetime() to milliseconds"
261
 
        return ((dt.days * 24 * 60 * 60 * 1000)
262
 
                + (dt.seconds * 1000)
263
 
                + (dt.microseconds // 1000))
264
 
    
265
209
    def timeout_milliseconds(self):
266
210
        "Return the 'timeout' attribute in milliseconds"
267
 
        return self._datetime_to_milliseconds(self.timeout)
 
211
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
212
                + (self.timeout.seconds * 1000)
 
213
                + (self.timeout.microseconds // 1000))
268
214
    
269
215
    def interval_milliseconds(self):
270
216
        "Return the 'interval' attribute in milliseconds"
271
 
        return self._datetime_to_milliseconds(self.interval)
 
217
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
218
                + (self.interval.seconds * 1000)
 
219
                + (self.interval.microseconds // 1000))
272
220
    
273
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
221
    def __init__(self, name = None, disable_hook=None, config=None,
 
222
                 use_dbus=True):
274
223
        """Note: the 'checker' key in 'config' sets the
275
224
        'checker_command' attribute and *not* the 'checker'
276
225
        attribute."""
278
227
        if config is None:
279
228
            config = {}
280
229
        logger.debug(u"Creating client %r", self.name)
 
230
        self.use_dbus = False   # During __init__
281
231
        # Uppercase and remove spaces from fingerprint for later
282
232
        # comparison purposes with return value from the fingerprint()
283
233
        # function
284
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
234
        self.fingerprint = (config["fingerprint"].upper()
285
235
                            .replace(u" ", u""))
286
236
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
287
 
        if u"secret" in config:
288
 
            self.secret = config[u"secret"].decode(u"base64")
289
 
        elif u"secfile" in config:
 
237
        if "secret" in config:
 
238
            self.secret = config["secret"].decode(u"base64")
 
239
        elif "secfile" in config:
290
240
            with closing(open(os.path.expanduser
291
241
                              (os.path.expandvars
292
 
                               (config[u"secfile"])))) as secfile:
 
242
                               (config["secfile"])))) as secfile:
293
243
                self.secret = secfile.read()
294
244
        else:
295
245
            raise TypeError(u"No secret or secfile for client %s"
296
246
                            % self.name)
297
 
        self.host = config.get(u"host", u"")
 
247
        self.host = config.get("host", "")
298
248
        self.created = datetime.datetime.utcnow()
299
249
        self.enabled = False
300
250
        self.last_enabled = None
301
251
        self.last_checked_ok = None
302
 
        self.timeout = string_to_delta(config[u"timeout"])
303
 
        self.interval = string_to_delta(config[u"interval"])
 
252
        self.timeout = string_to_delta(config["timeout"])
 
253
        self.interval = string_to_delta(config["interval"])
304
254
        self.disable_hook = disable_hook
305
255
        self.checker = None
306
256
        self.checker_initiator_tag = None
307
257
        self.disable_initiator_tag = None
308
258
        self.checker_callback_tag = None
309
 
        self.checker_command = config[u"checker"]
310
 
        self.current_checker_command = None
 
259
        self.checker_command = config["checker"]
311
260
        self.last_connect = None
 
261
        # Only now, when this client is initialized, can it show up on
 
262
        # the D-Bus
 
263
        self.use_dbus = use_dbus
 
264
        if self.use_dbus:
 
265
            self.dbus_object_path = (dbus.ObjectPath
 
266
                                     ("/clients/"
 
267
                                      + self.name.replace(".", "_")))
 
268
            dbus.service.Object.__init__(self, bus,
 
269
                                         self.dbus_object_path)
312
270
    
313
271
    def enable(self):
314
272
        """Start this client's checker and timeout hooks"""
315
 
        if getattr(self, u"enabled", False):
316
 
            # Already enabled
317
 
            return
318
273
        self.last_enabled = datetime.datetime.utcnow()
319
274
        # Schedule a new checker to be started an 'interval' from now,
320
275
        # and every interval from then on.
328
283
                                   (self.timeout_milliseconds(),
329
284
                                    self.disable))
330
285
        self.enabled = True
 
286
        if self.use_dbus:
 
287
            # Emit D-Bus signals
 
288
            self.PropertyChanged(dbus.String(u"enabled"),
 
289
                                 dbus.Boolean(True, variant_level=1))
 
290
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
291
                                 (_datetime_to_dbus(self.last_enabled,
 
292
                                                    variant_level=1)))
331
293
    
332
294
    def disable(self):
333
295
        """Disable this client."""
334
296
        if not getattr(self, "enabled", False):
335
297
            return False
336
298
        logger.info(u"Disabling client %s", self.name)
337
 
        if getattr(self, u"disable_initiator_tag", False):
 
299
        if getattr(self, "disable_initiator_tag", False):
338
300
            gobject.source_remove(self.disable_initiator_tag)
339
301
            self.disable_initiator_tag = None
340
 
        if getattr(self, u"checker_initiator_tag", False):
 
302
        if getattr(self, "checker_initiator_tag", False):
341
303
            gobject.source_remove(self.checker_initiator_tag)
342
304
            self.checker_initiator_tag = None
343
305
        self.stop_checker()
344
306
        if self.disable_hook:
345
307
            self.disable_hook(self)
346
308
        self.enabled = False
 
309
        if self.use_dbus:
 
310
            # Emit D-Bus signal
 
311
            self.PropertyChanged(dbus.String(u"enabled"),
 
312
                                 dbus.Boolean(False, variant_level=1))
347
313
        # Do not run this again if called by a gobject.timeout_add
348
314
        return False
349
315
    
355
321
        """The checker has completed, so take appropriate actions."""
356
322
        self.checker_callback_tag = None
357
323
        self.checker = None
 
324
        if self.use_dbus:
 
325
            # Emit D-Bus signal
 
326
            self.PropertyChanged(dbus.String(u"checker_running"),
 
327
                                 dbus.Boolean(False, variant_level=1))
358
328
        if os.WIFEXITED(condition):
359
329
            exitstatus = os.WEXITSTATUS(condition)
360
330
            if exitstatus == 0:
364
334
            else:
365
335
                logger.info(u"Checker for %(name)s failed",
366
336
                            vars(self))
 
337
            if self.use_dbus:
 
338
                # Emit D-Bus signal
 
339
                self.CheckerCompleted(dbus.Int16(exitstatus),
 
340
                                      dbus.Int64(condition),
 
341
                                      dbus.String(command))
367
342
        else:
368
343
            logger.warning(u"Checker for %(name)s crashed?",
369
344
                           vars(self))
 
345
            if self.use_dbus:
 
346
                # Emit D-Bus signal
 
347
                self.CheckerCompleted(dbus.Int16(-1),
 
348
                                      dbus.Int64(condition),
 
349
                                      dbus.String(command))
370
350
    
371
351
    def checked_ok(self):
372
352
        """Bump up the timeout for this client.
373
 
        
374
353
        This should only be called when the client has been seen,
375
354
        alive and well.
376
355
        """
379
358
        self.disable_initiator_tag = (gobject.timeout_add
380
359
                                      (self.timeout_milliseconds(),
381
360
                                       self.disable))
 
361
        if self.use_dbus:
 
362
            # Emit D-Bus signal
 
363
            self.PropertyChanged(
 
364
                dbus.String(u"last_checked_ok"),
 
365
                (_datetime_to_dbus(self.last_checked_ok,
 
366
                                   variant_level=1)))
382
367
    
383
368
    def start_checker(self):
384
369
        """Start a new checker subprocess if one is not running.
385
 
        
386
370
        If a checker already exists, leave it running and do
387
371
        nothing."""
388
372
        # The reason for not killing a running checker is that if we
393
377
        # checkers alone, the checker would have to take more time
394
378
        # than 'timeout' for the client to be declared invalid, which
395
379
        # is as it should be.
396
 
        
397
 
        # If a checker exists, make sure it is not a zombie
398
 
        if self.checker is not None:
399
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
400
 
            if pid:
401
 
                logger.warning(u"Checker was a zombie")
402
 
                gobject.source_remove(self.checker_callback_tag)
403
 
                self.checker_callback(pid, status,
404
 
                                      self.current_checker_command)
405
 
        # Start a new checker if needed
406
380
        if self.checker is None:
407
381
            try:
408
382
                # In case checker_command has exactly one % operator
409
383
                command = self.checker_command % self.host
410
384
            except TypeError:
411
385
                # Escape attributes for the shell
412
 
                escaped_attrs = dict((key,
413
 
                                      re.escape(unicode(str(val),
414
 
                                                        errors=
415
 
                                                        u'replace')))
 
386
                escaped_attrs = dict((key, re.escape(str(val)))
416
387
                                     for key, val in
417
388
                                     vars(self).iteritems())
418
389
                try:
421
392
                    logger.error(u'Could not format string "%s":'
422
393
                                 u' %s', self.checker_command, error)
423
394
                    return True # Try again later
424
 
            self.current_checker_command = command
425
395
            try:
426
396
                logger.info(u"Starting checker %r for %s",
427
397
                            command, self.name)
431
401
                # always replaced by /dev/null.)
432
402
                self.checker = subprocess.Popen(command,
433
403
                                                close_fds=True,
434
 
                                                shell=True, cwd=u"/")
 
404
                                                shell=True, cwd="/")
 
405
                if self.use_dbus:
 
406
                    # Emit D-Bus signal
 
407
                    self.CheckerStarted(command)
 
408
                    self.PropertyChanged(
 
409
                        dbus.String("checker_running"),
 
410
                        dbus.Boolean(True, variant_level=1))
435
411
                self.checker_callback_tag = (gobject.child_watch_add
436
412
                                             (self.checker.pid,
437
413
                                              self.checker_callback,
438
414
                                              data=command))
439
 
                # The checker may have completed before the gobject
440
 
                # watch was added.  Check for this.
441
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
442
 
                if pid:
443
 
                    gobject.source_remove(self.checker_callback_tag)
444
 
                    self.checker_callback(pid, status, command)
445
415
            except OSError, error:
446
416
                logger.error(u"Failed to start subprocess: %s",
447
417
                             error)
453
423
        if self.checker_callback_tag:
454
424
            gobject.source_remove(self.checker_callback_tag)
455
425
            self.checker_callback_tag = None
456
 
        if getattr(self, u"checker", None) is None:
 
426
        if getattr(self, "checker", None) is None:
457
427
            return
458
428
        logger.debug(u"Stopping checker for %(name)s", vars(self))
459
429
        try:
465
435
            if error.errno != errno.ESRCH: # No such process
466
436
                raise
467
437
        self.checker = None
 
438
        if self.use_dbus:
 
439
            self.PropertyChanged(dbus.String(u"checker_running"),
 
440
                                 dbus.Boolean(False, variant_level=1))
468
441
    
469
442
    def still_valid(self):
470
443
        """Has the timeout not yet passed for this client?"""
471
 
        if not getattr(self, u"enabled", False):
 
444
        if not getattr(self, "enabled", False):
472
445
            return False
473
446
        now = datetime.datetime.utcnow()
474
447
        if self.last_checked_ok is None:
475
448
            return now < (self.created + self.timeout)
476
449
        else:
477
450
            return now < (self.last_checked_ok + self.timeout)
478
 
 
479
 
 
480
 
class ClientDBus(Client, dbus.service.Object):
481
 
    """A Client class using D-Bus
482
 
    
483
 
    Attributes:
484
 
    dbus_object_path: dbus.ObjectPath
485
 
    bus: dbus.SystemBus()
486
 
    """
487
 
    # dbus.service.Object doesn't use super(), so we can't either.
488
 
    
489
 
    def __init__(self, bus = None, *args, **kwargs):
490
 
        self.bus = bus
491
 
        Client.__init__(self, *args, **kwargs)
492
 
        # Only now, when this client is initialized, can it show up on
493
 
        # the D-Bus
494
 
        self.dbus_object_path = (dbus.ObjectPath
495
 
                                 (u"/clients/"
496
 
                                  + self.name.replace(u".", u"_")))
497
 
        dbus.service.Object.__init__(self, self.bus,
498
 
                                     self.dbus_object_path)
499
 
    
500
 
    @staticmethod
501
 
    def _datetime_to_dbus(dt, variant_level=0):
502
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
503
 
        return dbus.String(dt.isoformat(),
504
 
                           variant_level=variant_level)
505
 
    
506
 
    def enable(self):
507
 
        oldstate = getattr(self, u"enabled", False)
508
 
        r = Client.enable(self)
509
 
        if oldstate != self.enabled:
510
 
            # Emit D-Bus signals
511
 
            self.PropertyChanged(dbus.String(u"enabled"),
512
 
                                 dbus.Boolean(True, variant_level=1))
513
 
            self.PropertyChanged(
514
 
                dbus.String(u"last_enabled"),
515
 
                self._datetime_to_dbus(self.last_enabled,
516
 
                                       variant_level=1))
517
 
        return r
518
 
    
519
 
    def disable(self, signal = True):
520
 
        oldstate = getattr(self, u"enabled", False)
521
 
        r = Client.disable(self)
522
 
        if signal and oldstate != self.enabled:
523
 
            # Emit D-Bus signal
524
 
            self.PropertyChanged(dbus.String(u"enabled"),
525
 
                                 dbus.Boolean(False, variant_level=1))
526
 
        return r
527
 
    
528
 
    def __del__(self, *args, **kwargs):
529
 
        try:
530
 
            self.remove_from_connection()
531
 
        except LookupError:
532
 
            pass
533
 
        if hasattr(dbus.service.Object, u"__del__"):
534
 
            dbus.service.Object.__del__(self, *args, **kwargs)
535
 
        Client.__del__(self, *args, **kwargs)
536
 
    
537
 
    def checker_callback(self, pid, condition, command,
538
 
                         *args, **kwargs):
539
 
        self.checker_callback_tag = None
540
 
        self.checker = None
541
 
        # Emit D-Bus signal
542
 
        self.PropertyChanged(dbus.String(u"checker_running"),
543
 
                             dbus.Boolean(False, variant_level=1))
544
 
        if os.WIFEXITED(condition):
545
 
            exitstatus = os.WEXITSTATUS(condition)
546
 
            # Emit D-Bus signal
547
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
548
 
                                  dbus.Int64(condition),
549
 
                                  dbus.String(command))
550
 
        else:
551
 
            # Emit D-Bus signal
552
 
            self.CheckerCompleted(dbus.Int16(-1),
553
 
                                  dbus.Int64(condition),
554
 
                                  dbus.String(command))
555
 
        
556
 
        return Client.checker_callback(self, pid, condition, command,
557
 
                                       *args, **kwargs)
558
 
    
559
 
    def checked_ok(self, *args, **kwargs):
560
 
        r = Client.checked_ok(self, *args, **kwargs)
561
 
        # Emit D-Bus signal
562
 
        self.PropertyChanged(
563
 
            dbus.String(u"last_checked_ok"),
564
 
            (self._datetime_to_dbus(self.last_checked_ok,
565
 
                                    variant_level=1)))
566
 
        return r
567
 
    
568
 
    def start_checker(self, *args, **kwargs):
569
 
        old_checker = self.checker
570
 
        if self.checker is not None:
571
 
            old_checker_pid = self.checker.pid
572
 
        else:
573
 
            old_checker_pid = None
574
 
        r = Client.start_checker(self, *args, **kwargs)
575
 
        # Only if new checker process was started
576
 
        if (self.checker is not None
577
 
            and old_checker_pid != self.checker.pid):
578
 
            # Emit D-Bus signal
579
 
            self.CheckerStarted(self.current_checker_command)
580
 
            self.PropertyChanged(
581
 
                dbus.String(u"checker_running"),
582
 
                dbus.Boolean(True, variant_level=1))
583
 
        return r
584
 
    
585
 
    def stop_checker(self, *args, **kwargs):
586
 
        old_checker = getattr(self, u"checker", None)
587
 
        r = Client.stop_checker(self, *args, **kwargs)
588
 
        if (old_checker is not None
589
 
            and getattr(self, u"checker", None) is None):
590
 
            self.PropertyChanged(dbus.String(u"checker_running"),
591
 
                                 dbus.Boolean(False, variant_level=1))
592
 
        return r
593
451
    
594
452
    ## D-Bus methods & signals
595
453
    _interface = u"se.bsnet.fukt.Mandos.Client"
596
454
    
597
455
    # CheckedOK - method
598
 
    @dbus.service.method(_interface)
599
 
    def CheckedOK(self):
600
 
        return self.checked_ok()
 
456
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
457
    CheckedOK.__name__ = "CheckedOK"
601
458
    
602
459
    # CheckerCompleted - signal
603
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
460
    @dbus.service.signal(_interface, signature="nxs")
604
461
    def CheckerCompleted(self, exitcode, waitstatus, command):
605
462
        "D-Bus signal"
606
463
        pass
607
464
    
608
465
    # CheckerStarted - signal
609
 
    @dbus.service.signal(_interface, signature=u"s")
 
466
    @dbus.service.signal(_interface, signature="s")
610
467
    def CheckerStarted(self, command):
611
468
        "D-Bus signal"
612
469
        pass
613
470
    
614
471
    # GetAllProperties - method
615
 
    @dbus.service.method(_interface, out_signature=u"a{sv}")
 
472
    @dbus.service.method(_interface, out_signature="a{sv}")
616
473
    def GetAllProperties(self):
617
474
        "D-Bus method"
618
475
        return dbus.Dictionary({
619
 
                dbus.String(u"name"):
 
476
                dbus.String("name"):
620
477
                    dbus.String(self.name, variant_level=1),
621
 
                dbus.String(u"fingerprint"):
 
478
                dbus.String("fingerprint"):
622
479
                    dbus.String(self.fingerprint, variant_level=1),
623
 
                dbus.String(u"host"):
 
480
                dbus.String("host"):
624
481
                    dbus.String(self.host, variant_level=1),
625
 
                dbus.String(u"created"):
626
 
                    self._datetime_to_dbus(self.created,
627
 
                                           variant_level=1),
628
 
                dbus.String(u"last_enabled"):
629
 
                    (self._datetime_to_dbus(self.last_enabled,
630
 
                                            variant_level=1)
 
482
                dbus.String("created"):
 
483
                    _datetime_to_dbus(self.created, variant_level=1),
 
484
                dbus.String("last_enabled"):
 
485
                    (_datetime_to_dbus(self.last_enabled,
 
486
                                       variant_level=1)
631
487
                     if self.last_enabled is not None
632
488
                     else dbus.Boolean(False, variant_level=1)),
633
 
                dbus.String(u"enabled"):
 
489
                dbus.String("enabled"):
634
490
                    dbus.Boolean(self.enabled, variant_level=1),
635
 
                dbus.String(u"last_checked_ok"):
636
 
                    (self._datetime_to_dbus(self.last_checked_ok,
637
 
                                            variant_level=1)
 
491
                dbus.String("last_checked_ok"):
 
492
                    (_datetime_to_dbus(self.last_checked_ok,
 
493
                                       variant_level=1)
638
494
                     if self.last_checked_ok is not None
639
495
                     else dbus.Boolean (False, variant_level=1)),
640
 
                dbus.String(u"timeout"):
 
496
                dbus.String("timeout"):
641
497
                    dbus.UInt64(self.timeout_milliseconds(),
642
498
                                variant_level=1),
643
 
                dbus.String(u"interval"):
 
499
                dbus.String("interval"):
644
500
                    dbus.UInt64(self.interval_milliseconds(),
645
501
                                variant_level=1),
646
 
                dbus.String(u"checker"):
 
502
                dbus.String("checker"):
647
503
                    dbus.String(self.checker_command,
648
504
                                variant_level=1),
649
 
                dbus.String(u"checker_running"):
 
505
                dbus.String("checker_running"):
650
506
                    dbus.Boolean(self.checker is not None,
651
507
                                 variant_level=1),
652
 
                dbus.String(u"object_path"):
 
508
                dbus.String("object_path"):
653
509
                    dbus.ObjectPath(self.dbus_object_path,
654
510
                                    variant_level=1)
655
 
                }, signature=u"sv")
 
511
                }, signature="sv")
656
512
    
657
513
    # IsStillValid - method
658
 
    @dbus.service.method(_interface, out_signature=u"b")
659
 
    def IsStillValid(self):
660
 
        return self.still_valid()
 
514
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
515
                    (still_valid))
 
516
    IsStillValid.__name__ = "IsStillValid"
661
517
    
662
518
    # PropertyChanged - signal
663
 
    @dbus.service.signal(_interface, signature=u"sv")
 
519
    @dbus.service.signal(_interface, signature="sv")
664
520
    def PropertyChanged(self, property, value):
665
521
        "D-Bus signal"
666
522
        pass
667
523
    
668
 
    # ReceivedSecret - signal
669
 
    @dbus.service.signal(_interface)
670
 
    def ReceivedSecret(self):
671
 
        "D-Bus signal"
672
 
        pass
673
 
    
674
 
    # Rejected - signal
675
 
    @dbus.service.signal(_interface)
676
 
    def Rejected(self):
677
 
        "D-Bus signal"
678
 
        pass
679
 
    
680
524
    # SetChecker - method
681
 
    @dbus.service.method(_interface, in_signature=u"s")
 
525
    @dbus.service.method(_interface, in_signature="s")
682
526
    def SetChecker(self, checker):
683
527
        "D-Bus setter method"
684
528
        self.checker_command = checker
688
532
                                         variant_level=1))
689
533
    
690
534
    # SetHost - method
691
 
    @dbus.service.method(_interface, in_signature=u"s")
 
535
    @dbus.service.method(_interface, in_signature="s")
692
536
    def SetHost(self, host):
693
537
        "D-Bus setter method"
694
538
        self.host = host
697
541
                             dbus.String(self.host, variant_level=1))
698
542
    
699
543
    # SetInterval - method
700
 
    @dbus.service.method(_interface, in_signature=u"t")
 
544
    @dbus.service.method(_interface, in_signature="t")
701
545
    def SetInterval(self, milliseconds):
702
546
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
547
        # Emit D-Bus signal
706
550
                                          variant_level=1)))
707
551
    
708
552
    # SetSecret - method
709
 
    @dbus.service.method(_interface, in_signature=u"ay",
 
553
    @dbus.service.method(_interface, in_signature="ay",
710
554
                         byte_arrays=True)
711
555
    def SetSecret(self, secret):
712
556
        "D-Bus setter method"
713
557
        self.secret = str(secret)
714
558
    
715
559
    # SetTimeout - method
716
 
    @dbus.service.method(_interface, in_signature=u"t")
 
560
    @dbus.service.method(_interface, in_signature="t")
717
561
    def SetTimeout(self, milliseconds):
718
562
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
563
        # Emit D-Bus signal
722
566
                                          variant_level=1)))
723
567
    
724
568
    # Enable - method
725
 
    @dbus.service.method(_interface)
726
 
    def Enable(self):
727
 
        "D-Bus method"
728
 
        self.enable()
 
569
    Enable = dbus.service.method(_interface)(enable)
 
570
    Enable.__name__ = "Enable"
729
571
    
730
572
    # StartChecker - method
731
573
    @dbus.service.method(_interface)
740
582
        self.disable()
741
583
    
742
584
    # StopChecker - method
743
 
    @dbus.service.method(_interface)
744
 
    def StopChecker(self):
745
 
        self.stop_checker()
 
585
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
586
    StopChecker.__name__ = "StopChecker"
746
587
    
747
588
    del _interface
748
589
 
749
590
 
750
 
class ClientHandler(socketserver.BaseRequestHandler, object):
751
 
    """A class to handle client connections.
752
 
    
753
 
    Instantiated once for each connection to handle it.
 
591
def peer_certificate(session):
 
592
    "Return the peer's OpenPGP certificate as a bytestring"
 
593
    # If not an OpenPGP certificate...
 
594
    if (gnutls.library.functions
 
595
        .gnutls_certificate_type_get(session._c_object)
 
596
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
597
        # ...do the normal thing
 
598
        return session.peer_certificate
 
599
    list_size = ctypes.c_uint(1)
 
600
    cert_list = (gnutls.library.functions
 
601
                 .gnutls_certificate_get_peers
 
602
                 (session._c_object, ctypes.byref(list_size)))
 
603
    if not bool(cert_list) and list_size.value != 0:
 
604
        raise gnutls.errors.GNUTLSError("error getting peer"
 
605
                                        " certificate")
 
606
    if list_size.value == 0:
 
607
        return None
 
608
    cert = cert_list[0]
 
609
    return ctypes.string_at(cert.data, cert.size)
 
610
 
 
611
 
 
612
def fingerprint(openpgp):
 
613
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
614
    # New GnuTLS "datum" with the OpenPGP public key
 
615
    datum = (gnutls.library.types
 
616
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
617
                                         ctypes.POINTER
 
618
                                         (ctypes.c_ubyte)),
 
619
                             ctypes.c_uint(len(openpgp))))
 
620
    # New empty GnuTLS certificate
 
621
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
622
    (gnutls.library.functions
 
623
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
624
    # Import the OpenPGP public key into the certificate
 
625
    (gnutls.library.functions
 
626
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
627
                                gnutls.library.constants
 
628
                                .GNUTLS_OPENPGP_FMT_RAW))
 
629
    # Verify the self signature in the key
 
630
    crtverify = ctypes.c_uint()
 
631
    (gnutls.library.functions
 
632
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
633
    if crtverify.value != 0:
 
634
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
635
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
636
    # New buffer for the fingerprint
 
637
    buf = ctypes.create_string_buffer(20)
 
638
    buf_len = ctypes.c_size_t()
 
639
    # Get the fingerprint from the certificate into the buffer
 
640
    (gnutls.library.functions
 
641
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
642
                                         ctypes.byref(buf_len)))
 
643
    # Deinit the certificate
 
644
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
645
    # Convert the buffer to a Python bytestring
 
646
    fpr = ctypes.string_at(buf, buf_len.value)
 
647
    # Convert the bytestring to hexadecimal notation
 
648
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
649
    return hex_fpr
 
650
 
 
651
 
 
652
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
653
    """A TCP request handler class.
 
654
    Instantiated by IPv6_TCPServer for each request to handle it.
754
655
    Note: This will run in its own forked process."""
755
656
    
756
657
    def handle(self):
757
658
        logger.info(u"TCP connection from: %s",
758
659
                    unicode(self.client_address))
759
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
 
        # Open IPC pipe to parent process
761
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
762
 
            session = (gnutls.connection
763
 
                       .ClientSession(self.request,
764
 
                                      gnutls.connection
765
 
                                      .X509Credentials()))
766
 
            
767
 
            line = self.request.makefile().readline()
768
 
            logger.debug(u"Protocol version: %r", line)
769
 
            try:
770
 
                if int(line.strip().split()[0]) > 1:
771
 
                    raise RuntimeError
772
 
            except (ValueError, IndexError, RuntimeError), error:
773
 
                logger.error(u"Unknown protocol version: %s", error)
774
 
                return
775
 
            
776
 
            # Note: gnutls.connection.X509Credentials is really a
777
 
            # generic GnuTLS certificate credentials object so long as
778
 
            # no X.509 keys are added to it.  Therefore, we can use it
779
 
            # here despite using OpenPGP certificates.
780
 
            
781
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
 
            #                      u"+AES-256-CBC", u"+SHA1",
783
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
784
 
            #                      u"+DHE-DSS"))
785
 
            # Use a fallback default, since this MUST be set.
786
 
            priority = self.server.gnutls_priority
787
 
            if priority is None:
788
 
                priority = u"NORMAL"
789
 
            (gnutls.library.functions
790
 
             .gnutls_priority_set_direct(session._c_object,
791
 
                                         priority, None))
792
 
            
793
 
            try:
794
 
                session.handshake()
795
 
            except gnutls.errors.GNUTLSError, error:
796
 
                logger.warning(u"Handshake failed: %s", error)
797
 
                # Do not run session.bye() here: the session is not
798
 
                # established.  Just abandon the request.
799
 
                return
800
 
            logger.debug(u"Handshake succeeded")
801
 
            try:
802
 
                fpr = self.fingerprint(self.peer_certificate(session))
803
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
804
 
                logger.warning(u"Bad certificate: %s", error)
805
 
                session.bye()
806
 
                return
807
 
            logger.debug(u"Fingerprint: %s", fpr)
808
 
            
809
 
            for c in self.server.clients:
810
 
                if c.fingerprint == fpr:
811
 
                    client = c
812
 
                    break
813
 
            else:
814
 
                ipc.write(u"NOTFOUND %s %s\n"
815
 
                          % (fpr, unicode(self.client_address)))
816
 
                session.bye()
817
 
                return
818
 
            # Have to check if client.still_valid(), since it is
819
 
            # possible that the client timed out while establishing
820
 
            # the GnuTLS session.
821
 
            if not client.still_valid():
822
 
                ipc.write(u"INVALID %s\n" % client.name)
823
 
                session.bye()
824
 
                return
825
 
            ipc.write(u"SENDING %s\n" % client.name)
826
 
            sent_size = 0
827
 
            while sent_size < len(client.secret):
828
 
                sent = session.send(client.secret[sent_size:])
829
 
                logger.debug(u"Sent: %d, remaining: %d",
830
 
                             sent, len(client.secret)
831
 
                             - (sent_size + sent))
832
 
                sent_size += sent
833
 
            session.bye()
834
 
    
835
 
    @staticmethod
836
 
    def peer_certificate(session):
837
 
        "Return the peer's OpenPGP certificate as a bytestring"
838
 
        # If not an OpenPGP certificate...
839
 
        if (gnutls.library.functions
840
 
            .gnutls_certificate_type_get(session._c_object)
841
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
842
 
            # ...do the normal thing
843
 
            return session.peer_certificate
844
 
        list_size = ctypes.c_uint(1)
845
 
        cert_list = (gnutls.library.functions
846
 
                     .gnutls_certificate_get_peers
847
 
                     (session._c_object, ctypes.byref(list_size)))
848
 
        if not bool(cert_list) and list_size.value != 0:
849
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
850
 
                                            u" certificate")
851
 
        if list_size.value == 0:
852
 
            return None
853
 
        cert = cert_list[0]
854
 
        return ctypes.string_at(cert.data, cert.size)
855
 
    
856
 
    @staticmethod
857
 
    def fingerprint(openpgp):
858
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
859
 
        # New GnuTLS "datum" with the OpenPGP public key
860
 
        datum = (gnutls.library.types
861
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
862
 
                                             ctypes.POINTER
863
 
                                             (ctypes.c_ubyte)),
864
 
                                 ctypes.c_uint(len(openpgp))))
865
 
        # New empty GnuTLS certificate
866
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
867
 
        (gnutls.library.functions
868
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
869
 
        # Import the OpenPGP public key into the certificate
870
 
        (gnutls.library.functions
871
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
872
 
                                    gnutls.library.constants
873
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
874
 
        # Verify the self signature in the key
875
 
        crtverify = ctypes.c_uint()
876
 
        (gnutls.library.functions
877
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
878
 
                                         ctypes.byref(crtverify)))
879
 
        if crtverify.value != 0:
880
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
881
 
            raise (gnutls.errors.CertificateSecurityError
882
 
                   (u"Verify failed"))
883
 
        # New buffer for the fingerprint
884
 
        buf = ctypes.create_string_buffer(20)
885
 
        buf_len = ctypes.c_size_t()
886
 
        # Get the fingerprint from the certificate into the buffer
887
 
        (gnutls.library.functions
888
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
889
 
                                             ctypes.byref(buf_len)))
890
 
        # Deinit the certificate
891
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
892
 
        # Convert the buffer to a Python bytestring
893
 
        fpr = ctypes.string_at(buf, buf_len.value)
894
 
        # Convert the bytestring to hexadecimal notation
895
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
896
 
        return hex_fpr
897
 
 
898
 
 
899
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
900
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
901
 
    def process_request(self, request, client_address):
902
 
        """Overrides and wraps the original process_request().
903
 
        
904
 
        This function creates a new pipe in self.pipe
905
 
        """
906
 
        self.pipe = os.pipe()
907
 
        super(ForkingMixInWithPipe,
908
 
              self).process_request(request, client_address)
909
 
        os.close(self.pipe[1])  # close write end
910
 
        self.add_pipe(self.pipe[0])
911
 
    def add_pipe(self, pipe):
912
 
        """Dummy function; override as necessary"""
913
 
        os.close(pipe)
914
 
 
915
 
 
916
 
class IPv6_TCPServer(ForkingMixInWithPipe,
917
 
                     socketserver.TCPServer, object):
918
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
919
 
    
 
660
        session = (gnutls.connection
 
661
                   .ClientSession(self.request,
 
662
                                  gnutls.connection
 
663
                                  .X509Credentials()))
 
664
        
 
665
        line = self.request.makefile().readline()
 
666
        logger.debug(u"Protocol version: %r", line)
 
667
        try:
 
668
            if int(line.strip().split()[0]) > 1:
 
669
                raise RuntimeError
 
670
        except (ValueError, IndexError, RuntimeError), error:
 
671
            logger.error(u"Unknown protocol version: %s", error)
 
672
            return
 
673
        
 
674
        # Note: gnutls.connection.X509Credentials is really a generic
 
675
        # GnuTLS certificate credentials object so long as no X.509
 
676
        # keys are added to it.  Therefore, we can use it here despite
 
677
        # using OpenPGP certificates.
 
678
        
 
679
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
 
680
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
681
        #                     "+DHE-DSS"))
 
682
        # Use a fallback default, since this MUST be set.
 
683
        priority = self.server.settings.get("priority", "NORMAL")
 
684
        (gnutls.library.functions
 
685
         .gnutls_priority_set_direct(session._c_object,
 
686
                                     priority, None))
 
687
        
 
688
        try:
 
689
            session.handshake()
 
690
        except gnutls.errors.GNUTLSError, error:
 
691
            logger.warning(u"Handshake failed: %s", error)
 
692
            # Do not run session.bye() here: the session is not
 
693
            # established.  Just abandon the request.
 
694
            return
 
695
        logger.debug(u"Handshake succeeded")
 
696
        try:
 
697
            fpr = fingerprint(peer_certificate(session))
 
698
        except (TypeError, gnutls.errors.GNUTLSError), error:
 
699
            logger.warning(u"Bad certificate: %s", error)
 
700
            session.bye()
 
701
            return
 
702
        logger.debug(u"Fingerprint: %s", fpr)
 
703
        
 
704
        for c in self.server.clients:
 
705
            if c.fingerprint == fpr:
 
706
                client = c
 
707
                break
 
708
        else:
 
709
            logger.warning(u"Client not found for fingerprint: %s",
 
710
                           fpr)
 
711
            session.bye()
 
712
            return
 
713
        # Have to check if client.still_valid(), since it is possible
 
714
        # that the client timed out while establishing the GnuTLS
 
715
        # session.
 
716
        if not client.still_valid():
 
717
            logger.warning(u"Client %(name)s is invalid",
 
718
                           vars(client))
 
719
            session.bye()
 
720
            return
 
721
        ## This won't work here, since we're in a fork.
 
722
        # client.checked_ok()
 
723
        sent_size = 0
 
724
        while sent_size < len(client.secret):
 
725
            sent = session.send(client.secret[sent_size:])
 
726
            logger.debug(u"Sent: %d, remaining: %d",
 
727
                         sent, len(client.secret)
 
728
                         - (sent_size + sent))
 
729
            sent_size += sent
 
730
        session.bye()
 
731
 
 
732
 
 
733
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
734
                     SocketServer.TCPServer, object):
 
735
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
920
736
    Attributes:
 
737
        settings:       Server settings
 
738
        clients:        Set() of Client objects
921
739
        enabled:        Boolean; whether this server is activated yet
922
 
        interface:      None or a network interface name (string)
923
 
        use_ipv6:       Boolean; to use IPv6 or not
924
740
    """
925
 
    def __init__(self, server_address, RequestHandlerClass,
926
 
                 interface=None, use_ipv6=True):
927
 
        self.interface = interface
928
 
        if use_ipv6:
929
 
            self.address_family = socket.AF_INET6
930
 
        socketserver.TCPServer.__init__(self, server_address,
931
 
                                        RequestHandlerClass)
 
741
    address_family = socket.AF_INET6
 
742
    def __init__(self, *args, **kwargs):
 
743
        if "settings" in kwargs:
 
744
            self.settings = kwargs["settings"]
 
745
            del kwargs["settings"]
 
746
        if "clients" in kwargs:
 
747
            self.clients = kwargs["clients"]
 
748
            del kwargs["clients"]
 
749
        self.enabled = False
 
750
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
932
751
    def server_bind(self):
933
752
        """This overrides the normal server_bind() function
934
753
        to bind to an interface if one was specified, and also NOT to
935
754
        bind to an address or port if they were not specified."""
936
 
        if self.interface is not None:
937
 
            if SO_BINDTODEVICE is None:
938
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
939
 
                             u" cannot bind to interface %s",
940
 
                             self.interface)
941
 
            else:
942
 
                try:
943
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
944
 
                                           SO_BINDTODEVICE,
945
 
                                           str(self.interface
946
 
                                               + u'\0'))
947
 
                except socket.error, error:
948
 
                    if error[0] == errno.EPERM:
949
 
                        logger.error(u"No permission to"
950
 
                                     u" bind to interface %s",
951
 
                                     self.interface)
952
 
                    elif error[0] == errno.ENOPROTOOPT:
953
 
                        logger.error(u"SO_BINDTODEVICE not available;"
954
 
                                     u" cannot bind to interface %s",
955
 
                                     self.interface)
956
 
                    else:
957
 
                        raise
 
755
        if self.settings["interface"]:
 
756
            # 25 is from /usr/include/asm-i486/socket.h
 
757
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
 
758
            try:
 
759
                self.socket.setsockopt(socket.SOL_SOCKET,
 
760
                                       SO_BINDTODEVICE,
 
761
                                       self.settings["interface"])
 
762
            except socket.error, error:
 
763
                if error[0] == errno.EPERM:
 
764
                    logger.error(u"No permission to"
 
765
                                 u" bind to interface %s",
 
766
                                 self.settings["interface"])
 
767
                else:
 
768
                    raise
958
769
        # Only bind(2) the socket if we really need to.
959
770
        if self.server_address[0] or self.server_address[1]:
960
771
            if not self.server_address[0]:
961
 
                if self.address_family == socket.AF_INET6:
962
 
                    any_address = u"::" # in6addr_any
963
 
                else:
964
 
                    any_address = socket.INADDR_ANY
965
 
                self.server_address = (any_address,
 
772
                in6addr_any = "::"
 
773
                self.server_address = (in6addr_any,
966
774
                                       self.server_address[1])
967
775
            elif not self.server_address[1]:
968
776
                self.server_address = (self.server_address[0],
969
777
                                       0)
970
 
#                 if self.interface:
 
778
#                 if self.settings["interface"]:
971
779
#                     self.server_address = (self.server_address[0],
972
780
#                                            0, # port
973
781
#                                            0, # flowinfo
974
782
#                                            if_nametoindex
975
 
#                                            (self.interface))
976
 
            return socketserver.TCPServer.server_bind(self)
977
 
 
978
 
 
979
 
class MandosServer(IPv6_TCPServer):
980
 
    """Mandos server.
981
 
    
982
 
    Attributes:
983
 
        clients:        set of Client objects
984
 
        gnutls_priority GnuTLS priority string
985
 
        use_dbus:       Boolean; to emit D-Bus signals or not
986
 
    
987
 
    Assumes a gobject.MainLoop event loop.
988
 
    """
989
 
    def __init__(self, server_address, RequestHandlerClass,
990
 
                 interface=None, use_ipv6=True, clients=None,
991
 
                 gnutls_priority=None, use_dbus=True):
992
 
        self.enabled = False
993
 
        self.clients = clients
994
 
        if self.clients is None:
995
 
            self.clients = set()
996
 
        self.use_dbus = use_dbus
997
 
        self.gnutls_priority = gnutls_priority
998
 
        IPv6_TCPServer.__init__(self, server_address,
999
 
                                RequestHandlerClass,
1000
 
                                interface = interface,
1001
 
                                use_ipv6 = use_ipv6)
 
783
#                                            (self.settings
 
784
#                                             ["interface"]))
 
785
            return super(IPv6_TCPServer, self).server_bind()
1002
786
    def server_activate(self):
1003
787
        if self.enabled:
1004
 
            return socketserver.TCPServer.server_activate(self)
 
788
            return super(IPv6_TCPServer, self).server_activate()
1005
789
    def enable(self):
1006
790
        self.enabled = True
1007
 
    def add_pipe(self, pipe):
1008
 
        # Call "handle_ipc" for both data and EOF events
1009
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1010
 
                             self.handle_ipc)
1011
 
    def handle_ipc(self, source, condition, file_objects={}):
1012
 
        condition_names = {
1013
 
            gobject.IO_IN: u"IN",   # There is data to read.
1014
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
1015
 
                                    # blocking).
1016
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1017
 
            gobject.IO_ERR: u"ERR", # Error condition.
1018
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1019
 
                                    # broken, usually for pipes and
1020
 
                                    # sockets).
1021
 
            }
1022
 
        conditions_string = ' | '.join(name
1023
 
                                       for cond, name in
1024
 
                                       condition_names.iteritems()
1025
 
                                       if cond & condition)
1026
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1027
 
                     conditions_string)
1028
 
        
1029
 
        # Turn the pipe file descriptor into a Python file object
1030
 
        if source not in file_objects:
1031
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1032
 
        
1033
 
        # Read a line from the file object
1034
 
        cmdline = file_objects[source].readline()
1035
 
        if not cmdline:             # Empty line means end of file
1036
 
            # close the IPC pipe
1037
 
            file_objects[source].close()
1038
 
            del file_objects[source]
1039
 
            
1040
 
            # Stop calling this function
1041
 
            return False
1042
 
        
1043
 
        logger.debug(u"IPC command: %r", cmdline)
1044
 
        
1045
 
        # Parse and act on command
1046
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1047
 
        
1048
 
        if cmd == u"NOTFOUND":
1049
 
            logger.warning(u"Client not found for fingerprint: %s",
1050
 
                           args)
1051
 
            if self.use_dbus:
1052
 
                # Emit D-Bus signal
1053
 
                mandos_dbus_service.ClientNotFound(args)
1054
 
        elif cmd == u"INVALID":
1055
 
            for client in self.clients:
1056
 
                if client.name == args:
1057
 
                    logger.warning(u"Client %s is invalid", args)
1058
 
                    if self.use_dbus:
1059
 
                        # Emit D-Bus signal
1060
 
                        client.Rejected()
1061
 
                    break
1062
 
            else:
1063
 
                logger.error(u"Unknown client %s is invalid", args)
1064
 
        elif cmd == u"SENDING":
1065
 
            for client in self.clients:
1066
 
                if client.name == args:
1067
 
                    logger.info(u"Sending secret to %s", client.name)
1068
 
                    client.checked_ok()
1069
 
                    if self.use_dbus:
1070
 
                        # Emit D-Bus signal
1071
 
                        client.ReceivedSecret()
1072
 
                    break
1073
 
            else:
1074
 
                logger.error(u"Sending secret to unknown client %s",
1075
 
                             args)
1076
 
        else:
1077
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1078
 
        
1079
 
        # Keep calling this function
1080
 
        return True
1081
791
 
1082
792
 
1083
793
def string_to_delta(interval):
1084
794
    """Parse a string and return a datetime.timedelta
1085
795
    
1086
 
    >>> string_to_delta(u'7d')
 
796
    >>> string_to_delta('7d')
1087
797
    datetime.timedelta(7)
1088
 
    >>> string_to_delta(u'60s')
 
798
    >>> string_to_delta('60s')
1089
799
    datetime.timedelta(0, 60)
1090
 
    >>> string_to_delta(u'60m')
 
800
    >>> string_to_delta('60m')
1091
801
    datetime.timedelta(0, 3600)
1092
 
    >>> string_to_delta(u'24h')
 
802
    >>> string_to_delta('24h')
1093
803
    datetime.timedelta(1)
1094
804
    >>> string_to_delta(u'1w')
1095
805
    datetime.timedelta(7)
1096
 
    >>> string_to_delta(u'5m 30s')
 
806
    >>> string_to_delta('5m 30s')
1097
807
    datetime.timedelta(0, 330)
1098
808
    """
1099
809
    timevalue = datetime.timedelta(0)
1119
829
    return timevalue
1120
830
 
1121
831
 
 
832
def server_state_changed(state):
 
833
    """Derived from the Avahi example code"""
 
834
    if state == avahi.SERVER_COLLISION:
 
835
        logger.error(u"Zeroconf server name collision")
 
836
        service.remove()
 
837
    elif state == avahi.SERVER_RUNNING:
 
838
        service.add()
 
839
 
 
840
 
 
841
def entry_group_state_changed(state, error):
 
842
    """Derived from the Avahi example code"""
 
843
    logger.debug(u"Avahi state change: %i", state)
 
844
    
 
845
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
846
        logger.debug(u"Zeroconf service established.")
 
847
    elif state == avahi.ENTRY_GROUP_COLLISION:
 
848
        logger.warning(u"Zeroconf service name collision.")
 
849
        service.rename()
 
850
    elif state == avahi.ENTRY_GROUP_FAILURE:
 
851
        logger.critical(u"Avahi: Error in group state changed %s",
 
852
                        unicode(error))
 
853
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
854
 
1122
855
def if_nametoindex(interface):
1123
 
    """Call the C function if_nametoindex(), or equivalent
1124
 
    
1125
 
    Note: This function cannot accept a unicode string."""
 
856
    """Call the C function if_nametoindex(), or equivalent"""
1126
857
    global if_nametoindex
1127
858
    try:
1128
859
        if_nametoindex = (ctypes.cdll.LoadLibrary
1129
 
                          (ctypes.util.find_library(u"c"))
 
860
                          (ctypes.util.find_library("c"))
1130
861
                          .if_nametoindex)
1131
862
    except (OSError, AttributeError):
1132
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
863
        if "struct" not in sys.modules:
 
864
            import struct
 
865
        if "fcntl" not in sys.modules:
 
866
            import fcntl
1133
867
        def if_nametoindex(interface):
1134
868
            "Get an interface index the hard way, i.e. using fcntl()"
1135
869
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1136
870
            with closing(socket.socket()) as s:
1137
871
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1138
 
                                    struct.pack(str(u"16s16x"),
1139
 
                                                interface))
1140
 
            interface_index = struct.unpack(str(u"I"),
1141
 
                                            ifreq[16:20])[0]
 
872
                                    struct.pack("16s16x", interface))
 
873
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1142
874
            return interface_index
1143
875
    return if_nametoindex(interface)
1144
876
 
1145
877
 
1146
878
def daemon(nochdir = False, noclose = False):
1147
879
    """See daemon(3).  Standard BSD Unix function.
1148
 
    
1149
880
    This should really exist as os.daemon, but it doesn't (yet)."""
1150
881
    if os.fork():
1151
882
        sys.exit()
1152
883
    os.setsid()
1153
884
    if not nochdir:
1154
 
        os.chdir(u"/")
 
885
        os.chdir("/")
1155
886
    if os.fork():
1156
887
        sys.exit()
1157
888
    if not noclose:
1159
890
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1160
891
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1161
892
            raise OSError(errno.ENODEV,
1162
 
                          u"/dev/null not a character device")
 
893
                          "/dev/null not a character device")
1163
894
        os.dup2(null, sys.stdin.fileno())
1164
895
        os.dup2(null, sys.stdout.fileno())
1165
896
        os.dup2(null, sys.stderr.fileno())
1168
899
 
1169
900
 
1170
901
def main():
1171
 
    
1172
 
    ######################################################################
1173
 
    # Parsing of options, both command line and config file
1174
 
    
1175
902
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1176
 
    parser.add_option("-i", u"--interface", type=u"string",
1177
 
                      metavar="IF", help=u"Bind to interface IF")
1178
 
    parser.add_option("-a", u"--address", type=u"string",
1179
 
                      help=u"Address to listen for requests on")
1180
 
    parser.add_option("-p", u"--port", type=u"int",
1181
 
                      help=u"Port number to receive requests on")
1182
 
    parser.add_option("--check", action=u"store_true",
1183
 
                      help=u"Run self-test")
1184
 
    parser.add_option("--debug", action=u"store_true",
1185
 
                      help=u"Debug mode; run in foreground and log to"
1186
 
                      u" terminal")
1187
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1188
 
                      u" priority string (see GnuTLS documentation)")
1189
 
    parser.add_option("--servicename", type=u"string",
1190
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1191
 
    parser.add_option("--configdir", type=u"string",
1192
 
                      default=u"/etc/mandos", metavar=u"DIR",
1193
 
                      help=u"Directory to search for configuration"
1194
 
                      u" files")
1195
 
    parser.add_option("--no-dbus", action=u"store_false",
1196
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1197
 
                      u" system bus interface")
1198
 
    parser.add_option("--no-ipv6", action=u"store_false",
1199
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
903
    parser.add_option("-i", "--interface", type="string",
 
904
                      metavar="IF", help="Bind to interface IF")
 
905
    parser.add_option("-a", "--address", type="string",
 
906
                      help="Address to listen for requests on")
 
907
    parser.add_option("-p", "--port", type="int",
 
908
                      help="Port number to receive requests on")
 
909
    parser.add_option("--check", action="store_true",
 
910
                      help="Run self-test")
 
911
    parser.add_option("--debug", action="store_true",
 
912
                      help="Debug mode; run in foreground and log to"
 
913
                      " terminal")
 
914
    parser.add_option("--priority", type="string", help="GnuTLS"
 
915
                      " priority string (see GnuTLS documentation)")
 
916
    parser.add_option("--servicename", type="string", metavar="NAME",
 
917
                      help="Zeroconf service name")
 
918
    parser.add_option("--configdir", type="string",
 
919
                      default="/etc/mandos", metavar="DIR",
 
920
                      help="Directory to search for configuration"
 
921
                      " files")
 
922
    parser.add_option("--no-dbus", action="store_false",
 
923
                      dest="use_dbus",
 
924
                      help="Do not provide D-Bus system bus"
 
925
                      " interface")
1200
926
    options = parser.parse_args()[0]
1201
927
    
1202
928
    if options.check:
1205
931
        sys.exit()
1206
932
    
1207
933
    # Default values for config file for server-global settings
1208
 
    server_defaults = { u"interface": u"",
1209
 
                        u"address": u"",
1210
 
                        u"port": u"",
1211
 
                        u"debug": u"False",
1212
 
                        u"priority":
1213
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1214
 
                        u"servicename": u"Mandos",
1215
 
                        u"use_dbus": u"True",
1216
 
                        u"use_ipv6": u"True",
 
934
    server_defaults = { "interface": "",
 
935
                        "address": "",
 
936
                        "port": "",
 
937
                        "debug": "False",
 
938
                        "priority":
 
939
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
940
                        "servicename": "Mandos",
 
941
                        "use_dbus": "True",
1217
942
                        }
1218
943
    
1219
944
    # Parse config file for server-global settings
1220
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
945
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1221
946
    del server_defaults
1222
 
    server_config.read(os.path.join(options.configdir,
1223
 
                                    u"mandos.conf"))
 
947
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1224
948
    # Convert the SafeConfigParser object to a dict
1225
949
    server_settings = server_config.defaults()
1226
950
    # Use the appropriate methods on the non-string config options
1227
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1228
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1229
 
                                                           option)
 
951
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
952
                                                        "debug")
 
953
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
954
                                                           "use_dbus")
1230
955
    if server_settings["port"]:
1231
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1232
 
                                                       u"port")
 
956
        server_settings["port"] = server_config.getint("DEFAULT",
 
957
                                                       "port")
1233
958
    del server_config
1234
959
    
1235
960
    # Override the settings from the config file with command line
1236
961
    # options, if set.
1237
 
    for option in (u"interface", u"address", u"port", u"debug",
1238
 
                   u"priority", u"servicename", u"configdir",
1239
 
                   u"use_dbus", u"use_ipv6"):
 
962
    for option in ("interface", "address", "port", "debug",
 
963
                   "priority", "servicename", "configdir",
 
964
                   "use_dbus"):
1240
965
        value = getattr(options, option)
1241
966
        if value is not None:
1242
967
            server_settings[option] = value
1243
968
    del options
1244
 
    # Force all strings to be unicode
1245
 
    for option in server_settings.keys():
1246
 
        if type(server_settings[option]) is str:
1247
 
            server_settings[option] = unicode(server_settings[option])
1248
969
    # Now we have our good server settings in "server_settings"
1249
970
    
1250
 
    ##################################################################
1251
 
    
1252
971
    # For convenience
1253
 
    debug = server_settings[u"debug"]
1254
 
    use_dbus = server_settings[u"use_dbus"]
1255
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
972
    debug = server_settings["debug"]
 
973
    use_dbus = server_settings["use_dbus"]
1256
974
    
1257
975
    if not debug:
1258
976
        syslogger.setLevel(logging.WARNING)
1259
977
        console.setLevel(logging.WARNING)
1260
978
    
1261
 
    if server_settings[u"servicename"] != u"Mandos":
 
979
    if server_settings["servicename"] != "Mandos":
1262
980
        syslogger.setFormatter(logging.Formatter
1263
 
                               (u'Mandos (%s) [%%(process)d]:'
1264
 
                                u' %%(levelname)s: %%(message)s'
1265
 
                                % server_settings[u"servicename"]))
 
981
                               ('Mandos (%s): %%(levelname)s:'
 
982
                                ' %%(message)s'
 
983
                                % server_settings["servicename"]))
1266
984
    
1267
985
    # Parse config file with clients
1268
 
    client_defaults = { u"timeout": u"1h",
1269
 
                        u"interval": u"5m",
1270
 
                        u"checker": u"fping -q -- %%(host)s",
1271
 
                        u"host": u"",
 
986
    client_defaults = { "timeout": "1h",
 
987
                        "interval": "5m",
 
988
                        "checker": "fping -q -- %%(host)s",
 
989
                        "host": "",
1272
990
                        }
1273
 
    client_config = configparser.SafeConfigParser(client_defaults)
1274
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1275
 
                                    u"clients.conf"))
1276
 
    
1277
 
    global mandos_dbus_service
1278
 
    mandos_dbus_service = None
1279
 
    
1280
 
    tcp_server = MandosServer((server_settings[u"address"],
1281
 
                               server_settings[u"port"]),
1282
 
                              ClientHandler,
1283
 
                              interface=server_settings[u"interface"],
1284
 
                              use_ipv6=use_ipv6,
1285
 
                              gnutls_priority=
1286
 
                              server_settings[u"priority"],
1287
 
                              use_dbus=use_dbus)
1288
 
    pidfilename = u"/var/run/mandos.pid"
 
991
    client_config = ConfigParser.SafeConfigParser(client_defaults)
 
992
    client_config.read(os.path.join(server_settings["configdir"],
 
993
                                    "clients.conf"))
 
994
    
 
995
    clients = Set()
 
996
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
997
                                 server_settings["port"]),
 
998
                                TCP_handler,
 
999
                                settings=server_settings,
 
1000
                                clients=clients)
 
1001
    pidfilename = "/var/run/mandos.pid"
1289
1002
    try:
1290
 
        pidfile = open(pidfilename, u"w")
 
1003
        pidfile = open(pidfilename, "w")
1291
1004
    except IOError:
1292
 
        logger.error(u"Could not open file %r", pidfilename)
 
1005
        logger.error("Could not open file %r", pidfilename)
1293
1006
    
1294
1007
    try:
1295
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1296
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1008
        uid = pwd.getpwnam("_mandos").pw_uid
 
1009
        gid = pwd.getpwnam("_mandos").pw_gid
1297
1010
    except KeyError:
1298
1011
        try:
1299
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1300
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1012
            uid = pwd.getpwnam("mandos").pw_uid
 
1013
            gid = pwd.getpwnam("mandos").pw_gid
1301
1014
        except KeyError:
1302
1015
            try:
1303
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1304
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1016
                uid = pwd.getpwnam("nobody").pw_uid
 
1017
                gid = pwd.getpwnam("nogroup").pw_gid
1305
1018
            except KeyError:
1306
1019
                uid = 65534
1307
1020
                gid = 65534
1320
1033
        
1321
1034
        @gnutls.library.types.gnutls_log_func
1322
1035
        def debug_gnutls(level, string):
1323
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1036
            logger.debug("GnuTLS: %s", string[:-1])
1324
1037
        
1325
1038
        (gnutls.library.functions
1326
1039
         .gnutls_global_set_log_function(debug_gnutls))
1327
1040
    
 
1041
    global service
 
1042
    service = AvahiService(name = server_settings["servicename"],
 
1043
                           servicetype = "_mandos._tcp", )
 
1044
    if server_settings["interface"]:
 
1045
        service.interface = (if_nametoindex
 
1046
                             (server_settings["interface"]))
 
1047
    
1328
1048
    global main_loop
 
1049
    global bus
 
1050
    global server
1329
1051
    # From the Avahi example code
1330
1052
    DBusGMainLoop(set_as_default=True )
1331
1053
    main_loop = gobject.MainLoop()
1332
1054
    bus = dbus.SystemBus()
 
1055
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1056
                                           avahi.DBUS_PATH_SERVER),
 
1057
                            avahi.DBUS_INTERFACE_SERVER)
1333
1058
    # End of Avahi example code
1334
1059
    if use_dbus:
1335
1060
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1336
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1337
 
    service = AvahiService(name = server_settings[u"servicename"],
1338
 
                           servicetype = u"_mandos._tcp",
1339
 
                           protocol = protocol, bus = bus)
1340
 
    if server_settings["interface"]:
1341
 
        service.interface = (if_nametoindex
1342
 
                             (str(server_settings[u"interface"])))
1343
1061
    
1344
 
    client_class = Client
1345
 
    if use_dbus:
1346
 
        client_class = functools.partial(ClientDBus, bus = bus)
1347
 
    tcp_server.clients.update(set(
1348
 
            client_class(name = section,
1349
 
                         config= dict(client_config.items(section)))
1350
 
            for section in client_config.sections()))
1351
 
    if not tcp_server.clients:
 
1062
    clients.update(Set(Client(name = section,
 
1063
                              config
 
1064
                              = dict(client_config.items(section)),
 
1065
                              use_dbus = use_dbus)
 
1066
                       for section in client_config.sections()))
 
1067
    if not clients:
1352
1068
        logger.warning(u"No clients defined")
1353
1069
    
1354
1070
    if debug:
1364
1080
        daemon()
1365
1081
    
1366
1082
    try:
1367
 
        with closing(pidfile):
1368
 
            pid = os.getpid()
1369
 
            pidfile.write(str(pid) + "\n")
 
1083
        pid = os.getpid()
 
1084
        pidfile.write(str(pid) + "\n")
 
1085
        pidfile.close()
1370
1086
        del pidfile
1371
1087
    except IOError:
1372
1088
        logger.error(u"Could not write to file %r with PID %d",
1378
1094
    
1379
1095
    def cleanup():
1380
1096
        "Cleanup function; run on exit"
1381
 
        service.cleanup()
 
1097
        global group
 
1098
        # From the Avahi example code
 
1099
        if not group is None:
 
1100
            group.Free()
 
1101
            group = None
 
1102
        # End of Avahi example code
1382
1103
        
1383
 
        while tcp_server.clients:
1384
 
            client = tcp_server.clients.pop()
 
1104
        while clients:
 
1105
            client = clients.pop()
1385
1106
            client.disable_hook = None
1386
1107
            client.disable()
1387
1108
    
1393
1114
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1394
1115
    
1395
1116
    if use_dbus:
1396
 
        class MandosDBusService(dbus.service.Object):
 
1117
        class MandosServer(dbus.service.Object):
1397
1118
            """A D-Bus proxy object"""
1398
1119
            def __init__(self):
1399
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1120
                dbus.service.Object.__init__(self, bus, "/")
1400
1121
            _interface = u"se.bsnet.fukt.Mandos"
1401
1122
            
1402
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
 
1123
            @dbus.service.signal(_interface, signature="oa{sv}")
1403
1124
            def ClientAdded(self, objpath, properties):
1404
1125
                "D-Bus signal"
1405
1126
                pass
1406
1127
            
1407
 
            @dbus.service.signal(_interface, signature=u"s")
1408
 
            def ClientNotFound(self, fingerprint):
1409
 
                "D-Bus signal"
1410
 
                pass
1411
 
            
1412
 
            @dbus.service.signal(_interface, signature=u"os")
 
1128
            @dbus.service.signal(_interface, signature="os")
1413
1129
            def ClientRemoved(self, objpath, name):
1414
1130
                "D-Bus signal"
1415
1131
                pass
1416
1132
            
1417
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1133
            @dbus.service.method(_interface, out_signature="ao")
1418
1134
            def GetAllClients(self):
1419
1135
                "D-Bus method"
1420
 
                return dbus.Array(c.dbus_object_path
1421
 
                                  for c in tcp_server.clients)
 
1136
                return dbus.Array(c.dbus_object_path for c in clients)
1422
1137
            
1423
 
            @dbus.service.method(_interface,
1424
 
                                 out_signature=u"a{oa{sv}}")
 
1138
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1425
1139
            def GetAllClientsWithProperties(self):
1426
1140
                "D-Bus method"
1427
1141
                return dbus.Dictionary(
1428
1142
                    ((c.dbus_object_path, c.GetAllProperties())
1429
 
                     for c in tcp_server.clients),
1430
 
                    signature=u"oa{sv}")
 
1143
                     for c in clients),
 
1144
                    signature="oa{sv}")
1431
1145
            
1432
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1146
            @dbus.service.method(_interface, in_signature="o")
1433
1147
            def RemoveClient(self, object_path):
1434
1148
                "D-Bus method"
1435
 
                for c in tcp_server.clients:
 
1149
                for c in clients:
1436
1150
                    if c.dbus_object_path == object_path:
1437
 
                        tcp_server.clients.remove(c)
1438
 
                        c.remove_from_connection()
 
1151
                        clients.remove(c)
1439
1152
                        # Don't signal anything except ClientRemoved
1440
 
                        c.disable(signal=False)
 
1153
                        c.use_dbus = False
 
1154
                        c.disable()
1441
1155
                        # Emit D-Bus signal
1442
1156
                        self.ClientRemoved(object_path, c.name)
1443
1157
                        return
1445
1159
            
1446
1160
            del _interface
1447
1161
        
1448
 
        mandos_dbus_service = MandosDBusService()
 
1162
        mandos_server = MandosServer()
1449
1163
    
1450
 
    for client in tcp_server.clients:
 
1164
    for client in clients:
1451
1165
        if use_dbus:
1452
1166
            # Emit D-Bus signal
1453
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1454
 
                                            client.GetAllProperties())
 
1167
            mandos_server.ClientAdded(client.dbus_object_path,
 
1168
                                      client.GetAllProperties())
1455
1169
        client.enable()
1456
1170
    
1457
1171
    tcp_server.enable()
1459
1173
    
1460
1174
    # Find out what port we got
1461
1175
    service.port = tcp_server.socket.getsockname()[1]
1462
 
    if use_ipv6:
1463
 
        logger.info(u"Now listening on address %r, port %d,"
1464
 
                    " flowinfo %d, scope_id %d"
1465
 
                    % tcp_server.socket.getsockname())
1466
 
    else:                       # IPv4
1467
 
        logger.info(u"Now listening on address %r, port %d"
1468
 
                    % tcp_server.socket.getsockname())
 
1176
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
1177
                u" scope_id %d" % tcp_server.socket.getsockname())
1469
1178
    
1470
1179
    #service.interface = tcp_server.socket.getsockname()[3]
1471
1180
    
1472
1181
    try:
1473
1182
        # From the Avahi example code
 
1183
        server.connect_to_signal("StateChanged", server_state_changed)
1474
1184
        try:
1475
 
            service.activate()
 
1185
            server_state_changed(server.GetState())
1476
1186
        except dbus.exceptions.DBusException, error:
1477
1187
            logger.critical(u"DBusException: %s", error)
1478
1188
            sys.exit(1)
1491
1201
    except KeyboardInterrupt:
1492
1202
        if debug:
1493
1203
            print >> sys.stderr
1494
 
        logger.debug(u"Server received KeyboardInterrupt")
1495
 
    logger.debug(u"Server exiting")
 
1204
        logger.debug("Server received KeyboardInterrupt")
 
1205
    logger.debug("Server exiting")
1496
1206
 
1497
1207
if __name__ == '__main__':
1498
1208
    main()