/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: 2012-05-06 16:13:00 UTC
  • Revision ID: teddy@recompile.se-20120506161300-43rls2rr4qub3zhw
* mandos: Use a class decorator instead of a metaclass to provide
          alternate D-Bus interface names on D-Bus object attributes.
  (alternate_dbus_interfaces): New class decorator.
  (AlternateDBusNamesMetaclass, ClientDBusTransitional,
   MandosDBusServiceTransitional): Removed; all users changed.
  (ClientDbus, MandosDBusService): Use new "alternate_dbus_interfaces"
                                   class decorator.

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
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
65
69
 
66
70
import dbus
67
71
import dbus.service
72
76
import ctypes.util
73
77
import xml.dom.minidom
74
78
import inspect
 
79
import GnuPGInterface
75
80
 
76
81
try:
77
82
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
86
    except ImportError:
82
87
        SO_BINDTODEVICE = None
83
88
 
84
 
 
85
 
version = "1.3.1"
86
 
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
89
version = "1.5.3"
 
90
stored_state_file = "clients.pickle"
 
91
 
 
92
logger = logging.getLogger()
89
93
syslogger = (logging.handlers.SysLogHandler
90
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
95
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
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
 
102
211
 
103
212
class AvahiError(Exception):
104
213
    def __init__(self, value, *args, **kwargs):
134
243
    server: D-Bus Server
135
244
    bus: dbus.SystemBus()
136
245
    """
 
246
    
137
247
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
248
                 servicetype = None, port = None, TXT = None,
139
249
                 domain = "", host = "", max_renames = 32768,
152
262
        self.server = None
153
263
        self.bus = bus
154
264
        self.entry_group_state_changed_match = None
 
265
    
155
266
    def rename(self):
156
267
        """Derived from the Avahi example code"""
157
268
        if self.rename_count >= self.max_renames:
159
270
                            " after %i retries, exiting.",
160
271
                            self.rename_count)
161
272
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
273
        self.name = unicode(self.server
 
274
                            .GetAlternativeServiceName(self.name))
163
275
        logger.info("Changing Zeroconf service name to %r ...",
164
276
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
277
        self.remove()
170
278
        try:
171
279
            self.add()
172
280
        except dbus.exceptions.DBusException as error:
173
 
            logger.critical("DBusException: %s", error)
 
281
            logger.critical("D-Bus Exception", exc_info=error)
174
282
            self.cleanup()
175
283
            os._exit(1)
176
284
        self.rename_count += 1
 
285
    
177
286
    def remove(self):
178
287
        """Derived from the Avahi example code"""
179
288
        if self.entry_group_state_changed_match is not None:
181
290
            self.entry_group_state_changed_match = None
182
291
        if self.group is not None:
183
292
            self.group.Reset()
 
293
    
184
294
    def add(self):
185
295
        """Derived from the Avahi example code"""
186
296
        self.remove()
191
301
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
302
        self.entry_group_state_changed_match = (
193
303
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
 
304
                'StateChanged', self.entry_group_state_changed))
195
305
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
196
306
                     self.name, self.type)
197
307
        self.group.AddService(
203
313
            dbus.UInt16(self.port),
204
314
            avahi.string_array_to_txt_array(self.TXT))
205
315
        self.group.Commit()
 
316
    
206
317
    def entry_group_state_changed(self, state, error):
207
318
        """Derived from the Avahi example code"""
208
319
        logger.debug("Avahi entry group state change: %i", state)
215
326
        elif state == avahi.ENTRY_GROUP_FAILURE:
216
327
            logger.critical("Avahi: Error in group state changed %s",
217
328
                            unicode(error))
218
 
            raise AvahiGroupError("State changed: %s"
219
 
                                  % unicode(error))
 
329
            raise AvahiGroupError("State changed: {0!s}"
 
330
                                  .format(error))
 
331
    
220
332
    def cleanup(self):
221
333
        """Derived from the Avahi example code"""
222
334
        if self.group is not None:
223
335
            try:
224
336
                self.group.Free()
225
337
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
 
338
                    dbus.exceptions.DBusException):
227
339
                pass
228
340
            self.group = None
229
341
        self.remove()
 
342
    
230
343
    def server_state_changed(self, state, error=None):
231
344
        """Derived from the Avahi example code"""
232
345
        logger.debug("Avahi server state change: %i", state)
251
364
                logger.debug("Unknown state: %r", state)
252
365
            else:
253
366
                logger.debug("Unknown state: %r: %r", state, error)
 
367
    
254
368
    def activate(self):
255
369
        """Derived from the Avahi example code"""
256
370
        if self.server is None:
263
377
                                 self.server_state_changed)
264
378
        self.server_state_changed(self.server.GetState())
265
379
 
 
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
266
389
 
267
 
def _timedelta_to_milliseconds(td):
 
390
def timedelta_to_milliseconds(td):
268
391
    "Convert a datetime.timedelta() to milliseconds"
269
392
    return ((td.days * 24 * 60 * 60 * 1000)
270
393
            + (td.seconds * 1000)
271
394
            + (td.microseconds // 1000))
272
 
        
 
395
 
273
396
class Client(object):
274
397
    """A representation of a client host served by this server.
275
398
    
276
399
    Attributes:
277
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
400
    approved:   bool(); 'None' if not yet approved/disapproved
278
401
    approval_delay: datetime.timedelta(); Time to wait for approval
279
402
    approval_duration: datetime.timedelta(); Duration of one approval
280
403
    checker:    subprocess.Popen(); a running checker process used
287
410
                     instance %(name)s can be used in the command.
288
411
    checker_initiator_tag: a gobject event source tag, or None
289
412
    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
290
415
    current_checker_command: string; current running checker_command
291
 
    disable_hook:  If set, called by disable() as disable_hook(self)
292
416
    disable_initiator_tag: a gobject event source tag, or None
293
417
    enabled:    bool()
294
418
    fingerprint: string (40 or 32 hexadecimal digits); used to
297
421
    interval:   datetime.timedelta(); How often to start a new checker
298
422
    last_approval_request: datetime.datetime(); (UTC) or None
299
423
    last_checked_ok: datetime.datetime(); (UTC) or None
300
 
    last_enabled: datetime.datetime(); (UTC)
 
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
301
428
    name:       string; from the config file, used in log messages and
302
429
                        D-Bus identifiers
303
430
    secret:     bytestring; sent verbatim (over TLS) to client
304
431
    timeout:    datetime.timedelta(); How long from last_checked_ok
305
432
                                      until this client is disabled
306
 
    extended_timeout:   extra long timeout when password has been sent
 
433
    extended_timeout:   extra long timeout when secret has been sent
307
434
    runtime_expansions: Allowed attributes for runtime expansion.
308
435
    expires:    datetime.datetime(); time (UTC) when a client will be
309
436
                disabled, or None
313
440
                          "created", "enabled", "fingerprint",
314
441
                          "host", "interval", "last_checked_ok",
315
442
                          "last_enabled", "name", "timeout")
316
 
        
 
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
                        }
 
453
    
317
454
    def timeout_milliseconds(self):
318
455
        "Return the 'timeout' attribute in milliseconds"
319
 
        return _timedelta_to_milliseconds(self.timeout)
320
 
 
 
456
        return timedelta_to_milliseconds(self.timeout)
 
457
    
321
458
    def extended_timeout_milliseconds(self):
322
459
        "Return the 'extended_timeout' attribute in milliseconds"
323
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
460
        return timedelta_to_milliseconds(self.extended_timeout)
324
461
    
325
462
    def interval_milliseconds(self):
326
463
        "Return the 'interval' attribute in milliseconds"
327
 
        return _timedelta_to_milliseconds(self.interval)
328
 
 
 
464
        return timedelta_to_milliseconds(self.interval)
 
465
    
329
466
    def approval_delay_milliseconds(self):
330
 
        return _timedelta_to_milliseconds(self.approval_delay)
331
 
    
332
 
    def __init__(self, name = None, disable_hook=None, config=None):
333
 
        """Note: the 'checker' key in 'config' sets the
334
 
        'checker_command' attribute and *not* the 'checker'
335
 
        attribute."""
 
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):
336
517
        self.name = name
337
 
        if config is None:
338
 
            config = {}
 
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
        
339
532
        logger.debug("Creating client %r", self.name)
340
533
        # Uppercase and remove spaces from fingerprint for later
341
534
        # comparison purposes with return value from the fingerprint()
342
535
        # function
343
 
        self.fingerprint = (config["fingerprint"].upper()
344
 
                            .replace(" ", ""))
345
536
        logger.debug("  Fingerprint: %s", self.fingerprint)
346
 
        if "secret" in config:
347
 
            self.secret = config["secret"].decode("base64")
348
 
        elif "secfile" in config:
349
 
            with open(os.path.expanduser(os.path.expandvars
350
 
                                         (config["secfile"])),
351
 
                      "rb") as secfile:
352
 
                self.secret = secfile.read()
353
 
        else:
354
 
            raise TypeError("No secret or secfile for client %s"
355
 
                            % self.name)
356
 
        self.host = config.get("host", "")
357
 
        self.created = datetime.datetime.utcnow()
358
 
        self.enabled = False
359
 
        self.last_approval_request = None
360
 
        self.last_enabled = None
361
 
        self.last_checked_ok = None
362
 
        self.timeout = string_to_delta(config["timeout"])
363
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
364
 
        self.interval = string_to_delta(config["interval"])
365
 
        self.disable_hook = disable_hook
 
537
        self.created = settings.get("created",
 
538
                                    datetime.datetime.utcnow())
 
539
        
 
540
        # attributes specific for this server instance
366
541
        self.checker = None
367
542
        self.checker_initiator_tag = None
368
543
        self.disable_initiator_tag = None
369
 
        self.expires = None
370
544
        self.checker_callback_tag = None
371
 
        self.checker_command = config["checker"]
372
545
        self.current_checker_command = None
373
 
        self.last_connect = None
374
 
        self._approved = None
375
 
        self.approved_by_default = config.get("approved_by_default",
376
 
                                              True)
 
546
        self.approved = None
377
547
        self.approvals_pending = 0
378
 
        self.approval_delay = string_to_delta(
379
 
            config["approval_delay"])
380
 
        self.approval_duration = string_to_delta(
381
 
            config["approval_duration"])
382
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
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)
383
562
    
 
563
    # Send notice to process children that client state has changed
384
564
    def send_changedstate(self):
385
 
        self.changedstate.acquire()
386
 
        self.changedstate.notify_all()
387
 
        self.changedstate.release()
388
 
        
 
565
        with self.changedstate:
 
566
            self.changedstate.notify_all()
 
567
    
389
568
    def enable(self):
390
569
        """Start this client's checker and timeout hooks"""
391
570
        if getattr(self, "enabled", False):
392
571
            # Already enabled
393
572
            return
394
573
        self.send_changedstate()
395
 
        # Schedule a new checker to be started an 'interval' from now,
396
 
        # and every interval from then on.
397
 
        self.checker_initiator_tag = (gobject.timeout_add
398
 
                                      (self.interval_milliseconds(),
399
 
                                       self.start_checker))
400
 
        # Schedule a disable() when 'timeout' has passed
401
574
        self.expires = datetime.datetime.utcnow() + self.timeout
402
 
        self.disable_initiator_tag = (gobject.timeout_add
403
 
                                   (self.timeout_milliseconds(),
404
 
                                    self.disable))
405
575
        self.enabled = True
406
576
        self.last_enabled = datetime.datetime.utcnow()
407
 
        # Also start a new checker *right now*.
408
 
        self.start_checker()
 
577
        self.init_checker()
409
578
    
410
579
    def disable(self, quiet=True):
411
580
        """Disable this client."""
423
592
            gobject.source_remove(self.checker_initiator_tag)
424
593
            self.checker_initiator_tag = None
425
594
        self.stop_checker()
426
 
        if self.disable_hook:
427
 
            self.disable_hook(self)
428
595
        self.enabled = False
429
596
        # Do not run this again if called by a gobject.timeout_add
430
597
        return False
431
598
    
432
599
    def __del__(self):
433
 
        self.disable_hook = None
434
600
        self.disable()
435
601
    
 
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
    
436
615
    def checker_callback(self, pid, condition, command):
437
616
        """The checker has completed, so take appropriate actions."""
438
617
        self.checker_callback_tag = None
439
618
        self.checker = None
440
619
        if os.WIFEXITED(condition):
441
 
            exitstatus = os.WEXITSTATUS(condition)
442
 
            if exitstatus == 0:
 
620
            self.last_checker_status = os.WEXITSTATUS(condition)
 
621
            if self.last_checker_status == 0:
443
622
                logger.info("Checker for %(name)s succeeded",
444
623
                            vars(self))
445
624
                self.checked_ok()
447
626
                logger.info("Checker for %(name)s failed",
448
627
                            vars(self))
449
628
        else:
 
629
            self.last_checker_status = -1
450
630
            logger.warning("Checker for %(name)s crashed?",
451
631
                           vars(self))
452
632
    
453
 
    def checked_ok(self, timeout=None):
454
 
        """Bump up the timeout for this client.
455
 
        
456
 
        This should only be called when the client has been seen,
457
 
        alive and well.
458
 
        """
 
633
    def checked_ok(self):
 
634
        """Assert that the client has been seen, alive and well."""
 
635
        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."""
459
641
        if timeout is None:
460
642
            timeout = self.timeout
461
 
        self.last_checked_ok = datetime.datetime.utcnow()
462
 
        gobject.source_remove(self.disable_initiator_tag)
463
 
        self.expires = datetime.datetime.utcnow() + timeout
464
 
        self.disable_initiator_tag = (gobject.timeout_add
465
 
                                      (_timedelta_to_milliseconds(timeout),
466
 
                                       self.disable))
 
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
467
650
    
468
651
    def need_approval(self):
469
652
        self.last_approval_request = datetime.datetime.utcnow()
509
692
                                       'replace')))
510
693
                    for attr in
511
694
                    self.runtime_expansions)
512
 
 
 
695
                
513
696
                try:
514
697
                    command = self.checker_command % escaped_attrs
515
698
                except TypeError as error:
516
 
                    logger.error('Could not format string "%s":'
517
 
                                 ' %s', self.checker_command, error)
 
699
                    logger.error('Could not format string "%s"',
 
700
                                 self.checker_command, exc_info=error)
518
701
                    return True # Try again later
519
702
            self.current_checker_command = command
520
703
            try:
538
721
                    gobject.source_remove(self.checker_callback_tag)
539
722
                    self.checker_callback(pid, status, command)
540
723
            except OSError as error:
541
 
                logger.error("Failed to start subprocess: %s",
542
 
                             error)
 
724
                logger.error("Failed to start subprocess",
 
725
                             exc_info=error)
543
726
        # Re-run this periodically if run by gobject.timeout_add
544
727
        return True
545
728
    
552
735
            return
553
736
        logger.debug("Stopping checker for %(name)s", vars(self))
554
737
        try:
555
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
738
            self.checker.terminate()
556
739
            #time.sleep(0.5)
557
740
            #if self.checker.poll() is None:
558
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
741
            #    self.checker.kill()
559
742
        except OSError as error:
560
743
            if error.errno != errno.ESRCH: # No such process
561
744
                raise
562
745
        self.checker = None
563
746
 
 
747
 
564
748
def dbus_service_property(dbus_interface, signature="v",
565
749
                          access="readwrite", byte_arrays=False):
566
750
    """Decorators for marking methods of a DBusObjectWithProperties to
577
761
    # "Set" method, so we fail early here:
578
762
    if byte_arrays and signature != "ay":
579
763
        raise ValueError("Byte arrays not supported for non-'ay'"
580
 
                         " signature %r" % signature)
 
764
                         " signature {0!r}".format(signature))
581
765
    def decorator(func):
582
766
        func._dbus_is_property = True
583
767
        func._dbus_interface = dbus_interface
591
775
    return decorator
592
776
 
593
777
 
 
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
 
594
815
class DBusPropertyException(dbus.exceptions.DBusException):
595
816
    """A base class for D-Bus property-related exceptions
596
817
    """
612
833
 
613
834
class DBusObjectWithProperties(dbus.service.Object):
614
835
    """A D-Bus object with properties.
615
 
 
 
836
    
616
837
    Classes inheriting from this can use the dbus_service_property
617
838
    decorator to expose methods as D-Bus properties.  It exposes the
618
839
    standard Get(), Set(), and GetAll() methods on the D-Bus.
619
840
    """
620
841
    
621
842
    @staticmethod
622
 
    def _is_dbus_property(obj):
623
 
        return getattr(obj, "_dbus_is_property", False)
 
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)
624
851
    
625
 
    def _get_all_dbus_properties(self):
 
852
    def _get_all_dbus_things(self, thing):
626
853
        """Returns a generator of (name, attribute) pairs
627
854
        """
628
 
        return ((prop._dbus_name, prop)
629
 
                for name, prop in
630
 
                inspect.getmembers(self, self._is_dbus_property))
 
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)))
631
862
    
632
863
    def _get_dbus_property(self, interface_name, property_name):
633
864
        """Returns a bound method if one exists which is a D-Bus
634
865
        property with the specified name and interface.
635
866
        """
636
 
        for name in (property_name,
637
 
                     property_name + "_dbus_property"):
638
 
            prop = getattr(self, name, None)
639
 
            if (prop is None
640
 
                or not self._is_dbus_property(prop)
641
 
                or prop._dbus_name != property_name
642
 
                or (interface_name and prop._dbus_interface
643
 
                    and interface_name != prop._dbus_interface)):
644
 
                continue
645
 
            return prop
 
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
        
646
875
        # No such property
647
876
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
877
                                   + interface_name + "."
673
902
            # signatures other than "ay".
674
903
            if prop._dbus_signature != "ay":
675
904
                raise ValueError
676
 
            value = dbus.ByteArray(''.join(unichr(byte)
677
 
                                           for byte in value))
 
905
            value = dbus.ByteArray(b''.join(chr(byte)
 
906
                                            for byte in value))
678
907
        prop(value)
679
908
    
680
909
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
911
    def GetAll(self, interface_name):
683
912
        """Standard D-Bus property GetAll() method, see D-Bus
684
913
        standard.
685
 
 
 
914
        
686
915
        Note: Will not include properties with access="write".
687
916
        """
688
 
        all = {}
689
 
        for name, prop in self._get_all_dbus_properties():
 
917
        properties = {}
 
918
        for name, prop in self._get_all_dbus_things("property"):
690
919
            if (interface_name
691
920
                and interface_name != prop._dbus_interface):
692
921
                # Interface non-empty but did not match
696
925
                continue
697
926
            value = prop()
698
927
            if not hasattr(value, "variant_level"):
699
 
                all[name] = value
 
928
                properties[name] = value
700
929
                continue
701
 
            all[name] = type(value)(value, variant_level=
702
 
                                    value.variant_level+1)
703
 
        return dbus.Dictionary(all, signature="sv")
 
930
            properties[name] = type(value)(value, variant_level=
 
931
                                           value.variant_level+1)
 
932
        return dbus.Dictionary(properties, signature="sv")
704
933
    
705
934
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
706
935
                         out_signature="s",
707
936
                         path_keyword='object_path',
708
937
                         connection_keyword='connection')
709
938
    def Introspect(self, object_path, connection):
710
 
        """Standard D-Bus method, overloaded to insert property tags.
 
939
        """Overloading of standard D-Bus method.
 
940
        
 
941
        Inserts property tags and interface annotation tags.
711
942
        """
712
943
        xmlstring = dbus.service.Object.Introspect(self, object_path,
713
944
                                                   connection)
720
951
                e.setAttribute("access", prop._dbus_access)
721
952
                return e
722
953
            for if_tag in document.getElementsByTagName("interface"):
 
954
                # Add property tags
723
955
                for tag in (make_tag(document, name, prop)
724
956
                            for name, prop
725
 
                            in self._get_all_dbus_properties()
 
957
                            in self._get_all_dbus_things("property")
726
958
                            if prop._dbus_interface
727
959
                            == if_tag.getAttribute("name")):
728
960
                    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)
729
992
                # Add the names to the return values for the
730
993
                # "org.freedesktop.DBus.Properties" methods
731
994
                if (if_tag.getAttribute("name")
746
1009
        except (AttributeError, xml.dom.DOMException,
747
1010
                xml.parsers.expat.ExpatError) as error:
748
1011
            logger.error("Failed to override Introspection method",
749
 
                         error)
 
1012
                         exc_info=error)
750
1013
        return xmlstring
751
1014
 
752
1015
 
757
1020
    return dbus.String(dt.isoformat(),
758
1021
                       variant_level=variant_level)
759
1022
 
 
1023
 
 
1024
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1025
    """A class decorator; applied to a subclass of
 
1026
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1027
    interface names according to the "alt_interface_names" mapping.
 
1028
    Usage:
 
1029
    
 
1030
    @alternate_dbus_names({"org.example.Interface":
 
1031
                               "net.example.AlternateInterface"})
 
1032
    class SampleDBusObject(dbus.service.Object):
 
1033
        @dbus.service.method("org.example.Interface")
 
1034
        def SampleDBusMethod():
 
1035
            pass
 
1036
    
 
1037
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1038
    reachable via two interfaces: "org.example.Interface" and
 
1039
    "net.example.AlternateInterface", the latter of which will have
 
1040
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1041
    "true", unless "deprecate" is passed with a False value.
 
1042
    
 
1043
    This works for methods and signals, and also for D-Bus properties
 
1044
    (from DBusObjectWithProperties) and interfaces (from the
 
1045
    dbus_interface_annotations decorator).
 
1046
    """
 
1047
    def wrapper(cls):
 
1048
        for orig_interface_name, alt_interface_name in (
 
1049
            alt_interface_names.iteritems()):
 
1050
            attr = {}
 
1051
            interface_names = set()
 
1052
            # Go though all attributes of the class
 
1053
            for attrname, attribute in inspect.getmembers(cls):
 
1054
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1055
                # with the wrong interface name
 
1056
                if (not hasattr(attribute, "_dbus_interface")
 
1057
                    or not attribute._dbus_interface
 
1058
                    .startswith(orig_interface_name)):
 
1059
                    continue
 
1060
                # Create an alternate D-Bus interface name based on
 
1061
                # the current name
 
1062
                alt_interface = (attribute._dbus_interface
 
1063
                                 .replace(orig_interface_name,
 
1064
                                          alt_interface_name))
 
1065
                interface_names.add(alt_interface)
 
1066
                # Is this a D-Bus signal?
 
1067
                if getattr(attribute, "_dbus_is_signal", False):
 
1068
                    # Extract the original non-method function by
 
1069
                    # black magic
 
1070
                    nonmethod_func = (dict(
 
1071
                            zip(attribute.func_code.co_freevars,
 
1072
                                attribute.__closure__))["func"]
 
1073
                                      .cell_contents)
 
1074
                    # Create a new, but exactly alike, function
 
1075
                    # object, and decorate it to be a new D-Bus signal
 
1076
                    # with the alternate D-Bus interface name
 
1077
                    new_function = (dbus.service.signal
 
1078
                                    (alt_interface,
 
1079
                                     attribute._dbus_signature)
 
1080
                                    (types.FunctionType(
 
1081
                                nonmethod_func.func_code,
 
1082
                                nonmethod_func.func_globals,
 
1083
                                nonmethod_func.func_name,
 
1084
                                nonmethod_func.func_defaults,
 
1085
                                nonmethod_func.func_closure)))
 
1086
                    # Copy annotations, if any
 
1087
                    try:
 
1088
                        new_function._dbus_annotations = (
 
1089
                            dict(attribute._dbus_annotations))
 
1090
                    except AttributeError:
 
1091
                        pass
 
1092
                    # Define a creator of a function to call both the
 
1093
                    # original and alternate functions, so both the
 
1094
                    # original and alternate signals gets sent when
 
1095
                    # the function is called
 
1096
                    def fixscope(func1, func2):
 
1097
                        """This function is a scope container to pass
 
1098
                        func1 and func2 to the "call_both" function
 
1099
                        outside of its arguments"""
 
1100
                        def call_both(*args, **kwargs):
 
1101
                            """This function will emit two D-Bus
 
1102
                            signals by calling func1 and func2"""
 
1103
                            func1(*args, **kwargs)
 
1104
                            func2(*args, **kwargs)
 
1105
                        return call_both
 
1106
                    # Create the "call_both" function and add it to
 
1107
                    # the class
 
1108
                    attr[attrname] = fixscope(attribute, new_function)
 
1109
                # Is this a D-Bus method?
 
1110
                elif getattr(attribute, "_dbus_is_method", False):
 
1111
                    # Create a new, but exactly alike, function
 
1112
                    # object.  Decorate it to be a new D-Bus method
 
1113
                    # with the alternate D-Bus interface name.  Add it
 
1114
                    # to the class.
 
1115
                    attr[attrname] = (dbus.service.method
 
1116
                                      (alt_interface,
 
1117
                                       attribute._dbus_in_signature,
 
1118
                                       attribute._dbus_out_signature)
 
1119
                                      (types.FunctionType
 
1120
                                       (attribute.func_code,
 
1121
                                        attribute.func_globals,
 
1122
                                        attribute.func_name,
 
1123
                                        attribute.func_defaults,
 
1124
                                        attribute.func_closure)))
 
1125
                    # Copy annotations, if any
 
1126
                    try:
 
1127
                        attr[attrname]._dbus_annotations = (
 
1128
                            dict(attribute._dbus_annotations))
 
1129
                    except AttributeError:
 
1130
                        pass
 
1131
                # Is this a D-Bus property?
 
1132
                elif getattr(attribute, "_dbus_is_property", False):
 
1133
                    # Create a new, but exactly alike, function
 
1134
                    # object, and decorate it to be a new D-Bus
 
1135
                    # property with the alternate D-Bus interface
 
1136
                    # name.  Add it to the class.
 
1137
                    attr[attrname] = (dbus_service_property
 
1138
                                      (alt_interface,
 
1139
                                       attribute._dbus_signature,
 
1140
                                       attribute._dbus_access,
 
1141
                                       attribute
 
1142
                                       ._dbus_get_args_options
 
1143
                                       ["byte_arrays"])
 
1144
                                      (types.FunctionType
 
1145
                                       (attribute.func_code,
 
1146
                                        attribute.func_globals,
 
1147
                                        attribute.func_name,
 
1148
                                        attribute.func_defaults,
 
1149
                                        attribute.func_closure)))
 
1150
                    # Copy annotations, if any
 
1151
                    try:
 
1152
                        attr[attrname]._dbus_annotations = (
 
1153
                            dict(attribute._dbus_annotations))
 
1154
                    except AttributeError:
 
1155
                        pass
 
1156
                # Is this a D-Bus interface?
 
1157
                elif getattr(attribute, "_dbus_is_interface", False):
 
1158
                    # Create a new, but exactly alike, function
 
1159
                    # object.  Decorate it to be a new D-Bus interface
 
1160
                    # with the alternate D-Bus interface name.  Add it
 
1161
                    # to the class.
 
1162
                    attr[attrname] = (dbus_interface_annotations
 
1163
                                      (alt_interface)
 
1164
                                      (types.FunctionType
 
1165
                                       (attribute.func_code,
 
1166
                                        attribute.func_globals,
 
1167
                                        attribute.func_name,
 
1168
                                        attribute.func_defaults,
 
1169
                                        attribute.func_closure)))
 
1170
            if deprecate:
 
1171
                # Deprecate all alternate interfaces
 
1172
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1173
                for interface_name in interface_names:
 
1174
                    @dbus_interface_annotations(interface_name)
 
1175
                    def func(self):
 
1176
                        return { "org.freedesktop.DBus.Deprecated":
 
1177
                                     "true" }
 
1178
                    # Find an unused name
 
1179
                    for aname in (iname.format(i)
 
1180
                                  for i in itertools.count()):
 
1181
                        if aname not in attr:
 
1182
                            attr[aname] = func
 
1183
                            break
 
1184
            if interface_names:
 
1185
                # Replace the class with a new subclass of it with
 
1186
                # methods, signals, etc. as created above.
 
1187
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1188
                           (cls,), attr)
 
1189
        return cls
 
1190
    return wrapper
 
1191
 
 
1192
 
 
1193
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1194
                                "se.bsnet.fukt.Mandos"})
760
1195
class ClientDBus(Client, DBusObjectWithProperties):
761
1196
    """A Client class using D-Bus
762
1197
    
771
1206
    # dbus.service.Object doesn't use super(), so we can't either.
772
1207
    
773
1208
    def __init__(self, bus = None, *args, **kwargs):
774
 
        self._approvals_pending = 0
775
1209
        self.bus = bus
776
1210
        Client.__init__(self, *args, **kwargs)
777
1211
        # Only now, when this client is initialized, can it show up on
783
1217
                                 ("/clients/" + client_object_name))
784
1218
        DBusObjectWithProperties.__init__(self, self.bus,
785
1219
                                          self.dbus_object_path)
786
 
        
 
1220
    
787
1221
    def notifychangeproperty(transform_func,
788
1222
                             dbus_name, type_func=lambda x: x,
789
1223
                             variant_level=1):
790
 
        """ Modify a variable so that its a property that announce its
791
 
        changes to DBus.
792
 
        transform_fun: Function that takes a value and transform it to
793
 
                       DBus type.
794
 
        dbus_name: DBus name of the variable
 
1224
        """ Modify a variable so that it's a property which announces
 
1225
        its changes to DBus.
 
1226
        
 
1227
        transform_fun: Function that takes a value and a variant_level
 
1228
                       and transforms it to a D-Bus type.
 
1229
        dbus_name: D-Bus name of the variable
795
1230
        type_func: Function that transform the value before sending it
796
 
                   to DBus
797
 
        variant_level: DBus variant level. default: 1
 
1231
                   to the D-Bus.  Default: no transform
 
1232
        variant_level: D-Bus variant level.  Default: 1
798
1233
        """
799
 
        real_value = [None,]
 
1234
        attrname = "_{0}".format(dbus_name)
800
1235
        def setter(self, value):
801
 
            old_value = real_value[0]
802
 
            real_value[0] = value
803
1236
            if hasattr(self, "dbus_object_path"):
804
 
                if type_func(old_value) != type_func(real_value[0]):
805
 
                    dbus_value = transform_func(type_func(real_value[0]),
806
 
                                                variant_level)
 
1237
                if (not hasattr(self, attrname) or
 
1238
                    type_func(getattr(self, attrname, None))
 
1239
                    != type_func(value)):
 
1240
                    dbus_value = transform_func(type_func(value),
 
1241
                                                variant_level
 
1242
                                                =variant_level)
807
1243
                    self.PropertyChanged(dbus.String(dbus_name),
808
1244
                                         dbus_value)
809
 
 
810
 
        return property(lambda self: real_value[0], setter)
811
 
 
812
 
 
 
1245
            setattr(self, attrname, value)
 
1246
        
 
1247
        return property(lambda self: getattr(self, attrname), setter)
 
1248
    
813
1249
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
814
1250
    approvals_pending = notifychangeproperty(dbus.Boolean,
815
1251
                                             "ApprovalPending",
818
1254
    last_enabled = notifychangeproperty(datetime_to_dbus,
819
1255
                                        "LastEnabled")
820
1256
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
821
 
                                   type_func = lambda checker: checker is not None)
 
1257
                                   type_func = lambda checker:
 
1258
                                       checker is not None)
822
1259
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
823
1260
                                           "LastCheckedOK")
824
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
825
 
                                                 "LastApprovalRequest")
 
1261
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1262
                                               "LastCheckerStatus")
 
1263
    last_approval_request = notifychangeproperty(
 
1264
        datetime_to_dbus, "LastApprovalRequest")
826
1265
    approved_by_default = notifychangeproperty(dbus.Boolean,
827
1266
                                               "ApprovedByDefault")
828
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
 
                                          type_func = _timedelta_to_milliseconds)
830
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
 
                                             type_func = _timedelta_to_milliseconds)
 
1267
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1268
                                          "ApprovalDelay",
 
1269
                                          type_func =
 
1270
                                          timedelta_to_milliseconds)
 
1271
    approval_duration = notifychangeproperty(
 
1272
        dbus.UInt64, "ApprovalDuration",
 
1273
        type_func = timedelta_to_milliseconds)
832
1274
    host = notifychangeproperty(dbus.String, "Host")
833
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
 
                                   type_func = _timedelta_to_milliseconds)
835
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
 
                                            type_func = _timedelta_to_milliseconds)
837
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
838
 
                                    type_func = _timedelta_to_milliseconds)
 
1275
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1276
                                   type_func =
 
1277
                                   timedelta_to_milliseconds)
 
1278
    extended_timeout = notifychangeproperty(
 
1279
        dbus.UInt64, "ExtendedTimeout",
 
1280
        type_func = timedelta_to_milliseconds)
 
1281
    interval = notifychangeproperty(dbus.UInt64,
 
1282
                                    "Interval",
 
1283
                                    type_func =
 
1284
                                    timedelta_to_milliseconds)
839
1285
    checker_command = notifychangeproperty(dbus.String, "Checker")
840
1286
    
841
1287
    del notifychangeproperty
867
1313
        
868
1314
        return Client.checker_callback(self, pid, condition, command,
869
1315
                                       *args, **kwargs)
870
 
 
 
1316
    
871
1317
    def start_checker(self, *args, **kwargs):
872
1318
        old_checker = self.checker
873
1319
        if self.checker is not None:
883
1329
        return r
884
1330
    
885
1331
    def _reset_approved(self):
886
 
        self._approved = None
 
1332
        self.approved = None
887
1333
        return False
888
1334
    
889
1335
    def approve(self, value=True):
890
1336
        self.send_changedstate()
891
 
        self._approved = value
892
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1337
        self.approved = value
 
1338
        gobject.timeout_add(timedelta_to_milliseconds
893
1339
                            (self.approval_duration),
894
1340
                            self._reset_approved)
895
1341
    
896
 
    
897
1342
    ## D-Bus methods, signals & properties
898
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1343
    _interface = "se.recompile.Mandos.Client"
 
1344
    
 
1345
    ## Interfaces
 
1346
    
 
1347
    @dbus_interface_annotations(_interface)
 
1348
    def _foo(self):
 
1349
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1350
                     "false"}
899
1351
    
900
1352
    ## Signals
901
1353
    
1001
1453
                           access="readwrite")
1002
1454
    def ApprovalDuration_dbus_property(self, value=None):
1003
1455
        if value is None:       # get
1004
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1456
            return dbus.UInt64(timedelta_to_milliseconds(
1005
1457
                    self.approval_duration))
1006
1458
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1007
1459
    
1021
1473
    def Host_dbus_property(self, value=None):
1022
1474
        if value is None:       # get
1023
1475
            return dbus.String(self.host)
1024
 
        self.host = value
 
1476
        self.host = unicode(value)
1025
1477
    
1026
1478
    # Created - property
1027
1479
    @dbus_service_property(_interface, signature="s", access="read")
1028
1480
    def Created_dbus_property(self):
1029
 
        return dbus.String(datetime_to_dbus(self.created))
 
1481
        return datetime_to_dbus(self.created)
1030
1482
    
1031
1483
    # LastEnabled - property
1032
1484
    @dbus_service_property(_interface, signature="s", access="read")
1053
1505
            return
1054
1506
        return datetime_to_dbus(self.last_checked_ok)
1055
1507
    
 
1508
    # LastCheckerStatus - property
 
1509
    @dbus_service_property(_interface, signature="n",
 
1510
                           access="read")
 
1511
    def LastCheckerStatus_dbus_property(self):
 
1512
        return dbus.Int16(self.last_checker_status)
 
1513
    
1056
1514
    # Expires - property
1057
1515
    @dbus_service_property(_interface, signature="s", access="read")
1058
1516
    def Expires_dbus_property(self):
1070
1528
        if value is None:       # get
1071
1529
            return dbus.UInt64(self.timeout_milliseconds())
1072
1530
        self.timeout = datetime.timedelta(0, 0, 0, value)
1073
 
        if getattr(self, "disable_initiator_tag", None) is None:
1074
 
            return
1075
1531
        # Reschedule timeout
1076
 
        gobject.source_remove(self.disable_initiator_tag)
1077
 
        self.disable_initiator_tag = None
1078
 
        self.expires = None
1079
 
        time_to_die = (self.
1080
 
                       _timedelta_to_milliseconds((self
1081
 
                                                   .last_checked_ok
1082
 
                                                   + self.timeout)
1083
 
                                                  - datetime.datetime
1084
 
                                                  .utcnow()))
1085
 
        if time_to_die <= 0:
1086
 
            # The timeout has passed
1087
 
            self.disable()
1088
 
        else:
1089
 
            self.expires = (datetime.datetime.utcnow()
1090
 
                            + datetime.timedelta(milliseconds = time_to_die))
1091
 
            self.disable_initiator_tag = (gobject.timeout_add
1092
 
                                          (time_to_die, self.disable))
1093
 
 
 
1532
        if self.enabled:
 
1533
            now = datetime.datetime.utcnow()
 
1534
            time_to_die = timedelta_to_milliseconds(
 
1535
                (self.last_checked_ok + self.timeout) - now)
 
1536
            if time_to_die <= 0:
 
1537
                # The timeout has passed
 
1538
                self.disable()
 
1539
            else:
 
1540
                self.expires = (now +
 
1541
                                datetime.timedelta(milliseconds =
 
1542
                                                   time_to_die))
 
1543
                if (getattr(self, "disable_initiator_tag", None)
 
1544
                    is None):
 
1545
                    return
 
1546
                gobject.source_remove(self.disable_initiator_tag)
 
1547
                self.disable_initiator_tag = (gobject.timeout_add
 
1548
                                              (time_to_die,
 
1549
                                               self.disable))
 
1550
    
1094
1551
    # ExtendedTimeout - property
1095
1552
    @dbus_service_property(_interface, signature="t",
1096
1553
                           access="readwrite")
1098
1555
        if value is None:       # get
1099
1556
            return dbus.UInt64(self.extended_timeout_milliseconds())
1100
1557
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1101
 
 
 
1558
    
1102
1559
    # Interval - property
1103
1560
    @dbus_service_property(_interface, signature="t",
1104
1561
                           access="readwrite")
1108
1565
        self.interval = datetime.timedelta(0, 0, 0, value)
1109
1566
        if getattr(self, "checker_initiator_tag", None) is None:
1110
1567
            return
1111
 
        # Reschedule checker run
1112
 
        gobject.source_remove(self.checker_initiator_tag)
1113
 
        self.checker_initiator_tag = (gobject.timeout_add
1114
 
                                      (value, self.start_checker))
1115
 
        self.start_checker()    # Start one now, too
1116
 
 
 
1568
        if self.enabled:
 
1569
            # Reschedule checker run
 
1570
            gobject.source_remove(self.checker_initiator_tag)
 
1571
            self.checker_initiator_tag = (gobject.timeout_add
 
1572
                                          (value, self.start_checker))
 
1573
            self.start_checker()    # Start one now, too
 
1574
    
1117
1575
    # Checker - property
1118
1576
    @dbus_service_property(_interface, signature="s",
1119
1577
                           access="readwrite")
1120
1578
    def Checker_dbus_property(self, value=None):
1121
1579
        if value is None:       # get
1122
1580
            return dbus.String(self.checker_command)
1123
 
        self.checker_command = value
 
1581
        self.checker_command = unicode(value)
1124
1582
    
1125
1583
    # CheckerRunning - property
1126
1584
    @dbus_service_property(_interface, signature="b",
1153
1611
        self._pipe.send(('init', fpr, address))
1154
1612
        if not self._pipe.recv():
1155
1613
            raise KeyError()
1156
 
 
 
1614
    
1157
1615
    def __getattribute__(self, name):
1158
 
        if(name == '_pipe'):
 
1616
        if name == '_pipe':
1159
1617
            return super(ProxyClient, self).__getattribute__(name)
1160
1618
        self._pipe.send(('getattr', name))
1161
1619
        data = self._pipe.recv()
1166
1624
                self._pipe.send(('funcall', name, args, kwargs))
1167
1625
                return self._pipe.recv()[1]
1168
1626
            return func
1169
 
 
 
1627
    
1170
1628
    def __setattr__(self, name, value):
1171
 
        if(name == '_pipe'):
 
1629
        if name == '_pipe':
1172
1630
            return super(ProxyClient, self).__setattr__(name, value)
1173
1631
        self._pipe.send(('setattr', name, value))
1174
1632
 
1185
1643
                        unicode(self.client_address))
1186
1644
            logger.debug("Pipe FD: %d",
1187
1645
                         self.server.child_pipe.fileno())
1188
 
 
 
1646
            
1189
1647
            session = (gnutls.connection
1190
1648
                       .ClientSession(self.request,
1191
1649
                                      gnutls.connection
1192
1650
                                      .X509Credentials()))
1193
 
 
 
1651
            
1194
1652
            # Note: gnutls.connection.X509Credentials is really a
1195
1653
            # generic GnuTLS certificate credentials object so long as
1196
1654
            # no X.509 keys are added to it.  Therefore, we can use it
1197
1655
            # here despite using OpenPGP certificates.
1198
 
 
 
1656
            
1199
1657
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
1658
            #                      "+AES-256-CBC", "+SHA1",
1201
1659
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1207
1665
            (gnutls.library.functions
1208
1666
             .gnutls_priority_set_direct(session._c_object,
1209
1667
                                         priority, None))
1210
 
 
 
1668
            
1211
1669
            # Start communication using the Mandos protocol
1212
1670
            # Get protocol number
1213
1671
            line = self.request.makefile().readline()
1218
1676
            except (ValueError, IndexError, RuntimeError) as error:
1219
1677
                logger.error("Unknown protocol version: %s", error)
1220
1678
                return
1221
 
 
 
1679
            
1222
1680
            # Start GnuTLS connection
1223
1681
            try:
1224
1682
                session.handshake()
1228
1686
                # established.  Just abandon the request.
1229
1687
                return
1230
1688
            logger.debug("Handshake succeeded")
1231
 
 
 
1689
            
1232
1690
            approval_required = False
1233
1691
            try:
1234
1692
                try:
1239
1697
                    logger.warning("Bad certificate: %s", error)
1240
1698
                    return
1241
1699
                logger.debug("Fingerprint: %s", fpr)
1242
 
 
 
1700
                
1243
1701
                try:
1244
1702
                    client = ProxyClient(child_pipe, fpr,
1245
1703
                                         self.client_address)
1257
1715
                                       client.name)
1258
1716
                        if self.server.use_dbus:
1259
1717
                            # Emit D-Bus signal
1260
 
                            client.Rejected("Disabled")                    
 
1718
                            client.Rejected("Disabled")
1261
1719
                        return
1262
1720
                    
1263
 
                    if client._approved or not client.approval_delay:
 
1721
                    if client.approved or not client.approval_delay:
1264
1722
                        #We are approved or approval is disabled
1265
1723
                        break
1266
 
                    elif client._approved is None:
 
1724
                    elif client.approved is None:
1267
1725
                        logger.info("Client %s needs approval",
1268
1726
                                    client.name)
1269
1727
                        if self.server.use_dbus:
1280
1738
                        return
1281
1739
                    
1282
1740
                    #wait until timeout or approved
1283
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1284
1741
                    time = datetime.datetime.now()
1285
1742
                    client.changedstate.acquire()
1286
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1743
                    (client.changedstate.wait
 
1744
                     (float(client.timedelta_to_milliseconds(delay)
 
1745
                            / 1000)))
1287
1746
                    client.changedstate.release()
1288
1747
                    time2 = datetime.datetime.now()
1289
1748
                    if (time2 - time) >= delay:
1305
1764
                    try:
1306
1765
                        sent = session.send(client.secret[sent_size:])
1307
1766
                    except gnutls.errors.GNUTLSError as error:
1308
 
                        logger.warning("gnutls send failed")
 
1767
                        logger.warning("gnutls send failed",
 
1768
                                       exc_info=error)
1309
1769
                        return
1310
1770
                    logger.debug("Sent: %d, remaining: %d",
1311
1771
                                 sent, len(client.secret)
1312
1772
                                 - (sent_size + sent))
1313
1773
                    sent_size += sent
1314
 
 
 
1774
                
1315
1775
                logger.info("Sending secret to %s", client.name)
1316
 
                # bump the timeout as if seen
1317
 
                client.checked_ok(client.extended_timeout)
 
1776
                # bump the timeout using extended_timeout
 
1777
                client.bump_timeout(client.extended_timeout)
1318
1778
                if self.server.use_dbus:
1319
1779
                    # Emit D-Bus signal
1320
1780
                    client.GotSecret()
1325
1785
                try:
1326
1786
                    session.bye()
1327
1787
                except gnutls.errors.GNUTLSError as error:
1328
 
                    logger.warning("GnuTLS bye failed")
 
1788
                    logger.warning("GnuTLS bye failed",
 
1789
                                   exc_info=error)
1329
1790
    
1330
1791
    @staticmethod
1331
1792
    def peer_certificate(session):
1387
1848
        # Convert the buffer to a Python bytestring
1388
1849
        fpr = ctypes.string_at(buf, buf_len.value)
1389
1850
        # Convert the bytestring to hexadecimal notation
1390
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1851
        hex_fpr = binascii.hexlify(fpr).upper()
1391
1852
        return hex_fpr
1392
1853
 
1393
1854
 
1396
1857
    def sub_process_main(self, request, address):
1397
1858
        try:
1398
1859
            self.finish_request(request, address)
1399
 
        except:
 
1860
        except Exception:
1400
1861
            self.handle_error(request, address)
1401
1862
        self.close_request(request)
1402
 
            
 
1863
    
1403
1864
    def process_request(self, request, address):
1404
1865
        """Start a new process to process the request."""
1405
 
        multiprocessing.Process(target = self.sub_process_main,
1406
 
                                args = (request, address)).start()
 
1866
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1867
                                       args = (request,
 
1868
                                               address))
 
1869
        proc.start()
 
1870
        return proc
 
1871
 
1407
1872
 
1408
1873
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1409
1874
    """ adds a pipe to the MixIn """
1413
1878
        This function creates a new pipe in self.pipe
1414
1879
        """
1415
1880
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1416
 
 
1417
 
        super(MultiprocessingMixInWithPipe,
1418
 
              self).process_request(request, client_address)
 
1881
        
 
1882
        proc = MultiprocessingMixIn.process_request(self, request,
 
1883
                                                    client_address)
1419
1884
        self.child_pipe.close()
1420
 
        self.add_pipe(parent_pipe)
1421
 
 
1422
 
    def add_pipe(self, parent_pipe):
 
1885
        self.add_pipe(parent_pipe, proc)
 
1886
    
 
1887
    def add_pipe(self, parent_pipe, proc):
1423
1888
        """Dummy function; override as necessary"""
1424
1889
        raise NotImplementedError
1425
1890
 
 
1891
 
1426
1892
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1427
1893
                     socketserver.TCPServer, object):
1428
1894
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1502
1968
        self.enabled = False
1503
1969
        self.clients = clients
1504
1970
        if self.clients is None:
1505
 
            self.clients = set()
 
1971
            self.clients = {}
1506
1972
        self.use_dbus = use_dbus
1507
1973
        self.gnutls_priority = gnutls_priority
1508
1974
        IPv6_TCPServer.__init__(self, server_address,
1512
1978
    def server_activate(self):
1513
1979
        if self.enabled:
1514
1980
            return socketserver.TCPServer.server_activate(self)
 
1981
    
1515
1982
    def enable(self):
1516
1983
        self.enabled = True
1517
 
    def add_pipe(self, parent_pipe):
 
1984
    
 
1985
    def add_pipe(self, parent_pipe, proc):
1518
1986
        # Call "handle_ipc" for both data and EOF events
1519
1987
        gobject.io_add_watch(parent_pipe.fileno(),
1520
1988
                             gobject.IO_IN | gobject.IO_HUP,
1521
1989
                             functools.partial(self.handle_ipc,
1522
 
                                               parent_pipe = parent_pipe))
1523
 
        
 
1990
                                               parent_pipe =
 
1991
                                               parent_pipe,
 
1992
                                               proc = proc))
 
1993
    
1524
1994
    def handle_ipc(self, source, condition, parent_pipe=None,
1525
 
                   client_object=None):
 
1995
                   proc = None, client_object=None):
1526
1996
        condition_names = {
1527
1997
            gobject.IO_IN: "IN",   # There is data to read.
1528
1998
            gobject.IO_OUT: "OUT", # Data can be written (without
1537
2007
                                       for cond, name in
1538
2008
                                       condition_names.iteritems()
1539
2009
                                       if cond & condition)
1540
 
        # error or the other end of multiprocessing.Pipe has closed
 
2010
        # error, or the other end of multiprocessing.Pipe has closed
1541
2011
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2012
            # Wait for other process to exit
 
2013
            proc.join()
1542
2014
            return False
1543
2015
        
1544
2016
        # Read a request from the child
1549
2021
            fpr = request[1]
1550
2022
            address = request[2]
1551
2023
            
1552
 
            for c in self.clients:
 
2024
            for c in self.clients.itervalues():
1553
2025
                if c.fingerprint == fpr:
1554
2026
                    client = c
1555
2027
                    break
1558
2030
                            "dress: %s", fpr, address)
1559
2031
                if self.use_dbus:
1560
2032
                    # Emit D-Bus signal
1561
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
2033
                    mandos_dbus_service.ClientNotFound(fpr,
 
2034
                                                       address[0])
1562
2035
                parent_pipe.send(False)
1563
2036
                return False
1564
2037
            
1565
2038
            gobject.io_add_watch(parent_pipe.fileno(),
1566
2039
                                 gobject.IO_IN | gobject.IO_HUP,
1567
2040
                                 functools.partial(self.handle_ipc,
1568
 
                                                   parent_pipe = parent_pipe,
1569
 
                                                   client_object = client))
 
2041
                                                   parent_pipe =
 
2042
                                                   parent_pipe,
 
2043
                                                   proc = proc,
 
2044
                                                   client_object =
 
2045
                                                   client))
1570
2046
            parent_pipe.send(True)
1571
 
            # remove the old hook in favor of the new above hook on same fileno
 
2047
            # remove the old hook in favor of the new above hook on
 
2048
            # same fileno
1572
2049
            return False
1573
2050
        if command == 'funcall':
1574
2051
            funcname = request[1]
1575
2052
            args = request[2]
1576
2053
            kwargs = request[3]
1577
2054
            
1578
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1579
 
 
 
2055
            parent_pipe.send(('data', getattr(client_object,
 
2056
                                              funcname)(*args,
 
2057
                                                         **kwargs)))
 
2058
        
1580
2059
        if command == 'getattr':
1581
2060
            attrname = request[1]
1582
2061
            if callable(client_object.__getattribute__(attrname)):
1583
2062
                parent_pipe.send(('function',))
1584
2063
            else:
1585
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
2064
                parent_pipe.send(('data', client_object
 
2065
                                  .__getattribute__(attrname)))
1586
2066
        
1587
2067
        if command == 'setattr':
1588
2068
            attrname = request[1]
1589
2069
            value = request[2]
1590
2070
            setattr(client_object, attrname, value)
1591
 
 
 
2071
        
1592
2072
        return True
1593
2073
 
1594
2074
 
1624
2104
            elif suffix == "w":
1625
2105
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1626
2106
            else:
1627
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2107
                raise ValueError("Unknown suffix {0!r}"
 
2108
                                 .format(suffix))
1628
2109
        except (ValueError, IndexError) as e:
1629
2110
            raise ValueError(*(e.args))
1630
2111
        timevalue += delta
1631
2112
    return timevalue
1632
2113
 
1633
2114
 
1634
 
def if_nametoindex(interface):
1635
 
    """Call the C function if_nametoindex(), or equivalent
1636
 
    
1637
 
    Note: This function cannot accept a unicode string."""
1638
 
    global if_nametoindex
1639
 
    try:
1640
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1641
 
                          (ctypes.util.find_library("c"))
1642
 
                          .if_nametoindex)
1643
 
    except (OSError, AttributeError):
1644
 
        logger.warning("Doing if_nametoindex the hard way")
1645
 
        def if_nametoindex(interface):
1646
 
            "Get an interface index the hard way, i.e. using fcntl()"
1647
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1648
 
            with contextlib.closing(socket.socket()) as s:
1649
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1650
 
                                    struct.pack(str("16s16x"),
1651
 
                                                interface))
1652
 
            interface_index = struct.unpack(str("I"),
1653
 
                                            ifreq[16:20])[0]
1654
 
            return interface_index
1655
 
    return if_nametoindex(interface)
1656
 
 
1657
 
 
1658
2115
def daemon(nochdir = False, noclose = False):
1659
2116
    """See daemon(3).  Standard BSD Unix function.
1660
2117
    
1668
2125
        sys.exit()
1669
2126
    if not noclose:
1670
2127
        # Close all standard open file descriptors
1671
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2128
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1672
2129
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1673
2130
            raise OSError(errno.ENODEV,
1674
 
                          "%s not a character device"
1675
 
                          % os.path.devnull)
 
2131
                          "{0} not a character device"
 
2132
                          .format(os.devnull))
1676
2133
        os.dup2(null, sys.stdin.fileno())
1677
2134
        os.dup2(null, sys.stdout.fileno())
1678
2135
        os.dup2(null, sys.stderr.fileno())
1687
2144
    
1688
2145
    parser = argparse.ArgumentParser()
1689
2146
    parser.add_argument("-v", "--version", action="version",
1690
 
                        version = "%%(prog)s %s" % version,
 
2147
                        version = "%(prog)s {0}".format(version),
1691
2148
                        help="show version number and exit")
1692
2149
    parser.add_argument("-i", "--interface", metavar="IF",
1693
2150
                        help="Bind to interface IF")
1715
2172
                        " system bus interface")
1716
2173
    parser.add_argument("--no-ipv6", action="store_false",
1717
2174
                        dest="use_ipv6", help="Do not use IPv6")
 
2175
    parser.add_argument("--no-restore", action="store_false",
 
2176
                        dest="restore", help="Do not restore stored"
 
2177
                        " state")
 
2178
    parser.add_argument("--statedir", metavar="DIR",
 
2179
                        help="Directory to save/restore state in")
 
2180
    
1718
2181
    options = parser.parse_args()
1719
2182
    
1720
2183
    if options.check:
1733
2196
                        "use_dbus": "True",
1734
2197
                        "use_ipv6": "True",
1735
2198
                        "debuglevel": "",
 
2199
                        "restore": "True",
 
2200
                        "statedir": "/var/lib/mandos"
1736
2201
                        }
1737
2202
    
1738
2203
    # Parse config file for server-global settings
1755
2220
    # options, if set.
1756
2221
    for option in ("interface", "address", "port", "debug",
1757
2222
                   "priority", "servicename", "configdir",
1758
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2223
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2224
                   "statedir"):
1759
2225
        value = getattr(options, option)
1760
2226
        if value is not None:
1761
2227
            server_settings[option] = value
1773
2239
    debuglevel = server_settings["debuglevel"]
1774
2240
    use_dbus = server_settings["use_dbus"]
1775
2241
    use_ipv6 = server_settings["use_ipv6"]
1776
 
 
 
2242
    stored_state_path = os.path.join(server_settings["statedir"],
 
2243
                                     stored_state_file)
 
2244
    
 
2245
    if debug:
 
2246
        initlogger(debug, logging.DEBUG)
 
2247
    else:
 
2248
        if not debuglevel:
 
2249
            initlogger(debug)
 
2250
        else:
 
2251
            level = getattr(logging, debuglevel.upper())
 
2252
            initlogger(debug, level)
 
2253
    
1777
2254
    if server_settings["servicename"] != "Mandos":
1778
2255
        syslogger.setFormatter(logging.Formatter
1779
 
                               ('Mandos (%s) [%%(process)d]:'
1780
 
                                ' %%(levelname)s: %%(message)s'
1781
 
                                % server_settings["servicename"]))
 
2256
                               ('Mandos ({0}) [%(process)d]:'
 
2257
                                ' %(levelname)s: %(message)s'
 
2258
                                .format(server_settings
 
2259
                                        ["servicename"])))
1782
2260
    
1783
2261
    # Parse config file with clients
1784
 
    client_defaults = { "timeout": "5m",
1785
 
                        "extended_timeout": "15m",
1786
 
                        "interval": "2m",
1787
 
                        "checker": "fping -q -- %%(host)s",
1788
 
                        "host": "",
1789
 
                        "approval_delay": "0s",
1790
 
                        "approval_duration": "1s",
1791
 
                        }
1792
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2262
    client_config = configparser.SafeConfigParser(Client
 
2263
                                                  .client_defaults)
1793
2264
    client_config.read(os.path.join(server_settings["configdir"],
1794
2265
                                    "clients.conf"))
1795
2266
    
1809
2280
        pidfilename = "/var/run/mandos.pid"
1810
2281
        try:
1811
2282
            pidfile = open(pidfilename, "w")
1812
 
        except IOError:
1813
 
            logger.error("Could not open file %r", pidfilename)
 
2283
        except IOError as e:
 
2284
            logger.error("Could not open file %r", pidfilename,
 
2285
                         exc_info=e)
1814
2286
    
1815
 
    try:
1816
 
        uid = pwd.getpwnam("_mandos").pw_uid
1817
 
        gid = pwd.getpwnam("_mandos").pw_gid
1818
 
    except KeyError:
 
2287
    for name in ("_mandos", "mandos", "nobody"):
1819
2288
        try:
1820
 
            uid = pwd.getpwnam("mandos").pw_uid
1821
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2289
            uid = pwd.getpwnam(name).pw_uid
 
2290
            gid = pwd.getpwnam(name).pw_gid
 
2291
            break
1822
2292
        except KeyError:
1823
 
            try:
1824
 
                uid = pwd.getpwnam("nobody").pw_uid
1825
 
                gid = pwd.getpwnam("nobody").pw_gid
1826
 
            except KeyError:
1827
 
                uid = 65534
1828
 
                gid = 65534
 
2293
            continue
 
2294
    else:
 
2295
        uid = 65534
 
2296
        gid = 65534
1829
2297
    try:
1830
2298
        os.setgid(gid)
1831
2299
        os.setuid(uid)
1833
2301
        if error[0] != errno.EPERM:
1834
2302
            raise error
1835
2303
    
1836
 
    if not debug and not debuglevel:
1837
 
        syslogger.setLevel(logging.WARNING)
1838
 
        console.setLevel(logging.WARNING)
1839
 
    if debuglevel:
1840
 
        level = getattr(logging, debuglevel.upper())
1841
 
        syslogger.setLevel(level)
1842
 
        console.setLevel(level)
1843
 
 
1844
2304
    if debug:
1845
2305
        # Enable all possible GnuTLS debugging
1846
2306
        
1856
2316
         .gnutls_global_set_log_function(debug_gnutls))
1857
2317
        
1858
2318
        # Redirect stdin so all checkers get /dev/null
1859
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2319
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1860
2320
        os.dup2(null, sys.stdin.fileno())
1861
2321
        if null > 2:
1862
2322
            os.close(null)
1863
 
    else:
1864
 
        # No console logging
1865
 
        logger.removeHandler(console)
1866
2323
    
1867
2324
    # Need to fork before connecting to D-Bus
1868
2325
    if not debug:
1869
2326
        # Close all input and output, do double fork, etc.
1870
2327
        daemon()
1871
2328
    
 
2329
    gobject.threads_init()
 
2330
    
1872
2331
    global main_loop
1873
2332
    # From the Avahi example code
1874
 
    DBusGMainLoop(set_as_default=True )
 
2333
    DBusGMainLoop(set_as_default=True)
1875
2334
    main_loop = gobject.MainLoop()
1876
2335
    bus = dbus.SystemBus()
1877
2336
    # End of Avahi example code
1878
2337
    if use_dbus:
1879
2338
        try:
1880
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2339
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1881
2340
                                            bus, do_not_queue=True)
 
2341
            old_bus_name = (dbus.service.BusName
 
2342
                            ("se.bsnet.fukt.Mandos", bus,
 
2343
                             do_not_queue=True))
1882
2344
        except dbus.exceptions.NameExistsException as e:
1883
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2345
            logger.error("Disabling D-Bus:", exc_info=e)
1884
2346
            use_dbus = False
1885
2347
            server_settings["use_dbus"] = False
1886
2348
            tcp_server.use_dbus = False
1887
2349
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1888
 
    service = AvahiService(name = server_settings["servicename"],
1889
 
                           servicetype = "_mandos._tcp",
1890
 
                           protocol = protocol, bus = bus)
 
2350
    service = AvahiServiceToSyslog(name =
 
2351
                                   server_settings["servicename"],
 
2352
                                   servicetype = "_mandos._tcp",
 
2353
                                   protocol = protocol, bus = bus)
1891
2354
    if server_settings["interface"]:
1892
2355
        service.interface = (if_nametoindex
1893
2356
                             (str(server_settings["interface"])))
1898
2361
    client_class = Client
1899
2362
    if use_dbus:
1900
2363
        client_class = functools.partial(ClientDBus, bus = bus)
1901
 
    def client_config_items(config, section):
1902
 
        special_settings = {
1903
 
            "approved_by_default":
1904
 
                lambda: config.getboolean(section,
1905
 
                                          "approved_by_default"),
1906
 
            }
1907
 
        for name, value in config.items(section):
 
2364
    
 
2365
    client_settings = Client.config_parser(client_config)
 
2366
    old_client_settings = {}
 
2367
    clients_data = {}
 
2368
    
 
2369
    # Get client data and settings from last running state.
 
2370
    if server_settings["restore"]:
 
2371
        try:
 
2372
            with open(stored_state_path, "rb") as stored_state:
 
2373
                clients_data, old_client_settings = (pickle.load
 
2374
                                                     (stored_state))
 
2375
            os.remove(stored_state_path)
 
2376
        except IOError as e:
 
2377
            if e.errno == errno.ENOENT:
 
2378
                logger.warning("Could not load persistent state: {0}"
 
2379
                                .format(os.strerror(e.errno)))
 
2380
            else:
 
2381
                logger.critical("Could not load persistent state:",
 
2382
                                exc_info=e)
 
2383
                raise
 
2384
        except EOFError as e:
 
2385
            logger.warning("Could not load persistent state: "
 
2386
                           "EOFError:", exc_info=e)
 
2387
    
 
2388
    with PGPEngine() as pgp:
 
2389
        for client_name, client in clients_data.iteritems():
 
2390
            # Decide which value to use after restoring saved state.
 
2391
            # We have three different values: Old config file,
 
2392
            # new config file, and saved state.
 
2393
            # New config value takes precedence if it differs from old
 
2394
            # config value, otherwise use saved state.
 
2395
            for name, value in client_settings[client_name].items():
 
2396
                try:
 
2397
                    # For each value in new config, check if it
 
2398
                    # differs from the old config value (Except for
 
2399
                    # the "secret" attribute)
 
2400
                    if (name != "secret" and
 
2401
                        value != old_client_settings[client_name]
 
2402
                        [name]):
 
2403
                        client[name] = value
 
2404
                except KeyError:
 
2405
                    pass
 
2406
            
 
2407
            # Clients who has passed its expire date can still be
 
2408
            # enabled if its last checker was successful.  Clients
 
2409
            # whose checker succeeded before we stored its state is
 
2410
            # assumed to have successfully run all checkers during
 
2411
            # downtime.
 
2412
            if client["enabled"]:
 
2413
                if datetime.datetime.utcnow() >= client["expires"]:
 
2414
                    if not client["last_checked_ok"]:
 
2415
                        logger.warning(
 
2416
                            "disabling client {0} - Client never "
 
2417
                            "performed a successful checker"
 
2418
                            .format(client_name))
 
2419
                        client["enabled"] = False
 
2420
                    elif client["last_checker_status"] != 0:
 
2421
                        logger.warning(
 
2422
                            "disabling client {0} - Client "
 
2423
                            "last checker failed with error code {1}"
 
2424
                            .format(client_name,
 
2425
                                    client["last_checker_status"]))
 
2426
                        client["enabled"] = False
 
2427
                    else:
 
2428
                        client["expires"] = (datetime.datetime
 
2429
                                             .utcnow()
 
2430
                                             + client["timeout"])
 
2431
                        logger.debug("Last checker succeeded,"
 
2432
                                     " keeping {0} enabled"
 
2433
                                     .format(client_name))
1908
2434
            try:
1909
 
                yield (name, special_settings[name]())
1910
 
            except KeyError:
1911
 
                yield (name, value)
1912
 
    
1913
 
    tcp_server.clients.update(set(
1914
 
            client_class(name = section,
1915
 
                         config= dict(client_config_items(
1916
 
                        client_config, section)))
1917
 
            for section in client_config.sections()))
 
2435
                client["secret"] = (
 
2436
                    pgp.decrypt(client["encrypted_secret"],
 
2437
                                client_settings[client_name]
 
2438
                                ["secret"]))
 
2439
            except PGPError:
 
2440
                # If decryption fails, we use secret from new settings
 
2441
                logger.debug("Failed to decrypt {0} old secret"
 
2442
                             .format(client_name))
 
2443
                client["secret"] = (
 
2444
                    client_settings[client_name]["secret"])
 
2445
    
 
2446
    # Add/remove clients based on new changes made to config
 
2447
    for client_name in (set(old_client_settings)
 
2448
                        - set(client_settings)):
 
2449
        del clients_data[client_name]
 
2450
    for client_name in (set(client_settings)
 
2451
                        - set(old_client_settings)):
 
2452
        clients_data[client_name] = client_settings[client_name]
 
2453
    
 
2454
    # Create all client objects
 
2455
    for client_name, client in clients_data.iteritems():
 
2456
        tcp_server.clients[client_name] = client_class(
 
2457
            name = client_name, settings = client)
 
2458
    
1918
2459
    if not tcp_server.clients:
1919
2460
        logger.warning("No clients defined")
1920
 
        
 
2461
    
1921
2462
    if not debug:
1922
2463
        try:
1923
2464
            with pidfile:
1931
2472
            # "pidfile" was never created
1932
2473
            pass
1933
2474
        del pidfilename
1934
 
        
1935
2475
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1936
 
 
 
2476
    
1937
2477
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1938
2478
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1939
2479
    
1940
2480
    if use_dbus:
1941
 
        class MandosDBusService(dbus.service.Object):
 
2481
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2482
                                        "se.bsnet.fukt.Mandos"})
 
2483
        class MandosDBusService(DBusObjectWithProperties):
1942
2484
            """A D-Bus proxy object"""
1943
2485
            def __init__(self):
1944
2486
                dbus.service.Object.__init__(self, bus, "/")
1945
 
            _interface = "se.bsnet.fukt.Mandos"
 
2487
            _interface = "se.recompile.Mandos"
 
2488
            
 
2489
            @dbus_interface_annotations(_interface)
 
2490
            def _foo(self):
 
2491
                return { "org.freedesktop.DBus.Property"
 
2492
                         ".EmitsChangedSignal":
 
2493
                             "false"}
1946
2494
            
1947
2495
            @dbus.service.signal(_interface, signature="o")
1948
2496
            def ClientAdded(self, objpath):
1963
2511
            def GetAllClients(self):
1964
2512
                "D-Bus method"
1965
2513
                return dbus.Array(c.dbus_object_path
1966
 
                                  for c in tcp_server.clients)
 
2514
                                  for c in
 
2515
                                  tcp_server.clients.itervalues())
1967
2516
            
1968
2517
            @dbus.service.method(_interface,
1969
2518
                                 out_signature="a{oa{sv}}")
1971
2520
                "D-Bus method"
1972
2521
                return dbus.Dictionary(
1973
2522
                    ((c.dbus_object_path, c.GetAll(""))
1974
 
                     for c in tcp_server.clients),
 
2523
                     for c in tcp_server.clients.itervalues()),
1975
2524
                    signature="oa{sv}")
1976
2525
            
1977
2526
            @dbus.service.method(_interface, in_signature="o")
1978
2527
            def RemoveClient(self, object_path):
1979
2528
                "D-Bus method"
1980
 
                for c in tcp_server.clients:
 
2529
                for c in tcp_server.clients.itervalues():
1981
2530
                    if c.dbus_object_path == object_path:
1982
 
                        tcp_server.clients.remove(c)
 
2531
                        del tcp_server.clients[c.name]
1983
2532
                        c.remove_from_connection()
1984
2533
                        # Don't signal anything except ClientRemoved
1985
2534
                        c.disable(quiet=True)
1996
2545
        "Cleanup function; run on exit"
1997
2546
        service.cleanup()
1998
2547
        
 
2548
        multiprocessing.active_children()
 
2549
        if not (tcp_server.clients or client_settings):
 
2550
            return
 
2551
        
 
2552
        # Store client before exiting. Secrets are encrypted with key
 
2553
        # based on what config file has. If config file is
 
2554
        # removed/edited, old secret will thus be unrecovable.
 
2555
        clients = {}
 
2556
        with PGPEngine() as pgp:
 
2557
            for client in tcp_server.clients.itervalues():
 
2558
                key = client_settings[client.name]["secret"]
 
2559
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2560
                                                      key)
 
2561
                client_dict = {}
 
2562
                
 
2563
                # A list of attributes that can not be pickled
 
2564
                # + secret.
 
2565
                exclude = set(("bus", "changedstate", "secret",
 
2566
                               "checker"))
 
2567
                for name, typ in (inspect.getmembers
 
2568
                                  (dbus.service.Object)):
 
2569
                    exclude.add(name)
 
2570
                
 
2571
                client_dict["encrypted_secret"] = (client
 
2572
                                                   .encrypted_secret)
 
2573
                for attr in client.client_structure:
 
2574
                    if attr not in exclude:
 
2575
                        client_dict[attr] = getattr(client, attr)
 
2576
                
 
2577
                clients[client.name] = client_dict
 
2578
                del client_settings[client.name]["secret"]
 
2579
        
 
2580
        try:
 
2581
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2582
                                                prefix="clients-",
 
2583
                                                dir=os.path.dirname
 
2584
                                                (stored_state_path))
 
2585
            with os.fdopen(tempfd, "wb") as stored_state:
 
2586
                pickle.dump((clients, client_settings), stored_state)
 
2587
            os.rename(tempname, stored_state_path)
 
2588
        except (IOError, OSError) as e:
 
2589
            if not debug:
 
2590
                try:
 
2591
                    os.remove(tempname)
 
2592
                except NameError:
 
2593
                    pass
 
2594
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2595
                logger.warning("Could not save persistent state: {0}"
 
2596
                               .format(os.strerror(e.errno)))
 
2597
            else:
 
2598
                logger.warning("Could not save persistent state:",
 
2599
                               exc_info=e)
 
2600
                raise e
 
2601
        
 
2602
        # Delete all clients, and settings from config
1999
2603
        while tcp_server.clients:
2000
 
            client = tcp_server.clients.pop()
 
2604
            name, client = tcp_server.clients.popitem()
2001
2605
            if use_dbus:
2002
2606
                client.remove_from_connection()
2003
 
            client.disable_hook = None
2004
2607
            # Don't signal anything except ClientRemoved
2005
2608
            client.disable(quiet=True)
2006
2609
            if use_dbus:
2007
2610
                # Emit D-Bus signal
2008
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2611
                mandos_dbus_service.ClientRemoved(client
 
2612
                                                  .dbus_object_path,
2009
2613
                                                  client.name)
 
2614
        client_settings.clear()
2010
2615
    
2011
2616
    atexit.register(cleanup)
2012
2617
    
2013
 
    for client in tcp_server.clients:
 
2618
    for client in tcp_server.clients.itervalues():
2014
2619
        if use_dbus:
2015
2620
            # Emit D-Bus signal
2016
2621
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2017
 
        client.enable()
 
2622
        # Need to initiate checking of clients
 
2623
        if client.enabled:
 
2624
            client.init_checker()
2018
2625
    
2019
2626
    tcp_server.enable()
2020
2627
    tcp_server.server_activate()
2023
2630
    service.port = tcp_server.socket.getsockname()[1]
2024
2631
    if use_ipv6:
2025
2632
        logger.info("Now listening on address %r, port %d,"
2026
 
                    " flowinfo %d, scope_id %d"
2027
 
                    % tcp_server.socket.getsockname())
 
2633
                    " flowinfo %d, scope_id %d",
 
2634
                    *tcp_server.socket.getsockname())
2028
2635
    else:                       # IPv4
2029
 
        logger.info("Now listening on address %r, port %d"
2030
 
                    % tcp_server.socket.getsockname())
 
2636
        logger.info("Now listening on address %r, port %d",
 
2637
                    *tcp_server.socket.getsockname())
2031
2638
    
2032
2639
    #service.interface = tcp_server.socket.getsockname()[3]
2033
2640
    
2036
2643
        try:
2037
2644
            service.activate()
2038
2645
        except dbus.exceptions.DBusException as error:
2039
 
            logger.critical("DBusException: %s", error)
 
2646
            logger.critical("D-Bus Exception", exc_info=error)
2040
2647
            cleanup()
2041
2648
            sys.exit(1)
2042
2649
        # End of Avahi example code
2049
2656
        logger.debug("Starting main loop")
2050
2657
        main_loop.run()
2051
2658
    except AvahiError as error:
2052
 
        logger.critical("AvahiError: %s", error)
 
2659
        logger.critical("Avahi Error", exc_info=error)
2053
2660
        cleanup()
2054
2661
        sys.exit(1)
2055
2662
    except KeyboardInterrupt: