/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-04-02 06:37:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers.  Also Changed to new
          "except x as y" exception syntax.
  (AvahiService.entry_group_state_changed_match): New; contains the
                                                  SignalMatch object.
  (AvahiService.remove): Really remove the group and the signal
                         connection, if any.
  (AvahiService.add): Always create a new group and signal connection.
  (AvahiService.cleanup): Changed to simply call remove().
  (AvahiService.server_state_changed): Handle and log more bad states.
  (AvahiService.activate): Set "follow_name_owner_changes=True" on the
                           Avahi Server proxy object.
  (ClientDBus.checked_ok): Do not return anything.
  (ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
64
62
import functools
65
63
import cPickle as pickle
66
64
import multiprocessing
67
 
import types
68
 
import binascii
69
 
import tempfile
70
 
import itertools
71
 
import collections
72
65
 
73
66
import dbus
74
67
import dbus.service
88
81
    except ImportError:
89
82
        SO_BINDTODEVICE = None
90
83
 
91
 
if sys.version_info.major == 2:
92
 
    str = unicode
93
 
 
94
 
version = "1.6.8"
95
 
stored_state_file = "clients.pickle"
96
 
 
97
 
logger = logging.getLogger()
98
 
syslogger = None
99
 
 
100
 
try:
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
102
 
                      (ctypes.util.find_library("c"))
103
 
                      .if_nametoindex)
104
 
except (OSError, AttributeError):
105
 
    def if_nametoindex(interface):
106
 
        "Get an interface index the hard way, i.e. using fcntl()"
107
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
 
        with contextlib.closing(socket.socket()) as s:
109
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
112
 
        return interface_index
113
 
 
114
 
 
115
 
def initlogger(debug, level=logging.WARNING):
116
 
    """init logger and add loglevel"""
117
 
    
118
 
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
123
 
    syslogger.setFormatter(logging.Formatter
124
 
                           ('Mandos [%(process)d]: %(levelname)s:'
125
 
                            ' %(message)s'))
126
 
    logger.addHandler(syslogger)
127
 
    
128
 
    if debug:
129
 
        console = logging.StreamHandler()
130
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
131
 
                                               ' [%(process)d]:'
132
 
                                               ' %(levelname)s:'
133
 
                                               ' %(message)s'))
134
 
        logger.addHandler(console)
135
 
    logger.setLevel(level)
136
 
 
137
 
 
138
 
class PGPError(Exception):
139
 
    """Exception if encryption/decryption fails"""
140
 
    pass
141
 
 
142
 
 
143
 
class PGPEngine(object):
144
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
145
 
    def __init__(self):
146
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
 
        self.gnupgargs = ['--batch',
148
 
                          '--home', self.tempdir,
149
 
                          '--force-mdc',
150
 
                          '--quiet',
151
 
                          '--no-use-agent']
152
 
    
153
 
    def __enter__(self):
154
 
        return self
155
 
    
156
 
    def __exit__(self, exc_type, exc_value, traceback):
157
 
        self._cleanup()
158
 
        return False
159
 
    
160
 
    def __del__(self):
161
 
        self._cleanup()
162
 
    
163
 
    def _cleanup(self):
164
 
        if self.tempdir is not None:
165
 
            # Delete contents of tempdir
166
 
            for root, dirs, files in os.walk(self.tempdir,
167
 
                                             topdown = False):
168
 
                for filename in files:
169
 
                    os.remove(os.path.join(root, filename))
170
 
                for dirname in dirs:
171
 
                    os.rmdir(os.path.join(root, dirname))
172
 
            # Remove tempdir
173
 
            os.rmdir(self.tempdir)
174
 
            self.tempdir = None
175
 
    
176
 
    def password_encode(self, password):
177
 
        # Passphrase can not be empty and can not contain newlines or
178
 
        # NUL bytes.  So we prefix it and hex encode it.
179
 
        encoded = b"mandos" + binascii.hexlify(password)
180
 
        if len(encoded) > 2048:
181
 
            # GnuPG can't handle long passwords, so encode differently
182
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
 
                       .replace(b"\n", b"\\n")
184
 
                       .replace(b"\0", b"\\x00"))
185
 
        return encoded
186
 
    
187
 
    def encrypt(self, data, password):
188
 
        passphrase = self.password_encode(password)
189
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
190
 
                                         ) as passfile:
191
 
            passfile.write(passphrase)
192
 
            passfile.flush()
193
 
            proc = subprocess.Popen(['gpg', '--symmetric',
194
 
                                     '--passphrase-file',
195
 
                                     passfile.name]
196
 
                                    + self.gnupgargs,
197
 
                                    stdin = subprocess.PIPE,
198
 
                                    stdout = subprocess.PIPE,
199
 
                                    stderr = subprocess.PIPE)
200
 
            ciphertext, err = proc.communicate(input = data)
201
 
        if proc.returncode != 0:
202
 
            raise PGPError(err)
203
 
        return ciphertext
204
 
    
205
 
    def decrypt(self, data, password):
206
 
        passphrase = self.password_encode(password)
207
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
208
 
                                         ) as passfile:
209
 
            passfile.write(passphrase)
210
 
            passfile.flush()
211
 
            proc = subprocess.Popen(['gpg', '--decrypt',
212
 
                                     '--passphrase-file',
213
 
                                     passfile.name]
214
 
                                    + self.gnupgargs,
215
 
                                    stdin = subprocess.PIPE,
216
 
                                    stdout = subprocess.PIPE,
217
 
                                    stderr = subprocess.PIPE)
218
 
            decrypted_plaintext, err = proc.communicate(input
219
 
                                                        = data)
220
 
        if proc.returncode != 0:
221
 
            raise PGPError(err)
222
 
        return decrypted_plaintext
223
 
 
 
84
 
 
85
version = "1.3.0"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
 
89
syslogger = (logging.handlers.SysLogHandler
 
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
91
              address = str("/dev/log")))
 
92
syslogger.setFormatter(logging.Formatter
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
 
95
logger.addHandler(syslogger)
 
96
 
 
97
console = logging.StreamHandler()
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
 
101
logger.addHandler(console)
224
102
 
225
103
class AvahiError(Exception):
226
104
    def __init__(self, value, *args, **kwargs):
227
105
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
107
    def __unicode__(self):
 
108
        return unicode(repr(self.value))
230
109
 
231
110
class AvahiServiceError(AvahiError):
232
111
    pass
243
122
               Used to optionally bind to the specified interface.
244
123
    name: string; Example: 'Mandos'
245
124
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
126
    port: integer; what port to announce
248
127
    TXT: list of strings; TXT record for the service
249
128
    domain: string; Domain to publish on, default to .local if empty.
255
134
    server: D-Bus Server
256
135
    bus: dbus.SystemBus()
257
136
    """
258
 
    
259
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
138
                 servicetype = None, port = None, TXT = None,
261
139
                 domain = "", host = "", max_renames = 32768,
274
152
        self.server = None
275
153
        self.bus = bus
276
154
        self.entry_group_state_changed_match = None
277
 
    
278
155
    def rename(self):
279
156
        """Derived from the Avahi example code"""
280
157
        if self.rename_count >= self.max_renames:
282
159
                            " after %i retries, exiting.",
283
160
                            self.rename_count)
284
161
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
287
163
        logger.info("Changing Zeroconf service name to %r ...",
288
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
289
169
        self.remove()
290
170
        try:
291
171
            self.add()
292
172
        except dbus.exceptions.DBusException as error:
293
 
            logger.critical("D-Bus Exception", exc_info=error)
 
173
            logger.critical("DBusException: %s", error)
294
174
            self.cleanup()
295
175
            os._exit(1)
296
176
        self.rename_count += 1
297
 
    
298
177
    def remove(self):
299
178
        """Derived from the Avahi example code"""
 
179
        if self.group is not None:
 
180
            try:
 
181
                self.group.Free()
 
182
            except (dbus.exceptions.UnknownMethodException,
 
183
                    dbus.exceptions.DBusException) as e:
 
184
                pass
 
185
            self.group = None
300
186
        if self.entry_group_state_changed_match is not None:
301
187
            self.entry_group_state_changed_match.remove()
302
188
            self.entry_group_state_changed_match = None
303
 
        if self.group is not None:
304
 
            self.group.Reset()
305
 
    
306
189
    def add(self):
307
190
        """Derived from the Avahi example code"""
308
191
        self.remove()
309
 
        if self.group is None:
310
 
            self.group = dbus.Interface(
311
 
                self.bus.get_object(avahi.DBUS_NAME,
312
 
                                    self.server.EntryGroupNew()),
313
 
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
192
        self.group = dbus.Interface(
 
193
            self.bus.get_object(avahi.DBUS_NAME,
 
194
                                self.server.EntryGroupNew(),
 
195
                                follow_name_owner_changes=True),
 
196
            avahi.DBUS_INTERFACE_ENTRY_GROUP)
314
197
        self.entry_group_state_changed_match = (
315
198
            self.group.connect_to_signal(
316
 
                'StateChanged', self.entry_group_state_changed))
 
199
                'StateChanged', self .entry_group_state_changed))
317
200
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
318
201
                     self.name, self.type)
319
202
        self.group.AddService(
325
208
            dbus.UInt16(self.port),
326
209
            avahi.string_array_to_txt_array(self.TXT))
327
210
        self.group.Commit()
328
 
    
329
211
    def entry_group_state_changed(self, state, error):
330
212
        """Derived from the Avahi example code"""
331
213
        logger.debug("Avahi entry group state change: %i", state)
337
219
            self.rename()
338
220
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
221
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
342
 
                                  .format(error))
343
 
    
 
222
                            unicode(error))
 
223
            raise AvahiGroupError("State changed: %s"
 
224
                                  % unicode(error))
344
225
    def cleanup(self):
345
226
        """Derived from the Avahi example code"""
346
 
        if self.group is not None:
347
 
            try:
348
 
                self.group.Free()
349
 
            except (dbus.exceptions.UnknownMethodException,
350
 
                    dbus.exceptions.DBusException):
351
 
                pass
352
 
            self.group = None
353
227
        self.remove()
354
 
    
355
228
    def server_state_changed(self, state, error=None):
356
229
        """Derived from the Avahi example code"""
357
230
        logger.debug("Avahi server state change: %i", state)
363
236
                       avahi.SERVER_FAILURE:
364
237
                           "Zeroconf server failure" }
365
238
        if state in bad_states:
366
 
            if bad_states[state] is not None:
367
 
                if error is None:
368
 
                    logger.error(bad_states[state])
369
 
                else:
370
 
                    logger.error(bad_states[state] + ": %r", error)
371
 
            self.cleanup()
 
239
            if bad_states[state]:
 
240
                logger.error(bad_states[state])
 
241
            self.remove()
372
242
        elif state == avahi.SERVER_RUNNING:
373
243
            self.add()
374
244
        else:
375
 
            if error is None:
376
 
                logger.debug("Unknown state: %r", state)
377
 
            else:
378
 
                logger.debug("Unknown state: %r: %r", state, error)
379
 
    
 
245
            logger.debug("Unknown state: %r", state)
380
246
    def activate(self):
381
247
        """Derived from the Avahi example code"""
382
248
        if self.server is None:
390
256
        self.server_state_changed(self.server.GetState())
391
257
 
392
258
 
393
 
class AvahiServiceToSyslog(AvahiService):
394
 
    def rename(self):
395
 
        """Add the new name to the syslog messages"""
396
 
        ret = AvahiService.rename(self)
397
 
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
399
 
                                ' %(levelname)s: %(message)s'
400
 
                                .format(self.name)))
401
 
        return ret
402
 
 
403
 
 
404
259
class Client(object):
405
260
    """A representation of a client host served by this server.
406
261
    
407
262
    Attributes:
408
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
263
    _approved:   bool(); 'None' if not yet approved/disapproved
409
264
    approval_delay: datetime.timedelta(); Time to wait for approval
410
265
    approval_duration: datetime.timedelta(); Duration of one approval
411
266
    checker:    subprocess.Popen(); a running checker process used
418
273
                     instance %(name)s can be used in the command.
419
274
    checker_initiator_tag: a gobject event source tag, or None
420
275
    created:    datetime.datetime(); (UTC) object creation
421
 
    client_structure: Object describing what attributes a client has
422
 
                      and is used for storing the client at exit
423
276
    current_checker_command: string; current running checker_command
 
277
    disable_hook:  If set, called by disable() as disable_hook(self)
424
278
    disable_initiator_tag: a gobject event source tag, or None
425
279
    enabled:    bool()
426
280
    fingerprint: string (40 or 32 hexadecimal digits); used to
429
283
    interval:   datetime.timedelta(); How often to start a new checker
430
284
    last_approval_request: datetime.datetime(); (UTC) or None
431
285
    last_checked_ok: datetime.datetime(); (UTC) or None
432
 
    last_checker_status: integer between 0 and 255 reflecting exit
433
 
                         status of last checker. -1 reflects crashed
434
 
                         checker, -2 means no checker completed yet.
435
 
    last_enabled: datetime.datetime(); (UTC) or None
 
286
    last_enabled: datetime.datetime(); (UTC)
436
287
    name:       string; from the config file, used in log messages and
437
288
                        D-Bus identifiers
438
289
    secret:     bytestring; sent verbatim (over TLS) to client
439
290
    timeout:    datetime.timedelta(); How long from last_checked_ok
440
291
                                      until this client is disabled
441
 
    extended_timeout:   extra long timeout when secret has been sent
442
292
    runtime_expansions: Allowed attributes for runtime expansion.
443
 
    expires:    datetime.datetime(); time (UTC) when a client will be
444
 
                disabled, or None
445
 
    server_settings: The server_settings dict from main()
446
293
    """
447
294
    
448
295
    runtime_expansions = ("approval_delay", "approval_duration",
449
 
                          "created", "enabled", "expires",
450
 
                          "fingerprint", "host", "interval",
451
 
                          "last_approval_request", "last_checked_ok",
 
296
                          "created", "enabled", "fingerprint",
 
297
                          "host", "interval", "last_checked_ok",
452
298
                          "last_enabled", "name", "timeout")
453
 
    client_defaults = { "timeout": "PT5M",
454
 
                        "extended_timeout": "PT15M",
455
 
                        "interval": "PT2M",
456
 
                        "checker": "fping -q -- %%(host)s",
457
 
                        "host": "",
458
 
                        "approval_delay": "PT0S",
459
 
                        "approval_duration": "PT1S",
460
 
                        "approved_by_default": "True",
461
 
                        "enabled": "True",
462
 
                        }
463
299
    
464
300
    @staticmethod
465
 
    def config_parser(config):
466
 
        """Construct a new dict of client settings of this form:
467
 
        { client_name: {setting_name: value, ...}, ...}
468
 
        with exceptions for any special settings as defined above.
469
 
        NOTE: Must be a pure function. Must return the same result
470
 
        value given the same arguments.
471
 
        """
472
 
        settings = {}
473
 
        for client_name in config.sections():
474
 
            section = dict(config.items(client_name))
475
 
            client = settings[client_name] = {}
476
 
            
477
 
            client["host"] = section["host"]
478
 
            # Reformat values from string types to Python types
479
 
            client["approved_by_default"] = config.getboolean(
480
 
                client_name, "approved_by_default")
481
 
            client["enabled"] = config.getboolean(client_name,
482
 
                                                  "enabled")
483
 
            
484
 
            client["fingerprint"] = (section["fingerprint"].upper()
485
 
                                     .replace(" ", ""))
486
 
            if "secret" in section:
487
 
                client["secret"] = section["secret"].decode("base64")
488
 
            elif "secfile" in section:
489
 
                with open(os.path.expanduser(os.path.expandvars
490
 
                                             (section["secfile"])),
491
 
                          "rb") as secfile:
492
 
                    client["secret"] = secfile.read()
493
 
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
495
 
                                .format(section))
496
 
            client["timeout"] = string_to_delta(section["timeout"])
497
 
            client["extended_timeout"] = string_to_delta(
498
 
                section["extended_timeout"])
499
 
            client["interval"] = string_to_delta(section["interval"])
500
 
            client["approval_delay"] = string_to_delta(
501
 
                section["approval_delay"])
502
 
            client["approval_duration"] = string_to_delta(
503
 
                section["approval_duration"])
504
 
            client["checker_command"] = section["checker"]
505
 
            client["last_approval_request"] = None
506
 
            client["last_checked_ok"] = None
507
 
            client["last_checker_status"] = -2
508
 
        
509
 
        return settings
510
 
    
511
 
    def __init__(self, settings, name = None, server_settings=None):
 
301
    def _timedelta_to_milliseconds(td):
 
302
        "Convert a datetime.timedelta() to milliseconds"
 
303
        return ((td.days * 24 * 60 * 60 * 1000)
 
304
                + (td.seconds * 1000)
 
305
                + (td.microseconds // 1000))
 
306
    
 
307
    def timeout_milliseconds(self):
 
308
        "Return the 'timeout' attribute in milliseconds"
 
309
        return self._timedelta_to_milliseconds(self.timeout)
 
310
    
 
311
    def interval_milliseconds(self):
 
312
        "Return the 'interval' attribute in milliseconds"
 
313
        return self._timedelta_to_milliseconds(self.interval)
 
314
 
 
315
    def approval_delay_milliseconds(self):
 
316
        return self._timedelta_to_milliseconds(self.approval_delay)
 
317
    
 
318
    def __init__(self, name = None, disable_hook=None, config=None):
 
319
        """Note: the 'checker' key in 'config' sets the
 
320
        'checker_command' attribute and *not* the 'checker'
 
321
        attribute."""
512
322
        self.name = name
513
 
        if server_settings is None:
514
 
            server_settings = {}
515
 
        self.server_settings = server_settings
516
 
        # adding all client settings
517
 
        for setting, value in settings.items():
518
 
            setattr(self, setting, value)
519
 
        
520
 
        if self.enabled:
521
 
            if not hasattr(self, "last_enabled"):
522
 
                self.last_enabled = datetime.datetime.utcnow()
523
 
            if not hasattr(self, "expires"):
524
 
                self.expires = (datetime.datetime.utcnow()
525
 
                                + self.timeout)
526
 
        else:
527
 
            self.last_enabled = None
528
 
            self.expires = None
529
 
        
 
323
        if config is None:
 
324
            config = {}
530
325
        logger.debug("Creating client %r", self.name)
531
326
        # Uppercase and remove spaces from fingerprint for later
532
327
        # comparison purposes with return value from the fingerprint()
533
328
        # function
 
329
        self.fingerprint = (config["fingerprint"].upper()
 
330
                            .replace(" ", ""))
534
331
        logger.debug("  Fingerprint: %s", self.fingerprint)
535
 
        self.created = settings.get("created",
536
 
                                    datetime.datetime.utcnow())
537
 
        
538
 
        # attributes specific for this server instance
 
332
        if "secret" in config:
 
333
            self.secret = config["secret"].decode("base64")
 
334
        elif "secfile" in config:
 
335
            with open(os.path.expanduser(os.path.expandvars
 
336
                                         (config["secfile"])),
 
337
                      "rb") as secfile:
 
338
                self.secret = secfile.read()
 
339
        else:
 
340
            raise TypeError("No secret or secfile for client %s"
 
341
                            % self.name)
 
342
        self.host = config.get("host", "")
 
343
        self.created = datetime.datetime.utcnow()
 
344
        self.enabled = False
 
345
        self.last_approval_request = None
 
346
        self.last_enabled = None
 
347
        self.last_checked_ok = None
 
348
        self.timeout = string_to_delta(config["timeout"])
 
349
        self.interval = string_to_delta(config["interval"])
 
350
        self.disable_hook = disable_hook
539
351
        self.checker = None
540
352
        self.checker_initiator_tag = None
541
353
        self.disable_initiator_tag = None
542
354
        self.checker_callback_tag = None
 
355
        self.checker_command = config["checker"]
543
356
        self.current_checker_command = None
544
 
        self.approved = None
 
357
        self.last_connect = None
 
358
        self._approved = None
 
359
        self.approved_by_default = config.get("approved_by_default",
 
360
                                              True)
545
361
        self.approvals_pending = 0
546
 
        self.changedstate = (multiprocessing_manager
547
 
                             .Condition(multiprocessing_manager
548
 
                                        .Lock()))
549
 
        self.client_structure = [attr for attr in
550
 
                                 self.__dict__.iterkeys()
551
 
                                 if not attr.startswith("_")]
552
 
        self.client_structure.append("client_structure")
553
 
        
554
 
        for name, t in inspect.getmembers(type(self),
555
 
                                          lambda obj:
556
 
                                              isinstance(obj,
557
 
                                                         property)):
558
 
            if not name.startswith("_"):
559
 
                self.client_structure.append(name)
 
362
        self.approval_delay = string_to_delta(
 
363
            config["approval_delay"])
 
364
        self.approval_duration = string_to_delta(
 
365
            config["approval_duration"])
 
366
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
560
367
    
561
 
    # Send notice to process children that client state has changed
562
368
    def send_changedstate(self):
563
 
        with self.changedstate:
564
 
            self.changedstate.notify_all()
565
 
    
 
369
        self.changedstate.acquire()
 
370
        self.changedstate.notify_all()
 
371
        self.changedstate.release()
 
372
        
566
373
    def enable(self):
567
374
        """Start this client's checker and timeout hooks"""
568
375
        if getattr(self, "enabled", False):
569
376
            # Already enabled
570
377
            return
571
 
        self.expires = datetime.datetime.utcnow() + self.timeout
572
 
        self.enabled = True
 
378
        self.send_changedstate()
573
379
        self.last_enabled = datetime.datetime.utcnow()
574
 
        self.init_checker()
575
 
        self.send_changedstate()
 
380
        # Schedule a new checker to be started an 'interval' from now,
 
381
        # and every interval from then on.
 
382
        self.checker_initiator_tag = (gobject.timeout_add
 
383
                                      (self.interval_milliseconds(),
 
384
                                       self.start_checker))
 
385
        # Schedule a disable() when 'timeout' has passed
 
386
        self.disable_initiator_tag = (gobject.timeout_add
 
387
                                   (self.timeout_milliseconds(),
 
388
                                    self.disable))
 
389
        self.enabled = True
 
390
        # Also start a new checker *right now*.
 
391
        self.start_checker()
576
392
    
577
393
    def disable(self, quiet=True):
578
394
        """Disable this client."""
579
395
        if not getattr(self, "enabled", False):
580
396
            return False
581
397
        if not quiet:
 
398
            self.send_changedstate()
 
399
        if not quiet:
582
400
            logger.info("Disabling client %s", self.name)
583
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
401
        if getattr(self, "disable_initiator_tag", False):
584
402
            gobject.source_remove(self.disable_initiator_tag)
585
403
            self.disable_initiator_tag = None
586
 
        self.expires = None
587
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
404
        if getattr(self, "checker_initiator_tag", False):
588
405
            gobject.source_remove(self.checker_initiator_tag)
589
406
            self.checker_initiator_tag = None
590
407
        self.stop_checker()
 
408
        if self.disable_hook:
 
409
            self.disable_hook(self)
591
410
        self.enabled = False
592
 
        if not quiet:
593
 
            self.send_changedstate()
594
411
        # Do not run this again if called by a gobject.timeout_add
595
412
        return False
596
413
    
597
414
    def __del__(self):
 
415
        self.disable_hook = None
598
416
        self.disable()
599
417
    
600
 
    def init_checker(self):
601
 
        # Schedule a new checker to be started an 'interval' from now,
602
 
        # and every interval from then on.
603
 
        if self.checker_initiator_tag is not None:
604
 
            gobject.source_remove(self.checker_initiator_tag)
605
 
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
608
 
                                       self.start_checker))
609
 
        # Schedule a disable() when 'timeout' has passed
610
 
        if self.disable_initiator_tag is not None:
611
 
            gobject.source_remove(self.disable_initiator_tag)
612
 
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
616
 
        # Also start a new checker *right now*.
617
 
        self.start_checker()
618
 
    
619
418
    def checker_callback(self, pid, condition, command):
620
419
        """The checker has completed, so take appropriate actions."""
621
420
        self.checker_callback_tag = None
622
421
        self.checker = None
623
422
        if os.WIFEXITED(condition):
624
 
            self.last_checker_status = os.WEXITSTATUS(condition)
625
 
            if self.last_checker_status == 0:
 
423
            exitstatus = os.WEXITSTATUS(condition)
 
424
            if exitstatus == 0:
626
425
                logger.info("Checker for %(name)s succeeded",
627
426
                            vars(self))
628
427
                self.checked_ok()
630
429
                logger.info("Checker for %(name)s failed",
631
430
                            vars(self))
632
431
        else:
633
 
            self.last_checker_status = -1
634
432
            logger.warning("Checker for %(name)s crashed?",
635
433
                           vars(self))
636
434
    
637
435
    def checked_ok(self):
638
 
        """Assert that the client has been seen, alive and well."""
 
436
        """Bump up the timeout for this client.
 
437
        
 
438
        This should only be called when the client has been seen,
 
439
        alive and well.
 
440
        """
639
441
        self.last_checked_ok = datetime.datetime.utcnow()
640
 
        self.last_checker_status = 0
641
 
        self.bump_timeout()
642
 
    
643
 
    def bump_timeout(self, timeout=None):
644
 
        """Bump up the timeout for this client."""
645
 
        if timeout is None:
646
 
            timeout = self.timeout
647
 
        if self.disable_initiator_tag is not None:
648
 
            gobject.source_remove(self.disable_initiator_tag)
649
 
            self.disable_initiator_tag = None
650
 
        if getattr(self, "enabled", False):
651
 
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
654
 
            self.expires = datetime.datetime.utcnow() + timeout
 
442
        gobject.source_remove(self.disable_initiator_tag)
 
443
        self.disable_initiator_tag = (gobject.timeout_add
 
444
                                      (self.timeout_milliseconds(),
 
445
                                       self.disable))
655
446
    
656
447
    def need_approval(self):
657
448
        self.last_approval_request = datetime.datetime.utcnow()
662
453
        If a checker already exists, leave it running and do
663
454
        nothing."""
664
455
        # The reason for not killing a running checker is that if we
665
 
        # did that, and if a checker (for some reason) started running
666
 
        # slowly and taking more than 'interval' time, then the client
667
 
        # would inevitably timeout, since no checker would get a
668
 
        # chance to run to completion.  If we instead leave running
 
456
        # did that, then if a checker (for some reason) started
 
457
        # running slowly and taking more than 'interval' time, the
 
458
        # client would inevitably timeout, since no checker would get
 
459
        # a chance to run to completion.  If we instead leave running
669
460
        # checkers alone, the checker would have to take more time
670
461
        # than 'timeout' for the client to be disabled, which is as it
671
462
        # should be.
673
464
        # If a checker exists, make sure it is not a zombie
674
465
        try:
675
466
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
 
        except AttributeError:
677
 
            pass
678
 
        except OSError as error:
679
 
            if error.errno != errno.ECHILD:
680
 
                raise
 
467
        except (AttributeError, OSError) as error:
 
468
            if (isinstance(error, OSError)
 
469
                and error.errno != errno.ECHILD):
 
470
                raise error
681
471
        else:
682
472
            if pid:
683
473
                logger.warning("Checker was a zombie")
686
476
                                      self.current_checker_command)
687
477
        # Start a new checker if needed
688
478
        if self.checker is None:
689
 
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(str(getattr(self, attr)))
692
 
                              for attr in self.runtime_expansions }
693
479
            try:
694
 
                command = self.checker_command % escaped_attrs
695
 
            except TypeError as error:
696
 
                logger.error('Could not format string "%s"',
697
 
                             self.checker_command, exc_info=error)
698
 
                return True # Try again later
 
480
                # In case checker_command has exactly one % operator
 
481
                command = self.checker_command % self.host
 
482
            except TypeError:
 
483
                # Escape attributes for the shell
 
484
                escaped_attrs = dict(
 
485
                    (attr,
 
486
                     re.escape(unicode(str(getattr(self, attr, "")),
 
487
                                       errors=
 
488
                                       'replace')))
 
489
                    for attr in
 
490
                    self.runtime_expansions)
 
491
 
 
492
                try:
 
493
                    command = self.checker_command % escaped_attrs
 
494
                except TypeError as error:
 
495
                    logger.error('Could not format string "%s":'
 
496
                                 ' %s', self.checker_command, error)
 
497
                    return True # Try again later
699
498
            self.current_checker_command = command
700
499
            try:
701
500
                logger.info("Starting checker %r for %s",
704
503
                # in normal mode, that is already done by daemon(),
705
504
                # and in debug mode we don't want to.  (Stdin is
706
505
                # always replaced by /dev/null.)
707
 
                # The exception is when not debugging but nevertheless
708
 
                # running in the foreground; use the previously
709
 
                # created wnull.
710
 
                popen_args = {}
711
 
                if (not self.server_settings["debug"]
712
 
                    and self.server_settings["foreground"]):
713
 
                    popen_args.update({"stdout": wnull,
714
 
                                       "stderr": wnull })
715
506
                self.checker = subprocess.Popen(command,
716
507
                                                close_fds=True,
717
 
                                                shell=True, cwd="/",
718
 
                                                **popen_args)
719
 
            except OSError as error:
720
 
                logger.error("Failed to start subprocess",
721
 
                             exc_info=error)
722
 
                return True
723
 
            self.checker_callback_tag = (gobject.child_watch_add
724
 
                                         (self.checker.pid,
725
 
                                          self.checker_callback,
726
 
                                          data=command))
727
 
            # The checker may have completed before the gobject
728
 
            # watch was added.  Check for this.
729
 
            try:
 
508
                                                shell=True, cwd="/")
 
509
                self.checker_callback_tag = (gobject.child_watch_add
 
510
                                             (self.checker.pid,
 
511
                                              self.checker_callback,
 
512
                                              data=command))
 
513
                # The checker may have completed before the gobject
 
514
                # watch was added.  Check for this.
730
515
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
516
                if pid:
 
517
                    gobject.source_remove(self.checker_callback_tag)
 
518
                    self.checker_callback(pid, status, command)
731
519
            except OSError as error:
732
 
                if error.errno == errno.ECHILD:
733
 
                    # This should never happen
734
 
                    logger.error("Child process vanished",
735
 
                                 exc_info=error)
736
 
                    return True
737
 
                raise
738
 
            if pid:
739
 
                gobject.source_remove(self.checker_callback_tag)
740
 
                self.checker_callback(pid, status, command)
 
520
                logger.error("Failed to start subprocess: %s",
 
521
                             error)
741
522
        # Re-run this periodically if run by gobject.timeout_add
742
523
        return True
743
524
    
750
531
            return
751
532
        logger.debug("Stopping checker for %(name)s", vars(self))
752
533
        try:
753
 
            self.checker.terminate()
 
534
            os.kill(self.checker.pid, signal.SIGTERM)
754
535
            #time.sleep(0.5)
755
536
            #if self.checker.poll() is None:
756
 
            #    self.checker.kill()
 
537
            #    os.kill(self.checker.pid, signal.SIGKILL)
757
538
        except OSError as error:
758
539
            if error.errno != errno.ESRCH: # No such process
759
540
                raise
760
541
        self.checker = None
761
542
 
762
 
 
763
543
def dbus_service_property(dbus_interface, signature="v",
764
544
                          access="readwrite", byte_arrays=False):
765
545
    """Decorators for marking methods of a DBusObjectWithProperties to
776
556
    # "Set" method, so we fail early here:
777
557
    if byte_arrays and signature != "ay":
778
558
        raise ValueError("Byte arrays not supported for non-'ay'"
779
 
                         " signature {!r}".format(signature))
 
559
                         " signature %r" % signature)
780
560
    def decorator(func):
781
561
        func._dbus_is_property = True
782
562
        func._dbus_interface = dbus_interface
790
570
    return decorator
791
571
 
792
572
 
793
 
def dbus_interface_annotations(dbus_interface):
794
 
    """Decorator for marking functions returning interface annotations
795
 
    
796
 
    Usage:
797
 
    
798
 
    @dbus_interface_annotations("org.example.Interface")
799
 
    def _foo(self):  # Function name does not matter
800
 
        return {"org.freedesktop.DBus.Deprecated": "true",
801
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
802
 
                    "false"}
803
 
    """
804
 
    def decorator(func):
805
 
        func._dbus_is_interface = True
806
 
        func._dbus_interface = dbus_interface
807
 
        func._dbus_name = dbus_interface
808
 
        return func
809
 
    return decorator
810
 
 
811
 
 
812
 
def dbus_annotations(annotations):
813
 
    """Decorator to annotate D-Bus methods, signals or properties
814
 
    Usage:
815
 
    
816
 
    @dbus_service_property("org.example.Interface", signature="b",
817
 
                           access="r")
818
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
819
 
                        "org.freedesktop.DBus.Property."
820
 
                        "EmitsChangedSignal": "false"})
821
 
    def Property_dbus_property(self):
822
 
        return dbus.Boolean(False)
823
 
    """
824
 
    def decorator(func):
825
 
        func._dbus_annotations = annotations
826
 
        return func
827
 
    return decorator
828
 
 
829
 
 
830
573
class DBusPropertyException(dbus.exceptions.DBusException):
831
574
    """A base class for D-Bus property-related exceptions
832
575
    """
833
 
    pass
 
576
    def __unicode__(self):
 
577
        return unicode(str(self))
 
578
 
834
579
 
835
580
class DBusPropertyAccessException(DBusPropertyException):
836
581
    """A property's access permissions disallows an operation.
846
591
 
847
592
class DBusObjectWithProperties(dbus.service.Object):
848
593
    """A D-Bus object with properties.
849
 
    
 
594
 
850
595
    Classes inheriting from this can use the dbus_service_property
851
596
    decorator to expose methods as D-Bus properties.  It exposes the
852
597
    standard Get(), Set(), and GetAll() methods on the D-Bus.
853
598
    """
854
599
    
855
600
    @staticmethod
856
 
    def _is_dbus_thing(thing):
857
 
        """Returns a function testing if an attribute is a D-Bus thing
858
 
        
859
 
        If called like _is_dbus_thing("method") it returns a function
860
 
        suitable for use as predicate to inspect.getmembers().
861
 
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
863
 
                                   False)
 
601
    def _is_dbus_property(obj):
 
602
        return getattr(obj, "_dbus_is_property", False)
864
603
    
865
 
    def _get_all_dbus_things(self, thing):
 
604
    def _get_all_dbus_properties(self):
866
605
        """Returns a generator of (name, attribute) pairs
867
606
        """
868
 
        return ((getattr(athing.__get__(self), "_dbus_name",
869
 
                         name),
870
 
                 athing.__get__(self))
871
 
                for cls in self.__class__.__mro__
872
 
                for name, athing in
873
 
                inspect.getmembers(cls,
874
 
                                   self._is_dbus_thing(thing)))
 
607
        return ((prop._dbus_name, prop)
 
608
                for name, prop in
 
609
                inspect.getmembers(self, self._is_dbus_property))
875
610
    
876
611
    def _get_dbus_property(self, interface_name, property_name):
877
612
        """Returns a bound method if one exists which is a D-Bus
878
613
        property with the specified name and interface.
879
614
        """
880
 
        for cls in  self.__class__.__mro__:
881
 
            for name, value in (inspect.getmembers
882
 
                                (cls,
883
 
                                 self._is_dbus_thing("property"))):
884
 
                if (value._dbus_name == property_name
885
 
                    and value._dbus_interface == interface_name):
886
 
                    return value.__get__(self)
887
 
        
 
615
        for name in (property_name,
 
616
                     property_name + "_dbus_property"):
 
617
            prop = getattr(self, name, None)
 
618
            if (prop is None
 
619
                or not self._is_dbus_property(prop)
 
620
                or prop._dbus_name != property_name
 
621
                or (interface_name and prop._dbus_interface
 
622
                    and interface_name != prop._dbus_interface)):
 
623
                continue
 
624
            return prop
888
625
        # No such property
889
626
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
627
                                   + interface_name + "."
914
651
            # The byte_arrays option is not supported yet on
915
652
            # signatures other than "ay".
916
653
            if prop._dbus_signature != "ay":
917
 
                raise ValueError("Byte arrays not supported for non-"
918
 
                                 "'ay' signature {!r}"
919
 
                                 .format(prop._dbus_signature))
920
 
            value = dbus.ByteArray(b''.join(chr(byte)
921
 
                                            for byte in value))
 
654
                raise ValueError
 
655
            value = dbus.ByteArray(''.join(unichr(byte)
 
656
                                           for byte in value))
922
657
        prop(value)
923
658
    
924
659
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
926
661
    def GetAll(self, interface_name):
927
662
        """Standard D-Bus property GetAll() method, see D-Bus
928
663
        standard.
929
 
        
 
664
 
930
665
        Note: Will not include properties with access="write".
931
666
        """
932
 
        properties = {}
933
 
        for name, prop in self._get_all_dbus_things("property"):
 
667
        all = {}
 
668
        for name, prop in self._get_all_dbus_properties():
934
669
            if (interface_name
935
670
                and interface_name != prop._dbus_interface):
936
671
                # Interface non-empty but did not match
940
675
                continue
941
676
            value = prop()
942
677
            if not hasattr(value, "variant_level"):
943
 
                properties[name] = value
 
678
                all[name] = value
944
679
                continue
945
 
            properties[name] = type(value)(value, variant_level=
946
 
                                           value.variant_level+1)
947
 
        return dbus.Dictionary(properties, signature="sv")
 
680
            all[name] = type(value)(value, variant_level=
 
681
                                    value.variant_level+1)
 
682
        return dbus.Dictionary(all, signature="sv")
948
683
    
949
684
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
950
685
                         out_signature="s",
951
686
                         path_keyword='object_path',
952
687
                         connection_keyword='connection')
953
688
    def Introspect(self, object_path, connection):
954
 
        """Overloading of standard D-Bus method.
955
 
        
956
 
        Inserts property tags and interface annotation tags.
 
689
        """Standard D-Bus method, overloaded to insert property tags.
957
690
        """
958
691
        xmlstring = dbus.service.Object.Introspect(self, object_path,
959
692
                                                   connection)
966
699
                e.setAttribute("access", prop._dbus_access)
967
700
                return e
968
701
            for if_tag in document.getElementsByTagName("interface"):
969
 
                # Add property tags
970
702
                for tag in (make_tag(document, name, prop)
971
703
                            for name, prop
972
 
                            in self._get_all_dbus_things("property")
 
704
                            in self._get_all_dbus_properties()
973
705
                            if prop._dbus_interface
974
706
                            == if_tag.getAttribute("name")):
975
707
                    if_tag.appendChild(tag)
976
 
                # Add annotation tags
977
 
                for typ in ("method", "signal", "property"):
978
 
                    for tag in if_tag.getElementsByTagName(typ):
979
 
                        annots = dict()
980
 
                        for name, prop in (self.
981
 
                                           _get_all_dbus_things(typ)):
982
 
                            if (name == tag.getAttribute("name")
983
 
                                and prop._dbus_interface
984
 
                                == if_tag.getAttribute("name")):
985
 
                                annots.update(getattr
986
 
                                              (prop,
987
 
                                               "_dbus_annotations",
988
 
                                               {}))
989
 
                        for name, value in annots.items():
990
 
                            ann_tag = document.createElement(
991
 
                                "annotation")
992
 
                            ann_tag.setAttribute("name", name)
993
 
                            ann_tag.setAttribute("value", value)
994
 
                            tag.appendChild(ann_tag)
995
 
                # Add interface annotation tags
996
 
                for annotation, value in dict(
997
 
                    itertools.chain.from_iterable(
998
 
                        annotations().items()
999
 
                        for name, annotations in
1000
 
                        self._get_all_dbus_things("interface")
1001
 
                        if name == if_tag.getAttribute("name")
1002
 
                        )).items():
1003
 
                    ann_tag = document.createElement("annotation")
1004
 
                    ann_tag.setAttribute("name", annotation)
1005
 
                    ann_tag.setAttribute("value", value)
1006
 
                    if_tag.appendChild(ann_tag)
1007
708
                # Add the names to the return values for the
1008
709
                # "org.freedesktop.DBus.Properties" methods
1009
710
                if (if_tag.getAttribute("name")
1024
725
        except (AttributeError, xml.dom.DOMException,
1025
726
                xml.parsers.expat.ExpatError) as error:
1026
727
            logger.error("Failed to override Introspection method",
1027
 
                         exc_info=error)
 
728
                         error)
1028
729
        return xmlstring
1029
730
 
1030
731
 
1031
 
def datetime_to_dbus(dt, variant_level=0):
1032
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1033
 
    if dt is None:
1034
 
        return dbus.String("", variant_level = variant_level)
1035
 
    return dbus.String(dt.isoformat(),
1036
 
                       variant_level=variant_level)
1037
 
 
1038
 
 
1039
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1040
 
    """A class decorator; applied to a subclass of
1041
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1042
 
    interface names according to the "alt_interface_names" mapping.
1043
 
    Usage:
1044
 
    
1045
 
    @alternate_dbus_interfaces({"org.example.Interface":
1046
 
                                    "net.example.AlternateInterface"})
1047
 
    class SampleDBusObject(dbus.service.Object):
1048
 
        @dbus.service.method("org.example.Interface")
1049
 
        def SampleDBusMethod():
1050
 
            pass
1051
 
    
1052
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1053
 
    reachable via two interfaces: "org.example.Interface" and
1054
 
    "net.example.AlternateInterface", the latter of which will have
1055
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1056
 
    "true", unless "deprecate" is passed with a False value.
1057
 
    
1058
 
    This works for methods and signals, and also for D-Bus properties
1059
 
    (from DBusObjectWithProperties) and interfaces (from the
1060
 
    dbus_interface_annotations decorator).
1061
 
    """
1062
 
    def wrapper(cls):
1063
 
        for orig_interface_name, alt_interface_name in (
1064
 
            alt_interface_names.items()):
1065
 
            attr = {}
1066
 
            interface_names = set()
1067
 
            # Go though all attributes of the class
1068
 
            for attrname, attribute in inspect.getmembers(cls):
1069
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1070
 
                # with the wrong interface name
1071
 
                if (not hasattr(attribute, "_dbus_interface")
1072
 
                    or not attribute._dbus_interface
1073
 
                    .startswith(orig_interface_name)):
1074
 
                    continue
1075
 
                # Create an alternate D-Bus interface name based on
1076
 
                # the current name
1077
 
                alt_interface = (attribute._dbus_interface
1078
 
                                 .replace(orig_interface_name,
1079
 
                                          alt_interface_name))
1080
 
                interface_names.add(alt_interface)
1081
 
                # Is this a D-Bus signal?
1082
 
                if getattr(attribute, "_dbus_is_signal", False):
1083
 
                    # Extract the original non-method undecorated
1084
 
                    # function by black magic
1085
 
                    nonmethod_func = (dict(
1086
 
                            zip(attribute.func_code.co_freevars,
1087
 
                                attribute.__closure__))["func"]
1088
 
                                      .cell_contents)
1089
 
                    # Create a new, but exactly alike, function
1090
 
                    # object, and decorate it to be a new D-Bus signal
1091
 
                    # with the alternate D-Bus interface name
1092
 
                    new_function = (dbus.service.signal
1093
 
                                    (alt_interface,
1094
 
                                     attribute._dbus_signature)
1095
 
                                    (types.FunctionType(
1096
 
                                nonmethod_func.func_code,
1097
 
                                nonmethod_func.func_globals,
1098
 
                                nonmethod_func.func_name,
1099
 
                                nonmethod_func.func_defaults,
1100
 
                                nonmethod_func.func_closure)))
1101
 
                    # Copy annotations, if any
1102
 
                    try:
1103
 
                        new_function._dbus_annotations = (
1104
 
                            dict(attribute._dbus_annotations))
1105
 
                    except AttributeError:
1106
 
                        pass
1107
 
                    # Define a creator of a function to call both the
1108
 
                    # original and alternate functions, so both the
1109
 
                    # original and alternate signals gets sent when
1110
 
                    # the function is called
1111
 
                    def fixscope(func1, func2):
1112
 
                        """This function is a scope container to pass
1113
 
                        func1 and func2 to the "call_both" function
1114
 
                        outside of its arguments"""
1115
 
                        def call_both(*args, **kwargs):
1116
 
                            """This function will emit two D-Bus
1117
 
                            signals by calling func1 and func2"""
1118
 
                            func1(*args, **kwargs)
1119
 
                            func2(*args, **kwargs)
1120
 
                        return call_both
1121
 
                    # Create the "call_both" function and add it to
1122
 
                    # the class
1123
 
                    attr[attrname] = fixscope(attribute, new_function)
1124
 
                # Is this a D-Bus method?
1125
 
                elif getattr(attribute, "_dbus_is_method", False):
1126
 
                    # Create a new, but exactly alike, function
1127
 
                    # object.  Decorate it to be a new D-Bus method
1128
 
                    # with the alternate D-Bus interface name.  Add it
1129
 
                    # to the class.
1130
 
                    attr[attrname] = (dbus.service.method
1131
 
                                      (alt_interface,
1132
 
                                       attribute._dbus_in_signature,
1133
 
                                       attribute._dbus_out_signature)
1134
 
                                      (types.FunctionType
1135
 
                                       (attribute.func_code,
1136
 
                                        attribute.func_globals,
1137
 
                                        attribute.func_name,
1138
 
                                        attribute.func_defaults,
1139
 
                                        attribute.func_closure)))
1140
 
                    # Copy annotations, if any
1141
 
                    try:
1142
 
                        attr[attrname]._dbus_annotations = (
1143
 
                            dict(attribute._dbus_annotations))
1144
 
                    except AttributeError:
1145
 
                        pass
1146
 
                # Is this a D-Bus property?
1147
 
                elif getattr(attribute, "_dbus_is_property", False):
1148
 
                    # Create a new, but exactly alike, function
1149
 
                    # object, and decorate it to be a new D-Bus
1150
 
                    # property with the alternate D-Bus interface
1151
 
                    # name.  Add it to the class.
1152
 
                    attr[attrname] = (dbus_service_property
1153
 
                                      (alt_interface,
1154
 
                                       attribute._dbus_signature,
1155
 
                                       attribute._dbus_access,
1156
 
                                       attribute
1157
 
                                       ._dbus_get_args_options
1158
 
                                       ["byte_arrays"])
1159
 
                                      (types.FunctionType
1160
 
                                       (attribute.func_code,
1161
 
                                        attribute.func_globals,
1162
 
                                        attribute.func_name,
1163
 
                                        attribute.func_defaults,
1164
 
                                        attribute.func_closure)))
1165
 
                    # Copy annotations, if any
1166
 
                    try:
1167
 
                        attr[attrname]._dbus_annotations = (
1168
 
                            dict(attribute._dbus_annotations))
1169
 
                    except AttributeError:
1170
 
                        pass
1171
 
                # Is this a D-Bus interface?
1172
 
                elif getattr(attribute, "_dbus_is_interface", False):
1173
 
                    # Create a new, but exactly alike, function
1174
 
                    # object.  Decorate it to be a new D-Bus interface
1175
 
                    # with the alternate D-Bus interface name.  Add it
1176
 
                    # to the class.
1177
 
                    attr[attrname] = (dbus_interface_annotations
1178
 
                                      (alt_interface)
1179
 
                                      (types.FunctionType
1180
 
                                       (attribute.func_code,
1181
 
                                        attribute.func_globals,
1182
 
                                        attribute.func_name,
1183
 
                                        attribute.func_defaults,
1184
 
                                        attribute.func_closure)))
1185
 
            if deprecate:
1186
 
                # Deprecate all alternate interfaces
1187
 
                iname="_AlternateDBusNames_interface_annotation{}"
1188
 
                for interface_name in interface_names:
1189
 
                    @dbus_interface_annotations(interface_name)
1190
 
                    def func(self):
1191
 
                        return { "org.freedesktop.DBus.Deprecated":
1192
 
                                     "true" }
1193
 
                    # Find an unused name
1194
 
                    for aname in (iname.format(i)
1195
 
                                  for i in itertools.count()):
1196
 
                        if aname not in attr:
1197
 
                            attr[aname] = func
1198
 
                            break
1199
 
            if interface_names:
1200
 
                # Replace the class with a new subclass of it with
1201
 
                # methods, signals, etc. as created above.
1202
 
                cls = type(b"{}Alternate".format(cls.__name__),
1203
 
                           (cls,), attr)
1204
 
        return cls
1205
 
    return wrapper
1206
 
 
1207
 
 
1208
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1209
 
                                "se.bsnet.fukt.Mandos"})
1210
732
class ClientDBus(Client, DBusObjectWithProperties):
1211
733
    """A Client class using D-Bus
1212
734
    
1221
743
    # dbus.service.Object doesn't use super(), so we can't either.
1222
744
    
1223
745
    def __init__(self, bus = None, *args, **kwargs):
 
746
        self._approvals_pending = 0
1224
747
        self.bus = bus
1225
748
        Client.__init__(self, *args, **kwargs)
1226
749
        # Only now, when this client is initialized, can it show up on
1227
750
        # the D-Bus
1228
 
        client_object_name = str(self.name).translate(
 
751
        client_object_name = unicode(self.name).translate(
1229
752
            {ord("."): ord("_"),
1230
753
             ord("-"): ord("_")})
1231
754
        self.dbus_object_path = (dbus.ObjectPath
1232
755
                                 ("/clients/" + client_object_name))
1233
756
        DBusObjectWithProperties.__init__(self, self.bus,
1234
757
                                          self.dbus_object_path)
1235
 
    
1236
 
    def notifychangeproperty(transform_func,
1237
 
                             dbus_name, type_func=lambda x: x,
1238
 
                             variant_level=1):
1239
 
        """ Modify a variable so that it's a property which announces
1240
 
        its changes to DBus.
1241
 
        
1242
 
        transform_fun: Function that takes a value and a variant_level
1243
 
                       and transforms it to a D-Bus type.
1244
 
        dbus_name: D-Bus name of the variable
1245
 
        type_func: Function that transform the value before sending it
1246
 
                   to the D-Bus.  Default: no transform
1247
 
        variant_level: D-Bus variant level.  Default: 1
1248
 
        """
1249
 
        attrname = "_{}".format(dbus_name)
1250
 
        def setter(self, value):
1251
 
            if hasattr(self, "dbus_object_path"):
1252
 
                if (not hasattr(self, attrname) or
1253
 
                    type_func(getattr(self, attrname, None))
1254
 
                    != type_func(value)):
1255
 
                    dbus_value = transform_func(type_func(value),
1256
 
                                                variant_level
1257
 
                                                =variant_level)
1258
 
                    self.PropertyChanged(dbus.String(dbus_name),
1259
 
                                         dbus_value)
1260
 
            setattr(self, attrname, value)
1261
 
        
1262
 
        return property(lambda self: getattr(self, attrname), setter)
1263
 
    
1264
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1265
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1266
 
                                             "ApprovalPending",
1267
 
                                             type_func = bool)
1268
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1269
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1270
 
                                        "LastEnabled")
1271
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1272
 
                                   type_func = lambda checker:
1273
 
                                       checker is not None)
1274
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1275
 
                                           "LastCheckedOK")
1276
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1277
 
                                               "LastCheckerStatus")
1278
 
    last_approval_request = notifychangeproperty(
1279
 
        datetime_to_dbus, "LastApprovalRequest")
1280
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1281
 
                                               "ApprovedByDefault")
1282
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1283
 
                                          "ApprovalDelay",
1284
 
                                          type_func =
1285
 
                                          lambda td: td.total_seconds()
1286
 
                                          * 1000)
1287
 
    approval_duration = notifychangeproperty(
1288
 
        dbus.UInt64, "ApprovalDuration",
1289
 
        type_func = lambda td: td.total_seconds() * 1000)
1290
 
    host = notifychangeproperty(dbus.String, "Host")
1291
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1292
 
                                   type_func = lambda td:
1293
 
                                       td.total_seconds() * 1000)
1294
 
    extended_timeout = notifychangeproperty(
1295
 
        dbus.UInt64, "ExtendedTimeout",
1296
 
        type_func = lambda td: td.total_seconds() * 1000)
1297
 
    interval = notifychangeproperty(dbus.UInt64,
1298
 
                                    "Interval",
1299
 
                                    type_func =
1300
 
                                    lambda td: td.total_seconds()
1301
 
                                    * 1000)
1302
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1303
 
    
1304
 
    del notifychangeproperty
 
758
        
 
759
    def _get_approvals_pending(self):
 
760
        return self._approvals_pending
 
761
    def _set_approvals_pending(self, value):
 
762
        old_value = self._approvals_pending
 
763
        self._approvals_pending = value
 
764
        bval = bool(value)
 
765
        if (hasattr(self, "dbus_object_path")
 
766
            and bval is not bool(old_value)):
 
767
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
768
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
769
                                 dbus_bool)
 
770
 
 
771
    approvals_pending = property(_get_approvals_pending,
 
772
                                 _set_approvals_pending)
 
773
    del _get_approvals_pending, _set_approvals_pending
 
774
    
 
775
    @staticmethod
 
776
    def _datetime_to_dbus(dt, variant_level=0):
 
777
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
778
        return dbus.String(dt.isoformat(),
 
779
                           variant_level=variant_level)
 
780
    
 
781
    def enable(self):
 
782
        oldstate = getattr(self, "enabled", False)
 
783
        r = Client.enable(self)
 
784
        if oldstate != self.enabled:
 
785
            # Emit D-Bus signals
 
786
            self.PropertyChanged(dbus.String("Enabled"),
 
787
                                 dbus.Boolean(True, variant_level=1))
 
788
            self.PropertyChanged(
 
789
                dbus.String("LastEnabled"),
 
790
                self._datetime_to_dbus(self.last_enabled,
 
791
                                       variant_level=1))
 
792
        return r
 
793
    
 
794
    def disable(self, quiet = False):
 
795
        oldstate = getattr(self, "enabled", False)
 
796
        r = Client.disable(self, quiet=quiet)
 
797
        if not quiet and oldstate != self.enabled:
 
798
            # Emit D-Bus signal
 
799
            self.PropertyChanged(dbus.String("Enabled"),
 
800
                                 dbus.Boolean(False, variant_level=1))
 
801
        return r
1305
802
    
1306
803
    def __del__(self, *args, **kwargs):
1307
804
        try:
1316
813
                         *args, **kwargs):
1317
814
        self.checker_callback_tag = None
1318
815
        self.checker = None
 
816
        # Emit D-Bus signal
 
817
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
818
                             dbus.Boolean(False, variant_level=1))
1319
819
        if os.WIFEXITED(condition):
1320
820
            exitstatus = os.WEXITSTATUS(condition)
1321
821
            # Emit D-Bus signal
1331
831
        return Client.checker_callback(self, pid, condition, command,
1332
832
                                       *args, **kwargs)
1333
833
    
 
834
    def checked_ok(self, *args, **kwargs):
 
835
        Client.checked_ok(self, *args, **kwargs)
 
836
        # Emit D-Bus signal
 
837
        self.PropertyChanged(
 
838
            dbus.String("LastCheckedOK"),
 
839
            (self._datetime_to_dbus(self.last_checked_ok,
 
840
                                    variant_level=1)))
 
841
    
 
842
    def need_approval(self, *args, **kwargs):
 
843
        r = Client.need_approval(self, *args, **kwargs)
 
844
        # Emit D-Bus signal
 
845
        self.PropertyChanged(
 
846
            dbus.String("LastApprovalRequest"),
 
847
            (self._datetime_to_dbus(self.last_approval_request,
 
848
                                    variant_level=1)))
 
849
        return r
 
850
    
1334
851
    def start_checker(self, *args, **kwargs):
1335
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
852
        old_checker = self.checker
 
853
        if self.checker is not None:
 
854
            old_checker_pid = self.checker.pid
 
855
        else:
 
856
            old_checker_pid = None
1336
857
        r = Client.start_checker(self, *args, **kwargs)
1337
858
        # Only if new checker process was started
1338
859
        if (self.checker is not None
1339
860
            and old_checker_pid != self.checker.pid):
1340
861
            # Emit D-Bus signal
1341
862
            self.CheckerStarted(self.current_checker_command)
 
863
            self.PropertyChanged(
 
864
                dbus.String("CheckerRunning"),
 
865
                dbus.Boolean(True, variant_level=1))
1342
866
        return r
1343
867
    
 
868
    def stop_checker(self, *args, **kwargs):
 
869
        old_checker = getattr(self, "checker", None)
 
870
        r = Client.stop_checker(self, *args, **kwargs)
 
871
        if (old_checker is not None
 
872
            and getattr(self, "checker", None) is None):
 
873
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
874
                                 dbus.Boolean(False, variant_level=1))
 
875
        return r
 
876
 
1344
877
    def _reset_approved(self):
1345
 
        self.approved = None
 
878
        self._approved = None
1346
879
        return False
1347
880
    
1348
881
    def approve(self, value=True):
1349
 
        self.approved = value
1350
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1351
 
                                * 1000), self._reset_approved)
1352
882
        self.send_changedstate()
 
883
        self._approved = value
 
884
        gobject.timeout_add(self._timedelta_to_milliseconds
 
885
                            (self.approval_duration),
 
886
                            self._reset_approved)
 
887
    
1353
888
    
1354
889
    ## D-Bus methods, signals & properties
1355
 
    _interface = "se.recompile.Mandos.Client"
1356
 
    
1357
 
    ## Interfaces
1358
 
    
1359
 
    @dbus_interface_annotations(_interface)
1360
 
    def _foo(self):
1361
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1362
 
                     "false"}
 
890
    _interface = "se.bsnet.fukt.Mandos.Client"
1363
891
    
1364
892
    ## Signals
1365
893
    
1451
979
        if value is None:       # get
1452
980
            return dbus.Boolean(self.approved_by_default)
1453
981
        self.approved_by_default = bool(value)
 
982
        # Emit D-Bus signal
 
983
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
984
                             dbus.Boolean(value, variant_level=1))
1454
985
    
1455
986
    # ApprovalDelay - property
1456
987
    @dbus_service_property(_interface, signature="t",
1457
988
                           access="readwrite")
1458
989
    def ApprovalDelay_dbus_property(self, value=None):
1459
990
        if value is None:       # get
1460
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1461
 
                               * 1000)
 
991
            return dbus.UInt64(self.approval_delay_milliseconds())
1462
992
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
993
        # Emit D-Bus signal
 
994
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
995
                             dbus.UInt64(value, variant_level=1))
1463
996
    
1464
997
    # ApprovalDuration - property
1465
998
    @dbus_service_property(_interface, signature="t",
1466
999
                           access="readwrite")
1467
1000
    def ApprovalDuration_dbus_property(self, value=None):
1468
1001
        if value is None:       # get
1469
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1470
 
                               * 1000)
 
1002
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1003
                    self.approval_duration))
1471
1004
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1005
        # Emit D-Bus signal
 
1006
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
1007
                             dbus.UInt64(value, variant_level=1))
1472
1008
    
1473
1009
    # Name - property
1474
1010
    @dbus_service_property(_interface, signature="s", access="read")
1486
1022
    def Host_dbus_property(self, value=None):
1487
1023
        if value is None:       # get
1488
1024
            return dbus.String(self.host)
1489
 
        self.host = str(value)
 
1025
        self.host = value
 
1026
        # Emit D-Bus signal
 
1027
        self.PropertyChanged(dbus.String("Host"),
 
1028
                             dbus.String(value, variant_level=1))
1490
1029
    
1491
1030
    # Created - property
1492
1031
    @dbus_service_property(_interface, signature="s", access="read")
1493
1032
    def Created_dbus_property(self):
1494
 
        return datetime_to_dbus(self.created)
 
1033
        return dbus.String(self._datetime_to_dbus(self.created))
1495
1034
    
1496
1035
    # LastEnabled - property
1497
1036
    @dbus_service_property(_interface, signature="s", access="read")
1498
1037
    def LastEnabled_dbus_property(self):
1499
 
        return datetime_to_dbus(self.last_enabled)
 
1038
        if self.last_enabled is None:
 
1039
            return dbus.String("")
 
1040
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1500
1041
    
1501
1042
    # Enabled - property
1502
1043
    @dbus_service_property(_interface, signature="b",
1516
1057
        if value is not None:
1517
1058
            self.checked_ok()
1518
1059
            return
1519
 
        return datetime_to_dbus(self.last_checked_ok)
1520
 
    
1521
 
    # LastCheckerStatus - property
1522
 
    @dbus_service_property(_interface, signature="n",
1523
 
                           access="read")
1524
 
    def LastCheckerStatus_dbus_property(self):
1525
 
        return dbus.Int16(self.last_checker_status)
1526
 
    
1527
 
    # Expires - property
1528
 
    @dbus_service_property(_interface, signature="s", access="read")
1529
 
    def Expires_dbus_property(self):
1530
 
        return datetime_to_dbus(self.expires)
 
1060
        if self.last_checked_ok is None:
 
1061
            return dbus.String("")
 
1062
        return dbus.String(self._datetime_to_dbus(self
 
1063
                                                  .last_checked_ok))
1531
1064
    
1532
1065
    # LastApprovalRequest - property
1533
1066
    @dbus_service_property(_interface, signature="s", access="read")
1534
1067
    def LastApprovalRequest_dbus_property(self):
1535
 
        return datetime_to_dbus(self.last_approval_request)
 
1068
        if self.last_approval_request is None:
 
1069
            return dbus.String("")
 
1070
        return dbus.String(self.
 
1071
                           _datetime_to_dbus(self
 
1072
                                             .last_approval_request))
1536
1073
    
1537
1074
    # Timeout - property
1538
1075
    @dbus_service_property(_interface, signature="t",
1539
1076
                           access="readwrite")
1540
1077
    def Timeout_dbus_property(self, value=None):
1541
1078
        if value is None:       # get
1542
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1543
 
        old_timeout = self.timeout
 
1079
            return dbus.UInt64(self.timeout_milliseconds())
1544
1080
        self.timeout = datetime.timedelta(0, 0, 0, value)
1545
 
        # Reschedule disabling
1546
 
        if self.enabled:
1547
 
            now = datetime.datetime.utcnow()
1548
 
            self.expires += self.timeout - old_timeout
1549
 
            if self.expires <= now:
1550
 
                # The timeout has passed
1551
 
                self.disable()
1552
 
            else:
1553
 
                if (getattr(self, "disable_initiator_tag", None)
1554
 
                    is None):
1555
 
                    return
1556
 
                gobject.source_remove(self.disable_initiator_tag)
1557
 
                self.disable_initiator_tag = (
1558
 
                    gobject.timeout_add(
1559
 
                        int((self.expires - now).total_seconds()
1560
 
                            * 1000), self.disable))
1561
 
    
1562
 
    # ExtendedTimeout - property
1563
 
    @dbus_service_property(_interface, signature="t",
1564
 
                           access="readwrite")
1565
 
    def ExtendedTimeout_dbus_property(self, value=None):
1566
 
        if value is None:       # get
1567
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1568
 
                               * 1000)
1569
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1081
        # Emit D-Bus signal
 
1082
        self.PropertyChanged(dbus.String("Timeout"),
 
1083
                             dbus.UInt64(value, variant_level=1))
 
1084
        if getattr(self, "disable_initiator_tag", None) is None:
 
1085
            return
 
1086
        # Reschedule timeout
 
1087
        gobject.source_remove(self.disable_initiator_tag)
 
1088
        self.disable_initiator_tag = None
 
1089
        time_to_die = (self.
 
1090
                       _timedelta_to_milliseconds((self
 
1091
                                                   .last_checked_ok
 
1092
                                                   + self.timeout)
 
1093
                                                  - datetime.datetime
 
1094
                                                  .utcnow()))
 
1095
        if time_to_die <= 0:
 
1096
            # The timeout has passed
 
1097
            self.disable()
 
1098
        else:
 
1099
            self.disable_initiator_tag = (gobject.timeout_add
 
1100
                                          (time_to_die, self.disable))
1570
1101
    
1571
1102
    # Interval - property
1572
1103
    @dbus_service_property(_interface, signature="t",
1573
1104
                           access="readwrite")
1574
1105
    def Interval_dbus_property(self, value=None):
1575
1106
        if value is None:       # get
1576
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1107
            return dbus.UInt64(self.interval_milliseconds())
1577
1108
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1109
        # Emit D-Bus signal
 
1110
        self.PropertyChanged(dbus.String("Interval"),
 
1111
                             dbus.UInt64(value, variant_level=1))
1578
1112
        if getattr(self, "checker_initiator_tag", None) is None:
1579
1113
            return
1580
 
        if self.enabled:
1581
 
            # Reschedule checker run
1582
 
            gobject.source_remove(self.checker_initiator_tag)
1583
 
            self.checker_initiator_tag = (gobject.timeout_add
1584
 
                                          (value, self.start_checker))
1585
 
            self.start_checker()    # Start one now, too
1586
 
    
 
1114
        # Reschedule checker run
 
1115
        gobject.source_remove(self.checker_initiator_tag)
 
1116
        self.checker_initiator_tag = (gobject.timeout_add
 
1117
                                      (value, self.start_checker))
 
1118
        self.start_checker()    # Start one now, too
 
1119
 
1587
1120
    # Checker - property
1588
1121
    @dbus_service_property(_interface, signature="s",
1589
1122
                           access="readwrite")
1590
1123
    def Checker_dbus_property(self, value=None):
1591
1124
        if value is None:       # get
1592
1125
            return dbus.String(self.checker_command)
1593
 
        self.checker_command = str(value)
 
1126
        self.checker_command = value
 
1127
        # Emit D-Bus signal
 
1128
        self.PropertyChanged(dbus.String("Checker"),
 
1129
                             dbus.String(self.checker_command,
 
1130
                                         variant_level=1))
1594
1131
    
1595
1132
    # CheckerRunning - property
1596
1133
    @dbus_service_property(_interface, signature="b",
1612
1149
    @dbus_service_property(_interface, signature="ay",
1613
1150
                           access="write", byte_arrays=True)
1614
1151
    def Secret_dbus_property(self, value):
1615
 
        self.secret = bytes(value)
 
1152
        self.secret = str(value)
1616
1153
    
1617
1154
    del _interface
1618
1155
 
1623
1160
        self._pipe.send(('init', fpr, address))
1624
1161
        if not self._pipe.recv():
1625
1162
            raise KeyError()
1626
 
    
 
1163
 
1627
1164
    def __getattribute__(self, name):
1628
 
        if name == '_pipe':
 
1165
        if(name == '_pipe'):
1629
1166
            return super(ProxyClient, self).__getattribute__(name)
1630
1167
        self._pipe.send(('getattr', name))
1631
1168
        data = self._pipe.recv()
1636
1173
                self._pipe.send(('funcall', name, args, kwargs))
1637
1174
                return self._pipe.recv()[1]
1638
1175
            return func
1639
 
    
 
1176
 
1640
1177
    def __setattr__(self, name, value):
1641
 
        if name == '_pipe':
 
1178
        if(name == '_pipe'):
1642
1179
            return super(ProxyClient, self).__setattr__(name, value)
1643
1180
        self._pipe.send(('setattr', name, value))
1644
1181
 
1652
1189
    def handle(self):
1653
1190
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1654
1191
            logger.info("TCP connection from: %s",
1655
 
                        str(self.client_address))
 
1192
                        unicode(self.client_address))
1656
1193
            logger.debug("Pipe FD: %d",
1657
1194
                         self.server.child_pipe.fileno())
1658
 
            
 
1195
 
1659
1196
            session = (gnutls.connection
1660
1197
                       .ClientSession(self.request,
1661
1198
                                      gnutls.connection
1662
1199
                                      .X509Credentials()))
1663
 
            
 
1200
 
1664
1201
            # Note: gnutls.connection.X509Credentials is really a
1665
1202
            # generic GnuTLS certificate credentials object so long as
1666
1203
            # no X.509 keys are added to it.  Therefore, we can use it
1667
1204
            # here despite using OpenPGP certificates.
1668
 
            
 
1205
 
1669
1206
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1670
1207
            #                      "+AES-256-CBC", "+SHA1",
1671
1208
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1677
1214
            (gnutls.library.functions
1678
1215
             .gnutls_priority_set_direct(session._c_object,
1679
1216
                                         priority, None))
1680
 
            
 
1217
 
1681
1218
            # Start communication using the Mandos protocol
1682
1219
            # Get protocol number
1683
1220
            line = self.request.makefile().readline()
1684
1221
            logger.debug("Protocol version: %r", line)
1685
1222
            try:
1686
1223
                if int(line.strip().split()[0]) > 1:
1687
 
                    raise RuntimeError(line)
 
1224
                    raise RuntimeError
1688
1225
            except (ValueError, IndexError, RuntimeError) as error:
1689
1226
                logger.error("Unknown protocol version: %s", error)
1690
1227
                return
1691
 
            
 
1228
 
1692
1229
            # Start GnuTLS connection
1693
1230
            try:
1694
1231
                session.handshake()
1698
1235
                # established.  Just abandon the request.
1699
1236
                return
1700
1237
            logger.debug("Handshake succeeded")
1701
 
            
 
1238
 
1702
1239
            approval_required = False
1703
1240
            try:
1704
1241
                try:
1709
1246
                    logger.warning("Bad certificate: %s", error)
1710
1247
                    return
1711
1248
                logger.debug("Fingerprint: %s", fpr)
1712
 
                
 
1249
 
1713
1250
                try:
1714
1251
                    client = ProxyClient(child_pipe, fpr,
1715
1252
                                         self.client_address)
1723
1260
                
1724
1261
                while True:
1725
1262
                    if not client.enabled:
1726
 
                        logger.info("Client %s is disabled",
 
1263
                        logger.warning("Client %s is disabled",
1727
1264
                                       client.name)
1728
1265
                        if self.server.use_dbus:
1729
1266
                            # Emit D-Bus signal
1730
 
                            client.Rejected("Disabled")
 
1267
                            client.Rejected("Disabled")                    
1731
1268
                        return
1732
1269
                    
1733
 
                    if client.approved or not client.approval_delay:
 
1270
                    if client._approved or not client.approval_delay:
1734
1271
                        #We are approved or approval is disabled
1735
1272
                        break
1736
 
                    elif client.approved is None:
 
1273
                    elif client._approved is None:
1737
1274
                        logger.info("Client %s needs approval",
1738
1275
                                    client.name)
1739
1276
                        if self.server.use_dbus:
1740
1277
                            # Emit D-Bus signal
1741
1278
                            client.NeedApproval(
1742
 
                                client.approval_delay.total_seconds()
1743
 
                                * 1000, client.approved_by_default)
 
1279
                                client.approval_delay_milliseconds(),
 
1280
                                client.approved_by_default)
1744
1281
                    else:
1745
1282
                        logger.warning("Client %s was not approved",
1746
1283
                                       client.name)
1750
1287
                        return
1751
1288
                    
1752
1289
                    #wait until timeout or approved
 
1290
                    #x = float(client._timedelta_to_milliseconds(delay))
1753
1291
                    time = datetime.datetime.now()
1754
1292
                    client.changedstate.acquire()
1755
 
                    client.changedstate.wait(delay.total_seconds())
 
1293
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1756
1294
                    client.changedstate.release()
1757
1295
                    time2 = datetime.datetime.now()
1758
1296
                    if (time2 - time) >= delay:
1774
1312
                    try:
1775
1313
                        sent = session.send(client.secret[sent_size:])
1776
1314
                    except gnutls.errors.GNUTLSError as error:
1777
 
                        logger.warning("gnutls send failed",
1778
 
                                       exc_info=error)
 
1315
                        logger.warning("gnutls send failed")
1779
1316
                        return
1780
1317
                    logger.debug("Sent: %d, remaining: %d",
1781
1318
                                 sent, len(client.secret)
1782
1319
                                 - (sent_size + sent))
1783
1320
                    sent_size += sent
1784
 
                
 
1321
 
1785
1322
                logger.info("Sending secret to %s", client.name)
1786
 
                # bump the timeout using extended_timeout
1787
 
                client.bump_timeout(client.extended_timeout)
 
1323
                # bump the timeout as if seen
 
1324
                client.checked_ok()
1788
1325
                if self.server.use_dbus:
1789
1326
                    # Emit D-Bus signal
1790
1327
                    client.GotSecret()
1795
1332
                try:
1796
1333
                    session.bye()
1797
1334
                except gnutls.errors.GNUTLSError as error:
1798
 
                    logger.warning("GnuTLS bye failed",
1799
 
                                   exc_info=error)
 
1335
                    logger.warning("GnuTLS bye failed")
1800
1336
    
1801
1337
    @staticmethod
1802
1338
    def peer_certificate(session):
1858
1394
        # Convert the buffer to a Python bytestring
1859
1395
        fpr = ctypes.string_at(buf, buf_len.value)
1860
1396
        # Convert the bytestring to hexadecimal notation
1861
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1397
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1862
1398
        return hex_fpr
1863
1399
 
1864
1400
 
1867
1403
    def sub_process_main(self, request, address):
1868
1404
        try:
1869
1405
            self.finish_request(request, address)
1870
 
        except Exception:
 
1406
        except:
1871
1407
            self.handle_error(request, address)
1872
1408
        self.close_request(request)
1873
 
    
 
1409
            
1874
1410
    def process_request(self, request, address):
1875
1411
        """Start a new process to process the request."""
1876
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1877
 
                                       args = (request, address))
1878
 
        proc.start()
1879
 
        return proc
1880
 
 
 
1412
        multiprocessing.Process(target = self.sub_process_main,
 
1413
                                args = (request, address)).start()
1881
1414
 
1882
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1883
1416
    """ adds a pipe to the MixIn """
1887
1420
        This function creates a new pipe in self.pipe
1888
1421
        """
1889
1422
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1890
 
        
1891
 
        proc = MultiprocessingMixIn.process_request(self, request,
1892
 
                                                    client_address)
 
1423
 
 
1424
        super(MultiprocessingMixInWithPipe,
 
1425
              self).process_request(request, client_address)
1893
1426
        self.child_pipe.close()
1894
 
        self.add_pipe(parent_pipe, proc)
1895
 
    
1896
 
    def add_pipe(self, parent_pipe, proc):
 
1427
        self.add_pipe(parent_pipe)
 
1428
 
 
1429
    def add_pipe(self, parent_pipe):
1897
1430
        """Dummy function; override as necessary"""
1898
 
        raise NotImplementedError()
1899
 
 
 
1431
        raise NotImplementedError
1900
1432
 
1901
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1902
1434
                     socketserver.TCPServer, object):
1908
1440
        use_ipv6:       Boolean; to use IPv6 or not
1909
1441
    """
1910
1442
    def __init__(self, server_address, RequestHandlerClass,
1911
 
                 interface=None, use_ipv6=True, socketfd=None):
1912
 
        """If socketfd is set, use that file descriptor instead of
1913
 
        creating a new one with socket.socket().
1914
 
        """
 
1443
                 interface=None, use_ipv6=True):
1915
1444
        self.interface = interface
1916
1445
        if use_ipv6:
1917
1446
            self.address_family = socket.AF_INET6
1918
 
        if socketfd is not None:
1919
 
            # Save the file descriptor
1920
 
            self.socketfd = socketfd
1921
 
            # Save the original socket.socket() function
1922
 
            self.socket_socket = socket.socket
1923
 
            # To implement --socket, we monkey patch socket.socket.
1924
 
            # 
1925
 
            # (When socketserver.TCPServer is a new-style class, we
1926
 
            # could make self.socket into a property instead of monkey
1927
 
            # patching socket.socket.)
1928
 
            # 
1929
 
            # Create a one-time-only replacement for socket.socket()
1930
 
            @functools.wraps(socket.socket)
1931
 
            def socket_wrapper(*args, **kwargs):
1932
 
                # Restore original function so subsequent calls are
1933
 
                # not affected.
1934
 
                socket.socket = self.socket_socket
1935
 
                del self.socket_socket
1936
 
                # This time only, return a new socket object from the
1937
 
                # saved file descriptor.
1938
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1939
 
            # Replace socket.socket() function with wrapper
1940
 
            socket.socket = socket_wrapper
1941
 
        # The socketserver.TCPServer.__init__ will call
1942
 
        # socket.socket(), which might be our replacement,
1943
 
        # socket_wrapper(), if socketfd was set.
1944
1447
        socketserver.TCPServer.__init__(self, server_address,
1945
1448
                                        RequestHandlerClass)
1946
 
    
1947
1449
    def server_bind(self):
1948
1450
        """This overrides the normal server_bind() function
1949
1451
        to bind to an interface if one was specified, and also NOT to
1957
1459
                try:
1958
1460
                    self.socket.setsockopt(socket.SOL_SOCKET,
1959
1461
                                           SO_BINDTODEVICE,
1960
 
                                           (self.interface + "\0")
1961
 
                                           .encode("utf-8"))
 
1462
                                           str(self.interface
 
1463
                                               + '\0'))
1962
1464
                except socket.error as error:
1963
 
                    if error.errno == errno.EPERM:
1964
 
                        logger.error("No permission to bind to"
1965
 
                                     " interface %s", self.interface)
1966
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1465
                    if error[0] == errno.EPERM:
 
1466
                        logger.error("No permission to"
 
1467
                                     " bind to interface %s",
 
1468
                                     self.interface)
 
1469
                    elif error[0] == errno.ENOPROTOOPT:
1967
1470
                        logger.error("SO_BINDTODEVICE not available;"
1968
1471
                                     " cannot bind to interface %s",
1969
1472
                                     self.interface)
1970
 
                    elif error.errno == errno.ENODEV:
1971
 
                        logger.error("Interface %s does not exist,"
1972
 
                                     " cannot bind", self.interface)
1973
1473
                    else:
1974
1474
                        raise
1975
1475
        # Only bind(2) the socket if we really need to.
1978
1478
                if self.address_family == socket.AF_INET6:
1979
1479
                    any_address = "::" # in6addr_any
1980
1480
                else:
1981
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1481
                    any_address = socket.INADDR_ANY
1982
1482
                self.server_address = (any_address,
1983
1483
                                       self.server_address[1])
1984
1484
            elif not self.server_address[1]:
2005
1505
    """
2006
1506
    def __init__(self, server_address, RequestHandlerClass,
2007
1507
                 interface=None, use_ipv6=True, clients=None,
2008
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1508
                 gnutls_priority=None, use_dbus=True):
2009
1509
        self.enabled = False
2010
1510
        self.clients = clients
2011
1511
        if self.clients is None:
2012
 
            self.clients = {}
 
1512
            self.clients = set()
2013
1513
        self.use_dbus = use_dbus
2014
1514
        self.gnutls_priority = gnutls_priority
2015
1515
        IPv6_TCPServer.__init__(self, server_address,
2016
1516
                                RequestHandlerClass,
2017
1517
                                interface = interface,
2018
 
                                use_ipv6 = use_ipv6,
2019
 
                                socketfd = socketfd)
 
1518
                                use_ipv6 = use_ipv6)
2020
1519
    def server_activate(self):
2021
1520
        if self.enabled:
2022
1521
            return socketserver.TCPServer.server_activate(self)
2023
 
    
2024
1522
    def enable(self):
2025
1523
        self.enabled = True
2026
 
    
2027
 
    def add_pipe(self, parent_pipe, proc):
 
1524
    def add_pipe(self, parent_pipe):
2028
1525
        # Call "handle_ipc" for both data and EOF events
2029
1526
        gobject.io_add_watch(parent_pipe.fileno(),
2030
1527
                             gobject.IO_IN | gobject.IO_HUP,
2031
1528
                             functools.partial(self.handle_ipc,
2032
 
                                               parent_pipe =
2033
 
                                               parent_pipe,
2034
 
                                               proc = proc))
2035
 
    
 
1529
                                               parent_pipe = parent_pipe))
 
1530
        
2036
1531
    def handle_ipc(self, source, condition, parent_pipe=None,
2037
 
                   proc = None, client_object=None):
2038
 
        # error, or the other end of multiprocessing.Pipe has closed
2039
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2040
 
            # Wait for other process to exit
2041
 
            proc.join()
 
1532
                   client_object=None):
 
1533
        condition_names = {
 
1534
            gobject.IO_IN: "IN",   # There is data to read.
 
1535
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1536
                                    # blocking).
 
1537
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1538
            gobject.IO_ERR: "ERR", # Error condition.
 
1539
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1540
                                    # broken, usually for pipes and
 
1541
                                    # sockets).
 
1542
            }
 
1543
        conditions_string = ' | '.join(name
 
1544
                                       for cond, name in
 
1545
                                       condition_names.iteritems()
 
1546
                                       if cond & condition)
 
1547
        # error or the other end of multiprocessing.Pipe has closed
 
1548
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2042
1549
            return False
2043
1550
        
2044
1551
        # Read a request from the child
2049
1556
            fpr = request[1]
2050
1557
            address = request[2]
2051
1558
            
2052
 
            for c in self.clients.itervalues():
 
1559
            for c in self.clients:
2053
1560
                if c.fingerprint == fpr:
2054
1561
                    client = c
2055
1562
                    break
2056
1563
            else:
2057
 
                logger.info("Client not found for fingerprint: %s, ad"
2058
 
                            "dress: %s", fpr, address)
 
1564
                logger.warning("Client not found for fingerprint: %s, ad"
 
1565
                               "dress: %s", fpr, address)
2059
1566
                if self.use_dbus:
2060
1567
                    # Emit D-Bus signal
2061
 
                    mandos_dbus_service.ClientNotFound(fpr,
2062
 
                                                       address[0])
 
1568
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2063
1569
                parent_pipe.send(False)
2064
1570
                return False
2065
1571
            
2066
1572
            gobject.io_add_watch(parent_pipe.fileno(),
2067
1573
                                 gobject.IO_IN | gobject.IO_HUP,
2068
1574
                                 functools.partial(self.handle_ipc,
2069
 
                                                   parent_pipe =
2070
 
                                                   parent_pipe,
2071
 
                                                   proc = proc,
2072
 
                                                   client_object =
2073
 
                                                   client))
 
1575
                                                   parent_pipe = parent_pipe,
 
1576
                                                   client_object = client))
2074
1577
            parent_pipe.send(True)
2075
 
            # remove the old hook in favor of the new above hook on
2076
 
            # same fileno
 
1578
            # remove the old hook in favor of the new above hook on same fileno
2077
1579
            return False
2078
1580
        if command == 'funcall':
2079
1581
            funcname = request[1]
2080
1582
            args = request[2]
2081
1583
            kwargs = request[3]
2082
1584
            
2083
 
            parent_pipe.send(('data', getattr(client_object,
2084
 
                                              funcname)(*args,
2085
 
                                                         **kwargs)))
2086
 
        
 
1585
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1586
 
2087
1587
        if command == 'getattr':
2088
1588
            attrname = request[1]
2089
1589
            if callable(client_object.__getattribute__(attrname)):
2090
1590
                parent_pipe.send(('function',))
2091
1591
            else:
2092
 
                parent_pipe.send(('data', client_object
2093
 
                                  .__getattribute__(attrname)))
 
1592
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2094
1593
        
2095
1594
        if command == 'setattr':
2096
1595
            attrname = request[1]
2097
1596
            value = request[2]
2098
1597
            setattr(client_object, attrname, value)
2099
 
        
 
1598
 
2100
1599
        return True
2101
1600
 
2102
1601
 
2103
 
def rfc3339_duration_to_delta(duration):
2104
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2105
 
    
2106
 
    >>> rfc3339_duration_to_delta("P7D")
2107
 
    datetime.timedelta(7)
2108
 
    >>> rfc3339_duration_to_delta("PT60S")
2109
 
    datetime.timedelta(0, 60)
2110
 
    >>> rfc3339_duration_to_delta("PT60M")
2111
 
    datetime.timedelta(0, 3600)
2112
 
    >>> rfc3339_duration_to_delta("PT24H")
2113
 
    datetime.timedelta(1)
2114
 
    >>> rfc3339_duration_to_delta("P1W")
2115
 
    datetime.timedelta(7)
2116
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2117
 
    datetime.timedelta(0, 330)
2118
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2119
 
    datetime.timedelta(1, 200)
2120
 
    """
2121
 
    
2122
 
    # Parsing an RFC 3339 duration with regular expressions is not
2123
 
    # possible - there would have to be multiple places for the same
2124
 
    # values, like seconds.  The current code, while more esoteric, is
2125
 
    # cleaner without depending on a parsing library.  If Python had a
2126
 
    # built-in library for parsing we would use it, but we'd like to
2127
 
    # avoid excessive use of external libraries.
2128
 
    
2129
 
    # New type for defining tokens, syntax, and semantics all-in-one
2130
 
    Token = collections.namedtuple("Token",
2131
 
                                   ("regexp", # To match token; if
2132
 
                                              # "value" is not None,
2133
 
                                              # must have a "group"
2134
 
                                              # containing digits
2135
 
                                    "value",  # datetime.timedelta or
2136
 
                                              # None
2137
 
                                    "followers")) # Tokens valid after
2138
 
                                                  # this token
2139
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2140
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2141
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2142
 
    token_second = Token(re.compile(r"(\d+)S"),
2143
 
                         datetime.timedelta(seconds=1),
2144
 
                         frozenset((token_end,)))
2145
 
    token_minute = Token(re.compile(r"(\d+)M"),
2146
 
                         datetime.timedelta(minutes=1),
2147
 
                         frozenset((token_second, token_end)))
2148
 
    token_hour = Token(re.compile(r"(\d+)H"),
2149
 
                       datetime.timedelta(hours=1),
2150
 
                       frozenset((token_minute, token_end)))
2151
 
    token_time = Token(re.compile(r"T"),
2152
 
                       None,
2153
 
                       frozenset((token_hour, token_minute,
2154
 
                                  token_second)))
2155
 
    token_day = Token(re.compile(r"(\d+)D"),
2156
 
                      datetime.timedelta(days=1),
2157
 
                      frozenset((token_time, token_end)))
2158
 
    token_month = Token(re.compile(r"(\d+)M"),
2159
 
                        datetime.timedelta(weeks=4),
2160
 
                        frozenset((token_day, token_end)))
2161
 
    token_year = Token(re.compile(r"(\d+)Y"),
2162
 
                       datetime.timedelta(weeks=52),
2163
 
                       frozenset((token_month, token_end)))
2164
 
    token_week = Token(re.compile(r"(\d+)W"),
2165
 
                       datetime.timedelta(weeks=1),
2166
 
                       frozenset((token_end,)))
2167
 
    token_duration = Token(re.compile(r"P"), None,
2168
 
                           frozenset((token_year, token_month,
2169
 
                                      token_day, token_time,
2170
 
                                      token_week)))
2171
 
    # Define starting values
2172
 
    value = datetime.timedelta() # Value so far
2173
 
    found_token = None
2174
 
    followers = frozenset((token_duration,)) # Following valid tokens
2175
 
    s = duration                # String left to parse
2176
 
    # Loop until end token is found
2177
 
    while found_token is not token_end:
2178
 
        # Search for any currently valid tokens
2179
 
        for token in followers:
2180
 
            match = token.regexp.match(s)
2181
 
            if match is not None:
2182
 
                # Token found
2183
 
                if token.value is not None:
2184
 
                    # Value found, parse digits
2185
 
                    factor = int(match.group(1), 10)
2186
 
                    # Add to value so far
2187
 
                    value += factor * token.value
2188
 
                # Strip token from string
2189
 
                s = token.regexp.sub("", s, 1)
2190
 
                # Go to found token
2191
 
                found_token = token
2192
 
                # Set valid next tokens
2193
 
                followers = found_token.followers
2194
 
                break
2195
 
        else:
2196
 
            # No currently valid tokens were found
2197
 
            raise ValueError("Invalid RFC 3339 duration")
2198
 
    # End token found
2199
 
    return value
2200
 
 
2201
 
 
2202
1602
def string_to_delta(interval):
2203
1603
    """Parse a string and return a datetime.timedelta
2204
1604
    
2215
1615
    >>> string_to_delta('5m 30s')
2216
1616
    datetime.timedelta(0, 330)
2217
1617
    """
2218
 
    
2219
 
    try:
2220
 
        return rfc3339_duration_to_delta(interval)
2221
 
    except ValueError:
2222
 
        pass
2223
 
    
2224
1618
    timevalue = datetime.timedelta(0)
2225
1619
    for s in interval.split():
2226
1620
        try:
2227
 
            suffix = s[-1]
 
1621
            suffix = unicode(s[-1])
2228
1622
            value = int(s[:-1])
2229
1623
            if suffix == "d":
2230
1624
                delta = datetime.timedelta(value)
2237
1631
            elif suffix == "w":
2238
1632
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
1633
            else:
2240
 
                raise ValueError("Unknown suffix {!r}"
2241
 
                                 .format(suffix))
2242
 
        except IndexError as e:
 
1634
                raise ValueError("Unknown suffix %r" % suffix)
 
1635
        except (ValueError, IndexError) as e:
2243
1636
            raise ValueError(*(e.args))
2244
1637
        timevalue += delta
2245
1638
    return timevalue
2246
1639
 
2247
1640
 
 
1641
def if_nametoindex(interface):
 
1642
    """Call the C function if_nametoindex(), or equivalent
 
1643
    
 
1644
    Note: This function cannot accept a unicode string."""
 
1645
    global if_nametoindex
 
1646
    try:
 
1647
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1648
                          (ctypes.util.find_library("c"))
 
1649
                          .if_nametoindex)
 
1650
    except (OSError, AttributeError):
 
1651
        logger.warning("Doing if_nametoindex the hard way")
 
1652
        def if_nametoindex(interface):
 
1653
            "Get an interface index the hard way, i.e. using fcntl()"
 
1654
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1655
            with contextlib.closing(socket.socket()) as s:
 
1656
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1657
                                    struct.pack(str("16s16x"),
 
1658
                                                interface))
 
1659
            interface_index = struct.unpack(str("I"),
 
1660
                                            ifreq[16:20])[0]
 
1661
            return interface_index
 
1662
    return if_nametoindex(interface)
 
1663
 
 
1664
 
2248
1665
def daemon(nochdir = False, noclose = False):
2249
1666
    """See daemon(3).  Standard BSD Unix function.
2250
1667
    
2258
1675
        sys.exit()
2259
1676
    if not noclose:
2260
1677
        # Close all standard open file descriptors
2261
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1678
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2262
1679
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
 
            raise OSError(errno.ENODEV, "{} not a character device"
2264
 
                          .format(os.devnull))
 
1680
            raise OSError(errno.ENODEV,
 
1681
                          "%s not a character device"
 
1682
                          % os.path.devnull)
2265
1683
        os.dup2(null, sys.stdin.fileno())
2266
1684
        os.dup2(null, sys.stdout.fileno())
2267
1685
        os.dup2(null, sys.stderr.fileno())
2276
1694
    
2277
1695
    parser = argparse.ArgumentParser()
2278
1696
    parser.add_argument("-v", "--version", action="version",
2279
 
                        version = "%(prog)s {}".format(version),
 
1697
                        version = "%%(prog)s %s" % version,
2280
1698
                        help="show version number and exit")
2281
1699
    parser.add_argument("-i", "--interface", metavar="IF",
2282
1700
                        help="Bind to interface IF")
2288
1706
                        help="Run self-test")
2289
1707
    parser.add_argument("--debug", action="store_true",
2290
1708
                        help="Debug mode; run in foreground and log"
2291
 
                        " to terminal", default=None)
 
1709
                        " to terminal")
2292
1710
    parser.add_argument("--debuglevel", metavar="LEVEL",
2293
1711
                        help="Debug level for stdout output")
2294
1712
    parser.add_argument("--priority", help="GnuTLS"
2301
1719
                        " files")
2302
1720
    parser.add_argument("--no-dbus", action="store_false",
2303
1721
                        dest="use_dbus", help="Do not provide D-Bus"
2304
 
                        " system bus interface", default=None)
 
1722
                        " system bus interface")
2305
1723
    parser.add_argument("--no-ipv6", action="store_false",
2306
 
                        dest="use_ipv6", help="Do not use IPv6",
2307
 
                        default=None)
2308
 
    parser.add_argument("--no-restore", action="store_false",
2309
 
                        dest="restore", help="Do not restore stored"
2310
 
                        " state", default=None)
2311
 
    parser.add_argument("--socket", type=int,
2312
 
                        help="Specify a file descriptor to a network"
2313
 
                        " socket to use instead of creating one")
2314
 
    parser.add_argument("--statedir", metavar="DIR",
2315
 
                        help="Directory to save/restore state in")
2316
 
    parser.add_argument("--foreground", action="store_true",
2317
 
                        help="Run in foreground", default=None)
2318
 
    parser.add_argument("--no-zeroconf", action="store_false",
2319
 
                        dest="zeroconf", help="Do not use Zeroconf",
2320
 
                        default=None)
2321
 
    
 
1724
                        dest="use_ipv6", help="Do not use IPv6")
2322
1725
    options = parser.parse_args()
2323
1726
    
2324
1727
    if options.check:
2325
1728
        import doctest
2326
 
        fail_count, test_count = doctest.testmod()
2327
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1729
        doctest.testmod()
 
1730
        sys.exit()
2328
1731
    
2329
1732
    # Default values for config file for server-global settings
2330
1733
    server_defaults = { "interface": "",
2332
1735
                        "port": "",
2333
1736
                        "debug": "False",
2334
1737
                        "priority":
2335
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
1738
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2336
1739
                        "servicename": "Mandos",
2337
1740
                        "use_dbus": "True",
2338
1741
                        "use_ipv6": "True",
2339
1742
                        "debuglevel": "",
2340
 
                        "restore": "True",
2341
 
                        "socket": "",
2342
 
                        "statedir": "/var/lib/mandos",
2343
 
                        "foreground": "False",
2344
 
                        "zeroconf": "True",
2345
1743
                        }
2346
1744
    
2347
1745
    # Parse config file for server-global settings
2352
1750
    # Convert the SafeConfigParser object to a dict
2353
1751
    server_settings = server_config.defaults()
2354
1752
    # Use the appropriate methods on the non-string config options
2355
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1753
    for option in ("debug", "use_dbus", "use_ipv6"):
2356
1754
        server_settings[option] = server_config.getboolean("DEFAULT",
2357
1755
                                                           option)
2358
1756
    if server_settings["port"]:
2359
1757
        server_settings["port"] = server_config.getint("DEFAULT",
2360
1758
                                                       "port")
2361
 
    if server_settings["socket"]:
2362
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2363
 
                                                         "socket")
2364
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2365
 
        # over with an opened os.devnull.  But we don't want this to
2366
 
        # happen with a supplied network socket.
2367
 
        if 0 <= server_settings["socket"] <= 2:
2368
 
            server_settings["socket"] = os.dup(server_settings
2369
 
                                               ["socket"])
2370
1759
    del server_config
2371
1760
    
2372
1761
    # Override the settings from the config file with command line
2373
1762
    # options, if set.
2374
1763
    for option in ("interface", "address", "port", "debug",
2375
1764
                   "priority", "servicename", "configdir",
2376
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2377
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
1765
                   "use_dbus", "use_ipv6", "debuglevel"):
2378
1766
        value = getattr(options, option)
2379
1767
        if value is not None:
2380
1768
            server_settings[option] = value
2381
1769
    del options
2382
1770
    # Force all strings to be unicode
2383
1771
    for option in server_settings.keys():
2384
 
        if isinstance(server_settings[option], bytes):
2385
 
            server_settings[option] = (server_settings[option]
2386
 
                                       .decode("utf-8"))
2387
 
    # Force all boolean options to be boolean
2388
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2389
 
                   "foreground", "zeroconf"):
2390
 
        server_settings[option] = bool(server_settings[option])
2391
 
    # Debug implies foreground
2392
 
    if server_settings["debug"]:
2393
 
        server_settings["foreground"] = True
 
1772
        if type(server_settings[option]) is str:
 
1773
            server_settings[option] = unicode(server_settings[option])
2394
1774
    # Now we have our good server settings in "server_settings"
2395
1775
    
2396
1776
    ##################################################################
2397
1777
    
2398
 
    if (not server_settings["zeroconf"] and
2399
 
        not (server_settings["port"]
2400
 
             or server_settings["socket"] != "")):
2401
 
            parser.error("Needs port or socket to work without"
2402
 
                         " Zeroconf")
2403
 
    
2404
1778
    # For convenience
2405
1779
    debug = server_settings["debug"]
2406
1780
    debuglevel = server_settings["debuglevel"]
2407
1781
    use_dbus = server_settings["use_dbus"]
2408
1782
    use_ipv6 = server_settings["use_ipv6"]
2409
 
    stored_state_path = os.path.join(server_settings["statedir"],
2410
 
                                     stored_state_file)
2411
 
    foreground = server_settings["foreground"]
2412
 
    zeroconf = server_settings["zeroconf"]
2413
 
    
2414
 
    if debug:
2415
 
        initlogger(debug, logging.DEBUG)
2416
 
    else:
2417
 
        if not debuglevel:
2418
 
            initlogger(debug)
2419
 
        else:
2420
 
            level = getattr(logging, debuglevel.upper())
2421
 
            initlogger(debug, level)
2422
 
    
 
1783
 
2423
1784
    if server_settings["servicename"] != "Mandos":
2424
1785
        syslogger.setFormatter(logging.Formatter
2425
 
                               ('Mandos ({}) [%(process)d]:'
2426
 
                                ' %(levelname)s: %(message)s'
2427
 
                                .format(server_settings
2428
 
                                        ["servicename"])))
 
1786
                               ('Mandos (%s) [%%(process)d]:'
 
1787
                                ' %%(levelname)s: %%(message)s'
 
1788
                                % server_settings["servicename"]))
2429
1789
    
2430
1790
    # Parse config file with clients
2431
 
    client_config = configparser.SafeConfigParser(Client
2432
 
                                                  .client_defaults)
 
1791
    client_defaults = { "timeout": "1h",
 
1792
                        "interval": "5m",
 
1793
                        "checker": "fping -q -- %%(host)s",
 
1794
                        "host": "",
 
1795
                        "approval_delay": "0s",
 
1796
                        "approval_duration": "1s",
 
1797
                        }
 
1798
    client_config = configparser.SafeConfigParser(client_defaults)
2433
1799
    client_config.read(os.path.join(server_settings["configdir"],
2434
1800
                                    "clients.conf"))
2435
1801
    
2436
1802
    global mandos_dbus_service
2437
1803
    mandos_dbus_service = None
2438
1804
    
2439
 
    socketfd = None
2440
 
    if server_settings["socket"] != "":
2441
 
        socketfd = server_settings["socket"]
2442
1805
    tcp_server = MandosServer((server_settings["address"],
2443
1806
                               server_settings["port"]),
2444
1807
                              ClientHandler,
2447
1810
                              use_ipv6=use_ipv6,
2448
1811
                              gnutls_priority=
2449
1812
                              server_settings["priority"],
2450
 
                              use_dbus=use_dbus,
2451
 
                              socketfd=socketfd)
2452
 
    if not foreground:
2453
 
        pidfilename = "/run/mandos.pid"
2454
 
        if not os.path.isdir("/run/."):
2455
 
            pidfilename = "/var/run/mandos.pid"
2456
 
        pidfile = None
 
1813
                              use_dbus=use_dbus)
 
1814
    if not debug:
 
1815
        pidfilename = "/var/run/mandos.pid"
2457
1816
        try:
2458
1817
            pidfile = open(pidfilename, "w")
2459
 
        except IOError as e:
2460
 
            logger.error("Could not open file %r", pidfilename,
2461
 
                         exc_info=e)
 
1818
        except IOError:
 
1819
            logger.error("Could not open file %r", pidfilename)
2462
1820
    
2463
 
    for name in ("_mandos", "mandos", "nobody"):
 
1821
    try:
 
1822
        uid = pwd.getpwnam("_mandos").pw_uid
 
1823
        gid = pwd.getpwnam("_mandos").pw_gid
 
1824
    except KeyError:
2464
1825
        try:
2465
 
            uid = pwd.getpwnam(name).pw_uid
2466
 
            gid = pwd.getpwnam(name).pw_gid
2467
 
            break
 
1826
            uid = pwd.getpwnam("mandos").pw_uid
 
1827
            gid = pwd.getpwnam("mandos").pw_gid
2468
1828
        except KeyError:
2469
 
            continue
2470
 
    else:
2471
 
        uid = 65534
2472
 
        gid = 65534
 
1829
            try:
 
1830
                uid = pwd.getpwnam("nobody").pw_uid
 
1831
                gid = pwd.getpwnam("nobody").pw_gid
 
1832
            except KeyError:
 
1833
                uid = 65534
 
1834
                gid = 65534
2473
1835
    try:
2474
1836
        os.setgid(gid)
2475
1837
        os.setuid(uid)
2476
1838
    except OSError as error:
2477
 
        if error.errno != errno.EPERM:
2478
 
            raise
 
1839
        if error[0] != errno.EPERM:
 
1840
            raise error
2479
1841
    
 
1842
    if not debug and not debuglevel:
 
1843
        syslogger.setLevel(logging.WARNING)
 
1844
        console.setLevel(logging.WARNING)
 
1845
    if debuglevel:
 
1846
        level = getattr(logging, debuglevel.upper())
 
1847
        syslogger.setLevel(level)
 
1848
        console.setLevel(level)
 
1849
 
2480
1850
    if debug:
2481
1851
        # Enable all possible GnuTLS debugging
2482
1852
        
2492
1862
         .gnutls_global_set_log_function(debug_gnutls))
2493
1863
        
2494
1864
        # Redirect stdin so all checkers get /dev/null
2495
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1865
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2496
1866
        os.dup2(null, sys.stdin.fileno())
2497
1867
        if null > 2:
2498
1868
            os.close(null)
 
1869
    else:
 
1870
        # No console logging
 
1871
        logger.removeHandler(console)
2499
1872
    
2500
1873
    # Need to fork before connecting to D-Bus
2501
 
    if not foreground:
 
1874
    if not debug:
2502
1875
        # Close all input and output, do double fork, etc.
2503
1876
        daemon()
2504
1877
    
2505
 
    # multiprocessing will use threads, so before we use gobject we
2506
 
    # need to inform gobject that threads will be used.
2507
 
    gobject.threads_init()
2508
 
    
2509
1878
    global main_loop
2510
1879
    # From the Avahi example code
2511
 
    DBusGMainLoop(set_as_default=True)
 
1880
    DBusGMainLoop(set_as_default=True )
2512
1881
    main_loop = gobject.MainLoop()
2513
1882
    bus = dbus.SystemBus()
2514
1883
    # End of Avahi example code
2515
1884
    if use_dbus:
2516
1885
        try:
2517
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1886
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2518
1887
                                            bus, do_not_queue=True)
2519
 
            old_bus_name = (dbus.service.BusName
2520
 
                            ("se.bsnet.fukt.Mandos", bus,
2521
 
                             do_not_queue=True))
2522
1888
        except dbus.exceptions.NameExistsException as e:
2523
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
1889
            logger.error(unicode(e) + ", disabling D-Bus")
2524
1890
            use_dbus = False
2525
1891
            server_settings["use_dbus"] = False
2526
1892
            tcp_server.use_dbus = False
2527
 
    if zeroconf:
2528
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2529
 
        service = AvahiServiceToSyslog(name =
2530
 
                                       server_settings["servicename"],
2531
 
                                       servicetype = "_mandos._tcp",
2532
 
                                       protocol = protocol, bus = bus)
2533
 
        if server_settings["interface"]:
2534
 
            service.interface = (if_nametoindex
2535
 
                                 (server_settings["interface"]
2536
 
                                  .encode("utf-8")))
 
1893
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1894
    service = AvahiService(name = server_settings["servicename"],
 
1895
                           servicetype = "_mandos._tcp",
 
1896
                           protocol = protocol, bus = bus)
 
1897
    if server_settings["interface"]:
 
1898
        service.interface = (if_nametoindex
 
1899
                             (str(server_settings["interface"])))
2537
1900
    
2538
1901
    global multiprocessing_manager
2539
1902
    multiprocessing_manager = multiprocessing.Manager()
2541
1904
    client_class = Client
2542
1905
    if use_dbus:
2543
1906
        client_class = functools.partial(ClientDBus, bus = bus)
2544
 
    
2545
 
    client_settings = Client.config_parser(client_config)
2546
 
    old_client_settings = {}
2547
 
    clients_data = {}
2548
 
    
2549
 
    # This is used to redirect stdout and stderr for checker processes
2550
 
    global wnull
2551
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2552
 
    # Only used if server is running in foreground but not in debug
2553
 
    # mode
2554
 
    if debug or not foreground:
2555
 
        wnull.close()
2556
 
    
2557
 
    # Get client data and settings from last running state.
2558
 
    if server_settings["restore"]:
2559
 
        try:
2560
 
            with open(stored_state_path, "rb") as stored_state:
2561
 
                clients_data, old_client_settings = (pickle.load
2562
 
                                                     (stored_state))
2563
 
            os.remove(stored_state_path)
2564
 
        except IOError as e:
2565
 
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
2567
 
                                .format(os.strerror(e.errno)))
2568
 
            else:
2569
 
                logger.critical("Could not load persistent state:",
2570
 
                                exc_info=e)
2571
 
                raise
2572
 
        except EOFError as e:
2573
 
            logger.warning("Could not load persistent state: "
2574
 
                           "EOFError:", exc_info=e)
2575
 
    
2576
 
    with PGPEngine() as pgp:
2577
 
        for client_name, client in clients_data.items():
2578
 
            # Skip removed clients
2579
 
            if client_name not in client_settings:
2580
 
                continue
2581
 
            
2582
 
            # Decide which value to use after restoring saved state.
2583
 
            # We have three different values: Old config file,
2584
 
            # new config file, and saved state.
2585
 
            # New config value takes precedence if it differs from old
2586
 
            # config value, otherwise use saved state.
2587
 
            for name, value in client_settings[client_name].items():
2588
 
                try:
2589
 
                    # For each value in new config, check if it
2590
 
                    # differs from the old config value (Except for
2591
 
                    # the "secret" attribute)
2592
 
                    if (name != "secret" and
2593
 
                        value != old_client_settings[client_name]
2594
 
                        [name]):
2595
 
                        client[name] = value
2596
 
                except KeyError:
2597
 
                    pass
2598
 
            
2599
 
            # Clients who has passed its expire date can still be
2600
 
            # enabled if its last checker was successful.  Clients
2601
 
            # whose checker succeeded before we stored its state is
2602
 
            # assumed to have successfully run all checkers during
2603
 
            # downtime.
2604
 
            if client["enabled"]:
2605
 
                if datetime.datetime.utcnow() >= client["expires"]:
2606
 
                    if not client["last_checked_ok"]:
2607
 
                        logger.warning(
2608
 
                            "disabling client {} - Client never "
2609
 
                            "performed a successful checker"
2610
 
                            .format(client_name))
2611
 
                        client["enabled"] = False
2612
 
                    elif client["last_checker_status"] != 0:
2613
 
                        logger.warning(
2614
 
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
2616
 
                            .format(client_name,
2617
 
                                    client["last_checker_status"]))
2618
 
                        client["enabled"] = False
2619
 
                    else:
2620
 
                        client["expires"] = (datetime.datetime
2621
 
                                             .utcnow()
2622
 
                                             + client["timeout"])
2623
 
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
2625
 
                                     .format(client_name))
 
1907
    def client_config_items(config, section):
 
1908
        special_settings = {
 
1909
            "approved_by_default":
 
1910
                lambda: config.getboolean(section,
 
1911
                                          "approved_by_default"),
 
1912
            }
 
1913
        for name, value in config.items(section):
2626
1914
            try:
2627
 
                client["secret"] = (
2628
 
                    pgp.decrypt(client["encrypted_secret"],
2629
 
                                client_settings[client_name]
2630
 
                                ["secret"]))
2631
 
            except PGPError:
2632
 
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
2634
 
                             .format(client_name))
2635
 
                client["secret"] = (
2636
 
                    client_settings[client_name]["secret"])
2637
 
    
2638
 
    # Add/remove clients based on new changes made to config
2639
 
    for client_name in (set(old_client_settings)
2640
 
                        - set(client_settings)):
2641
 
        del clients_data[client_name]
2642
 
    for client_name in (set(client_settings)
2643
 
                        - set(old_client_settings)):
2644
 
        clients_data[client_name] = client_settings[client_name]
2645
 
    
2646
 
    # Create all client objects
2647
 
    for client_name, client in clients_data.items():
2648
 
        tcp_server.clients[client_name] = client_class(
2649
 
            name = client_name, settings = client,
2650
 
            server_settings = server_settings)
2651
 
    
 
1915
                yield (name, special_settings[name]())
 
1916
            except KeyError:
 
1917
                yield (name, value)
 
1918
    
 
1919
    tcp_server.clients.update(set(
 
1920
            client_class(name = section,
 
1921
                         config= dict(client_config_items(
 
1922
                        client_config, section)))
 
1923
            for section in client_config.sections()))
2652
1924
    if not tcp_server.clients:
2653
1925
        logger.warning("No clients defined")
2654
 
    
2655
 
    if not foreground:
2656
 
        if pidfile is not None:
2657
 
            try:
2658
 
                with pidfile:
2659
 
                    pid = os.getpid()
2660
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2661
 
            except IOError:
2662
 
                logger.error("Could not write to file %r with PID %d",
2663
 
                             pidfilename, pid)
2664
 
        del pidfile
 
1926
        
 
1927
    if not debug:
 
1928
        try:
 
1929
            with pidfile:
 
1930
                pid = os.getpid()
 
1931
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1932
            del pidfile
 
1933
        except IOError:
 
1934
            logger.error("Could not write to file %r with PID %d",
 
1935
                         pidfilename, pid)
 
1936
        except NameError:
 
1937
            # "pidfile" was never created
 
1938
            pass
2665
1939
        del pidfilename
2666
 
    
 
1940
        
 
1941
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1942
 
2667
1943
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2668
1944
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2669
1945
    
2670
1946
    if use_dbus:
2671
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2672
 
                                        "se.bsnet.fukt.Mandos"})
2673
 
        class MandosDBusService(DBusObjectWithProperties):
 
1947
        class MandosDBusService(dbus.service.Object):
2674
1948
            """A D-Bus proxy object"""
2675
1949
            def __init__(self):
2676
1950
                dbus.service.Object.__init__(self, bus, "/")
2677
 
            _interface = "se.recompile.Mandos"
2678
 
            
2679
 
            @dbus_interface_annotations(_interface)
2680
 
            def _foo(self):
2681
 
                return { "org.freedesktop.DBus.Property"
2682
 
                         ".EmitsChangedSignal":
2683
 
                             "false"}
 
1951
            _interface = "se.bsnet.fukt.Mandos"
2684
1952
            
2685
1953
            @dbus.service.signal(_interface, signature="o")
2686
1954
            def ClientAdded(self, objpath):
2701
1969
            def GetAllClients(self):
2702
1970
                "D-Bus method"
2703
1971
                return dbus.Array(c.dbus_object_path
2704
 
                                  for c in
2705
 
                                  tcp_server.clients.itervalues())
 
1972
                                  for c in tcp_server.clients)
2706
1973
            
2707
1974
            @dbus.service.method(_interface,
2708
1975
                                 out_signature="a{oa{sv}}")
2710
1977
                "D-Bus method"
2711
1978
                return dbus.Dictionary(
2712
1979
                    ((c.dbus_object_path, c.GetAll(""))
2713
 
                     for c in tcp_server.clients.itervalues()),
 
1980
                     for c in tcp_server.clients),
2714
1981
                    signature="oa{sv}")
2715
1982
            
2716
1983
            @dbus.service.method(_interface, in_signature="o")
2717
1984
            def RemoveClient(self, object_path):
2718
1985
                "D-Bus method"
2719
 
                for c in tcp_server.clients.itervalues():
 
1986
                for c in tcp_server.clients:
2720
1987
                    if c.dbus_object_path == object_path:
2721
 
                        del tcp_server.clients[c.name]
 
1988
                        tcp_server.clients.remove(c)
2722
1989
                        c.remove_from_connection()
2723
1990
                        # Don't signal anything except ClientRemoved
2724
1991
                        c.disable(quiet=True)
2733
2000
    
2734
2001
    def cleanup():
2735
2002
        "Cleanup function; run on exit"
2736
 
        if zeroconf:
2737
 
            service.cleanup()
2738
 
        
2739
 
        multiprocessing.active_children()
2740
 
        wnull.close()
2741
 
        if not (tcp_server.clients or client_settings):
2742
 
            return
2743
 
        
2744
 
        # Store client before exiting. Secrets are encrypted with key
2745
 
        # based on what config file has. If config file is
2746
 
        # removed/edited, old secret will thus be unrecovable.
2747
 
        clients = {}
2748
 
        with PGPEngine() as pgp:
2749
 
            for client in tcp_server.clients.itervalues():
2750
 
                key = client_settings[client.name]["secret"]
2751
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2752
 
                                                      key)
2753
 
                client_dict = {}
2754
 
                
2755
 
                # A list of attributes that can not be pickled
2756
 
                # + secret.
2757
 
                exclude = { "bus", "changedstate", "secret",
2758
 
                            "checker", "server_settings" }
2759
 
                for name, typ in (inspect.getmembers
2760
 
                                  (dbus.service.Object)):
2761
 
                    exclude.add(name)
2762
 
                
2763
 
                client_dict["encrypted_secret"] = (client
2764
 
                                                   .encrypted_secret)
2765
 
                for attr in client.client_structure:
2766
 
                    if attr not in exclude:
2767
 
                        client_dict[attr] = getattr(client, attr)
2768
 
                
2769
 
                clients[client.name] = client_dict
2770
 
                del client_settings[client.name]["secret"]
2771
 
        
2772
 
        try:
2773
 
            with (tempfile.NamedTemporaryFile
2774
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2775
 
                   dir=os.path.dirname(stored_state_path),
2776
 
                   delete=False)) as stored_state:
2777
 
                pickle.dump((clients, client_settings), stored_state)
2778
 
                tempname=stored_state.name
2779
 
            os.rename(tempname, stored_state_path)
2780
 
        except (IOError, OSError) as e:
2781
 
            if not debug:
2782
 
                try:
2783
 
                    os.remove(tempname)
2784
 
                except NameError:
2785
 
                    pass
2786
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2787
 
                logger.warning("Could not save persistent state: {}"
2788
 
                               .format(os.strerror(e.errno)))
2789
 
            else:
2790
 
                logger.warning("Could not save persistent state:",
2791
 
                               exc_info=e)
2792
 
                raise
2793
 
        
2794
 
        # Delete all clients, and settings from config
 
2003
        service.cleanup()
 
2004
        
2795
2005
        while tcp_server.clients:
2796
 
            name, client = tcp_server.clients.popitem()
 
2006
            client = tcp_server.clients.pop()
2797
2007
            if use_dbus:
2798
2008
                client.remove_from_connection()
 
2009
            client.disable_hook = None
2799
2010
            # Don't signal anything except ClientRemoved
2800
2011
            client.disable(quiet=True)
2801
2012
            if use_dbus:
2802
2013
                # Emit D-Bus signal
2803
 
                mandos_dbus_service.ClientRemoved(client
2804
 
                                                  .dbus_object_path,
 
2014
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2805
2015
                                                  client.name)
2806
 
        client_settings.clear()
2807
2016
    
2808
2017
    atexit.register(cleanup)
2809
2018
    
2810
 
    for client in tcp_server.clients.itervalues():
 
2019
    for client in tcp_server.clients:
2811
2020
        if use_dbus:
2812
2021
            # Emit D-Bus signal
2813
2022
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2814
 
        # Need to initiate checking of clients
2815
 
        if client.enabled:
2816
 
            client.init_checker()
 
2023
        client.enable()
2817
2024
    
2818
2025
    tcp_server.enable()
2819
2026
    tcp_server.server_activate()
2820
2027
    
2821
2028
    # Find out what port we got
2822
 
    if zeroconf:
2823
 
        service.port = tcp_server.socket.getsockname()[1]
 
2029
    service.port = tcp_server.socket.getsockname()[1]
2824
2030
    if use_ipv6:
2825
2031
        logger.info("Now listening on address %r, port %d,"
2826
 
                    " flowinfo %d, scope_id %d",
2827
 
                    *tcp_server.socket.getsockname())
 
2032
                    " flowinfo %d, scope_id %d"
 
2033
                    % tcp_server.socket.getsockname())
2828
2034
    else:                       # IPv4
2829
 
        logger.info("Now listening on address %r, port %d",
2830
 
                    *tcp_server.socket.getsockname())
 
2035
        logger.info("Now listening on address %r, port %d"
 
2036
                    % tcp_server.socket.getsockname())
2831
2037
    
2832
2038
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2039
    
2834
2040
    try:
2835
 
        if zeroconf:
2836
 
            # From the Avahi example code
2837
 
            try:
2838
 
                service.activate()
2839
 
            except dbus.exceptions.DBusException as error:
2840
 
                logger.critical("D-Bus Exception", exc_info=error)
2841
 
                cleanup()
2842
 
                sys.exit(1)
2843
 
            # End of Avahi example code
 
2041
        # From the Avahi example code
 
2042
        try:
 
2043
            service.activate()
 
2044
        except dbus.exceptions.DBusException as error:
 
2045
            logger.critical("DBusException: %s", error)
 
2046
            cleanup()
 
2047
            sys.exit(1)
 
2048
        # End of Avahi example code
2844
2049
        
2845
2050
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
2051
                             lambda *args, **kwargs:
2850
2055
        logger.debug("Starting main loop")
2851
2056
        main_loop.run()
2852
2057
    except AvahiError as error:
2853
 
        logger.critical("Avahi Error", exc_info=error)
 
2058
        logger.critical("AvahiError: %s", error)
2854
2059
        cleanup()
2855
2060
        sys.exit(1)
2856
2061
    except KeyboardInterrupt: