/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-06-17 14:55:31 UTC
  • mto: (301.1.1 release) (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 302.
  • Revision ID: teddy@recompile.se-20120617145531-o24z982oerm6xb6s
* mandos: New "--foreground" option.

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"
89
 
stored_state_path = "/var/lib/mandos/clients.pickle"
 
91
version = "1.5.5"
 
92
stored_state_file = "clients.pickle"
90
93
 
91
94
logger = logging.getLogger()
92
95
syslogger = (logging.handlers.SysLogHandler
110
113
        return interface_index
111
114
 
112
115
 
113
 
def initlogger(level=logging.WARNING):
 
116
def initlogger(debug, level=logging.WARNING):
114
117
    """init logger and add loglevel"""
115
118
    
116
119
    syslogger.setFormatter(logging.Formatter
118
121
                            ' %(message)s'))
119
122
    logger.addHandler(syslogger)
120
123
    
121
 
    console = logging.StreamHandler()
122
 
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
123
 
                                           ' [%(process)d]:'
124
 
                                           ' %(levelname)s:'
125
 
                                           ' %(message)s'))
126
 
    logger.addHandler(console)
 
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)
127
131
    logger.setLevel(level)
128
132
 
129
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
 
212
 
 
213
 
130
214
class AvahiError(Exception):
131
215
    def __init__(self, value, *args, **kwargs):
132
216
        self.value = value
161
245
    server: D-Bus Server
162
246
    bus: dbus.SystemBus()
163
247
    """
 
248
    
164
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
165
250
                 servicetype = None, port = None, TXT = None,
166
251
                 domain = "", host = "", max_renames = 32768,
179
264
        self.server = None
180
265
        self.bus = bus
181
266
        self.entry_group_state_changed_match = None
 
267
    
182
268
    def rename(self):
183
269
        """Derived from the Avahi example code"""
184
270
        if self.rename_count >= self.max_renames:
194
280
        try:
195
281
            self.add()
196
282
        except dbus.exceptions.DBusException as error:
197
 
            logger.critical("DBusException: %s", error)
 
283
            logger.critical("D-Bus Exception", exc_info=error)
198
284
            self.cleanup()
199
285
            os._exit(1)
200
286
        self.rename_count += 1
 
287
    
201
288
    def remove(self):
202
289
        """Derived from the Avahi example code"""
203
290
        if self.entry_group_state_changed_match is not None:
205
292
            self.entry_group_state_changed_match = None
206
293
        if self.group is not None:
207
294
            self.group.Reset()
 
295
    
208
296
    def add(self):
209
297
        """Derived from the Avahi example code"""
210
298
        self.remove()
227
315
            dbus.UInt16(self.port),
228
316
            avahi.string_array_to_txt_array(self.TXT))
229
317
        self.group.Commit()
 
318
    
230
319
    def entry_group_state_changed(self, state, error):
231
320
        """Derived from the Avahi example code"""
232
321
        logger.debug("Avahi entry group state change: %i", state)
239
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
240
329
            logger.critical("Avahi: Error in group state changed %s",
241
330
                            unicode(error))
242
 
            raise AvahiGroupError("State changed: %s"
243
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
244
334
    def cleanup(self):
245
335
        """Derived from the Avahi example code"""
246
336
        if self.group is not None:
251
341
                pass
252
342
            self.group = None
253
343
        self.remove()
 
344
    
254
345
    def server_state_changed(self, state, error=None):
255
346
        """Derived from the Avahi example code"""
256
347
        logger.debug("Avahi server state change: %i", state)
275
366
                logger.debug("Unknown state: %r", state)
276
367
            else:
277
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
278
370
    def activate(self):
279
371
        """Derived from the Avahi example code"""
280
372
        if self.server is None:
287
379
                                 self.server_state_changed)
288
380
        self.server_state_changed(self.server.GetState())
289
381
 
 
382
 
290
383
class AvahiServiceToSyslog(AvahiService):
291
384
    def rename(self):
292
385
        """Add the new name to the syslog messages"""
293
386
        ret = AvahiService.rename(self)
294
387
        syslogger.setFormatter(logging.Formatter
295
 
                               ('Mandos (%s) [%%(process)d]:'
296
 
                                ' %%(levelname)s: %%(message)s'
297
 
                                % self.name))
 
388
                               ('Mandos ({0}) [%(process)d]:'
 
389
                                ' %(levelname)s: %(message)s'
 
390
                                .format(self.name)))
298
391
        return ret
299
392
 
300
 
def _timedelta_to_milliseconds(td):
 
393
 
 
394
def timedelta_to_milliseconds(td):
301
395
    "Convert a datetime.timedelta() to milliseconds"
302
396
    return ((td.days * 24 * 60 * 60 * 1000)
303
397
            + (td.seconds * 1000)
304
398
            + (td.microseconds // 1000))
305
 
        
 
399
 
 
400
 
306
401
class Client(object):
307
402
    """A representation of a client host served by this server.
308
403
    
309
404
    Attributes:
310
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
405
    approved:   bool(); 'None' if not yet approved/disapproved
311
406
    approval_delay: datetime.timedelta(); Time to wait for approval
312
407
    approval_duration: datetime.timedelta(); Duration of one approval
313
408
    checker:    subprocess.Popen(); a running checker process used
331
426
    interval:   datetime.timedelta(); How often to start a new checker
332
427
    last_approval_request: datetime.datetime(); (UTC) or None
333
428
    last_checked_ok: datetime.datetime(); (UTC) or None
334
 
    last_checker_status: integer between 0 and 255 reflecting exit status
335
 
                         of last checker. -1 reflect crashed checker,
336
 
                         or None.
337
 
    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
338
433
    name:       string; from the config file, used in log messages and
339
434
                        D-Bus identifiers
340
435
    secret:     bytestring; sent verbatim (over TLS) to client
341
436
    timeout:    datetime.timedelta(); How long from last_checked_ok
342
437
                                      until this client is disabled
343
 
    extended_timeout:   extra long timeout when password has been sent
 
438
    extended_timeout:   extra long timeout when secret has been sent
344
439
    runtime_expansions: Allowed attributes for runtime expansion.
345
440
    expires:    datetime.datetime(); time (UTC) when a client will be
346
441
                disabled, or None
347
442
    """
348
443
    
349
444
    runtime_expansions = ("approval_delay", "approval_duration",
350
 
                          "created", "enabled", "fingerprint",
351
 
                          "host", "interval", "last_checked_ok",
 
445
                          "created", "enabled", "expires",
 
446
                          "fingerprint", "host", "interval",
 
447
                          "last_approval_request", "last_checked_ok",
352
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
                        }
353
459
    
354
460
    def timeout_milliseconds(self):
355
461
        "Return the 'timeout' attribute in milliseconds"
356
 
        return _timedelta_to_milliseconds(self.timeout)
 
462
        return timedelta_to_milliseconds(self.timeout)
357
463
    
358
464
    def extended_timeout_milliseconds(self):
359
465
        "Return the 'extended_timeout' attribute in milliseconds"
360
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
466
        return timedelta_to_milliseconds(self.extended_timeout)
361
467
    
362
468
    def interval_milliseconds(self):
363
469
        "Return the 'interval' attribute in milliseconds"
364
 
        return _timedelta_to_milliseconds(self.interval)
 
470
        return timedelta_to_milliseconds(self.interval)
365
471
    
366
472
    def approval_delay_milliseconds(self):
367
 
        return _timedelta_to_milliseconds(self.approval_delay)
368
 
    
369
 
    def __init__(self, name = None, config=None):
370
 
        """Note: the 'checker' key in 'config' sets the
371
 
        'checker_command' attribute and *not* the 'checker'
372
 
        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):
373
523
        self.name = name
374
 
        if config is None:
375
 
            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
        
376
538
        logger.debug("Creating client %r", self.name)
377
539
        # Uppercase and remove spaces from fingerprint for later
378
540
        # comparison purposes with return value from the fingerprint()
379
541
        # function
380
 
        self.fingerprint = (config["fingerprint"].upper()
381
 
                            .replace(" ", ""))
382
542
        logger.debug("  Fingerprint: %s", self.fingerprint)
383
 
        if "secret" in config:
384
 
            self.secret = config["secret"].decode("base64")
385
 
        elif "secfile" in config:
386
 
            with open(os.path.expanduser(os.path.expandvars
387
 
                                         (config["secfile"])),
388
 
                      "rb") as secfile:
389
 
                self.secret = secfile.read()
390
 
        else:
391
 
            raise TypeError("No secret or secfile for client %s"
392
 
                            % self.name)
393
 
        self.host = config.get("host", "")
394
 
        self.created = datetime.datetime.utcnow()
395
 
        self.enabled = True
396
 
        self.last_approval_request = None
397
 
        self.last_enabled = datetime.datetime.utcnow()
398
 
        self.last_checked_ok = None
399
 
        self.last_checker_status = None
400
 
        self.timeout = string_to_delta(config["timeout"])
401
 
        self.extended_timeout = string_to_delta(config
402
 
                                                ["extended_timeout"])
403
 
        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
404
547
        self.checker = None
405
548
        self.checker_initiator_tag = None
406
549
        self.disable_initiator_tag = None
407
 
        self.expires = datetime.datetime.utcnow() + self.timeout
408
550
        self.checker_callback_tag = None
409
 
        self.checker_command = config["checker"]
410
551
        self.current_checker_command = None
411
 
        self._approved = None
412
 
        self.approved_by_default = config.get("approved_by_default",
413
 
                                              True)
 
552
        self.approved = None
414
553
        self.approvals_pending = 0
415
 
        self.approval_delay = string_to_delta(
416
 
            config["approval_delay"])
417
 
        self.approval_duration = string_to_delta(
418
 
            config["approval_duration"])
419
554
        self.changedstate = (multiprocessing_manager
420
555
                             .Condition(multiprocessing_manager
421
556
                                        .Lock()))
422
 
        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("_")]
423
560
        self.client_structure.append("client_structure")
424
561
        
425
562
        for name, t in inspect.getmembers(type(self),
426
 
                                          lambda obj: isinstance(obj, property)):
 
563
                                          lambda obj:
 
564
                                              isinstance(obj,
 
565
                                                         property)):
427
566
            if not name.startswith("_"):
428
567
                self.client_structure.append(name)
429
568
    
437
576
        if getattr(self, "enabled", False):
438
577
            # Already enabled
439
578
            return
440
 
        self.send_changedstate()
441
579
        self.expires = datetime.datetime.utcnow() + self.timeout
442
580
        self.enabled = True
443
581
        self.last_enabled = datetime.datetime.utcnow()
444
582
        self.init_checker()
 
583
        self.send_changedstate()
445
584
    
446
585
    def disable(self, quiet=True):
447
586
        """Disable this client."""
448
587
        if not getattr(self, "enabled", False):
449
588
            return False
450
589
        if not quiet:
451
 
            self.send_changedstate()
452
 
        if not quiet:
453
590
            logger.info("Disabling client %s", self.name)
454
 
        if getattr(self, "disable_initiator_tag", False):
 
591
        if getattr(self, "disable_initiator_tag", None) is not None:
455
592
            gobject.source_remove(self.disable_initiator_tag)
456
593
            self.disable_initiator_tag = None
457
594
        self.expires = None
458
 
        if getattr(self, "checker_initiator_tag", False):
 
595
        if getattr(self, "checker_initiator_tag", None) is not None:
459
596
            gobject.source_remove(self.checker_initiator_tag)
460
597
            self.checker_initiator_tag = None
461
598
        self.stop_checker()
462
599
        self.enabled = False
 
600
        if not quiet:
 
601
            self.send_changedstate()
463
602
        # Do not run this again if called by a gobject.timeout_add
464
603
        return False
465
604
    
469
608
    def init_checker(self):
470
609
        # Schedule a new checker to be started an 'interval' from now,
471
610
        # and every interval from then on.
 
611
        if self.checker_initiator_tag is not None:
 
612
            gobject.source_remove(self.checker_initiator_tag)
472
613
        self.checker_initiator_tag = (gobject.timeout_add
473
614
                                      (self.interval_milliseconds(),
474
615
                                       self.start_checker))
475
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)
476
619
        self.disable_initiator_tag = (gobject.timeout_add
477
620
                                   (self.timeout_milliseconds(),
478
621
                                    self.disable))
484
627
        self.checker_callback_tag = None
485
628
        self.checker = None
486
629
        if os.WIFEXITED(condition):
487
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
630
            self.last_checker_status = os.WEXITSTATUS(condition)
488
631
            if self.last_checker_status == 0:
489
632
                logger.info("Checker for %(name)s succeeded",
490
633
                            vars(self))
497
640
            logger.warning("Checker for %(name)s crashed?",
498
641
                           vars(self))
499
642
    
500
 
    def checked_ok(self, timeout=None):
501
 
        """Bump up the timeout for this client.
502
 
        
503
 
        This should only be called when the client has been seen,
504
 
        alive and well.
505
 
        """
 
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."""
506
651
        if timeout is None:
507
652
            timeout = self.timeout
508
 
        self.last_checked_ok = datetime.datetime.utcnow()
509
653
        if self.disable_initiator_tag is not None:
510
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
            self.disable_initiator_tag = None
511
656
        if getattr(self, "enabled", False):
512
657
            self.disable_initiator_tag = (gobject.timeout_add
513
 
                                          (_timedelta_to_milliseconds
 
658
                                          (timedelta_to_milliseconds
514
659
                                           (timeout), self.disable))
515
660
            self.expires = datetime.datetime.utcnow() + timeout
516
661
    
523
668
        If a checker already exists, leave it running and do
524
669
        nothing."""
525
670
        # The reason for not killing a running checker is that if we
526
 
        # did that, then if a checker (for some reason) started
527
 
        # running slowly and taking more than 'interval' time, the
528
 
        # client would inevitably timeout, since no checker would get
529
 
        # 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
530
675
        # checkers alone, the checker would have to take more time
531
676
        # than 'timeout' for the client to be disabled, which is as it
532
677
        # should be.
546
691
                                      self.current_checker_command)
547
692
        # Start a new checker if needed
548
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)
549
699
            try:
550
 
                # In case checker_command has exactly one % operator
551
 
                command = self.checker_command % self.host
552
 
            except TypeError:
553
 
                # Escape attributes for the shell
554
 
                escaped_attrs = dict(
555
 
                    (attr,
556
 
                     re.escape(unicode(str(getattr(self, attr, "")),
557
 
                                       errors=
558
 
                                       'replace')))
559
 
                    for attr in
560
 
                    self.runtime_expansions)
561
 
                
562
 
                try:
563
 
                    command = self.checker_command % escaped_attrs
564
 
                except TypeError as error:
565
 
                    logger.error('Could not format string "%s":'
566
 
                                 ' %s', self.checker_command, error)
567
 
                    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
568
705
            self.current_checker_command = command
569
706
            try:
570
707
                logger.info("Starting checker %r for %s",
576
713
                self.checker = subprocess.Popen(command,
577
714
                                                close_fds=True,
578
715
                                                shell=True, cwd="/")
579
 
                self.checker_callback_tag = (gobject.child_watch_add
580
 
                                             (self.checker.pid,
581
 
                                              self.checker_callback,
582
 
                                              data=command))
583
 
                # The checker may have completed before the gobject
584
 
                # watch was added.  Check for this.
585
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
586
 
                if pid:
587
 
                    gobject.source_remove(self.checker_callback_tag)
588
 
                    self.checker_callback(pid, status, command)
589
716
            except OSError as error:
590
 
                logger.error("Failed to start subprocess: %s",
591
 
                             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)
592
729
        # Re-run this periodically if run by gobject.timeout_add
593
730
        return True
594
731
    
601
738
            return
602
739
        logger.debug("Stopping checker for %(name)s", vars(self))
603
740
        try:
604
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
741
            self.checker.terminate()
605
742
            #time.sleep(0.5)
606
743
            #if self.checker.poll() is None:
607
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
744
            #    self.checker.kill()
608
745
        except OSError as error:
609
746
            if error.errno != errno.ESRCH: # No such process
610
747
                raise
611
748
        self.checker = None
612
 
    
613
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
614
 
    def encrypt_secret(self, key):
615
 
        # Encryption-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
 
        # Create validation hash so we know at decryption if it was sucessful
621
 
        hasheng = hashlib.sha256()
622
 
        hasheng.update(self.secret)
623
 
        validationhash = hasheng.digest()
624
 
        
625
 
        # Encrypt secret
626
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
627
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
628
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
629
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
630
 
        self.encrypted_secret = (ciphertext, iv)
631
 
    
632
 
    # Decrypt a encrypted client secret
633
 
    def decrypt_secret(self, key):
634
 
        # Decryption-key need to be of a specific size, so we hash inputed key
635
 
        hasheng = hashlib.sha256()
636
 
        hasheng.update(key)
637
 
        encryptionkey = hasheng.digest()
638
 
        
639
 
        # Decrypt encrypted secret
640
 
        ciphertext, iv = self.encrypted_secret
641
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
642
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
643
 
        plain = ciphereng.decrypt(ciphertext)
644
 
        
645
 
        # Validate decrypted secret to know if it was succesful
646
 
        hasheng = hashlib.sha256()
647
 
        validationhash = plain[:hasheng.digest_size]
648
 
        secret = plain[hasheng.digest_size:]
649
 
        hasheng.update(secret)
650
 
        
651
 
        # if validation fails, we use key as new secret. Otherwhise, we use
652
 
        # the decrypted secret
653
 
        if hasheng.digest() == validationhash:
654
 
            self.secret = secret
655
 
        else:
656
 
            self.secret = key
657
 
        del self.encrypted_secret
658
749
 
659
750
 
660
751
def dbus_service_property(dbus_interface, signature="v",
673
764
    # "Set" method, so we fail early here:
674
765
    if byte_arrays and signature != "ay":
675
766
        raise ValueError("Byte arrays not supported for non-'ay'"
676
 
                         " signature %r" % signature)
 
767
                         " signature {0!r}".format(signature))
677
768
    def decorator(func):
678
769
        func._dbus_is_property = True
679
770
        func._dbus_interface = dbus_interface
687
778
    return decorator
688
779
 
689
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
 
690
818
class DBusPropertyException(dbus.exceptions.DBusException):
691
819
    """A base class for D-Bus property-related exceptions
692
820
    """
715
843
    """
716
844
    
717
845
    @staticmethod
718
 
    def _is_dbus_property(obj):
719
 
        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)
720
854
    
721
 
    def _get_all_dbus_properties(self):
 
855
    def _get_all_dbus_things(self, thing):
722
856
        """Returns a generator of (name, attribute) pairs
723
857
        """
724
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
858
        return ((getattr(athing.__get__(self), "_dbus_name",
 
859
                         name),
 
860
                 athing.__get__(self))
725
861
                for cls in self.__class__.__mro__
726
 
                for name, prop in
727
 
                inspect.getmembers(cls, self._is_dbus_property))
 
862
                for name, athing in
 
863
                inspect.getmembers(cls,
 
864
                                   self._is_dbus_thing(thing)))
728
865
    
729
866
    def _get_dbus_property(self, interface_name, property_name):
730
867
        """Returns a bound method if one exists which is a D-Bus
732
869
        """
733
870
        for cls in  self.__class__.__mro__:
734
871
            for name, value in (inspect.getmembers
735
 
                                (cls, self._is_dbus_property)):
 
872
                                (cls,
 
873
                                 self._is_dbus_thing("property"))):
736
874
                if (value._dbus_name == property_name
737
875
                    and value._dbus_interface == interface_name):
738
876
                    return value.__get__(self)
767
905
            # signatures other than "ay".
768
906
            if prop._dbus_signature != "ay":
769
907
                raise ValueError
770
 
            value = dbus.ByteArray(''.join(unichr(byte)
771
 
                                           for byte in value))
 
908
            value = dbus.ByteArray(b''.join(chr(byte)
 
909
                                            for byte in value))
772
910
        prop(value)
773
911
    
774
912
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
780
918
        Note: Will not include properties with access="write".
781
919
        """
782
920
        properties = {}
783
 
        for name, prop in self._get_all_dbus_properties():
 
921
        for name, prop in self._get_all_dbus_things("property"):
784
922
            if (interface_name
785
923
                and interface_name != prop._dbus_interface):
786
924
                # Interface non-empty but did not match
801
939
                         path_keyword='object_path',
802
940
                         connection_keyword='connection')
803
941
    def Introspect(self, object_path, connection):
804
 
        """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.
805
945
        """
806
946
        xmlstring = dbus.service.Object.Introspect(self, object_path,
807
947
                                                   connection)
814
954
                e.setAttribute("access", prop._dbus_access)
815
955
                return e
816
956
            for if_tag in document.getElementsByTagName("interface"):
 
957
                # Add property tags
817
958
                for tag in (make_tag(document, name, prop)
818
959
                            for name, prop
819
 
                            in self._get_all_dbus_properties()
 
960
                            in self._get_all_dbus_things("property")
820
961
                            if prop._dbus_interface
821
962
                            == if_tag.getAttribute("name")):
822
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)
823
995
                # Add the names to the return values for the
824
996
                # "org.freedesktop.DBus.Properties" methods
825
997
                if (if_tag.getAttribute("name")
840
1012
        except (AttributeError, xml.dom.DOMException,
841
1013
                xml.parsers.expat.ExpatError) as error:
842
1014
            logger.error("Failed to override Introspection method",
843
 
                         error)
 
1015
                         exc_info=error)
844
1016
        return xmlstring
845
1017
 
846
1018
 
847
 
def datetime_to_dbus (dt, variant_level=0):
 
1019
def datetime_to_dbus(dt, variant_level=0):
848
1020
    """Convert a UTC datetime.datetime() to a D-Bus type."""
849
1021
    if dt is None:
850
1022
        return dbus.String("", variant_level = variant_level)
852
1024
                       variant_level=variant_level)
853
1025
 
854
1026
 
855
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
856
 
                                  .__metaclass__):
857
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
858
 
    will add additional D-Bus attributes matching a certain pattern.
 
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).
859
1049
    """
860
 
    def __new__(mcs, name, bases, attr):
861
 
        # Go through all the base classes which could have D-Bus
862
 
        # methods, signals, or properties in them
863
 
        for base in (b for b in bases
864
 
                     if issubclass(b, dbus.service.Object)):
865
 
            # Go though all attributes of the base class
866
 
            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):
867
1057
                # Ignore non-D-Bus attributes, and D-Bus attributes
868
1058
                # with the wrong interface name
869
1059
                if (not hasattr(attribute, "_dbus_interface")
870
1060
                    or not attribute._dbus_interface
871
 
                    .startswith("se.recompile.Mandos")):
 
1061
                    .startswith(orig_interface_name)):
872
1062
                    continue
873
1063
                # Create an alternate D-Bus interface name based on
874
1064
                # the current name
875
1065
                alt_interface = (attribute._dbus_interface
876
 
                                 .replace("se.recompile.Mandos",
877
 
                                          "se.bsnet.fukt.Mandos"))
 
1066
                                 .replace(orig_interface_name,
 
1067
                                          alt_interface_name))
 
1068
                interface_names.add(alt_interface)
878
1069
                # Is this a D-Bus signal?
879
1070
                if getattr(attribute, "_dbus_is_signal", False):
880
1071
                    # Extract the original non-method function by
895
1086
                                nonmethod_func.func_name,
896
1087
                                nonmethod_func.func_defaults,
897
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
898
1095
                    # Define a creator of a function to call both the
899
 
                    # old and new functions, so both the old and new
900
 
                    # 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
901
1099
                    def fixscope(func1, func2):
902
1100
                        """This function is a scope container to pass
903
1101
                        func1 and func2 to the "call_both" function
910
1108
                        return call_both
911
1109
                    # Create the "call_both" function and add it to
912
1110
                    # the class
913
 
                    attr[attrname] = fixscope(attribute,
914
 
                                              new_function)
 
1111
                    attr[attrname] = fixscope(attribute, new_function)
915
1112
                # Is this a D-Bus method?
916
1113
                elif getattr(attribute, "_dbus_is_method", False):
917
1114
                    # Create a new, but exactly alike, function
928
1125
                                        attribute.func_name,
929
1126
                                        attribute.func_defaults,
930
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
931
1134
                # Is this a D-Bus property?
932
1135
                elif getattr(attribute, "_dbus_is_property", False):
933
1136
                    # Create a new, but exactly alike, function
947
1150
                                        attribute.func_name,
948
1151
                                        attribute.func_defaults,
949
1152
                                        attribute.func_closure)))
950
 
        return type.__new__(mcs, name, bases, attr)
951
 
 
952
 
 
 
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"})
953
1198
class ClientDBus(Client, DBusObjectWithProperties):
954
1199
    """A Client class using D-Bus
955
1200
    
966
1211
    def __init__(self, bus = None, *args, **kwargs):
967
1212
        self.bus = bus
968
1213
        Client.__init__(self, *args, **kwargs)
969
 
        
970
 
        self._approvals_pending = 0
971
1214
        # Only now, when this client is initialized, can it show up on
972
1215
        # the D-Bus
973
1216
        client_object_name = unicode(self.name).translate(
977
1220
                                 ("/clients/" + client_object_name))
978
1221
        DBusObjectWithProperties.__init__(self, self.bus,
979
1222
                                          self.dbus_object_path)
980
 
        
 
1223
    
981
1224
    def notifychangeproperty(transform_func,
982
1225
                             dbus_name, type_func=lambda x: x,
983
1226
                             variant_level=1):
1006
1249
        
1007
1250
        return property(lambda self: getattr(self, attrname), setter)
1008
1251
    
1009
 
    
1010
1252
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1011
1253
    approvals_pending = notifychangeproperty(dbus.Boolean,
1012
1254
                                             "ApprovalPending",
1019
1261
                                       checker is not None)
1020
1262
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1021
1263
                                           "LastCheckedOK")
 
1264
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1265
                                               "LastCheckerStatus")
1022
1266
    last_approval_request = notifychangeproperty(
1023
1267
        datetime_to_dbus, "LastApprovalRequest")
1024
1268
    approved_by_default = notifychangeproperty(dbus.Boolean,
1025
1269
                                               "ApprovedByDefault")
1026
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1270
    approval_delay = notifychangeproperty(dbus.UInt64,
1027
1271
                                          "ApprovalDelay",
1028
1272
                                          type_func =
1029
 
                                          _timedelta_to_milliseconds)
 
1273
                                          timedelta_to_milliseconds)
1030
1274
    approval_duration = notifychangeproperty(
1031
 
        dbus.UInt16, "ApprovalDuration",
1032
 
        type_func = _timedelta_to_milliseconds)
 
1275
        dbus.UInt64, "ApprovalDuration",
 
1276
        type_func = timedelta_to_milliseconds)
1033
1277
    host = notifychangeproperty(dbus.String, "Host")
1034
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1278
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1035
1279
                                   type_func =
1036
 
                                   _timedelta_to_milliseconds)
 
1280
                                   timedelta_to_milliseconds)
1037
1281
    extended_timeout = notifychangeproperty(
1038
 
        dbus.UInt16, "ExtendedTimeout",
1039
 
        type_func = _timedelta_to_milliseconds)
1040
 
    interval = notifychangeproperty(dbus.UInt16,
 
1282
        dbus.UInt64, "ExtendedTimeout",
 
1283
        type_func = timedelta_to_milliseconds)
 
1284
    interval = notifychangeproperty(dbus.UInt64,
1041
1285
                                    "Interval",
1042
1286
                                    type_func =
1043
 
                                    _timedelta_to_milliseconds)
 
1287
                                    timedelta_to_milliseconds)
1044
1288
    checker_command = notifychangeproperty(dbus.String, "Checker")
1045
1289
    
1046
1290
    del notifychangeproperty
1088
1332
        return r
1089
1333
    
1090
1334
    def _reset_approved(self):
1091
 
        self._approved = None
 
1335
        self.approved = None
1092
1336
        return False
1093
1337
    
1094
1338
    def approve(self, value=True):
1095
 
        self.send_changedstate()
1096
 
        self._approved = value
1097
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1339
        self.approved = value
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
1098
1341
                            (self.approval_duration),
1099
1342
                            self._reset_approved)
1100
 
    
 
1343
        self.send_changedstate()
1101
1344
    
1102
1345
    ## D-Bus methods, signals & properties
1103
1346
    _interface = "se.recompile.Mandos.Client"
1104
1347
    
 
1348
    ## Interfaces
 
1349
    
 
1350
    @dbus_interface_annotations(_interface)
 
1351
    def _foo(self):
 
1352
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1353
                     "false"}
 
1354
    
1105
1355
    ## Signals
1106
1356
    
1107
1357
    # CheckerCompleted - signal
1143
1393
        "D-Bus signal"
1144
1394
        return self.need_approval()
1145
1395
    
1146
 
    # NeRwequest - signal
1147
 
    @dbus.service.signal(_interface, signature="s")
1148
 
    def NewRequest(self, ip):
1149
 
        """D-Bus signal
1150
 
        Is sent after a client request a password.
1151
 
        """
1152
 
        pass
1153
 
    
1154
1396
    ## Methods
1155
1397
    
1156
1398
    # Approve - method
1214
1456
                           access="readwrite")
1215
1457
    def ApprovalDuration_dbus_property(self, value=None):
1216
1458
        if value is None:       # get
1217
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1459
            return dbus.UInt64(timedelta_to_milliseconds(
1218
1460
                    self.approval_duration))
1219
1461
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1220
1462
    
1234
1476
    def Host_dbus_property(self, value=None):
1235
1477
        if value is None:       # get
1236
1478
            return dbus.String(self.host)
1237
 
        self.host = value
 
1479
        self.host = unicode(value)
1238
1480
    
1239
1481
    # Created - property
1240
1482
    @dbus_service_property(_interface, signature="s", access="read")
1241
1483
    def Created_dbus_property(self):
1242
 
        return dbus.String(datetime_to_dbus(self.created))
 
1484
        return datetime_to_dbus(self.created)
1243
1485
    
1244
1486
    # LastEnabled - property
1245
1487
    @dbus_service_property(_interface, signature="s", access="read")
1266
1508
            return
1267
1509
        return datetime_to_dbus(self.last_checked_ok)
1268
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
    
1269
1517
    # Expires - property
1270
1518
    @dbus_service_property(_interface, signature="s", access="read")
1271
1519
    def Expires_dbus_property(self):
1282
1530
    def Timeout_dbus_property(self, value=None):
1283
1531
        if value is None:       # get
1284
1532
            return dbus.UInt64(self.timeout_milliseconds())
 
1533
        old_timeout = self.timeout
1285
1534
        self.timeout = datetime.timedelta(0, 0, 0, value)
1286
 
        if getattr(self, "disable_initiator_tag", None) is None:
1287
 
            return
1288
 
        # Reschedule timeout
1289
 
        gobject.source_remove(self.disable_initiator_tag)
1290
 
        self.disable_initiator_tag = None
1291
 
        self.expires = None
1292
 
        time_to_die = _timedelta_to_milliseconds((self
1293
 
                                                  .last_checked_ok
1294
 
                                                  + self.timeout)
1295
 
                                                 - datetime.datetime
1296
 
                                                 .utcnow())
1297
 
        if time_to_die <= 0:
1298
 
            # The timeout has passed
1299
 
            self.disable()
1300
 
        else:
1301
 
            self.expires = (datetime.datetime.utcnow()
1302
 
                            + datetime.timedelta(milliseconds =
1303
 
                                                 time_to_die))
1304
 
            self.disable_initiator_tag = (gobject.timeout_add
1305
 
                                          (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))
1306
1551
    
1307
1552
    # ExtendedTimeout - property
1308
1553
    @dbus_service_property(_interface, signature="t",
1321
1566
        self.interval = datetime.timedelta(0, 0, 0, value)
1322
1567
        if getattr(self, "checker_initiator_tag", None) is None:
1323
1568
            return
1324
 
        # Reschedule checker run
1325
 
        gobject.source_remove(self.checker_initiator_tag)
1326
 
        self.checker_initiator_tag = (gobject.timeout_add
1327
 
                                      (value, self.start_checker))
1328
 
        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
1329
1575
    
1330
1576
    # Checker - property
1331
1577
    @dbus_service_property(_interface, signature="s",
1333
1579
    def Checker_dbus_property(self, value=None):
1334
1580
        if value is None:       # get
1335
1581
            return dbus.String(self.checker_command)
1336
 
        self.checker_command = value
 
1582
        self.checker_command = unicode(value)
1337
1583
    
1338
1584
    # CheckerRunning - property
1339
1585
    @dbus_service_property(_interface, signature="b",
1368
1614
            raise KeyError()
1369
1615
    
1370
1616
    def __getattribute__(self, name):
1371
 
        if(name == '_pipe'):
 
1617
        if name == '_pipe':
1372
1618
            return super(ProxyClient, self).__getattribute__(name)
1373
1619
        self._pipe.send(('getattr', name))
1374
1620
        data = self._pipe.recv()
1381
1627
            return func
1382
1628
    
1383
1629
    def __setattr__(self, name, value):
1384
 
        if(name == '_pipe'):
 
1630
        if name == '_pipe':
1385
1631
            return super(ProxyClient, self).__setattr__(name, value)
1386
1632
        self._pipe.send(('setattr', name, value))
1387
1633
 
1388
1634
 
1389
 
class ClientDBusTransitional(ClientDBus):
1390
 
    __metaclass__ = AlternateDBusNamesMetaclass
1391
 
 
1392
 
 
1393
1635
class ClientHandler(socketserver.BaseRequestHandler, object):
1394
1636
    """A class to handle client connections.
1395
1637
    
1456
1698
                    logger.warning("Bad certificate: %s", error)
1457
1699
                    return
1458
1700
                logger.debug("Fingerprint: %s", fpr)
1459
 
                if self.server.use_dbus:
1460
 
                    # Emit D-Bus signal
1461
 
                    client.NewRequest(str(self.client_address))
1462
1701
                
1463
1702
                try:
1464
1703
                    client = ProxyClient(child_pipe, fpr,
1480
1719
                            client.Rejected("Disabled")
1481
1720
                        return
1482
1721
                    
1483
 
                    if client._approved or not client.approval_delay:
 
1722
                    if client.approved or not client.approval_delay:
1484
1723
                        #We are approved or approval is disabled
1485
1724
                        break
1486
 
                    elif client._approved is None:
 
1725
                    elif client.approved is None:
1487
1726
                        logger.info("Client %s needs approval",
1488
1727
                                    client.name)
1489
1728
                        if self.server.use_dbus:
1502
1741
                    #wait until timeout or approved
1503
1742
                    time = datetime.datetime.now()
1504
1743
                    client.changedstate.acquire()
1505
 
                    (client.changedstate.wait
1506
 
                     (float(client._timedelta_to_milliseconds(delay)
1507
 
                            / 1000)))
 
1744
                    client.changedstate.wait(
 
1745
                        float(timedelta_to_milliseconds(delay)
 
1746
                              / 1000))
1508
1747
                    client.changedstate.release()
1509
1748
                    time2 = datetime.datetime.now()
1510
1749
                    if (time2 - time) >= delay:
1526
1765
                    try:
1527
1766
                        sent = session.send(client.secret[sent_size:])
1528
1767
                    except gnutls.errors.GNUTLSError as error:
1529
 
                        logger.warning("gnutls send failed")
 
1768
                        logger.warning("gnutls send failed",
 
1769
                                       exc_info=error)
1530
1770
                        return
1531
1771
                    logger.debug("Sent: %d, remaining: %d",
1532
1772
                                 sent, len(client.secret)
1535
1775
                
1536
1776
                logger.info("Sending secret to %s", client.name)
1537
1777
                # bump the timeout using extended_timeout
1538
 
                client.checked_ok(client.extended_timeout)
 
1778
                client.bump_timeout(client.extended_timeout)
1539
1779
                if self.server.use_dbus:
1540
1780
                    # Emit D-Bus signal
1541
1781
                    client.GotSecret()
1546
1786
                try:
1547
1787
                    session.bye()
1548
1788
                except gnutls.errors.GNUTLSError as error:
1549
 
                    logger.warning("GnuTLS bye failed")
 
1789
                    logger.warning("GnuTLS bye failed",
 
1790
                                   exc_info=error)
1550
1791
    
1551
1792
    @staticmethod
1552
1793
    def peer_certificate(session):
1608
1849
        # Convert the buffer to a Python bytestring
1609
1850
        fpr = ctypes.string_at(buf, buf_len.value)
1610
1851
        # Convert the bytestring to hexadecimal notation
1611
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1852
        hex_fpr = binascii.hexlify(fpr).upper()
1612
1853
        return hex_fpr
1613
1854
 
1614
1855
 
1617
1858
    def sub_process_main(self, request, address):
1618
1859
        try:
1619
1860
            self.finish_request(request, address)
1620
 
        except:
 
1861
        except Exception:
1621
1862
            self.handle_error(request, address)
1622
1863
        self.close_request(request)
1623
1864
    
1624
1865
    def process_request(self, request, address):
1625
1866
        """Start a new process to process the request."""
1626
1867
        proc = multiprocessing.Process(target = self.sub_process_main,
1627
 
                                       args = (request,
1628
 
                                               address))
 
1868
                                       args = (request, address))
1629
1869
        proc.start()
1630
1870
        return proc
1631
1871
 
1659
1899
        use_ipv6:       Boolean; to use IPv6 or not
1660
1900
    """
1661
1901
    def __init__(self, server_address, RequestHandlerClass,
1662
 
                 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
        """
1663
1906
        self.interface = interface
1664
1907
        if use_ipv6:
1665
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.
1666
1935
        socketserver.TCPServer.__init__(self, server_address,
1667
1936
                                        RequestHandlerClass)
 
1937
    
1668
1938
    def server_bind(self):
1669
1939
        """This overrides the normal server_bind() function
1670
1940
        to bind to an interface if one was specified, and also NOT to
1678
1948
                try:
1679
1949
                    self.socket.setsockopt(socket.SOL_SOCKET,
1680
1950
                                           SO_BINDTODEVICE,
1681
 
                                           str(self.interface
1682
 
                                               + '\0'))
 
1951
                                           str(self.interface + '\0'))
1683
1952
                except socket.error as error:
1684
 
                    if error[0] == errno.EPERM:
1685
 
                        logger.error("No permission to"
1686
 
                                     " bind to interface %s",
1687
 
                                     self.interface)
1688
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1953
                    if error.errno == errno.EPERM:
 
1954
                        logger.error("No permission to bind to"
 
1955
                                     " interface %s", self.interface)
 
1956
                    elif error.errno == errno.ENOPROTOOPT:
1689
1957
                        logger.error("SO_BINDTODEVICE not available;"
1690
1958
                                     " cannot bind to interface %s",
1691
1959
                                     self.interface)
 
1960
                    elif error.errno == errno.ENODEV:
 
1961
                        logger.error("Interface %s does not exist,"
 
1962
                                     " cannot bind", self.interface)
1692
1963
                    else:
1693
1964
                        raise
1694
1965
        # Only bind(2) the socket if we really need to.
1724
1995
    """
1725
1996
    def __init__(self, server_address, RequestHandlerClass,
1726
1997
                 interface=None, use_ipv6=True, clients=None,
1727
 
                 gnutls_priority=None, use_dbus=True):
 
1998
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1728
1999
        self.enabled = False
1729
2000
        self.clients = clients
1730
2001
        if self.clients is None:
1734
2005
        IPv6_TCPServer.__init__(self, server_address,
1735
2006
                                RequestHandlerClass,
1736
2007
                                interface = interface,
1737
 
                                use_ipv6 = use_ipv6)
 
2008
                                use_ipv6 = use_ipv6,
 
2009
                                socketfd = socketfd)
1738
2010
    def server_activate(self):
1739
2011
        if self.enabled:
1740
2012
            return socketserver.TCPServer.server_activate(self)
1753
2025
    
1754
2026
    def handle_ipc(self, source, condition, parent_pipe=None,
1755
2027
                   proc = None, client_object=None):
1756
 
        condition_names = {
1757
 
            gobject.IO_IN: "IN",   # There is data to read.
1758
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1759
 
                                    # blocking).
1760
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1761
 
            gobject.IO_ERR: "ERR", # Error condition.
1762
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1763
 
                                    # broken, usually for pipes and
1764
 
                                    # sockets).
1765
 
            }
1766
 
        conditions_string = ' | '.join(name
1767
 
                                       for cond, name in
1768
 
                                       condition_names.iteritems()
1769
 
                                       if cond & condition)
1770
2028
        # error, or the other end of multiprocessing.Pipe has closed
1771
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2029
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1772
2030
            # Wait for other process to exit
1773
2031
            proc.join()
1774
2032
            return False
1864
2122
            elif suffix == "w":
1865
2123
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1866
2124
            else:
1867
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2125
                raise ValueError("Unknown suffix {0!r}"
 
2126
                                 .format(suffix))
1868
2127
        except (ValueError, IndexError) as e:
1869
2128
            raise ValueError(*(e.args))
1870
2129
        timevalue += delta
1884
2143
        sys.exit()
1885
2144
    if not noclose:
1886
2145
        # Close all standard open file descriptors
1887
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2146
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1888
2147
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1889
2148
            raise OSError(errno.ENODEV,
1890
 
                          "%s not a character device"
1891
 
                          % os.path.devnull)
 
2149
                          "{0} not a character device"
 
2150
                          .format(os.devnull))
1892
2151
        os.dup2(null, sys.stdin.fileno())
1893
2152
        os.dup2(null, sys.stdout.fileno())
1894
2153
        os.dup2(null, sys.stderr.fileno())
1903
2162
    
1904
2163
    parser = argparse.ArgumentParser()
1905
2164
    parser.add_argument("-v", "--version", action="version",
1906
 
                        version = "%%(prog)s %s" % version,
 
2165
                        version = "%(prog)s {0}".format(version),
1907
2166
                        help="show version number and exit")
1908
2167
    parser.add_argument("-i", "--interface", metavar="IF",
1909
2168
                        help="Bind to interface IF")
1932
2191
    parser.add_argument("--no-ipv6", action="store_false",
1933
2192
                        dest="use_ipv6", help="Do not use IPv6")
1934
2193
    parser.add_argument("--no-restore", action="store_false",
1935
 
                        dest="restore", help="Do not restore stored state",
1936
 
                        default=True)
 
2194
                        dest="restore", help="Do not restore stored"
 
2195
                        " state")
 
2196
    parser.add_argument("--socket", type=int,
 
2197
                        help="Specify a file descriptor to a network"
 
2198
                        " socket to use instead of creating one")
 
2199
    parser.add_argument("--statedir", metavar="DIR",
 
2200
                        help="Directory to save/restore state in")
 
2201
    parser.add_argument("--foreground", action="store_true",
 
2202
                        help="Run in foreground")
1937
2203
    
1938
2204
    options = parser.parse_args()
1939
2205
    
1953
2219
                        "use_dbus": "True",
1954
2220
                        "use_ipv6": "True",
1955
2221
                        "debuglevel": "",
 
2222
                        "restore": "True",
 
2223
                        "socket": "",
 
2224
                        "statedir": "/var/lib/mandos",
 
2225
                        "foreground": "False",
1956
2226
                        }
1957
2227
    
1958
2228
    # Parse config file for server-global settings
1963
2233
    # Convert the SafeConfigParser object to a dict
1964
2234
    server_settings = server_config.defaults()
1965
2235
    # Use the appropriate methods on the non-string config options
1966
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2236
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1967
2237
        server_settings[option] = server_config.getboolean("DEFAULT",
1968
2238
                                                           option)
1969
2239
    if server_settings["port"]:
1970
2240
        server_settings["port"] = server_config.getint("DEFAULT",
1971
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"])
1972
2251
    del server_config
1973
2252
    
1974
2253
    # Override the settings from the config file with command line
1975
2254
    # options, if set.
1976
2255
    for option in ("interface", "address", "port", "debug",
1977
2256
                   "priority", "servicename", "configdir",
1978
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2257
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2258
                   "statedir", "socket", "foreground"):
1979
2259
        value = getattr(options, option)
1980
2260
        if value is not None:
1981
2261
            server_settings[option] = value
1984
2264
    for option in server_settings.keys():
1985
2265
        if type(server_settings[option]) is str:
1986
2266
            server_settings[option] = unicode(server_settings[option])
 
2267
    # Debug implies foreground
 
2268
    if server_settings["debug"]:
 
2269
        server_settings["foreground"] = True
1987
2270
    # Now we have our good server settings in "server_settings"
1988
2271
    
1989
2272
    ##################################################################
1993
2276
    debuglevel = server_settings["debuglevel"]
1994
2277
    use_dbus = server_settings["use_dbus"]
1995
2278
    use_ipv6 = server_settings["use_ipv6"]
 
2279
    stored_state_path = os.path.join(server_settings["statedir"],
 
2280
                                     stored_state_file)
 
2281
    foreground = server_settings["foreground"]
1996
2282
    
1997
2283
    if debug:
1998
 
        initlogger(logging.DEBUG)
 
2284
        initlogger(debug, logging.DEBUG)
1999
2285
    else:
2000
2286
        if not debuglevel:
2001
 
            initlogger()
 
2287
            initlogger(debug)
2002
2288
        else:
2003
2289
            level = getattr(logging, debuglevel.upper())
2004
 
            initlogger(level)    
 
2290
            initlogger(debug, level)
2005
2291
    
2006
2292
    if server_settings["servicename"] != "Mandos":
2007
2293
        syslogger.setFormatter(logging.Formatter
2008
 
                               ('Mandos (%s) [%%(process)d]:'
2009
 
                                ' %%(levelname)s: %%(message)s'
2010
 
                                % server_settings["servicename"]))
 
2294
                               ('Mandos ({0}) [%(process)d]:'
 
2295
                                ' %(levelname)s: %(message)s'
 
2296
                                .format(server_settings
 
2297
                                        ["servicename"])))
2011
2298
    
2012
2299
    # Parse config file with clients
2013
 
    client_defaults = { "timeout": "5m",
2014
 
                        "extended_timeout": "15m",
2015
 
                        "interval": "2m",
2016
 
                        "checker": "fping -q -- %%(host)s",
2017
 
                        "host": "",
2018
 
                        "approval_delay": "0s",
2019
 
                        "approval_duration": "1s",
2020
 
                        }
2021
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2300
    client_config = configparser.SafeConfigParser(Client
 
2301
                                                  .client_defaults)
2022
2302
    client_config.read(os.path.join(server_settings["configdir"],
2023
2303
                                    "clients.conf"))
2024
2304
    
2033
2313
                              use_ipv6=use_ipv6,
2034
2314
                              gnutls_priority=
2035
2315
                              server_settings["priority"],
2036
 
                              use_dbus=use_dbus)
2037
 
    if not debug:
 
2316
                              use_dbus=use_dbus,
 
2317
                              socketfd=(server_settings["socket"]
 
2318
                                        or None))
 
2319
    if not foreground:
2038
2320
        pidfilename = "/var/run/mandos.pid"
 
2321
        pidfile = None
2039
2322
        try:
2040
2323
            pidfile = open(pidfilename, "w")
2041
 
        except IOError:
2042
 
            logger.error("Could not open file %r", pidfilename)
 
2324
        except IOError as e:
 
2325
            logger.error("Could not open file %r", pidfilename,
 
2326
                         exc_info=e)
2043
2327
    
2044
 
    try:
2045
 
        uid = pwd.getpwnam("_mandos").pw_uid
2046
 
        gid = pwd.getpwnam("_mandos").pw_gid
2047
 
    except KeyError:
 
2328
    for name in ("_mandos", "mandos", "nobody"):
2048
2329
        try:
2049
 
            uid = pwd.getpwnam("mandos").pw_uid
2050
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2330
            uid = pwd.getpwnam(name).pw_uid
 
2331
            gid = pwd.getpwnam(name).pw_gid
 
2332
            break
2051
2333
        except KeyError:
2052
 
            try:
2053
 
                uid = pwd.getpwnam("nobody").pw_uid
2054
 
                gid = pwd.getpwnam("nobody").pw_gid
2055
 
            except KeyError:
2056
 
                uid = 65534
2057
 
                gid = 65534
 
2334
            continue
 
2335
    else:
 
2336
        uid = 65534
 
2337
        gid = 65534
2058
2338
    try:
2059
2339
        os.setgid(gid)
2060
2340
        os.setuid(uid)
2061
2341
    except OSError as error:
2062
 
        if error[0] != errno.EPERM:
 
2342
        if error.errno != errno.EPERM:
2063
2343
            raise error
2064
2344
    
2065
2345
    if debug:
2077
2357
         .gnutls_global_set_log_function(debug_gnutls))
2078
2358
        
2079
2359
        # Redirect stdin so all checkers get /dev/null
2080
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2360
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2081
2361
        os.dup2(null, sys.stdin.fileno())
2082
2362
        if null > 2:
2083
2363
            os.close(null)
2084
 
    else:
2085
 
        # No console logging
2086
 
        logger.removeHandler(console)
2087
2364
    
2088
2365
    # Need to fork before connecting to D-Bus
2089
 
    if not debug:
 
2366
    if not foreground:
2090
2367
        # Close all input and output, do double fork, etc.
2091
2368
        daemon()
2092
2369
    
 
2370
    # multiprocessing will use threads, so before we use gobject we
 
2371
    # need to inform gobject that threads will be used.
 
2372
    gobject.threads_init()
 
2373
    
2093
2374
    global main_loop
2094
2375
    # From the Avahi example code
2095
 
    DBusGMainLoop(set_as_default=True )
 
2376
    DBusGMainLoop(set_as_default=True)
2096
2377
    main_loop = gobject.MainLoop()
2097
2378
    bus = dbus.SystemBus()
2098
2379
    # End of Avahi example code
2104
2385
                            ("se.bsnet.fukt.Mandos", bus,
2105
2386
                             do_not_queue=True))
2106
2387
        except dbus.exceptions.NameExistsException as e:
2107
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2388
            logger.error("Disabling D-Bus:", exc_info=e)
2108
2389
            use_dbus = False
2109
2390
            server_settings["use_dbus"] = False
2110
2391
            tcp_server.use_dbus = False
2122
2403
    
2123
2404
    client_class = Client
2124
2405
    if use_dbus:
2125
 
        client_class = functools.partial(ClientDBusTransitional,
2126
 
                                         bus = bus)
2127
 
    
2128
 
    special_settings = {
2129
 
        # Some settings need to be accessd by special methods;
2130
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2131
 
        "approved_by_default":
2132
 
            lambda section:
2133
 
            client_config.getboolean(section, "approved_by_default"),
2134
 
        }
2135
 
    # Construct a new dict of client settings of this form:
2136
 
    # { client_name: {setting_name: value, ...}, ...}
2137
 
    # with exceptions for any special settings as defined above
2138
 
    client_settings = dict((clientname,
2139
 
                           dict((setting,
2140
 
                                 (value if setting not in special_settings
2141
 
                                  else special_settings[setting](clientname)))
2142
 
                                for setting, value in client_config.items(clientname)))
2143
 
                          for clientname in client_config.sections())
2144
 
    
 
2406
        client_class = functools.partial(ClientDBus, bus = bus)
 
2407
    
 
2408
    client_settings = Client.config_parser(client_config)
2145
2409
    old_client_settings = {}
2146
 
    clients_data = []
 
2410
    clients_data = {}
2147
2411
    
2148
 
    # Get client data and settings from last running state. 
 
2412
    # Get client data and settings from last running state.
2149
2413
    if server_settings["restore"]:
2150
2414
        try:
2151
2415
            with open(stored_state_path, "rb") as stored_state:
2152
 
                clients_data, old_client_settings = pickle.load(stored_state)
 
2416
                clients_data, old_client_settings = (pickle.load
 
2417
                                                     (stored_state))
2153
2418
            os.remove(stored_state_path)
2154
2419
        except IOError as e:
2155
 
            logger.warning("Could not load persistant state: {0}".format(e))
2156
 
            if e.errno != errno.ENOENT:
 
2420
            if e.errno == errno.ENOENT:
 
2421
                logger.warning("Could not load persistent state: {0}"
 
2422
                                .format(os.strerror(e.errno)))
 
2423
            else:
 
2424
                logger.critical("Could not load persistent state:",
 
2425
                                exc_info=e)
2157
2426
                raise
 
2427
        except EOFError as e:
 
2428
            logger.warning("Could not load persistent state: "
 
2429
                           "EOFError:", exc_info=e)
2158
2430
    
2159
 
    for client in clients_data:
2160
 
        client_name = client["name"]
2161
 
        
2162
 
        # Decide which value to use after restoring saved state.
2163
 
        # We have three different values: Old config file,
2164
 
        # new config file, and saved state.
2165
 
        # New config value takes precedence if it differs from old
2166
 
        # config value, otherwise use saved state.
2167
 
        for name, value in client_settings[client_name].items():
 
2431
    with PGPEngine() as pgp:
 
2432
        for client_name, client in clients_data.iteritems():
 
2433
            # Decide which value to use after restoring saved state.
 
2434
            # We have three different values: Old config file,
 
2435
            # new config file, and saved state.
 
2436
            # New config value takes precedence if it differs from old
 
2437
            # config value, otherwise use saved state.
 
2438
            for name, value in client_settings[client_name].items():
 
2439
                try:
 
2440
                    # For each value in new config, check if it
 
2441
                    # differs from the old config value (Except for
 
2442
                    # the "secret" attribute)
 
2443
                    if (name != "secret" and
 
2444
                        value != old_client_settings[client_name]
 
2445
                        [name]):
 
2446
                        client[name] = value
 
2447
                except KeyError:
 
2448
                    pass
 
2449
            
 
2450
            # Clients who has passed its expire date can still be
 
2451
            # enabled if its last checker was successful.  Clients
 
2452
            # whose checker succeeded before we stored its state is
 
2453
            # assumed to have successfully run all checkers during
 
2454
            # downtime.
 
2455
            if client["enabled"]:
 
2456
                if datetime.datetime.utcnow() >= client["expires"]:
 
2457
                    if not client["last_checked_ok"]:
 
2458
                        logger.warning(
 
2459
                            "disabling client {0} - Client never "
 
2460
                            "performed a successful checker"
 
2461
                            .format(client_name))
 
2462
                        client["enabled"] = False
 
2463
                    elif client["last_checker_status"] != 0:
 
2464
                        logger.warning(
 
2465
                            "disabling client {0} - Client "
 
2466
                            "last checker failed with error code {1}"
 
2467
                            .format(client_name,
 
2468
                                    client["last_checker_status"]))
 
2469
                        client["enabled"] = False
 
2470
                    else:
 
2471
                        client["expires"] = (datetime.datetime
 
2472
                                             .utcnow()
 
2473
                                             + client["timeout"])
 
2474
                        logger.debug("Last checker succeeded,"
 
2475
                                     " keeping {0} enabled"
 
2476
                                     .format(client_name))
2168
2477
            try:
2169
 
                # For each value in new config, check if it differs
2170
 
                # from the old config value (Except for the "secret"
2171
 
                # attribute)
2172
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2173
 
                    setattr(client, name, value)
2174
 
            except KeyError:
2175
 
                pass
2176
 
        
2177
 
        # Clients who has passed its expire date, can still be enabled if its
2178
 
        # last checker was sucessful. Clients who checkers failed before we
2179
 
        # stored it state is asumed to had failed checker during downtime.
2180
 
        if client["enabled"] and client["last_checked_ok"]:
2181
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2182
 
                > client["interval"]):
2183
 
                if client["last_checker_status"] != 0:
2184
 
                    client["enabled"] = False
2185
 
                else:
2186
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2187
 
        
2188
 
        client["changedstate"] = (multiprocessing_manager
2189
 
                                  .Condition(multiprocessing_manager
2190
 
                                             .Lock()))
2191
 
        if use_dbus:
2192
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2193
 
            tcp_server.clients[client_name] = new_client
2194
 
            new_client.bus = bus
2195
 
            for name, value in client.iteritems():
2196
 
                setattr(new_client, name, value)
2197
 
            client_object_name = unicode(client_name).translate(
2198
 
                {ord("."): ord("_"),
2199
 
                 ord("-"): ord("_")})
2200
 
            new_client.dbus_object_path = (dbus.ObjectPath
2201
 
                                     ("/clients/" + client_object_name))
2202
 
            DBusObjectWithProperties.__init__(new_client,
2203
 
                                              new_client.bus,
2204
 
                                              new_client.dbus_object_path)
2205
 
        else:
2206
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2207
 
            for name, value in client.iteritems():
2208
 
                setattr(tcp_server.clients[client_name], name, value)
2209
 
                
2210
 
        tcp_server.clients[client_name].decrypt_secret(
2211
 
            client_settings[client_name]["secret"])            
2212
 
        
2213
 
    # Create/remove clients based on new changes made to config
2214
 
    for clientname in set(old_client_settings) - set(client_settings):
2215
 
        del tcp_server.clients[clientname]
2216
 
    for clientname in set(client_settings) - set(old_client_settings):
2217
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2218
 
                                                       config =
2219
 
                                                       client_settings
2220
 
                                                       [clientname]))
2221
 
    
 
2478
                client["secret"] = (
 
2479
                    pgp.decrypt(client["encrypted_secret"],
 
2480
                                client_settings[client_name]
 
2481
                                ["secret"]))
 
2482
            except PGPError:
 
2483
                # If decryption fails, we use secret from new settings
 
2484
                logger.debug("Failed to decrypt {0} old secret"
 
2485
                             .format(client_name))
 
2486
                client["secret"] = (
 
2487
                    client_settings[client_name]["secret"])
 
2488
    
 
2489
    # Add/remove clients based on new changes made to config
 
2490
    for client_name in (set(old_client_settings)
 
2491
                        - set(client_settings)):
 
2492
        del clients_data[client_name]
 
2493
    for client_name in (set(client_settings)
 
2494
                        - set(old_client_settings)):
 
2495
        clients_data[client_name] = client_settings[client_name]
 
2496
    
 
2497
    # Create all client objects
 
2498
    for client_name, client in clients_data.iteritems():
 
2499
        tcp_server.clients[client_name] = client_class(
 
2500
            name = client_name, settings = client)
2222
2501
    
2223
2502
    if not tcp_server.clients:
2224
2503
        logger.warning("No clients defined")
2225
 
        
2226
 
    if not debug:
2227
 
        try:
2228
 
            with pidfile:
2229
 
                pid = os.getpid()
2230
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2231
 
            del pidfile
2232
 
        except IOError:
2233
 
            logger.error("Could not write to file %r with PID %d",
2234
 
                         pidfilename, pid)
2235
 
        except NameError:
2236
 
            # "pidfile" was never created
2237
 
            pass
 
2504
    
 
2505
    if not foreground:
 
2506
        if pidfile is not None:
 
2507
            try:
 
2508
                with pidfile:
 
2509
                    pid = os.getpid()
 
2510
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2511
            except IOError:
 
2512
                logger.error("Could not write to file %r with PID %d",
 
2513
                             pidfilename, pid)
 
2514
        del pidfile
2238
2515
        del pidfilename
2239
 
        
2240
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2241
2516
    
2242
2517
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2243
2518
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2244
2519
    
2245
2520
    if use_dbus:
2246
 
        class MandosDBusService(dbus.service.Object):
 
2521
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2522
                                        "se.bsnet.fukt.Mandos"})
 
2523
        class MandosDBusService(DBusObjectWithProperties):
2247
2524
            """A D-Bus proxy object"""
2248
2525
            def __init__(self):
2249
2526
                dbus.service.Object.__init__(self, bus, "/")
2250
2527
            _interface = "se.recompile.Mandos"
2251
2528
            
 
2529
            @dbus_interface_annotations(_interface)
 
2530
            def _foo(self):
 
2531
                return { "org.freedesktop.DBus.Property"
 
2532
                         ".EmitsChangedSignal":
 
2533
                             "false"}
 
2534
            
2252
2535
            @dbus.service.signal(_interface, signature="o")
2253
2536
            def ClientAdded(self, objpath):
2254
2537
                "D-Bus signal"
2296
2579
            
2297
2580
            del _interface
2298
2581
        
2299
 
        class MandosDBusServiceTransitional(MandosDBusService):
2300
 
            __metaclass__ = AlternateDBusNamesMetaclass
2301
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2582
        mandos_dbus_service = MandosDBusService()
2302
2583
    
2303
2584
    def cleanup():
2304
2585
        "Cleanup function; run on exit"
2308
2589
        if not (tcp_server.clients or client_settings):
2309
2590
            return
2310
2591
        
2311
 
        # Store client before exiting. Secrets are encrypted with key based
2312
 
        # on what config file has. If config file is removed/edited, old
2313
 
        # secret will thus be unrecovable.
2314
 
        clients = []
2315
 
        for client in tcp_server.clients.itervalues():
2316
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2317
 
            
2318
 
            client_dict = {}
2319
 
            
2320
 
            # A list of attributes that will not be stored when shuting down.
2321
 
            exclude = set(("bus", "changedstate", "secret"))            
2322
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2323
 
                exclude.add(name)
2324
 
                
2325
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2326
 
            for attr in client.client_structure:
2327
 
                if attr not in exclude:
2328
 
                    client_dict[attr] = getattr(client, attr)
2329
 
            
2330
 
            clients.append(client_dict) 
2331
 
            del client_settings[client.name]["secret"]
2332
 
            
 
2592
        # Store client before exiting. Secrets are encrypted with key
 
2593
        # based on what config file has. If config file is
 
2594
        # removed/edited, old secret will thus be unrecovable.
 
2595
        clients = {}
 
2596
        with PGPEngine() as pgp:
 
2597
            for client in tcp_server.clients.itervalues():
 
2598
                key = client_settings[client.name]["secret"]
 
2599
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2600
                                                      key)
 
2601
                client_dict = {}
 
2602
                
 
2603
                # A list of attributes that can not be pickled
 
2604
                # + secret.
 
2605
                exclude = set(("bus", "changedstate", "secret",
 
2606
                               "checker"))
 
2607
                for name, typ in (inspect.getmembers
 
2608
                                  (dbus.service.Object)):
 
2609
                    exclude.add(name)
 
2610
                
 
2611
                client_dict["encrypted_secret"] = (client
 
2612
                                                   .encrypted_secret)
 
2613
                for attr in client.client_structure:
 
2614
                    if attr not in exclude:
 
2615
                        client_dict[attr] = getattr(client, attr)
 
2616
                
 
2617
                clients[client.name] = client_dict
 
2618
                del client_settings[client.name]["secret"]
 
2619
        
2333
2620
        try:
2334
 
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
2621
            with (tempfile.NamedTemporaryFile
 
2622
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2623
                   dir=os.path.dirname(stored_state_path),
 
2624
                   delete=False)) as stored_state:
2335
2625
                pickle.dump((clients, client_settings), stored_state)
2336
 
        except IOError as e:
2337
 
            logger.warning("Could not save persistant state: {0}".format(e))
2338
 
            if e.errno != errno.ENOENT:
2339
 
                raise
 
2626
                tempname=stored_state.name
 
2627
            os.rename(tempname, stored_state_path)
 
2628
        except (IOError, OSError) as e:
 
2629
            if not debug:
 
2630
                try:
 
2631
                    os.remove(tempname)
 
2632
                except NameError:
 
2633
                    pass
 
2634
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2635
                logger.warning("Could not save persistent state: {0}"
 
2636
                               .format(os.strerror(e.errno)))
 
2637
            else:
 
2638
                logger.warning("Could not save persistent state:",
 
2639
                               exc_info=e)
 
2640
                raise e
2340
2641
        
2341
2642
        # Delete all clients, and settings from config
2342
2643
        while tcp_server.clients:
2361
2662
        # Need to initiate checking of clients
2362
2663
        if client.enabled:
2363
2664
            client.init_checker()
2364
 
 
2365
2665
    
2366
2666
    tcp_server.enable()
2367
2667
    tcp_server.server_activate()
2370
2670
    service.port = tcp_server.socket.getsockname()[1]
2371
2671
    if use_ipv6:
2372
2672
        logger.info("Now listening on address %r, port %d,"
2373
 
                    " flowinfo %d, scope_id %d"
2374
 
                    % tcp_server.socket.getsockname())
 
2673
                    " flowinfo %d, scope_id %d",
 
2674
                    *tcp_server.socket.getsockname())
2375
2675
    else:                       # IPv4
2376
 
        logger.info("Now listening on address %r, port %d"
2377
 
                    % tcp_server.socket.getsockname())
 
2676
        logger.info("Now listening on address %r, port %d",
 
2677
                    *tcp_server.socket.getsockname())
2378
2678
    
2379
2679
    #service.interface = tcp_server.socket.getsockname()[3]
2380
2680
    
2383
2683
        try:
2384
2684
            service.activate()
2385
2685
        except dbus.exceptions.DBusException as error:
2386
 
            logger.critical("DBusException: %s", error)
 
2686
            logger.critical("D-Bus Exception", exc_info=error)
2387
2687
            cleanup()
2388
2688
            sys.exit(1)
2389
2689
        # End of Avahi example code
2396
2696
        logger.debug("Starting main loop")
2397
2697
        main_loop.run()
2398
2698
    except AvahiError as error:
2399
 
        logger.critical("AvahiError: %s", error)
 
2699
        logger.critical("Avahi Error", exc_info=error)
2400
2700
        cleanup()
2401
2701
        sys.exit(1)
2402
2702
    except KeyboardInterrupt:
2407
2707
    # Must run before the D-Bus bus name gets deregistered
2408
2708
    cleanup()
2409
2709
 
2410
 
 
2411
2710
if __name__ == '__main__':
2412
2711
    main()