/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

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