/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-04-17 01:16:37 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090417011637-bcqjpm7fskm4370v
Code cleanup and one bug fix.

* mandos (Client.enable): Bug fix: Do not enable if already enabled.
  (MandosServer.__init__): Create empty set of clients if none passed.
  (main): Do not create clients set; do not pass a clients set to
          MandosServer.  Use tcp_server.clients throughout.

Show diffs side-by-side

added added

removed removed

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