/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: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

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