/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-08-27 23:12:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090827231209-ry9loqws0gr7ze4g
* plugins.d/mandos-client.c (quit_now): Move up declaration before
                                        first use.
  (resolve_callback, ): Check "quit_now" flag.
  (main): Renamed "interface_taken_up" to "take_down_interface" for
          clarity.  Check existence of interface before taking it up.
          Set "take_down_interface" and "tempdir_created" flags before
          any action is taken, to make sure cleanup is never missed.
          Check "quit_now" flag throughout.

Show diffs side-by-side

added added

removed removed

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