/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:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 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,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
 
import itertools
69
65
 
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
 
import GnuPGInterface
80
75
 
81
76
try:
82
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
    except ImportError:
87
82
        SO_BINDTODEVICE = None
88
83
 
89
 
version = "1.5.3"
90
 
stored_state_file = "clients.pickle"
91
 
 
92
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.0"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
96
 
 
97
 
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
101
 
except (OSError, AttributeError):
102
 
    def if_nametoindex(interface):
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
 
        with contextlib.closing(socket.socket()) as s:
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
111
 
        return interface_index
112
 
 
113
 
 
114
 
def initlogger(debug, level=logging.WARNING):
115
 
    """init logger and add loglevel"""
116
 
    
117
 
    syslogger.setFormatter(logging.Formatter
118
 
                           ('Mandos [%(process)d]: %(levelname)s:'
119
 
                            ' %(message)s'))
120
 
    logger.addHandler(syslogger)
121
 
    
122
 
    if debug:
123
 
        console = logging.StreamHandler()
124
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
 
                                               ' [%(process)d]:'
126
 
                                               ' %(levelname)s:'
127
 
                                               ' %(message)s'))
128
 
        logger.addHandler(console)
129
 
    logger.setLevel(level)
130
 
 
131
 
 
132
 
class PGPError(Exception):
133
 
    """Exception if encryption/decryption fails"""
134
 
    pass
135
 
 
136
 
 
137
 
class PGPEngine(object):
138
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
 
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
148
 
    
149
 
    def __enter__(self):
150
 
        return self
151
 
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
153
 
        self._cleanup()
154
 
        return False
155
 
    
156
 
    def __del__(self):
157
 
        self._cleanup()
158
 
    
159
 
    def _cleanup(self):
160
 
        if self.tempdir is not None:
161
 
            # Delete contents of tempdir
162
 
            for root, dirs, files in os.walk(self.tempdir,
163
 
                                             topdown = False):
164
 
                for filename in files:
165
 
                    os.remove(os.path.join(root, filename))
166
 
                for dirname in dirs:
167
 
                    os.rmdir(os.path.join(root, dirname))
168
 
            # Remove tempdir
169
 
            os.rmdir(self.tempdir)
170
 
            self.tempdir = None
171
 
    
172
 
    def password_encode(self, password):
173
 
        # Passphrase can not be empty and can not contain newlines or
174
 
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
176
 
    
177
 
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
192
 
        return ciphertext
193
 
    
194
 
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
209
 
        return decrypted_plaintext
210
 
 
 
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)
211
102
 
212
103
class AvahiError(Exception):
213
104
    def __init__(self, value, *args, **kwargs):
243
134
    server: D-Bus Server
244
135
    bus: dbus.SystemBus()
245
136
    """
246
 
    
247
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
138
                 servicetype = None, port = None, TXT = None,
249
139
                 domain = "", host = "", max_renames = 32768,
262
152
        self.server = None
263
153
        self.bus = bus
264
154
        self.entry_group_state_changed_match = None
265
 
    
266
155
    def rename(self):
267
156
        """Derived from the Avahi example code"""
268
157
        if self.rename_count >= self.max_renames:
270
159
                            " after %i retries, exiting.",
271
160
                            self.rename_count)
272
161
            raise AvahiServiceError("Too many renames")
273
 
        self.name = unicode(self.server
274
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
275
163
        logger.info("Changing Zeroconf service name to %r ...",
276
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
277
169
        self.remove()
278
170
        try:
279
171
            self.add()
280
172
        except dbus.exceptions.DBusException as error:
281
 
            logger.critical("D-Bus Exception", exc_info=error)
 
173
            logger.critical("DBusException: %s", error)
282
174
            self.cleanup()
283
175
            os._exit(1)
284
176
        self.rename_count += 1
285
 
    
286
177
    def remove(self):
287
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
288
186
        if self.entry_group_state_changed_match is not None:
289
187
            self.entry_group_state_changed_match.remove()
290
188
            self.entry_group_state_changed_match = None
291
 
        if self.group is not None:
292
 
            self.group.Reset()
293
 
    
294
189
    def add(self):
295
190
        """Derived from the Avahi example code"""
296
191
        self.remove()
297
 
        if self.group is None:
298
 
            self.group = dbus.Interface(
299
 
                self.bus.get_object(avahi.DBUS_NAME,
300
 
                                    self.server.EntryGroupNew()),
301
 
                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)
302
197
        self.entry_group_state_changed_match = (
303
198
            self.group.connect_to_signal(
304
 
                'StateChanged', self.entry_group_state_changed))
 
199
                'StateChanged', self .entry_group_state_changed))
305
200
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
306
201
                     self.name, self.type)
307
202
        self.group.AddService(
313
208
            dbus.UInt16(self.port),
314
209
            avahi.string_array_to_txt_array(self.TXT))
315
210
        self.group.Commit()
316
 
    
317
211
    def entry_group_state_changed(self, state, error):
318
212
        """Derived from the Avahi example code"""
319
213
        logger.debug("Avahi entry group state change: %i", state)
326
220
        elif state == avahi.ENTRY_GROUP_FAILURE:
327
221
            logger.critical("Avahi: Error in group state changed %s",
328
222
                            unicode(error))
329
 
            raise AvahiGroupError("State changed: {0!s}"
330
 
                                  .format(error))
331
 
    
 
223
            raise AvahiGroupError("State changed: %s"
 
224
                                  % unicode(error))
332
225
    def cleanup(self):
333
226
        """Derived from the Avahi example code"""
334
 
        if self.group is not None:
335
 
            try:
336
 
                self.group.Free()
337
 
            except (dbus.exceptions.UnknownMethodException,
338
 
                    dbus.exceptions.DBusException):
339
 
                pass
340
 
            self.group = None
341
227
        self.remove()
342
 
    
343
228
    def server_state_changed(self, state, error=None):
344
229
        """Derived from the Avahi example code"""
345
230
        logger.debug("Avahi server state change: %i", state)
351
236
                       avahi.SERVER_FAILURE:
352
237
                           "Zeroconf server failure" }
353
238
        if state in bad_states:
354
 
            if bad_states[state] is not None:
355
 
                if error is None:
356
 
                    logger.error(bad_states[state])
357
 
                else:
358
 
                    logger.error(bad_states[state] + ": %r", error)
359
 
            self.cleanup()
 
239
            if bad_states[state]:
 
240
                logger.error(bad_states[state])
 
241
            self.remove()
360
242
        elif state == avahi.SERVER_RUNNING:
361
243
            self.add()
362
244
        else:
363
 
            if error is None:
364
 
                logger.debug("Unknown state: %r", state)
365
 
            else:
366
 
                logger.debug("Unknown state: %r: %r", state, error)
367
 
    
 
245
            logger.debug("Unknown state: %r", state)
368
246
    def activate(self):
369
247
        """Derived from the Avahi example code"""
370
248
        if self.server is None:
377
255
                                 self.server_state_changed)
378
256
        self.server_state_changed(self.server.GetState())
379
257
 
380
 
class AvahiServiceToSyslog(AvahiService):
381
 
    def rename(self):
382
 
        """Add the new name to the syslog messages"""
383
 
        ret = AvahiService.rename(self)
384
 
        syslogger.setFormatter(logging.Formatter
385
 
                               ('Mandos ({0}) [%(process)d]:'
386
 
                                ' %(levelname)s: %(message)s'
387
 
                                .format(self.name)))
388
 
        return ret
389
 
 
390
 
def timedelta_to_milliseconds(td):
391
 
    "Convert a datetime.timedelta() to milliseconds"
392
 
    return ((td.days * 24 * 60 * 60 * 1000)
393
 
            + (td.seconds * 1000)
394
 
            + (td.microseconds // 1000))
395
258
 
396
259
class Client(object):
397
260
    """A representation of a client host served by this server.
398
261
    
399
262
    Attributes:
400
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
263
    _approved:   bool(); 'None' if not yet approved/disapproved
401
264
    approval_delay: datetime.timedelta(); Time to wait for approval
402
265
    approval_duration: datetime.timedelta(); Duration of one approval
403
266
    checker:    subprocess.Popen(); a running checker process used
410
273
                     instance %(name)s can be used in the command.
411
274
    checker_initiator_tag: a gobject event source tag, or None
412
275
    created:    datetime.datetime(); (UTC) object creation
413
 
    client_structure: Object describing what attributes a client has
414
 
                      and is used for storing the client at exit
415
276
    current_checker_command: string; current running checker_command
 
277
    disable_hook:  If set, called by disable() as disable_hook(self)
416
278
    disable_initiator_tag: a gobject event source tag, or None
417
279
    enabled:    bool()
418
280
    fingerprint: string (40 or 32 hexadecimal digits); used to
421
283
    interval:   datetime.timedelta(); How often to start a new checker
422
284
    last_approval_request: datetime.datetime(); (UTC) or None
423
285
    last_checked_ok: datetime.datetime(); (UTC) or None
424
 
    last_checker_status: integer between 0 and 255 reflecting exit
425
 
                         status of last checker. -1 reflects crashed
426
 
                         checker, -2 means no checker completed yet.
427
 
    last_enabled: datetime.datetime(); (UTC) or None
 
286
    last_enabled: datetime.datetime(); (UTC)
428
287
    name:       string; from the config file, used in log messages and
429
288
                        D-Bus identifiers
430
289
    secret:     bytestring; sent verbatim (over TLS) to client
431
290
    timeout:    datetime.timedelta(); How long from last_checked_ok
432
291
                                      until this client is disabled
433
 
    extended_timeout:   extra long timeout when secret has been sent
434
292
    runtime_expansions: Allowed attributes for runtime expansion.
435
 
    expires:    datetime.datetime(); time (UTC) when a client will be
436
 
                disabled, or None
437
293
    """
438
294
    
439
295
    runtime_expansions = ("approval_delay", "approval_duration",
440
296
                          "created", "enabled", "fingerprint",
441
297
                          "host", "interval", "last_checked_ok",
442
298
                          "last_enabled", "name", "timeout")
443
 
    client_defaults = { "timeout": "5m",
444
 
                        "extended_timeout": "15m",
445
 
                        "interval": "2m",
446
 
                        "checker": "fping -q -- %%(host)s",
447
 
                        "host": "",
448
 
                        "approval_delay": "0s",
449
 
                        "approval_duration": "1s",
450
 
                        "approved_by_default": "True",
451
 
                        "enabled": "True",
452
 
                        }
 
299
    
 
300
    @staticmethod
 
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))
453
306
    
454
307
    def timeout_milliseconds(self):
455
308
        "Return the 'timeout' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.timeout)
457
 
    
458
 
    def extended_timeout_milliseconds(self):
459
 
        "Return the 'extended_timeout' attribute in milliseconds"
460
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
309
        return self._timedelta_to_milliseconds(self.timeout)
461
310
    
462
311
    def interval_milliseconds(self):
463
312
        "Return the 'interval' attribute in milliseconds"
464
 
        return timedelta_to_milliseconds(self.interval)
465
 
    
 
313
        return self._timedelta_to_milliseconds(self.interval)
 
314
 
466
315
    def approval_delay_milliseconds(self):
467
 
        return timedelta_to_milliseconds(self.approval_delay)
468
 
    
469
 
    @staticmethod
470
 
    def config_parser(config):
471
 
        """Construct a new dict of client settings of this form:
472
 
        { client_name: {setting_name: value, ...}, ...}
473
 
        with exceptions for any special settings as defined above.
474
 
        NOTE: Must be a pure function. Must return the same result
475
 
        value given the same arguments.
476
 
        """
477
 
        settings = {}
478
 
        for client_name in config.sections():
479
 
            section = dict(config.items(client_name))
480
 
            client = settings[client_name] = {}
481
 
            
482
 
            client["host"] = section["host"]
483
 
            # Reformat values from string types to Python types
484
 
            client["approved_by_default"] = config.getboolean(
485
 
                client_name, "approved_by_default")
486
 
            client["enabled"] = config.getboolean(client_name,
487
 
                                                  "enabled")
488
 
            
489
 
            client["fingerprint"] = (section["fingerprint"].upper()
490
 
                                     .replace(" ", ""))
491
 
            if "secret" in section:
492
 
                client["secret"] = section["secret"].decode("base64")
493
 
            elif "secfile" in section:
494
 
                with open(os.path.expanduser(os.path.expandvars
495
 
                                             (section["secfile"])),
496
 
                          "rb") as secfile:
497
 
                    client["secret"] = secfile.read()
498
 
            else:
499
 
                raise TypeError("No secret or secfile for section {0}"
500
 
                                .format(section))
501
 
            client["timeout"] = string_to_delta(section["timeout"])
502
 
            client["extended_timeout"] = string_to_delta(
503
 
                section["extended_timeout"])
504
 
            client["interval"] = string_to_delta(section["interval"])
505
 
            client["approval_delay"] = string_to_delta(
506
 
                section["approval_delay"])
507
 
            client["approval_duration"] = string_to_delta(
508
 
                section["approval_duration"])
509
 
            client["checker_command"] = section["checker"]
510
 
            client["last_approval_request"] = None
511
 
            client["last_checked_ok"] = None
512
 
            client["last_checker_status"] = -2
513
 
        
514
 
        return settings
515
 
    
516
 
    def __init__(self, settings, name = None):
 
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."""
517
322
        self.name = name
518
 
        # adding all client settings
519
 
        for setting, value in settings.iteritems():
520
 
            setattr(self, setting, value)
521
 
        
522
 
        if self.enabled:
523
 
            if not hasattr(self, "last_enabled"):
524
 
                self.last_enabled = datetime.datetime.utcnow()
525
 
            if not hasattr(self, "expires"):
526
 
                self.expires = (datetime.datetime.utcnow()
527
 
                                + self.timeout)
528
 
        else:
529
 
            self.last_enabled = None
530
 
            self.expires = None
531
 
        
 
323
        if config is None:
 
324
            config = {}
532
325
        logger.debug("Creating client %r", self.name)
533
326
        # Uppercase and remove spaces from fingerprint for later
534
327
        # comparison purposes with return value from the fingerprint()
535
328
        # function
 
329
        self.fingerprint = (config["fingerprint"].upper()
 
330
                            .replace(" ", ""))
536
331
        logger.debug("  Fingerprint: %s", self.fingerprint)
537
 
        self.created = settings.get("created",
538
 
                                    datetime.datetime.utcnow())
539
 
        
540
 
        # 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
541
351
        self.checker = None
542
352
        self.checker_initiator_tag = None
543
353
        self.disable_initiator_tag = None
544
354
        self.checker_callback_tag = None
 
355
        self.checker_command = config["checker"]
545
356
        self.current_checker_command = None
546
 
        self.approved = None
 
357
        self.last_connect = None
 
358
        self._approved = None
 
359
        self.approved_by_default = config.get("approved_by_default",
 
360
                                              True)
547
361
        self.approvals_pending = 0
548
 
        self.changedstate = (multiprocessing_manager
549
 
                             .Condition(multiprocessing_manager
550
 
                                        .Lock()))
551
 
        self.client_structure = [attr for attr in
552
 
                                 self.__dict__.iterkeys()
553
 
                                 if not attr.startswith("_")]
554
 
        self.client_structure.append("client_structure")
555
 
        
556
 
        for name, t in inspect.getmembers(type(self),
557
 
                                          lambda obj:
558
 
                                              isinstance(obj,
559
 
                                                         property)):
560
 
            if not name.startswith("_"):
561
 
                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())
562
367
    
563
 
    # Send notice to process children that client state has changed
564
368
    def send_changedstate(self):
565
 
        with self.changedstate:
566
 
            self.changedstate.notify_all()
567
 
    
 
369
        self.changedstate.acquire()
 
370
        self.changedstate.notify_all()
 
371
        self.changedstate.release()
 
372
        
568
373
    def enable(self):
569
374
        """Start this client's checker and timeout hooks"""
570
375
        if getattr(self, "enabled", False):
571
376
            # Already enabled
572
377
            return
573
378
        self.send_changedstate()
574
 
        self.expires = datetime.datetime.utcnow() + self.timeout
575
 
        self.enabled = True
576
379
        self.last_enabled = datetime.datetime.utcnow()
577
 
        self.init_checker()
 
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()
578
392
    
579
393
    def disable(self, quiet=True):
580
394
        """Disable this client."""
587
401
        if getattr(self, "disable_initiator_tag", False):
588
402
            gobject.source_remove(self.disable_initiator_tag)
589
403
            self.disable_initiator_tag = None
590
 
        self.expires = None
591
404
        if getattr(self, "checker_initiator_tag", False):
592
405
            gobject.source_remove(self.checker_initiator_tag)
593
406
            self.checker_initiator_tag = None
594
407
        self.stop_checker()
 
408
        if self.disable_hook:
 
409
            self.disable_hook(self)
595
410
        self.enabled = False
596
411
        # Do not run this again if called by a gobject.timeout_add
597
412
        return False
598
413
    
599
414
    def __del__(self):
 
415
        self.disable_hook = None
600
416
        self.disable()
601
417
    
602
 
    def init_checker(self):
603
 
        # Schedule a new checker to be started an 'interval' from now,
604
 
        # and every interval from then on.
605
 
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (self.interval_milliseconds(),
607
 
                                       self.start_checker))
608
 
        # Schedule a disable() when 'timeout' has passed
609
 
        self.disable_initiator_tag = (gobject.timeout_add
610
 
                                   (self.timeout_milliseconds(),
611
 
                                    self.disable))
612
 
        # Also start a new checker *right now*.
613
 
        self.start_checker()
614
 
    
615
418
    def checker_callback(self, pid, condition, command):
616
419
        """The checker has completed, so take appropriate actions."""
617
420
        self.checker_callback_tag = None
618
421
        self.checker = None
619
422
        if os.WIFEXITED(condition):
620
 
            self.last_checker_status = os.WEXITSTATUS(condition)
621
 
            if self.last_checker_status == 0:
 
423
            exitstatus = os.WEXITSTATUS(condition)
 
424
            if exitstatus == 0:
622
425
                logger.info("Checker for %(name)s succeeded",
623
426
                            vars(self))
624
427
                self.checked_ok()
626
429
                logger.info("Checker for %(name)s failed",
627
430
                            vars(self))
628
431
        else:
629
 
            self.last_checker_status = -1
630
432
            logger.warning("Checker for %(name)s crashed?",
631
433
                           vars(self))
632
434
    
633
435
    def checked_ok(self):
634
 
        """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
        """
635
441
        self.last_checked_ok = datetime.datetime.utcnow()
636
 
        self.last_checker_status = 0
637
 
        self.bump_timeout()
638
 
    
639
 
    def bump_timeout(self, timeout=None):
640
 
        """Bump up the timeout for this client."""
641
 
        if timeout is None:
642
 
            timeout = self.timeout
643
 
        if self.disable_initiator_tag is not None:
644
 
            gobject.source_remove(self.disable_initiator_tag)
645
 
        if getattr(self, "enabled", False):
646
 
            self.disable_initiator_tag = (gobject.timeout_add
647
 
                                          (timedelta_to_milliseconds
648
 
                                           (timeout), self.disable))
649
 
            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))
650
446
    
651
447
    def need_approval(self):
652
448
        self.last_approval_request = datetime.datetime.utcnow()
692
488
                                       'replace')))
693
489
                    for attr in
694
490
                    self.runtime_expansions)
695
 
                
 
491
 
696
492
                try:
697
493
                    command = self.checker_command % escaped_attrs
698
494
                except TypeError as error:
699
 
                    logger.error('Could not format string "%s"',
700
 
                                 self.checker_command, exc_info=error)
 
495
                    logger.error('Could not format string "%s":'
 
496
                                 ' %s', self.checker_command, error)
701
497
                    return True # Try again later
702
498
            self.current_checker_command = command
703
499
            try:
721
517
                    gobject.source_remove(self.checker_callback_tag)
722
518
                    self.checker_callback(pid, status, command)
723
519
            except OSError as error:
724
 
                logger.error("Failed to start subprocess",
725
 
                             exc_info=error)
 
520
                logger.error("Failed to start subprocess: %s",
 
521
                             error)
726
522
        # Re-run this periodically if run by gobject.timeout_add
727
523
        return True
728
524
    
735
531
            return
736
532
        logger.debug("Stopping checker for %(name)s", vars(self))
737
533
        try:
738
 
            self.checker.terminate()
 
534
            os.kill(self.checker.pid, signal.SIGTERM)
739
535
            #time.sleep(0.5)
740
536
            #if self.checker.poll() is None:
741
 
            #    self.checker.kill()
 
537
            #    os.kill(self.checker.pid, signal.SIGKILL)
742
538
        except OSError as error:
743
539
            if error.errno != errno.ESRCH: # No such process
744
540
                raise
745
541
        self.checker = None
746
542
 
747
 
 
748
543
def dbus_service_property(dbus_interface, signature="v",
749
544
                          access="readwrite", byte_arrays=False):
750
545
    """Decorators for marking methods of a DBusObjectWithProperties to
761
556
    # "Set" method, so we fail early here:
762
557
    if byte_arrays and signature != "ay":
763
558
        raise ValueError("Byte arrays not supported for non-'ay'"
764
 
                         " signature {0!r}".format(signature))
 
559
                         " signature %r" % signature)
765
560
    def decorator(func):
766
561
        func._dbus_is_property = True
767
562
        func._dbus_interface = dbus_interface
775
570
    return decorator
776
571
 
777
572
 
778
 
def dbus_interface_annotations(dbus_interface):
779
 
    """Decorator for marking functions returning interface annotations
780
 
    
781
 
    Usage:
782
 
    
783
 
    @dbus_interface_annotations("org.example.Interface")
784
 
    def _foo(self):  # Function name does not matter
785
 
        return {"org.freedesktop.DBus.Deprecated": "true",
786
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
787
 
                    "false"}
788
 
    """
789
 
    def decorator(func):
790
 
        func._dbus_is_interface = True
791
 
        func._dbus_interface = dbus_interface
792
 
        func._dbus_name = dbus_interface
793
 
        return func
794
 
    return decorator
795
 
 
796
 
 
797
 
def dbus_annotations(annotations):
798
 
    """Decorator to annotate D-Bus methods, signals or properties
799
 
    Usage:
800
 
    
801
 
    @dbus_service_property("org.example.Interface", signature="b",
802
 
                           access="r")
803
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
 
                        "org.freedesktop.DBus.Property."
805
 
                        "EmitsChangedSignal": "false"})
806
 
    def Property_dbus_property(self):
807
 
        return dbus.Boolean(False)
808
 
    """
809
 
    def decorator(func):
810
 
        func._dbus_annotations = annotations
811
 
        return func
812
 
    return decorator
813
 
 
814
 
 
815
573
class DBusPropertyException(dbus.exceptions.DBusException):
816
574
    """A base class for D-Bus property-related exceptions
817
575
    """
833
591
 
834
592
class DBusObjectWithProperties(dbus.service.Object):
835
593
    """A D-Bus object with properties.
836
 
    
 
594
 
837
595
    Classes inheriting from this can use the dbus_service_property
838
596
    decorator to expose methods as D-Bus properties.  It exposes the
839
597
    standard Get(), Set(), and GetAll() methods on the D-Bus.
840
598
    """
841
599
    
842
600
    @staticmethod
843
 
    def _is_dbus_thing(thing):
844
 
        """Returns a function testing if an attribute is a D-Bus thing
845
 
        
846
 
        If called like _is_dbus_thing("method") it returns a function
847
 
        suitable for use as predicate to inspect.getmembers().
848
 
        """
849
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
850
 
                                   False)
 
601
    def _is_dbus_property(obj):
 
602
        return getattr(obj, "_dbus_is_property", False)
851
603
    
852
 
    def _get_all_dbus_things(self, thing):
 
604
    def _get_all_dbus_properties(self):
853
605
        """Returns a generator of (name, attribute) pairs
854
606
        """
855
 
        return ((getattr(athing.__get__(self), "_dbus_name",
856
 
                         name),
857
 
                 athing.__get__(self))
858
 
                for cls in self.__class__.__mro__
859
 
                for name, athing in
860
 
                inspect.getmembers(cls,
861
 
                                   self._is_dbus_thing(thing)))
 
607
        return ((prop._dbus_name, prop)
 
608
                for name, prop in
 
609
                inspect.getmembers(self, self._is_dbus_property))
862
610
    
863
611
    def _get_dbus_property(self, interface_name, property_name):
864
612
        """Returns a bound method if one exists which is a D-Bus
865
613
        property with the specified name and interface.
866
614
        """
867
 
        for cls in  self.__class__.__mro__:
868
 
            for name, value in (inspect.getmembers
869
 
                                (cls,
870
 
                                 self._is_dbus_thing("property"))):
871
 
                if (value._dbus_name == property_name
872
 
                    and value._dbus_interface == interface_name):
873
 
                    return value.__get__(self)
874
 
        
 
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
875
625
        # No such property
876
626
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
627
                                   + interface_name + "."
902
652
            # signatures other than "ay".
903
653
            if prop._dbus_signature != "ay":
904
654
                raise ValueError
905
 
            value = dbus.ByteArray(b''.join(chr(byte)
906
 
                                            for byte in value))
 
655
            value = dbus.ByteArray(''.join(unichr(byte)
 
656
                                           for byte in value))
907
657
        prop(value)
908
658
    
909
659
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
911
661
    def GetAll(self, interface_name):
912
662
        """Standard D-Bus property GetAll() method, see D-Bus
913
663
        standard.
914
 
        
 
664
 
915
665
        Note: Will not include properties with access="write".
916
666
        """
917
 
        properties = {}
918
 
        for name, prop in self._get_all_dbus_things("property"):
 
667
        all = {}
 
668
        for name, prop in self._get_all_dbus_properties():
919
669
            if (interface_name
920
670
                and interface_name != prop._dbus_interface):
921
671
                # Interface non-empty but did not match
925
675
                continue
926
676
            value = prop()
927
677
            if not hasattr(value, "variant_level"):
928
 
                properties[name] = value
 
678
                all[name] = value
929
679
                continue
930
 
            properties[name] = type(value)(value, variant_level=
931
 
                                           value.variant_level+1)
932
 
        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")
933
683
    
934
684
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
935
685
                         out_signature="s",
936
686
                         path_keyword='object_path',
937
687
                         connection_keyword='connection')
938
688
    def Introspect(self, object_path, connection):
939
 
        """Overloading of standard D-Bus method.
940
 
        
941
 
        Inserts property tags and interface annotation tags.
 
689
        """Standard D-Bus method, overloaded to insert property tags.
942
690
        """
943
691
        xmlstring = dbus.service.Object.Introspect(self, object_path,
944
692
                                                   connection)
951
699
                e.setAttribute("access", prop._dbus_access)
952
700
                return e
953
701
            for if_tag in document.getElementsByTagName("interface"):
954
 
                # Add property tags
955
702
                for tag in (make_tag(document, name, prop)
956
703
                            for name, prop
957
 
                            in self._get_all_dbus_things("property")
 
704
                            in self._get_all_dbus_properties()
958
705
                            if prop._dbus_interface
959
706
                            == if_tag.getAttribute("name")):
960
707
                    if_tag.appendChild(tag)
961
 
                # Add annotation tags
962
 
                for typ in ("method", "signal", "property"):
963
 
                    for tag in if_tag.getElementsByTagName(typ):
964
 
                        annots = dict()
965
 
                        for name, prop in (self.
966
 
                                           _get_all_dbus_things(typ)):
967
 
                            if (name == tag.getAttribute("name")
968
 
                                and prop._dbus_interface
969
 
                                == if_tag.getAttribute("name")):
970
 
                                annots.update(getattr
971
 
                                              (prop,
972
 
                                               "_dbus_annotations",
973
 
                                               {}))
974
 
                        for name, value in annots.iteritems():
975
 
                            ann_tag = document.createElement(
976
 
                                "annotation")
977
 
                            ann_tag.setAttribute("name", name)
978
 
                            ann_tag.setAttribute("value", value)
979
 
                            tag.appendChild(ann_tag)
980
 
                # Add interface annotation tags
981
 
                for annotation, value in dict(
982
 
                    itertools.chain(
983
 
                        *(annotations().iteritems()
984
 
                          for name, annotations in
985
 
                          self._get_all_dbus_things("interface")
986
 
                          if name == if_tag.getAttribute("name")
987
 
                          ))).iteritems():
988
 
                    ann_tag = document.createElement("annotation")
989
 
                    ann_tag.setAttribute("name", annotation)
990
 
                    ann_tag.setAttribute("value", value)
991
 
                    if_tag.appendChild(ann_tag)
992
708
                # Add the names to the return values for the
993
709
                # "org.freedesktop.DBus.Properties" methods
994
710
                if (if_tag.getAttribute("name")
1009
725
        except (AttributeError, xml.dom.DOMException,
1010
726
                xml.parsers.expat.ExpatError) as error:
1011
727
            logger.error("Failed to override Introspection method",
1012
 
                         exc_info=error)
 
728
                         error)
1013
729
        return xmlstring
1014
730
 
1015
731
 
1016
 
def datetime_to_dbus (dt, variant_level=0):
1017
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1018
 
    if dt is None:
1019
 
        return dbus.String("", variant_level = variant_level)
1020
 
    return dbus.String(dt.isoformat(),
1021
 
                       variant_level=variant_level)
1022
 
 
1023
 
 
1024
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1025
 
                                  .__metaclass__):
1026
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1027
 
    will add additional D-Bus attributes matching a certain pattern.
1028
 
    """
1029
 
    def __new__(mcs, name, bases, attr):
1030
 
        # Go through all the base classes which could have D-Bus
1031
 
        # methods, signals, or properties in them
1032
 
        old_interface_names = []
1033
 
        for base in (b for b in bases
1034
 
                     if issubclass(b, dbus.service.Object)):
1035
 
            # Go though all attributes of the base class
1036
 
            for attrname, attribute in inspect.getmembers(base):
1037
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1038
 
                # with the wrong interface name
1039
 
                if (not hasattr(attribute, "_dbus_interface")
1040
 
                    or not attribute._dbus_interface
1041
 
                    .startswith("se.recompile.Mandos")):
1042
 
                    continue
1043
 
                # Create an alternate D-Bus interface name based on
1044
 
                # the current name
1045
 
                alt_interface = (attribute._dbus_interface
1046
 
                                 .replace("se.recompile.Mandos",
1047
 
                                          "se.bsnet.fukt.Mandos"))
1048
 
                if alt_interface != attribute._dbus_interface:
1049
 
                    old_interface_names.append(alt_interface)
1050
 
                # Is this a D-Bus signal?
1051
 
                if getattr(attribute, "_dbus_is_signal", False):
1052
 
                    # Extract the original non-method function by
1053
 
                    # black magic
1054
 
                    nonmethod_func = (dict(
1055
 
                            zip(attribute.func_code.co_freevars,
1056
 
                                attribute.__closure__))["func"]
1057
 
                                      .cell_contents)
1058
 
                    # Create a new, but exactly alike, function
1059
 
                    # object, and decorate it to be a new D-Bus signal
1060
 
                    # with the alternate D-Bus interface name
1061
 
                    new_function = (dbus.service.signal
1062
 
                                    (alt_interface,
1063
 
                                     attribute._dbus_signature)
1064
 
                                    (types.FunctionType(
1065
 
                                nonmethod_func.func_code,
1066
 
                                nonmethod_func.func_globals,
1067
 
                                nonmethod_func.func_name,
1068
 
                                nonmethod_func.func_defaults,
1069
 
                                nonmethod_func.func_closure)))
1070
 
                    # Copy annotations, if any
1071
 
                    try:
1072
 
                        new_function._dbus_annotations = (
1073
 
                            dict(attribute._dbus_annotations))
1074
 
                    except AttributeError:
1075
 
                        pass
1076
 
                    # Define a creator of a function to call both the
1077
 
                    # old and new functions, so both the old and new
1078
 
                    # signals gets sent when the function is called
1079
 
                    def fixscope(func1, func2):
1080
 
                        """This function is a scope container to pass
1081
 
                        func1 and func2 to the "call_both" function
1082
 
                        outside of its arguments"""
1083
 
                        def call_both(*args, **kwargs):
1084
 
                            """This function will emit two D-Bus
1085
 
                            signals by calling func1 and func2"""
1086
 
                            func1(*args, **kwargs)
1087
 
                            func2(*args, **kwargs)
1088
 
                        return call_both
1089
 
                    # Create the "call_both" function and add it to
1090
 
                    # the class
1091
 
                    attr[attrname] = fixscope(attribute,
1092
 
                                              new_function)
1093
 
                # Is this a D-Bus method?
1094
 
                elif getattr(attribute, "_dbus_is_method", False):
1095
 
                    # Create a new, but exactly alike, function
1096
 
                    # object.  Decorate it to be a new D-Bus method
1097
 
                    # with the alternate D-Bus interface name.  Add it
1098
 
                    # to the class.
1099
 
                    attr[attrname] = (dbus.service.method
1100
 
                                      (alt_interface,
1101
 
                                       attribute._dbus_in_signature,
1102
 
                                       attribute._dbus_out_signature)
1103
 
                                      (types.FunctionType
1104
 
                                       (attribute.func_code,
1105
 
                                        attribute.func_globals,
1106
 
                                        attribute.func_name,
1107
 
                                        attribute.func_defaults,
1108
 
                                        attribute.func_closure)))
1109
 
                    # Copy annotations, if any
1110
 
                    try:
1111
 
                        attr[attrname]._dbus_annotations = (
1112
 
                            dict(attribute._dbus_annotations))
1113
 
                    except AttributeError:
1114
 
                        pass
1115
 
                # Is this a D-Bus property?
1116
 
                elif getattr(attribute, "_dbus_is_property", False):
1117
 
                    # Create a new, but exactly alike, function
1118
 
                    # object, and decorate it to be a new D-Bus
1119
 
                    # property with the alternate D-Bus interface
1120
 
                    # name.  Add it to the class.
1121
 
                    attr[attrname] = (dbus_service_property
1122
 
                                      (alt_interface,
1123
 
                                       attribute._dbus_signature,
1124
 
                                       attribute._dbus_access,
1125
 
                                       attribute
1126
 
                                       ._dbus_get_args_options
1127
 
                                       ["byte_arrays"])
1128
 
                                      (types.FunctionType
1129
 
                                       (attribute.func_code,
1130
 
                                        attribute.func_globals,
1131
 
                                        attribute.func_name,
1132
 
                                        attribute.func_defaults,
1133
 
                                        attribute.func_closure)))
1134
 
                    # Copy annotations, if any
1135
 
                    try:
1136
 
                        attr[attrname]._dbus_annotations = (
1137
 
                            dict(attribute._dbus_annotations))
1138
 
                    except AttributeError:
1139
 
                        pass
1140
 
                # Is this a D-Bus interface?
1141
 
                elif getattr(attribute, "_dbus_is_interface", False):
1142
 
                    # Create a new, but exactly alike, function
1143
 
                    # object.  Decorate it to be a new D-Bus interface
1144
 
                    # with the alternate D-Bus interface name.  Add it
1145
 
                    # to the class.
1146
 
                    attr[attrname] = (dbus_interface_annotations
1147
 
                                      (alt_interface)
1148
 
                                      (types.FunctionType
1149
 
                                       (attribute.func_code,
1150
 
                                        attribute.func_globals,
1151
 
                                        attribute.func_name,
1152
 
                                        attribute.func_defaults,
1153
 
                                        attribute.func_closure)))
1154
 
        # Deprecate all old interfaces
1155
 
        iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
 
        for old_interface_name in old_interface_names:
1157
 
            @dbus_interface_annotations(old_interface_name)
1158
 
            def func(self):
1159
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1160
 
            # Find an unused name
1161
 
            for aname in (iname.format(i) for i in itertools.count()):
1162
 
                if aname not in attr:
1163
 
                    attr[aname] = func
1164
 
                    break
1165
 
        return type.__new__(mcs, name, bases, attr)
1166
 
 
1167
 
 
1168
732
class ClientDBus(Client, DBusObjectWithProperties):
1169
733
    """A Client class using D-Bus
1170
734
    
1179
743
    # dbus.service.Object doesn't use super(), so we can't either.
1180
744
    
1181
745
    def __init__(self, bus = None, *args, **kwargs):
 
746
        self._approvals_pending = 0
1182
747
        self.bus = bus
1183
748
        Client.__init__(self, *args, **kwargs)
1184
749
        # Only now, when this client is initialized, can it show up on
1190
755
                                 ("/clients/" + client_object_name))
1191
756
        DBusObjectWithProperties.__init__(self, self.bus,
1192
757
                                          self.dbus_object_path)
1193
 
    
1194
 
    def notifychangeproperty(transform_func,
1195
 
                             dbus_name, type_func=lambda x: x,
1196
 
                             variant_level=1):
1197
 
        """ Modify a variable so that it's a property which announces
1198
 
        its changes to DBus.
1199
 
        
1200
 
        transform_fun: Function that takes a value and a variant_level
1201
 
                       and transforms it to a D-Bus type.
1202
 
        dbus_name: D-Bus name of the variable
1203
 
        type_func: Function that transform the value before sending it
1204
 
                   to the D-Bus.  Default: no transform
1205
 
        variant_level: D-Bus variant level.  Default: 1
1206
 
        """
1207
 
        attrname = "_{0}".format(dbus_name)
1208
 
        def setter(self, value):
1209
 
            if hasattr(self, "dbus_object_path"):
1210
 
                if (not hasattr(self, attrname) or
1211
 
                    type_func(getattr(self, attrname, None))
1212
 
                    != type_func(value)):
1213
 
                    dbus_value = transform_func(type_func(value),
1214
 
                                                variant_level
1215
 
                                                =variant_level)
1216
 
                    self.PropertyChanged(dbus.String(dbus_name),
1217
 
                                         dbus_value)
1218
 
            setattr(self, attrname, value)
1219
 
        
1220
 
        return property(lambda self: getattr(self, attrname), setter)
1221
 
    
1222
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1223
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1224
 
                                             "ApprovalPending",
1225
 
                                             type_func = bool)
1226
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1227
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1228
 
                                        "LastEnabled")
1229
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1230
 
                                   type_func = lambda checker:
1231
 
                                       checker is not None)
1232
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1233
 
                                           "LastCheckedOK")
1234
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1235
 
                                               "LastCheckerStatus")
1236
 
    last_approval_request = notifychangeproperty(
1237
 
        datetime_to_dbus, "LastApprovalRequest")
1238
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1239
 
                                               "ApprovedByDefault")
1240
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1241
 
                                          "ApprovalDelay",
1242
 
                                          type_func =
1243
 
                                          timedelta_to_milliseconds)
1244
 
    approval_duration = notifychangeproperty(
1245
 
        dbus.UInt64, "ApprovalDuration",
1246
 
        type_func = timedelta_to_milliseconds)
1247
 
    host = notifychangeproperty(dbus.String, "Host")
1248
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1249
 
                                   type_func =
1250
 
                                   timedelta_to_milliseconds)
1251
 
    extended_timeout = notifychangeproperty(
1252
 
        dbus.UInt64, "ExtendedTimeout",
1253
 
        type_func = timedelta_to_milliseconds)
1254
 
    interval = notifychangeproperty(dbus.UInt64,
1255
 
                                    "Interval",
1256
 
                                    type_func =
1257
 
                                    timedelta_to_milliseconds)
1258
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1259
 
    
1260
 
    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
1261
802
    
1262
803
    def __del__(self, *args, **kwargs):
1263
804
        try:
1272
813
                         *args, **kwargs):
1273
814
        self.checker_callback_tag = None
1274
815
        self.checker = None
 
816
        # Emit D-Bus signal
 
817
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
818
                             dbus.Boolean(False, variant_level=1))
1275
819
        if os.WIFEXITED(condition):
1276
820
            exitstatus = os.WEXITSTATUS(condition)
1277
821
            # Emit D-Bus signal
1287
831
        return Client.checker_callback(self, pid, condition, command,
1288
832
                                       *args, **kwargs)
1289
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
    
1290
851
    def start_checker(self, *args, **kwargs):
1291
852
        old_checker = self.checker
1292
853
        if self.checker is not None:
1299
860
            and old_checker_pid != self.checker.pid):
1300
861
            # Emit D-Bus signal
1301
862
            self.CheckerStarted(self.current_checker_command)
 
863
            self.PropertyChanged(
 
864
                dbus.String("CheckerRunning"),
 
865
                dbus.Boolean(True, variant_level=1))
1302
866
        return r
1303
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
 
1304
877
    def _reset_approved(self):
1305
 
        self.approved = None
 
878
        self._approved = None
1306
879
        return False
1307
880
    
1308
881
    def approve(self, value=True):
1309
882
        self.send_changedstate()
1310
 
        self.approved = value
1311
 
        gobject.timeout_add(timedelta_to_milliseconds
 
883
        self._approved = value
 
884
        gobject.timeout_add(self._timedelta_to_milliseconds
1312
885
                            (self.approval_duration),
1313
886
                            self._reset_approved)
1314
887
    
 
888
    
1315
889
    ## D-Bus methods, signals & properties
1316
 
    _interface = "se.recompile.Mandos.Client"
1317
 
    
1318
 
    ## Interfaces
1319
 
    
1320
 
    @dbus_interface_annotations(_interface)
1321
 
    def _foo(self):
1322
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
 
                     "false"}
 
890
    _interface = "se.bsnet.fukt.Mandos.Client"
1324
891
    
1325
892
    ## Signals
1326
893
    
1412
979
        if value is None:       # get
1413
980
            return dbus.Boolean(self.approved_by_default)
1414
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))
1415
985
    
1416
986
    # ApprovalDelay - property
1417
987
    @dbus_service_property(_interface, signature="t",
1420
990
        if value is None:       # get
1421
991
            return dbus.UInt64(self.approval_delay_milliseconds())
1422
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))
1423
996
    
1424
997
    # ApprovalDuration - property
1425
998
    @dbus_service_property(_interface, signature="t",
1426
999
                           access="readwrite")
1427
1000
    def ApprovalDuration_dbus_property(self, value=None):
1428
1001
        if value is None:       # get
1429
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1002
            return dbus.UInt64(self._timedelta_to_milliseconds(
1430
1003
                    self.approval_duration))
1431
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))
1432
1008
    
1433
1009
    # Name - property
1434
1010
    @dbus_service_property(_interface, signature="s", access="read")
1446
1022
    def Host_dbus_property(self, value=None):
1447
1023
        if value is None:       # get
1448
1024
            return dbus.String(self.host)
1449
 
        self.host = unicode(value)
 
1025
        self.host = value
 
1026
        # Emit D-Bus signal
 
1027
        self.PropertyChanged(dbus.String("Host"),
 
1028
                             dbus.String(value, variant_level=1))
1450
1029
    
1451
1030
    # Created - property
1452
1031
    @dbus_service_property(_interface, signature="s", access="read")
1453
1032
    def Created_dbus_property(self):
1454
 
        return datetime_to_dbus(self.created)
 
1033
        return dbus.String(self._datetime_to_dbus(self.created))
1455
1034
    
1456
1035
    # LastEnabled - property
1457
1036
    @dbus_service_property(_interface, signature="s", access="read")
1458
1037
    def LastEnabled_dbus_property(self):
1459
 
        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))
1460
1041
    
1461
1042
    # Enabled - property
1462
1043
    @dbus_service_property(_interface, signature="b",
1476
1057
        if value is not None:
1477
1058
            self.checked_ok()
1478
1059
            return
1479
 
        return datetime_to_dbus(self.last_checked_ok)
1480
 
    
1481
 
    # LastCheckerStatus - property
1482
 
    @dbus_service_property(_interface, signature="n",
1483
 
                           access="read")
1484
 
    def LastCheckerStatus_dbus_property(self):
1485
 
        return dbus.Int16(self.last_checker_status)
1486
 
    
1487
 
    # Expires - property
1488
 
    @dbus_service_property(_interface, signature="s", access="read")
1489
 
    def Expires_dbus_property(self):
1490
 
        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))
1491
1064
    
1492
1065
    # LastApprovalRequest - property
1493
1066
    @dbus_service_property(_interface, signature="s", access="read")
1494
1067
    def LastApprovalRequest_dbus_property(self):
1495
 
        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))
1496
1073
    
1497
1074
    # Timeout - property
1498
1075
    @dbus_service_property(_interface, signature="t",
1501
1078
        if value is None:       # get
1502
1079
            return dbus.UInt64(self.timeout_milliseconds())
1503
1080
        self.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
1504
1086
        # Reschedule timeout
1505
 
        if self.enabled:
1506
 
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
1510
 
                # The timeout has passed
1511
 
                self.disable()
1512
 
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
 
                if (getattr(self, "disable_initiator_tag", None)
1517
 
                    is None):
1518
 
                    return
1519
 
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
1523
 
    
1524
 
    # ExtendedTimeout - property
1525
 
    @dbus_service_property(_interface, signature="t",
1526
 
                           access="readwrite")
1527
 
    def ExtendedTimeout_dbus_property(self, value=None):
1528
 
        if value is None:       # get
1529
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1530
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
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))
1531
1101
    
1532
1102
    # Interval - property
1533
1103
    @dbus_service_property(_interface, signature="t",
1536
1106
        if value is None:       # get
1537
1107
            return dbus.UInt64(self.interval_milliseconds())
1538
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))
1539
1112
        if getattr(self, "checker_initiator_tag", None) is None:
1540
1113
            return
1541
 
        if self.enabled:
1542
 
            # Reschedule checker run
1543
 
            gobject.source_remove(self.checker_initiator_tag)
1544
 
            self.checker_initiator_tag = (gobject.timeout_add
1545
 
                                          (value, self.start_checker))
1546
 
            self.start_checker()    # Start one now, too
1547
 
    
 
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
 
1548
1120
    # Checker - property
1549
1121
    @dbus_service_property(_interface, signature="s",
1550
1122
                           access="readwrite")
1551
1123
    def Checker_dbus_property(self, value=None):
1552
1124
        if value is None:       # get
1553
1125
            return dbus.String(self.checker_command)
1554
 
        self.checker_command = unicode(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))
1555
1131
    
1556
1132
    # CheckerRunning - property
1557
1133
    @dbus_service_property(_interface, signature="b",
1584
1160
        self._pipe.send(('init', fpr, address))
1585
1161
        if not self._pipe.recv():
1586
1162
            raise KeyError()
1587
 
    
 
1163
 
1588
1164
    def __getattribute__(self, name):
1589
 
        if name == '_pipe':
 
1165
        if(name == '_pipe'):
1590
1166
            return super(ProxyClient, self).__getattribute__(name)
1591
1167
        self._pipe.send(('getattr', name))
1592
1168
        data = self._pipe.recv()
1597
1173
                self._pipe.send(('funcall', name, args, kwargs))
1598
1174
                return self._pipe.recv()[1]
1599
1175
            return func
1600
 
    
 
1176
 
1601
1177
    def __setattr__(self, name, value):
1602
 
        if name == '_pipe':
 
1178
        if(name == '_pipe'):
1603
1179
            return super(ProxyClient, self).__setattr__(name, value)
1604
1180
        self._pipe.send(('setattr', name, value))
1605
1181
 
1606
1182
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1183
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1184
    """A class to handle client connections.
1613
1185
    
1620
1192
                        unicode(self.client_address))
1621
1193
            logger.debug("Pipe FD: %d",
1622
1194
                         self.server.child_pipe.fileno())
1623
 
            
 
1195
 
1624
1196
            session = (gnutls.connection
1625
1197
                       .ClientSession(self.request,
1626
1198
                                      gnutls.connection
1627
1199
                                      .X509Credentials()))
1628
 
            
 
1200
 
1629
1201
            # Note: gnutls.connection.X509Credentials is really a
1630
1202
            # generic GnuTLS certificate credentials object so long as
1631
1203
            # no X.509 keys are added to it.  Therefore, we can use it
1632
1204
            # here despite using OpenPGP certificates.
1633
 
            
 
1205
 
1634
1206
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
1207
            #                      "+AES-256-CBC", "+SHA1",
1636
1208
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1642
1214
            (gnutls.library.functions
1643
1215
             .gnutls_priority_set_direct(session._c_object,
1644
1216
                                         priority, None))
1645
 
            
 
1217
 
1646
1218
            # Start communication using the Mandos protocol
1647
1219
            # Get protocol number
1648
1220
            line = self.request.makefile().readline()
1653
1225
            except (ValueError, IndexError, RuntimeError) as error:
1654
1226
                logger.error("Unknown protocol version: %s", error)
1655
1227
                return
1656
 
            
 
1228
 
1657
1229
            # Start GnuTLS connection
1658
1230
            try:
1659
1231
                session.handshake()
1663
1235
                # established.  Just abandon the request.
1664
1236
                return
1665
1237
            logger.debug("Handshake succeeded")
1666
 
            
 
1238
 
1667
1239
            approval_required = False
1668
1240
            try:
1669
1241
                try:
1674
1246
                    logger.warning("Bad certificate: %s", error)
1675
1247
                    return
1676
1248
                logger.debug("Fingerprint: %s", fpr)
1677
 
                
 
1249
 
1678
1250
                try:
1679
1251
                    client = ProxyClient(child_pipe, fpr,
1680
1252
                                         self.client_address)
1688
1260
                
1689
1261
                while True:
1690
1262
                    if not client.enabled:
1691
 
                        logger.info("Client %s is disabled",
 
1263
                        logger.warning("Client %s is disabled",
1692
1264
                                       client.name)
1693
1265
                        if self.server.use_dbus:
1694
1266
                            # Emit D-Bus signal
1695
 
                            client.Rejected("Disabled")
 
1267
                            client.Rejected("Disabled")                    
1696
1268
                        return
1697
1269
                    
1698
 
                    if client.approved or not client.approval_delay:
 
1270
                    if client._approved or not client.approval_delay:
1699
1271
                        #We are approved or approval is disabled
1700
1272
                        break
1701
 
                    elif client.approved is None:
 
1273
                    elif client._approved is None:
1702
1274
                        logger.info("Client %s needs approval",
1703
1275
                                    client.name)
1704
1276
                        if self.server.use_dbus:
1715
1287
                        return
1716
1288
                    
1717
1289
                    #wait until timeout or approved
 
1290
                    #x = float(client._timedelta_to_milliseconds(delay))
1718
1291
                    time = datetime.datetime.now()
1719
1292
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1293
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1723
1294
                    client.changedstate.release()
1724
1295
                    time2 = datetime.datetime.now()
1725
1296
                    if (time2 - time) >= delay:
1747
1318
                                 sent, len(client.secret)
1748
1319
                                 - (sent_size + sent))
1749
1320
                    sent_size += sent
1750
 
                
 
1321
 
1751
1322
                logger.info("Sending secret to %s", client.name)
1752
 
                # bump the timeout using extended_timeout
1753
 
                client.bump_timeout(client.extended_timeout)
 
1323
                # bump the timeout as if seen
 
1324
                client.checked_ok()
1754
1325
                if self.server.use_dbus:
1755
1326
                    # Emit D-Bus signal
1756
1327
                    client.GotSecret()
1823
1394
        # Convert the buffer to a Python bytestring
1824
1395
        fpr = ctypes.string_at(buf, buf_len.value)
1825
1396
        # Convert the bytestring to hexadecimal notation
1826
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1397
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1827
1398
        return hex_fpr
1828
1399
 
1829
1400
 
1832
1403
    def sub_process_main(self, request, address):
1833
1404
        try:
1834
1405
            self.finish_request(request, address)
1835
 
        except Exception:
 
1406
        except:
1836
1407
            self.handle_error(request, address)
1837
1408
        self.close_request(request)
1838
 
    
 
1409
            
1839
1410
    def process_request(self, request, address):
1840
1411
        """Start a new process to process the request."""
1841
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1842
 
                                       args = (request,
1843
 
                                               address))
1844
 
        proc.start()
1845
 
        return proc
1846
 
 
 
1412
        multiprocessing.Process(target = self.sub_process_main,
 
1413
                                args = (request, address)).start()
1847
1414
 
1848
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1849
1416
    """ adds a pipe to the MixIn """
1853
1420
        This function creates a new pipe in self.pipe
1854
1421
        """
1855
1422
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1856
 
        
1857
 
        proc = MultiprocessingMixIn.process_request(self, request,
1858
 
                                                    client_address)
 
1423
 
 
1424
        super(MultiprocessingMixInWithPipe,
 
1425
              self).process_request(request, client_address)
1859
1426
        self.child_pipe.close()
1860
 
        self.add_pipe(parent_pipe, proc)
1861
 
    
1862
 
    def add_pipe(self, parent_pipe, proc):
 
1427
        self.add_pipe(parent_pipe)
 
1428
 
 
1429
    def add_pipe(self, parent_pipe):
1863
1430
        """Dummy function; override as necessary"""
1864
1431
        raise NotImplementedError
1865
1432
 
1866
 
 
1867
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
1434
                     socketserver.TCPServer, object):
1869
1435
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1943
1509
        self.enabled = False
1944
1510
        self.clients = clients
1945
1511
        if self.clients is None:
1946
 
            self.clients = {}
 
1512
            self.clients = set()
1947
1513
        self.use_dbus = use_dbus
1948
1514
        self.gnutls_priority = gnutls_priority
1949
1515
        IPv6_TCPServer.__init__(self, server_address,
1953
1519
    def server_activate(self):
1954
1520
        if self.enabled:
1955
1521
            return socketserver.TCPServer.server_activate(self)
1956
 
    
1957
1522
    def enable(self):
1958
1523
        self.enabled = True
1959
 
    
1960
 
    def add_pipe(self, parent_pipe, proc):
 
1524
    def add_pipe(self, parent_pipe):
1961
1525
        # Call "handle_ipc" for both data and EOF events
1962
1526
        gobject.io_add_watch(parent_pipe.fileno(),
1963
1527
                             gobject.IO_IN | gobject.IO_HUP,
1964
1528
                             functools.partial(self.handle_ipc,
1965
 
                                               parent_pipe =
1966
 
                                               parent_pipe,
1967
 
                                               proc = proc))
1968
 
    
 
1529
                                               parent_pipe = parent_pipe))
 
1530
        
1969
1531
    def handle_ipc(self, source, condition, parent_pipe=None,
1970
 
                   proc = None, client_object=None):
 
1532
                   client_object=None):
1971
1533
        condition_names = {
1972
1534
            gobject.IO_IN: "IN",   # There is data to read.
1973
1535
            gobject.IO_OUT: "OUT", # Data can be written (without
1982
1544
                                       for cond, name in
1983
1545
                                       condition_names.iteritems()
1984
1546
                                       if cond & condition)
1985
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1547
        # error or the other end of multiprocessing.Pipe has closed
1986
1548
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1987
 
            # Wait for other process to exit
1988
 
            proc.join()
1989
1549
            return False
1990
1550
        
1991
1551
        # Read a request from the child
1996
1556
            fpr = request[1]
1997
1557
            address = request[2]
1998
1558
            
1999
 
            for c in self.clients.itervalues():
 
1559
            for c in self.clients:
2000
1560
                if c.fingerprint == fpr:
2001
1561
                    client = c
2002
1562
                    break
2003
1563
            else:
2004
 
                logger.info("Client not found for fingerprint: %s, ad"
2005
 
                            "dress: %s", fpr, address)
 
1564
                logger.warning("Client not found for fingerprint: %s, ad"
 
1565
                               "dress: %s", fpr, address)
2006
1566
                if self.use_dbus:
2007
1567
                    # Emit D-Bus signal
2008
 
                    mandos_dbus_service.ClientNotFound(fpr,
2009
 
                                                       address[0])
 
1568
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2010
1569
                parent_pipe.send(False)
2011
1570
                return False
2012
1571
            
2013
1572
            gobject.io_add_watch(parent_pipe.fileno(),
2014
1573
                                 gobject.IO_IN | gobject.IO_HUP,
2015
1574
                                 functools.partial(self.handle_ipc,
2016
 
                                                   parent_pipe =
2017
 
                                                   parent_pipe,
2018
 
                                                   proc = proc,
2019
 
                                                   client_object =
2020
 
                                                   client))
 
1575
                                                   parent_pipe = parent_pipe,
 
1576
                                                   client_object = client))
2021
1577
            parent_pipe.send(True)
2022
 
            # remove the old hook in favor of the new above hook on
2023
 
            # same fileno
 
1578
            # remove the old hook in favor of the new above hook on same fileno
2024
1579
            return False
2025
1580
        if command == 'funcall':
2026
1581
            funcname = request[1]
2027
1582
            args = request[2]
2028
1583
            kwargs = request[3]
2029
1584
            
2030
 
            parent_pipe.send(('data', getattr(client_object,
2031
 
                                              funcname)(*args,
2032
 
                                                         **kwargs)))
2033
 
        
 
1585
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1586
 
2034
1587
        if command == 'getattr':
2035
1588
            attrname = request[1]
2036
1589
            if callable(client_object.__getattribute__(attrname)):
2037
1590
                parent_pipe.send(('function',))
2038
1591
            else:
2039
 
                parent_pipe.send(('data', client_object
2040
 
                                  .__getattribute__(attrname)))
 
1592
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2041
1593
        
2042
1594
        if command == 'setattr':
2043
1595
            attrname = request[1]
2044
1596
            value = request[2]
2045
1597
            setattr(client_object, attrname, value)
2046
 
        
 
1598
 
2047
1599
        return True
2048
1600
 
2049
1601
 
2079
1631
            elif suffix == "w":
2080
1632
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
1633
            else:
2082
 
                raise ValueError("Unknown suffix {0!r}"
2083
 
                                 .format(suffix))
 
1634
                raise ValueError("Unknown suffix %r" % suffix)
2084
1635
        except (ValueError, IndexError) as e:
2085
1636
            raise ValueError(*(e.args))
2086
1637
        timevalue += delta
2087
1638
    return timevalue
2088
1639
 
2089
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
 
2090
1665
def daemon(nochdir = False, noclose = False):
2091
1666
    """See daemon(3).  Standard BSD Unix function.
2092
1667
    
2100
1675
        sys.exit()
2101
1676
    if not noclose:
2102
1677
        # Close all standard open file descriptors
2103
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1678
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2104
1679
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2105
1680
            raise OSError(errno.ENODEV,
2106
 
                          "{0} not a character device"
2107
 
                          .format(os.devnull))
 
1681
                          "%s not a character device"
 
1682
                          % os.path.devnull)
2108
1683
        os.dup2(null, sys.stdin.fileno())
2109
1684
        os.dup2(null, sys.stdout.fileno())
2110
1685
        os.dup2(null, sys.stderr.fileno())
2119
1694
    
2120
1695
    parser = argparse.ArgumentParser()
2121
1696
    parser.add_argument("-v", "--version", action="version",
2122
 
                        version = "%(prog)s {0}".format(version),
 
1697
                        version = "%%(prog)s %s" % version,
2123
1698
                        help="show version number and exit")
2124
1699
    parser.add_argument("-i", "--interface", metavar="IF",
2125
1700
                        help="Bind to interface IF")
2147
1722
                        " system bus interface")
2148
1723
    parser.add_argument("--no-ipv6", action="store_false",
2149
1724
                        dest="use_ipv6", help="Do not use IPv6")
2150
 
    parser.add_argument("--no-restore", action="store_false",
2151
 
                        dest="restore", help="Do not restore stored"
2152
 
                        " state")
2153
 
    parser.add_argument("--statedir", metavar="DIR",
2154
 
                        help="Directory to save/restore state in")
2155
 
    
2156
1725
    options = parser.parse_args()
2157
1726
    
2158
1727
    if options.check:
2171
1740
                        "use_dbus": "True",
2172
1741
                        "use_ipv6": "True",
2173
1742
                        "debuglevel": "",
2174
 
                        "restore": "True",
2175
 
                        "statedir": "/var/lib/mandos"
2176
1743
                        }
2177
1744
    
2178
1745
    # Parse config file for server-global settings
2195
1762
    # options, if set.
2196
1763
    for option in ("interface", "address", "port", "debug",
2197
1764
                   "priority", "servicename", "configdir",
2198
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2199
 
                   "statedir"):
 
1765
                   "use_dbus", "use_ipv6", "debuglevel"):
2200
1766
        value = getattr(options, option)
2201
1767
        if value is not None:
2202
1768
            server_settings[option] = value
2214
1780
    debuglevel = server_settings["debuglevel"]
2215
1781
    use_dbus = server_settings["use_dbus"]
2216
1782
    use_ipv6 = server_settings["use_ipv6"]
2217
 
    stored_state_path = os.path.join(server_settings["statedir"],
2218
 
                                     stored_state_file)
2219
 
    
2220
 
    if debug:
2221
 
        initlogger(debug, logging.DEBUG)
2222
 
    else:
2223
 
        if not debuglevel:
2224
 
            initlogger(debug)
2225
 
        else:
2226
 
            level = getattr(logging, debuglevel.upper())
2227
 
            initlogger(debug, level)
2228
 
    
 
1783
 
2229
1784
    if server_settings["servicename"] != "Mandos":
2230
1785
        syslogger.setFormatter(logging.Formatter
2231
 
                               ('Mandos ({0}) [%(process)d]:'
2232
 
                                ' %(levelname)s: %(message)s'
2233
 
                                .format(server_settings
2234
 
                                        ["servicename"])))
 
1786
                               ('Mandos (%s) [%%(process)d]:'
 
1787
                                ' %%(levelname)s: %%(message)s'
 
1788
                                % server_settings["servicename"]))
2235
1789
    
2236
1790
    # Parse config file with clients
2237
 
    client_config = configparser.SafeConfigParser(Client
2238
 
                                                  .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)
2239
1799
    client_config.read(os.path.join(server_settings["configdir"],
2240
1800
                                    "clients.conf"))
2241
1801
    
2258
1818
        except IOError:
2259
1819
            logger.error("Could not open file %r", pidfilename)
2260
1820
    
2261
 
    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:
2262
1825
        try:
2263
 
            uid = pwd.getpwnam(name).pw_uid
2264
 
            gid = pwd.getpwnam(name).pw_gid
2265
 
            break
 
1826
            uid = pwd.getpwnam("mandos").pw_uid
 
1827
            gid = pwd.getpwnam("mandos").pw_gid
2266
1828
        except KeyError:
2267
 
            continue
2268
 
    else:
2269
 
        uid = 65534
2270
 
        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
2271
1835
    try:
2272
1836
        os.setgid(gid)
2273
1837
        os.setuid(uid)
2275
1839
        if error[0] != errno.EPERM:
2276
1840
            raise error
2277
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
 
2278
1850
    if debug:
2279
1851
        # Enable all possible GnuTLS debugging
2280
1852
        
2290
1862
         .gnutls_global_set_log_function(debug_gnutls))
2291
1863
        
2292
1864
        # Redirect stdin so all checkers get /dev/null
2293
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1865
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2294
1866
        os.dup2(null, sys.stdin.fileno())
2295
1867
        if null > 2:
2296
1868
            os.close(null)
 
1869
    else:
 
1870
        # No console logging
 
1871
        logger.removeHandler(console)
2297
1872
    
2298
1873
    # Need to fork before connecting to D-Bus
2299
1874
    if not debug:
2300
1875
        # Close all input and output, do double fork, etc.
2301
1876
        daemon()
2302
1877
    
2303
 
    gobject.threads_init()
2304
 
    
2305
1878
    global main_loop
2306
1879
    # From the Avahi example code
2307
 
    DBusGMainLoop(set_as_default=True)
 
1880
    DBusGMainLoop(set_as_default=True )
2308
1881
    main_loop = gobject.MainLoop()
2309
1882
    bus = dbus.SystemBus()
2310
1883
    # End of Avahi example code
2311
1884
    if use_dbus:
2312
1885
        try:
2313
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1886
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2314
1887
                                            bus, do_not_queue=True)
2315
 
            old_bus_name = (dbus.service.BusName
2316
 
                            ("se.bsnet.fukt.Mandos", bus,
2317
 
                             do_not_queue=True))
2318
1888
        except dbus.exceptions.NameExistsException as e:
2319
1889
            logger.error(unicode(e) + ", disabling D-Bus")
2320
1890
            use_dbus = False
2321
1891
            server_settings["use_dbus"] = False
2322
1892
            tcp_server.use_dbus = False
2323
1893
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
 
    service = AvahiServiceToSyslog(name =
2325
 
                                   server_settings["servicename"],
2326
 
                                   servicetype = "_mandos._tcp",
2327
 
                                   protocol = protocol, bus = bus)
 
1894
    service = AvahiService(name = server_settings["servicename"],
 
1895
                           servicetype = "_mandos._tcp",
 
1896
                           protocol = protocol, bus = bus)
2328
1897
    if server_settings["interface"]:
2329
1898
        service.interface = (if_nametoindex
2330
1899
                             (str(server_settings["interface"])))
2334
1903
    
2335
1904
    client_class = Client
2336
1905
    if use_dbus:
2337
 
        client_class = functools.partial(ClientDBusTransitional,
2338
 
                                         bus = bus)
2339
 
    
2340
 
    client_settings = Client.config_parser(client_config)
2341
 
    old_client_settings = {}
2342
 
    clients_data = {}
2343
 
    
2344
 
    # Get client data and settings from last running state.
2345
 
    if server_settings["restore"]:
2346
 
        try:
2347
 
            with open(stored_state_path, "rb") as stored_state:
2348
 
                clients_data, old_client_settings = (pickle.load
2349
 
                                                     (stored_state))
2350
 
            os.remove(stored_state_path)
2351
 
        except IOError as e:
2352
 
            logger.warning("Could not load persistent state: {0}"
2353
 
                           .format(e))
2354
 
            if e.errno != errno.ENOENT:
2355
 
                raise
2356
 
        except EOFError as e:
2357
 
            logger.warning("Could not load persistent state: "
2358
 
                           "EOFError: {0}".format(e))
2359
 
    
2360
 
    with PGPEngine() as pgp:
2361
 
        for client_name, client in clients_data.iteritems():
2362
 
            # Decide which value to use after restoring saved state.
2363
 
            # We have three different values: Old config file,
2364
 
            # new config file, and saved state.
2365
 
            # New config value takes precedence if it differs from old
2366
 
            # config value, otherwise use saved state.
2367
 
            for name, value in client_settings[client_name].items():
2368
 
                try:
2369
 
                    # For each value in new config, check if it
2370
 
                    # differs from the old config value (Except for
2371
 
                    # the "secret" attribute)
2372
 
                    if (name != "secret" and
2373
 
                        value != old_client_settings[client_name]
2374
 
                        [name]):
2375
 
                        client[name] = value
2376
 
                except KeyError:
2377
 
                    pass
2378
 
            
2379
 
            # Clients who has passed its expire date can still be
2380
 
            # enabled if its last checker was successful.  Clients
2381
 
            # whose checker succeeded before we stored its state is
2382
 
            # assumed to have successfully run all checkers during
2383
 
            # downtime.
2384
 
            if client["enabled"]:
2385
 
                if datetime.datetime.utcnow() >= client["expires"]:
2386
 
                    if not client["last_checked_ok"]:
2387
 
                        logger.warning(
2388
 
                            "disabling client {0} - Client never "
2389
 
                            "performed a successful checker"
2390
 
                            .format(client_name))
2391
 
                        client["enabled"] = False
2392
 
                    elif client["last_checker_status"] != 0:
2393
 
                        logger.warning(
2394
 
                            "disabling client {0} - Client "
2395
 
                            "last checker failed with error code {1}"
2396
 
                            .format(client_name,
2397
 
                                    client["last_checker_status"]))
2398
 
                        client["enabled"] = False
2399
 
                    else:
2400
 
                        client["expires"] = (datetime.datetime
2401
 
                                             .utcnow()
2402
 
                                             + client["timeout"])
2403
 
                        logger.debug("Last checker succeeded,"
2404
 
                                     " keeping {0} enabled"
2405
 
                                     .format(client_name))
 
1906
        client_class = functools.partial(ClientDBus, bus = bus)
 
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):
2406
1914
            try:
2407
 
                client["secret"] = (
2408
 
                    pgp.decrypt(client["encrypted_secret"],
2409
 
                                client_settings[client_name]
2410
 
                                ["secret"]))
2411
 
            except PGPError:
2412
 
                # If decryption fails, we use secret from new settings
2413
 
                logger.debug("Failed to decrypt {0} old secret"
2414
 
                             .format(client_name))
2415
 
                client["secret"] = (
2416
 
                    client_settings[client_name]["secret"])
2417
 
    
2418
 
    # Add/remove clients based on new changes made to config
2419
 
    for client_name in (set(old_client_settings)
2420
 
                        - set(client_settings)):
2421
 
        del clients_data[client_name]
2422
 
    for client_name in (set(client_settings)
2423
 
                        - set(old_client_settings)):
2424
 
        clients_data[client_name] = client_settings[client_name]
2425
 
    
2426
 
    # Create all client objects
2427
 
    for client_name, client in clients_data.iteritems():
2428
 
        tcp_server.clients[client_name] = client_class(
2429
 
            name = client_name, settings = client)
2430
 
    
 
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()))
2431
1924
    if not tcp_server.clients:
2432
1925
        logger.warning("No clients defined")
2433
 
    
 
1926
        
2434
1927
    if not debug:
2435
1928
        try:
2436
1929
            with pidfile:
2444
1937
            # "pidfile" was never created
2445
1938
            pass
2446
1939
        del pidfilename
 
1940
        
2447
1941
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2448
 
    
 
1942
 
2449
1943
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2450
1944
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2451
1945
    
2452
1946
    if use_dbus:
2453
 
        class MandosDBusService(DBusObjectWithProperties):
 
1947
        class MandosDBusService(dbus.service.Object):
2454
1948
            """A D-Bus proxy object"""
2455
1949
            def __init__(self):
2456
1950
                dbus.service.Object.__init__(self, bus, "/")
2457
 
            _interface = "se.recompile.Mandos"
2458
 
            
2459
 
            @dbus_interface_annotations(_interface)
2460
 
            def _foo(self):
2461
 
                return { "org.freedesktop.DBus.Property"
2462
 
                         ".EmitsChangedSignal":
2463
 
                             "false"}
 
1951
            _interface = "se.bsnet.fukt.Mandos"
2464
1952
            
2465
1953
            @dbus.service.signal(_interface, signature="o")
2466
1954
            def ClientAdded(self, objpath):
2481
1969
            def GetAllClients(self):
2482
1970
                "D-Bus method"
2483
1971
                return dbus.Array(c.dbus_object_path
2484
 
                                  for c in
2485
 
                                  tcp_server.clients.itervalues())
 
1972
                                  for c in tcp_server.clients)
2486
1973
            
2487
1974
            @dbus.service.method(_interface,
2488
1975
                                 out_signature="a{oa{sv}}")
2490
1977
                "D-Bus method"
2491
1978
                return dbus.Dictionary(
2492
1979
                    ((c.dbus_object_path, c.GetAll(""))
2493
 
                     for c in tcp_server.clients.itervalues()),
 
1980
                     for c in tcp_server.clients),
2494
1981
                    signature="oa{sv}")
2495
1982
            
2496
1983
            @dbus.service.method(_interface, in_signature="o")
2497
1984
            def RemoveClient(self, object_path):
2498
1985
                "D-Bus method"
2499
 
                for c in tcp_server.clients.itervalues():
 
1986
                for c in tcp_server.clients:
2500
1987
                    if c.dbus_object_path == object_path:
2501
 
                        del tcp_server.clients[c.name]
 
1988
                        tcp_server.clients.remove(c)
2502
1989
                        c.remove_from_connection()
2503
1990
                        # Don't signal anything except ClientRemoved
2504
1991
                        c.disable(quiet=True)
2509
1996
            
2510
1997
            del _interface
2511
1998
        
2512
 
        class MandosDBusServiceTransitional(MandosDBusService):
2513
 
            __metaclass__ = AlternateDBusNamesMetaclass
2514
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1999
        mandos_dbus_service = MandosDBusService()
2515
2000
    
2516
2001
    def cleanup():
2517
2002
        "Cleanup function; run on exit"
2518
2003
        service.cleanup()
2519
2004
        
2520
 
        multiprocessing.active_children()
2521
 
        if not (tcp_server.clients or client_settings):
2522
 
            return
2523
 
        
2524
 
        # Store client before exiting. Secrets are encrypted with key
2525
 
        # based on what config file has. If config file is
2526
 
        # removed/edited, old secret will thus be unrecovable.
2527
 
        clients = {}
2528
 
        with PGPEngine() as pgp:
2529
 
            for client in tcp_server.clients.itervalues():
2530
 
                key = client_settings[client.name]["secret"]
2531
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2532
 
                                                      key)
2533
 
                client_dict = {}
2534
 
                
2535
 
                # A list of attributes that can not be pickled
2536
 
                # + secret.
2537
 
                exclude = set(("bus", "changedstate", "secret",
2538
 
                               "checker"))
2539
 
                for name, typ in (inspect.getmembers
2540
 
                                  (dbus.service.Object)):
2541
 
                    exclude.add(name)
2542
 
                
2543
 
                client_dict["encrypted_secret"] = (client
2544
 
                                                   .encrypted_secret)
2545
 
                for attr in client.client_structure:
2546
 
                    if attr not in exclude:
2547
 
                        client_dict[attr] = getattr(client, attr)
2548
 
                
2549
 
                clients[client.name] = client_dict
2550
 
                del client_settings[client.name]["secret"]
2551
 
        
2552
 
        try:
2553
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2554
 
                                                prefix="clients-",
2555
 
                                                dir=os.path.dirname
2556
 
                                                (stored_state_path))
2557
 
            with os.fdopen(tempfd, "wb") as stored_state:
2558
 
                pickle.dump((clients, client_settings), stored_state)
2559
 
            os.rename(tempname, stored_state_path)
2560
 
        except (IOError, OSError) as e:
2561
 
            logger.warning("Could not save persistent state: {0}"
2562
 
                           .format(e))
2563
 
            if not debug:
2564
 
                try:
2565
 
                    os.remove(tempname)
2566
 
                except NameError:
2567
 
                    pass
2568
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2569
 
                                   errno.EEXIST)):
2570
 
                raise e
2571
 
        
2572
 
        # Delete all clients, and settings from config
2573
2005
        while tcp_server.clients:
2574
 
            name, client = tcp_server.clients.popitem()
 
2006
            client = tcp_server.clients.pop()
2575
2007
            if use_dbus:
2576
2008
                client.remove_from_connection()
 
2009
            client.disable_hook = None
2577
2010
            # Don't signal anything except ClientRemoved
2578
2011
            client.disable(quiet=True)
2579
2012
            if use_dbus:
2580
2013
                # Emit D-Bus signal
2581
 
                mandos_dbus_service.ClientRemoved(client
2582
 
                                                  .dbus_object_path,
 
2014
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2583
2015
                                                  client.name)
2584
 
        client_settings.clear()
2585
2016
    
2586
2017
    atexit.register(cleanup)
2587
2018
    
2588
 
    for client in tcp_server.clients.itervalues():
 
2019
    for client in tcp_server.clients:
2589
2020
        if use_dbus:
2590
2021
            # Emit D-Bus signal
2591
2022
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2592
 
        # Need to initiate checking of clients
2593
 
        if client.enabled:
2594
 
            client.init_checker()
 
2023
        client.enable()
2595
2024
    
2596
2025
    tcp_server.enable()
2597
2026
    tcp_server.server_activate()
2600
2029
    service.port = tcp_server.socket.getsockname()[1]
2601
2030
    if use_ipv6:
2602
2031
        logger.info("Now listening on address %r, port %d,"
2603
 
                    " flowinfo %d, scope_id %d",
2604
 
                    *tcp_server.socket.getsockname())
 
2032
                    " flowinfo %d, scope_id %d"
 
2033
                    % tcp_server.socket.getsockname())
2605
2034
    else:                       # IPv4
2606
 
        logger.info("Now listening on address %r, port %d",
2607
 
                    *tcp_server.socket.getsockname())
 
2035
        logger.info("Now listening on address %r, port %d"
 
2036
                    % tcp_server.socket.getsockname())
2608
2037
    
2609
2038
    #service.interface = tcp_server.socket.getsockname()[3]
2610
2039
    
2613
2042
        try:
2614
2043
            service.activate()
2615
2044
        except dbus.exceptions.DBusException as error:
2616
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2045
            logger.critical("DBusException: %s", error)
2617
2046
            cleanup()
2618
2047
            sys.exit(1)
2619
2048
        # End of Avahi example code
2626
2055
        logger.debug("Starting main loop")
2627
2056
        main_loop.run()
2628
2057
    except AvahiError as error:
2629
 
        logger.critical("Avahi Error", exc_info=error)
 
2058
        logger.critical("AvahiError: %s", error)
2630
2059
        cleanup()
2631
2060
        sys.exit(1)
2632
2061
    except KeyboardInterrupt: