/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-11-19 18:31:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.

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