/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

* debian/source/local-options: New; contains "--single-debian-patch".

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
38
 
import optparse
 
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
 
from contextlib import closing
 
59
import contextlib
59
60
import struct
60
61
import fcntl
61
62
import functools
 
63
import cPickle as pickle
 
64
import multiprocessing
 
65
import types
62
66
 
63
67
import dbus
64
68
import dbus.service
67
71
from dbus.mainloop.glib import DBusGMainLoop
68
72
import ctypes
69
73
import ctypes.util
 
74
import xml.dom.minidom
 
75
import inspect
70
76
 
71
77
try:
72
78
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
83
        SO_BINDTODEVICE = None
78
84
 
79
85
 
80
 
version = "1.0.10"
 
86
version = "1.3.1"
81
87
 
82
 
logger = logging.Logger(u'mandos')
 
88
#logger = logging.getLogger('mandos')
 
89
logger = logging.Logger('mandos')
83
90
syslogger = (logging.handlers.SysLogHandler
84
91
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
85
 
              address = "/dev/log"))
 
92
              address = str("/dev/log")))
86
93
syslogger.setFormatter(logging.Formatter
87
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
88
 
                        u' %(message)s'))
 
94
                       ('Mandos [%(process)d]: %(levelname)s:'
 
95
                        ' %(message)s'))
89
96
logger.addHandler(syslogger)
90
97
 
91
98
console = logging.StreamHandler()
92
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
 
                                       u' %(levelname)s:'
94
 
                                       u' %(message)s'))
 
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
100
                                       ' %(levelname)s:'
 
101
                                       ' %(message)s'))
95
102
logger.addHandler(console)
96
103
 
97
104
class AvahiError(Exception):
114
121
    Attributes:
115
122
    interface: integer; avahi.IF_UNSPEC or an interface index.
116
123
               Used to optionally bind to the specified interface.
117
 
    name: string; Example: u'Mandos'
118
 
    type: string; Example: u'_mandos._tcp'.
 
124
    name: string; Example: 'Mandos'
 
125
    type: string; Example: '_mandos._tcp'.
119
126
                  See <http://www.dns-sd.org/ServiceTypes.html>
120
127
    port: integer; what port to announce
121
128
    TXT: list of strings; TXT record for the service
130
137
    """
131
138
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
132
139
                 servicetype = None, port = None, TXT = None,
133
 
                 domain = u"", host = u"", max_renames = 32768,
 
140
                 domain = "", host = "", max_renames = 32768,
134
141
                 protocol = avahi.PROTO_UNSPEC, bus = None):
135
142
        self.interface = interface
136
143
        self.name = name
145
152
        self.group = None       # our entry group
146
153
        self.server = None
147
154
        self.bus = bus
 
155
        self.entry_group_state_changed_match = None
148
156
    def rename(self):
149
157
        """Derived from the Avahi example code"""
150
158
        if self.rename_count >= self.max_renames:
151
 
            logger.critical(u"No suitable Zeroconf service name found"
152
 
                            u" after %i retries, exiting.",
 
159
            logger.critical("No suitable Zeroconf service name found"
 
160
                            " after %i retries, exiting.",
153
161
                            self.rename_count)
154
 
            raise AvahiServiceError(u"Too many renames")
155
 
        self.name = self.server.GetAlternativeServiceName(self.name)
156
 
        logger.info(u"Changing Zeroconf service name to %r ...",
157
 
                    unicode(self.name))
 
162
            raise AvahiServiceError("Too many renames")
 
163
        self.name = unicode(self.server
 
164
                            .GetAlternativeServiceName(self.name))
 
165
        logger.info("Changing Zeroconf service name to %r ...",
 
166
                    self.name)
158
167
        syslogger.setFormatter(logging.Formatter
159
 
                               (u'Mandos (%s) [%%(process)d]:'
160
 
                                u' %%(levelname)s: %%(message)s'
 
168
                               ('Mandos (%s) [%%(process)d]:'
 
169
                                ' %%(levelname)s: %%(message)s'
161
170
                                % self.name))
162
171
        self.remove()
163
 
        self.add()
 
172
        try:
 
173
            self.add()
 
174
        except dbus.exceptions.DBusException as error:
 
175
            logger.critical("DBusException: %s", error)
 
176
            self.cleanup()
 
177
            os._exit(1)
164
178
        self.rename_count += 1
165
179
    def remove(self):
166
180
        """Derived from the Avahi example code"""
 
181
        if self.entry_group_state_changed_match is not None:
 
182
            self.entry_group_state_changed_match.remove()
 
183
            self.entry_group_state_changed_match = None
167
184
        if self.group is not None:
168
185
            self.group.Reset()
169
186
    def add(self):
170
187
        """Derived from the Avahi example code"""
 
188
        self.remove()
171
189
        if self.group is None:
172
190
            self.group = dbus.Interface(
173
191
                self.bus.get_object(avahi.DBUS_NAME,
174
192
                                    self.server.EntryGroupNew()),
175
193
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
 
            self.group.connect_to_signal('StateChanged',
177
 
                                         self.entry_group_state_changed)
178
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
194
        self.entry_group_state_changed_match = (
 
195
            self.group.connect_to_signal(
 
196
                'StateChanged', self .entry_group_state_changed))
 
197
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
179
198
                     self.name, self.type)
180
199
        self.group.AddService(
181
200
            self.interface,
188
207
        self.group.Commit()
189
208
    def entry_group_state_changed(self, state, error):
190
209
        """Derived from the Avahi example code"""
191
 
        logger.debug(u"Avahi state change: %i", state)
 
210
        logger.debug("Avahi entry group state change: %i", state)
192
211
        
193
212
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
 
            logger.debug(u"Zeroconf service established.")
 
213
            logger.debug("Zeroconf service established.")
195
214
        elif state == avahi.ENTRY_GROUP_COLLISION:
196
 
            logger.warning(u"Zeroconf service name collision.")
 
215
            logger.info("Zeroconf service name collision.")
197
216
            self.rename()
198
217
        elif state == avahi.ENTRY_GROUP_FAILURE:
199
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
218
            logger.critical("Avahi: Error in group state changed %s",
200
219
                            unicode(error))
201
 
            raise AvahiGroupError(u"State changed: %s"
 
220
            raise AvahiGroupError("State changed: %s"
202
221
                                  % unicode(error))
203
222
    def cleanup(self):
204
223
        """Derived from the Avahi example code"""
205
224
        if self.group is not None:
206
 
            self.group.Free()
 
225
            try:
 
226
                self.group.Free()
 
227
            except (dbus.exceptions.UnknownMethodException,
 
228
                    dbus.exceptions.DBusException) as e:
 
229
                pass
207
230
            self.group = None
208
 
    def server_state_changed(self, state):
 
231
        self.remove()
 
232
    def server_state_changed(self, state, error=None):
209
233
        """Derived from the Avahi example code"""
210
 
        if state == avahi.SERVER_COLLISION:
211
 
            logger.error(u"Zeroconf server name collision")
212
 
            self.remove()
 
234
        logger.debug("Avahi server state change: %i", state)
 
235
        bad_states = { avahi.SERVER_INVALID:
 
236
                           "Zeroconf server invalid",
 
237
                       avahi.SERVER_REGISTERING: None,
 
238
                       avahi.SERVER_COLLISION:
 
239
                           "Zeroconf server name collision",
 
240
                       avahi.SERVER_FAILURE:
 
241
                           "Zeroconf server failure" }
 
242
        if state in bad_states:
 
243
            if bad_states[state] is not None:
 
244
                if error is None:
 
245
                    logger.error(bad_states[state])
 
246
                else:
 
247
                    logger.error(bad_states[state] + ": %r", error)
 
248
            self.cleanup()
213
249
        elif state == avahi.SERVER_RUNNING:
214
250
            self.add()
 
251
        else:
 
252
            if error is None:
 
253
                logger.debug("Unknown state: %r", state)
 
254
            else:
 
255
                logger.debug("Unknown state: %r: %r", state, error)
215
256
    def activate(self):
216
257
        """Derived from the Avahi example code"""
217
258
        if self.server is None:
218
259
            self.server = dbus.Interface(
219
260
                self.bus.get_object(avahi.DBUS_NAME,
220
 
                                    avahi.DBUS_PATH_SERVER),
 
261
                                    avahi.DBUS_PATH_SERVER,
 
262
                                    follow_name_owner_changes=True),
221
263
                avahi.DBUS_INTERFACE_SERVER)
222
 
        self.server.connect_to_signal(u"StateChanged",
 
264
        self.server.connect_to_signal("StateChanged",
223
265
                                 self.server_state_changed)
224
266
        self.server_state_changed(self.server.GetState())
225
267
 
226
268
 
 
269
def _timedelta_to_milliseconds(td):
 
270
    "Convert a datetime.timedelta() to milliseconds"
 
271
    return ((td.days * 24 * 60 * 60 * 1000)
 
272
            + (td.seconds * 1000)
 
273
            + (td.microseconds // 1000))
 
274
        
227
275
class Client(object):
228
276
    """A representation of a client host served by this server.
229
277
    
230
278
    Attributes:
231
 
    name:       string; from the config file, used in log messages and
232
 
                        D-Bus identifiers
233
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
234
 
                 uniquely identify the client
235
 
    secret:     bytestring; sent verbatim (over TLS) to client
236
 
    host:       string; available for use by the checker command
237
 
    created:    datetime.datetime(); (UTC) object creation
238
 
    last_enabled: datetime.datetime(); (UTC)
239
 
    enabled:    bool()
240
 
    last_checked_ok: datetime.datetime(); (UTC) or None
241
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
242
 
                                      until this client is invalid
243
 
    interval:   datetime.timedelta(); How often to start a new checker
244
 
    disable_hook:  If set, called by disable() as disable_hook(self)
 
279
    _approved:   bool(); 'None' if not yet approved/disapproved
 
280
    approval_delay: datetime.timedelta(); Time to wait for approval
 
281
    approval_duration: datetime.timedelta(); Duration of one approval
245
282
    checker:    subprocess.Popen(); a running checker process used
246
283
                                    to see if the client lives.
247
284
                                    'None' if no process is running.
248
 
    checker_initiator_tag: a gobject event source tag, or None
249
 
    disable_initiator_tag:    - '' -
250
 
    checker_callback_tag:  - '' -
251
 
    checker_command: string; External command which is run to check if
252
 
                     client lives.  %() expansions are done at
 
285
    checker_callback_tag: a gobject event source tag, or None
 
286
    checker_command: string; External command which is run to check
 
287
                     if client lives.  %() expansions are done at
253
288
                     runtime with vars(self) as dict, so that for
254
289
                     instance %(name)s can be used in the command.
 
290
    checker_initiator_tag: a gobject event source tag, or None
 
291
    created:    datetime.datetime(); (UTC) object creation
255
292
    current_checker_command: string; current running checker_command
 
293
    disable_hook:  If set, called by disable() as disable_hook(self)
 
294
    disable_initiator_tag: a gobject event source tag, or None
 
295
    enabled:    bool()
 
296
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
297
                 uniquely identify the client
 
298
    host:       string; available for use by the checker command
 
299
    interval:   datetime.timedelta(); How often to start a new checker
 
300
    last_approval_request: datetime.datetime(); (UTC) or None
 
301
    last_checked_ok: datetime.datetime(); (UTC) or None
 
302
    last_enabled: datetime.datetime(); (UTC)
 
303
    name:       string; from the config file, used in log messages and
 
304
                        D-Bus identifiers
 
305
    secret:     bytestring; sent verbatim (over TLS) to client
 
306
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
307
                                      until this client is disabled
 
308
    extended_timeout:   extra long timeout when password has been sent
 
309
    runtime_expansions: Allowed attributes for runtime expansion.
 
310
    expires:    datetime.datetime(); time (UTC) when a client will be
 
311
                disabled, or None
256
312
    """
257
313
    
258
 
    @staticmethod
259
 
    def _datetime_to_milliseconds(dt):
260
 
        "Convert a datetime.datetime() to milliseconds"
261
 
        return ((dt.days * 24 * 60 * 60 * 1000)
262
 
                + (dt.seconds * 1000)
263
 
                + (dt.microseconds // 1000))
 
314
    runtime_expansions = ("approval_delay", "approval_duration",
 
315
                          "created", "enabled", "fingerprint",
 
316
                          "host", "interval", "last_checked_ok",
 
317
                          "last_enabled", "name", "timeout")
264
318
    
265
319
    def timeout_milliseconds(self):
266
320
        "Return the 'timeout' attribute in milliseconds"
267
 
        return self._datetime_to_milliseconds(self.timeout)
 
321
        return _timedelta_to_milliseconds(self.timeout)
 
322
    
 
323
    def extended_timeout_milliseconds(self):
 
324
        "Return the 'extended_timeout' attribute in milliseconds"
 
325
        return _timedelta_to_milliseconds(self.extended_timeout)
268
326
    
269
327
    def interval_milliseconds(self):
270
328
        "Return the 'interval' attribute in milliseconds"
271
 
        return self._datetime_to_milliseconds(self.interval)
 
329
        return _timedelta_to_milliseconds(self.interval)
 
330
    
 
331
    def approval_delay_milliseconds(self):
 
332
        return _timedelta_to_milliseconds(self.approval_delay)
272
333
    
273
334
    def __init__(self, name = None, disable_hook=None, config=None):
274
335
        """Note: the 'checker' key in 'config' sets the
277
338
        self.name = name
278
339
        if config is None:
279
340
            config = {}
280
 
        logger.debug(u"Creating client %r", self.name)
 
341
        logger.debug("Creating client %r", self.name)
281
342
        # Uppercase and remove spaces from fingerprint for later
282
343
        # comparison purposes with return value from the fingerprint()
283
344
        # function
284
 
        self.fingerprint = (config[u"fingerprint"].upper()
285
 
                            .replace(u" ", u""))
286
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
287
 
        if u"secret" in config:
288
 
            self.secret = config[u"secret"].decode(u"base64")
289
 
        elif u"secfile" in config:
290
 
            with closing(open(os.path.expanduser
291
 
                              (os.path.expandvars
292
 
                               (config[u"secfile"])))) as secfile:
 
345
        self.fingerprint = (config["fingerprint"].upper()
 
346
                            .replace(" ", ""))
 
347
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
348
        if "secret" in config:
 
349
            self.secret = config["secret"].decode("base64")
 
350
        elif "secfile" in config:
 
351
            with open(os.path.expanduser(os.path.expandvars
 
352
                                         (config["secfile"])),
 
353
                      "rb") as secfile:
293
354
                self.secret = secfile.read()
294
355
        else:
295
 
            raise TypeError(u"No secret or secfile for client %s"
 
356
            raise TypeError("No secret or secfile for client %s"
296
357
                            % self.name)
297
 
        self.host = config.get(u"host", u"")
 
358
        self.host = config.get("host", "")
298
359
        self.created = datetime.datetime.utcnow()
299
360
        self.enabled = False
 
361
        self.last_approval_request = None
300
362
        self.last_enabled = None
301
363
        self.last_checked_ok = None
302
 
        self.timeout = string_to_delta(config[u"timeout"])
303
 
        self.interval = string_to_delta(config[u"interval"])
 
364
        self.timeout = string_to_delta(config["timeout"])
 
365
        self.extended_timeout = string_to_delta(config
 
366
                                                ["extended_timeout"])
 
367
        self.interval = string_to_delta(config["interval"])
304
368
        self.disable_hook = disable_hook
305
369
        self.checker = None
306
370
        self.checker_initiator_tag = None
307
371
        self.disable_initiator_tag = None
 
372
        self.expires = None
308
373
        self.checker_callback_tag = None
309
 
        self.checker_command = config[u"checker"]
 
374
        self.checker_command = config["checker"]
310
375
        self.current_checker_command = None
311
376
        self.last_connect = None
 
377
        self._approved = None
 
378
        self.approved_by_default = config.get("approved_by_default",
 
379
                                              True)
 
380
        self.approvals_pending = 0
 
381
        self.approval_delay = string_to_delta(
 
382
            config["approval_delay"])
 
383
        self.approval_duration = string_to_delta(
 
384
            config["approval_duration"])
 
385
        self.changedstate = (multiprocessing_manager
 
386
                             .Condition(multiprocessing_manager
 
387
                                        .Lock()))
 
388
    
 
389
    def send_changedstate(self):
 
390
        self.changedstate.acquire()
 
391
        self.changedstate.notify_all()
 
392
        self.changedstate.release()
312
393
    
313
394
    def enable(self):
314
395
        """Start this client's checker and timeout hooks"""
315
 
        if getattr(self, u"enabled", False):
 
396
        if getattr(self, "enabled", False):
316
397
            # Already enabled
317
398
            return
318
 
        self.last_enabled = datetime.datetime.utcnow()
 
399
        self.send_changedstate()
319
400
        # Schedule a new checker to be started an 'interval' from now,
320
401
        # and every interval from then on.
321
402
        self.checker_initiator_tag = (gobject.timeout_add
322
403
                                      (self.interval_milliseconds(),
323
404
                                       self.start_checker))
324
 
        # Also start a new checker *right now*.
325
 
        self.start_checker()
326
405
        # Schedule a disable() when 'timeout' has passed
 
406
        self.expires = datetime.datetime.utcnow() + self.timeout
327
407
        self.disable_initiator_tag = (gobject.timeout_add
328
408
                                   (self.timeout_milliseconds(),
329
409
                                    self.disable))
330
410
        self.enabled = True
 
411
        self.last_enabled = datetime.datetime.utcnow()
 
412
        # Also start a new checker *right now*.
 
413
        self.start_checker()
331
414
    
332
 
    def disable(self):
 
415
    def disable(self, quiet=True):
333
416
        """Disable this client."""
334
417
        if not getattr(self, "enabled", False):
335
418
            return False
336
 
        logger.info(u"Disabling client %s", self.name)
337
 
        if getattr(self, u"disable_initiator_tag", False):
 
419
        if not quiet:
 
420
            self.send_changedstate()
 
421
        if not quiet:
 
422
            logger.info("Disabling client %s", self.name)
 
423
        if getattr(self, "disable_initiator_tag", False):
338
424
            gobject.source_remove(self.disable_initiator_tag)
339
425
            self.disable_initiator_tag = None
340
 
        if getattr(self, u"checker_initiator_tag", False):
 
426
        self.expires = None
 
427
        if getattr(self, "checker_initiator_tag", False):
341
428
            gobject.source_remove(self.checker_initiator_tag)
342
429
            self.checker_initiator_tag = None
343
430
        self.stop_checker()
358
445
        if os.WIFEXITED(condition):
359
446
            exitstatus = os.WEXITSTATUS(condition)
360
447
            if exitstatus == 0:
361
 
                logger.info(u"Checker for %(name)s succeeded",
 
448
                logger.info("Checker for %(name)s succeeded",
362
449
                            vars(self))
363
450
                self.checked_ok()
364
451
            else:
365
 
                logger.info(u"Checker for %(name)s failed",
 
452
                logger.info("Checker for %(name)s failed",
366
453
                            vars(self))
367
454
        else:
368
 
            logger.warning(u"Checker for %(name)s crashed?",
 
455
            logger.warning("Checker for %(name)s crashed?",
369
456
                           vars(self))
370
457
    
371
 
    def checked_ok(self):
 
458
    def checked_ok(self, timeout=None):
372
459
        """Bump up the timeout for this client.
373
460
        
374
461
        This should only be called when the client has been seen,
375
462
        alive and well.
376
463
        """
 
464
        if timeout is None:
 
465
            timeout = self.timeout
377
466
        self.last_checked_ok = datetime.datetime.utcnow()
378
467
        gobject.source_remove(self.disable_initiator_tag)
 
468
        self.expires = datetime.datetime.utcnow() + timeout
379
469
        self.disable_initiator_tag = (gobject.timeout_add
380
 
                                      (self.timeout_milliseconds(),
381
 
                                       self.disable))
 
470
                                      (_timedelta_to_milliseconds
 
471
                                       (timeout), self.disable))
 
472
    
 
473
    def need_approval(self):
 
474
        self.last_approval_request = datetime.datetime.utcnow()
382
475
    
383
476
    def start_checker(self):
384
477
        """Start a new checker subprocess if one is not running.
391
484
        # client would inevitably timeout, since no checker would get
392
485
        # a chance to run to completion.  If we instead leave running
393
486
        # checkers alone, the checker would have to take more time
394
 
        # than 'timeout' for the client to be declared invalid, which
395
 
        # is as it should be.
 
487
        # than 'timeout' for the client to be disabled, which is as it
 
488
        # should be.
396
489
        
397
490
        # If a checker exists, make sure it is not a zombie
398
 
        if self.checker is not None:
 
491
        try:
399
492
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
493
        except (AttributeError, OSError) as error:
 
494
            if (isinstance(error, OSError)
 
495
                and error.errno != errno.ECHILD):
 
496
                raise error
 
497
        else:
400
498
            if pid:
401
 
                logger.warning(u"Checker was a zombie")
 
499
                logger.warning("Checker was a zombie")
402
500
                gobject.source_remove(self.checker_callback_tag)
403
501
                self.checker_callback(pid, status,
404
502
                                      self.current_checker_command)
409
507
                command = self.checker_command % self.host
410
508
            except TypeError:
411
509
                # Escape attributes for the shell
412
 
                escaped_attrs = dict((key,
413
 
                                      re.escape(unicode(str(val),
414
 
                                                        errors=
415
 
                                                        u'replace')))
416
 
                                     for key, val in
417
 
                                     vars(self).iteritems())
 
510
                escaped_attrs = dict(
 
511
                    (attr,
 
512
                     re.escape(unicode(str(getattr(self, attr, "")),
 
513
                                       errors=
 
514
                                       'replace')))
 
515
                    for attr in
 
516
                    self.runtime_expansions)
 
517
                
418
518
                try:
419
519
                    command = self.checker_command % escaped_attrs
420
 
                except TypeError, error:
421
 
                    logger.error(u'Could not format string "%s":'
422
 
                                 u' %s', self.checker_command, error)
 
520
                except TypeError as error:
 
521
                    logger.error('Could not format string "%s":'
 
522
                                 ' %s', self.checker_command, error)
423
523
                    return True # Try again later
424
524
            self.current_checker_command = command
425
525
            try:
426
 
                logger.info(u"Starting checker %r for %s",
 
526
                logger.info("Starting checker %r for %s",
427
527
                            command, self.name)
428
528
                # We don't need to redirect stdout and stderr, since
429
529
                # in normal mode, that is already done by daemon(),
431
531
                # always replaced by /dev/null.)
432
532
                self.checker = subprocess.Popen(command,
433
533
                                                close_fds=True,
434
 
                                                shell=True, cwd=u"/")
 
534
                                                shell=True, cwd="/")
435
535
                self.checker_callback_tag = (gobject.child_watch_add
436
536
                                             (self.checker.pid,
437
537
                                              self.checker_callback,
442
542
                if pid:
443
543
                    gobject.source_remove(self.checker_callback_tag)
444
544
                    self.checker_callback(pid, status, command)
445
 
            except OSError, error:
446
 
                logger.error(u"Failed to start subprocess: %s",
 
545
            except OSError as error:
 
546
                logger.error("Failed to start subprocess: %s",
447
547
                             error)
448
548
        # Re-run this periodically if run by gobject.timeout_add
449
549
        return True
453
553
        if self.checker_callback_tag:
454
554
            gobject.source_remove(self.checker_callback_tag)
455
555
            self.checker_callback_tag = None
456
 
        if getattr(self, u"checker", None) is None:
 
556
        if getattr(self, "checker", None) is None:
457
557
            return
458
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
558
        logger.debug("Stopping checker for %(name)s", vars(self))
459
559
        try:
460
560
            os.kill(self.checker.pid, signal.SIGTERM)
461
 
            #os.sleep(0.5)
 
561
            #time.sleep(0.5)
462
562
            #if self.checker.poll() is None:
463
563
            #    os.kill(self.checker.pid, signal.SIGKILL)
464
 
        except OSError, error:
 
564
        except OSError as error:
465
565
            if error.errno != errno.ESRCH: # No such process
466
566
                raise
467
567
        self.checker = None
468
 
    
469
 
    def still_valid(self):
470
 
        """Has the timeout not yet passed for this client?"""
471
 
        if not getattr(self, u"enabled", False):
472
 
            return False
473
 
        now = datetime.datetime.utcnow()
474
 
        if self.last_checked_ok is None:
475
 
            return now < (self.created + self.timeout)
476
 
        else:
477
 
            return now < (self.last_checked_ok + self.timeout)
478
 
 
479
 
 
480
 
class ClientDBus(Client, dbus.service.Object):
 
568
 
 
569
 
 
570
def dbus_service_property(dbus_interface, signature="v",
 
571
                          access="readwrite", byte_arrays=False):
 
572
    """Decorators for marking methods of a DBusObjectWithProperties to
 
573
    become properties on the D-Bus.
 
574
    
 
575
    The decorated method will be called with no arguments by "Get"
 
576
    and with one argument by "Set".
 
577
    
 
578
    The parameters, where they are supported, are the same as
 
579
    dbus.service.method, except there is only "signature", since the
 
580
    type from Get() and the type sent to Set() is the same.
 
581
    """
 
582
    # Encoding deeply encoded byte arrays is not supported yet by the
 
583
    # "Set" method, so we fail early here:
 
584
    if byte_arrays and signature != "ay":
 
585
        raise ValueError("Byte arrays not supported for non-'ay'"
 
586
                         " signature %r" % signature)
 
587
    def decorator(func):
 
588
        func._dbus_is_property = True
 
589
        func._dbus_interface = dbus_interface
 
590
        func._dbus_signature = signature
 
591
        func._dbus_access = access
 
592
        func._dbus_name = func.__name__
 
593
        if func._dbus_name.endswith("_dbus_property"):
 
594
            func._dbus_name = func._dbus_name[:-14]
 
595
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
596
        return func
 
597
    return decorator
 
598
 
 
599
 
 
600
class DBusPropertyException(dbus.exceptions.DBusException):
 
601
    """A base class for D-Bus property-related exceptions
 
602
    """
 
603
    def __unicode__(self):
 
604
        return unicode(str(self))
 
605
 
 
606
 
 
607
class DBusPropertyAccessException(DBusPropertyException):
 
608
    """A property's access permissions disallows an operation.
 
609
    """
 
610
    pass
 
611
 
 
612
 
 
613
class DBusPropertyNotFound(DBusPropertyException):
 
614
    """An attempt was made to access a non-existing property.
 
615
    """
 
616
    pass
 
617
 
 
618
 
 
619
class DBusObjectWithProperties(dbus.service.Object):
 
620
    """A D-Bus object with properties.
 
621
    
 
622
    Classes inheriting from this can use the dbus_service_property
 
623
    decorator to expose methods as D-Bus properties.  It exposes the
 
624
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
625
    """
 
626
    
 
627
    @staticmethod
 
628
    def _is_dbus_property(obj):
 
629
        return getattr(obj, "_dbus_is_property", False)
 
630
    
 
631
    def _get_all_dbus_properties(self):
 
632
        """Returns a generator of (name, attribute) pairs
 
633
        """
 
634
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
635
                for cls in self.__class__.__mro__
 
636
                for name, prop in
 
637
                inspect.getmembers(cls, self._is_dbus_property))
 
638
    
 
639
    def _get_dbus_property(self, interface_name, property_name):
 
640
        """Returns a bound method if one exists which is a D-Bus
 
641
        property with the specified name and interface.
 
642
        """
 
643
        for cls in  self.__class__.__mro__:
 
644
            for name, value in (inspect.getmembers
 
645
                                (cls, self._is_dbus_property)):
 
646
                if (value._dbus_name == property_name
 
647
                    and value._dbus_interface == interface_name):
 
648
                    return value.__get__(self)
 
649
        
 
650
        # No such property
 
651
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
652
                                   + interface_name + "."
 
653
                                   + property_name)
 
654
    
 
655
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
656
                         out_signature="v")
 
657
    def Get(self, interface_name, property_name):
 
658
        """Standard D-Bus property Get() method, see D-Bus standard.
 
659
        """
 
660
        prop = self._get_dbus_property(interface_name, property_name)
 
661
        if prop._dbus_access == "write":
 
662
            raise DBusPropertyAccessException(property_name)
 
663
        value = prop()
 
664
        if not hasattr(value, "variant_level"):
 
665
            return value
 
666
        return type(value)(value, variant_level=value.variant_level+1)
 
667
    
 
668
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
669
    def Set(self, interface_name, property_name, value):
 
670
        """Standard D-Bus property Set() method, see D-Bus standard.
 
671
        """
 
672
        prop = self._get_dbus_property(interface_name, property_name)
 
673
        if prop._dbus_access == "read":
 
674
            raise DBusPropertyAccessException(property_name)
 
675
        if prop._dbus_get_args_options["byte_arrays"]:
 
676
            # The byte_arrays option is not supported yet on
 
677
            # signatures other than "ay".
 
678
            if prop._dbus_signature != "ay":
 
679
                raise ValueError
 
680
            value = dbus.ByteArray(''.join(unichr(byte)
 
681
                                           for byte in value))
 
682
        prop(value)
 
683
    
 
684
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
685
                         out_signature="a{sv}")
 
686
    def GetAll(self, interface_name):
 
687
        """Standard D-Bus property GetAll() method, see D-Bus
 
688
        standard.
 
689
        
 
690
        Note: Will not include properties with access="write".
 
691
        """
 
692
        all = {}
 
693
        for name, prop in self._get_all_dbus_properties():
 
694
            if (interface_name
 
695
                and interface_name != prop._dbus_interface):
 
696
                # Interface non-empty but did not match
 
697
                continue
 
698
            # Ignore write-only properties
 
699
            if prop._dbus_access == "write":
 
700
                continue
 
701
            value = prop()
 
702
            if not hasattr(value, "variant_level"):
 
703
                all[name] = value
 
704
                continue
 
705
            all[name] = type(value)(value, variant_level=
 
706
                                    value.variant_level+1)
 
707
        return dbus.Dictionary(all, signature="sv")
 
708
    
 
709
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
710
                         out_signature="s",
 
711
                         path_keyword='object_path',
 
712
                         connection_keyword='connection')
 
713
    def Introspect(self, object_path, connection):
 
714
        """Standard D-Bus method, overloaded to insert property tags.
 
715
        """
 
716
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
717
                                                   connection)
 
718
        try:
 
719
            document = xml.dom.minidom.parseString(xmlstring)
 
720
            def make_tag(document, name, prop):
 
721
                e = document.createElement("property")
 
722
                e.setAttribute("name", name)
 
723
                e.setAttribute("type", prop._dbus_signature)
 
724
                e.setAttribute("access", prop._dbus_access)
 
725
                return e
 
726
            for if_tag in document.getElementsByTagName("interface"):
 
727
                for tag in (make_tag(document, name, prop)
 
728
                            for name, prop
 
729
                            in self._get_all_dbus_properties()
 
730
                            if prop._dbus_interface
 
731
                            == if_tag.getAttribute("name")):
 
732
                    if_tag.appendChild(tag)
 
733
                # Add the names to the return values for the
 
734
                # "org.freedesktop.DBus.Properties" methods
 
735
                if (if_tag.getAttribute("name")
 
736
                    == "org.freedesktop.DBus.Properties"):
 
737
                    for cn in if_tag.getElementsByTagName("method"):
 
738
                        if cn.getAttribute("name") == "Get":
 
739
                            for arg in cn.getElementsByTagName("arg"):
 
740
                                if (arg.getAttribute("direction")
 
741
                                    == "out"):
 
742
                                    arg.setAttribute("name", "value")
 
743
                        elif cn.getAttribute("name") == "GetAll":
 
744
                            for arg in cn.getElementsByTagName("arg"):
 
745
                                if (arg.getAttribute("direction")
 
746
                                    == "out"):
 
747
                                    arg.setAttribute("name", "props")
 
748
            xmlstring = document.toxml("utf-8")
 
749
            document.unlink()
 
750
        except (AttributeError, xml.dom.DOMException,
 
751
                xml.parsers.expat.ExpatError) as error:
 
752
            logger.error("Failed to override Introspection method",
 
753
                         error)
 
754
        return xmlstring
 
755
 
 
756
 
 
757
def datetime_to_dbus (dt, variant_level=0):
 
758
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
759
    if dt is None:
 
760
        return dbus.String("", variant_level = variant_level)
 
761
    return dbus.String(dt.isoformat(),
 
762
                       variant_level=variant_level)
 
763
 
 
764
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
765
                                  .__metaclass__):
 
766
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
767
    will add additional D-Bus attributes matching a certain pattern.
 
768
    """
 
769
    def __new__(mcs, name, bases, attr):
 
770
        # Go through all the base classes which could have D-Bus
 
771
        # methods, signals, or properties in them
 
772
        for base in (b for b in bases
 
773
                     if issubclass(b, dbus.service.Object)):
 
774
            # Go though all attributes of the base class
 
775
            for attrname, attribute in inspect.getmembers(base):
 
776
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
777
                # with the wrong interface name
 
778
                if (not hasattr(attribute, "_dbus_interface")
 
779
                    or not attribute._dbus_interface
 
780
                    .startswith("se.recompile.Mandos")):
 
781
                    continue
 
782
                # Create an alternate D-Bus interface name based on
 
783
                # the current name
 
784
                alt_interface = (attribute._dbus_interface
 
785
                                 .replace("se.recompile.Mandos",
 
786
                                          "se.bsnet.fukt.Mandos"))
 
787
                # Is this a D-Bus signal?
 
788
                if getattr(attribute, "_dbus_is_signal", False):
 
789
                    # Extract the original non-method function by
 
790
                    # black magic
 
791
                    nonmethod_func = (dict(
 
792
                            zip(attribute.func_code.co_freevars,
 
793
                                attribute.__closure__))["func"]
 
794
                                      .cell_contents)
 
795
                    # Create a new, but exactly alike, function
 
796
                    # object, and decorate it to be a new D-Bus signal
 
797
                    # with the alternate D-Bus interface name
 
798
                    new_function = (dbus.service.signal
 
799
                                    (alt_interface,
 
800
                                     attribute._dbus_signature)
 
801
                                    (types.FunctionType(
 
802
                                nonmethod_func.func_code,
 
803
                                nonmethod_func.func_globals,
 
804
                                nonmethod_func.func_name,
 
805
                                nonmethod_func.func_defaults,
 
806
                                nonmethod_func.func_closure)))
 
807
                    # Define a creator of a function to call both the
 
808
                    # old and new functions, so both the old and new
 
809
                    # signals gets sent when the function is called
 
810
                    def fixscope(func1, func2):
 
811
                        """This function is a scope container to pass
 
812
                        func1 and func2 to the "call_both" function
 
813
                        outside of its arguments"""
 
814
                        def call_both(*args, **kwargs):
 
815
                            """This function will emit two D-Bus
 
816
                            signals by calling func1 and func2"""
 
817
                            func1(*args, **kwargs)
 
818
                            func2(*args, **kwargs)
 
819
                        return call_both
 
820
                    # Create the "call_both" function and add it to
 
821
                    # the class
 
822
                    attr[attrname] = fixscope(attribute,
 
823
                                              new_function)
 
824
                # Is this a D-Bus method?
 
825
                elif getattr(attribute, "_dbus_is_method", False):
 
826
                    # Create a new, but exactly alike, function
 
827
                    # object.  Decorate it to be a new D-Bus method
 
828
                    # with the alternate D-Bus interface name.  Add it
 
829
                    # to the class.
 
830
                    attr[attrname] = (dbus.service.method
 
831
                                      (alt_interface,
 
832
                                       attribute._dbus_in_signature,
 
833
                                       attribute._dbus_out_signature)
 
834
                                      (types.FunctionType
 
835
                                       (attribute.func_code,
 
836
                                        attribute.func_globals,
 
837
                                        attribute.func_name,
 
838
                                        attribute.func_defaults,
 
839
                                        attribute.func_closure)))
 
840
                # Is this a D-Bus property?
 
841
                elif getattr(attribute, "_dbus_is_property", False):
 
842
                    # Create a new, but exactly alike, function
 
843
                    # object, and decorate it to be a new D-Bus
 
844
                    # property with the alternate D-Bus interface
 
845
                    # name.  Add it to the class.
 
846
                    attr[attrname] = (dbus_service_property
 
847
                                      (alt_interface,
 
848
                                       attribute._dbus_signature,
 
849
                                       attribute._dbus_access,
 
850
                                       attribute
 
851
                                       ._dbus_get_args_options
 
852
                                       ["byte_arrays"])
 
853
                                      (types.FunctionType
 
854
                                       (attribute.func_code,
 
855
                                        attribute.func_globals,
 
856
                                        attribute.func_name,
 
857
                                        attribute.func_defaults,
 
858
                                        attribute.func_closure)))
 
859
        return type.__new__(mcs, name, bases, attr)
 
860
 
 
861
class ClientDBus(Client, DBusObjectWithProperties):
481
862
    """A Client class using D-Bus
482
863
    
483
864
    Attributes:
484
865
    dbus_object_path: dbus.ObjectPath
485
866
    bus: dbus.SystemBus()
486
867
    """
 
868
    
 
869
    runtime_expansions = (Client.runtime_expansions
 
870
                          + ("dbus_object_path",))
 
871
    
487
872
    # dbus.service.Object doesn't use super(), so we can't either.
488
873
    
489
874
    def __init__(self, bus = None, *args, **kwargs):
 
875
        self._approvals_pending = 0
490
876
        self.bus = bus
491
877
        Client.__init__(self, *args, **kwargs)
492
878
        # Only now, when this client is initialized, can it show up on
493
879
        # the D-Bus
 
880
        client_object_name = unicode(self.name).translate(
 
881
            {ord("."): ord("_"),
 
882
             ord("-"): ord("_")})
494
883
        self.dbus_object_path = (dbus.ObjectPath
495
 
                                 (u"/clients/"
496
 
                                  + self.name.replace(u".", u"_")))
497
 
        dbus.service.Object.__init__(self, self.bus,
498
 
                                     self.dbus_object_path)
499
 
    
500
 
    @staticmethod
501
 
    def _datetime_to_dbus(dt, variant_level=0):
502
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
503
 
        return dbus.String(dt.isoformat(),
504
 
                           variant_level=variant_level)
505
 
    
506
 
    def enable(self):
507
 
        oldstate = getattr(self, u"enabled", False)
508
 
        r = Client.enable(self)
509
 
        if oldstate != self.enabled:
510
 
            # Emit D-Bus signals
511
 
            self.PropertyChanged(dbus.String(u"enabled"),
512
 
                                 dbus.Boolean(True, variant_level=1))
513
 
            self.PropertyChanged(
514
 
                dbus.String(u"last_enabled"),
515
 
                self._datetime_to_dbus(self.last_enabled,
516
 
                                       variant_level=1))
517
 
        return r
518
 
    
519
 
    def disable(self, signal = True):
520
 
        oldstate = getattr(self, u"enabled", False)
521
 
        r = Client.disable(self)
522
 
        if signal and oldstate != self.enabled:
523
 
            # Emit D-Bus signal
524
 
            self.PropertyChanged(dbus.String(u"enabled"),
525
 
                                 dbus.Boolean(False, variant_level=1))
526
 
        return r
 
884
                                 ("/clients/" + client_object_name))
 
885
        DBusObjectWithProperties.__init__(self, self.bus,
 
886
                                          self.dbus_object_path)
 
887
        
 
888
    def notifychangeproperty(transform_func,
 
889
                             dbus_name, type_func=lambda x: x,
 
890
                             variant_level=1):
 
891
        """ Modify a variable so that it's a property which announces
 
892
        its changes to DBus.
 
893
 
 
894
        transform_fun: Function that takes a value and transforms it
 
895
                       to a D-Bus type.
 
896
        dbus_name: D-Bus name of the variable
 
897
        type_func: Function that transform the value before sending it
 
898
                   to the D-Bus.  Default: no transform
 
899
        variant_level: D-Bus variant level.  Default: 1
 
900
        """
 
901
        attrname = "_{0}".format(dbus_name)
 
902
        def setter(self, value):
 
903
            if hasattr(self, "dbus_object_path"):
 
904
                if (not hasattr(self, attrname) or
 
905
                    type_func(getattr(self, attrname, None))
 
906
                    != type_func(value)):
 
907
                    dbus_value = transform_func(type_func(value),
 
908
                                                variant_level)
 
909
                    self.PropertyChanged(dbus.String(dbus_name),
 
910
                                         dbus_value)
 
911
            setattr(self, attrname, value)
 
912
        
 
913
        return property(lambda self: getattr(self, attrname), setter)
 
914
    
 
915
    
 
916
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
917
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
918
                                             "ApprovalPending",
 
919
                                             type_func = bool)
 
920
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
921
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
922
                                        "LastEnabled")
 
923
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
924
                                   type_func = lambda checker:
 
925
                                       checker is not None)
 
926
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
927
                                           "LastCheckedOK")
 
928
    last_approval_request = notifychangeproperty(
 
929
        datetime_to_dbus, "LastApprovalRequest")
 
930
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
931
                                               "ApprovedByDefault")
 
932
    approval_delay = notifychangeproperty(dbus.UInt16,
 
933
                                          "ApprovalDelay",
 
934
                                          type_func =
 
935
                                          _timedelta_to_milliseconds)
 
936
    approval_duration = notifychangeproperty(
 
937
        dbus.UInt16, "ApprovalDuration",
 
938
        type_func = _timedelta_to_milliseconds)
 
939
    host = notifychangeproperty(dbus.String, "Host")
 
940
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
941
                                   type_func =
 
942
                                   _timedelta_to_milliseconds)
 
943
    extended_timeout = notifychangeproperty(
 
944
        dbus.UInt16, "ExtendedTimeout",
 
945
        type_func = _timedelta_to_milliseconds)
 
946
    interval = notifychangeproperty(dbus.UInt16,
 
947
                                    "Interval",
 
948
                                    type_func =
 
949
                                    _timedelta_to_milliseconds)
 
950
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
951
    
 
952
    del notifychangeproperty
527
953
    
528
954
    def __del__(self, *args, **kwargs):
529
955
        try:
530
956
            self.remove_from_connection()
531
957
        except LookupError:
532
958
            pass
533
 
        if hasattr(dbus.service.Object, u"__del__"):
534
 
            dbus.service.Object.__del__(self, *args, **kwargs)
 
959
        if hasattr(DBusObjectWithProperties, "__del__"):
 
960
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
535
961
        Client.__del__(self, *args, **kwargs)
536
962
    
537
963
    def checker_callback(self, pid, condition, command,
538
964
                         *args, **kwargs):
539
965
        self.checker_callback_tag = None
540
966
        self.checker = None
541
 
        # Emit D-Bus signal
542
 
        self.PropertyChanged(dbus.String(u"checker_running"),
543
 
                             dbus.Boolean(False, variant_level=1))
544
967
        if os.WIFEXITED(condition):
545
968
            exitstatus = os.WEXITSTATUS(condition)
546
969
            # Emit D-Bus signal
556
979
        return Client.checker_callback(self, pid, condition, command,
557
980
                                       *args, **kwargs)
558
981
    
559
 
    def checked_ok(self, *args, **kwargs):
560
 
        r = Client.checked_ok(self, *args, **kwargs)
561
 
        # Emit D-Bus signal
562
 
        self.PropertyChanged(
563
 
            dbus.String(u"last_checked_ok"),
564
 
            (self._datetime_to_dbus(self.last_checked_ok,
565
 
                                    variant_level=1)))
566
 
        return r
567
 
    
568
982
    def start_checker(self, *args, **kwargs):
569
983
        old_checker = self.checker
570
984
        if self.checker is not None:
577
991
            and old_checker_pid != self.checker.pid):
578
992
            # Emit D-Bus signal
579
993
            self.CheckerStarted(self.current_checker_command)
580
 
            self.PropertyChanged(
581
 
                dbus.String(u"checker_running"),
582
 
                dbus.Boolean(True, variant_level=1))
583
 
        return r
584
 
    
585
 
    def stop_checker(self, *args, **kwargs):
586
 
        old_checker = getattr(self, u"checker", None)
587
 
        r = Client.stop_checker(self, *args, **kwargs)
588
 
        if (old_checker is not None
589
 
            and getattr(self, u"checker", None) is None):
590
 
            self.PropertyChanged(dbus.String(u"checker_running"),
591
 
                                 dbus.Boolean(False, variant_level=1))
592
 
        return r
593
 
    
594
 
    ## D-Bus methods & signals
595
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
596
 
    
597
 
    # CheckedOK - method
598
 
    @dbus.service.method(_interface)
599
 
    def CheckedOK(self):
600
 
        return self.checked_ok()
 
994
        return r
 
995
    
 
996
    def _reset_approved(self):
 
997
        self._approved = None
 
998
        return False
 
999
    
 
1000
    def approve(self, value=True):
 
1001
        self.send_changedstate()
 
1002
        self._approved = value
 
1003
        gobject.timeout_add(_timedelta_to_milliseconds
 
1004
                            (self.approval_duration),
 
1005
                            self._reset_approved)
 
1006
    
 
1007
    
 
1008
    ## D-Bus methods, signals & properties
 
1009
    _interface = "se.recompile.Mandos.Client"
 
1010
    
 
1011
    ## Signals
601
1012
    
602
1013
    # CheckerCompleted - signal
603
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
1014
    @dbus.service.signal(_interface, signature="nxs")
604
1015
    def CheckerCompleted(self, exitcode, waitstatus, command):
605
1016
        "D-Bus signal"
606
1017
        pass
607
1018
    
608
1019
    # CheckerStarted - signal
609
 
    @dbus.service.signal(_interface, signature=u"s")
 
1020
    @dbus.service.signal(_interface, signature="s")
610
1021
    def CheckerStarted(self, command):
611
1022
        "D-Bus signal"
612
1023
        pass
613
1024
    
614
 
    # GetAllProperties - method
615
 
    @dbus.service.method(_interface, out_signature=u"a{sv}")
616
 
    def GetAllProperties(self):
617
 
        "D-Bus method"
618
 
        return dbus.Dictionary({
619
 
                dbus.String(u"name"):
620
 
                    dbus.String(self.name, variant_level=1),
621
 
                dbus.String(u"fingerprint"):
622
 
                    dbus.String(self.fingerprint, variant_level=1),
623
 
                dbus.String(u"host"):
624
 
                    dbus.String(self.host, variant_level=1),
625
 
                dbus.String(u"created"):
626
 
                    self._datetime_to_dbus(self.created,
627
 
                                           variant_level=1),
628
 
                dbus.String(u"last_enabled"):
629
 
                    (self._datetime_to_dbus(self.last_enabled,
630
 
                                            variant_level=1)
631
 
                     if self.last_enabled is not None
632
 
                     else dbus.Boolean(False, variant_level=1)),
633
 
                dbus.String(u"enabled"):
634
 
                    dbus.Boolean(self.enabled, variant_level=1),
635
 
                dbus.String(u"last_checked_ok"):
636
 
                    (self._datetime_to_dbus(self.last_checked_ok,
637
 
                                            variant_level=1)
638
 
                     if self.last_checked_ok is not None
639
 
                     else dbus.Boolean (False, variant_level=1)),
640
 
                dbus.String(u"timeout"):
641
 
                    dbus.UInt64(self.timeout_milliseconds(),
642
 
                                variant_level=1),
643
 
                dbus.String(u"interval"):
644
 
                    dbus.UInt64(self.interval_milliseconds(),
645
 
                                variant_level=1),
646
 
                dbus.String(u"checker"):
647
 
                    dbus.String(self.checker_command,
648
 
                                variant_level=1),
649
 
                dbus.String(u"checker_running"):
650
 
                    dbus.Boolean(self.checker is not None,
651
 
                                 variant_level=1),
652
 
                dbus.String(u"object_path"):
653
 
                    dbus.ObjectPath(self.dbus_object_path,
654
 
                                    variant_level=1)
655
 
                }, signature=u"sv")
656
 
    
657
 
    # IsStillValid - method
658
 
    @dbus.service.method(_interface, out_signature=u"b")
659
 
    def IsStillValid(self):
660
 
        return self.still_valid()
661
 
    
662
1025
    # PropertyChanged - signal
663
 
    @dbus.service.signal(_interface, signature=u"sv")
 
1026
    @dbus.service.signal(_interface, signature="sv")
664
1027
    def PropertyChanged(self, property, value):
665
1028
        "D-Bus signal"
666
1029
        pass
667
1030
    
668
 
    # ReceivedSecret - signal
 
1031
    # GotSecret - signal
669
1032
    @dbus.service.signal(_interface)
670
 
    def ReceivedSecret(self):
671
 
        "D-Bus signal"
 
1033
    def GotSecret(self):
 
1034
        """D-Bus signal
 
1035
        Is sent after a successful transfer of secret from the Mandos
 
1036
        server to mandos-client
 
1037
        """
672
1038
        pass
673
1039
    
674
1040
    # Rejected - signal
675
 
    @dbus.service.signal(_interface)
676
 
    def Rejected(self):
 
1041
    @dbus.service.signal(_interface, signature="s")
 
1042
    def Rejected(self, reason):
677
1043
        "D-Bus signal"
678
1044
        pass
679
1045
    
680
 
    # SetChecker - method
681
 
    @dbus.service.method(_interface, in_signature=u"s")
682
 
    def SetChecker(self, checker):
683
 
        "D-Bus setter method"
684
 
        self.checker_command = checker
685
 
        # Emit D-Bus signal
686
 
        self.PropertyChanged(dbus.String(u"checker"),
687
 
                             dbus.String(self.checker_command,
688
 
                                         variant_level=1))
689
 
    
690
 
    # SetHost - method
691
 
    @dbus.service.method(_interface, in_signature=u"s")
692
 
    def SetHost(self, host):
693
 
        "D-Bus setter method"
694
 
        self.host = host
695
 
        # Emit D-Bus signal
696
 
        self.PropertyChanged(dbus.String(u"host"),
697
 
                             dbus.String(self.host, variant_level=1))
698
 
    
699
 
    # SetInterval - method
700
 
    @dbus.service.method(_interface, in_signature=u"t")
701
 
    def SetInterval(self, milliseconds):
702
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
 
        # Emit D-Bus signal
704
 
        self.PropertyChanged(dbus.String(u"interval"),
705
 
                             (dbus.UInt64(self.interval_milliseconds(),
706
 
                                          variant_level=1)))
707
 
    
708
 
    # SetSecret - method
709
 
    @dbus.service.method(_interface, in_signature=u"ay",
710
 
                         byte_arrays=True)
711
 
    def SetSecret(self, secret):
712
 
        "D-Bus setter method"
713
 
        self.secret = str(secret)
714
 
    
715
 
    # SetTimeout - method
716
 
    @dbus.service.method(_interface, in_signature=u"t")
717
 
    def SetTimeout(self, milliseconds):
718
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
 
        # Emit D-Bus signal
720
 
        self.PropertyChanged(dbus.String(u"timeout"),
721
 
                             (dbus.UInt64(self.timeout_milliseconds(),
722
 
                                          variant_level=1)))
 
1046
    # NeedApproval - signal
 
1047
    @dbus.service.signal(_interface, signature="tb")
 
1048
    def NeedApproval(self, timeout, default):
 
1049
        "D-Bus signal"
 
1050
        return self.need_approval()
 
1051
    
 
1052
    ## Methods
 
1053
    
 
1054
    # Approve - method
 
1055
    @dbus.service.method(_interface, in_signature="b")
 
1056
    def Approve(self, value):
 
1057
        self.approve(value)
 
1058
    
 
1059
    # CheckedOK - method
 
1060
    @dbus.service.method(_interface)
 
1061
    def CheckedOK(self):
 
1062
        self.checked_ok()
723
1063
    
724
1064
    # Enable - method
725
1065
    @dbus.service.method(_interface)
744
1084
    def StopChecker(self):
745
1085
        self.stop_checker()
746
1086
    
 
1087
    ## Properties
 
1088
    
 
1089
    # ApprovalPending - property
 
1090
    @dbus_service_property(_interface, signature="b", access="read")
 
1091
    def ApprovalPending_dbus_property(self):
 
1092
        return dbus.Boolean(bool(self.approvals_pending))
 
1093
    
 
1094
    # ApprovedByDefault - property
 
1095
    @dbus_service_property(_interface, signature="b",
 
1096
                           access="readwrite")
 
1097
    def ApprovedByDefault_dbus_property(self, value=None):
 
1098
        if value is None:       # get
 
1099
            return dbus.Boolean(self.approved_by_default)
 
1100
        self.approved_by_default = bool(value)
 
1101
    
 
1102
    # ApprovalDelay - property
 
1103
    @dbus_service_property(_interface, signature="t",
 
1104
                           access="readwrite")
 
1105
    def ApprovalDelay_dbus_property(self, value=None):
 
1106
        if value is None:       # get
 
1107
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1108
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1109
    
 
1110
    # ApprovalDuration - property
 
1111
    @dbus_service_property(_interface, signature="t",
 
1112
                           access="readwrite")
 
1113
    def ApprovalDuration_dbus_property(self, value=None):
 
1114
        if value is None:       # get
 
1115
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1116
                    self.approval_duration))
 
1117
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1118
    
 
1119
    # Name - property
 
1120
    @dbus_service_property(_interface, signature="s", access="read")
 
1121
    def Name_dbus_property(self):
 
1122
        return dbus.String(self.name)
 
1123
    
 
1124
    # Fingerprint - property
 
1125
    @dbus_service_property(_interface, signature="s", access="read")
 
1126
    def Fingerprint_dbus_property(self):
 
1127
        return dbus.String(self.fingerprint)
 
1128
    
 
1129
    # Host - property
 
1130
    @dbus_service_property(_interface, signature="s",
 
1131
                           access="readwrite")
 
1132
    def Host_dbus_property(self, value=None):
 
1133
        if value is None:       # get
 
1134
            return dbus.String(self.host)
 
1135
        self.host = value
 
1136
    
 
1137
    # Created - property
 
1138
    @dbus_service_property(_interface, signature="s", access="read")
 
1139
    def Created_dbus_property(self):
 
1140
        return dbus.String(datetime_to_dbus(self.created))
 
1141
    
 
1142
    # LastEnabled - property
 
1143
    @dbus_service_property(_interface, signature="s", access="read")
 
1144
    def LastEnabled_dbus_property(self):
 
1145
        return datetime_to_dbus(self.last_enabled)
 
1146
    
 
1147
    # Enabled - property
 
1148
    @dbus_service_property(_interface, signature="b",
 
1149
                           access="readwrite")
 
1150
    def Enabled_dbus_property(self, value=None):
 
1151
        if value is None:       # get
 
1152
            return dbus.Boolean(self.enabled)
 
1153
        if value:
 
1154
            self.enable()
 
1155
        else:
 
1156
            self.disable()
 
1157
    
 
1158
    # LastCheckedOK - property
 
1159
    @dbus_service_property(_interface, signature="s",
 
1160
                           access="readwrite")
 
1161
    def LastCheckedOK_dbus_property(self, value=None):
 
1162
        if value is not None:
 
1163
            self.checked_ok()
 
1164
            return
 
1165
        return datetime_to_dbus(self.last_checked_ok)
 
1166
    
 
1167
    # Expires - property
 
1168
    @dbus_service_property(_interface, signature="s", access="read")
 
1169
    def Expires_dbus_property(self):
 
1170
        return datetime_to_dbus(self.expires)
 
1171
    
 
1172
    # LastApprovalRequest - property
 
1173
    @dbus_service_property(_interface, signature="s", access="read")
 
1174
    def LastApprovalRequest_dbus_property(self):
 
1175
        return datetime_to_dbus(self.last_approval_request)
 
1176
    
 
1177
    # Timeout - property
 
1178
    @dbus_service_property(_interface, signature="t",
 
1179
                           access="readwrite")
 
1180
    def Timeout_dbus_property(self, value=None):
 
1181
        if value is None:       # get
 
1182
            return dbus.UInt64(self.timeout_milliseconds())
 
1183
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1184
        if getattr(self, "disable_initiator_tag", None) is None:
 
1185
            return
 
1186
        # Reschedule timeout
 
1187
        gobject.source_remove(self.disable_initiator_tag)
 
1188
        self.disable_initiator_tag = None
 
1189
        self.expires = None
 
1190
        time_to_die = (self.
 
1191
                       _timedelta_to_milliseconds((self
 
1192
                                                   .last_checked_ok
 
1193
                                                   + self.timeout)
 
1194
                                                  - datetime.datetime
 
1195
                                                  .utcnow()))
 
1196
        if time_to_die <= 0:
 
1197
            # The timeout has passed
 
1198
            self.disable()
 
1199
        else:
 
1200
            self.expires = (datetime.datetime.utcnow()
 
1201
                            + datetime.timedelta(milliseconds =
 
1202
                                                 time_to_die))
 
1203
            self.disable_initiator_tag = (gobject.timeout_add
 
1204
                                          (time_to_die, self.disable))
 
1205
    
 
1206
    # ExtendedTimeout - property
 
1207
    @dbus_service_property(_interface, signature="t",
 
1208
                           access="readwrite")
 
1209
    def ExtendedTimeout_dbus_property(self, value=None):
 
1210
        if value is None:       # get
 
1211
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1212
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1213
    
 
1214
    # Interval - property
 
1215
    @dbus_service_property(_interface, signature="t",
 
1216
                           access="readwrite")
 
1217
    def Interval_dbus_property(self, value=None):
 
1218
        if value is None:       # get
 
1219
            return dbus.UInt64(self.interval_milliseconds())
 
1220
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1221
        if getattr(self, "checker_initiator_tag", None) is None:
 
1222
            return
 
1223
        # Reschedule checker run
 
1224
        gobject.source_remove(self.checker_initiator_tag)
 
1225
        self.checker_initiator_tag = (gobject.timeout_add
 
1226
                                      (value, self.start_checker))
 
1227
        self.start_checker()    # Start one now, too
 
1228
    
 
1229
    # Checker - property
 
1230
    @dbus_service_property(_interface, signature="s",
 
1231
                           access="readwrite")
 
1232
    def Checker_dbus_property(self, value=None):
 
1233
        if value is None:       # get
 
1234
            return dbus.String(self.checker_command)
 
1235
        self.checker_command = value
 
1236
    
 
1237
    # CheckerRunning - property
 
1238
    @dbus_service_property(_interface, signature="b",
 
1239
                           access="readwrite")
 
1240
    def CheckerRunning_dbus_property(self, value=None):
 
1241
        if value is None:       # get
 
1242
            return dbus.Boolean(self.checker is not None)
 
1243
        if value:
 
1244
            self.start_checker()
 
1245
        else:
 
1246
            self.stop_checker()
 
1247
    
 
1248
    # ObjectPath - property
 
1249
    @dbus_service_property(_interface, signature="o", access="read")
 
1250
    def ObjectPath_dbus_property(self):
 
1251
        return self.dbus_object_path # is already a dbus.ObjectPath
 
1252
    
 
1253
    # Secret = property
 
1254
    @dbus_service_property(_interface, signature="ay",
 
1255
                           access="write", byte_arrays=True)
 
1256
    def Secret_dbus_property(self, value):
 
1257
        self.secret = str(value)
 
1258
    
747
1259
    del _interface
748
1260
 
749
1261
 
 
1262
class ProxyClient(object):
 
1263
    def __init__(self, child_pipe, fpr, address):
 
1264
        self._pipe = child_pipe
 
1265
        self._pipe.send(('init', fpr, address))
 
1266
        if not self._pipe.recv():
 
1267
            raise KeyError()
 
1268
    
 
1269
    def __getattribute__(self, name):
 
1270
        if(name == '_pipe'):
 
1271
            return super(ProxyClient, self).__getattribute__(name)
 
1272
        self._pipe.send(('getattr', name))
 
1273
        data = self._pipe.recv()
 
1274
        if data[0] == 'data':
 
1275
            return data[1]
 
1276
        if data[0] == 'function':
 
1277
            def func(*args, **kwargs):
 
1278
                self._pipe.send(('funcall', name, args, kwargs))
 
1279
                return self._pipe.recv()[1]
 
1280
            return func
 
1281
    
 
1282
    def __setattr__(self, name, value):
 
1283
        if(name == '_pipe'):
 
1284
            return super(ProxyClient, self).__setattr__(name, value)
 
1285
        self._pipe.send(('setattr', name, value))
 
1286
 
 
1287
class ClientDBusTransitional(ClientDBus):
 
1288
    __metaclass__ = AlternateDBusNamesMetaclass
 
1289
 
750
1290
class ClientHandler(socketserver.BaseRequestHandler, object):
751
1291
    """A class to handle client connections.
752
1292
    
754
1294
    Note: This will run in its own forked process."""
755
1295
    
756
1296
    def handle(self):
757
 
        logger.info(u"TCP connection from: %s",
758
 
                    unicode(self.client_address))
759
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
 
        # Open IPC pipe to parent process
761
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
1297
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1298
            logger.info("TCP connection from: %s",
 
1299
                        unicode(self.client_address))
 
1300
            logger.debug("Pipe FD: %d",
 
1301
                         self.server.child_pipe.fileno())
 
1302
            
762
1303
            session = (gnutls.connection
763
1304
                       .ClientSession(self.request,
764
1305
                                      gnutls.connection
765
1306
                                      .X509Credentials()))
766
1307
            
767
 
            line = self.request.makefile().readline()
768
 
            logger.debug(u"Protocol version: %r", line)
769
 
            try:
770
 
                if int(line.strip().split()[0]) > 1:
771
 
                    raise RuntimeError
772
 
            except (ValueError, IndexError, RuntimeError), error:
773
 
                logger.error(u"Unknown protocol version: %s", error)
774
 
                return
775
 
            
776
1308
            # Note: gnutls.connection.X509Credentials is really a
777
1309
            # generic GnuTLS certificate credentials object so long as
778
1310
            # no X.509 keys are added to it.  Therefore, we can use it
779
1311
            # here despite using OpenPGP certificates.
780
1312
            
781
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
 
            #                      u"+AES-256-CBC", u"+SHA1",
783
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
784
 
            #                      u"+DHE-DSS"))
 
1313
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1314
            #                      "+AES-256-CBC", "+SHA1",
 
1315
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1316
            #                      "+DHE-DSS"))
785
1317
            # Use a fallback default, since this MUST be set.
786
1318
            priority = self.server.gnutls_priority
787
1319
            if priority is None:
788
 
                priority = u"NORMAL"
 
1320
                priority = "NORMAL"
789
1321
            (gnutls.library.functions
790
1322
             .gnutls_priority_set_direct(session._c_object,
791
1323
                                         priority, None))
792
1324
            
 
1325
            # Start communication using the Mandos protocol
 
1326
            # Get protocol number
 
1327
            line = self.request.makefile().readline()
 
1328
            logger.debug("Protocol version: %r", line)
 
1329
            try:
 
1330
                if int(line.strip().split()[0]) > 1:
 
1331
                    raise RuntimeError
 
1332
            except (ValueError, IndexError, RuntimeError) as error:
 
1333
                logger.error("Unknown protocol version: %s", error)
 
1334
                return
 
1335
            
 
1336
            # Start GnuTLS connection
793
1337
            try:
794
1338
                session.handshake()
795
 
            except gnutls.errors.GNUTLSError, error:
796
 
                logger.warning(u"Handshake failed: %s", error)
 
1339
            except gnutls.errors.GNUTLSError as error:
 
1340
                logger.warning("Handshake failed: %s", error)
797
1341
                # Do not run session.bye() here: the session is not
798
1342
                # established.  Just abandon the request.
799
1343
                return
800
 
            logger.debug(u"Handshake succeeded")
 
1344
            logger.debug("Handshake succeeded")
 
1345
            
 
1346
            approval_required = False
801
1347
            try:
802
 
                fpr = self.fingerprint(self.peer_certificate(session))
803
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
804
 
                logger.warning(u"Bad certificate: %s", error)
805
 
                session.bye()
806
 
                return
807
 
            logger.debug(u"Fingerprint: %s", fpr)
 
1348
                try:
 
1349
                    fpr = self.fingerprint(self.peer_certificate
 
1350
                                           (session))
 
1351
                except (TypeError,
 
1352
                        gnutls.errors.GNUTLSError) as error:
 
1353
                    logger.warning("Bad certificate: %s", error)
 
1354
                    return
 
1355
                logger.debug("Fingerprint: %s", fpr)
 
1356
                
 
1357
                try:
 
1358
                    client = ProxyClient(child_pipe, fpr,
 
1359
                                         self.client_address)
 
1360
                except KeyError:
 
1361
                    return
 
1362
                
 
1363
                if client.approval_delay:
 
1364
                    delay = client.approval_delay
 
1365
                    client.approvals_pending += 1
 
1366
                    approval_required = True
 
1367
                
 
1368
                while True:
 
1369
                    if not client.enabled:
 
1370
                        logger.info("Client %s is disabled",
 
1371
                                       client.name)
 
1372
                        if self.server.use_dbus:
 
1373
                            # Emit D-Bus signal
 
1374
                            client.Rejected("Disabled")
 
1375
                        return
 
1376
                    
 
1377
                    if client._approved or not client.approval_delay:
 
1378
                        #We are approved or approval is disabled
 
1379
                        break
 
1380
                    elif client._approved is None:
 
1381
                        logger.info("Client %s needs approval",
 
1382
                                    client.name)
 
1383
                        if self.server.use_dbus:
 
1384
                            # Emit D-Bus signal
 
1385
                            client.NeedApproval(
 
1386
                                client.approval_delay_milliseconds(),
 
1387
                                client.approved_by_default)
 
1388
                    else:
 
1389
                        logger.warning("Client %s was not approved",
 
1390
                                       client.name)
 
1391
                        if self.server.use_dbus:
 
1392
                            # Emit D-Bus signal
 
1393
                            client.Rejected("Denied")
 
1394
                        return
 
1395
                    
 
1396
                    #wait until timeout or approved
 
1397
                    #x = float(client
 
1398
                    #          ._timedelta_to_milliseconds(delay))
 
1399
                    time = datetime.datetime.now()
 
1400
                    client.changedstate.acquire()
 
1401
                    (client.changedstate.wait
 
1402
                     (float(client._timedelta_to_milliseconds(delay)
 
1403
                            / 1000)))
 
1404
                    client.changedstate.release()
 
1405
                    time2 = datetime.datetime.now()
 
1406
                    if (time2 - time) >= delay:
 
1407
                        if not client.approved_by_default:
 
1408
                            logger.warning("Client %s timed out while"
 
1409
                                           " waiting for approval",
 
1410
                                           client.name)
 
1411
                            if self.server.use_dbus:
 
1412
                                # Emit D-Bus signal
 
1413
                                client.Rejected("Approval timed out")
 
1414
                            return
 
1415
                        else:
 
1416
                            break
 
1417
                    else:
 
1418
                        delay -= time2 - time
 
1419
                
 
1420
                sent_size = 0
 
1421
                while sent_size < len(client.secret):
 
1422
                    try:
 
1423
                        sent = session.send(client.secret[sent_size:])
 
1424
                    except gnutls.errors.GNUTLSError as error:
 
1425
                        logger.warning("gnutls send failed")
 
1426
                        return
 
1427
                    logger.debug("Sent: %d, remaining: %d",
 
1428
                                 sent, len(client.secret)
 
1429
                                 - (sent_size + sent))
 
1430
                    sent_size += sent
 
1431
                
 
1432
                logger.info("Sending secret to %s", client.name)
 
1433
                # bump the timeout as if seen
 
1434
                client.checked_ok(client.extended_timeout)
 
1435
                if self.server.use_dbus:
 
1436
                    # Emit D-Bus signal
 
1437
                    client.GotSecret()
808
1438
            
809
 
            for c in self.server.clients:
810
 
                if c.fingerprint == fpr:
811
 
                    client = c
812
 
                    break
813
 
            else:
814
 
                ipc.write(u"NOTFOUND %s\n" % fpr)
815
 
                session.bye()
816
 
                return
817
 
            # Have to check if client.still_valid(), since it is
818
 
            # possible that the client timed out while establishing
819
 
            # the GnuTLS session.
820
 
            if not client.still_valid():
821
 
                ipc.write(u"INVALID %s\n" % client.name)
822
 
                session.bye()
823
 
                return
824
 
            ipc.write(u"SENDING %s\n" % client.name)
825
 
            sent_size = 0
826
 
            while sent_size < len(client.secret):
827
 
                sent = session.send(client.secret[sent_size:])
828
 
                logger.debug(u"Sent: %d, remaining: %d",
829
 
                             sent, len(client.secret)
830
 
                             - (sent_size + sent))
831
 
                sent_size += sent
832
 
            session.bye()
 
1439
            finally:
 
1440
                if approval_required:
 
1441
                    client.approvals_pending -= 1
 
1442
                try:
 
1443
                    session.bye()
 
1444
                except gnutls.errors.GNUTLSError as error:
 
1445
                    logger.warning("GnuTLS bye failed")
833
1446
    
834
1447
    @staticmethod
835
1448
    def peer_certificate(session):
845
1458
                     .gnutls_certificate_get_peers
846
1459
                     (session._c_object, ctypes.byref(list_size)))
847
1460
        if not bool(cert_list) and list_size.value != 0:
848
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
849
 
                                            u" certificate")
 
1461
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1462
                                            " certificate")
850
1463
        if list_size.value == 0:
851
1464
            return None
852
1465
        cert = cert_list[0]
878
1491
        if crtverify.value != 0:
879
1492
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
880
1493
            raise (gnutls.errors.CertificateSecurityError
881
 
                   (u"Verify failed"))
 
1494
                   ("Verify failed"))
882
1495
        # New buffer for the fingerprint
883
1496
        buf = ctypes.create_string_buffer(20)
884
1497
        buf_len = ctypes.c_size_t()
891
1504
        # Convert the buffer to a Python bytestring
892
1505
        fpr = ctypes.string_at(buf, buf_len.value)
893
1506
        # Convert the bytestring to hexadecimal notation
894
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1507
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
895
1508
        return hex_fpr
896
1509
 
897
1510
 
898
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
899
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
1511
class MultiprocessingMixIn(object):
 
1512
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1513
    def sub_process_main(self, request, address):
 
1514
        try:
 
1515
            self.finish_request(request, address)
 
1516
        except:
 
1517
            self.handle_error(request, address)
 
1518
        self.close_request(request)
 
1519
            
 
1520
    def process_request(self, request, address):
 
1521
        """Start a new process to process the request."""
 
1522
        multiprocessing.Process(target = self.sub_process_main,
 
1523
                                args = (request, address)).start()
 
1524
 
 
1525
 
 
1526
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1527
    """ adds a pipe to the MixIn """
900
1528
    def process_request(self, request, client_address):
901
1529
        """Overrides and wraps the original process_request().
902
1530
        
903
 
        This function creates a new pipe in self.pipe 
 
1531
        This function creates a new pipe in self.pipe
904
1532
        """
905
 
        self.pipe = os.pipe()
906
 
        super(ForkingMixInWithPipe,
 
1533
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1534
        
 
1535
        super(MultiprocessingMixInWithPipe,
907
1536
              self).process_request(request, client_address)
908
 
        os.close(self.pipe[1])  # close write end
909
 
        self.add_pipe(self.pipe[0])
910
 
    def add_pipe(self, pipe):
 
1537
        self.child_pipe.close()
 
1538
        self.add_pipe(parent_pipe)
 
1539
    
 
1540
    def add_pipe(self, parent_pipe):
911
1541
        """Dummy function; override as necessary"""
912
 
        os.close(pipe)
913
 
 
914
 
 
915
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1542
        raise NotImplementedError
 
1543
 
 
1544
 
 
1545
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
916
1546
                     socketserver.TCPServer, object):
917
1547
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
918
1548
    
934
1564
        bind to an address or port if they were not specified."""
935
1565
        if self.interface is not None:
936
1566
            if SO_BINDTODEVICE is None:
937
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
938
 
                             u" cannot bind to interface %s",
 
1567
                logger.error("SO_BINDTODEVICE does not exist;"
 
1568
                             " cannot bind to interface %s",
939
1569
                             self.interface)
940
1570
            else:
941
1571
                try:
942
1572
                    self.socket.setsockopt(socket.SOL_SOCKET,
943
1573
                                           SO_BINDTODEVICE,
944
1574
                                           str(self.interface
945
 
                                               + u'\0'))
946
 
                except socket.error, error:
 
1575
                                               + '\0'))
 
1576
                except socket.error as error:
947
1577
                    if error[0] == errno.EPERM:
948
 
                        logger.error(u"No permission to"
949
 
                                     u" bind to interface %s",
 
1578
                        logger.error("No permission to"
 
1579
                                     " bind to interface %s",
950
1580
                                     self.interface)
951
1581
                    elif error[0] == errno.ENOPROTOOPT:
952
 
                        logger.error(u"SO_BINDTODEVICE not available;"
953
 
                                     u" cannot bind to interface %s",
 
1582
                        logger.error("SO_BINDTODEVICE not available;"
 
1583
                                     " cannot bind to interface %s",
954
1584
                                     self.interface)
955
1585
                    else:
956
1586
                        raise
958
1588
        if self.server_address[0] or self.server_address[1]:
959
1589
            if not self.server_address[0]:
960
1590
                if self.address_family == socket.AF_INET6:
961
 
                    any_address = u"::" # in6addr_any
 
1591
                    any_address = "::" # in6addr_any
962
1592
                else:
963
1593
                    any_address = socket.INADDR_ANY
964
1594
                self.server_address = (any_address,
982
1612
        clients:        set of Client objects
983
1613
        gnutls_priority GnuTLS priority string
984
1614
        use_dbus:       Boolean; to emit D-Bus signals or not
985
 
        clients:        set of Client objects
986
 
        gnutls_priority GnuTLS priority string
987
 
        use_dbus:       Boolean; to emit D-Bus signals or not
988
1615
    
989
1616
    Assumes a gobject.MainLoop event loop.
990
1617
    """
1006
1633
            return socketserver.TCPServer.server_activate(self)
1007
1634
    def enable(self):
1008
1635
        self.enabled = True
1009
 
    def add_pipe(self, pipe):
 
1636
    def add_pipe(self, parent_pipe):
1010
1637
        # 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={}):
 
1638
        gobject.io_add_watch(parent_pipe.fileno(),
 
1639
                             gobject.IO_IN | gobject.IO_HUP,
 
1640
                             functools.partial(self.handle_ipc,
 
1641
                                               parent_pipe =
 
1642
                                               parent_pipe))
 
1643
        
 
1644
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1645
                   client_object=None):
1014
1646
        condition_names = {
1015
 
            gobject.IO_IN: u"IN",   # There is data to read.
1016
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1647
            gobject.IO_IN: "IN",   # There is data to read.
 
1648
            gobject.IO_OUT: "OUT", # Data can be written (without
1017
1649
                                    # 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
 
1650
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1651
            gobject.IO_ERR: "ERR", # Error condition.
 
1652
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1021
1653
                                    # broken, usually for pipes and
1022
1654
                                    # sockets).
1023
1655
            }
1025
1657
                                       for cond, name in
1026
1658
                                       condition_names.iteritems()
1027
1659
                                       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
 
1660
        # error or the other end of multiprocessing.Pipe has closed
 
1661
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1662
            return False
 
1663
        
 
1664
        # Read a request from the child
 
1665
        request = parent_pipe.recv()
 
1666
        command = request[0]
 
1667
        
 
1668
        if command == 'init':
 
1669
            fpr = request[1]
 
1670
            address = request[2]
 
1671
            
 
1672
            for c in self.clients:
 
1673
                if c.fingerprint == fpr:
 
1674
                    client = c
 
1675
                    break
 
1676
            else:
 
1677
                logger.info("Client not found for fingerprint: %s, ad"
 
1678
                            "dress: %s", fpr, address)
 
1679
                if self.use_dbus:
 
1680
                    # Emit D-Bus signal
 
1681
                    mandos_dbus_service.ClientNotFound(fpr,
 
1682
                                                       address[0])
 
1683
                parent_pipe.send(False)
 
1684
                return False
 
1685
            
 
1686
            gobject.io_add_watch(parent_pipe.fileno(),
 
1687
                                 gobject.IO_IN | gobject.IO_HUP,
 
1688
                                 functools.partial(self.handle_ipc,
 
1689
                                                   parent_pipe =
 
1690
                                                   parent_pipe,
 
1691
                                                   client_object =
 
1692
                                                   client))
 
1693
            parent_pipe.send(True)
 
1694
            # remove the old hook in favor of the new above hook on
 
1695
            # same fileno
 
1696
            return False
 
1697
        if command == 'funcall':
 
1698
            funcname = request[1]
 
1699
            args = request[2]
 
1700
            kwargs = request[3]
 
1701
            
 
1702
            parent_pipe.send(('data', getattr(client_object,
 
1703
                                              funcname)(*args,
 
1704
                                                         **kwargs)))
 
1705
        
 
1706
        if command == 'getattr':
 
1707
            attrname = request[1]
 
1708
            if callable(client_object.__getattribute__(attrname)):
 
1709
                parent_pipe.send(('function',))
 
1710
            else:
 
1711
                parent_pipe.send(('data', client_object
 
1712
                                  .__getattribute__(attrname)))
 
1713
        
 
1714
        if command == 'setattr':
 
1715
            attrname = request[1]
 
1716
            value = request[2]
 
1717
            setattr(client_object, attrname, value)
 
1718
        
1082
1719
        return True
1083
1720
 
1084
1721
 
1085
1722
def string_to_delta(interval):
1086
1723
    """Parse a string and return a datetime.timedelta
1087
1724
    
1088
 
    >>> string_to_delta(u'7d')
 
1725
    >>> string_to_delta('7d')
1089
1726
    datetime.timedelta(7)
1090
 
    >>> string_to_delta(u'60s')
 
1727
    >>> string_to_delta('60s')
1091
1728
    datetime.timedelta(0, 60)
1092
 
    >>> string_to_delta(u'60m')
 
1729
    >>> string_to_delta('60m')
1093
1730
    datetime.timedelta(0, 3600)
1094
 
    >>> string_to_delta(u'24h')
 
1731
    >>> string_to_delta('24h')
1095
1732
    datetime.timedelta(1)
1096
 
    >>> string_to_delta(u'1w')
 
1733
    >>> string_to_delta('1w')
1097
1734
    datetime.timedelta(7)
1098
 
    >>> string_to_delta(u'5m 30s')
 
1735
    >>> string_to_delta('5m 30s')
1099
1736
    datetime.timedelta(0, 330)
1100
1737
    """
1101
1738
    timevalue = datetime.timedelta(0)
1103
1740
        try:
1104
1741
            suffix = unicode(s[-1])
1105
1742
            value = int(s[:-1])
1106
 
            if suffix == u"d":
 
1743
            if suffix == "d":
1107
1744
                delta = datetime.timedelta(value)
1108
 
            elif suffix == u"s":
 
1745
            elif suffix == "s":
1109
1746
                delta = datetime.timedelta(0, value)
1110
 
            elif suffix == u"m":
 
1747
            elif suffix == "m":
1111
1748
                delta = datetime.timedelta(0, 0, 0, 0, value)
1112
 
            elif suffix == u"h":
 
1749
            elif suffix == "h":
1113
1750
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1114
 
            elif suffix == u"w":
 
1751
            elif suffix == "w":
1115
1752
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1116
1753
            else:
1117
 
                raise ValueError
1118
 
        except (ValueError, IndexError):
1119
 
            raise ValueError
 
1754
                raise ValueError("Unknown suffix %r" % suffix)
 
1755
        except (ValueError, IndexError) as e:
 
1756
            raise ValueError(*(e.args))
1120
1757
        timevalue += delta
1121
1758
    return timevalue
1122
1759
 
1128
1765
    global if_nametoindex
1129
1766
    try:
1130
1767
        if_nametoindex = (ctypes.cdll.LoadLibrary
1131
 
                          (ctypes.util.find_library(u"c"))
 
1768
                          (ctypes.util.find_library("c"))
1132
1769
                          .if_nametoindex)
1133
1770
    except (OSError, AttributeError):
1134
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1771
        logger.warning("Doing if_nametoindex the hard way")
1135
1772
        def if_nametoindex(interface):
1136
1773
            "Get an interface index the hard way, i.e. using fcntl()"
1137
1774
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1138
 
            with closing(socket.socket()) as s:
 
1775
            with contextlib.closing(socket.socket()) as s:
1139
1776
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1140
 
                                    struct.pack(str(u"16s16x"),
 
1777
                                    struct.pack(str("16s16x"),
1141
1778
                                                interface))
1142
 
            interface_index = struct.unpack(str(u"I"),
 
1779
            interface_index = struct.unpack(str("I"),
1143
1780
                                            ifreq[16:20])[0]
1144
1781
            return interface_index
1145
1782
    return if_nametoindex(interface)
1153
1790
        sys.exit()
1154
1791
    os.setsid()
1155
1792
    if not nochdir:
1156
 
        os.chdir(u"/")
 
1793
        os.chdir("/")
1157
1794
    if os.fork():
1158
1795
        sys.exit()
1159
1796
    if not noclose:
1161
1798
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1162
1799
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1163
1800
            raise OSError(errno.ENODEV,
1164
 
                          u"/dev/null not a character device")
 
1801
                          "%s not a character device"
 
1802
                          % os.path.devnull)
1165
1803
        os.dup2(null, sys.stdin.fileno())
1166
1804
        os.dup2(null, sys.stdout.fileno())
1167
1805
        os.dup2(null, sys.stderr.fileno())
1171
1809
 
1172
1810
def main():
1173
1811
    
1174
 
    ######################################################################
 
1812
    ##################################################################
1175
1813
    # Parsing of options, both command line and config file
1176
1814
    
1177
 
    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")
1202
 
    options = parser.parse_args()[0]
 
1815
    parser = argparse.ArgumentParser()
 
1816
    parser.add_argument("-v", "--version", action="version",
 
1817
                        version = "%%(prog)s %s" % version,
 
1818
                        help="show version number and exit")
 
1819
    parser.add_argument("-i", "--interface", metavar="IF",
 
1820
                        help="Bind to interface IF")
 
1821
    parser.add_argument("-a", "--address",
 
1822
                        help="Address to listen for requests on")
 
1823
    parser.add_argument("-p", "--port", type=int,
 
1824
                        help="Port number to receive requests on")
 
1825
    parser.add_argument("--check", action="store_true",
 
1826
                        help="Run self-test")
 
1827
    parser.add_argument("--debug", action="store_true",
 
1828
                        help="Debug mode; run in foreground and log"
 
1829
                        " to terminal")
 
1830
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
1831
                        help="Debug level for stdout output")
 
1832
    parser.add_argument("--priority", help="GnuTLS"
 
1833
                        " priority string (see GnuTLS documentation)")
 
1834
    parser.add_argument("--servicename",
 
1835
                        metavar="NAME", help="Zeroconf service name")
 
1836
    parser.add_argument("--configdir",
 
1837
                        default="/etc/mandos", metavar="DIR",
 
1838
                        help="Directory to search for configuration"
 
1839
                        " files")
 
1840
    parser.add_argument("--no-dbus", action="store_false",
 
1841
                        dest="use_dbus", help="Do not provide D-Bus"
 
1842
                        " system bus interface")
 
1843
    parser.add_argument("--no-ipv6", action="store_false",
 
1844
                        dest="use_ipv6", help="Do not use IPv6")
 
1845
    options = parser.parse_args()
1203
1846
    
1204
1847
    if options.check:
1205
1848
        import doctest
1207
1850
        sys.exit()
1208
1851
    
1209
1852
    # 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",
 
1853
    server_defaults = { "interface": "",
 
1854
                        "address": "",
 
1855
                        "port": "",
 
1856
                        "debug": "False",
 
1857
                        "priority":
 
1858
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1859
                        "servicename": "Mandos",
 
1860
                        "use_dbus": "True",
 
1861
                        "use_ipv6": "True",
 
1862
                        "debuglevel": "",
1219
1863
                        }
1220
1864
    
1221
1865
    # Parse config file for server-global settings
1222
1866
    server_config = configparser.SafeConfigParser(server_defaults)
1223
1867
    del server_defaults
1224
1868
    server_config.read(os.path.join(options.configdir,
1225
 
                                    u"mandos.conf"))
 
1869
                                    "mandos.conf"))
1226
1870
    # Convert the SafeConfigParser object to a dict
1227
1871
    server_settings = server_config.defaults()
1228
1872
    # 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",
 
1873
    for option in ("debug", "use_dbus", "use_ipv6"):
 
1874
        server_settings[option] = server_config.getboolean("DEFAULT",
1231
1875
                                                           option)
1232
1876
    if server_settings["port"]:
1233
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1234
 
                                                       u"port")
 
1877
        server_settings["port"] = server_config.getint("DEFAULT",
 
1878
                                                       "port")
1235
1879
    del server_config
1236
1880
    
1237
1881
    # Override the settings from the config file with command line
1238
1882
    # 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"):
 
1883
    for option in ("interface", "address", "port", "debug",
 
1884
                   "priority", "servicename", "configdir",
 
1885
                   "use_dbus", "use_ipv6", "debuglevel"):
1242
1886
        value = getattr(options, option)
1243
1887
        if value is not None:
1244
1888
            server_settings[option] = value
1252
1896
    ##################################################################
1253
1897
    
1254
1898
    # For convenience
1255
 
    debug = server_settings[u"debug"]
1256
 
    use_dbus = server_settings[u"use_dbus"]
1257
 
    use_ipv6 = server_settings[u"use_ipv6"]
1258
 
    
1259
 
    if not debug:
1260
 
        syslogger.setLevel(logging.WARNING)
1261
 
        console.setLevel(logging.WARNING)
1262
 
    
1263
 
    if server_settings[u"servicename"] != u"Mandos":
 
1899
    debug = server_settings["debug"]
 
1900
    debuglevel = server_settings["debuglevel"]
 
1901
    use_dbus = server_settings["use_dbus"]
 
1902
    use_ipv6 = server_settings["use_ipv6"]
 
1903
    
 
1904
    if server_settings["servicename"] != "Mandos":
1264
1905
        syslogger.setFormatter(logging.Formatter
1265
 
                               (u'Mandos (%s) [%%(process)d]:'
1266
 
                                u' %%(levelname)s: %%(message)s'
1267
 
                                % server_settings[u"servicename"]))
 
1906
                               ('Mandos (%s) [%%(process)d]:'
 
1907
                                ' %%(levelname)s: %%(message)s'
 
1908
                                % server_settings["servicename"]))
1268
1909
    
1269
1910
    # 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"",
 
1911
    client_defaults = { "timeout": "5m",
 
1912
                        "extended_timeout": "15m",
 
1913
                        "interval": "2m",
 
1914
                        "checker": "fping -q -- %%(host)s",
 
1915
                        "host": "",
 
1916
                        "approval_delay": "0s",
 
1917
                        "approval_duration": "1s",
1274
1918
                        }
1275
1919
    client_config = configparser.SafeConfigParser(client_defaults)
1276
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1277
 
                                    u"clients.conf"))
 
1920
    client_config.read(os.path.join(server_settings["configdir"],
 
1921
                                    "clients.conf"))
1278
1922
    
1279
1923
    global mandos_dbus_service
1280
1924
    mandos_dbus_service = None
1281
1925
    
1282
 
    tcp_server = MandosServer((server_settings[u"address"],
1283
 
                               server_settings[u"port"]),
 
1926
    tcp_server = MandosServer((server_settings["address"],
 
1927
                               server_settings["port"]),
1284
1928
                              ClientHandler,
1285
 
                              interface=server_settings[u"interface"],
 
1929
                              interface=(server_settings["interface"]
 
1930
                                         or None),
1286
1931
                              use_ipv6=use_ipv6,
1287
1932
                              gnutls_priority=
1288
 
                              server_settings[u"priority"],
 
1933
                              server_settings["priority"],
1289
1934
                              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)
 
1935
    if not debug:
 
1936
        pidfilename = "/var/run/mandos.pid"
 
1937
        try:
 
1938
            pidfile = open(pidfilename, "w")
 
1939
        except IOError:
 
1940
            logger.error("Could not open file %r", pidfilename)
1295
1941
    
1296
1942
    try:
1297
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1298
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1943
        uid = pwd.getpwnam("_mandos").pw_uid
 
1944
        gid = pwd.getpwnam("_mandos").pw_gid
1299
1945
    except KeyError:
1300
1946
        try:
1301
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1302
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1947
            uid = pwd.getpwnam("mandos").pw_uid
 
1948
            gid = pwd.getpwnam("mandos").pw_gid
1303
1949
        except KeyError:
1304
1950
            try:
1305
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1306
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1951
                uid = pwd.getpwnam("nobody").pw_uid
 
1952
                gid = pwd.getpwnam("nobody").pw_gid
1307
1953
            except KeyError:
1308
1954
                uid = 65534
1309
1955
                gid = 65534
1310
1956
    try:
1311
1957
        os.setgid(gid)
1312
1958
        os.setuid(uid)
1313
 
    except OSError, error:
 
1959
    except OSError as error:
1314
1960
        if error[0] != errno.EPERM:
1315
1961
            raise error
1316
1962
    
1317
 
    # Enable all possible GnuTLS debugging
 
1963
    if not debug and not debuglevel:
 
1964
        syslogger.setLevel(logging.WARNING)
 
1965
        console.setLevel(logging.WARNING)
 
1966
    if debuglevel:
 
1967
        level = getattr(logging, debuglevel.upper())
 
1968
        syslogger.setLevel(level)
 
1969
        console.setLevel(level)
 
1970
    
1318
1971
    if debug:
 
1972
        # Enable all possible GnuTLS debugging
 
1973
        
1319
1974
        # "Use a log level over 10 to enable all debugging options."
1320
1975
        # - GnuTLS manual
1321
1976
        gnutls.library.functions.gnutls_global_set_log_level(11)
1322
1977
        
1323
1978
        @gnutls.library.types.gnutls_log_func
1324
1979
        def debug_gnutls(level, string):
1325
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1980
            logger.debug("GnuTLS: %s", string[:-1])
1326
1981
        
1327
1982
        (gnutls.library.functions
1328
1983
         .gnutls_global_set_log_function(debug_gnutls))
 
1984
        
 
1985
        # Redirect stdin so all checkers get /dev/null
 
1986
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1987
        os.dup2(null, sys.stdin.fileno())
 
1988
        if null > 2:
 
1989
            os.close(null)
 
1990
    else:
 
1991
        # No console logging
 
1992
        logger.removeHandler(console)
 
1993
    
 
1994
    # Need to fork before connecting to D-Bus
 
1995
    if not debug:
 
1996
        # Close all input and output, do double fork, etc.
 
1997
        daemon()
1329
1998
    
1330
1999
    global main_loop
1331
2000
    # From the Avahi example code
1334
2003
    bus = dbus.SystemBus()
1335
2004
    # End of Avahi example code
1336
2005
    if use_dbus:
1337
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
2006
        try:
 
2007
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2008
                                            bus, do_not_queue=True)
 
2009
            old_bus_name = (dbus.service.BusName
 
2010
                            ("se.bsnet.fukt.Mandos", bus,
 
2011
                             do_not_queue=True))
 
2012
        except dbus.exceptions.NameExistsException as e:
 
2013
            logger.error(unicode(e) + ", disabling D-Bus")
 
2014
            use_dbus = False
 
2015
            server_settings["use_dbus"] = False
 
2016
            tcp_server.use_dbus = False
1338
2017
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1339
 
    service = AvahiService(name = server_settings[u"servicename"],
1340
 
                           servicetype = u"_mandos._tcp",
 
2018
    service = AvahiService(name = server_settings["servicename"],
 
2019
                           servicetype = "_mandos._tcp",
1341
2020
                           protocol = protocol, bus = bus)
1342
2021
    if server_settings["interface"]:
1343
2022
        service.interface = (if_nametoindex
1344
 
                             (str(server_settings[u"interface"])))
 
2023
                             (str(server_settings["interface"])))
 
2024
    
 
2025
    global multiprocessing_manager
 
2026
    multiprocessing_manager = multiprocessing.Manager()
1345
2027
    
1346
2028
    client_class = Client
1347
2029
    if use_dbus:
1348
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2030
        client_class = functools.partial(ClientDBusTransitional,
 
2031
                                         bus = bus)
 
2032
    def client_config_items(config, section):
 
2033
        special_settings = {
 
2034
            "approved_by_default":
 
2035
                lambda: config.getboolean(section,
 
2036
                                          "approved_by_default"),
 
2037
            }
 
2038
        for name, value in config.items(section):
 
2039
            try:
 
2040
                yield (name, special_settings[name]())
 
2041
            except KeyError:
 
2042
                yield (name, value)
 
2043
    
1349
2044
    tcp_server.clients.update(set(
1350
2045
            client_class(name = section,
1351
 
                         config= dict(client_config.items(section)))
 
2046
                         config= dict(client_config_items(
 
2047
                        client_config, section)))
1352
2048
            for section in client_config.sections()))
1353
2049
    if not tcp_server.clients:
1354
 
        logger.warning(u"No clients defined")
1355
 
    
1356
 
    if debug:
1357
 
        # Redirect stdin so all checkers get /dev/null
1358
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1359
 
        os.dup2(null, sys.stdin.fileno())
1360
 
        if null > 2:
1361
 
            os.close(null)
1362
 
    else:
1363
 
        # No console logging
1364
 
        logger.removeHandler(console)
1365
 
        # Close all input and output, do double fork, etc.
1366
 
        daemon()
1367
 
    
1368
 
    try:
1369
 
        with closing(pidfile):
1370
 
            pid = os.getpid()
1371
 
            pidfile.write(str(pid) + "\n")
1372
 
        del pidfile
1373
 
    except IOError:
1374
 
        logger.error(u"Could not write to file %r with PID %d",
1375
 
                     pidfilename, pid)
1376
 
    except NameError:
1377
 
        # "pidfile" was never created
1378
 
        pass
1379
 
    del pidfilename
1380
 
    
1381
 
    def cleanup():
1382
 
        "Cleanup function; run on exit"
1383
 
        service.cleanup()
 
2050
        logger.warning("No clients defined")
1384
2051
        
1385
 
        while tcp_server.clients:
1386
 
            client = tcp_server.clients.pop()
1387
 
            client.disable_hook = None
1388
 
            client.disable()
1389
 
    
1390
 
    atexit.register(cleanup)
1391
 
    
1392
2052
    if not debug:
 
2053
        try:
 
2054
            with pidfile:
 
2055
                pid = os.getpid()
 
2056
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2057
            del pidfile
 
2058
        except IOError:
 
2059
            logger.error("Could not write to file %r with PID %d",
 
2060
                         pidfilename, pid)
 
2061
        except NameError:
 
2062
            # "pidfile" was never created
 
2063
            pass
 
2064
        del pidfilename
 
2065
        
1393
2066
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2067
    
1394
2068
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1395
2069
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1396
2070
    
1398
2072
        class MandosDBusService(dbus.service.Object):
1399
2073
            """A D-Bus proxy object"""
1400
2074
            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}")
1405
 
            def ClientAdded(self, objpath, properties):
1406
 
                "D-Bus signal"
1407
 
                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")
 
2075
                dbus.service.Object.__init__(self, bus, "/")
 
2076
            _interface = "se.recompile.Mandos"
 
2077
            
 
2078
            @dbus.service.signal(_interface, signature="o")
 
2079
            def ClientAdded(self, objpath):
 
2080
                "D-Bus signal"
 
2081
                pass
 
2082
            
 
2083
            @dbus.service.signal(_interface, signature="ss")
 
2084
            def ClientNotFound(self, fingerprint, address):
 
2085
                "D-Bus signal"
 
2086
                pass
 
2087
            
 
2088
            @dbus.service.signal(_interface, signature="os")
1415
2089
            def ClientRemoved(self, objpath, name):
1416
2090
                "D-Bus signal"
1417
2091
                pass
1418
2092
            
1419
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
2093
            @dbus.service.method(_interface, out_signature="ao")
1420
2094
            def GetAllClients(self):
1421
2095
                "D-Bus method"
1422
2096
                return dbus.Array(c.dbus_object_path
1423
2097
                                  for c in tcp_server.clients)
1424
2098
            
1425
2099
            @dbus.service.method(_interface,
1426
 
                                 out_signature=u"a{oa{sv}}")
 
2100
                                 out_signature="a{oa{sv}}")
1427
2101
            def GetAllClientsWithProperties(self):
1428
2102
                "D-Bus method"
1429
2103
                return dbus.Dictionary(
1430
 
                    ((c.dbus_object_path, c.GetAllProperties())
 
2104
                    ((c.dbus_object_path, c.GetAll(""))
1431
2105
                     for c in tcp_server.clients),
1432
 
                    signature=u"oa{sv}")
 
2106
                    signature="oa{sv}")
1433
2107
            
1434
 
            @dbus.service.method(_interface, in_signature=u"o")
 
2108
            @dbus.service.method(_interface, in_signature="o")
1435
2109
            def RemoveClient(self, object_path):
1436
2110
                "D-Bus method"
1437
2111
                for c in tcp_server.clients:
1439
2113
                        tcp_server.clients.remove(c)
1440
2114
                        c.remove_from_connection()
1441
2115
                        # Don't signal anything except ClientRemoved
1442
 
                        c.disable(signal=False)
 
2116
                        c.disable(quiet=True)
1443
2117
                        # Emit D-Bus signal
1444
2118
                        self.ClientRemoved(object_path, c.name)
1445
2119
                        return
1446
 
                raise KeyError
 
2120
                raise KeyError(object_path)
1447
2121
            
1448
2122
            del _interface
1449
2123
        
1450
 
        mandos_dbus_service = MandosDBusService()
 
2124
        class MandosDBusServiceTransitional(MandosDBusService):
 
2125
            __metaclass__ = AlternateDBusNamesMetaclass
 
2126
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2127
    
 
2128
    def cleanup():
 
2129
        "Cleanup function; run on exit"
 
2130
        service.cleanup()
 
2131
        
 
2132
        while tcp_server.clients:
 
2133
            client = tcp_server.clients.pop()
 
2134
            if use_dbus:
 
2135
                client.remove_from_connection()
 
2136
            client.disable_hook = None
 
2137
            # Don't signal anything except ClientRemoved
 
2138
            client.disable(quiet=True)
 
2139
            if use_dbus:
 
2140
                # Emit D-Bus signal
 
2141
                mandos_dbus_service.ClientRemoved(client
 
2142
                                                  .dbus_object_path,
 
2143
                                                  client.name)
 
2144
    
 
2145
    atexit.register(cleanup)
1451
2146
    
1452
2147
    for client in tcp_server.clients:
1453
2148
        if use_dbus:
1454
2149
            # Emit D-Bus signal
1455
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1456
 
                                            client.GetAllProperties())
 
2150
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1457
2151
        client.enable()
1458
2152
    
1459
2153
    tcp_server.enable()
1462
2156
    # Find out what port we got
1463
2157
    service.port = tcp_server.socket.getsockname()[1]
1464
2158
    if use_ipv6:
1465
 
        logger.info(u"Now listening on address %r, port %d,"
 
2159
        logger.info("Now listening on address %r, port %d,"
1466
2160
                    " flowinfo %d, scope_id %d"
1467
2161
                    % tcp_server.socket.getsockname())
1468
2162
    else:                       # IPv4
1469
 
        logger.info(u"Now listening on address %r, port %d"
 
2163
        logger.info("Now listening on address %r, port %d"
1470
2164
                    % tcp_server.socket.getsockname())
1471
2165
    
1472
2166
    #service.interface = tcp_server.socket.getsockname()[3]
1475
2169
        # From the Avahi example code
1476
2170
        try:
1477
2171
            service.activate()
1478
 
        except dbus.exceptions.DBusException, error:
1479
 
            logger.critical(u"DBusException: %s", error)
 
2172
        except dbus.exceptions.DBusException as error:
 
2173
            logger.critical("DBusException: %s", error)
 
2174
            cleanup()
1480
2175
            sys.exit(1)
1481
2176
        # End of Avahi example code
1482
2177
        
1485
2180
                             (tcp_server.handle_request
1486
2181
                              (*args[2:], **kwargs) or True))
1487
2182
        
1488
 
        logger.debug(u"Starting main loop")
 
2183
        logger.debug("Starting main loop")
1489
2184
        main_loop.run()
1490
 
    except AvahiError, error:
1491
 
        logger.critical(u"AvahiError: %s", error)
 
2185
    except AvahiError as error:
 
2186
        logger.critical("AvahiError: %s", error)
 
2187
        cleanup()
1492
2188
        sys.exit(1)
1493
2189
    except KeyboardInterrupt:
1494
2190
        if debug:
1495
 
            print >> sys.stderr
1496
 
        logger.debug(u"Server received KeyboardInterrupt")
1497
 
    logger.debug(u"Server exiting")
 
2191
            print("", file=sys.stderr)
 
2192
        logger.debug("Server received KeyboardInterrupt")
 
2193
    logger.debug("Server exiting")
 
2194
    # Must run before the D-Bus bus name gets deregistered
 
2195
    cleanup()
 
2196
 
1498
2197
 
1499
2198
if __name__ == '__main__':
1500
2199
    main()