/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-01-18 00:16:57 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090118001657-6mo3ae73ldy5tegf
* debian/mandos-client.postinst: Converted to Bourne shell.  Also
                                 minor message change.
* debian/mandos-client.postrm: Minor message change.
* debian/mandos.postinst: Converted to Bourne shell.  Also minor
                          message change.
* debian/mandos.prerm: Minor message change.

Show diffs side-by-side

added added

removed removed

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