/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-26 22:56:38 UTC
  • mfrom: (589.1.1 socket-option)
  • Revision ID: teddy@recompile.se-20120526225638-4hvqyrvmj0036lfn
Merge "--socket" option for server.

This is suggested by the GNU Coding Standards' Table of Long Options,
and will probably also allow socket activation (e.g. by systemd(8)).

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
66
 
import hashlib
 
68
import binascii
 
69
import tempfile
 
70
import itertools
67
71
 
68
72
import dbus
69
73
import dbus.service
74
78
import ctypes.util
75
79
import xml.dom.minidom
76
80
import inspect
77
 
import Crypto.Cipher.AES
 
81
import GnuPGInterface
78
82
 
79
83
try:
80
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
88
    except ImportError:
85
89
        SO_BINDTODEVICE = None
86
90
 
87
 
 
88
 
version = "1.4.1"
 
91
version = "1.5.4"
 
92
stored_state_file = "clients.pickle"
89
93
 
90
94
logger = logging.getLogger()
91
 
stored_state_path = "/var/lib/mandos/clients.pickle"
92
 
 
93
95
syslogger = (logging.handlers.SysLogHandler
94
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
97
              address = str("/dev/log")))
96
 
syslogger.setFormatter(logging.Formatter
97
 
                       ('Mandos [%(process)d]: %(levelname)s:'
98
 
                        ' %(message)s'))
99
 
logger.addHandler(syslogger)
100
 
 
101
 
console = logging.StreamHandler()
102
 
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
 
                                       ' [%(process)d]:'
104
 
                                       ' %(levelname)s:'
105
 
                                       ' %(message)s'))
106
 
logger.addHandler(console)
 
98
 
 
99
try:
 
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
                      (ctypes.util.find_library("c"))
 
102
                      .if_nametoindex)
 
103
except (OSError, AttributeError):
 
104
    def if_nametoindex(interface):
 
105
        "Get an interface index the hard way, i.e. using fcntl()"
 
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
107
        with contextlib.closing(socket.socket()) as s:
 
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
 
113
        return interface_index
 
114
 
 
115
 
 
116
def initlogger(debug, level=logging.WARNING):
 
117
    """init logger and add loglevel"""
 
118
    
 
119
    syslogger.setFormatter(logging.Formatter
 
120
                           ('Mandos [%(process)d]: %(levelname)s:'
 
121
                            ' %(message)s'))
 
122
    logger.addHandler(syslogger)
 
123
    
 
124
    if debug:
 
125
        console = logging.StreamHandler()
 
126
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
127
                                               ' [%(process)d]:'
 
128
                                               ' %(levelname)s:'
 
129
                                               ' %(message)s'))
 
130
        logger.addHandler(console)
 
131
    logger.setLevel(level)
 
132
 
 
133
 
 
134
class PGPError(Exception):
 
135
    """Exception if encryption/decryption fails"""
 
136
    pass
 
137
 
 
138
 
 
139
class PGPEngine(object):
 
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
 
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
144
        self.gnupg = GnuPGInterface.GnuPG()
 
145
        self.gnupg.options.meta_interactive = False
 
146
        self.gnupg.options.homedir = self.tempdir
 
147
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
148
                                              '--quiet',
 
149
                                              '--no-use-agent'])
 
150
    
 
151
    def __enter__(self):
 
152
        return self
 
153
    
 
154
    def __exit__(self, exc_type, exc_value, traceback):
 
155
        self._cleanup()
 
156
        return False
 
157
    
 
158
    def __del__(self):
 
159
        self._cleanup()
 
160
    
 
161
    def _cleanup(self):
 
162
        if self.tempdir is not None:
 
163
            # Delete contents of tempdir
 
164
            for root, dirs, files in os.walk(self.tempdir,
 
165
                                             topdown = False):
 
166
                for filename in files:
 
167
                    os.remove(os.path.join(root, filename))
 
168
                for dirname in dirs:
 
169
                    os.rmdir(os.path.join(root, dirname))
 
170
            # Remove tempdir
 
171
            os.rmdir(self.tempdir)
 
172
            self.tempdir = None
 
173
    
 
174
    def password_encode(self, password):
 
175
        # Passphrase can not be empty and can not contain newlines or
 
176
        # NUL bytes.  So we prefix it and hex encode it.
 
177
        return b"mandos" + binascii.hexlify(password)
 
178
    
 
179
    def encrypt(self, data, password):
 
180
        self.gnupg.passphrase = self.password_encode(password)
 
181
        with open(os.devnull, "w") as devnull:
 
182
            try:
 
183
                proc = self.gnupg.run(['--symmetric'],
 
184
                                      create_fhs=['stdin', 'stdout'],
 
185
                                      attach_fhs={'stderr': devnull})
 
186
                with contextlib.closing(proc.handles['stdin']) as f:
 
187
                    f.write(data)
 
188
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
                    ciphertext = f.read()
 
190
                proc.wait()
 
191
            except IOError as e:
 
192
                raise PGPError(e)
 
193
        self.gnupg.passphrase = None
 
194
        return ciphertext
 
195
    
 
196
    def decrypt(self, data, password):
 
197
        self.gnupg.passphrase = self.password_encode(password)
 
198
        with open(os.devnull, "w") as devnull:
 
199
            try:
 
200
                proc = self.gnupg.run(['--decrypt'],
 
201
                                      create_fhs=['stdin', 'stdout'],
 
202
                                      attach_fhs={'stderr': devnull})
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
 
204
                    f.write(data)
 
205
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
                    decrypted_plaintext = f.read()
 
207
                proc.wait()
 
208
            except IOError as e:
 
209
                raise PGPError(e)
 
210
        self.gnupg.passphrase = None
 
211
        return decrypted_plaintext
107
212
 
108
213
 
109
214
class AvahiError(Exception):
140
245
    server: D-Bus Server
141
246
    bus: dbus.SystemBus()
142
247
    """
 
248
    
143
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
250
                 servicetype = None, port = None, TXT = None,
145
251
                 domain = "", host = "", max_renames = 32768,
158
264
        self.server = None
159
265
        self.bus = bus
160
266
        self.entry_group_state_changed_match = None
 
267
    
161
268
    def rename(self):
162
269
        """Derived from the Avahi example code"""
163
270
        if self.rename_count >= self.max_renames:
173
280
        try:
174
281
            self.add()
175
282
        except dbus.exceptions.DBusException as error:
176
 
            logger.critical("DBusException: %s", error)
 
283
            logger.critical("D-Bus Exception", exc_info=error)
177
284
            self.cleanup()
178
285
            os._exit(1)
179
286
        self.rename_count += 1
 
287
    
180
288
    def remove(self):
181
289
        """Derived from the Avahi example code"""
182
290
        if self.entry_group_state_changed_match is not None:
184
292
            self.entry_group_state_changed_match = None
185
293
        if self.group is not None:
186
294
            self.group.Reset()
 
295
    
187
296
    def add(self):
188
297
        """Derived from the Avahi example code"""
189
298
        self.remove()
206
315
            dbus.UInt16(self.port),
207
316
            avahi.string_array_to_txt_array(self.TXT))
208
317
        self.group.Commit()
 
318
    
209
319
    def entry_group_state_changed(self, state, error):
210
320
        """Derived from the Avahi example code"""
211
321
        logger.debug("Avahi entry group state change: %i", state)
218
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
219
329
            logger.critical("Avahi: Error in group state changed %s",
220
330
                            unicode(error))
221
 
            raise AvahiGroupError("State changed: %s"
222
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
223
334
    def cleanup(self):
224
335
        """Derived from the Avahi example code"""
225
336
        if self.group is not None:
226
337
            try:
227
338
                self.group.Free()
228
339
            except (dbus.exceptions.UnknownMethodException,
229
 
                    dbus.exceptions.DBusException) as e:
 
340
                    dbus.exceptions.DBusException):
230
341
                pass
231
342
            self.group = None
232
343
        self.remove()
 
344
    
233
345
    def server_state_changed(self, state, error=None):
234
346
        """Derived from the Avahi example code"""
235
347
        logger.debug("Avahi server state change: %i", state)
254
366
                logger.debug("Unknown state: %r", state)
255
367
            else:
256
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
257
370
    def activate(self):
258
371
        """Derived from the Avahi example code"""
259
372
        if self.server is None:
266
379
                                 self.server_state_changed)
267
380
        self.server_state_changed(self.server.GetState())
268
381
 
 
382
 
269
383
class AvahiServiceToSyslog(AvahiService):
270
384
    def rename(self):
271
385
        """Add the new name to the syslog messages"""
272
386
        ret = AvahiService.rename(self)
273
387
        syslogger.setFormatter(logging.Formatter
274
 
                               ('Mandos (%s) [%%(process)d]:'
275
 
                                ' %%(levelname)s: %%(message)s'
276
 
                                % self.name))
 
388
                               ('Mandos ({0}) [%(process)d]:'
 
389
                                ' %(levelname)s: %(message)s'
 
390
                                .format(self.name)))
277
391
        return ret
278
392
 
279
 
def _timedelta_to_milliseconds(td):
 
393
 
 
394
def timedelta_to_milliseconds(td):
280
395
    "Convert a datetime.timedelta() to milliseconds"
281
396
    return ((td.days * 24 * 60 * 60 * 1000)
282
397
            + (td.seconds * 1000)
283
398
            + (td.microseconds // 1000))
284
 
        
 
399
 
 
400
 
285
401
class Client(object):
286
402
    """A representation of a client host served by this server.
287
403
    
288
404
    Attributes:
289
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
405
    approved:   bool(); 'None' if not yet approved/disapproved
290
406
    approval_delay: datetime.timedelta(); Time to wait for approval
291
407
    approval_duration: datetime.timedelta(); Duration of one approval
292
408
    checker:    subprocess.Popen(); a running checker process used
310
426
    interval:   datetime.timedelta(); How often to start a new checker
311
427
    last_approval_request: datetime.datetime(); (UTC) or None
312
428
    last_checked_ok: datetime.datetime(); (UTC) or None
313
 
    last_checker_status: integer between 0 and 255 reflecting exit status
314
 
                         of last checker. -1 reflect crashed checker,
315
 
                         or None.
316
 
    last_enabled: datetime.datetime(); (UTC)
 
429
    last_checker_status: integer between 0 and 255 reflecting exit
 
430
                         status of last checker. -1 reflects crashed
 
431
                         checker, -2 means no checker completed yet.
 
432
    last_enabled: datetime.datetime(); (UTC) or None
317
433
    name:       string; from the config file, used in log messages and
318
434
                        D-Bus identifiers
319
435
    secret:     bytestring; sent verbatim (over TLS) to client
320
436
    timeout:    datetime.timedelta(); How long from last_checked_ok
321
437
                                      until this client is disabled
322
 
    extended_timeout:   extra long timeout when password has been sent
 
438
    extended_timeout:   extra long timeout when secret has been sent
323
439
    runtime_expansions: Allowed attributes for runtime expansion.
324
440
    expires:    datetime.datetime(); time (UTC) when a client will be
325
441
                disabled, or None
326
442
    """
327
443
    
328
444
    runtime_expansions = ("approval_delay", "approval_duration",
329
 
                          "created", "enabled", "fingerprint",
330
 
                          "host", "interval", "last_checked_ok",
 
445
                          "created", "enabled", "expires",
 
446
                          "fingerprint", "host", "interval",
 
447
                          "last_approval_request", "last_checked_ok",
331
448
                          "last_enabled", "name", "timeout")
 
449
    client_defaults = { "timeout": "5m",
 
450
                        "extended_timeout": "15m",
 
451
                        "interval": "2m",
 
452
                        "checker": "fping -q -- %%(host)s",
 
453
                        "host": "",
 
454
                        "approval_delay": "0s",
 
455
                        "approval_duration": "1s",
 
456
                        "approved_by_default": "True",
 
457
                        "enabled": "True",
 
458
                        }
332
459
    
333
460
    def timeout_milliseconds(self):
334
461
        "Return the 'timeout' attribute in milliseconds"
335
 
        return _timedelta_to_milliseconds(self.timeout)
 
462
        return timedelta_to_milliseconds(self.timeout)
336
463
    
337
464
    def extended_timeout_milliseconds(self):
338
465
        "Return the 'extended_timeout' attribute in milliseconds"
339
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
466
        return timedelta_to_milliseconds(self.extended_timeout)
340
467
    
341
468
    def interval_milliseconds(self):
342
469
        "Return the 'interval' attribute in milliseconds"
343
 
        return _timedelta_to_milliseconds(self.interval)
 
470
        return timedelta_to_milliseconds(self.interval)
344
471
    
345
472
    def approval_delay_milliseconds(self):
346
 
        return _timedelta_to_milliseconds(self.approval_delay)
347
 
    
348
 
    def __init__(self, name = None, config=None):
349
 
        """Note: the 'checker' key in 'config' sets the
350
 
        'checker_command' attribute and *not* the 'checker'
351
 
        attribute."""
 
473
        return timedelta_to_milliseconds(self.approval_delay)
 
474
    
 
475
    @staticmethod
 
476
    def config_parser(config):
 
477
        """Construct a new dict of client settings of this form:
 
478
        { client_name: {setting_name: value, ...}, ...}
 
479
        with exceptions for any special settings as defined above.
 
480
        NOTE: Must be a pure function. Must return the same result
 
481
        value given the same arguments.
 
482
        """
 
483
        settings = {}
 
484
        for client_name in config.sections():
 
485
            section = dict(config.items(client_name))
 
486
            client = settings[client_name] = {}
 
487
            
 
488
            client["host"] = section["host"]
 
489
            # Reformat values from string types to Python types
 
490
            client["approved_by_default"] = config.getboolean(
 
491
                client_name, "approved_by_default")
 
492
            client["enabled"] = config.getboolean(client_name,
 
493
                                                  "enabled")
 
494
            
 
495
            client["fingerprint"] = (section["fingerprint"].upper()
 
496
                                     .replace(" ", ""))
 
497
            if "secret" in section:
 
498
                client["secret"] = section["secret"].decode("base64")
 
499
            elif "secfile" in section:
 
500
                with open(os.path.expanduser(os.path.expandvars
 
501
                                             (section["secfile"])),
 
502
                          "rb") as secfile:
 
503
                    client["secret"] = secfile.read()
 
504
            else:
 
505
                raise TypeError("No secret or secfile for section {0}"
 
506
                                .format(section))
 
507
            client["timeout"] = string_to_delta(section["timeout"])
 
508
            client["extended_timeout"] = string_to_delta(
 
509
                section["extended_timeout"])
 
510
            client["interval"] = string_to_delta(section["interval"])
 
511
            client["approval_delay"] = string_to_delta(
 
512
                section["approval_delay"])
 
513
            client["approval_duration"] = string_to_delta(
 
514
                section["approval_duration"])
 
515
            client["checker_command"] = section["checker"]
 
516
            client["last_approval_request"] = None
 
517
            client["last_checked_ok"] = None
 
518
            client["last_checker_status"] = -2
 
519
        
 
520
        return settings
 
521
    
 
522
    def __init__(self, settings, name = None):
352
523
        self.name = name
353
 
        if config is None:
354
 
            config = {}
 
524
        # adding all client settings
 
525
        for setting, value in settings.iteritems():
 
526
            setattr(self, setting, value)
 
527
        
 
528
        if self.enabled:
 
529
            if not hasattr(self, "last_enabled"):
 
530
                self.last_enabled = datetime.datetime.utcnow()
 
531
            if not hasattr(self, "expires"):
 
532
                self.expires = (datetime.datetime.utcnow()
 
533
                                + self.timeout)
 
534
        else:
 
535
            self.last_enabled = None
 
536
            self.expires = None
 
537
        
355
538
        logger.debug("Creating client %r", self.name)
356
539
        # Uppercase and remove spaces from fingerprint for later
357
540
        # comparison purposes with return value from the fingerprint()
358
541
        # function
359
 
        self.fingerprint = (config["fingerprint"].upper()
360
 
                            .replace(" ", ""))
361
542
        logger.debug("  Fingerprint: %s", self.fingerprint)
362
 
        if "secret" in config:
363
 
            self.secret = config["secret"].decode("base64")
364
 
        elif "secfile" in config:
365
 
            with open(os.path.expanduser(os.path.expandvars
366
 
                                         (config["secfile"])),
367
 
                      "rb") as secfile:
368
 
                self.secret = secfile.read()
369
 
        else:
370
 
            raise TypeError("No secret or secfile for client %s"
371
 
                            % self.name)
372
 
        self.host = config.get("host", "")
373
 
        self.created = datetime.datetime.utcnow()
374
 
        self.enabled = True
375
 
        self.last_approval_request = None
376
 
        self.last_enabled = datetime.datetime.utcnow()
377
 
        self.last_checked_ok = None
378
 
        self.last_checker_status = None
379
 
        self.timeout = string_to_delta(config["timeout"])
380
 
        self.extended_timeout = string_to_delta(config
381
 
                                                ["extended_timeout"])
382
 
        self.interval = string_to_delta(config["interval"])
 
543
        self.created = settings.get("created",
 
544
                                    datetime.datetime.utcnow())
 
545
        
 
546
        # attributes specific for this server instance
383
547
        self.checker = None
384
548
        self.checker_initiator_tag = None
385
549
        self.disable_initiator_tag = None
386
 
        self.expires = datetime.datetime.utcnow() + self.timeout
387
550
        self.checker_callback_tag = None
388
 
        self.checker_command = config["checker"]
389
551
        self.current_checker_command = None
390
 
        self._approved = None
391
 
        self.approved_by_default = config.get("approved_by_default",
392
 
                                              True)
 
552
        self.approved = None
393
553
        self.approvals_pending = 0
394
 
        self.approval_delay = string_to_delta(
395
 
            config["approval_delay"])
396
 
        self.approval_duration = string_to_delta(
397
 
            config["approval_duration"])
398
554
        self.changedstate = (multiprocessing_manager
399
555
                             .Condition(multiprocessing_manager
400
556
                                        .Lock()))
401
 
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
 
557
        self.client_structure = [attr for attr in
 
558
                                 self.__dict__.iterkeys()
 
559
                                 if not attr.startswith("_")]
402
560
        self.client_structure.append("client_structure")
403
 
 
404
 
 
 
561
        
405
562
        for name, t in inspect.getmembers(type(self),
406
 
                                          lambda obj: isinstance(obj, property)):
 
563
                                          lambda obj:
 
564
                                              isinstance(obj,
 
565
                                                         property)):
407
566
            if not name.startswith("_"):
408
567
                self.client_structure.append(name)
409
568
    
417
576
        if getattr(self, "enabled", False):
418
577
            # Already enabled
419
578
            return
420
 
        self.send_changedstate()
421
579
        self.expires = datetime.datetime.utcnow() + self.timeout
422
580
        self.enabled = True
423
581
        self.last_enabled = datetime.datetime.utcnow()
424
582
        self.init_checker()
 
583
        self.send_changedstate()
425
584
    
426
585
    def disable(self, quiet=True):
427
586
        """Disable this client."""
428
587
        if not getattr(self, "enabled", False):
429
588
            return False
430
589
        if not quiet:
431
 
            self.send_changedstate()
432
 
        if not quiet:
433
590
            logger.info("Disabling client %s", self.name)
434
 
        if getattr(self, "disable_initiator_tag", False):
 
591
        if getattr(self, "disable_initiator_tag", None) is not None:
435
592
            gobject.source_remove(self.disable_initiator_tag)
436
593
            self.disable_initiator_tag = None
437
594
        self.expires = None
438
 
        if getattr(self, "checker_initiator_tag", False):
 
595
        if getattr(self, "checker_initiator_tag", None) is not None:
439
596
            gobject.source_remove(self.checker_initiator_tag)
440
597
            self.checker_initiator_tag = None
441
598
        self.stop_checker()
442
599
        self.enabled = False
 
600
        if not quiet:
 
601
            self.send_changedstate()
443
602
        # Do not run this again if called by a gobject.timeout_add
444
603
        return False
445
604
    
446
605
    def __del__(self):
447
606
        self.disable()
448
 
 
 
607
    
449
608
    def init_checker(self):
450
609
        # Schedule a new checker to be started an 'interval' from now,
451
610
        # and every interval from then on.
 
611
        if self.checker_initiator_tag is not None:
 
612
            gobject.source_remove(self.checker_initiator_tag)
452
613
        self.checker_initiator_tag = (gobject.timeout_add
453
614
                                      (self.interval_milliseconds(),
454
615
                                       self.start_checker))
455
616
        # Schedule a disable() when 'timeout' has passed
 
617
        if self.disable_initiator_tag is not None:
 
618
            gobject.source_remove(self.disable_initiator_tag)
456
619
        self.disable_initiator_tag = (gobject.timeout_add
457
620
                                   (self.timeout_milliseconds(),
458
621
                                    self.disable))
459
622
        # Also start a new checker *right now*.
460
623
        self.start_checker()
461
 
 
462
 
        
 
624
    
463
625
    def checker_callback(self, pid, condition, command):
464
626
        """The checker has completed, so take appropriate actions."""
465
627
        self.checker_callback_tag = None
466
628
        self.checker = None
467
629
        if os.WIFEXITED(condition):
468
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
630
            self.last_checker_status = os.WEXITSTATUS(condition)
469
631
            if self.last_checker_status == 0:
470
632
                logger.info("Checker for %(name)s succeeded",
471
633
                            vars(self))
478
640
            logger.warning("Checker for %(name)s crashed?",
479
641
                           vars(self))
480
642
    
481
 
    def checked_ok(self, timeout=None):
482
 
        """Bump up the timeout for this client.
483
 
        
484
 
        This should only be called when the client has been seen,
485
 
        alive and well.
486
 
        """
 
643
    def checked_ok(self):
 
644
        """Assert that the client has been seen, alive and well."""
 
645
        self.last_checked_ok = datetime.datetime.utcnow()
 
646
        self.last_checker_status = 0
 
647
        self.bump_timeout()
 
648
    
 
649
    def bump_timeout(self, timeout=None):
 
650
        """Bump up the timeout for this client."""
487
651
        if timeout is None:
488
652
            timeout = self.timeout
489
 
        self.last_checked_ok = datetime.datetime.utcnow()
490
653
        if self.disable_initiator_tag is not None:
491
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
            self.disable_initiator_tag = None
492
656
        if getattr(self, "enabled", False):
493
657
            self.disable_initiator_tag = (gobject.timeout_add
494
 
                                          (_timedelta_to_milliseconds
 
658
                                          (timedelta_to_milliseconds
495
659
                                           (timeout), self.disable))
496
660
            self.expires = datetime.datetime.utcnow() + timeout
497
661
    
504
668
        If a checker already exists, leave it running and do
505
669
        nothing."""
506
670
        # The reason for not killing a running checker is that if we
507
 
        # did that, then if a checker (for some reason) started
508
 
        # running slowly and taking more than 'interval' time, the
509
 
        # client would inevitably timeout, since no checker would get
510
 
        # a chance to run to completion.  If we instead leave running
 
671
        # did that, and if a checker (for some reason) started running
 
672
        # slowly and taking more than 'interval' time, then the client
 
673
        # would inevitably timeout, since no checker would get a
 
674
        # chance to run to completion.  If we instead leave running
511
675
        # checkers alone, the checker would have to take more time
512
676
        # than 'timeout' for the client to be disabled, which is as it
513
677
        # should be.
527
691
                                      self.current_checker_command)
528
692
        # Start a new checker if needed
529
693
        if self.checker is None:
 
694
            # Escape attributes for the shell
 
695
            escaped_attrs = dict(
 
696
                (attr, re.escape(unicode(getattr(self, attr))))
 
697
                for attr in
 
698
                self.runtime_expansions)
530
699
            try:
531
 
                # In case checker_command has exactly one % operator
532
 
                command = self.checker_command % self.host
533
 
            except TypeError:
534
 
                # Escape attributes for the shell
535
 
                escaped_attrs = dict(
536
 
                    (attr,
537
 
                     re.escape(unicode(str(getattr(self, attr, "")),
538
 
                                       errors=
539
 
                                       'replace')))
540
 
                    for attr in
541
 
                    self.runtime_expansions)
542
 
                
543
 
                try:
544
 
                    command = self.checker_command % escaped_attrs
545
 
                except TypeError as error:
546
 
                    logger.error('Could not format string "%s":'
547
 
                                 ' %s', self.checker_command, error)
548
 
                    return True # Try again later
 
700
                command = self.checker_command % escaped_attrs
 
701
            except TypeError as error:
 
702
                logger.error('Could not format string "%s"',
 
703
                             self.checker_command, exc_info=error)
 
704
                return True # Try again later
549
705
            self.current_checker_command = command
550
706
            try:
551
707
                logger.info("Starting checker %r for %s",
557
713
                self.checker = subprocess.Popen(command,
558
714
                                                close_fds=True,
559
715
                                                shell=True, cwd="/")
560
 
                self.checker_callback_tag = (gobject.child_watch_add
561
 
                                             (self.checker.pid,
562
 
                                              self.checker_callback,
563
 
                                              data=command))
564
 
                # The checker may have completed before the gobject
565
 
                # watch was added.  Check for this.
566
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
567
 
                if pid:
568
 
                    gobject.source_remove(self.checker_callback_tag)
569
 
                    self.checker_callback(pid, status, command)
570
716
            except OSError as error:
571
 
                logger.error("Failed to start subprocess: %s",
572
 
                             error)
 
717
                logger.error("Failed to start subprocess",
 
718
                             exc_info=error)
 
719
            self.checker_callback_tag = (gobject.child_watch_add
 
720
                                         (self.checker.pid,
 
721
                                          self.checker_callback,
 
722
                                          data=command))
 
723
            # The checker may have completed before the gobject
 
724
            # watch was added.  Check for this.
 
725
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
726
            if pid:
 
727
                gobject.source_remove(self.checker_callback_tag)
 
728
                self.checker_callback(pid, status, command)
573
729
        # Re-run this periodically if run by gobject.timeout_add
574
730
        return True
575
731
    
582
738
            return
583
739
        logger.debug("Stopping checker for %(name)s", vars(self))
584
740
        try:
585
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
741
            self.checker.terminate()
586
742
            #time.sleep(0.5)
587
743
            #if self.checker.poll() is None:
588
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
744
            #    self.checker.kill()
589
745
        except OSError as error:
590
746
            if error.errno != errno.ESRCH: # No such process
591
747
                raise
592
748
        self.checker = None
593
749
 
594
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
595
 
    def encrypt_secret(self, key):
596
 
        # Encryption-key need to be of a specific size, so we hash inputed key
597
 
        hasheng = hashlib.sha256()
598
 
        hasheng.update(key)
599
 
        encryptionkey = hasheng.digest()
600
 
 
601
 
        # Create validation hash so we know at decryption if it was sucessful
602
 
        hasheng = hashlib.sha256()
603
 
        hasheng.update(self.secret)
604
 
        validationhash = hasheng.digest()
605
 
 
606
 
        # Encrypt secret
607
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
608
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
610
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
 
        self.encrypted_secret = (ciphertext, iv)
612
 
 
613
 
    # Decrypt a encrypted client secret
614
 
    def decrypt_secret(self, key):
615
 
        # Decryption-key need to be of a specific size, so we hash inputed key
616
 
        hasheng = hashlib.sha256()
617
 
        hasheng.update(key)
618
 
        encryptionkey = hasheng.digest()
619
 
 
620
 
        # Decrypt encrypted secret
621
 
        ciphertext, iv = self.encrypted_secret
622
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
624
 
        plain = ciphereng.decrypt(ciphertext)
625
 
 
626
 
        # Validate decrypted secret to know if it was succesful
627
 
        hasheng = hashlib.sha256()
628
 
        validationhash = plain[:hasheng.digest_size]
629
 
        secret = plain[hasheng.digest_size:]
630
 
        hasheng.update(secret)
631
 
 
632
 
        # if validation fails, we use key as new secret. Otherwhise, we use
633
 
        # the decrypted secret
634
 
        if hasheng.digest() == validationhash:
635
 
            self.secret = secret
636
 
        else:
637
 
            self.secret = key
638
 
        del self.encrypted_secret
639
 
 
640
750
 
641
751
def dbus_service_property(dbus_interface, signature="v",
642
752
                          access="readwrite", byte_arrays=False):
654
764
    # "Set" method, so we fail early here:
655
765
    if byte_arrays and signature != "ay":
656
766
        raise ValueError("Byte arrays not supported for non-'ay'"
657
 
                         " signature %r" % signature)
 
767
                         " signature {0!r}".format(signature))
658
768
    def decorator(func):
659
769
        func._dbus_is_property = True
660
770
        func._dbus_interface = dbus_interface
668
778
    return decorator
669
779
 
670
780
 
 
781
def dbus_interface_annotations(dbus_interface):
 
782
    """Decorator for marking functions returning interface annotations
 
783
    
 
784
    Usage:
 
785
    
 
786
    @dbus_interface_annotations("org.example.Interface")
 
787
    def _foo(self):  # Function name does not matter
 
788
        return {"org.freedesktop.DBus.Deprecated": "true",
 
789
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
790
                    "false"}
 
791
    """
 
792
    def decorator(func):
 
793
        func._dbus_is_interface = True
 
794
        func._dbus_interface = dbus_interface
 
795
        func._dbus_name = dbus_interface
 
796
        return func
 
797
    return decorator
 
798
 
 
799
 
 
800
def dbus_annotations(annotations):
 
801
    """Decorator to annotate D-Bus methods, signals or properties
 
802
    Usage:
 
803
    
 
804
    @dbus_service_property("org.example.Interface", signature="b",
 
805
                           access="r")
 
806
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
807
                        "org.freedesktop.DBus.Property."
 
808
                        "EmitsChangedSignal": "false"})
 
809
    def Property_dbus_property(self):
 
810
        return dbus.Boolean(False)
 
811
    """
 
812
    def decorator(func):
 
813
        func._dbus_annotations = annotations
 
814
        return func
 
815
    return decorator
 
816
 
 
817
 
671
818
class DBusPropertyException(dbus.exceptions.DBusException):
672
819
    """A base class for D-Bus property-related exceptions
673
820
    """
696
843
    """
697
844
    
698
845
    @staticmethod
699
 
    def _is_dbus_property(obj):
700
 
        return getattr(obj, "_dbus_is_property", False)
 
846
    def _is_dbus_thing(thing):
 
847
        """Returns a function testing if an attribute is a D-Bus thing
 
848
        
 
849
        If called like _is_dbus_thing("method") it returns a function
 
850
        suitable for use as predicate to inspect.getmembers().
 
851
        """
 
852
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
853
                                   False)
701
854
    
702
 
    def _get_all_dbus_properties(self):
 
855
    def _get_all_dbus_things(self, thing):
703
856
        """Returns a generator of (name, attribute) pairs
704
857
        """
705
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
858
        return ((getattr(athing.__get__(self), "_dbus_name",
 
859
                         name),
 
860
                 athing.__get__(self))
706
861
                for cls in self.__class__.__mro__
707
 
                for name, prop in
708
 
                inspect.getmembers(cls, self._is_dbus_property))
 
862
                for name, athing in
 
863
                inspect.getmembers(cls,
 
864
                                   self._is_dbus_thing(thing)))
709
865
    
710
866
    def _get_dbus_property(self, interface_name, property_name):
711
867
        """Returns a bound method if one exists which is a D-Bus
713
869
        """
714
870
        for cls in  self.__class__.__mro__:
715
871
            for name, value in (inspect.getmembers
716
 
                                (cls, self._is_dbus_property)):
 
872
                                (cls,
 
873
                                 self._is_dbus_thing("property"))):
717
874
                if (value._dbus_name == property_name
718
875
                    and value._dbus_interface == interface_name):
719
876
                    return value.__get__(self)
748
905
            # signatures other than "ay".
749
906
            if prop._dbus_signature != "ay":
750
907
                raise ValueError
751
 
            value = dbus.ByteArray(''.join(unichr(byte)
752
 
                                           for byte in value))
 
908
            value = dbus.ByteArray(b''.join(chr(byte)
 
909
                                            for byte in value))
753
910
        prop(value)
754
911
    
755
912
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
760
917
        
761
918
        Note: Will not include properties with access="write".
762
919
        """
763
 
        all = {}
764
 
        for name, prop in self._get_all_dbus_properties():
 
920
        properties = {}
 
921
        for name, prop in self._get_all_dbus_things("property"):
765
922
            if (interface_name
766
923
                and interface_name != prop._dbus_interface):
767
924
                # Interface non-empty but did not match
771
928
                continue
772
929
            value = prop()
773
930
            if not hasattr(value, "variant_level"):
774
 
                all[name] = value
 
931
                properties[name] = value
775
932
                continue
776
 
            all[name] = type(value)(value, variant_level=
777
 
                                    value.variant_level+1)
778
 
        return dbus.Dictionary(all, signature="sv")
 
933
            properties[name] = type(value)(value, variant_level=
 
934
                                           value.variant_level+1)
 
935
        return dbus.Dictionary(properties, signature="sv")
779
936
    
780
937
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
781
938
                         out_signature="s",
782
939
                         path_keyword='object_path',
783
940
                         connection_keyword='connection')
784
941
    def Introspect(self, object_path, connection):
785
 
        """Standard D-Bus method, overloaded to insert property tags.
 
942
        """Overloading of standard D-Bus method.
 
943
        
 
944
        Inserts property tags and interface annotation tags.
786
945
        """
787
946
        xmlstring = dbus.service.Object.Introspect(self, object_path,
788
947
                                                   connection)
795
954
                e.setAttribute("access", prop._dbus_access)
796
955
                return e
797
956
            for if_tag in document.getElementsByTagName("interface"):
 
957
                # Add property tags
798
958
                for tag in (make_tag(document, name, prop)
799
959
                            for name, prop
800
 
                            in self._get_all_dbus_properties()
 
960
                            in self._get_all_dbus_things("property")
801
961
                            if prop._dbus_interface
802
962
                            == if_tag.getAttribute("name")):
803
963
                    if_tag.appendChild(tag)
 
964
                # Add annotation tags
 
965
                for typ in ("method", "signal", "property"):
 
966
                    for tag in if_tag.getElementsByTagName(typ):
 
967
                        annots = dict()
 
968
                        for name, prop in (self.
 
969
                                           _get_all_dbus_things(typ)):
 
970
                            if (name == tag.getAttribute("name")
 
971
                                and prop._dbus_interface
 
972
                                == if_tag.getAttribute("name")):
 
973
                                annots.update(getattr
 
974
                                              (prop,
 
975
                                               "_dbus_annotations",
 
976
                                               {}))
 
977
                        for name, value in annots.iteritems():
 
978
                            ann_tag = document.createElement(
 
979
                                "annotation")
 
980
                            ann_tag.setAttribute("name", name)
 
981
                            ann_tag.setAttribute("value", value)
 
982
                            tag.appendChild(ann_tag)
 
983
                # Add interface annotation tags
 
984
                for annotation, value in dict(
 
985
                    itertools.chain.from_iterable(
 
986
                        annotations().iteritems()
 
987
                        for name, annotations in
 
988
                        self._get_all_dbus_things("interface")
 
989
                        if name == if_tag.getAttribute("name")
 
990
                        )).iteritems():
 
991
                    ann_tag = document.createElement("annotation")
 
992
                    ann_tag.setAttribute("name", annotation)
 
993
                    ann_tag.setAttribute("value", value)
 
994
                    if_tag.appendChild(ann_tag)
804
995
                # Add the names to the return values for the
805
996
                # "org.freedesktop.DBus.Properties" methods
806
997
                if (if_tag.getAttribute("name")
821
1012
        except (AttributeError, xml.dom.DOMException,
822
1013
                xml.parsers.expat.ExpatError) as error:
823
1014
            logger.error("Failed to override Introspection method",
824
 
                         error)
 
1015
                         exc_info=error)
825
1016
        return xmlstring
826
1017
 
827
1018
 
828
 
def datetime_to_dbus (dt, variant_level=0):
 
1019
def datetime_to_dbus(dt, variant_level=0):
829
1020
    """Convert a UTC datetime.datetime() to a D-Bus type."""
830
1021
    if dt is None:
831
1022
        return dbus.String("", variant_level = variant_level)
832
1023
    return dbus.String(dt.isoformat(),
833
1024
                       variant_level=variant_level)
834
1025
 
835
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
836
 
                                  .__metaclass__):
837
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
838
 
    will add additional D-Bus attributes matching a certain pattern.
 
1026
 
 
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1028
    """A class decorator; applied to a subclass of
 
1029
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1030
    interface names according to the "alt_interface_names" mapping.
 
1031
    Usage:
 
1032
    
 
1033
    @alternate_dbus_interfaces({"org.example.Interface":
 
1034
                                    "net.example.AlternateInterface"})
 
1035
    class SampleDBusObject(dbus.service.Object):
 
1036
        @dbus.service.method("org.example.Interface")
 
1037
        def SampleDBusMethod():
 
1038
            pass
 
1039
    
 
1040
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1041
    reachable via two interfaces: "org.example.Interface" and
 
1042
    "net.example.AlternateInterface", the latter of which will have
 
1043
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1044
    "true", unless "deprecate" is passed with a False value.
 
1045
    
 
1046
    This works for methods and signals, and also for D-Bus properties
 
1047
    (from DBusObjectWithProperties) and interfaces (from the
 
1048
    dbus_interface_annotations decorator).
839
1049
    """
840
 
    def __new__(mcs, name, bases, attr):
841
 
        # Go through all the base classes which could have D-Bus
842
 
        # methods, signals, or properties in them
843
 
        for base in (b for b in bases
844
 
                     if issubclass(b, dbus.service.Object)):
845
 
            # Go though all attributes of the base class
846
 
            for attrname, attribute in inspect.getmembers(base):
 
1050
    def wrapper(cls):
 
1051
        for orig_interface_name, alt_interface_name in (
 
1052
            alt_interface_names.iteritems()):
 
1053
            attr = {}
 
1054
            interface_names = set()
 
1055
            # Go though all attributes of the class
 
1056
            for attrname, attribute in inspect.getmembers(cls):
847
1057
                # Ignore non-D-Bus attributes, and D-Bus attributes
848
1058
                # with the wrong interface name
849
1059
                if (not hasattr(attribute, "_dbus_interface")
850
1060
                    or not attribute._dbus_interface
851
 
                    .startswith("se.recompile.Mandos")):
 
1061
                    .startswith(orig_interface_name)):
852
1062
                    continue
853
1063
                # Create an alternate D-Bus interface name based on
854
1064
                # the current name
855
1065
                alt_interface = (attribute._dbus_interface
856
 
                                 .replace("se.recompile.Mandos",
857
 
                                          "se.bsnet.fukt.Mandos"))
 
1066
                                 .replace(orig_interface_name,
 
1067
                                          alt_interface_name))
 
1068
                interface_names.add(alt_interface)
858
1069
                # Is this a D-Bus signal?
859
1070
                if getattr(attribute, "_dbus_is_signal", False):
860
1071
                    # Extract the original non-method function by
875
1086
                                nonmethod_func.func_name,
876
1087
                                nonmethod_func.func_defaults,
877
1088
                                nonmethod_func.func_closure)))
 
1089
                    # Copy annotations, if any
 
1090
                    try:
 
1091
                        new_function._dbus_annotations = (
 
1092
                            dict(attribute._dbus_annotations))
 
1093
                    except AttributeError:
 
1094
                        pass
878
1095
                    # Define a creator of a function to call both the
879
 
                    # old and new functions, so both the old and new
880
 
                    # signals gets sent when the function is called
 
1096
                    # original and alternate functions, so both the
 
1097
                    # original and alternate signals gets sent when
 
1098
                    # the function is called
881
1099
                    def fixscope(func1, func2):
882
1100
                        """This function is a scope container to pass
883
1101
                        func1 and func2 to the "call_both" function
890
1108
                        return call_both
891
1109
                    # Create the "call_both" function and add it to
892
1110
                    # the class
893
 
                    attr[attrname] = fixscope(attribute,
894
 
                                              new_function)
 
1111
                    attr[attrname] = fixscope(attribute, new_function)
895
1112
                # Is this a D-Bus method?
896
1113
                elif getattr(attribute, "_dbus_is_method", False):
897
1114
                    # Create a new, but exactly alike, function
908
1125
                                        attribute.func_name,
909
1126
                                        attribute.func_defaults,
910
1127
                                        attribute.func_closure)))
 
1128
                    # Copy annotations, if any
 
1129
                    try:
 
1130
                        attr[attrname]._dbus_annotations = (
 
1131
                            dict(attribute._dbus_annotations))
 
1132
                    except AttributeError:
 
1133
                        pass
911
1134
                # Is this a D-Bus property?
912
1135
                elif getattr(attribute, "_dbus_is_property", False):
913
1136
                    # Create a new, but exactly alike, function
927
1150
                                        attribute.func_name,
928
1151
                                        attribute.func_defaults,
929
1152
                                        attribute.func_closure)))
930
 
        return type.__new__(mcs, name, bases, attr)
931
 
 
 
1153
                    # Copy annotations, if any
 
1154
                    try:
 
1155
                        attr[attrname]._dbus_annotations = (
 
1156
                            dict(attribute._dbus_annotations))
 
1157
                    except AttributeError:
 
1158
                        pass
 
1159
                # Is this a D-Bus interface?
 
1160
                elif getattr(attribute, "_dbus_is_interface", False):
 
1161
                    # Create a new, but exactly alike, function
 
1162
                    # object.  Decorate it to be a new D-Bus interface
 
1163
                    # with the alternate D-Bus interface name.  Add it
 
1164
                    # to the class.
 
1165
                    attr[attrname] = (dbus_interface_annotations
 
1166
                                      (alt_interface)
 
1167
                                      (types.FunctionType
 
1168
                                       (attribute.func_code,
 
1169
                                        attribute.func_globals,
 
1170
                                        attribute.func_name,
 
1171
                                        attribute.func_defaults,
 
1172
                                        attribute.func_closure)))
 
1173
            if deprecate:
 
1174
                # Deprecate all alternate interfaces
 
1175
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1176
                for interface_name in interface_names:
 
1177
                    @dbus_interface_annotations(interface_name)
 
1178
                    def func(self):
 
1179
                        return { "org.freedesktop.DBus.Deprecated":
 
1180
                                     "true" }
 
1181
                    # Find an unused name
 
1182
                    for aname in (iname.format(i)
 
1183
                                  for i in itertools.count()):
 
1184
                        if aname not in attr:
 
1185
                            attr[aname] = func
 
1186
                            break
 
1187
            if interface_names:
 
1188
                # Replace the class with a new subclass of it with
 
1189
                # methods, signals, etc. as created above.
 
1190
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1191
                           (cls,), attr)
 
1192
        return cls
 
1193
    return wrapper
 
1194
 
 
1195
 
 
1196
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1197
                                "se.bsnet.fukt.Mandos"})
932
1198
class ClientDBus(Client, DBusObjectWithProperties):
933
1199
    """A Client class using D-Bus
934
1200
    
945
1211
    def __init__(self, bus = None, *args, **kwargs):
946
1212
        self.bus = bus
947
1213
        Client.__init__(self, *args, **kwargs)
948
 
 
949
 
        self._approvals_pending = 0
950
1214
        # Only now, when this client is initialized, can it show up on
951
1215
        # the D-Bus
952
1216
        client_object_name = unicode(self.name).translate(
956
1220
                                 ("/clients/" + client_object_name))
957
1221
        DBusObjectWithProperties.__init__(self, self.bus,
958
1222
                                          self.dbus_object_path)
959
 
        
 
1223
    
960
1224
    def notifychangeproperty(transform_func,
961
1225
                             dbus_name, type_func=lambda x: x,
962
1226
                             variant_level=1):
963
1227
        """ Modify a variable so that it's a property which announces
964
1228
        its changes to DBus.
965
 
 
 
1229
        
966
1230
        transform_fun: Function that takes a value and a variant_level
967
1231
                       and transforms it to a D-Bus type.
968
1232
        dbus_name: D-Bus name of the variable
985
1249
        
986
1250
        return property(lambda self: getattr(self, attrname), setter)
987
1251
    
988
 
    
989
1252
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
990
1253
    approvals_pending = notifychangeproperty(dbus.Boolean,
991
1254
                                             "ApprovalPending",
998
1261
                                       checker is not None)
999
1262
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1000
1263
                                           "LastCheckedOK")
 
1264
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1265
                                               "LastCheckerStatus")
1001
1266
    last_approval_request = notifychangeproperty(
1002
1267
        datetime_to_dbus, "LastApprovalRequest")
1003
1268
    approved_by_default = notifychangeproperty(dbus.Boolean,
1004
1269
                                               "ApprovedByDefault")
1005
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1270
    approval_delay = notifychangeproperty(dbus.UInt64,
1006
1271
                                          "ApprovalDelay",
1007
1272
                                          type_func =
1008
 
                                          _timedelta_to_milliseconds)
 
1273
                                          timedelta_to_milliseconds)
1009
1274
    approval_duration = notifychangeproperty(
1010
 
        dbus.UInt16, "ApprovalDuration",
1011
 
        type_func = _timedelta_to_milliseconds)
 
1275
        dbus.UInt64, "ApprovalDuration",
 
1276
        type_func = timedelta_to_milliseconds)
1012
1277
    host = notifychangeproperty(dbus.String, "Host")
1013
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1278
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1014
1279
                                   type_func =
1015
 
                                   _timedelta_to_milliseconds)
 
1280
                                   timedelta_to_milliseconds)
1016
1281
    extended_timeout = notifychangeproperty(
1017
 
        dbus.UInt16, "ExtendedTimeout",
1018
 
        type_func = _timedelta_to_milliseconds)
1019
 
    interval = notifychangeproperty(dbus.UInt16,
 
1282
        dbus.UInt64, "ExtendedTimeout",
 
1283
        type_func = timedelta_to_milliseconds)
 
1284
    interval = notifychangeproperty(dbus.UInt64,
1020
1285
                                    "Interval",
1021
1286
                                    type_func =
1022
 
                                    _timedelta_to_milliseconds)
 
1287
                                    timedelta_to_milliseconds)
1023
1288
    checker_command = notifychangeproperty(dbus.String, "Checker")
1024
1289
    
1025
1290
    del notifychangeproperty
1067
1332
        return r
1068
1333
    
1069
1334
    def _reset_approved(self):
1070
 
        self._approved = None
 
1335
        self.approved = None
1071
1336
        return False
1072
1337
    
1073
1338
    def approve(self, value=True):
1074
 
        self.send_changedstate()
1075
 
        self._approved = value
1076
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1339
        self.approved = value
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
1077
1341
                            (self.approval_duration),
1078
1342
                            self._reset_approved)
1079
 
    
 
1343
        self.send_changedstate()
1080
1344
    
1081
1345
    ## D-Bus methods, signals & properties
1082
1346
    _interface = "se.recompile.Mandos.Client"
1083
1347
    
 
1348
    ## Interfaces
 
1349
    
 
1350
    @dbus_interface_annotations(_interface)
 
1351
    def _foo(self):
 
1352
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1353
                     "false"}
 
1354
    
1084
1355
    ## Signals
1085
1356
    
1086
1357
    # CheckerCompleted - signal
1185
1456
                           access="readwrite")
1186
1457
    def ApprovalDuration_dbus_property(self, value=None):
1187
1458
        if value is None:       # get
1188
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1459
            return dbus.UInt64(timedelta_to_milliseconds(
1189
1460
                    self.approval_duration))
1190
1461
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1191
1462
    
1205
1476
    def Host_dbus_property(self, value=None):
1206
1477
        if value is None:       # get
1207
1478
            return dbus.String(self.host)
1208
 
        self.host = value
 
1479
        self.host = unicode(value)
1209
1480
    
1210
1481
    # Created - property
1211
1482
    @dbus_service_property(_interface, signature="s", access="read")
1212
1483
    def Created_dbus_property(self):
1213
 
        return dbus.String(datetime_to_dbus(self.created))
 
1484
        return datetime_to_dbus(self.created)
1214
1485
    
1215
1486
    # LastEnabled - property
1216
1487
    @dbus_service_property(_interface, signature="s", access="read")
1237
1508
            return
1238
1509
        return datetime_to_dbus(self.last_checked_ok)
1239
1510
    
 
1511
    # LastCheckerStatus - property
 
1512
    @dbus_service_property(_interface, signature="n",
 
1513
                           access="read")
 
1514
    def LastCheckerStatus_dbus_property(self):
 
1515
        return dbus.Int16(self.last_checker_status)
 
1516
    
1240
1517
    # Expires - property
1241
1518
    @dbus_service_property(_interface, signature="s", access="read")
1242
1519
    def Expires_dbus_property(self):
1253
1530
    def Timeout_dbus_property(self, value=None):
1254
1531
        if value is None:       # get
1255
1532
            return dbus.UInt64(self.timeout_milliseconds())
 
1533
        old_timeout = self.timeout
1256
1534
        self.timeout = datetime.timedelta(0, 0, 0, value)
1257
 
        if getattr(self, "disable_initiator_tag", None) is None:
1258
 
            return
1259
 
        # Reschedule timeout
1260
 
        gobject.source_remove(self.disable_initiator_tag)
1261
 
        self.disable_initiator_tag = None
1262
 
        self.expires = None
1263
 
        time_to_die = _timedelta_to_milliseconds((self
1264
 
                                                  .last_checked_ok
1265
 
                                                  + self.timeout)
1266
 
                                                 - datetime.datetime
1267
 
                                                 .utcnow())
1268
 
        if time_to_die <= 0:
1269
 
            # The timeout has passed
1270
 
            self.disable()
1271
 
        else:
1272
 
            self.expires = (datetime.datetime.utcnow()
1273
 
                            + datetime.timedelta(milliseconds =
1274
 
                                                 time_to_die))
1275
 
            self.disable_initiator_tag = (gobject.timeout_add
1276
 
                                          (time_to_die, self.disable))
 
1535
        # Reschedule disabling
 
1536
        if self.enabled:
 
1537
            now = datetime.datetime.utcnow()
 
1538
            self.expires += self.timeout - old_timeout
 
1539
            if self.expires <= now:
 
1540
                # The timeout has passed
 
1541
                self.disable()
 
1542
            else:
 
1543
                if (getattr(self, "disable_initiator_tag", None)
 
1544
                    is None):
 
1545
                    return
 
1546
                gobject.source_remove(self.disable_initiator_tag)
 
1547
                self.disable_initiator_tag = (
 
1548
                    gobject.timeout_add(
 
1549
                        timedelta_to_milliseconds(self.expires - now),
 
1550
                        self.disable))
1277
1551
    
1278
1552
    # ExtendedTimeout - property
1279
1553
    @dbus_service_property(_interface, signature="t",
1292
1566
        self.interval = datetime.timedelta(0, 0, 0, value)
1293
1567
        if getattr(self, "checker_initiator_tag", None) is None:
1294
1568
            return
1295
 
        # Reschedule checker run
1296
 
        gobject.source_remove(self.checker_initiator_tag)
1297
 
        self.checker_initiator_tag = (gobject.timeout_add
1298
 
                                      (value, self.start_checker))
1299
 
        self.start_checker()    # Start one now, too
 
1569
        if self.enabled:
 
1570
            # Reschedule checker run
 
1571
            gobject.source_remove(self.checker_initiator_tag)
 
1572
            self.checker_initiator_tag = (gobject.timeout_add
 
1573
                                          (value, self.start_checker))
 
1574
            self.start_checker()    # Start one now, too
1300
1575
    
1301
1576
    # Checker - property
1302
1577
    @dbus_service_property(_interface, signature="s",
1304
1579
    def Checker_dbus_property(self, value=None):
1305
1580
        if value is None:       # get
1306
1581
            return dbus.String(self.checker_command)
1307
 
        self.checker_command = value
 
1582
        self.checker_command = unicode(value)
1308
1583
    
1309
1584
    # CheckerRunning - property
1310
1585
    @dbus_service_property(_interface, signature="b",
1339
1614
            raise KeyError()
1340
1615
    
1341
1616
    def __getattribute__(self, name):
1342
 
        if(name == '_pipe'):
 
1617
        if name == '_pipe':
1343
1618
            return super(ProxyClient, self).__getattribute__(name)
1344
1619
        self._pipe.send(('getattr', name))
1345
1620
        data = self._pipe.recv()
1352
1627
            return func
1353
1628
    
1354
1629
    def __setattr__(self, name, value):
1355
 
        if(name == '_pipe'):
 
1630
        if name == '_pipe':
1356
1631
            return super(ProxyClient, self).__setattr__(name, value)
1357
1632
        self._pipe.send(('setattr', name, value))
1358
1633
 
1359
 
class ClientDBusTransitional(ClientDBus):
1360
 
    __metaclass__ = AlternateDBusNamesMetaclass
1361
1634
 
1362
1635
class ClientHandler(socketserver.BaseRequestHandler, object):
1363
1636
    """A class to handle client connections.
1446
1719
                            client.Rejected("Disabled")
1447
1720
                        return
1448
1721
                    
1449
 
                    if client._approved or not client.approval_delay:
 
1722
                    if client.approved or not client.approval_delay:
1450
1723
                        #We are approved or approval is disabled
1451
1724
                        break
1452
 
                    elif client._approved is None:
 
1725
                    elif client.approved is None:
1453
1726
                        logger.info("Client %s needs approval",
1454
1727
                                    client.name)
1455
1728
                        if self.server.use_dbus:
1468
1741
                    #wait until timeout or approved
1469
1742
                    time = datetime.datetime.now()
1470
1743
                    client.changedstate.acquire()
1471
 
                    (client.changedstate.wait
1472
 
                     (float(client._timedelta_to_milliseconds(delay)
1473
 
                            / 1000)))
 
1744
                    client.changedstate.wait(
 
1745
                        float(timedelta_to_milliseconds(delay)
 
1746
                              / 1000))
1474
1747
                    client.changedstate.release()
1475
1748
                    time2 = datetime.datetime.now()
1476
1749
                    if (time2 - time) >= delay:
1492
1765
                    try:
1493
1766
                        sent = session.send(client.secret[sent_size:])
1494
1767
                    except gnutls.errors.GNUTLSError as error:
1495
 
                        logger.warning("gnutls send failed")
 
1768
                        logger.warning("gnutls send failed",
 
1769
                                       exc_info=error)
1496
1770
                        return
1497
1771
                    logger.debug("Sent: %d, remaining: %d",
1498
1772
                                 sent, len(client.secret)
1501
1775
                
1502
1776
                logger.info("Sending secret to %s", client.name)
1503
1777
                # bump the timeout using extended_timeout
1504
 
                client.checked_ok(client.extended_timeout)
 
1778
                client.bump_timeout(client.extended_timeout)
1505
1779
                if self.server.use_dbus:
1506
1780
                    # Emit D-Bus signal
1507
1781
                    client.GotSecret()
1512
1786
                try:
1513
1787
                    session.bye()
1514
1788
                except gnutls.errors.GNUTLSError as error:
1515
 
                    logger.warning("GnuTLS bye failed")
 
1789
                    logger.warning("GnuTLS bye failed",
 
1790
                                   exc_info=error)
1516
1791
    
1517
1792
    @staticmethod
1518
1793
    def peer_certificate(session):
1574
1849
        # Convert the buffer to a Python bytestring
1575
1850
        fpr = ctypes.string_at(buf, buf_len.value)
1576
1851
        # Convert the bytestring to hexadecimal notation
1577
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1852
        hex_fpr = binascii.hexlify(fpr).upper()
1578
1853
        return hex_fpr
1579
1854
 
1580
1855
 
1583
1858
    def sub_process_main(self, request, address):
1584
1859
        try:
1585
1860
            self.finish_request(request, address)
1586
 
        except:
 
1861
        except Exception:
1587
1862
            self.handle_error(request, address)
1588
1863
        self.close_request(request)
1589
1864
    
1590
1865
    def process_request(self, request, address):
1591
1866
        """Start a new process to process the request."""
1592
1867
        proc = multiprocessing.Process(target = self.sub_process_main,
1593
 
                                       args = (request,
1594
 
                                               address))
 
1868
                                       args = (request, address))
1595
1869
        proc.start()
1596
1870
        return proc
1597
1871
 
1625
1899
        use_ipv6:       Boolean; to use IPv6 or not
1626
1900
    """
1627
1901
    def __init__(self, server_address, RequestHandlerClass,
1628
 
                 interface=None, use_ipv6=True):
 
1902
                 interface=None, use_ipv6=True, socketfd=None):
 
1903
        """If socketfd is set, use that file descriptor instead of
 
1904
        creating a new one with socket.socket().
 
1905
        """
1629
1906
        self.interface = interface
1630
1907
        if use_ipv6:
1631
1908
            self.address_family = socket.AF_INET6
 
1909
        if socketfd is not None:
 
1910
            # Save the file descriptor
 
1911
            self.socketfd = socketfd
 
1912
            # Save the original socket.socket() function
 
1913
            self.socket_socket = socket.socket
 
1914
            # To implement --socket, we monkey patch socket.socket.
 
1915
            # 
 
1916
            # (When socketserver.TCPServer is a new-style class, we
 
1917
            # could make self.socket into a property instead of monkey
 
1918
            # patching socket.socket.)
 
1919
            # 
 
1920
            # Create a one-time-only replacement for socket.socket()
 
1921
            @functools.wraps(socket.socket)
 
1922
            def socket_wrapper(*args, **kwargs):
 
1923
                # Restore original function so subsequent calls are
 
1924
                # not affected.
 
1925
                socket.socket = self.socket_socket
 
1926
                del self.socket_socket
 
1927
                # This time only, return a new socket object from the
 
1928
                # saved file descriptor.
 
1929
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1930
            # Replace socket.socket() function with wrapper
 
1931
            socket.socket = socket_wrapper
 
1932
        # The socketserver.TCPServer.__init__ will call
 
1933
        # socket.socket(), which might be our replacement,
 
1934
        # socket_wrapper(), if socketfd was set.
1632
1935
        socketserver.TCPServer.__init__(self, server_address,
1633
1936
                                        RequestHandlerClass)
 
1937
    
1634
1938
    def server_bind(self):
1635
1939
        """This overrides the normal server_bind() function
1636
1940
        to bind to an interface if one was specified, and also NOT to
1647
1951
                                           str(self.interface
1648
1952
                                               + '\0'))
1649
1953
                except socket.error as error:
1650
 
                    if error[0] == errno.EPERM:
 
1954
                    if error.errno == errno.EPERM:
1651
1955
                        logger.error("No permission to"
1652
1956
                                     " bind to interface %s",
1653
1957
                                     self.interface)
1654
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1958
                    elif error.errno == errno.ENOPROTOOPT:
1655
1959
                        logger.error("SO_BINDTODEVICE not available;"
1656
1960
                                     " cannot bind to interface %s",
1657
1961
                                     self.interface)
 
1962
                    elif error.errno == errno.ENODEV:
 
1963
                        logger.error("Interface %s does not"
 
1964
                                     " exist, cannot bind",
 
1965
                                     self.interface)
1658
1966
                    else:
1659
1967
                        raise
1660
1968
        # Only bind(2) the socket if we really need to.
1690
1998
    """
1691
1999
    def __init__(self, server_address, RequestHandlerClass,
1692
2000
                 interface=None, use_ipv6=True, clients=None,
1693
 
                 gnutls_priority=None, use_dbus=True):
 
2001
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1694
2002
        self.enabled = False
1695
2003
        self.clients = clients
1696
2004
        if self.clients is None:
1700
2008
        IPv6_TCPServer.__init__(self, server_address,
1701
2009
                                RequestHandlerClass,
1702
2010
                                interface = interface,
1703
 
                                use_ipv6 = use_ipv6)
 
2011
                                use_ipv6 = use_ipv6,
 
2012
                                socketfd = socketfd)
1704
2013
    def server_activate(self):
1705
2014
        if self.enabled:
1706
2015
            return socketserver.TCPServer.server_activate(self)
1719
2028
    
1720
2029
    def handle_ipc(self, source, condition, parent_pipe=None,
1721
2030
                   proc = None, client_object=None):
1722
 
        condition_names = {
1723
 
            gobject.IO_IN: "IN",   # There is data to read.
1724
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1725
 
                                    # blocking).
1726
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1727
 
            gobject.IO_ERR: "ERR", # Error condition.
1728
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1729
 
                                    # broken, usually for pipes and
1730
 
                                    # sockets).
1731
 
            }
1732
 
        conditions_string = ' | '.join(name
1733
 
                                       for cond, name in
1734
 
                                       condition_names.iteritems()
1735
 
                                       if cond & condition)
1736
2031
        # error, or the other end of multiprocessing.Pipe has closed
1737
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2032
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1738
2033
            # Wait for other process to exit
1739
2034
            proc.join()
1740
2035
            return False
1830
2125
            elif suffix == "w":
1831
2126
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1832
2127
            else:
1833
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2128
                raise ValueError("Unknown suffix {0!r}"
 
2129
                                 .format(suffix))
1834
2130
        except (ValueError, IndexError) as e:
1835
2131
            raise ValueError(*(e.args))
1836
2132
        timevalue += delta
1837
2133
    return timevalue
1838
2134
 
1839
2135
 
1840
 
def if_nametoindex(interface):
1841
 
    """Call the C function if_nametoindex(), or equivalent
1842
 
    
1843
 
    Note: This function cannot accept a unicode string."""
1844
 
    global if_nametoindex
1845
 
    try:
1846
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1847
 
                          (ctypes.util.find_library("c"))
1848
 
                          .if_nametoindex)
1849
 
    except (OSError, AttributeError):
1850
 
        logger.warning("Doing if_nametoindex the hard way")
1851
 
        def if_nametoindex(interface):
1852
 
            "Get an interface index the hard way, i.e. using fcntl()"
1853
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1854
 
            with contextlib.closing(socket.socket()) as s:
1855
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1856
 
                                    struct.pack(str("16s16x"),
1857
 
                                                interface))
1858
 
            interface_index = struct.unpack(str("I"),
1859
 
                                            ifreq[16:20])[0]
1860
 
            return interface_index
1861
 
    return if_nametoindex(interface)
1862
 
 
1863
 
 
1864
2136
def daemon(nochdir = False, noclose = False):
1865
2137
    """See daemon(3).  Standard BSD Unix function.
1866
2138
    
1874
2146
        sys.exit()
1875
2147
    if not noclose:
1876
2148
        # Close all standard open file descriptors
1877
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2149
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1878
2150
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1879
2151
            raise OSError(errno.ENODEV,
1880
 
                          "%s not a character device"
1881
 
                          % os.path.devnull)
 
2152
                          "{0} not a character device"
 
2153
                          .format(os.devnull))
1882
2154
        os.dup2(null, sys.stdin.fileno())
1883
2155
        os.dup2(null, sys.stdout.fileno())
1884
2156
        os.dup2(null, sys.stderr.fileno())
1893
2165
    
1894
2166
    parser = argparse.ArgumentParser()
1895
2167
    parser.add_argument("-v", "--version", action="version",
1896
 
                        version = "%%(prog)s %s" % version,
 
2168
                        version = "%(prog)s {0}".format(version),
1897
2169
                        help="show version number and exit")
1898
2170
    parser.add_argument("-i", "--interface", metavar="IF",
1899
2171
                        help="Bind to interface IF")
1922
2194
    parser.add_argument("--no-ipv6", action="store_false",
1923
2195
                        dest="use_ipv6", help="Do not use IPv6")
1924
2196
    parser.add_argument("--no-restore", action="store_false",
1925
 
                        dest="restore", help="Do not restore stored state",
1926
 
                        default=True)
1927
 
 
 
2197
                        dest="restore", help="Do not restore stored"
 
2198
                        " state")
 
2199
    parser.add_argument("--socket", type=int,
 
2200
                        help="Specify a file descriptor to a network"
 
2201
                        " socket to use instead of creating one")
 
2202
    parser.add_argument("--statedir", metavar="DIR",
 
2203
                        help="Directory to save/restore state in")
 
2204
    
1928
2205
    options = parser.parse_args()
1929
2206
    
1930
2207
    if options.check:
1943
2220
                        "use_dbus": "True",
1944
2221
                        "use_ipv6": "True",
1945
2222
                        "debuglevel": "",
 
2223
                        "restore": "True",
 
2224
                        "socket": "",
 
2225
                        "statedir": "/var/lib/mandos"
1946
2226
                        }
1947
2227
    
1948
2228
    # Parse config file for server-global settings
1959
2239
    if server_settings["port"]:
1960
2240
        server_settings["port"] = server_config.getint("DEFAULT",
1961
2241
                                                       "port")
 
2242
    if server_settings["socket"]:
 
2243
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2244
                                                         "socket")
 
2245
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2246
        # over with an opened os.devnull.  But we don't want this to
 
2247
        # happen with a supplied network socket.
 
2248
        if 0 <= server_settings["socket"] <= 2:
 
2249
            server_settings["socket"] = os.dup(server_settings
 
2250
                                               ["socket"])
1962
2251
    del server_config
1963
2252
    
1964
2253
    # Override the settings from the config file with command line
1965
2254
    # options, if set.
1966
2255
    for option in ("interface", "address", "port", "debug",
1967
2256
                   "priority", "servicename", "configdir",
1968
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2257
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2258
                   "statedir", "socket"):
1969
2259
        value = getattr(options, option)
1970
2260
        if value is not None:
1971
2261
            server_settings[option] = value
1983
2273
    debuglevel = server_settings["debuglevel"]
1984
2274
    use_dbus = server_settings["use_dbus"]
1985
2275
    use_ipv6 = server_settings["use_ipv6"]
 
2276
    stored_state_path = os.path.join(server_settings["statedir"],
 
2277
                                     stored_state_file)
 
2278
    
 
2279
    if debug:
 
2280
        initlogger(debug, logging.DEBUG)
 
2281
    else:
 
2282
        if not debuglevel:
 
2283
            initlogger(debug)
 
2284
        else:
 
2285
            level = getattr(logging, debuglevel.upper())
 
2286
            initlogger(debug, level)
1986
2287
    
1987
2288
    if server_settings["servicename"] != "Mandos":
1988
2289
        syslogger.setFormatter(logging.Formatter
1989
 
                               ('Mandos (%s) [%%(process)d]:'
1990
 
                                ' %%(levelname)s: %%(message)s'
1991
 
                                % server_settings["servicename"]))
 
2290
                               ('Mandos ({0}) [%(process)d]:'
 
2291
                                ' %(levelname)s: %(message)s'
 
2292
                                .format(server_settings
 
2293
                                        ["servicename"])))
1992
2294
    
1993
2295
    # Parse config file with clients
1994
 
    client_defaults = { "timeout": "5m",
1995
 
                        "extended_timeout": "15m",
1996
 
                        "interval": "2m",
1997
 
                        "checker": "fping -q -- %%(host)s",
1998
 
                        "host": "",
1999
 
                        "approval_delay": "0s",
2000
 
                        "approval_duration": "1s",
2001
 
                        }
2002
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2296
    client_config = configparser.SafeConfigParser(Client
 
2297
                                                  .client_defaults)
2003
2298
    client_config.read(os.path.join(server_settings["configdir"],
2004
2299
                                    "clients.conf"))
2005
2300
    
2014
2309
                              use_ipv6=use_ipv6,
2015
2310
                              gnutls_priority=
2016
2311
                              server_settings["priority"],
2017
 
                              use_dbus=use_dbus)
 
2312
                              use_dbus=use_dbus,
 
2313
                              socketfd=(server_settings["socket"]
 
2314
                                        or None))
2018
2315
    if not debug:
2019
2316
        pidfilename = "/var/run/mandos.pid"
2020
2317
        try:
2021
2318
            pidfile = open(pidfilename, "w")
2022
 
        except IOError:
2023
 
            logger.error("Could not open file %r", pidfilename)
 
2319
        except IOError as e:
 
2320
            logger.error("Could not open file %r", pidfilename,
 
2321
                         exc_info=e)
2024
2322
    
2025
 
    try:
2026
 
        uid = pwd.getpwnam("_mandos").pw_uid
2027
 
        gid = pwd.getpwnam("_mandos").pw_gid
2028
 
    except KeyError:
 
2323
    for name in ("_mandos", "mandos", "nobody"):
2029
2324
        try:
2030
 
            uid = pwd.getpwnam("mandos").pw_uid
2031
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2325
            uid = pwd.getpwnam(name).pw_uid
 
2326
            gid = pwd.getpwnam(name).pw_gid
 
2327
            break
2032
2328
        except KeyError:
2033
 
            try:
2034
 
                uid = pwd.getpwnam("nobody").pw_uid
2035
 
                gid = pwd.getpwnam("nobody").pw_gid
2036
 
            except KeyError:
2037
 
                uid = 65534
2038
 
                gid = 65534
 
2329
            continue
 
2330
    else:
 
2331
        uid = 65534
 
2332
        gid = 65534
2039
2333
    try:
2040
2334
        os.setgid(gid)
2041
2335
        os.setuid(uid)
2042
2336
    except OSError as error:
2043
 
        if error[0] != errno.EPERM:
 
2337
        if error.errno != errno.EPERM:
2044
2338
            raise error
2045
2339
    
2046
 
    if not debug and not debuglevel:
2047
 
        logger.setLevel(logging.WARNING)
2048
 
    if debuglevel:
2049
 
        level = getattr(logging, debuglevel.upper())
2050
 
        logger.setLevel(level)
2051
 
    
2052
2340
    if debug:
2053
 
        logger.setLevel(logging.DEBUG)
2054
2341
        # Enable all possible GnuTLS debugging
2055
2342
        
2056
2343
        # "Use a log level over 10 to enable all debugging options."
2065
2352
         .gnutls_global_set_log_function(debug_gnutls))
2066
2353
        
2067
2354
        # Redirect stdin so all checkers get /dev/null
2068
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2355
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2069
2356
        os.dup2(null, sys.stdin.fileno())
2070
2357
        if null > 2:
2071
2358
            os.close(null)
2072
 
    else:
2073
 
        # No console logging
2074
 
        logger.removeHandler(console)
2075
2359
    
2076
2360
    # Need to fork before connecting to D-Bus
2077
2361
    if not debug:
2078
2362
        # Close all input and output, do double fork, etc.
2079
2363
        daemon()
2080
2364
    
 
2365
    # multiprocessing will use threads, so before we use gobject we
 
2366
    # need to inform gobject that threads will be used.
 
2367
    gobject.threads_init()
 
2368
    
2081
2369
    global main_loop
2082
2370
    # From the Avahi example code
2083
 
    DBusGMainLoop(set_as_default=True )
 
2371
    DBusGMainLoop(set_as_default=True)
2084
2372
    main_loop = gobject.MainLoop()
2085
2373
    bus = dbus.SystemBus()
2086
2374
    # End of Avahi example code
2092
2380
                            ("se.bsnet.fukt.Mandos", bus,
2093
2381
                             do_not_queue=True))
2094
2382
        except dbus.exceptions.NameExistsException as e:
2095
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2383
            logger.error("Disabling D-Bus:", exc_info=e)
2096
2384
            use_dbus = False
2097
2385
            server_settings["use_dbus"] = False
2098
2386
            tcp_server.use_dbus = False
2110
2398
    
2111
2399
    client_class = Client
2112
2400
    if use_dbus:
2113
 
        client_class = functools.partial(ClientDBusTransitional,
2114
 
                                         bus = bus)
2115
 
    
2116
 
    special_settings = {
2117
 
        # Some settings need to be accessd by special methods;
2118
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2119
 
        "approved_by_default":
2120
 
            lambda section:
2121
 
            client_config.getboolean(section, "approved_by_default"),
2122
 
        }
2123
 
    # Construct a new dict of client settings of this form:
2124
 
    # { client_name: {setting_name: value, ...}, ...}
2125
 
    # with exceptions for any special settings as defined above
2126
 
    client_settings = dict((clientname,
2127
 
                           dict((setting,
2128
 
                                 (value if setting not in special_settings
2129
 
                                  else special_settings[setting](clientname)))
2130
 
                                for setting, value in client_config.items(clientname)))
2131
 
                          for clientname in client_config.sections())
2132
 
    
 
2401
        client_class = functools.partial(ClientDBus, bus = bus)
 
2402
    
 
2403
    client_settings = Client.config_parser(client_config)
2133
2404
    old_client_settings = {}
2134
 
    clients_data = []
2135
 
 
2136
 
    # Get client data and settings from last running state. 
 
2405
    clients_data = {}
 
2406
    
 
2407
    # Get client data and settings from last running state.
2137
2408
    if server_settings["restore"]:
2138
2409
        try:
2139
2410
            with open(stored_state_path, "rb") as stored_state:
2140
 
                clients_data, old_client_settings = pickle.load(stored_state)
 
2411
                clients_data, old_client_settings = (pickle.load
 
2412
                                                     (stored_state))
2141
2413
            os.remove(stored_state_path)
2142
2414
        except IOError as e:
2143
 
            logger.warning("Could not load persistant state: {0}".format(e))
2144
 
            if e.errno != errno.ENOENT:
 
2415
            if e.errno == errno.ENOENT:
 
2416
                logger.warning("Could not load persistent state: {0}"
 
2417
                                .format(os.strerror(e.errno)))
 
2418
            else:
 
2419
                logger.critical("Could not load persistent state:",
 
2420
                                exc_info=e)
2145
2421
                raise
2146
 
 
2147
 
    for client in clients_data:
2148
 
        client_name = client["name"]
2149
 
        
2150
 
        # Decide which value to use after restoring saved state.
2151
 
        # We have three different values: Old config file,
2152
 
        # new config file, and saved state.
2153
 
        # New config value takes precedence if it differs from old
2154
 
        # config value, otherwise use saved state.
2155
 
        for name, value in client_settings[client_name].items():
 
2422
        except EOFError as e:
 
2423
            logger.warning("Could not load persistent state: "
 
2424
                           "EOFError:", exc_info=e)
 
2425
    
 
2426
    with PGPEngine() as pgp:
 
2427
        for client_name, client in clients_data.iteritems():
 
2428
            # Decide which value to use after restoring saved state.
 
2429
            # We have three different values: Old config file,
 
2430
            # new config file, and saved state.
 
2431
            # New config value takes precedence if it differs from old
 
2432
            # config value, otherwise use saved state.
 
2433
            for name, value in client_settings[client_name].items():
 
2434
                try:
 
2435
                    # For each value in new config, check if it
 
2436
                    # differs from the old config value (Except for
 
2437
                    # the "secret" attribute)
 
2438
                    if (name != "secret" and
 
2439
                        value != old_client_settings[client_name]
 
2440
                        [name]):
 
2441
                        client[name] = value
 
2442
                except KeyError:
 
2443
                    pass
 
2444
            
 
2445
            # Clients who has passed its expire date can still be
 
2446
            # enabled if its last checker was successful.  Clients
 
2447
            # whose checker succeeded before we stored its state is
 
2448
            # assumed to have successfully run all checkers during
 
2449
            # downtime.
 
2450
            if client["enabled"]:
 
2451
                if datetime.datetime.utcnow() >= client["expires"]:
 
2452
                    if not client["last_checked_ok"]:
 
2453
                        logger.warning(
 
2454
                            "disabling client {0} - Client never "
 
2455
                            "performed a successful checker"
 
2456
                            .format(client_name))
 
2457
                        client["enabled"] = False
 
2458
                    elif client["last_checker_status"] != 0:
 
2459
                        logger.warning(
 
2460
                            "disabling client {0} - Client "
 
2461
                            "last checker failed with error code {1}"
 
2462
                            .format(client_name,
 
2463
                                    client["last_checker_status"]))
 
2464
                        client["enabled"] = False
 
2465
                    else:
 
2466
                        client["expires"] = (datetime.datetime
 
2467
                                             .utcnow()
 
2468
                                             + client["timeout"])
 
2469
                        logger.debug("Last checker succeeded,"
 
2470
                                     " keeping {0} enabled"
 
2471
                                     .format(client_name))
2156
2472
            try:
2157
 
                # For each value in new config, check if it differs
2158
 
                # from the old config value (Except for the "secret"
2159
 
                # attribute)
2160
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2161
 
                    setattr(client, name, value)
2162
 
            except KeyError:
2163
 
                pass
2164
 
 
2165
 
        # Clients who has passed its expire date, can still be enabled if its
2166
 
        # last checker was sucessful. Clients who checkers failed before we
2167
 
        # stored it state is asumed to had failed checker during downtime.
2168
 
        if client["enabled"] and client["last_checked_ok"]:
2169
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2170
 
                > client["interval"]):
2171
 
                if client["last_checker_status"] != 0:
2172
 
                    client["enabled"] = False
2173
 
                else:
2174
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2175
 
 
2176
 
        client["changedstate"] = (multiprocessing_manager
2177
 
                                  .Condition(multiprocessing_manager
2178
 
                                             .Lock()))
2179
 
        if use_dbus:
2180
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2181
 
            tcp_server.clients[client_name] = new_client
2182
 
            new_client.bus = bus
2183
 
            for name, value in client.iteritems():
2184
 
                setattr(new_client, name, value)
2185
 
            client_object_name = unicode(client_name).translate(
2186
 
                {ord("."): ord("_"),
2187
 
                 ord("-"): ord("_")})
2188
 
            new_client.dbus_object_path = (dbus.ObjectPath
2189
 
                                     ("/clients/" + client_object_name))
2190
 
            DBusObjectWithProperties.__init__(new_client,
2191
 
                                              new_client.bus,
2192
 
                                              new_client.dbus_object_path)
2193
 
        else:
2194
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2195
 
            for name, value in client.iteritems():
2196
 
                setattr(tcp_server.clients[client_name], name, value)
2197
 
                
2198
 
        tcp_server.clients[client_name].decrypt_secret(
2199
 
            client_settings[client_name]["secret"])            
2200
 
        
2201
 
    # Create/remove clients based on new changes made to config
2202
 
    for clientname in set(old_client_settings) - set(client_settings):
2203
 
        del tcp_server.clients[clientname]
2204
 
    for clientname in set(client_settings) - set(old_client_settings):
2205
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2206
 
                                                       config =
2207
 
                                                       client_settings
2208
 
                                                       [clientname]))
2209
 
    
2210
 
 
 
2473
                client["secret"] = (
 
2474
                    pgp.decrypt(client["encrypted_secret"],
 
2475
                                client_settings[client_name]
 
2476
                                ["secret"]))
 
2477
            except PGPError:
 
2478
                # If decryption fails, we use secret from new settings
 
2479
                logger.debug("Failed to decrypt {0} old secret"
 
2480
                             .format(client_name))
 
2481
                client["secret"] = (
 
2482
                    client_settings[client_name]["secret"])
 
2483
    
 
2484
    # Add/remove clients based on new changes made to config
 
2485
    for client_name in (set(old_client_settings)
 
2486
                        - set(client_settings)):
 
2487
        del clients_data[client_name]
 
2488
    for client_name in (set(client_settings)
 
2489
                        - set(old_client_settings)):
 
2490
        clients_data[client_name] = client_settings[client_name]
 
2491
    
 
2492
    # Create all client objects
 
2493
    for client_name, client in clients_data.iteritems():
 
2494
        tcp_server.clients[client_name] = client_class(
 
2495
            name = client_name, settings = client)
 
2496
    
2211
2497
    if not tcp_server.clients:
2212
2498
        logger.warning("No clients defined")
2213
 
        
 
2499
    
2214
2500
    if not debug:
2215
2501
        try:
2216
2502
            with pidfile:
2224
2510
            # "pidfile" was never created
2225
2511
            pass
2226
2512
        del pidfilename
2227
 
        
2228
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2229
2513
    
2230
2514
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2231
2515
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2232
2516
    
2233
2517
    if use_dbus:
2234
 
        class MandosDBusService(dbus.service.Object):
 
2518
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2519
                                        "se.bsnet.fukt.Mandos"})
 
2520
        class MandosDBusService(DBusObjectWithProperties):
2235
2521
            """A D-Bus proxy object"""
2236
2522
            def __init__(self):
2237
2523
                dbus.service.Object.__init__(self, bus, "/")
2238
2524
            _interface = "se.recompile.Mandos"
2239
2525
            
 
2526
            @dbus_interface_annotations(_interface)
 
2527
            def _foo(self):
 
2528
                return { "org.freedesktop.DBus.Property"
 
2529
                         ".EmitsChangedSignal":
 
2530
                             "false"}
 
2531
            
2240
2532
            @dbus.service.signal(_interface, signature="o")
2241
2533
            def ClientAdded(self, objpath):
2242
2534
                "D-Bus signal"
2284
2576
            
2285
2577
            del _interface
2286
2578
        
2287
 
        class MandosDBusServiceTransitional(MandosDBusService):
2288
 
            __metaclass__ = AlternateDBusNamesMetaclass
2289
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2579
        mandos_dbus_service = MandosDBusService()
2290
2580
    
2291
2581
    def cleanup():
2292
2582
        "Cleanup function; run on exit"
2295
2585
        multiprocessing.active_children()
2296
2586
        if not (tcp_server.clients or client_settings):
2297
2587
            return
2298
 
 
2299
 
        # Store client before exiting. Secrets are encrypted with key based
2300
 
        # on what config file has. If config file is removed/edited, old
2301
 
        # secret will thus be unrecovable.
2302
 
        clients = []
2303
 
        for client in tcp_server.clients.itervalues():
2304
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2305
 
 
2306
 
            client_dict = {}
2307
 
 
2308
 
            # A list of attributes that will not be stored when shuting down.
2309
 
            exclude = set(("bus", "changedstate", "secret"))            
2310
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2311
 
                exclude.add(name)
2312
 
                
2313
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2314
 
            for attr in client.client_structure:
2315
 
                if attr not in exclude:
2316
 
                    client_dict[attr] = getattr(client, attr)
2317
 
 
2318
 
            clients.append(client_dict) 
2319
 
            del client_settings[client.name]["secret"]
2320
 
            
 
2588
        
 
2589
        # Store client before exiting. Secrets are encrypted with key
 
2590
        # based on what config file has. If config file is
 
2591
        # removed/edited, old secret will thus be unrecovable.
 
2592
        clients = {}
 
2593
        with PGPEngine() as pgp:
 
2594
            for client in tcp_server.clients.itervalues():
 
2595
                key = client_settings[client.name]["secret"]
 
2596
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2597
                                                      key)
 
2598
                client_dict = {}
 
2599
                
 
2600
                # A list of attributes that can not be pickled
 
2601
                # + secret.
 
2602
                exclude = set(("bus", "changedstate", "secret",
 
2603
                               "checker"))
 
2604
                for name, typ in (inspect.getmembers
 
2605
                                  (dbus.service.Object)):
 
2606
                    exclude.add(name)
 
2607
                
 
2608
                client_dict["encrypted_secret"] = (client
 
2609
                                                   .encrypted_secret)
 
2610
                for attr in client.client_structure:
 
2611
                    if attr not in exclude:
 
2612
                        client_dict[attr] = getattr(client, attr)
 
2613
                
 
2614
                clients[client.name] = client_dict
 
2615
                del client_settings[client.name]["secret"]
 
2616
        
2321
2617
        try:
2322
 
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
2618
            with (tempfile.NamedTemporaryFile
 
2619
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2620
                   dir=os.path.dirname(stored_state_path),
 
2621
                   delete=False)) as stored_state:
2323
2622
                pickle.dump((clients, client_settings), stored_state)
2324
 
        except IOError as e:
2325
 
            logger.warning("Could not save persistant state: {0}".format(e))
2326
 
            if e.errno != errno.ENOENT:
2327
 
                raise
2328
 
 
 
2623
                tempname=stored_state.name
 
2624
            os.rename(tempname, stored_state_path)
 
2625
        except (IOError, OSError) as e:
 
2626
            if not debug:
 
2627
                try:
 
2628
                    os.remove(tempname)
 
2629
                except NameError:
 
2630
                    pass
 
2631
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2632
                logger.warning("Could not save persistent state: {0}"
 
2633
                               .format(os.strerror(e.errno)))
 
2634
            else:
 
2635
                logger.warning("Could not save persistent state:",
 
2636
                               exc_info=e)
 
2637
                raise e
 
2638
        
2329
2639
        # Delete all clients, and settings from config
2330
2640
        while tcp_server.clients:
2331
2641
            name, client = tcp_server.clients.popitem()
2349
2659
        # Need to initiate checking of clients
2350
2660
        if client.enabled:
2351
2661
            client.init_checker()
2352
 
 
2353
2662
    
2354
2663
    tcp_server.enable()
2355
2664
    tcp_server.server_activate()
2358
2667
    service.port = tcp_server.socket.getsockname()[1]
2359
2668
    if use_ipv6:
2360
2669
        logger.info("Now listening on address %r, port %d,"
2361
 
                    " flowinfo %d, scope_id %d"
2362
 
                    % tcp_server.socket.getsockname())
 
2670
                    " flowinfo %d, scope_id %d",
 
2671
                    *tcp_server.socket.getsockname())
2363
2672
    else:                       # IPv4
2364
 
        logger.info("Now listening on address %r, port %d"
2365
 
                    % tcp_server.socket.getsockname())
 
2673
        logger.info("Now listening on address %r, port %d",
 
2674
                    *tcp_server.socket.getsockname())
2366
2675
    
2367
2676
    #service.interface = tcp_server.socket.getsockname()[3]
2368
2677
    
2371
2680
        try:
2372
2681
            service.activate()
2373
2682
        except dbus.exceptions.DBusException as error:
2374
 
            logger.critical("DBusException: %s", error)
 
2683
            logger.critical("D-Bus Exception", exc_info=error)
2375
2684
            cleanup()
2376
2685
            sys.exit(1)
2377
2686
        # End of Avahi example code
2384
2693
        logger.debug("Starting main loop")
2385
2694
        main_loop.run()
2386
2695
    except AvahiError as error:
2387
 
        logger.critical("AvahiError: %s", error)
 
2696
        logger.critical("Avahi Error", exc_info=error)
2388
2697
        cleanup()
2389
2698
        sys.exit(1)
2390
2699
    except KeyboardInterrupt:
2395
2704
    # Must run before the D-Bus bus name gets deregistered
2396
2705
    cleanup()
2397
2706
 
2398
 
 
2399
2707
if __name__ == '__main__':
2400
2708
    main()