/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos (MandosServer): Fixed doc string.

* plugin-runner.c (main): Note warnings from "-Wconversion".

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