/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-10-13 06:12:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20101013061252-3a918xedja5caya8
* debian/mandos-client.lintian-overrides: Added plugins.d/plymouth.

Show diffs side-by-side

added added

removed removed

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