/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

Merge threading/seg fault fix.

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
79
75
import ctypes.util
80
76
import xml.dom.minidom
81
77
import inspect
 
78
import GnuPGInterface
82
79
 
83
80
try:
84
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.6.6"
 
88
version = "1.4.1"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
95
 
syslogger = None
 
92
syslogger = (logging.handlers.SysLogHandler
 
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
94
              address = str("/dev/log")))
96
95
 
97
96
try:
98
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
111
110
        return interface_index
112
111
 
113
112
 
114
 
def initlogger(debug, level=logging.WARNING):
 
113
def initlogger(level=logging.WARNING):
115
114
    """init logger and add loglevel"""
116
115
    
117
 
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
122
116
    syslogger.setFormatter(logging.Formatter
123
117
                           ('Mandos [%(process)d]: %(levelname)s:'
124
118
                            ' %(message)s'))
125
119
    logger.addHandler(syslogger)
126
120
    
127
 
    if debug:
128
 
        console = logging.StreamHandler()
129
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
130
 
                                               ' [%(process)d]:'
131
 
                                               ' %(levelname)s:'
132
 
                                               ' %(message)s'))
133
 
        logger.addHandler(console)
 
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)
134
127
    logger.setLevel(level)
135
128
 
136
129
 
142
135
class PGPEngine(object):
143
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
144
137
    def __init__(self):
 
138
        self.gnupg = GnuPGInterface.GnuPG()
145
139
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
146
 
        self.gnupgargs = ['--batch',
147
 
                          '--home', self.tempdir,
148
 
                          '--force-mdc',
149
 
                          '--quiet',
150
 
                          '--no-use-agent']
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
141
        self.gnupg.options.meta_interactive = False
 
142
        self.gnupg.options.homedir = self.tempdir
 
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
144
                                              '--quiet'])
151
145
    
152
146
    def __enter__(self):
153
147
        return self
154
148
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
156
150
        self._cleanup()
157
151
        return False
158
152
    
175
169
    def password_encode(self, password):
176
170
        # Passphrase can not be empty and can not contain newlines or
177
171
        # NUL bytes.  So we prefix it and hex encode it.
178
 
        encoded = b"mandos" + binascii.hexlify(password)
179
 
        if len(encoded) > 2048:
180
 
            # GnuPG can't handle long passwords, so encode differently
181
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
182
 
                       .replace(b"\n", b"\\n")
183
 
                       .replace(b"\0", b"\\x00"))
184
 
        return encoded
 
172
        return b"mandos" + binascii.hexlify(password)
185
173
    
186
174
    def encrypt(self, data, password):
187
 
        passphrase = self.password_encode(password)
188
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
189
 
                                         ) as passfile:
190
 
            passfile.write(passphrase)
191
 
            passfile.flush()
192
 
            proc = subprocess.Popen(['gpg', '--symmetric',
193
 
                                     '--passphrase-file',
194
 
                                     passfile.name]
195
 
                                    + self.gnupgargs,
196
 
                                    stdin = subprocess.PIPE,
197
 
                                    stdout = subprocess.PIPE,
198
 
                                    stderr = subprocess.PIPE)
199
 
            ciphertext, err = proc.communicate(input = data)
200
 
        if proc.returncode != 0:
201
 
            raise PGPError(err)
 
175
        self.gnupg.passphrase = self.password_encode(password)
 
176
        with open(os.devnull) as devnull:
 
177
            try:
 
178
                proc = self.gnupg.run(['--symmetric'],
 
179
                                      create_fhs=['stdin', 'stdout'],
 
180
                                      attach_fhs={'stderr': devnull})
 
181
                with contextlib.closing(proc.handles['stdin']) as f:
 
182
                    f.write(data)
 
183
                with contextlib.closing(proc.handles['stdout']) as f:
 
184
                    ciphertext = f.read()
 
185
                proc.wait()
 
186
            except IOError as e:
 
187
                raise PGPError(e)
 
188
        self.gnupg.passphrase = None
202
189
        return ciphertext
203
190
    
204
191
    def decrypt(self, data, password):
205
 
        passphrase = self.password_encode(password)
206
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
207
 
                                         ) as passfile:
208
 
            passfile.write(passphrase)
209
 
            passfile.flush()
210
 
            proc = subprocess.Popen(['gpg', '--decrypt',
211
 
                                     '--passphrase-file',
212
 
                                     passfile.name]
213
 
                                    + self.gnupgargs,
214
 
                                    stdin = subprocess.PIPE,
215
 
                                    stdout = subprocess.PIPE,
216
 
                                    stderr = subprocess.PIPE)
217
 
            decrypted_plaintext, err = proc.communicate(input
218
 
                                                        = data)
219
 
        if proc.returncode != 0:
220
 
            raise PGPError(err)
 
192
        self.gnupg.passphrase = self.password_encode(password)
 
193
        with open(os.devnull) as devnull:
 
194
            try:
 
195
                proc = self.gnupg.run(['--decrypt'],
 
196
                                      create_fhs=['stdin', 'stdout'],
 
197
                                      attach_fhs={'stderr': devnull})
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
199
                    f.write(data)
 
200
                with contextlib.closing(proc.handles['stdout']) as f:
 
201
                    decrypted_plaintext = f.read()
 
202
                proc.wait()
 
203
            except IOError as e:
 
204
                raise PGPError(e)
 
205
        self.gnupg.passphrase = None
221
206
        return decrypted_plaintext
222
207
 
223
208
 
 
209
 
224
210
class AvahiError(Exception):
225
211
    def __init__(self, value, *args, **kwargs):
226
212
        self.value = value
243
229
               Used to optionally bind to the specified interface.
244
230
    name: string; Example: 'Mandos'
245
231
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
232
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
233
    port: integer; what port to announce
248
234
    TXT: list of strings; TXT record for the service
249
235
    domain: string; Domain to publish on, default to .local if empty.
255
241
    server: D-Bus Server
256
242
    bus: dbus.SystemBus()
257
243
    """
258
 
    
259
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
245
                 servicetype = None, port = None, TXT = None,
261
246
                 domain = "", host = "", max_renames = 32768,
274
259
        self.server = None
275
260
        self.bus = bus
276
261
        self.entry_group_state_changed_match = None
277
 
    
278
262
    def rename(self):
279
263
        """Derived from the Avahi example code"""
280
264
        if self.rename_count >= self.max_renames:
290
274
        try:
291
275
            self.add()
292
276
        except dbus.exceptions.DBusException as error:
293
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
294
278
            self.cleanup()
295
279
            os._exit(1)
296
280
        self.rename_count += 1
297
 
    
298
281
    def remove(self):
299
282
        """Derived from the Avahi example code"""
300
283
        if self.entry_group_state_changed_match is not None:
302
285
            self.entry_group_state_changed_match = None
303
286
        if self.group is not None:
304
287
            self.group.Reset()
305
 
    
306
288
    def add(self):
307
289
        """Derived from the Avahi example code"""
308
290
        self.remove()
325
307
            dbus.UInt16(self.port),
326
308
            avahi.string_array_to_txt_array(self.TXT))
327
309
        self.group.Commit()
328
 
    
329
310
    def entry_group_state_changed(self, state, error):
330
311
        """Derived from the Avahi example code"""
331
312
        logger.debug("Avahi entry group state change: %i", state)
338
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
320
            logger.critical("Avahi: Error in group state changed %s",
340
321
                            unicode(error))
341
 
            raise AvahiGroupError("State changed: {0!s}"
342
 
                                  .format(error))
343
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
344
324
    def cleanup(self):
345
325
        """Derived from the Avahi example code"""
346
326
        if self.group is not None:
351
331
                pass
352
332
            self.group = None
353
333
        self.remove()
354
 
    
355
334
    def server_state_changed(self, state, error=None):
356
335
        """Derived from the Avahi example code"""
357
336
        logger.debug("Avahi server state change: %i", state)
376
355
                logger.debug("Unknown state: %r", state)
377
356
            else:
378
357
                logger.debug("Unknown state: %r: %r", state, error)
379
 
    
380
358
    def activate(self):
381
359
        """Derived from the Avahi example code"""
382
360
        if self.server is None:
389
367
                                 self.server_state_changed)
390
368
        self.server_state_changed(self.server.GetState())
391
369
 
392
 
 
393
370
class AvahiServiceToSyslog(AvahiService):
394
371
    def rename(self):
395
372
        """Add the new name to the syslog messages"""
396
373
        ret = AvahiService.rename(self)
397
374
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({0}) [%(process)d]:'
399
 
                                ' %(levelname)s: %(message)s'
400
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
401
378
        return ret
402
379
 
403
 
 
404
380
def timedelta_to_milliseconds(td):
405
381
    "Convert a datetime.timedelta() to milliseconds"
406
382
    return ((td.days * 24 * 60 * 60 * 1000)
407
383
            + (td.seconds * 1000)
408
384
            + (td.microseconds // 1000))
409
 
 
410
 
 
 
385
        
411
386
class Client(object):
412
387
    """A representation of a client host served by this server.
413
388
    
438
413
    last_checked_ok: datetime.datetime(); (UTC) or None
439
414
    last_checker_status: integer between 0 and 255 reflecting exit
440
415
                         status of last checker. -1 reflects crashed
441
 
                         checker, -2 means no checker completed yet.
 
416
                         checker, or None.
442
417
    last_enabled: datetime.datetime(); (UTC) or None
443
418
    name:       string; from the config file, used in log messages and
444
419
                        D-Bus identifiers
445
420
    secret:     bytestring; sent verbatim (over TLS) to client
446
421
    timeout:    datetime.timedelta(); How long from last_checked_ok
447
422
                                      until this client is disabled
448
 
    extended_timeout:   extra long timeout when secret has been sent
 
423
    extended_timeout:   extra long timeout when password has been sent
449
424
    runtime_expansions: Allowed attributes for runtime expansion.
450
425
    expires:    datetime.datetime(); time (UTC) when a client will be
451
426
                disabled, or None
452
 
    server_settings: The server_settings dict from main()
453
427
    """
454
428
    
455
429
    runtime_expansions = ("approval_delay", "approval_duration",
456
 
                          "created", "enabled", "expires",
457
 
                          "fingerprint", "host", "interval",
458
 
                          "last_approval_request", "last_checked_ok",
 
430
                          "created", "enabled", "fingerprint",
 
431
                          "host", "interval", "last_checked_ok",
459
432
                          "last_enabled", "name", "timeout")
460
 
    client_defaults = { "timeout": "PT5M",
461
 
                        "extended_timeout": "PT15M",
462
 
                        "interval": "PT2M",
 
433
    client_defaults = { "timeout": "5m",
 
434
                        "extended_timeout": "15m",
 
435
                        "interval": "2m",
463
436
                        "checker": "fping -q -- %%(host)s",
464
437
                        "host": "",
465
 
                        "approval_delay": "PT0S",
466
 
                        "approval_duration": "PT1S",
 
438
                        "approval_delay": "0s",
 
439
                        "approval_duration": "1s",
467
440
                        "approved_by_default": "True",
468
441
                        "enabled": "True",
469
442
                        }
482
455
    
483
456
    def approval_delay_milliseconds(self):
484
457
        return timedelta_to_milliseconds(self.approval_delay)
485
 
    
 
458
 
486
459
    @staticmethod
487
460
    def config_parser(config):
488
 
        """Construct a new dict of client settings of this form:
 
461
        """ Construct a new dict of client settings of this form:
489
462
        { client_name: {setting_name: value, ...}, ...}
490
 
        with exceptions for any special settings as defined above.
491
 
        NOTE: Must be a pure function. Must return the same result
492
 
        value given the same arguments.
493
 
        """
 
463
        with exceptions for any special settings as defined above"""
494
464
        settings = {}
495
465
        for client_name in config.sections():
496
466
            section = dict(config.items(client_name))
500
470
            # Reformat values from string types to Python types
501
471
            client["approved_by_default"] = config.getboolean(
502
472
                client_name, "approved_by_default")
503
 
            client["enabled"] = config.getboolean(client_name,
504
 
                                                  "enabled")
 
473
            client["enabled"] = config.getboolean(client_name, "enabled")
505
474
            
506
475
            client["fingerprint"] = (section["fingerprint"].upper()
507
476
                                     .replace(" ", ""))
513
482
                          "rb") as secfile:
514
483
                    client["secret"] = secfile.read()
515
484
            else:
516
 
                raise TypeError("No secret or secfile for section {0}"
517
 
                                .format(section))
 
485
                raise TypeError("No secret or secfile for section %s"
 
486
                                % section)
518
487
            client["timeout"] = string_to_delta(section["timeout"])
519
488
            client["extended_timeout"] = string_to_delta(
520
489
                section["extended_timeout"])
526
495
            client["checker_command"] = section["checker"]
527
496
            client["last_approval_request"] = None
528
497
            client["last_checked_ok"] = None
529
 
            client["last_checker_status"] = -2
530
 
        
 
498
            client["last_checker_status"] = None
 
499
            if client["enabled"]:
 
500
                client["last_enabled"] = datetime.datetime.utcnow()
 
501
                client["expires"] = (datetime.datetime.utcnow()
 
502
                                     + client["timeout"])
 
503
            else:
 
504
                client["last_enabled"] = None
 
505
                client["expires"] = None
 
506
 
531
507
        return settings
532
 
    
533
 
    def __init__(self, settings, name = None, server_settings=None):
 
508
        
 
509
        
 
510
    def __init__(self, settings, name = None):
 
511
        """Note: the 'checker' key in 'config' sets the
 
512
        'checker_command' attribute and *not* the 'checker'
 
513
        attribute."""
534
514
        self.name = name
535
 
        if server_settings is None:
536
 
            server_settings = {}
537
 
        self.server_settings = server_settings
538
515
        # adding all client settings
539
516
        for setting, value in settings.iteritems():
540
517
            setattr(self, setting, value)
541
518
        
542
 
        if self.enabled:
543
 
            if not hasattr(self, "last_enabled"):
544
 
                self.last_enabled = datetime.datetime.utcnow()
545
 
            if not hasattr(self, "expires"):
546
 
                self.expires = (datetime.datetime.utcnow()
547
 
                                + self.timeout)
548
 
        else:
549
 
            self.last_enabled = None
550
 
            self.expires = None
551
 
        
552
519
        logger.debug("Creating client %r", self.name)
553
520
        # Uppercase and remove spaces from fingerprint for later
554
521
        # comparison purposes with return value from the fingerprint()
555
522
        # function
556
523
        logger.debug("  Fingerprint: %s", self.fingerprint)
557
 
        self.created = settings.get("created",
558
 
                                    datetime.datetime.utcnow())
559
 
        
 
524
        self.created = settings.get("created", datetime.datetime.utcnow())
 
525
 
560
526
        # attributes specific for this server instance
561
527
        self.checker = None
562
528
        self.checker_initiator_tag = None
590
556
        if getattr(self, "enabled", False):
591
557
            # Already enabled
592
558
            return
 
559
        self.send_changedstate()
593
560
        self.expires = datetime.datetime.utcnow() + self.timeout
594
561
        self.enabled = True
595
562
        self.last_enabled = datetime.datetime.utcnow()
596
563
        self.init_checker()
597
 
        self.send_changedstate()
598
564
    
599
565
    def disable(self, quiet=True):
600
566
        """Disable this client."""
601
567
        if not getattr(self, "enabled", False):
602
568
            return False
603
569
        if not quiet:
 
570
            self.send_changedstate()
 
571
        if not quiet:
604
572
            logger.info("Disabling client %s", self.name)
605
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
573
        if getattr(self, "disable_initiator_tag", False):
606
574
            gobject.source_remove(self.disable_initiator_tag)
607
575
            self.disable_initiator_tag = None
608
576
        self.expires = None
609
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
577
        if getattr(self, "checker_initiator_tag", False):
610
578
            gobject.source_remove(self.checker_initiator_tag)
611
579
            self.checker_initiator_tag = None
612
580
        self.stop_checker()
613
581
        self.enabled = False
614
 
        if not quiet:
615
 
            self.send_changedstate()
616
582
        # Do not run this again if called by a gobject.timeout_add
617
583
        return False
618
584
    
622
588
    def init_checker(self):
623
589
        # Schedule a new checker to be started an 'interval' from now,
624
590
        # and every interval from then on.
625
 
        if self.checker_initiator_tag is not None:
626
 
            gobject.source_remove(self.checker_initiator_tag)
627
591
        self.checker_initiator_tag = (gobject.timeout_add
628
592
                                      (self.interval_milliseconds(),
629
593
                                       self.start_checker))
630
594
        # Schedule a disable() when 'timeout' has passed
631
 
        if self.disable_initiator_tag is not None:
632
 
            gobject.source_remove(self.disable_initiator_tag)
633
595
        self.disable_initiator_tag = (gobject.timeout_add
634
596
                                   (self.timeout_milliseconds(),
635
597
                                    self.disable))
654
616
            logger.warning("Checker for %(name)s crashed?",
655
617
                           vars(self))
656
618
    
657
 
    def checked_ok(self):
658
 
        """Assert that the client has been seen, alive and well."""
659
 
        self.last_checked_ok = datetime.datetime.utcnow()
660
 
        self.last_checker_status = 0
661
 
        self.bump_timeout()
662
 
    
663
 
    def bump_timeout(self, timeout=None):
664
 
        """Bump up the timeout for this client."""
 
619
    def checked_ok(self, timeout=None):
 
620
        """Bump up the timeout for this client.
 
621
        
 
622
        This should only be called when the client has been seen,
 
623
        alive and well.
 
624
        """
665
625
        if timeout is None:
666
626
            timeout = self.timeout
 
627
        self.last_checked_ok = datetime.datetime.utcnow()
667
628
        if self.disable_initiator_tag is not None:
668
629
            gobject.source_remove(self.disable_initiator_tag)
669
 
            self.disable_initiator_tag = None
670
630
        if getattr(self, "enabled", False):
671
631
            self.disable_initiator_tag = (gobject.timeout_add
672
632
                                          (timedelta_to_milliseconds
682
642
        If a checker already exists, leave it running and do
683
643
        nothing."""
684
644
        # The reason for not killing a running checker is that if we
685
 
        # did that, and if a checker (for some reason) started running
686
 
        # slowly and taking more than 'interval' time, then the client
687
 
        # would inevitably timeout, since no checker would get a
688
 
        # chance to run to completion.  If we instead leave running
 
645
        # did that, then if a checker (for some reason) started
 
646
        # running slowly and taking more than 'interval' time, the
 
647
        # client would inevitably timeout, since no checker would get
 
648
        # a chance to run to completion.  If we instead leave running
689
649
        # checkers alone, the checker would have to take more time
690
650
        # than 'timeout' for the client to be disabled, which is as it
691
651
        # should be.
693
653
        # If a checker exists, make sure it is not a zombie
694
654
        try:
695
655
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
 
        except AttributeError:
697
 
            pass
698
 
        except OSError as error:
699
 
            if error.errno != errno.ECHILD:
700
 
                raise
 
656
        except (AttributeError, OSError) as error:
 
657
            if (isinstance(error, OSError)
 
658
                and error.errno != errno.ECHILD):
 
659
                raise error
701
660
        else:
702
661
            if pid:
703
662
                logger.warning("Checker was a zombie")
706
665
                                      self.current_checker_command)
707
666
        # Start a new checker if needed
708
667
        if self.checker is None:
709
 
            # Escape attributes for the shell
710
 
            escaped_attrs = dict(
711
 
                (attr, re.escape(unicode(getattr(self, attr))))
712
 
                for attr in
713
 
                self.runtime_expansions)
714
668
            try:
715
 
                command = self.checker_command % escaped_attrs
716
 
            except TypeError as error:
717
 
                logger.error('Could not format string "%s"',
718
 
                             self.checker_command, exc_info=error)
719
 
                return True # Try again later
 
669
                # In case checker_command has exactly one % operator
 
670
                command = self.checker_command % self.host
 
671
            except TypeError:
 
672
                # Escape attributes for the shell
 
673
                escaped_attrs = dict(
 
674
                    (attr,
 
675
                     re.escape(unicode(str(getattr(self, attr, "")),
 
676
                                       errors=
 
677
                                       'replace')))
 
678
                    for attr in
 
679
                    self.runtime_expansions)
 
680
                
 
681
                try:
 
682
                    command = self.checker_command % escaped_attrs
 
683
                except TypeError as error:
 
684
                    logger.error('Could not format string "%s":'
 
685
                                 ' %s', self.checker_command, error)
 
686
                    return True # Try again later
720
687
            self.current_checker_command = command
721
688
            try:
722
689
                logger.info("Starting checker %r for %s",
725
692
                # in normal mode, that is already done by daemon(),
726
693
                # and in debug mode we don't want to.  (Stdin is
727
694
                # always replaced by /dev/null.)
728
 
                # The exception is when not debugging but nevertheless
729
 
                # running in the foreground; use the previously
730
 
                # created wnull.
731
 
                popen_args = {}
732
 
                if (not self.server_settings["debug"]
733
 
                    and self.server_settings["foreground"]):
734
 
                    popen_args.update({"stdout": wnull,
735
 
                                       "stderr": wnull })
736
695
                self.checker = subprocess.Popen(command,
737
696
                                                close_fds=True,
738
 
                                                shell=True, cwd="/",
739
 
                                                **popen_args)
740
 
            except OSError as error:
741
 
                logger.error("Failed to start subprocess",
742
 
                             exc_info=error)
743
 
                return True
744
 
            self.checker_callback_tag = (gobject.child_watch_add
745
 
                                         (self.checker.pid,
746
 
                                          self.checker_callback,
747
 
                                          data=command))
748
 
            # The checker may have completed before the gobject
749
 
            # watch was added.  Check for this.
750
 
            try:
 
697
                                                shell=True, cwd="/")
 
698
                self.checker_callback_tag = (gobject.child_watch_add
 
699
                                             (self.checker.pid,
 
700
                                              self.checker_callback,
 
701
                                              data=command))
 
702
                # The checker may have completed before the gobject
 
703
                # watch was added.  Check for this.
751
704
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
705
                if pid:
 
706
                    gobject.source_remove(self.checker_callback_tag)
 
707
                    self.checker_callback(pid, status, command)
752
708
            except OSError as error:
753
 
                if error.errno == errno.ECHILD:
754
 
                    # This should never happen
755
 
                    logger.error("Child process vanished",
756
 
                                 exc_info=error)
757
 
                    return True
758
 
                raise
759
 
            if pid:
760
 
                gobject.source_remove(self.checker_callback_tag)
761
 
                self.checker_callback(pid, status, command)
 
709
                logger.error("Failed to start subprocess: %s",
 
710
                             error)
762
711
        # Re-run this periodically if run by gobject.timeout_add
763
712
        return True
764
713
    
771
720
            return
772
721
        logger.debug("Stopping checker for %(name)s", vars(self))
773
722
        try:
774
 
            self.checker.terminate()
 
723
            os.kill(self.checker.pid, signal.SIGTERM)
775
724
            #time.sleep(0.5)
776
725
            #if self.checker.poll() is None:
777
 
            #    self.checker.kill()
 
726
            #    os.kill(self.checker.pid, signal.SIGKILL)
778
727
        except OSError as error:
779
728
            if error.errno != errno.ESRCH: # No such process
780
729
                raise
797
746
    # "Set" method, so we fail early here:
798
747
    if byte_arrays and signature != "ay":
799
748
        raise ValueError("Byte arrays not supported for non-'ay'"
800
 
                         " signature {0!r}".format(signature))
 
749
                         " signature %r" % signature)
801
750
    def decorator(func):
802
751
        func._dbus_is_property = True
803
752
        func._dbus_interface = dbus_interface
811
760
    return decorator
812
761
 
813
762
 
814
 
def dbus_interface_annotations(dbus_interface):
815
 
    """Decorator for marking functions returning interface annotations
816
 
    
817
 
    Usage:
818
 
    
819
 
    @dbus_interface_annotations("org.example.Interface")
820
 
    def _foo(self):  # Function name does not matter
821
 
        return {"org.freedesktop.DBus.Deprecated": "true",
822
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
823
 
                    "false"}
824
 
    """
825
 
    def decorator(func):
826
 
        func._dbus_is_interface = True
827
 
        func._dbus_interface = dbus_interface
828
 
        func._dbus_name = dbus_interface
829
 
        return func
830
 
    return decorator
831
 
 
832
 
 
833
 
def dbus_annotations(annotations):
834
 
    """Decorator to annotate D-Bus methods, signals or properties
835
 
    Usage:
836
 
    
837
 
    @dbus_service_property("org.example.Interface", signature="b",
838
 
                           access="r")
839
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
 
                        "org.freedesktop.DBus.Property."
841
 
                        "EmitsChangedSignal": "false"})
842
 
    def Property_dbus_property(self):
843
 
        return dbus.Boolean(False)
844
 
    """
845
 
    def decorator(func):
846
 
        func._dbus_annotations = annotations
847
 
        return func
848
 
    return decorator
849
 
 
850
 
 
851
763
class DBusPropertyException(dbus.exceptions.DBusException):
852
764
    """A base class for D-Bus property-related exceptions
853
765
    """
876
788
    """
877
789
    
878
790
    @staticmethod
879
 
    def _is_dbus_thing(thing):
880
 
        """Returns a function testing if an attribute is a D-Bus thing
881
 
        
882
 
        If called like _is_dbus_thing("method") it returns a function
883
 
        suitable for use as predicate to inspect.getmembers().
884
 
        """
885
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
886
 
                                   False)
 
791
    def _is_dbus_property(obj):
 
792
        return getattr(obj, "_dbus_is_property", False)
887
793
    
888
 
    def _get_all_dbus_things(self, thing):
 
794
    def _get_all_dbus_properties(self):
889
795
        """Returns a generator of (name, attribute) pairs
890
796
        """
891
 
        return ((getattr(athing.__get__(self), "_dbus_name",
892
 
                         name),
893
 
                 athing.__get__(self))
 
797
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
894
798
                for cls in self.__class__.__mro__
895
 
                for name, athing in
896
 
                inspect.getmembers(cls,
897
 
                                   self._is_dbus_thing(thing)))
 
799
                for name, prop in
 
800
                inspect.getmembers(cls, self._is_dbus_property))
898
801
    
899
802
    def _get_dbus_property(self, interface_name, property_name):
900
803
        """Returns a bound method if one exists which is a D-Bus
902
805
        """
903
806
        for cls in  self.__class__.__mro__:
904
807
            for name, value in (inspect.getmembers
905
 
                                (cls,
906
 
                                 self._is_dbus_thing("property"))):
 
808
                                (cls, self._is_dbus_property)):
907
809
                if (value._dbus_name == property_name
908
810
                    and value._dbus_interface == interface_name):
909
811
                    return value.__get__(self)
937
839
            # The byte_arrays option is not supported yet on
938
840
            # signatures other than "ay".
939
841
            if prop._dbus_signature != "ay":
940
 
                raise ValueError("Byte arrays not supported for non-"
941
 
                                 "'ay' signature {0!r}"
942
 
                                 .format(prop._dbus_signature))
943
 
            value = dbus.ByteArray(b''.join(chr(byte)
944
 
                                            for byte in value))
 
842
                raise ValueError
 
843
            value = dbus.ByteArray(''.join(unichr(byte)
 
844
                                           for byte in value))
945
845
        prop(value)
946
846
    
947
847
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
953
853
        Note: Will not include properties with access="write".
954
854
        """
955
855
        properties = {}
956
 
        for name, prop in self._get_all_dbus_things("property"):
 
856
        for name, prop in self._get_all_dbus_properties():
957
857
            if (interface_name
958
858
                and interface_name != prop._dbus_interface):
959
859
                # Interface non-empty but did not match
974
874
                         path_keyword='object_path',
975
875
                         connection_keyword='connection')
976
876
    def Introspect(self, object_path, connection):
977
 
        """Overloading of standard D-Bus method.
978
 
        
979
 
        Inserts property tags and interface annotation tags.
 
877
        """Standard D-Bus method, overloaded to insert property tags.
980
878
        """
981
879
        xmlstring = dbus.service.Object.Introspect(self, object_path,
982
880
                                                   connection)
989
887
                e.setAttribute("access", prop._dbus_access)
990
888
                return e
991
889
            for if_tag in document.getElementsByTagName("interface"):
992
 
                # Add property tags
993
890
                for tag in (make_tag(document, name, prop)
994
891
                            for name, prop
995
 
                            in self._get_all_dbus_things("property")
 
892
                            in self._get_all_dbus_properties()
996
893
                            if prop._dbus_interface
997
894
                            == if_tag.getAttribute("name")):
998
895
                    if_tag.appendChild(tag)
999
 
                # Add annotation tags
1000
 
                for typ in ("method", "signal", "property"):
1001
 
                    for tag in if_tag.getElementsByTagName(typ):
1002
 
                        annots = dict()
1003
 
                        for name, prop in (self.
1004
 
                                           _get_all_dbus_things(typ)):
1005
 
                            if (name == tag.getAttribute("name")
1006
 
                                and prop._dbus_interface
1007
 
                                == if_tag.getAttribute("name")):
1008
 
                                annots.update(getattr
1009
 
                                              (prop,
1010
 
                                               "_dbus_annotations",
1011
 
                                               {}))
1012
 
                        for name, value in annots.iteritems():
1013
 
                            ann_tag = document.createElement(
1014
 
                                "annotation")
1015
 
                            ann_tag.setAttribute("name", name)
1016
 
                            ann_tag.setAttribute("value", value)
1017
 
                            tag.appendChild(ann_tag)
1018
 
                # Add interface annotation tags
1019
 
                for annotation, value in dict(
1020
 
                    itertools.chain.from_iterable(
1021
 
                        annotations().iteritems()
1022
 
                        for name, annotations in
1023
 
                        self._get_all_dbus_things("interface")
1024
 
                        if name == if_tag.getAttribute("name")
1025
 
                        )).iteritems():
1026
 
                    ann_tag = document.createElement("annotation")
1027
 
                    ann_tag.setAttribute("name", annotation)
1028
 
                    ann_tag.setAttribute("value", value)
1029
 
                    if_tag.appendChild(ann_tag)
1030
896
                # Add the names to the return values for the
1031
897
                # "org.freedesktop.DBus.Properties" methods
1032
898
                if (if_tag.getAttribute("name")
1047
913
        except (AttributeError, xml.dom.DOMException,
1048
914
                xml.parsers.expat.ExpatError) as error:
1049
915
            logger.error("Failed to override Introspection method",
1050
 
                         exc_info=error)
 
916
                         error)
1051
917
        return xmlstring
1052
918
 
1053
919
 
1054
 
def datetime_to_dbus(dt, variant_level=0):
 
920
def datetime_to_dbus (dt, variant_level=0):
1055
921
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1056
922
    if dt is None:
1057
923
        return dbus.String("", variant_level = variant_level)
1059
925
                       variant_level=variant_level)
1060
926
 
1061
927
 
1062
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1063
 
    """A class decorator; applied to a subclass of
1064
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1065
 
    interface names according to the "alt_interface_names" mapping.
1066
 
    Usage:
1067
 
    
1068
 
    @alternate_dbus_interfaces({"org.example.Interface":
1069
 
                                    "net.example.AlternateInterface"})
1070
 
    class SampleDBusObject(dbus.service.Object):
1071
 
        @dbus.service.method("org.example.Interface")
1072
 
        def SampleDBusMethod():
1073
 
            pass
1074
 
    
1075
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1076
 
    reachable via two interfaces: "org.example.Interface" and
1077
 
    "net.example.AlternateInterface", the latter of which will have
1078
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1079
 
    "true", unless "deprecate" is passed with a False value.
1080
 
    
1081
 
    This works for methods and signals, and also for D-Bus properties
1082
 
    (from DBusObjectWithProperties) and interfaces (from the
1083
 
    dbus_interface_annotations decorator).
 
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
929
                                  .__metaclass__):
 
930
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
931
    will add additional D-Bus attributes matching a certain pattern.
1084
932
    """
1085
 
    def wrapper(cls):
1086
 
        for orig_interface_name, alt_interface_name in (
1087
 
            alt_interface_names.iteritems()):
1088
 
            attr = {}
1089
 
            interface_names = set()
1090
 
            # Go though all attributes of the class
1091
 
            for attrname, attribute in inspect.getmembers(cls):
 
933
    def __new__(mcs, name, bases, attr):
 
934
        # Go through all the base classes which could have D-Bus
 
935
        # methods, signals, or properties in them
 
936
        for base in (b for b in bases
 
937
                     if issubclass(b, dbus.service.Object)):
 
938
            # Go though all attributes of the base class
 
939
            for attrname, attribute in inspect.getmembers(base):
1092
940
                # Ignore non-D-Bus attributes, and D-Bus attributes
1093
941
                # with the wrong interface name
1094
942
                if (not hasattr(attribute, "_dbus_interface")
1095
943
                    or not attribute._dbus_interface
1096
 
                    .startswith(orig_interface_name)):
 
944
                    .startswith("se.recompile.Mandos")):
1097
945
                    continue
1098
946
                # Create an alternate D-Bus interface name based on
1099
947
                # the current name
1100
948
                alt_interface = (attribute._dbus_interface
1101
 
                                 .replace(orig_interface_name,
1102
 
                                          alt_interface_name))
1103
 
                interface_names.add(alt_interface)
 
949
                                 .replace("se.recompile.Mandos",
 
950
                                          "se.bsnet.fukt.Mandos"))
1104
951
                # Is this a D-Bus signal?
1105
952
                if getattr(attribute, "_dbus_is_signal", False):
1106
 
                    # Extract the original non-method undecorated
1107
 
                    # function by black magic
 
953
                    # Extract the original non-method function by
 
954
                    # black magic
1108
955
                    nonmethod_func = (dict(
1109
956
                            zip(attribute.func_code.co_freevars,
1110
957
                                attribute.__closure__))["func"]
1121
968
                                nonmethod_func.func_name,
1122
969
                                nonmethod_func.func_defaults,
1123
970
                                nonmethod_func.func_closure)))
1124
 
                    # Copy annotations, if any
1125
 
                    try:
1126
 
                        new_function._dbus_annotations = (
1127
 
                            dict(attribute._dbus_annotations))
1128
 
                    except AttributeError:
1129
 
                        pass
1130
971
                    # Define a creator of a function to call both the
1131
 
                    # original and alternate functions, so both the
1132
 
                    # original and alternate signals gets sent when
1133
 
                    # the function is called
 
972
                    # old and new functions, so both the old and new
 
973
                    # signals gets sent when the function is called
1134
974
                    def fixscope(func1, func2):
1135
975
                        """This function is a scope container to pass
1136
976
                        func1 and func2 to the "call_both" function
1143
983
                        return call_both
1144
984
                    # Create the "call_both" function and add it to
1145
985
                    # the class
1146
 
                    attr[attrname] = fixscope(attribute, new_function)
 
986
                    attr[attrname] = fixscope(attribute,
 
987
                                              new_function)
1147
988
                # Is this a D-Bus method?
1148
989
                elif getattr(attribute, "_dbus_is_method", False):
1149
990
                    # Create a new, but exactly alike, function
1160
1001
                                        attribute.func_name,
1161
1002
                                        attribute.func_defaults,
1162
1003
                                        attribute.func_closure)))
1163
 
                    # Copy annotations, if any
1164
 
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
1167
 
                    except AttributeError:
1168
 
                        pass
1169
1004
                # Is this a D-Bus property?
1170
1005
                elif getattr(attribute, "_dbus_is_property", False):
1171
1006
                    # Create a new, but exactly alike, function
1185
1020
                                        attribute.func_name,
1186
1021
                                        attribute.func_defaults,
1187
1022
                                        attribute.func_closure)))
1188
 
                    # Copy annotations, if any
1189
 
                    try:
1190
 
                        attr[attrname]._dbus_annotations = (
1191
 
                            dict(attribute._dbus_annotations))
1192
 
                    except AttributeError:
1193
 
                        pass
1194
 
                # Is this a D-Bus interface?
1195
 
                elif getattr(attribute, "_dbus_is_interface", False):
1196
 
                    # Create a new, but exactly alike, function
1197
 
                    # object.  Decorate it to be a new D-Bus interface
1198
 
                    # with the alternate D-Bus interface name.  Add it
1199
 
                    # to the class.
1200
 
                    attr[attrname] = (dbus_interface_annotations
1201
 
                                      (alt_interface)
1202
 
                                      (types.FunctionType
1203
 
                                       (attribute.func_code,
1204
 
                                        attribute.func_globals,
1205
 
                                        attribute.func_name,
1206
 
                                        attribute.func_defaults,
1207
 
                                        attribute.func_closure)))
1208
 
            if deprecate:
1209
 
                # Deprecate all alternate interfaces
1210
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1211
 
                for interface_name in interface_names:
1212
 
                    @dbus_interface_annotations(interface_name)
1213
 
                    def func(self):
1214
 
                        return { "org.freedesktop.DBus.Deprecated":
1215
 
                                     "true" }
1216
 
                    # Find an unused name
1217
 
                    for aname in (iname.format(i)
1218
 
                                  for i in itertools.count()):
1219
 
                        if aname not in attr:
1220
 
                            attr[aname] = func
1221
 
                            break
1222
 
            if interface_names:
1223
 
                # Replace the class with a new subclass of it with
1224
 
                # methods, signals, etc. as created above.
1225
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1226
 
                           (cls,), attr)
1227
 
        return cls
1228
 
    return wrapper
1229
 
 
1230
 
 
1231
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1232
 
                                "se.bsnet.fukt.Mandos"})
 
1023
        return type.__new__(mcs, name, bases, attr)
 
1024
 
 
1025
 
1233
1026
class ClientDBus(Client, DBusObjectWithProperties):
1234
1027
    """A Client class using D-Bus
1235
1028
    
1246
1039
    def __init__(self, bus = None, *args, **kwargs):
1247
1040
        self.bus = bus
1248
1041
        Client.__init__(self, *args, **kwargs)
 
1042
        self._approvals_pending = 0
 
1043
        
 
1044
        self._approvals_pending = 0
1249
1045
        # Only now, when this client is initialized, can it show up on
1250
1046
        # the D-Bus
1251
1047
        client_object_name = unicode(self.name).translate(
1255
1051
                                 ("/clients/" + client_object_name))
1256
1052
        DBusObjectWithProperties.__init__(self, self.bus,
1257
1053
                                          self.dbus_object_path)
1258
 
    
 
1054
        
1259
1055
    def notifychangeproperty(transform_func,
1260
1056
                             dbus_name, type_func=lambda x: x,
1261
1057
                             variant_level=1):
1284
1080
        
1285
1081
        return property(lambda self: getattr(self, attrname), setter)
1286
1082
    
 
1083
    
1287
1084
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1288
1085
    approvals_pending = notifychangeproperty(dbus.Boolean,
1289
1086
                                             "ApprovalPending",
1296
1093
                                       checker is not None)
1297
1094
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1298
1095
                                           "LastCheckedOK")
1299
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1300
 
                                               "LastCheckerStatus")
1301
1096
    last_approval_request = notifychangeproperty(
1302
1097
        datetime_to_dbus, "LastApprovalRequest")
1303
1098
    approved_by_default = notifychangeproperty(dbus.Boolean,
1353
1148
                                       *args, **kwargs)
1354
1149
    
1355
1150
    def start_checker(self, *args, **kwargs):
1356
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1151
        old_checker = self.checker
 
1152
        if self.checker is not None:
 
1153
            old_checker_pid = self.checker.pid
 
1154
        else:
 
1155
            old_checker_pid = None
1357
1156
        r = Client.start_checker(self, *args, **kwargs)
1358
1157
        # Only if new checker process was started
1359
1158
        if (self.checker is not None
1367
1166
        return False
1368
1167
    
1369
1168
    def approve(self, value=True):
 
1169
        self.send_changedstate()
1370
1170
        self.approved = value
1371
1171
        gobject.timeout_add(timedelta_to_milliseconds
1372
1172
                            (self.approval_duration),
1373
1173
                            self._reset_approved)
1374
 
        self.send_changedstate()
 
1174
    
1375
1175
    
1376
1176
    ## D-Bus methods, signals & properties
1377
1177
    _interface = "se.recompile.Mandos.Client"
1378
1178
    
1379
 
    ## Interfaces
1380
 
    
1381
 
    @dbus_interface_annotations(_interface)
1382
 
    def _foo(self):
1383
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1384
 
                     "false"}
1385
 
    
1386
1179
    ## Signals
1387
1180
    
1388
1181
    # CheckerCompleted - signal
1424
1217
        "D-Bus signal"
1425
1218
        return self.need_approval()
1426
1219
    
 
1220
    # NeRwequest - signal
 
1221
    @dbus.service.signal(_interface, signature="s")
 
1222
    def NewRequest(self, ip):
 
1223
        """D-Bus signal
 
1224
        Is sent after a client request a password.
 
1225
        """
 
1226
        pass
 
1227
    
1427
1228
    ## Methods
1428
1229
    
1429
1230
    # Approve - method
1539
1340
            return
1540
1341
        return datetime_to_dbus(self.last_checked_ok)
1541
1342
    
1542
 
    # LastCheckerStatus - property
1543
 
    @dbus_service_property(_interface, signature="n",
1544
 
                           access="read")
1545
 
    def LastCheckerStatus_dbus_property(self):
1546
 
        return dbus.Int16(self.last_checker_status)
1547
 
    
1548
1343
    # Expires - property
1549
1344
    @dbus_service_property(_interface, signature="s", access="read")
1550
1345
    def Expires_dbus_property(self):
1561
1356
    def Timeout_dbus_property(self, value=None):
1562
1357
        if value is None:       # get
1563
1358
            return dbus.UInt64(self.timeout_milliseconds())
1564
 
        old_timeout = self.timeout
1565
1359
        self.timeout = datetime.timedelta(0, 0, 0, value)
1566
 
        # Reschedule disabling
1567
 
        if self.enabled:
1568
 
            now = datetime.datetime.utcnow()
1569
 
            self.expires += self.timeout - old_timeout
1570
 
            if self.expires <= now:
1571
 
                # The timeout has passed
1572
 
                self.disable()
1573
 
            else:
1574
 
                if (getattr(self, "disable_initiator_tag", None)
1575
 
                    is None):
1576
 
                    return
1577
 
                gobject.source_remove(self.disable_initiator_tag)
1578
 
                self.disable_initiator_tag = (
1579
 
                    gobject.timeout_add(
1580
 
                        timedelta_to_milliseconds(self.expires - now),
1581
 
                        self.disable))
 
1360
        if getattr(self, "disable_initiator_tag", None) is None:
 
1361
            return
 
1362
        # Reschedule timeout
 
1363
        gobject.source_remove(self.disable_initiator_tag)
 
1364
        self.disable_initiator_tag = None
 
1365
        self.expires = None
 
1366
        time_to_die = timedelta_to_milliseconds((self
 
1367
                                                 .last_checked_ok
 
1368
                                                 + self.timeout)
 
1369
                                                - datetime.datetime
 
1370
                                                .utcnow())
 
1371
        if time_to_die <= 0:
 
1372
            # The timeout has passed
 
1373
            self.disable()
 
1374
        else:
 
1375
            self.expires = (datetime.datetime.utcnow()
 
1376
                            + datetime.timedelta(milliseconds =
 
1377
                                                 time_to_die))
 
1378
            self.disable_initiator_tag = (gobject.timeout_add
 
1379
                                          (time_to_die, self.disable))
1582
1380
    
1583
1381
    # ExtendedTimeout - property
1584
1382
    @dbus_service_property(_interface, signature="t",
1663
1461
        self._pipe.send(('setattr', name, value))
1664
1462
 
1665
1463
 
 
1464
class ClientDBusTransitional(ClientDBus):
 
1465
    __metaclass__ = AlternateDBusNamesMetaclass
 
1466
 
 
1467
 
1666
1468
class ClientHandler(socketserver.BaseRequestHandler, object):
1667
1469
    """A class to handle client connections.
1668
1470
    
1704
1506
            logger.debug("Protocol version: %r", line)
1705
1507
            try:
1706
1508
                if int(line.strip().split()[0]) > 1:
1707
 
                    raise RuntimeError(line)
 
1509
                    raise RuntimeError
1708
1510
            except (ValueError, IndexError, RuntimeError) as error:
1709
1511
                logger.error("Unknown protocol version: %s", error)
1710
1512
                return
1736
1538
                except KeyError:
1737
1539
                    return
1738
1540
                
 
1541
                if self.server.use_dbus:
 
1542
                    # Emit D-Bus signal
 
1543
                    client.NewRequest(str(self.client_address))
 
1544
                
1739
1545
                if client.approval_delay:
1740
1546
                    delay = client.approval_delay
1741
1547
                    client.approvals_pending += 1
1772
1578
                    #wait until timeout or approved
1773
1579
                    time = datetime.datetime.now()
1774
1580
                    client.changedstate.acquire()
1775
 
                    client.changedstate.wait(
1776
 
                        float(timedelta_to_milliseconds(delay)
1777
 
                              / 1000))
 
1581
                    (client.changedstate.wait
 
1582
                     (float(client.timedelta_to_milliseconds(delay)
 
1583
                            / 1000)))
1778
1584
                    client.changedstate.release()
1779
1585
                    time2 = datetime.datetime.now()
1780
1586
                    if (time2 - time) >= delay:
1796
1602
                    try:
1797
1603
                        sent = session.send(client.secret[sent_size:])
1798
1604
                    except gnutls.errors.GNUTLSError as error:
1799
 
                        logger.warning("gnutls send failed",
1800
 
                                       exc_info=error)
 
1605
                        logger.warning("gnutls send failed")
1801
1606
                        return
1802
1607
                    logger.debug("Sent: %d, remaining: %d",
1803
1608
                                 sent, len(client.secret)
1806
1611
                
1807
1612
                logger.info("Sending secret to %s", client.name)
1808
1613
                # bump the timeout using extended_timeout
1809
 
                client.bump_timeout(client.extended_timeout)
 
1614
                client.checked_ok(client.extended_timeout)
1810
1615
                if self.server.use_dbus:
1811
1616
                    # Emit D-Bus signal
1812
1617
                    client.GotSecret()
1817
1622
                try:
1818
1623
                    session.bye()
1819
1624
                except gnutls.errors.GNUTLSError as error:
1820
 
                    logger.warning("GnuTLS bye failed",
1821
 
                                   exc_info=error)
 
1625
                    logger.warning("GnuTLS bye failed")
1822
1626
    
1823
1627
    @staticmethod
1824
1628
    def peer_certificate(session):
1896
1700
    def process_request(self, request, address):
1897
1701
        """Start a new process to process the request."""
1898
1702
        proc = multiprocessing.Process(target = self.sub_process_main,
1899
 
                                       args = (request, address))
 
1703
                                       args = (request,
 
1704
                                               address))
1900
1705
        proc.start()
1901
1706
        return proc
1902
1707
 
1917
1722
    
1918
1723
    def add_pipe(self, parent_pipe, proc):
1919
1724
        """Dummy function; override as necessary"""
1920
 
        raise NotImplementedError()
 
1725
        raise NotImplementedError
1921
1726
 
1922
1727
 
1923
1728
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1930
1735
        use_ipv6:       Boolean; to use IPv6 or not
1931
1736
    """
1932
1737
    def __init__(self, server_address, RequestHandlerClass,
1933
 
                 interface=None, use_ipv6=True, socketfd=None):
1934
 
        """If socketfd is set, use that file descriptor instead of
1935
 
        creating a new one with socket.socket().
1936
 
        """
 
1738
                 interface=None, use_ipv6=True):
1937
1739
        self.interface = interface
1938
1740
        if use_ipv6:
1939
1741
            self.address_family = socket.AF_INET6
1940
 
        if socketfd is not None:
1941
 
            # Save the file descriptor
1942
 
            self.socketfd = socketfd
1943
 
            # Save the original socket.socket() function
1944
 
            self.socket_socket = socket.socket
1945
 
            # To implement --socket, we monkey patch socket.socket.
1946
 
            # 
1947
 
            # (When socketserver.TCPServer is a new-style class, we
1948
 
            # could make self.socket into a property instead of monkey
1949
 
            # patching socket.socket.)
1950
 
            # 
1951
 
            # Create a one-time-only replacement for socket.socket()
1952
 
            @functools.wraps(socket.socket)
1953
 
            def socket_wrapper(*args, **kwargs):
1954
 
                # Restore original function so subsequent calls are
1955
 
                # not affected.
1956
 
                socket.socket = self.socket_socket
1957
 
                del self.socket_socket
1958
 
                # This time only, return a new socket object from the
1959
 
                # saved file descriptor.
1960
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1961
 
            # Replace socket.socket() function with wrapper
1962
 
            socket.socket = socket_wrapper
1963
 
        # The socketserver.TCPServer.__init__ will call
1964
 
        # socket.socket(), which might be our replacement,
1965
 
        # socket_wrapper(), if socketfd was set.
1966
1742
        socketserver.TCPServer.__init__(self, server_address,
1967
1743
                                        RequestHandlerClass)
1968
 
    
1969
1744
    def server_bind(self):
1970
1745
        """This overrides the normal server_bind() function
1971
1746
        to bind to an interface if one was specified, and also NOT to
1979
1754
                try:
1980
1755
                    self.socket.setsockopt(socket.SOL_SOCKET,
1981
1756
                                           SO_BINDTODEVICE,
1982
 
                                           str(self.interface + '\0'))
 
1757
                                           str(self.interface
 
1758
                                               + '\0'))
1983
1759
                except socket.error as error:
1984
 
                    if error.errno == errno.EPERM:
1985
 
                        logger.error("No permission to bind to"
1986
 
                                     " interface %s", self.interface)
1987
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1760
                    if error[0] == errno.EPERM:
 
1761
                        logger.error("No permission to"
 
1762
                                     " bind to interface %s",
 
1763
                                     self.interface)
 
1764
                    elif error[0] == errno.ENOPROTOOPT:
1988
1765
                        logger.error("SO_BINDTODEVICE not available;"
1989
1766
                                     " cannot bind to interface %s",
1990
1767
                                     self.interface)
1991
 
                    elif error.errno == errno.ENODEV:
1992
 
                        logger.error("Interface %s does not exist,"
1993
 
                                     " cannot bind", self.interface)
1994
1768
                    else:
1995
1769
                        raise
1996
1770
        # Only bind(2) the socket if we really need to.
1999
1773
                if self.address_family == socket.AF_INET6:
2000
1774
                    any_address = "::" # in6addr_any
2001
1775
                else:
2002
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1776
                    any_address = socket.INADDR_ANY
2003
1777
                self.server_address = (any_address,
2004
1778
                                       self.server_address[1])
2005
1779
            elif not self.server_address[1]:
2026
1800
    """
2027
1801
    def __init__(self, server_address, RequestHandlerClass,
2028
1802
                 interface=None, use_ipv6=True, clients=None,
2029
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1803
                 gnutls_priority=None, use_dbus=True):
2030
1804
        self.enabled = False
2031
1805
        self.clients = clients
2032
1806
        if self.clients is None:
2036
1810
        IPv6_TCPServer.__init__(self, server_address,
2037
1811
                                RequestHandlerClass,
2038
1812
                                interface = interface,
2039
 
                                use_ipv6 = use_ipv6,
2040
 
                                socketfd = socketfd)
 
1813
                                use_ipv6 = use_ipv6)
2041
1814
    def server_activate(self):
2042
1815
        if self.enabled:
2043
1816
            return socketserver.TCPServer.server_activate(self)
2056
1829
    
2057
1830
    def handle_ipc(self, source, condition, parent_pipe=None,
2058
1831
                   proc = None, client_object=None):
 
1832
        condition_names = {
 
1833
            gobject.IO_IN: "IN",   # There is data to read.
 
1834
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1835
                                    # blocking).
 
1836
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1837
            gobject.IO_ERR: "ERR", # Error condition.
 
1838
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1839
                                    # broken, usually for pipes and
 
1840
                                    # sockets).
 
1841
            }
 
1842
        conditions_string = ' | '.join(name
 
1843
                                       for cond, name in
 
1844
                                       condition_names.iteritems()
 
1845
                                       if cond & condition)
2059
1846
        # error, or the other end of multiprocessing.Pipe has closed
2060
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1847
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2061
1848
            # Wait for other process to exit
2062
1849
            proc.join()
2063
1850
            return False
2121
1908
        return True
2122
1909
 
2123
1910
 
2124
 
def rfc3339_duration_to_delta(duration):
2125
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2126
 
    
2127
 
    >>> rfc3339_duration_to_delta("P7D")
2128
 
    datetime.timedelta(7)
2129
 
    >>> rfc3339_duration_to_delta("PT60S")
2130
 
    datetime.timedelta(0, 60)
2131
 
    >>> rfc3339_duration_to_delta("PT60M")
2132
 
    datetime.timedelta(0, 3600)
2133
 
    >>> rfc3339_duration_to_delta("PT24H")
2134
 
    datetime.timedelta(1)
2135
 
    >>> rfc3339_duration_to_delta("P1W")
2136
 
    datetime.timedelta(7)
2137
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2138
 
    datetime.timedelta(0, 330)
2139
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2140
 
    datetime.timedelta(1, 200)
2141
 
    """
2142
 
    
2143
 
    # Parsing an RFC 3339 duration with regular expressions is not
2144
 
    # possible - there would have to be multiple places for the same
2145
 
    # values, like seconds.  The current code, while more esoteric, is
2146
 
    # cleaner without depending on a parsing library.  If Python had a
2147
 
    # built-in library for parsing we would use it, but we'd like to
2148
 
    # avoid excessive use of external libraries.
2149
 
    
2150
 
    # New type for defining tokens, syntax, and semantics all-in-one
2151
 
    Token = collections.namedtuple("Token",
2152
 
                                   ("regexp", # To match token; if
2153
 
                                              # "value" is not None,
2154
 
                                              # must have a "group"
2155
 
                                              # containing digits
2156
 
                                    "value",  # datetime.timedelta or
2157
 
                                              # None
2158
 
                                    "followers")) # Tokens valid after
2159
 
                                                  # this token
2160
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2161
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2162
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2163
 
    token_second = Token(re.compile(r"(\d+)S"),
2164
 
                         datetime.timedelta(seconds=1),
2165
 
                         frozenset((token_end,)))
2166
 
    token_minute = Token(re.compile(r"(\d+)M"),
2167
 
                         datetime.timedelta(minutes=1),
2168
 
                         frozenset((token_second, token_end)))
2169
 
    token_hour = Token(re.compile(r"(\d+)H"),
2170
 
                       datetime.timedelta(hours=1),
2171
 
                       frozenset((token_minute, token_end)))
2172
 
    token_time = Token(re.compile(r"T"),
2173
 
                       None,
2174
 
                       frozenset((token_hour, token_minute,
2175
 
                                  token_second)))
2176
 
    token_day = Token(re.compile(r"(\d+)D"),
2177
 
                      datetime.timedelta(days=1),
2178
 
                      frozenset((token_time, token_end)))
2179
 
    token_month = Token(re.compile(r"(\d+)M"),
2180
 
                        datetime.timedelta(weeks=4),
2181
 
                        frozenset((token_day, token_end)))
2182
 
    token_year = Token(re.compile(r"(\d+)Y"),
2183
 
                       datetime.timedelta(weeks=52),
2184
 
                       frozenset((token_month, token_end)))
2185
 
    token_week = Token(re.compile(r"(\d+)W"),
2186
 
                       datetime.timedelta(weeks=1),
2187
 
                       frozenset((token_end,)))
2188
 
    token_duration = Token(re.compile(r"P"), None,
2189
 
                           frozenset((token_year, token_month,
2190
 
                                      token_day, token_time,
2191
 
                                      token_week))),
2192
 
    # Define starting values
2193
 
    value = datetime.timedelta() # Value so far
2194
 
    found_token = None
2195
 
    followers = frozenset(token_duration,) # Following valid tokens
2196
 
    s = duration                # String left to parse
2197
 
    # Loop until end token is found
2198
 
    while found_token is not token_end:
2199
 
        # Search for any currently valid tokens
2200
 
        for token in followers:
2201
 
            match = token.regexp.match(s)
2202
 
            if match is not None:
2203
 
                # Token found
2204
 
                if token.value is not None:
2205
 
                    # Value found, parse digits
2206
 
                    factor = int(match.group(1), 10)
2207
 
                    # Add to value so far
2208
 
                    value += factor * token.value
2209
 
                # Strip token from string
2210
 
                s = token.regexp.sub("", s, 1)
2211
 
                # Go to found token
2212
 
                found_token = token
2213
 
                # Set valid next tokens
2214
 
                followers = found_token.followers
2215
 
                break
2216
 
        else:
2217
 
            # No currently valid tokens were found
2218
 
            raise ValueError("Invalid RFC 3339 duration")
2219
 
    # End token found
2220
 
    return value
2221
 
 
2222
 
 
2223
1911
def string_to_delta(interval):
2224
1912
    """Parse a string and return a datetime.timedelta
2225
1913
    
2236
1924
    >>> string_to_delta('5m 30s')
2237
1925
    datetime.timedelta(0, 330)
2238
1926
    """
2239
 
    
2240
 
    try:
2241
 
        return rfc3339_duration_to_delta(interval)
2242
 
    except ValueError:
2243
 
        pass
2244
 
    
2245
1927
    timevalue = datetime.timedelta(0)
2246
1928
    for s in interval.split():
2247
1929
        try:
2258
1940
            elif suffix == "w":
2259
1941
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2260
1942
            else:
2261
 
                raise ValueError("Unknown suffix {0!r}"
2262
 
                                 .format(suffix))
2263
 
        except IndexError as e:
 
1943
                raise ValueError("Unknown suffix %r" % suffix)
 
1944
        except (ValueError, IndexError) as e:
2264
1945
            raise ValueError(*(e.args))
2265
1946
        timevalue += delta
2266
1947
    return timevalue
2279
1960
        sys.exit()
2280
1961
    if not noclose:
2281
1962
        # Close all standard open file descriptors
2282
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1963
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2283
1964
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2284
1965
            raise OSError(errno.ENODEV,
2285
 
                          "{0} not a character device"
2286
 
                          .format(os.devnull))
 
1966
                          "%s not a character device"
 
1967
                          % os.path.devnull)
2287
1968
        os.dup2(null, sys.stdin.fileno())
2288
1969
        os.dup2(null, sys.stdout.fileno())
2289
1970
        os.dup2(null, sys.stderr.fileno())
2298
1979
    
2299
1980
    parser = argparse.ArgumentParser()
2300
1981
    parser.add_argument("-v", "--version", action="version",
2301
 
                        version = "%(prog)s {0}".format(version),
 
1982
                        version = "%%(prog)s %s" % version,
2302
1983
                        help="show version number and exit")
2303
1984
    parser.add_argument("-i", "--interface", metavar="IF",
2304
1985
                        help="Bind to interface IF")
2310
1991
                        help="Run self-test")
2311
1992
    parser.add_argument("--debug", action="store_true",
2312
1993
                        help="Debug mode; run in foreground and log"
2313
 
                        " to terminal", default=None)
 
1994
                        " to terminal")
2314
1995
    parser.add_argument("--debuglevel", metavar="LEVEL",
2315
1996
                        help="Debug level for stdout output")
2316
1997
    parser.add_argument("--priority", help="GnuTLS"
2323
2004
                        " files")
2324
2005
    parser.add_argument("--no-dbus", action="store_false",
2325
2006
                        dest="use_dbus", help="Do not provide D-Bus"
2326
 
                        " system bus interface", default=None)
 
2007
                        " system bus interface")
2327
2008
    parser.add_argument("--no-ipv6", action="store_false",
2328
 
                        dest="use_ipv6", help="Do not use IPv6",
2329
 
                        default=None)
 
2009
                        dest="use_ipv6", help="Do not use IPv6")
2330
2010
    parser.add_argument("--no-restore", action="store_false",
2331
2011
                        dest="restore", help="Do not restore stored"
2332
 
                        " state", default=None)
2333
 
    parser.add_argument("--socket", type=int,
2334
 
                        help="Specify a file descriptor to a network"
2335
 
                        " socket to use instead of creating one")
 
2012
                        " state")
2336
2013
    parser.add_argument("--statedir", metavar="DIR",
2337
2014
                        help="Directory to save/restore state in")
2338
 
    parser.add_argument("--foreground", action="store_true",
2339
 
                        help="Run in foreground", default=None)
2340
 
    parser.add_argument("--no-zeroconf", action="store_false",
2341
 
                        dest="zeroconf", help="Do not use Zeroconf",
2342
 
                        default=None)
2343
2015
    
2344
2016
    options = parser.parse_args()
2345
2017
    
2346
2018
    if options.check:
2347
2019
        import doctest
2348
 
        fail_count, test_count = doctest.testmod()
2349
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2020
        doctest.testmod()
 
2021
        sys.exit()
2350
2022
    
2351
2023
    # Default values for config file for server-global settings
2352
2024
    server_defaults = { "interface": "",
2354
2026
                        "port": "",
2355
2027
                        "debug": "False",
2356
2028
                        "priority":
2357
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2029
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2358
2030
                        "servicename": "Mandos",
2359
2031
                        "use_dbus": "True",
2360
2032
                        "use_ipv6": "True",
2361
2033
                        "debuglevel": "",
2362
2034
                        "restore": "True",
2363
 
                        "socket": "",
2364
 
                        "statedir": "/var/lib/mandos",
2365
 
                        "foreground": "False",
2366
 
                        "zeroconf": "True",
 
2035
                        "statedir": "/var/lib/mandos"
2367
2036
                        }
2368
2037
    
2369
2038
    # Parse config file for server-global settings
2374
2043
    # Convert the SafeConfigParser object to a dict
2375
2044
    server_settings = server_config.defaults()
2376
2045
    # Use the appropriate methods on the non-string config options
2377
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2046
    for option in ("debug", "use_dbus", "use_ipv6"):
2378
2047
        server_settings[option] = server_config.getboolean("DEFAULT",
2379
2048
                                                           option)
2380
2049
    if server_settings["port"]:
2381
2050
        server_settings["port"] = server_config.getint("DEFAULT",
2382
2051
                                                       "port")
2383
 
    if server_settings["socket"]:
2384
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2385
 
                                                         "socket")
2386
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2387
 
        # over with an opened os.devnull.  But we don't want this to
2388
 
        # happen with a supplied network socket.
2389
 
        if 0 <= server_settings["socket"] <= 2:
2390
 
            server_settings["socket"] = os.dup(server_settings
2391
 
                                               ["socket"])
2392
2052
    del server_config
2393
2053
    
2394
2054
    # Override the settings from the config file with command line
2396
2056
    for option in ("interface", "address", "port", "debug",
2397
2057
                   "priority", "servicename", "configdir",
2398
2058
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2059
                   "statedir"):
2400
2060
        value = getattr(options, option)
2401
2061
        if value is not None:
2402
2062
            server_settings[option] = value
2405
2065
    for option in server_settings.keys():
2406
2066
        if type(server_settings[option]) is str:
2407
2067
            server_settings[option] = unicode(server_settings[option])
2408
 
    # Force all boolean options to be boolean
2409
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2410
 
                   "foreground", "zeroconf"):
2411
 
        server_settings[option] = bool(server_settings[option])
2412
 
    # Debug implies foreground
2413
 
    if server_settings["debug"]:
2414
 
        server_settings["foreground"] = True
2415
2068
    # Now we have our good server settings in "server_settings"
2416
2069
    
2417
2070
    ##################################################################
2418
2071
    
2419
 
    if (not server_settings["zeroconf"] and
2420
 
        not (server_settings["port"]
2421
 
             or server_settings["socket"] != "")):
2422
 
            parser.error("Needs port or socket to work without"
2423
 
                         " Zeroconf")
2424
 
    
2425
2072
    # For convenience
2426
2073
    debug = server_settings["debug"]
2427
2074
    debuglevel = server_settings["debuglevel"]
2429
2076
    use_ipv6 = server_settings["use_ipv6"]
2430
2077
    stored_state_path = os.path.join(server_settings["statedir"],
2431
2078
                                     stored_state_file)
2432
 
    foreground = server_settings["foreground"]
2433
 
    zeroconf = server_settings["zeroconf"]
2434
2079
    
2435
2080
    if debug:
2436
 
        initlogger(debug, logging.DEBUG)
 
2081
        initlogger(logging.DEBUG)
2437
2082
    else:
2438
2083
        if not debuglevel:
2439
 
            initlogger(debug)
 
2084
            initlogger()
2440
2085
        else:
2441
2086
            level = getattr(logging, debuglevel.upper())
2442
 
            initlogger(debug, level)
 
2087
            initlogger(level)
2443
2088
    
2444
2089
    if server_settings["servicename"] != "Mandos":
2445
2090
        syslogger.setFormatter(logging.Formatter
2446
 
                               ('Mandos ({0}) [%(process)d]:'
2447
 
                                ' %(levelname)s: %(message)s'
2448
 
                                .format(server_settings
2449
 
                                        ["servicename"])))
 
2091
                               ('Mandos (%s) [%%(process)d]:'
 
2092
                                ' %%(levelname)s: %%(message)s'
 
2093
                                % server_settings["servicename"]))
2450
2094
    
2451
2095
    # Parse config file with clients
2452
 
    client_config = configparser.SafeConfigParser(Client
2453
 
                                                  .client_defaults)
 
2096
    client_config = configparser.SafeConfigParser(Client.client_defaults)
2454
2097
    client_config.read(os.path.join(server_settings["configdir"],
2455
2098
                                    "clients.conf"))
2456
2099
    
2457
2100
    global mandos_dbus_service
2458
2101
    mandos_dbus_service = None
2459
2102
    
2460
 
    socketfd = None
2461
 
    if server_settings["socket"] != "":
2462
 
        socketfd = server_settings["socket"]
2463
2103
    tcp_server = MandosServer((server_settings["address"],
2464
2104
                               server_settings["port"]),
2465
2105
                              ClientHandler,
2468
2108
                              use_ipv6=use_ipv6,
2469
2109
                              gnutls_priority=
2470
2110
                              server_settings["priority"],
2471
 
                              use_dbus=use_dbus,
2472
 
                              socketfd=socketfd)
2473
 
    if not foreground:
2474
 
        pidfilename = "/run/mandos.pid"
2475
 
        if not os.path.isdir("/run/."):
2476
 
            pidfilename = "/var/run/mandos.pid"
2477
 
        pidfile = None
 
2111
                              use_dbus=use_dbus)
 
2112
    if not debug:
 
2113
        pidfilename = "/var/run/mandos.pid"
2478
2114
        try:
2479
2115
            pidfile = open(pidfilename, "w")
2480
 
        except IOError as e:
2481
 
            logger.error("Could not open file %r", pidfilename,
2482
 
                         exc_info=e)
 
2116
        except IOError:
 
2117
            logger.error("Could not open file %r", pidfilename)
2483
2118
    
2484
 
    for name in ("_mandos", "mandos", "nobody"):
 
2119
    try:
 
2120
        uid = pwd.getpwnam("_mandos").pw_uid
 
2121
        gid = pwd.getpwnam("_mandos").pw_gid
 
2122
    except KeyError:
2485
2123
        try:
2486
 
            uid = pwd.getpwnam(name).pw_uid
2487
 
            gid = pwd.getpwnam(name).pw_gid
2488
 
            break
 
2124
            uid = pwd.getpwnam("mandos").pw_uid
 
2125
            gid = pwd.getpwnam("mandos").pw_gid
2489
2126
        except KeyError:
2490
 
            continue
2491
 
    else:
2492
 
        uid = 65534
2493
 
        gid = 65534
 
2127
            try:
 
2128
                uid = pwd.getpwnam("nobody").pw_uid
 
2129
                gid = pwd.getpwnam("nobody").pw_gid
 
2130
            except KeyError:
 
2131
                uid = 65534
 
2132
                gid = 65534
2494
2133
    try:
2495
2134
        os.setgid(gid)
2496
2135
        os.setuid(uid)
2497
2136
    except OSError as error:
2498
 
        if error.errno != errno.EPERM:
2499
 
            raise
 
2137
        if error[0] != errno.EPERM:
 
2138
            raise error
2500
2139
    
2501
2140
    if debug:
2502
2141
        # Enable all possible GnuTLS debugging
2513
2152
         .gnutls_global_set_log_function(debug_gnutls))
2514
2153
        
2515
2154
        # Redirect stdin so all checkers get /dev/null
2516
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2155
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2517
2156
        os.dup2(null, sys.stdin.fileno())
2518
2157
        if null > 2:
2519
2158
            os.close(null)
 
2159
    else:
 
2160
        # No console logging
 
2161
        logger.removeHandler(console)
2520
2162
    
2521
2163
    # Need to fork before connecting to D-Bus
2522
 
    if not foreground:
 
2164
    if not debug:
2523
2165
        # Close all input and output, do double fork, etc.
2524
2166
        daemon()
2525
2167
    
2526
 
    # multiprocessing will use threads, so before we use gobject we
2527
 
    # need to inform gobject that threads will be used.
2528
2168
    gobject.threads_init()
2529
2169
    
2530
2170
    global main_loop
2531
2171
    # From the Avahi example code
2532
 
    DBusGMainLoop(set_as_default=True)
 
2172
    DBusGMainLoop(set_as_default=True )
2533
2173
    main_loop = gobject.MainLoop()
2534
2174
    bus = dbus.SystemBus()
2535
2175
    # End of Avahi example code
2541
2181
                            ("se.bsnet.fukt.Mandos", bus,
2542
2182
                             do_not_queue=True))
2543
2183
        except dbus.exceptions.NameExistsException as e:
2544
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2184
            logger.error(unicode(e) + ", disabling D-Bus")
2545
2185
            use_dbus = False
2546
2186
            server_settings["use_dbus"] = False
2547
2187
            tcp_server.use_dbus = False
2548
 
    if zeroconf:
2549
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2550
 
        service = AvahiServiceToSyslog(name =
2551
 
                                       server_settings["servicename"],
2552
 
                                       servicetype = "_mandos._tcp",
2553
 
                                       protocol = protocol, bus = bus)
2554
 
        if server_settings["interface"]:
2555
 
            service.interface = (if_nametoindex
2556
 
                                 (str(server_settings["interface"])))
 
2188
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2189
    service = AvahiServiceToSyslog(name =
 
2190
                                   server_settings["servicename"],
 
2191
                                   servicetype = "_mandos._tcp",
 
2192
                                   protocol = protocol, bus = bus)
 
2193
    if server_settings["interface"]:
 
2194
        service.interface = (if_nametoindex
 
2195
                             (str(server_settings["interface"])))
2557
2196
    
2558
2197
    global multiprocessing_manager
2559
2198
    multiprocessing_manager = multiprocessing.Manager()
2560
2199
    
2561
2200
    client_class = Client
2562
2201
    if use_dbus:
2563
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2202
        client_class = functools.partial(ClientDBusTransitional,
 
2203
                                         bus = bus)
2564
2204
    
2565
2205
    client_settings = Client.config_parser(client_config)
2566
2206
    old_client_settings = {}
2567
2207
    clients_data = {}
2568
2208
    
2569
 
    # This is used to redirect stdout and stderr for checker processes
2570
 
    global wnull
2571
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2572
 
    # Only used if server is running in foreground but not in debug
2573
 
    # mode
2574
 
    if debug or not foreground:
2575
 
        wnull.close()
2576
 
    
2577
2209
    # Get client data and settings from last running state.
2578
2210
    if server_settings["restore"]:
2579
2211
        try:
2582
2214
                                                     (stored_state))
2583
2215
            os.remove(stored_state_path)
2584
2216
        except IOError as e:
2585
 
            if e.errno == errno.ENOENT:
2586
 
                logger.warning("Could not load persistent state: {0}"
2587
 
                                .format(os.strerror(e.errno)))
2588
 
            else:
2589
 
                logger.critical("Could not load persistent state:",
2590
 
                                exc_info=e)
 
2217
            logger.warning("Could not load persistent state: {0}"
 
2218
                           .format(e))
 
2219
            if e.errno != errno.ENOENT:
2591
2220
                raise
2592
 
        except EOFError as e:
2593
 
            logger.warning("Could not load persistent state: "
2594
 
                           "EOFError:", exc_info=e)
2595
2221
    
2596
2222
    with PGPEngine() as pgp:
2597
2223
        for client_name, client in clients_data.iteritems():
2598
 
            # Skip removed clients
2599
 
            if client_name not in client_settings:
2600
 
                continue
2601
 
            
2602
2224
            # Decide which value to use after restoring saved state.
2603
2225
            # We have three different values: Old config file,
2604
2226
            # new config file, and saved state.
2618
2240
            
2619
2241
            # Clients who has passed its expire date can still be
2620
2242
            # enabled if its last checker was successful.  Clients
2621
 
            # whose checker succeeded before we stored its state is
2622
 
            # assumed to have successfully run all checkers during
2623
 
            # downtime.
 
2243
            # whose checker failed before we stored its state is
 
2244
            # assumed to have failed all checkers during downtime.
2624
2245
            if client["enabled"]:
2625
2246
                if datetime.datetime.utcnow() >= client["expires"]:
2626
2247
                    if not client["last_checked_ok"]:
2627
2248
                        logger.warning(
2628
2249
                            "disabling client {0} - Client never "
2629
 
                            "performed a successful checker"
2630
 
                            .format(client_name))
 
2250
                            "performed a successfull checker"
 
2251
                            .format(client["name"]))
2631
2252
                        client["enabled"] = False
2632
2253
                    elif client["last_checker_status"] != 0:
2633
2254
                        logger.warning(
2634
2255
                            "disabling client {0} - Client "
2635
2256
                            "last checker failed with error code {1}"
2636
 
                            .format(client_name,
 
2257
                            .format(client["name"],
2637
2258
                                    client["last_checker_status"]))
2638
2259
                        client["enabled"] = False
2639
2260
                    else:
2640
2261
                        client["expires"] = (datetime.datetime
2641
2262
                                             .utcnow()
2642
2263
                                             + client["timeout"])
2643
 
                        logger.debug("Last checker succeeded,"
2644
 
                                     " keeping {0} enabled"
2645
 
                                     .format(client_name))
 
2264
                    
2646
2265
            try:
2647
2266
                client["secret"] = (
2648
2267
                    pgp.decrypt(client["encrypted_secret"],
2654
2273
                             .format(client_name))
2655
2274
                client["secret"] = (
2656
2275
                    client_settings[client_name]["secret"])
 
2276
 
2657
2277
    
2658
2278
    # Add/remove clients based on new changes made to config
2659
 
    for client_name in (set(old_client_settings)
2660
 
                        - set(client_settings)):
 
2279
    for client_name in set(old_client_settings) - set(client_settings):
2661
2280
        del clients_data[client_name]
2662
 
    for client_name in (set(client_settings)
2663
 
                        - set(old_client_settings)):
 
2281
    for client_name in set(client_settings) - set(old_client_settings):
2664
2282
        clients_data[client_name] = client_settings[client_name]
2665
 
    
2666
 
    # Create all client objects
 
2283
 
 
2284
    # Create clients all clients
2667
2285
    for client_name, client in clients_data.iteritems():
2668
2286
        tcp_server.clients[client_name] = client_class(
2669
 
            name = client_name, settings = client,
2670
 
            server_settings = server_settings)
 
2287
            name = client_name, settings = client)
2671
2288
    
2672
2289
    if not tcp_server.clients:
2673
2290
        logger.warning("No clients defined")
2674
 
    
2675
 
    if not foreground:
2676
 
        if pidfile is not None:
2677
 
            try:
2678
 
                with pidfile:
2679
 
                    pid = os.getpid()
2680
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2681
 
            except IOError:
2682
 
                logger.error("Could not write to file %r with PID %d",
2683
 
                             pidfilename, pid)
2684
 
        del pidfile
 
2291
        
 
2292
    if not debug:
 
2293
        try:
 
2294
            with pidfile:
 
2295
                pid = os.getpid()
 
2296
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2297
            del pidfile
 
2298
        except IOError:
 
2299
            logger.error("Could not write to file %r with PID %d",
 
2300
                         pidfilename, pid)
 
2301
        except NameError:
 
2302
            # "pidfile" was never created
 
2303
            pass
2685
2304
        del pidfilename
 
2305
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2686
2306
    
2687
2307
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2688
2308
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2689
2309
    
2690
2310
    if use_dbus:
2691
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2692
 
                                        "se.bsnet.fukt.Mandos"})
2693
 
        class MandosDBusService(DBusObjectWithProperties):
 
2311
        class MandosDBusService(dbus.service.Object):
2694
2312
            """A D-Bus proxy object"""
2695
2313
            def __init__(self):
2696
2314
                dbus.service.Object.__init__(self, bus, "/")
2697
2315
            _interface = "se.recompile.Mandos"
2698
2316
            
2699
 
            @dbus_interface_annotations(_interface)
2700
 
            def _foo(self):
2701
 
                return { "org.freedesktop.DBus.Property"
2702
 
                         ".EmitsChangedSignal":
2703
 
                             "false"}
2704
 
            
2705
2317
            @dbus.service.signal(_interface, signature="o")
2706
2318
            def ClientAdded(self, objpath):
2707
2319
                "D-Bus signal"
2749
2361
            
2750
2362
            del _interface
2751
2363
        
2752
 
        mandos_dbus_service = MandosDBusService()
 
2364
        class MandosDBusServiceTransitional(MandosDBusService):
 
2365
            __metaclass__ = AlternateDBusNamesMetaclass
 
2366
        mandos_dbus_service = MandosDBusServiceTransitional()
2753
2367
    
2754
2368
    def cleanup():
2755
2369
        "Cleanup function; run on exit"
2756
 
        if zeroconf:
2757
 
            service.cleanup()
 
2370
        service.cleanup()
2758
2371
        
2759
2372
        multiprocessing.active_children()
2760
 
        wnull.close()
2761
2373
        if not (tcp_server.clients or client_settings):
2762
2374
            return
2763
2375
        
2775
2387
                # A list of attributes that can not be pickled
2776
2388
                # + secret.
2777
2389
                exclude = set(("bus", "changedstate", "secret",
2778
 
                               "checker", "server_settings"))
 
2390
                               "checker"))
2779
2391
                for name, typ in (inspect.getmembers
2780
2392
                                  (dbus.service.Object)):
2781
2393
                    exclude.add(name)
2790
2402
                del client_settings[client.name]["secret"]
2791
2403
        
2792
2404
        try:
2793
 
            with (tempfile.NamedTemporaryFile
2794
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2795
 
                   dir=os.path.dirname(stored_state_path),
2796
 
                   delete=False)) as stored_state:
 
2405
            with os.fdopen(os.open(stored_state_path,
 
2406
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2407
                                   0600), "wb") as stored_state:
2797
2408
                pickle.dump((clients, client_settings), stored_state)
2798
 
                tempname=stored_state.name
2799
 
            os.rename(tempname, stored_state_path)
2800
2409
        except (IOError, OSError) as e:
2801
 
            if not debug:
2802
 
                try:
2803
 
                    os.remove(tempname)
2804
 
                except NameError:
2805
 
                    pass
2806
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2807
 
                logger.warning("Could not save persistent state: {0}"
2808
 
                               .format(os.strerror(e.errno)))
2809
 
            else:
2810
 
                logger.warning("Could not save persistent state:",
2811
 
                               exc_info=e)
 
2410
            logger.warning("Could not save persistent state: {0}"
 
2411
                           .format(e))
 
2412
            if e.errno not in (errno.ENOENT, errno.EACCES):
2812
2413
                raise
2813
2414
        
2814
2415
        # Delete all clients, and settings from config
2839
2440
    tcp_server.server_activate()
2840
2441
    
2841
2442
    # Find out what port we got
2842
 
    if zeroconf:
2843
 
        service.port = tcp_server.socket.getsockname()[1]
 
2443
    service.port = tcp_server.socket.getsockname()[1]
2844
2444
    if use_ipv6:
2845
2445
        logger.info("Now listening on address %r, port %d,"
2846
 
                    " flowinfo %d, scope_id %d",
2847
 
                    *tcp_server.socket.getsockname())
 
2446
                    " flowinfo %d, scope_id %d"
 
2447
                    % tcp_server.socket.getsockname())
2848
2448
    else:                       # IPv4
2849
 
        logger.info("Now listening on address %r, port %d",
2850
 
                    *tcp_server.socket.getsockname())
 
2449
        logger.info("Now listening on address %r, port %d"
 
2450
                    % tcp_server.socket.getsockname())
2851
2451
    
2852
2452
    #service.interface = tcp_server.socket.getsockname()[3]
2853
2453
    
2854
2454
    try:
2855
 
        if zeroconf:
2856
 
            # From the Avahi example code
2857
 
            try:
2858
 
                service.activate()
2859
 
            except dbus.exceptions.DBusException as error:
2860
 
                logger.critical("D-Bus Exception", exc_info=error)
2861
 
                cleanup()
2862
 
                sys.exit(1)
2863
 
            # End of Avahi example code
 
2455
        # From the Avahi example code
 
2456
        try:
 
2457
            service.activate()
 
2458
        except dbus.exceptions.DBusException as error:
 
2459
            logger.critical("DBusException: %s", error)
 
2460
            cleanup()
 
2461
            sys.exit(1)
 
2462
        # End of Avahi example code
2864
2463
        
2865
2464
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2866
2465
                             lambda *args, **kwargs:
2870
2469
        logger.debug("Starting main loop")
2871
2470
        main_loop.run()
2872
2471
    except AvahiError as error:
2873
 
        logger.critical("Avahi Error", exc_info=error)
 
2472
        logger.critical("AvahiError: %s", error)
2874
2473
        cleanup()
2875
2474
        sys.exit(1)
2876
2475
    except KeyboardInterrupt: