/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos-keygen (password): Remove bashism "${PIPESTATUS}".

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