/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* Makefile (DOCS): Added "intro.8mandos".
  (intro.8mandos, intro.8mandos.xhtml): New.
* README: Replaced text with link, reference and short summary.
* intro.xml: New.
* mandos-clients.conf.xml (SEE ALSO): Added "intro(8mandos)".
* mandos-ctl.xml (SEE ALSO): - '' -
* mandos-keygen.xml (SEE ALSO): - '' -
* mandos-monitor.xml (SEE ALSO): - '' -
* mandos.conf.xml (SEE ALSO): - '' -
* mandos.xml (SEE ALSO): - '' -
* plugin-runner.xml (SEE ALSO): - '' -
* plugins.d/askpass-fifo.xml (SEE ALSO): - '' -
* plugins.d/mandos-client.xml (SEE ALSO): - '' -
* plugins.d/password-prompt.xml (SEE ALSO): - '' -
* plugins.d/plymouth.xml (SEE ALSO): - '' -
* plugins.d/splashy.xml (SEE ALSO): - '' -
* plugins.d/usplash.xml (SEE ALSO): - '' -

Show diffs side-by-side

added added

removed removed

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