/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-12-27 03:35:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091227033558-y57wv1u4cls3i8kq
TODO file changes.

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