/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-14 18:07:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090214180705-vu6b7j4i2v2hibgg
Use "getconf" to get correct LFS compile and link flags.

* Makefile (GPGME_CFLAGS): Added output of "getconf LFS_CFLAGS".
  (GPGME_LIBS): Added output of "getconf LFS_LIBS" and
                "getconf LFS_LDFLAGS".
* plugins.d/mandos-client.c: Only define "_LARGEFILE_SOURCE" and
                             "_FILE_OFFSET_BITS" if they are not
                             already defined.

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