/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-11-27 19:37:54 UTC
  • mto: (237.12.11 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111127193754-4366e18gmi11kew0
* mandos (_timedelta_to_milliseconds): Renamed to
                                       "timedelta_to_milliseconds";
                                       all callers changed.
  (Client._approved): Bug fix; renamed to "approved" without
                      underscore.  All users changed.
  (ProxyClient): Removed superfluous parens in "if" statements.
  (ClientHandler.handle): Bug fix: Emit NewRequest signal *after*
                          client is found, not before.

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,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 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@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
38
 
import optparse
 
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
 
from contextlib import closing
 
59
import contextlib
59
60
import struct
60
61
import fcntl
61
62
import functools
 
63
import cPickle as pickle
 
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
62
68
 
63
69
import dbus
64
70
import dbus.service
67
73
from dbus.mainloop.glib import DBusGMainLoop
68
74
import ctypes
69
75
import ctypes.util
 
76
import xml.dom.minidom
 
77
import inspect
 
78
import GnuPGInterface
70
79
 
71
80
try:
72
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
86
        SO_BINDTODEVICE = None
78
87
 
79
88
 
80
 
version = "1.0.11"
 
89
version = "1.4.1"
 
90
stored_state_file = "clients.pickle"
81
91
 
82
 
logger = logging.Logger(u'mandos')
 
92
logger = logging.getLogger()
83
93
syslogger = (logging.handlers.SysLogHandler
84
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
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)
 
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
 
96
209
 
97
210
class AvahiError(Exception):
98
211
    def __init__(self, value, *args, **kwargs):
114
227
    Attributes:
115
228
    interface: integer; avahi.IF_UNSPEC or an interface index.
116
229
               Used to optionally bind to the specified interface.
117
 
    name: string; Example: u'Mandos'
118
 
    type: string; Example: u'_mandos._tcp'.
 
230
    name: string; Example: 'Mandos'
 
231
    type: string; Example: '_mandos._tcp'.
119
232
                  See <http://www.dns-sd.org/ServiceTypes.html>
120
233
    port: integer; what port to announce
121
234
    TXT: list of strings; TXT record for the service
130
243
    """
131
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
132
245
                 servicetype = None, port = None, TXT = None,
133
 
                 domain = u"", host = u"", max_renames = 32768,
 
246
                 domain = "", host = "", max_renames = 32768,
134
247
                 protocol = avahi.PROTO_UNSPEC, bus = None):
135
248
        self.interface = interface
136
249
        self.name = name
145
258
        self.group = None       # our entry group
146
259
        self.server = None
147
260
        self.bus = bus
 
261
        self.entry_group_state_changed_match = None
148
262
    def rename(self):
149
263
        """Derived from the Avahi example code"""
150
264
        if self.rename_count >= self.max_renames:
151
 
            logger.critical(u"No suitable Zeroconf service name found"
152
 
                            u" after %i retries, exiting.",
 
265
            logger.critical("No suitable Zeroconf service name found"
 
266
                            " after %i retries, exiting.",
153
267
                            self.rename_count)
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))
 
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)
162
273
        self.remove()
163
 
        self.add()
 
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)
164
280
        self.rename_count += 1
165
281
    def remove(self):
166
282
        """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
167
286
        if self.group is not None:
168
287
            self.group.Reset()
169
288
    def add(self):
170
289
        """Derived from the Avahi example code"""
 
290
        self.remove()
171
291
        if self.group is None:
172
292
            self.group = dbus.Interface(
173
293
                self.bus.get_object(avahi.DBUS_NAME,
174
294
                                    self.server.EntryGroupNew()),
175
295
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
 
            self.group.connect_to_signal('StateChanged',
177
 
                                         self.entry_group_state_changed)
178
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
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' ...",
179
300
                     self.name, self.type)
180
301
        self.group.AddService(
181
302
            self.interface,
188
309
        self.group.Commit()
189
310
    def entry_group_state_changed(self, state, error):
190
311
        """Derived from the Avahi example code"""
191
 
        logger.debug(u"Avahi state change: %i", state)
 
312
        logger.debug("Avahi entry group state change: %i", state)
192
313
        
193
314
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
 
            logger.debug(u"Zeroconf service established.")
 
315
            logger.debug("Zeroconf service established.")
195
316
        elif state == avahi.ENTRY_GROUP_COLLISION:
196
 
            logger.warning(u"Zeroconf service name collision.")
 
317
            logger.info("Zeroconf service name collision.")
197
318
            self.rename()
198
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
199
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
320
            logger.critical("Avahi: Error in group state changed %s",
200
321
                            unicode(error))
201
 
            raise AvahiGroupError(u"State changed: %s"
 
322
            raise AvahiGroupError("State changed: %s"
202
323
                                  % unicode(error))
203
324
    def cleanup(self):
204
325
        """Derived from the Avahi example code"""
205
326
        if self.group is not None:
206
 
            self.group.Free()
 
327
            try:
 
328
                self.group.Free()
 
329
            except (dbus.exceptions.UnknownMethodException,
 
330
                    dbus.exceptions.DBusException):
 
331
                pass
207
332
            self.group = None
208
 
    def server_state_changed(self, state):
 
333
        self.remove()
 
334
    def server_state_changed(self, state, error=None):
209
335
        """Derived from the Avahi example code"""
210
 
        if state == avahi.SERVER_COLLISION:
211
 
            logger.error(u"Zeroconf server name collision")
212
 
            self.remove()
 
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()
213
351
        elif state == avahi.SERVER_RUNNING:
214
352
            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)
215
358
    def activate(self):
216
359
        """Derived from the Avahi example code"""
217
360
        if self.server is None:
218
361
            self.server = dbus.Interface(
219
362
                self.bus.get_object(avahi.DBUS_NAME,
220
 
                                    avahi.DBUS_PATH_SERVER),
 
363
                                    avahi.DBUS_PATH_SERVER,
 
364
                                    follow_name_owner_changes=True),
221
365
                avahi.DBUS_INTERFACE_SERVER)
222
 
        self.server.connect_to_signal(u"StateChanged",
 
366
        self.server.connect_to_signal("StateChanged",
223
367
                                 self.server_state_changed)
224
368
        self.server_state_changed(self.server.GetState())
225
369
 
 
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
226
379
 
 
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
        
227
386
class Client(object):
228
387
    """A representation of a client host served by this server.
229
388
    
230
389
    Attributes:
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)
 
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
245
393
    checker:    subprocess.Popen(); a running checker process used
246
394
                                    to see if the client lives.
247
395
                                    'None' if no process is running.
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
 
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
253
399
                     runtime with vars(self) as dict, so that for
254
400
                     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
255
405
    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
256
428
    """
257
429
    
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))
 
430
    runtime_expansions = ("approval_delay", "approval_duration",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
 
433
                          "last_enabled", "name", "timeout")
264
434
    
265
435
    def timeout_milliseconds(self):
266
436
        "Return the 'timeout' attribute in milliseconds"
267
 
        return self._datetime_to_milliseconds(self.timeout)
 
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)
268
442
    
269
443
    def interval_milliseconds(self):
270
444
        "Return the 'interval' attribute in milliseconds"
271
 
        return self._datetime_to_milliseconds(self.interval)
272
 
    
273
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
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):
274
451
        """Note: the 'checker' key in 'config' sets the
275
452
        'checker_command' attribute and *not* the 'checker'
276
453
        attribute."""
277
454
        self.name = name
278
455
        if config is None:
279
456
            config = {}
280
 
        logger.debug(u"Creating client %r", self.name)
 
457
        logger.debug("Creating client %r", self.name)
281
458
        # Uppercase and remove spaces from fingerprint for later
282
459
        # comparison purposes with return value from the fingerprint()
283
460
        # function
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:
 
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:
293
470
                self.secret = secfile.read()
294
471
        else:
295
 
            raise TypeError(u"No secret or secfile for client %s"
 
472
            raise TypeError("No secret or secfile for client %s"
296
473
                            % self.name)
297
 
        self.host = config.get(u"host", u"")
 
474
        self.host = config.get("host", "")
298
475
        self.created = datetime.datetime.utcnow()
299
 
        self.enabled = False
300
 
        self.last_enabled = None
 
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
301
482
        self.last_checked_ok = None
302
 
        self.timeout = string_to_delta(config[u"timeout"])
303
 
        self.interval = string_to_delta(config[u"interval"])
304
 
        self.disable_hook = disable_hook
 
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"])
305
488
        self.checker = None
306
489
        self.checker_initiator_tag = None
307
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
308
495
        self.checker_callback_tag = None
309
 
        self.checker_command = config[u"checker"]
 
496
        self.checker_command = config["checker"]
310
497
        self.current_checker_command = None
311
 
        self.last_connect = 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()
312
525
    
313
526
    def enable(self):
314
527
        """Start this client's checker and timeout hooks"""
315
 
        if getattr(self, u"enabled", False):
 
528
        if getattr(self, "enabled", False):
316
529
            # Already enabled
317
530
            return
 
531
        self.send_changedstate()
 
532
        self.expires = datetime.datetime.utcnow() + self.timeout
 
533
        self.enabled = True
318
534
        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):
319
561
        # Schedule a new checker to be started an 'interval' from now,
320
562
        # and every interval from then on.
321
563
        self.checker_initiator_tag = (gobject.timeout_add
322
564
                                      (self.interval_milliseconds(),
323
565
                                       self.start_checker))
324
 
        # Also start a new checker *right now*.
325
 
        self.start_checker()
326
566
        # Schedule a disable() when 'timeout' has passed
327
567
        self.disable_initiator_tag = (gobject.timeout_add
328
568
                                   (self.timeout_milliseconds(),
329
569
                                    self.disable))
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()
 
570
        # Also start a new checker *right now*.
 
571
        self.start_checker()
353
572
    
354
573
    def checker_callback(self, pid, condition, command):
355
574
        """The checker has completed, so take appropriate actions."""
356
575
        self.checker_callback_tag = None
357
576
        self.checker = None
358
577
        if os.WIFEXITED(condition):
359
 
            exitstatus = os.WEXITSTATUS(condition)
360
 
            if exitstatus == 0:
361
 
                logger.info(u"Checker for %(name)s succeeded",
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
579
            if self.last_checker_status == 0:
 
580
                logger.info("Checker for %(name)s succeeded",
362
581
                            vars(self))
363
582
                self.checked_ok()
364
583
            else:
365
 
                logger.info(u"Checker for %(name)s failed",
 
584
                logger.info("Checker for %(name)s failed",
366
585
                            vars(self))
367
586
        else:
368
 
            logger.warning(u"Checker for %(name)s crashed?",
 
587
            self.last_checker_status = -1
 
588
            logger.warning("Checker for %(name)s crashed?",
369
589
                           vars(self))
370
590
    
371
 
    def checked_ok(self):
 
591
    def checked_ok(self, timeout=None):
372
592
        """Bump up the timeout for this client.
373
593
        
374
594
        This should only be called when the client has been seen,
375
595
        alive and well.
376
596
        """
 
597
        if timeout is None:
 
598
            timeout = self.timeout
377
599
        self.last_checked_ok = 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))
 
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()
382
610
    
383
611
    def start_checker(self):
384
612
        """Start a new checker subprocess if one is not running.
391
619
        # client would inevitably timeout, since no checker would get
392
620
        # a chance to run to completion.  If we instead leave running
393
621
        # checkers alone, the checker would have to take more time
394
 
        # than 'timeout' for the client to be declared invalid, which
395
 
        # is as it should be.
 
622
        # than 'timeout' for the client to be disabled, which is as it
 
623
        # should be.
396
624
        
397
625
        # If a checker exists, make sure it is not a zombie
398
 
        if self.checker is not None:
 
626
        try:
399
627
            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:
400
633
            if pid:
401
 
                logger.warning(u"Checker was a zombie")
 
634
                logger.warning("Checker was a zombie")
402
635
                gobject.source_remove(self.checker_callback_tag)
403
636
                self.checker_callback(pid, status,
404
637
                                      self.current_checker_command)
409
642
                command = self.checker_command % self.host
410
643
            except TypeError:
411
644
                # Escape attributes for the shell
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())
 
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
                
418
653
                try:
419
654
                    command = self.checker_command % escaped_attrs
420
 
                except TypeError, error:
421
 
                    logger.error(u'Could not format string "%s":'
422
 
                                 u' %s', self.checker_command, error)
 
655
                except TypeError as error:
 
656
                    logger.error('Could not format string "%s":'
 
657
                                 ' %s', self.checker_command, error)
423
658
                    return True # Try again later
424
659
            self.current_checker_command = command
425
660
            try:
426
 
                logger.info(u"Starting checker %r for %s",
 
661
                logger.info("Starting checker %r for %s",
427
662
                            command, self.name)
428
663
                # We don't need to redirect stdout and stderr, since
429
664
                # in normal mode, that is already done by daemon(),
431
666
                # always replaced by /dev/null.)
432
667
                self.checker = subprocess.Popen(command,
433
668
                                                close_fds=True,
434
 
                                                shell=True, cwd=u"/")
 
669
                                                shell=True, cwd="/")
435
670
                self.checker_callback_tag = (gobject.child_watch_add
436
671
                                             (self.checker.pid,
437
672
                                              self.checker_callback,
442
677
                if pid:
443
678
                    gobject.source_remove(self.checker_callback_tag)
444
679
                    self.checker_callback(pid, status, command)
445
 
            except OSError, error:
446
 
                logger.error(u"Failed to start subprocess: %s",
 
680
            except OSError as error:
 
681
                logger.error("Failed to start subprocess: %s",
447
682
                             error)
448
683
        # Re-run this periodically if run by gobject.timeout_add
449
684
        return True
453
688
        if self.checker_callback_tag:
454
689
            gobject.source_remove(self.checker_callback_tag)
455
690
            self.checker_callback_tag = None
456
 
        if getattr(self, u"checker", None) is None:
 
691
        if getattr(self, "checker", None) is None:
457
692
            return
458
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
693
        logger.debug("Stopping checker for %(name)s", vars(self))
459
694
        try:
460
695
            os.kill(self.checker.pid, signal.SIGTERM)
461
 
            #os.sleep(0.5)
 
696
            #time.sleep(0.5)
462
697
            #if self.checker.poll() is None:
463
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
464
 
        except OSError, error:
 
699
        except OSError as error:
465
700
            if error.errno != errno.ESRCH: # No such process
466
701
                raise
467
702
        self.checker = None
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):
 
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):
481
999
    """A Client class using D-Bus
482
1000
    
483
1001
    Attributes:
484
1002
    dbus_object_path: dbus.ObjectPath
485
1003
    bus: dbus.SystemBus()
486
1004
    """
 
1005
    
 
1006
    runtime_expansions = (Client.runtime_expansions
 
1007
                          + ("dbus_object_path",))
 
1008
    
487
1009
    # dbus.service.Object doesn't use super(), so we can't either.
488
1010
    
489
1011
    def __init__(self, bus = None, *args, **kwargs):
490
1012
        self.bus = bus
491
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
492
1016
        # Only now, when this client is initialized, can it show up on
493
1017
        # the D-Bus
 
1018
        client_object_name = unicode(self.name).translate(
 
1019
            {ord("."): ord("_"),
 
1020
             ord("-"): ord("_")})
494
1021
        self.dbus_object_path = (dbus.ObjectPath
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
 
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
527
1092
    
528
1093
    def __del__(self, *args, **kwargs):
529
1094
        try:
530
1095
            self.remove_from_connection()
531
1096
        except LookupError:
532
1097
            pass
533
 
        if hasattr(dbus.service.Object, u"__del__"):
534
 
            dbus.service.Object.__del__(self, *args, **kwargs)
 
1098
        if hasattr(DBusObjectWithProperties, "__del__"):
 
1099
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
535
1100
        Client.__del__(self, *args, **kwargs)
536
1101
    
537
1102
    def checker_callback(self, pid, condition, command,
538
1103
                         *args, **kwargs):
539
1104
        self.checker_callback_tag = None
540
1105
        self.checker = None
541
 
        # Emit D-Bus signal
542
 
        self.PropertyChanged(dbus.String(u"checker_running"),
543
 
                             dbus.Boolean(False, variant_level=1))
544
1106
        if os.WIFEXITED(condition):
545
1107
            exitstatus = os.WEXITSTATUS(condition)
546
1108
            # Emit D-Bus signal
556
1118
        return Client.checker_callback(self, pid, condition, command,
557
1119
                                       *args, **kwargs)
558
1120
    
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
 
    
568
1121
    def start_checker(self, *args, **kwargs):
569
1122
        old_checker = self.checker
570
1123
        if self.checker is not None:
577
1130
            and old_checker_pid != self.checker.pid):
578
1131
            # Emit D-Bus signal
579
1132
            self.CheckerStarted(self.current_checker_command)
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()
 
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
601
1151
    
602
1152
    # CheckerCompleted - signal
603
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
1153
    @dbus.service.signal(_interface, signature="nxs")
604
1154
    def CheckerCompleted(self, exitcode, waitstatus, command):
605
1155
        "D-Bus signal"
606
1156
        pass
607
1157
    
608
1158
    # CheckerStarted - signal
609
 
    @dbus.service.signal(_interface, signature=u"s")
 
1159
    @dbus.service.signal(_interface, signature="s")
610
1160
    def CheckerStarted(self, command):
611
1161
        "D-Bus signal"
612
1162
        pass
613
1163
    
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
 
    
662
1164
    # PropertyChanged - signal
663
 
    @dbus.service.signal(_interface, signature=u"sv")
 
1165
    @dbus.service.signal(_interface, signature="sv")
664
1166
    def PropertyChanged(self, property, value):
665
1167
        "D-Bus signal"
666
1168
        pass
667
1169
    
668
 
    # ReceivedSecret - signal
 
1170
    # GotSecret - signal
669
1171
    @dbus.service.signal(_interface)
670
 
    def ReceivedSecret(self):
671
 
        "D-Bus signal"
 
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
        """
672
1177
        pass
673
1178
    
674
1179
    # Rejected - signal
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)))
 
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()
723
1210
    
724
1211
    # Enable - method
725
1212
    @dbus.service.method(_interface)
744
1231
    def StopChecker(self):
745
1232
        self.stop_checker()
746
1233
    
 
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
    
747
1406
    del _interface
748
1407
 
749
1408
 
 
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
 
750
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
751
1440
    """A class to handle client connections.
752
1441
    
754
1443
    Note: This will run in its own forked process."""
755
1444
    
756
1445
    def handle(self):
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:
 
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
            
762
1452
            session = (gnutls.connection
763
1453
                       .ClientSession(self.request,
764
1454
                                      gnutls.connection
765
1455
                                      .X509Credentials()))
766
1456
            
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
 
            
776
1457
            # Note: gnutls.connection.X509Credentials is really a
777
1458
            # generic GnuTLS certificate credentials object so long as
778
1459
            # no X.509 keys are added to it.  Therefore, we can use it
779
1460
            # here despite using OpenPGP certificates.
780
1461
            
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"))
 
1462
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1463
            #                      "+AES-256-CBC", "+SHA1",
 
1464
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1465
            #                      "+DHE-DSS"))
785
1466
            # Use a fallback default, since this MUST be set.
786
1467
            priority = self.server.gnutls_priority
787
1468
            if priority is None:
788
 
                priority = u"NORMAL"
 
1469
                priority = "NORMAL"
789
1470
            (gnutls.library.functions
790
1471
             .gnutls_priority_set_direct(session._c_object,
791
1472
                                         priority, None))
792
1473
            
 
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
793
1486
            try:
794
1487
                session.handshake()
795
 
            except gnutls.errors.GNUTLSError, error:
796
 
                logger.warning(u"Handshake failed: %s", error)
 
1488
            except gnutls.errors.GNUTLSError as error:
 
1489
                logger.warning("Handshake failed: %s", error)
797
1490
                # Do not run session.bye() here: the session is not
798
1491
                # established.  Just abandon the request.
799
1492
                return
800
 
            logger.debug(u"Handshake succeeded")
 
1493
            logger.debug("Handshake succeeded")
 
1494
            
 
1495
            approval_required = False
801
1496
            try:
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)
 
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()
808
1589
            
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()
 
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")
834
1597
    
835
1598
    @staticmethod
836
1599
    def peer_certificate(session):
846
1609
                     .gnutls_certificate_get_peers
847
1610
                     (session._c_object, ctypes.byref(list_size)))
848
1611
        if not bool(cert_list) and list_size.value != 0:
849
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
850
 
                                            u" certificate")
 
1612
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1613
                                            " certificate")
851
1614
        if list_size.value == 0:
852
1615
            return None
853
1616
        cert = cert_list[0]
879
1642
        if crtverify.value != 0:
880
1643
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
881
1644
            raise (gnutls.errors.CertificateSecurityError
882
 
                   (u"Verify failed"))
 
1645
                   ("Verify failed"))
883
1646
        # New buffer for the fingerprint
884
1647
        buf = ctypes.create_string_buffer(20)
885
1648
        buf_len = ctypes.c_size_t()
892
1655
        # Convert the buffer to a Python bytestring
893
1656
        fpr = ctypes.string_at(buf, buf_len.value)
894
1657
        # Convert the bytestring to hexadecimal notation
895
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1658
        hex_fpr = binascii.hexlify(fpr).upper()
896
1659
        return hex_fpr
897
1660
 
898
1661
 
899
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
900
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
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 """
901
1682
    def process_request(self, request, client_address):
902
1683
        """Overrides and wraps the original process_request().
903
1684
        
904
1685
        This function creates a new pipe in self.pipe
905
1686
        """
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):
 
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):
912
1695
        """Dummy function; override as necessary"""
913
 
        os.close(pipe)
914
 
 
915
 
 
916
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1696
        raise NotImplementedError
 
1697
 
 
1698
 
 
1699
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
917
1700
                     socketserver.TCPServer, object):
918
1701
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
919
1702
    
935
1718
        bind to an address or port if they were not specified."""
936
1719
        if self.interface is not None:
937
1720
            if SO_BINDTODEVICE is None:
938
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
939
 
                             u" cannot bind to interface %s",
 
1721
                logger.error("SO_BINDTODEVICE does not exist;"
 
1722
                             " cannot bind to interface %s",
940
1723
                             self.interface)
941
1724
            else:
942
1725
                try:
943
1726
                    self.socket.setsockopt(socket.SOL_SOCKET,
944
1727
                                           SO_BINDTODEVICE,
945
1728
                                           str(self.interface
946
 
                                               + u'\0'))
947
 
                except socket.error, error:
 
1729
                                               + '\0'))
 
1730
                except socket.error as error:
948
1731
                    if error[0] == errno.EPERM:
949
 
                        logger.error(u"No permission to"
950
 
                                     u" bind to interface %s",
 
1732
                        logger.error("No permission to"
 
1733
                                     " bind to interface %s",
951
1734
                                     self.interface)
952
1735
                    elif error[0] == errno.ENOPROTOOPT:
953
 
                        logger.error(u"SO_BINDTODEVICE not available;"
954
 
                                     u" cannot bind to interface %s",
 
1736
                        logger.error("SO_BINDTODEVICE not available;"
 
1737
                                     " cannot bind to interface %s",
955
1738
                                     self.interface)
956
1739
                    else:
957
1740
                        raise
959
1742
        if self.server_address[0] or self.server_address[1]:
960
1743
            if not self.server_address[0]:
961
1744
                if self.address_family == socket.AF_INET6:
962
 
                    any_address = u"::" # in6addr_any
 
1745
                    any_address = "::" # in6addr_any
963
1746
                else:
964
1747
                    any_address = socket.INADDR_ANY
965
1748
                self.server_address = (any_address,
983
1766
        clients:        set of Client objects
984
1767
        gnutls_priority GnuTLS priority string
985
1768
        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
989
1769
    
990
1770
    Assumes a gobject.MainLoop event loop.
991
1771
    """
995
1775
        self.enabled = False
996
1776
        self.clients = clients
997
1777
        if self.clients is None:
998
 
            self.clients = set()
 
1778
            self.clients = {}
999
1779
        self.use_dbus = use_dbus
1000
1780
        self.gnutls_priority = gnutls_priority
1001
1781
        IPv6_TCPServer.__init__(self, server_address,
1005
1785
    def server_activate(self):
1006
1786
        if self.enabled:
1007
1787
            return socketserver.TCPServer.server_activate(self)
 
1788
    
1008
1789
    def enable(self):
1009
1790
        self.enabled = True
1010
 
    def add_pipe(self, pipe):
 
1791
    
 
1792
    def add_pipe(self, parent_pipe, proc):
1011
1793
        # Call "handle_ipc" for both data and EOF events
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={}):
 
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):
1015
1803
        condition_names = {
1016
 
            gobject.IO_IN: u"IN",   # There is data to read.
1017
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1804
            gobject.IO_IN: "IN",   # There is data to read.
 
1805
            gobject.IO_OUT: "OUT", # Data can be written (without
1018
1806
                                    # blocking).
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
 
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
1022
1810
                                    # broken, usually for pipes and
1023
1811
                                    # sockets).
1024
1812
            }
1026
1814
                                       for cond, name in
1027
1815
                                       condition_names.iteritems()
1028
1816
                                       if cond & condition)
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
 
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
        
1083
1879
        return True
1084
1880
 
1085
1881
 
1086
1882
def string_to_delta(interval):
1087
1883
    """Parse a string and return a datetime.timedelta
1088
1884
    
1089
 
    >>> string_to_delta(u'7d')
 
1885
    >>> string_to_delta('7d')
1090
1886
    datetime.timedelta(7)
1091
 
    >>> string_to_delta(u'60s')
 
1887
    >>> string_to_delta('60s')
1092
1888
    datetime.timedelta(0, 60)
1093
 
    >>> string_to_delta(u'60m')
 
1889
    >>> string_to_delta('60m')
1094
1890
    datetime.timedelta(0, 3600)
1095
 
    >>> string_to_delta(u'24h')
 
1891
    >>> string_to_delta('24h')
1096
1892
    datetime.timedelta(1)
1097
 
    >>> string_to_delta(u'1w')
 
1893
    >>> string_to_delta('1w')
1098
1894
    datetime.timedelta(7)
1099
 
    >>> string_to_delta(u'5m 30s')
 
1895
    >>> string_to_delta('5m 30s')
1100
1896
    datetime.timedelta(0, 330)
1101
1897
    """
1102
1898
    timevalue = datetime.timedelta(0)
1104
1900
        try:
1105
1901
            suffix = unicode(s[-1])
1106
1902
            value = int(s[:-1])
1107
 
            if suffix == u"d":
 
1903
            if suffix == "d":
1108
1904
                delta = datetime.timedelta(value)
1109
 
            elif suffix == u"s":
 
1905
            elif suffix == "s":
1110
1906
                delta = datetime.timedelta(0, value)
1111
 
            elif suffix == u"m":
 
1907
            elif suffix == "m":
1112
1908
                delta = datetime.timedelta(0, 0, 0, 0, value)
1113
 
            elif suffix == u"h":
 
1909
            elif suffix == "h":
1114
1910
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1115
 
            elif suffix == u"w":
 
1911
            elif suffix == "w":
1116
1912
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1117
1913
            else:
1118
 
                raise ValueError
1119
 
        except (ValueError, IndexError):
1120
 
            raise ValueError
 
1914
                raise ValueError("Unknown suffix %r" % suffix)
 
1915
        except (ValueError, IndexError) as e:
 
1916
            raise ValueError(*(e.args))
1121
1917
        timevalue += delta
1122
1918
    return timevalue
1123
1919
 
1124
1920
 
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
 
 
1149
1921
def daemon(nochdir = False, noclose = False):
1150
1922
    """See daemon(3).  Standard BSD Unix function.
1151
1923
    
1154
1926
        sys.exit()
1155
1927
    os.setsid()
1156
1928
    if not nochdir:
1157
 
        os.chdir(u"/")
 
1929
        os.chdir("/")
1158
1930
    if os.fork():
1159
1931
        sys.exit()
1160
1932
    if not noclose:
1162
1934
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1163
1935
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1164
1936
            raise OSError(errno.ENODEV,
1165
 
                          u"/dev/null not a character device")
 
1937
                          "%s not a character device"
 
1938
                          % os.path.devnull)
1166
1939
        os.dup2(null, sys.stdin.fileno())
1167
1940
        os.dup2(null, sys.stdout.fileno())
1168
1941
        os.dup2(null, sys.stderr.fileno())
1172
1945
 
1173
1946
def main():
1174
1947
    
1175
 
    ######################################################################
 
1948
    ##################################################################
1176
1949
    # Parsing of options, both command line and config file
1177
1950
    
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]
 
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()
1204
1988
    
1205
1989
    if options.check:
1206
1990
        import doctest
1208
1992
        sys.exit()
1209
1993
    
1210
1994
    # Default values for config file for server-global settings
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",
 
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"
1220
2007
                        }
1221
2008
    
1222
2009
    # Parse config file for server-global settings
1223
2010
    server_config = configparser.SafeConfigParser(server_defaults)
1224
2011
    del server_defaults
1225
2012
    server_config.read(os.path.join(options.configdir,
1226
 
                                    u"mandos.conf"))
 
2013
                                    "mandos.conf"))
1227
2014
    # Convert the SafeConfigParser object to a dict
1228
2015
    server_settings = server_config.defaults()
1229
2016
    # Use the appropriate methods on the non-string config options
1230
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1231
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
2017
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2018
        server_settings[option] = server_config.getboolean("DEFAULT",
1232
2019
                                                           option)
1233
2020
    if server_settings["port"]:
1234
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1235
 
                                                       u"port")
 
2021
        server_settings["port"] = server_config.getint("DEFAULT",
 
2022
                                                       "port")
1236
2023
    del server_config
1237
2024
    
1238
2025
    # Override the settings from the config file with command line
1239
2026
    # options, if set.
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"):
 
2027
    for option in ("interface", "address", "port", "debug",
 
2028
                   "priority", "servicename", "configdir",
 
2029
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2030
                   "statedir"):
1243
2031
        value = getattr(options, option)
1244
2032
        if value is not None:
1245
2033
            server_settings[option] = value
1253
2041
    ##################################################################
1254
2042
    
1255
2043
    # For convenience
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":
 
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":
1265
2061
        syslogger.setFormatter(logging.Formatter
1266
 
                               (u'Mandos (%s) [%%(process)d]:'
1267
 
                                u' %%(levelname)s: %%(message)s'
1268
 
                                % server_settings[u"servicename"]))
 
2062
                               ('Mandos (%s) [%%(process)d]:'
 
2063
                                ' %%(levelname)s: %%(message)s'
 
2064
                                % server_settings["servicename"]))
1269
2065
    
1270
2066
    # Parse config file with clients
1271
 
    client_defaults = { u"timeout": u"1h",
1272
 
                        u"interval": u"5m",
1273
 
                        u"checker": u"fping -q -- %%(host)s",
1274
 
                        u"host": u"",
 
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",
1275
2074
                        }
1276
2075
    client_config = configparser.SafeConfigParser(client_defaults)
1277
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1278
 
                                    u"clients.conf"))
 
2076
    client_config.read(os.path.join(server_settings["configdir"],
 
2077
                                    "clients.conf"))
1279
2078
    
1280
2079
    global mandos_dbus_service
1281
2080
    mandos_dbus_service = None
1282
2081
    
1283
 
    tcp_server = MandosServer((server_settings[u"address"],
1284
 
                               server_settings[u"port"]),
 
2082
    tcp_server = MandosServer((server_settings["address"],
 
2083
                               server_settings["port"]),
1285
2084
                              ClientHandler,
1286
 
                              interface=server_settings[u"interface"],
 
2085
                              interface=(server_settings["interface"]
 
2086
                                         or None),
1287
2087
                              use_ipv6=use_ipv6,
1288
2088
                              gnutls_priority=
1289
 
                              server_settings[u"priority"],
 
2089
                              server_settings["priority"],
1290
2090
                              use_dbus=use_dbus)
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)
 
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)
1296
2097
    
1297
2098
    try:
1298
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1299
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
2099
        uid = pwd.getpwnam("_mandos").pw_uid
 
2100
        gid = pwd.getpwnam("_mandos").pw_gid
1300
2101
    except KeyError:
1301
2102
        try:
1302
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1303
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
2103
            uid = pwd.getpwnam("mandos").pw_uid
 
2104
            gid = pwd.getpwnam("mandos").pw_gid
1304
2105
        except KeyError:
1305
2106
            try:
1306
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1307
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
2107
                uid = pwd.getpwnam("nobody").pw_uid
 
2108
                gid = pwd.getpwnam("nobody").pw_gid
1308
2109
            except KeyError:
1309
2110
                uid = 65534
1310
2111
                gid = 65534
1311
2112
    try:
1312
2113
        os.setgid(gid)
1313
2114
        os.setuid(uid)
1314
 
    except OSError, error:
 
2115
    except OSError as error:
1315
2116
        if error[0] != errno.EPERM:
1316
2117
            raise error
1317
2118
    
1318
 
    # Enable all possible GnuTLS debugging
1319
2119
    if debug:
 
2120
        # Enable all possible GnuTLS debugging
 
2121
        
1320
2122
        # "Use a log level over 10 to enable all debugging options."
1321
2123
        # - GnuTLS manual
1322
2124
        gnutls.library.functions.gnutls_global_set_log_level(11)
1323
2125
        
1324
2126
        @gnutls.library.types.gnutls_log_func
1325
2127
        def debug_gnutls(level, string):
1326
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
2128
            logger.debug("GnuTLS: %s", string[:-1])
1327
2129
        
1328
2130
        (gnutls.library.functions
1329
2131
         .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()
1330
2146
    
1331
2147
    global main_loop
1332
2148
    # From the Avahi example code
1335
2151
    bus = dbus.SystemBus()
1336
2152
    # End of Avahi example code
1337
2153
    if use_dbus:
1338
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
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
1339
2165
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1340
 
    service = AvahiService(name = server_settings[u"servicename"],
1341
 
                           servicetype = u"_mandos._tcp",
1342
 
                           protocol = protocol, bus = bus)
 
2166
    service = AvahiServiceToSyslog(name =
 
2167
                                   server_settings["servicename"],
 
2168
                                   servicetype = "_mandos._tcp",
 
2169
                                   protocol = protocol, bus = bus)
1343
2170
    if server_settings["interface"]:
1344
2171
        service.interface = (if_nametoindex
1345
 
                             (str(server_settings[u"interface"])))
 
2172
                             (str(server_settings["interface"])))
 
2173
    
 
2174
    global multiprocessing_manager
 
2175
    multiprocessing_manager = multiprocessing.Manager()
1346
2176
    
1347
2177
    client_class = Client
1348
2178
    if use_dbus:
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()))
 
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
    
1354
2306
    if not tcp_server.clients:
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()
 
2307
        logger.warning("No clients defined")
1385
2308
        
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
 
    
1393
2309
    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
        
1394
2323
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2324
    
1395
2325
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1396
2326
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1397
2327
    
1399
2329
        class MandosDBusService(dbus.service.Object):
1400
2330
            """A D-Bus proxy object"""
1401
2331
            def __init__(self):
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")
 
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")
1416
2346
            def ClientRemoved(self, objpath, name):
1417
2347
                "D-Bus signal"
1418
2348
                pass
1419
2349
            
1420
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
2350
            @dbus.service.method(_interface, out_signature="ao")
1421
2351
            def GetAllClients(self):
1422
2352
                "D-Bus method"
1423
2353
                return dbus.Array(c.dbus_object_path
1424
 
                                  for c in tcp_server.clients)
 
2354
                                  for c in
 
2355
                                  tcp_server.clients.itervalues())
1425
2356
            
1426
2357
            @dbus.service.method(_interface,
1427
 
                                 out_signature=u"a{oa{sv}}")
 
2358
                                 out_signature="a{oa{sv}}")
1428
2359
            def GetAllClientsWithProperties(self):
1429
2360
                "D-Bus method"
1430
2361
                return dbus.Dictionary(
1431
 
                    ((c.dbus_object_path, c.GetAllProperties())
1432
 
                     for c in tcp_server.clients),
1433
 
                    signature=u"oa{sv}")
 
2362
                    ((c.dbus_object_path, c.GetAll(""))
 
2363
                     for c in tcp_server.clients.itervalues()),
 
2364
                    signature="oa{sv}")
1434
2365
            
1435
 
            @dbus.service.method(_interface, in_signature=u"o")
 
2366
            @dbus.service.method(_interface, in_signature="o")
1436
2367
            def RemoveClient(self, object_path):
1437
2368
                "D-Bus method"
1438
 
                for c in tcp_server.clients:
 
2369
                for c in tcp_server.clients.itervalues():
1439
2370
                    if c.dbus_object_path == object_path:
1440
 
                        tcp_server.clients.remove(c)
 
2371
                        del tcp_server.clients[c.name]
1441
2372
                        c.remove_from_connection()
1442
2373
                        # Don't signal anything except ClientRemoved
1443
 
                        c.disable(signal=False)
 
2374
                        c.disable(quiet=True)
1444
2375
                        # Emit D-Bus signal
1445
2376
                        self.ClientRemoved(object_path, c.name)
1446
2377
                        return
1447
 
                raise KeyError
 
2378
                raise KeyError(object_path)
1448
2379
            
1449
2380
            del _interface
1450
2381
        
1451
 
        mandos_dbus_service = MandosDBusService()
1452
 
    
1453
 
    for client in tcp_server.clients:
 
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():
1454
2449
        if use_dbus:
1455
2450
            # Emit D-Bus signal
1456
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1457
 
                                            client.GetAllProperties())
1458
 
        client.enable()
 
2451
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
2452
        # Need to initiate checking of clients
 
2453
        if client.enabled:
 
2454
            client.init_checker()
1459
2455
    
1460
2456
    tcp_server.enable()
1461
2457
    tcp_server.server_activate()
1463
2459
    # Find out what port we got
1464
2460
    service.port = tcp_server.socket.getsockname()[1]
1465
2461
    if use_ipv6:
1466
 
        logger.info(u"Now listening on address %r, port %d,"
 
2462
        logger.info("Now listening on address %r, port %d,"
1467
2463
                    " flowinfo %d, scope_id %d"
1468
2464
                    % tcp_server.socket.getsockname())
1469
2465
    else:                       # IPv4
1470
 
        logger.info(u"Now listening on address %r, port %d"
 
2466
        logger.info("Now listening on address %r, port %d"
1471
2467
                    % tcp_server.socket.getsockname())
1472
2468
    
1473
2469
    #service.interface = tcp_server.socket.getsockname()[3]
1476
2472
        # From the Avahi example code
1477
2473
        try:
1478
2474
            service.activate()
1479
 
        except dbus.exceptions.DBusException, error:
1480
 
            logger.critical(u"DBusException: %s", error)
 
2475
        except dbus.exceptions.DBusException as error:
 
2476
            logger.critical("DBusException: %s", error)
 
2477
            cleanup()
1481
2478
            sys.exit(1)
1482
2479
        # End of Avahi example code
1483
2480
        
1486
2483
                             (tcp_server.handle_request
1487
2484
                              (*args[2:], **kwargs) or True))
1488
2485
        
1489
 
        logger.debug(u"Starting main loop")
 
2486
        logger.debug("Starting main loop")
1490
2487
        main_loop.run()
1491
 
    except AvahiError, error:
1492
 
        logger.critical(u"AvahiError: %s", error)
 
2488
    except AvahiError as error:
 
2489
        logger.critical("AvahiError: %s", error)
 
2490
        cleanup()
1493
2491
        sys.exit(1)
1494
2492
    except KeyboardInterrupt:
1495
2493
        if debug:
1496
 
            print >> sys.stderr
1497
 
        logger.debug(u"Server received KeyboardInterrupt")
1498
 
    logger.debug(u"Server exiting")
 
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
 
1499
2500
 
1500
2501
if __name__ == '__main__':
1501
2502
    main()