/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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.5"
 
88
 
 
89
version = "1.4.1"
92
90
stored_state_file = "clients.pickle"
93
91
 
94
92
logger = logging.getLogger()
95
 
syslogger = None
 
93
syslogger = (logging.handlers.SysLogHandler
 
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
95
              address = str("/dev/log")))
96
96
 
97
97
try:
98
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
111
111
        return interface_index
112
112
 
113
113
 
114
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
115
115
    """init logger and add loglevel"""
116
116
    
117
 
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
122
117
    syslogger.setFormatter(logging.Formatter
123
118
                           ('Mandos [%(process)d]: %(levelname)s:'
124
119
                            ' %(message)s'))
125
120
    logger.addHandler(syslogger)
126
121
    
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)
 
122
    console = logging.StreamHandler()
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                           ' [%(process)d]:'
 
125
                                           ' %(levelname)s:'
 
126
                                           ' %(message)s'))
 
127
    logger.addHandler(console)
134
128
    logger.setLevel(level)
135
129
 
136
130
 
137
 
class PGPError(Exception):
138
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
139
132
    pass
140
133
 
141
134
 
142
 
class PGPEngine(object):
 
135
class Crypto(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 CryptoError(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 CryptoError(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
 
def timedelta_to_milliseconds(td):
 
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
    
414
389
    Attributes:
415
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
390
    _approved:   bool(); 'None' if not yet approved/disapproved
416
391
    approval_delay: datetime.timedelta(); Time to wait for approval
417
392
    approval_duration: datetime.timedelta(); Duration of one approval
418
393
    checker:    subprocess.Popen(); a running checker process used
436
411
    interval:   datetime.timedelta(); How often to start a new checker
437
412
    last_approval_request: datetime.datetime(); (UTC) or None
438
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
439
415
    last_checker_status: integer between 0 and 255 reflecting exit
440
416
                         status of last checker. -1 reflects crashed
441
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
442
418
    last_enabled: datetime.datetime(); (UTC) or None
443
419
    name:       string; from the config file, used in log messages and
444
420
                        D-Bus identifiers
445
421
    secret:     bytestring; sent verbatim (over TLS) to client
446
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
447
423
                                      until this client is disabled
448
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
449
425
    runtime_expansions: Allowed attributes for runtime expansion.
450
426
    expires:    datetime.datetime(); time (UTC) when a client will be
451
427
                disabled, or None
452
 
    server_settings: The server_settings dict from main()
453
428
    """
454
429
    
455
430
    runtime_expansions = ("approval_delay", "approval_duration",
456
 
                          "created", "enabled", "expires",
457
 
                          "fingerprint", "host", "interval",
458
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
459
433
                          "last_enabled", "name", "timeout")
460
 
    client_defaults = { "timeout": "PT5M",
461
 
                        "extended_timeout": "PT15M",
462
 
                        "interval": "PT2M",
463
 
                        "checker": "fping -q -- %%(host)s",
464
 
                        "host": "",
465
 
                        "approval_delay": "PT0S",
466
 
                        "approval_duration": "PT1S",
467
 
                        "approved_by_default": "True",
468
 
                        "enabled": "True",
469
 
                        }
470
434
    
471
435
    def timeout_milliseconds(self):
472
436
        "Return the 'timeout' attribute in milliseconds"
473
 
        return timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
474
438
    
475
439
    def extended_timeout_milliseconds(self):
476
440
        "Return the 'extended_timeout' attribute in milliseconds"
477
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
478
442
    
479
443
    def interval_milliseconds(self):
480
444
        "Return the 'interval' attribute in milliseconds"
481
 
        return timedelta_to_milliseconds(self.interval)
 
445
        return _timedelta_to_milliseconds(self.interval)
482
446
    
483
447
    def approval_delay_milliseconds(self):
484
 
        return timedelta_to_milliseconds(self.approval_delay)
485
 
    
486
 
    @staticmethod
487
 
    def config_parser(config):
488
 
        """Construct a new dict of client settings of this form:
489
 
        { 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
 
        """
494
 
        settings = {}
495
 
        for client_name in config.sections():
496
 
            section = dict(config.items(client_name))
497
 
            client = settings[client_name] = {}
498
 
            
499
 
            client["host"] = section["host"]
500
 
            # Reformat values from string types to Python types
501
 
            client["approved_by_default"] = config.getboolean(
502
 
                client_name, "approved_by_default")
503
 
            client["enabled"] = config.getboolean(client_name,
504
 
                                                  "enabled")
505
 
            
506
 
            client["fingerprint"] = (section["fingerprint"].upper()
507
 
                                     .replace(" ", ""))
508
 
            if "secret" in section:
509
 
                client["secret"] = section["secret"].decode("base64")
510
 
            elif "secfile" in section:
511
 
                with open(os.path.expanduser(os.path.expandvars
512
 
                                             (section["secfile"])),
513
 
                          "rb") as secfile:
514
 
                    client["secret"] = secfile.read()
515
 
            else:
516
 
                raise TypeError("No secret or secfile for section {0}"
517
 
                                .format(section))
518
 
            client["timeout"] = string_to_delta(section["timeout"])
519
 
            client["extended_timeout"] = string_to_delta(
520
 
                section["extended_timeout"])
521
 
            client["interval"] = string_to_delta(section["interval"])
522
 
            client["approval_delay"] = string_to_delta(
523
 
                section["approval_delay"])
524
 
            client["approval_duration"] = string_to_delta(
525
 
                section["approval_duration"])
526
 
            client["checker_command"] = section["checker"]
527
 
            client["last_approval_request"] = None
528
 
            client["last_checked_ok"] = None
529
 
            client["last_checker_status"] = -2
530
 
        
531
 
        return settings
532
 
    
533
 
    def __init__(self, settings, name = None, server_settings=None):
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
 
449
    
 
450
    def __init__(self, name = None, config=None):
 
451
        """Note: the 'checker' key in 'config' sets the
 
452
        'checker_command' attribute and *not* the 'checker'
 
453
        attribute."""
534
454
        self.name = name
535
 
        if server_settings is None:
536
 
            server_settings = {}
537
 
        self.server_settings = server_settings
538
 
        # adding all client settings
539
 
        for setting, value in settings.iteritems():
540
 
            setattr(self, setting, value)
541
 
        
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
 
        
 
455
        if config is None:
 
456
            config = {}
552
457
        logger.debug("Creating client %r", self.name)
553
458
        # Uppercase and remove spaces from fingerprint for later
554
459
        # comparison purposes with return value from the fingerprint()
555
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
556
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
557
 
        self.created = settings.get("created",
558
 
                                    datetime.datetime.utcnow())
559
 
        
560
 
        # attributes specific for this server instance
 
464
        if "secret" in config:
 
465
            self.secret = config["secret"].decode("base64")
 
466
        elif "secfile" in config:
 
467
            with open(os.path.expanduser(os.path.expandvars
 
468
                                         (config["secfile"])),
 
469
                      "rb") as secfile:
 
470
                self.secret = secfile.read()
 
471
        else:
 
472
            raise TypeError("No secret or secfile for client %s"
 
473
                            % self.name)
 
474
        self.host = config.get("host", "")
 
475
        self.created = datetime.datetime.utcnow()
 
476
        self.enabled = config.get("enabled", True)
 
477
        self.last_approval_request = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
 
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
 
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
 
487
        self.interval = string_to_delta(config["interval"])
561
488
        self.checker = None
562
489
        self.checker_initiator_tag = None
563
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
564
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
565
497
        self.current_checker_command = None
566
 
        self.approved = None
 
498
        self._approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
567
501
        self.approvals_pending = 0
 
502
        self.approval_delay = string_to_delta(
 
503
            config["approval_delay"])
 
504
        self.approval_duration = string_to_delta(
 
505
            config["approval_duration"])
568
506
        self.changedstate = (multiprocessing_manager
569
507
                             .Condition(multiprocessing_manager
570
508
                                        .Lock()))
590
528
        if getattr(self, "enabled", False):
591
529
            # Already enabled
592
530
            return
 
531
        self.send_changedstate()
593
532
        self.expires = datetime.datetime.utcnow() + self.timeout
594
533
        self.enabled = True
595
534
        self.last_enabled = datetime.datetime.utcnow()
596
535
        self.init_checker()
597
 
        self.send_changedstate()
598
536
    
599
537
    def disable(self, quiet=True):
600
538
        """Disable this client."""
601
539
        if not getattr(self, "enabled", False):
602
540
            return False
603
541
        if not quiet:
 
542
            self.send_changedstate()
 
543
        if not quiet:
604
544
            logger.info("Disabling client %s", self.name)
605
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
545
        if getattr(self, "disable_initiator_tag", False):
606
546
            gobject.source_remove(self.disable_initiator_tag)
607
547
            self.disable_initiator_tag = None
608
548
        self.expires = None
609
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
549
        if getattr(self, "checker_initiator_tag", False):
610
550
            gobject.source_remove(self.checker_initiator_tag)
611
551
            self.checker_initiator_tag = None
612
552
        self.stop_checker()
613
553
        self.enabled = False
614
 
        if not quiet:
615
 
            self.send_changedstate()
616
554
        # Do not run this again if called by a gobject.timeout_add
617
555
        return False
618
556
    
622
560
    def init_checker(self):
623
561
        # Schedule a new checker to be started an 'interval' from now,
624
562
        # and every interval from then on.
625
 
        if self.checker_initiator_tag is not None:
626
 
            gobject.source_remove(self.checker_initiator_tag)
627
563
        self.checker_initiator_tag = (gobject.timeout_add
628
564
                                      (self.interval_milliseconds(),
629
565
                                       self.start_checker))
630
566
        # 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
567
        self.disable_initiator_tag = (gobject.timeout_add
634
568
                                   (self.timeout_milliseconds(),
635
569
                                    self.disable))
641
575
        self.checker_callback_tag = None
642
576
        self.checker = None
643
577
        if os.WIFEXITED(condition):
644
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
645
579
            if self.last_checker_status == 0:
646
580
                logger.info("Checker for %(name)s succeeded",
647
581
                            vars(self))
654
588
            logger.warning("Checker for %(name)s crashed?",
655
589
                           vars(self))
656
590
    
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."""
 
591
    def checked_ok(self, timeout=None):
 
592
        """Bump up the timeout for this client.
 
593
        
 
594
        This should only be called when the client has been seen,
 
595
        alive and well.
 
596
        """
665
597
        if timeout is None:
666
598
            timeout = self.timeout
 
599
        self.last_checked_ok = datetime.datetime.utcnow()
667
600
        if self.disable_initiator_tag is not None:
668
601
            gobject.source_remove(self.disable_initiator_tag)
669
 
            self.disable_initiator_tag = None
670
602
        if getattr(self, "enabled", False):
671
603
            self.disable_initiator_tag = (gobject.timeout_add
672
 
                                          (timedelta_to_milliseconds
 
604
                                          (_timedelta_to_milliseconds
673
605
                                           (timeout), self.disable))
674
606
            self.expires = datetime.datetime.utcnow() + timeout
675
607
    
682
614
        If a checker already exists, leave it running and do
683
615
        nothing."""
684
616
        # 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
 
617
        # did that, then if a checker (for some reason) started
 
618
        # running slowly and taking more than 'interval' time, the
 
619
        # client would inevitably timeout, since no checker would get
 
620
        # a chance to run to completion.  If we instead leave running
689
621
        # checkers alone, the checker would have to take more time
690
622
        # than 'timeout' for the client to be disabled, which is as it
691
623
        # should be.
693
625
        # If a checker exists, make sure it is not a zombie
694
626
        try:
695
627
            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
 
628
        except (AttributeError, OSError) as error:
 
629
            if (isinstance(error, OSError)
 
630
                and error.errno != errno.ECHILD):
 
631
                raise error
701
632
        else:
702
633
            if pid:
703
634
                logger.warning("Checker was a zombie")
706
637
                                      self.current_checker_command)
707
638
        # Start a new checker if needed
708
639
        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
640
            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
 
641
                # In case checker_command has exactly one % operator
 
642
                command = self.checker_command % self.host
 
643
            except TypeError:
 
644
                # Escape attributes for the shell
 
645
                escaped_attrs = dict(
 
646
                    (attr,
 
647
                     re.escape(unicode(str(getattr(self, attr, "")),
 
648
                                       errors=
 
649
                                       'replace')))
 
650
                    for attr in
 
651
                    self.runtime_expansions)
 
652
                
 
653
                try:
 
654
                    command = self.checker_command % escaped_attrs
 
655
                except TypeError as error:
 
656
                    logger.error('Could not format string "%s":'
 
657
                                 ' %s', self.checker_command, error)
 
658
                    return True # Try again later
720
659
            self.current_checker_command = command
721
660
            try:
722
661
                logger.info("Starting checker %r for %s",
725
664
                # in normal mode, that is already done by daemon(),
726
665
                # and in debug mode we don't want to.  (Stdin is
727
666
                # 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
667
                self.checker = subprocess.Popen(command,
737
668
                                                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:
 
669
                                                shell=True, cwd="/")
 
670
                self.checker_callback_tag = (gobject.child_watch_add
 
671
                                             (self.checker.pid,
 
672
                                              self.checker_callback,
 
673
                                              data=command))
 
674
                # The checker may have completed before the gobject
 
675
                # watch was added.  Check for this.
751
676
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
677
                if pid:
 
678
                    gobject.source_remove(self.checker_callback_tag)
 
679
                    self.checker_callback(pid, status, command)
752
680
            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)
 
681
                logger.error("Failed to start subprocess: %s",
 
682
                             error)
762
683
        # Re-run this periodically if run by gobject.timeout_add
763
684
        return True
764
685
    
771
692
            return
772
693
        logger.debug("Stopping checker for %(name)s", vars(self))
773
694
        try:
774
 
            self.checker.terminate()
 
695
            os.kill(self.checker.pid, signal.SIGTERM)
775
696
            #time.sleep(0.5)
776
697
            #if self.checker.poll() is None:
777
 
            #    self.checker.kill()
 
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
778
699
        except OSError as error:
779
700
            if error.errno != errno.ESRCH: # No such process
780
701
                raise
797
718
    # "Set" method, so we fail early here:
798
719
    if byte_arrays and signature != "ay":
799
720
        raise ValueError("Byte arrays not supported for non-'ay'"
800
 
                         " signature {0!r}".format(signature))
 
721
                         " signature %r" % signature)
801
722
    def decorator(func):
802
723
        func._dbus_is_property = True
803
724
        func._dbus_interface = dbus_interface
811
732
    return decorator
812
733
 
813
734
 
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
735
class DBusPropertyException(dbus.exceptions.DBusException):
852
736
    """A base class for D-Bus property-related exceptions
853
737
    """
876
760
    """
877
761
    
878
762
    @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)
 
763
    def _is_dbus_property(obj):
 
764
        return getattr(obj, "_dbus_is_property", False)
887
765
    
888
 
    def _get_all_dbus_things(self, thing):
 
766
    def _get_all_dbus_properties(self):
889
767
        """Returns a generator of (name, attribute) pairs
890
768
        """
891
 
        return ((getattr(athing.__get__(self), "_dbus_name",
892
 
                         name),
893
 
                 athing.__get__(self))
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
894
770
                for cls in self.__class__.__mro__
895
 
                for name, athing in
896
 
                inspect.getmembers(cls,
897
 
                                   self._is_dbus_thing(thing)))
 
771
                for name, prop in
 
772
                inspect.getmembers(cls, self._is_dbus_property))
898
773
    
899
774
    def _get_dbus_property(self, interface_name, property_name):
900
775
        """Returns a bound method if one exists which is a D-Bus
902
777
        """
903
778
        for cls in  self.__class__.__mro__:
904
779
            for name, value in (inspect.getmembers
905
 
                                (cls,
906
 
                                 self._is_dbus_thing("property"))):
 
780
                                (cls, self._is_dbus_property)):
907
781
                if (value._dbus_name == property_name
908
782
                    and value._dbus_interface == interface_name):
909
783
                    return value.__get__(self)
937
811
            # The byte_arrays option is not supported yet on
938
812
            # signatures other than "ay".
939
813
            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))
 
814
                raise ValueError
 
815
            value = dbus.ByteArray(''.join(unichr(byte)
 
816
                                           for byte in value))
945
817
        prop(value)
946
818
    
947
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
953
825
        Note: Will not include properties with access="write".
954
826
        """
955
827
        properties = {}
956
 
        for name, prop in self._get_all_dbus_things("property"):
 
828
        for name, prop in self._get_all_dbus_properties():
957
829
            if (interface_name
958
830
                and interface_name != prop._dbus_interface):
959
831
                # Interface non-empty but did not match
974
846
                         path_keyword='object_path',
975
847
                         connection_keyword='connection')
976
848
    def Introspect(self, object_path, connection):
977
 
        """Overloading of standard D-Bus method.
978
 
        
979
 
        Inserts property tags and interface annotation tags.
 
849
        """Standard D-Bus method, overloaded to insert property tags.
980
850
        """
981
851
        xmlstring = dbus.service.Object.Introspect(self, object_path,
982
852
                                                   connection)
989
859
                e.setAttribute("access", prop._dbus_access)
990
860
                return e
991
861
            for if_tag in document.getElementsByTagName("interface"):
992
 
                # Add property tags
993
862
                for tag in (make_tag(document, name, prop)
994
863
                            for name, prop
995
 
                            in self._get_all_dbus_things("property")
 
864
                            in self._get_all_dbus_properties()
996
865
                            if prop._dbus_interface
997
866
                            == if_tag.getAttribute("name")):
998
867
                    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
868
                # Add the names to the return values for the
1031
869
                # "org.freedesktop.DBus.Properties" methods
1032
870
                if (if_tag.getAttribute("name")
1047
885
        except (AttributeError, xml.dom.DOMException,
1048
886
                xml.parsers.expat.ExpatError) as error:
1049
887
            logger.error("Failed to override Introspection method",
1050
 
                         exc_info=error)
 
888
                         error)
1051
889
        return xmlstring
1052
890
 
1053
891
 
1054
 
def datetime_to_dbus(dt, variant_level=0):
 
892
def datetime_to_dbus (dt, variant_level=0):
1055
893
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1056
894
    if dt is None:
1057
895
        return dbus.String("", variant_level = variant_level)
1059
897
                       variant_level=variant_level)
1060
898
 
1061
899
 
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).
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
901
                                  .__metaclass__):
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
903
    will add additional D-Bus attributes matching a certain pattern.
1084
904
    """
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):
 
905
    def __new__(mcs, name, bases, attr):
 
906
        # Go through all the base classes which could have D-Bus
 
907
        # methods, signals, or properties in them
 
908
        for base in (b for b in bases
 
909
                     if issubclass(b, dbus.service.Object)):
 
910
            # Go though all attributes of the base class
 
911
            for attrname, attribute in inspect.getmembers(base):
1092
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
1093
913
                # with the wrong interface name
1094
914
                if (not hasattr(attribute, "_dbus_interface")
1095
915
                    or not attribute._dbus_interface
1096
 
                    .startswith(orig_interface_name)):
 
916
                    .startswith("se.recompile.Mandos")):
1097
917
                    continue
1098
918
                # Create an alternate D-Bus interface name based on
1099
919
                # the current name
1100
920
                alt_interface = (attribute._dbus_interface
1101
 
                                 .replace(orig_interface_name,
1102
 
                                          alt_interface_name))
1103
 
                interface_names.add(alt_interface)
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
1104
923
                # Is this a D-Bus signal?
1105
924
                if getattr(attribute, "_dbus_is_signal", False):
1106
 
                    # Extract the original non-method undecorated
1107
 
                    # function by black magic
 
925
                    # Extract the original non-method function by
 
926
                    # black magic
1108
927
                    nonmethod_func = (dict(
1109
928
                            zip(attribute.func_code.co_freevars,
1110
929
                                attribute.__closure__))["func"]
1121
940
                                nonmethod_func.func_name,
1122
941
                                nonmethod_func.func_defaults,
1123
942
                                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
943
                    # 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
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
1134
946
                    def fixscope(func1, func2):
1135
947
                        """This function is a scope container to pass
1136
948
                        func1 and func2 to the "call_both" function
1143
955
                        return call_both
1144
956
                    # Create the "call_both" function and add it to
1145
957
                    # the class
1146
 
                    attr[attrname] = fixscope(attribute, new_function)
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
1147
960
                # Is this a D-Bus method?
1148
961
                elif getattr(attribute, "_dbus_is_method", False):
1149
962
                    # Create a new, but exactly alike, function
1160
973
                                        attribute.func_name,
1161
974
                                        attribute.func_defaults,
1162
975
                                        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
976
                # Is this a D-Bus property?
1170
977
                elif getattr(attribute, "_dbus_is_property", False):
1171
978
                    # Create a new, but exactly alike, function
1185
992
                                        attribute.func_name,
1186
993
                                        attribute.func_defaults,
1187
994
                                        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"})
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
1233
998
class ClientDBus(Client, DBusObjectWithProperties):
1234
999
    """A Client class using D-Bus
1235
1000
    
1246
1011
    def __init__(self, bus = None, *args, **kwargs):
1247
1012
        self.bus = bus
1248
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
1249
1016
        # Only now, when this client is initialized, can it show up on
1250
1017
        # the D-Bus
1251
1018
        client_object_name = unicode(self.name).translate(
1255
1022
                                 ("/clients/" + client_object_name))
1256
1023
        DBusObjectWithProperties.__init__(self, self.bus,
1257
1024
                                          self.dbus_object_path)
1258
 
    
 
1025
        
1259
1026
    def notifychangeproperty(transform_func,
1260
1027
                             dbus_name, type_func=lambda x: x,
1261
1028
                             variant_level=1):
1284
1051
        
1285
1052
        return property(lambda self: getattr(self, attrname), setter)
1286
1053
    
 
1054
    
1287
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1288
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
1289
1057
                                             "ApprovalPending",
1296
1064
                                       checker is not None)
1297
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1298
1066
                                           "LastCheckedOK")
1299
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1300
 
                                               "LastCheckerStatus")
1301
1067
    last_approval_request = notifychangeproperty(
1302
1068
        datetime_to_dbus, "LastApprovalRequest")
1303
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1304
1070
                                               "ApprovedByDefault")
1305
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1306
1072
                                          "ApprovalDelay",
1307
1073
                                          type_func =
1308
 
                                          timedelta_to_milliseconds)
 
1074
                                          _timedelta_to_milliseconds)
1309
1075
    approval_duration = notifychangeproperty(
1310
 
        dbus.UInt64, "ApprovalDuration",
1311
 
        type_func = timedelta_to_milliseconds)
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
1312
1078
    host = notifychangeproperty(dbus.String, "Host")
1313
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1314
1080
                                   type_func =
1315
 
                                   timedelta_to_milliseconds)
 
1081
                                   _timedelta_to_milliseconds)
1316
1082
    extended_timeout = notifychangeproperty(
1317
 
        dbus.UInt64, "ExtendedTimeout",
1318
 
        type_func = timedelta_to_milliseconds)
1319
 
    interval = notifychangeproperty(dbus.UInt64,
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1320
1086
                                    "Interval",
1321
1087
                                    type_func =
1322
 
                                    timedelta_to_milliseconds)
 
1088
                                    _timedelta_to_milliseconds)
1323
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
1324
1090
    
1325
1091
    del notifychangeproperty
1353
1119
                                       *args, **kwargs)
1354
1120
    
1355
1121
    def start_checker(self, *args, **kwargs):
1356
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1122
        old_checker = self.checker
 
1123
        if self.checker is not None:
 
1124
            old_checker_pid = self.checker.pid
 
1125
        else:
 
1126
            old_checker_pid = None
1357
1127
        r = Client.start_checker(self, *args, **kwargs)
1358
1128
        # Only if new checker process was started
1359
1129
        if (self.checker is not None
1363
1133
        return r
1364
1134
    
1365
1135
    def _reset_approved(self):
1366
 
        self.approved = None
 
1136
        self._approved = None
1367
1137
        return False
1368
1138
    
1369
1139
    def approve(self, value=True):
1370
 
        self.approved = value
1371
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1140
        self.send_changedstate()
 
1141
        self._approved = value
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
1372
1143
                            (self.approval_duration),
1373
1144
                            self._reset_approved)
1374
 
        self.send_changedstate()
 
1145
    
1375
1146
    
1376
1147
    ## D-Bus methods, signals & properties
1377
1148
    _interface = "se.recompile.Mandos.Client"
1378
1149
    
1379
 
    ## Interfaces
1380
 
    
1381
 
    @dbus_interface_annotations(_interface)
1382
 
    def _foo(self):
1383
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1384
 
                     "false"}
1385
 
    
1386
1150
    ## Signals
1387
1151
    
1388
1152
    # CheckerCompleted - signal
1424
1188
        "D-Bus signal"
1425
1189
        return self.need_approval()
1426
1190
    
 
1191
    # NeRwequest - signal
 
1192
    @dbus.service.signal(_interface, signature="s")
 
1193
    def NewRequest(self, ip):
 
1194
        """D-Bus signal
 
1195
        Is sent after a client request a password.
 
1196
        """
 
1197
        pass
 
1198
    
1427
1199
    ## Methods
1428
1200
    
1429
1201
    # Approve - method
1487
1259
                           access="readwrite")
1488
1260
    def ApprovalDuration_dbus_property(self, value=None):
1489
1261
        if value is None:       # get
1490
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1491
1263
                    self.approval_duration))
1492
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1493
1265
    
1507
1279
    def Host_dbus_property(self, value=None):
1508
1280
        if value is None:       # get
1509
1281
            return dbus.String(self.host)
1510
 
        self.host = unicode(value)
 
1282
        self.host = value
1511
1283
    
1512
1284
    # Created - property
1513
1285
    @dbus_service_property(_interface, signature="s", access="read")
1539
1311
            return
1540
1312
        return datetime_to_dbus(self.last_checked_ok)
1541
1313
    
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
1314
    # Expires - property
1549
1315
    @dbus_service_property(_interface, signature="s", access="read")
1550
1316
    def Expires_dbus_property(self):
1561
1327
    def Timeout_dbus_property(self, value=None):
1562
1328
        if value is None:       # get
1563
1329
            return dbus.UInt64(self.timeout_milliseconds())
1564
 
        old_timeout = self.timeout
1565
1330
        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))
 
1331
        if getattr(self, "disable_initiator_tag", None) is None:
 
1332
            return
 
1333
        # Reschedule timeout
 
1334
        gobject.source_remove(self.disable_initiator_tag)
 
1335
        self.disable_initiator_tag = None
 
1336
        self.expires = None
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
 
1342
        if time_to_die <= 0:
 
1343
            # The timeout has passed
 
1344
            self.disable()
 
1345
        else:
 
1346
            self.expires = (datetime.datetime.utcnow()
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
 
1349
            self.disable_initiator_tag = (gobject.timeout_add
 
1350
                                          (time_to_die, self.disable))
1582
1351
    
1583
1352
    # ExtendedTimeout - property
1584
1353
    @dbus_service_property(_interface, signature="t",
1610
1379
    def Checker_dbus_property(self, value=None):
1611
1380
        if value is None:       # get
1612
1381
            return dbus.String(self.checker_command)
1613
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1614
1383
    
1615
1384
    # CheckerRunning - property
1616
1385
    @dbus_service_property(_interface, signature="b",
1645
1414
            raise KeyError()
1646
1415
    
1647
1416
    def __getattribute__(self, name):
1648
 
        if name == '_pipe':
 
1417
        if(name == '_pipe'):
1649
1418
            return super(ProxyClient, self).__getattribute__(name)
1650
1419
        self._pipe.send(('getattr', name))
1651
1420
        data = self._pipe.recv()
1658
1427
            return func
1659
1428
    
1660
1429
    def __setattr__(self, name, value):
1661
 
        if name == '_pipe':
 
1430
        if(name == '_pipe'):
1662
1431
            return super(ProxyClient, self).__setattr__(name, value)
1663
1432
        self._pipe.send(('setattr', name, value))
1664
1433
 
1665
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1666
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1667
1440
    """A class to handle client connections.
1668
1441
    
1704
1477
            logger.debug("Protocol version: %r", line)
1705
1478
            try:
1706
1479
                if int(line.strip().split()[0]) > 1:
1707
 
                    raise RuntimeError(line)
 
1480
                    raise RuntimeError
1708
1481
            except (ValueError, IndexError, RuntimeError) as error:
1709
1482
                logger.error("Unknown protocol version: %s", error)
1710
1483
                return
1729
1502
                    logger.warning("Bad certificate: %s", error)
1730
1503
                    return
1731
1504
                logger.debug("Fingerprint: %s", fpr)
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
1732
1508
                
1733
1509
                try:
1734
1510
                    client = ProxyClient(child_pipe, fpr,
1750
1526
                            client.Rejected("Disabled")
1751
1527
                        return
1752
1528
                    
1753
 
                    if client.approved or not client.approval_delay:
 
1529
                    if client._approved or not client.approval_delay:
1754
1530
                        #We are approved or approval is disabled
1755
1531
                        break
1756
 
                    elif client.approved is None:
 
1532
                    elif client._approved is None:
1757
1533
                        logger.info("Client %s needs approval",
1758
1534
                                    client.name)
1759
1535
                        if self.server.use_dbus:
1772
1548
                    #wait until timeout or approved
1773
1549
                    time = datetime.datetime.now()
1774
1550
                    client.changedstate.acquire()
1775
 
                    client.changedstate.wait(
1776
 
                        float(timedelta_to_milliseconds(delay)
1777
 
                              / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1778
1554
                    client.changedstate.release()
1779
1555
                    time2 = datetime.datetime.now()
1780
1556
                    if (time2 - time) >= delay:
1796
1572
                    try:
1797
1573
                        sent = session.send(client.secret[sent_size:])
1798
1574
                    except gnutls.errors.GNUTLSError as error:
1799
 
                        logger.warning("gnutls send failed",
1800
 
                                       exc_info=error)
 
1575
                        logger.warning("gnutls send failed")
1801
1576
                        return
1802
1577
                    logger.debug("Sent: %d, remaining: %d",
1803
1578
                                 sent, len(client.secret)
1806
1581
                
1807
1582
                logger.info("Sending secret to %s", client.name)
1808
1583
                # bump the timeout using extended_timeout
1809
 
                client.bump_timeout(client.extended_timeout)
 
1584
                client.checked_ok(client.extended_timeout)
1810
1585
                if self.server.use_dbus:
1811
1586
                    # Emit D-Bus signal
1812
1587
                    client.GotSecret()
1817
1592
                try:
1818
1593
                    session.bye()
1819
1594
                except gnutls.errors.GNUTLSError as error:
1820
 
                    logger.warning("GnuTLS bye failed",
1821
 
                                   exc_info=error)
 
1595
                    logger.warning("GnuTLS bye failed")
1822
1596
    
1823
1597
    @staticmethod
1824
1598
    def peer_certificate(session):
1889
1663
    def sub_process_main(self, request, address):
1890
1664
        try:
1891
1665
            self.finish_request(request, address)
1892
 
        except Exception:
 
1666
        except:
1893
1667
            self.handle_error(request, address)
1894
1668
        self.close_request(request)
1895
1669
    
1896
1670
    def process_request(self, request, address):
1897
1671
        """Start a new process to process the request."""
1898
1672
        proc = multiprocessing.Process(target = self.sub_process_main,
1899
 
                                       args = (request, address))
 
1673
                                       args = (request,
 
1674
                                               address))
1900
1675
        proc.start()
1901
1676
        return proc
1902
1677
 
1917
1692
    
1918
1693
    def add_pipe(self, parent_pipe, proc):
1919
1694
        """Dummy function; override as necessary"""
1920
 
        raise NotImplementedError()
 
1695
        raise NotImplementedError
1921
1696
 
1922
1697
 
1923
1698
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1930
1705
        use_ipv6:       Boolean; to use IPv6 or not
1931
1706
    """
1932
1707
    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
 
        """
 
1708
                 interface=None, use_ipv6=True):
1937
1709
        self.interface = interface
1938
1710
        if use_ipv6:
1939
1711
            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
1712
        socketserver.TCPServer.__init__(self, server_address,
1967
1713
                                        RequestHandlerClass)
1968
 
    
1969
1714
    def server_bind(self):
1970
1715
        """This overrides the normal server_bind() function
1971
1716
        to bind to an interface if one was specified, and also NOT to
1979
1724
                try:
1980
1725
                    self.socket.setsockopt(socket.SOL_SOCKET,
1981
1726
                                           SO_BINDTODEVICE,
1982
 
                                           str(self.interface + '\0'))
 
1727
                                           str(self.interface
 
1728
                                               + '\0'))
1983
1729
                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:
 
1730
                    if error[0] == errno.EPERM:
 
1731
                        logger.error("No permission to"
 
1732
                                     " bind to interface %s",
 
1733
                                     self.interface)
 
1734
                    elif error[0] == errno.ENOPROTOOPT:
1988
1735
                        logger.error("SO_BINDTODEVICE not available;"
1989
1736
                                     " cannot bind to interface %s",
1990
1737
                                     self.interface)
1991
 
                    elif error.errno == errno.ENODEV:
1992
 
                        logger.error("Interface %s does not exist,"
1993
 
                                     " cannot bind", self.interface)
1994
1738
                    else:
1995
1739
                        raise
1996
1740
        # Only bind(2) the socket if we really need to.
1999
1743
                if self.address_family == socket.AF_INET6:
2000
1744
                    any_address = "::" # in6addr_any
2001
1745
                else:
2002
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1746
                    any_address = socket.INADDR_ANY
2003
1747
                self.server_address = (any_address,
2004
1748
                                       self.server_address[1])
2005
1749
            elif not self.server_address[1]:
2026
1770
    """
2027
1771
    def __init__(self, server_address, RequestHandlerClass,
2028
1772
                 interface=None, use_ipv6=True, clients=None,
2029
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1773
                 gnutls_priority=None, use_dbus=True):
2030
1774
        self.enabled = False
2031
1775
        self.clients = clients
2032
1776
        if self.clients is None:
2036
1780
        IPv6_TCPServer.__init__(self, server_address,
2037
1781
                                RequestHandlerClass,
2038
1782
                                interface = interface,
2039
 
                                use_ipv6 = use_ipv6,
2040
 
                                socketfd = socketfd)
 
1783
                                use_ipv6 = use_ipv6)
2041
1784
    def server_activate(self):
2042
1785
        if self.enabled:
2043
1786
            return socketserver.TCPServer.server_activate(self)
2056
1799
    
2057
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
2058
1801
                   proc = None, client_object=None):
 
1802
        condition_names = {
 
1803
            gobject.IO_IN: "IN",   # There is data to read.
 
1804
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1805
                                    # blocking).
 
1806
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1807
            gobject.IO_ERR: "ERR", # Error condition.
 
1808
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1809
                                    # broken, usually for pipes and
 
1810
                                    # sockets).
 
1811
            }
 
1812
        conditions_string = ' | '.join(name
 
1813
                                       for cond, name in
 
1814
                                       condition_names.iteritems()
 
1815
                                       if cond & condition)
2059
1816
        # error, or the other end of multiprocessing.Pipe has closed
2060
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2061
1818
            # Wait for other process to exit
2062
1819
            proc.join()
2063
1820
            return False
2121
1878
        return True
2122
1879
 
2123
1880
 
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
1881
def string_to_delta(interval):
2224
1882
    """Parse a string and return a datetime.timedelta
2225
1883
    
2236
1894
    >>> string_to_delta('5m 30s')
2237
1895
    datetime.timedelta(0, 330)
2238
1896
    """
2239
 
    
2240
 
    try:
2241
 
        return rfc3339_duration_to_delta(interval)
2242
 
    except ValueError:
2243
 
        pass
2244
 
    
2245
1897
    timevalue = datetime.timedelta(0)
2246
1898
    for s in interval.split():
2247
1899
        try:
2258
1910
            elif suffix == "w":
2259
1911
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2260
1912
            else:
2261
 
                raise ValueError("Unknown suffix {0!r}"
2262
 
                                 .format(suffix))
2263
 
        except IndexError as e:
 
1913
                raise ValueError("Unknown suffix %r" % suffix)
 
1914
        except (ValueError, IndexError) as e:
2264
1915
            raise ValueError(*(e.args))
2265
1916
        timevalue += delta
2266
1917
    return timevalue
2279
1930
        sys.exit()
2280
1931
    if not noclose:
2281
1932
        # Close all standard open file descriptors
2282
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1933
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2283
1934
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2284
1935
            raise OSError(errno.ENODEV,
2285
 
                          "{0} not a character device"
2286
 
                          .format(os.devnull))
 
1936
                          "%s not a character device"
 
1937
                          % os.path.devnull)
2287
1938
        os.dup2(null, sys.stdin.fileno())
2288
1939
        os.dup2(null, sys.stdout.fileno())
2289
1940
        os.dup2(null, sys.stderr.fileno())
2298
1949
    
2299
1950
    parser = argparse.ArgumentParser()
2300
1951
    parser.add_argument("-v", "--version", action="version",
2301
 
                        version = "%(prog)s {0}".format(version),
 
1952
                        version = "%%(prog)s %s" % version,
2302
1953
                        help="show version number and exit")
2303
1954
    parser.add_argument("-i", "--interface", metavar="IF",
2304
1955
                        help="Bind to interface IF")
2310
1961
                        help="Run self-test")
2311
1962
    parser.add_argument("--debug", action="store_true",
2312
1963
                        help="Debug mode; run in foreground and log"
2313
 
                        " to terminal", default=None)
 
1964
                        " to terminal")
2314
1965
    parser.add_argument("--debuglevel", metavar="LEVEL",
2315
1966
                        help="Debug level for stdout output")
2316
1967
    parser.add_argument("--priority", help="GnuTLS"
2323
1974
                        " files")
2324
1975
    parser.add_argument("--no-dbus", action="store_false",
2325
1976
                        dest="use_dbus", help="Do not provide D-Bus"
2326
 
                        " system bus interface", default=None)
 
1977
                        " system bus interface")
2327
1978
    parser.add_argument("--no-ipv6", action="store_false",
2328
 
                        dest="use_ipv6", help="Do not use IPv6",
2329
 
                        default=None)
 
1979
                        dest="use_ipv6", help="Do not use IPv6")
2330
1980
    parser.add_argument("--no-restore", action="store_false",
2331
1981
                        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")
 
1982
                        " state")
2336
1983
    parser.add_argument("--statedir", metavar="DIR",
2337
1984
                        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
1985
    
2344
1986
    options = parser.parse_args()
2345
1987
    
2346
1988
    if options.check:
2347
1989
        import doctest
2348
 
        fail_count, test_count = doctest.testmod()
2349
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1990
        doctest.testmod()
 
1991
        sys.exit()
2350
1992
    
2351
1993
    # Default values for config file for server-global settings
2352
1994
    server_defaults = { "interface": "",
2354
1996
                        "port": "",
2355
1997
                        "debug": "False",
2356
1998
                        "priority":
2357
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
1999
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2358
2000
                        "servicename": "Mandos",
2359
2001
                        "use_dbus": "True",
2360
2002
                        "use_ipv6": "True",
2361
2003
                        "debuglevel": "",
2362
2004
                        "restore": "True",
2363
 
                        "socket": "",
2364
 
                        "statedir": "/var/lib/mandos",
2365
 
                        "foreground": "False",
2366
 
                        "zeroconf": "True",
 
2005
                        "statedir": "/var/lib/mandos"
2367
2006
                        }
2368
2007
    
2369
2008
    # Parse config file for server-global settings
2374
2013
    # Convert the SafeConfigParser object to a dict
2375
2014
    server_settings = server_config.defaults()
2376
2015
    # Use the appropriate methods on the non-string config options
2377
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2016
    for option in ("debug", "use_dbus", "use_ipv6"):
2378
2017
        server_settings[option] = server_config.getboolean("DEFAULT",
2379
2018
                                                           option)
2380
2019
    if server_settings["port"]:
2381
2020
        server_settings["port"] = server_config.getint("DEFAULT",
2382
2021
                                                       "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
2022
    del server_config
2393
2023
    
2394
2024
    # Override the settings from the config file with command line
2396
2026
    for option in ("interface", "address", "port", "debug",
2397
2027
                   "priority", "servicename", "configdir",
2398
2028
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2029
                   "statedir"):
2400
2030
        value = getattr(options, option)
2401
2031
        if value is not None:
2402
2032
            server_settings[option] = value
2405
2035
    for option in server_settings.keys():
2406
2036
        if type(server_settings[option]) is str:
2407
2037
            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
2038
    # Now we have our good server settings in "server_settings"
2416
2039
    
2417
2040
    ##################################################################
2418
2041
    
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
2042
    # For convenience
2426
2043
    debug = server_settings["debug"]
2427
2044
    debuglevel = server_settings["debuglevel"]
2429
2046
    use_ipv6 = server_settings["use_ipv6"]
2430
2047
    stored_state_path = os.path.join(server_settings["statedir"],
2431
2048
                                     stored_state_file)
2432
 
    foreground = server_settings["foreground"]
2433
 
    zeroconf = server_settings["zeroconf"]
2434
2049
    
2435
2050
    if debug:
2436
 
        initlogger(debug, logging.DEBUG)
 
2051
        initlogger(logging.DEBUG)
2437
2052
    else:
2438
2053
        if not debuglevel:
2439
 
            initlogger(debug)
 
2054
            initlogger()
2440
2055
        else:
2441
2056
            level = getattr(logging, debuglevel.upper())
2442
 
            initlogger(debug, level)
 
2057
            initlogger(level)
2443
2058
    
2444
2059
    if server_settings["servicename"] != "Mandos":
2445
2060
        syslogger.setFormatter(logging.Formatter
2446
 
                               ('Mandos ({0}) [%(process)d]:'
2447
 
                                ' %(levelname)s: %(message)s'
2448
 
                                .format(server_settings
2449
 
                                        ["servicename"])))
 
2061
                               ('Mandos (%s) [%%(process)d]:'
 
2062
                                ' %%(levelname)s: %%(message)s'
 
2063
                                % server_settings["servicename"]))
2450
2064
    
2451
2065
    # Parse config file with clients
2452
 
    client_config = configparser.SafeConfigParser(Client
2453
 
                                                  .client_defaults)
 
2066
    client_defaults = { "timeout": "5m",
 
2067
                        "extended_timeout": "15m",
 
2068
                        "interval": "2m",
 
2069
                        "checker": "fping -q -- %%(host)s",
 
2070
                        "host": "",
 
2071
                        "approval_delay": "0s",
 
2072
                        "approval_duration": "1s",
 
2073
                        }
 
2074
    client_config = configparser.SafeConfigParser(client_defaults)
2454
2075
    client_config.read(os.path.join(server_settings["configdir"],
2455
2076
                                    "clients.conf"))
2456
2077
    
2457
2078
    global mandos_dbus_service
2458
2079
    mandos_dbus_service = None
2459
2080
    
2460
 
    socketfd = None
2461
 
    if server_settings["socket"] != "":
2462
 
        socketfd = server_settings["socket"]
2463
2081
    tcp_server = MandosServer((server_settings["address"],
2464
2082
                               server_settings["port"]),
2465
2083
                              ClientHandler,
2468
2086
                              use_ipv6=use_ipv6,
2469
2087
                              gnutls_priority=
2470
2088
                              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
 
2089
                              use_dbus=use_dbus)
 
2090
    if not debug:
 
2091
        pidfilename = "/var/run/mandos.pid"
2478
2092
        try:
2479
2093
            pidfile = open(pidfilename, "w")
2480
 
        except IOError as e:
2481
 
            logger.error("Could not open file %r", pidfilename,
2482
 
                         exc_info=e)
 
2094
        except IOError:
 
2095
            logger.error("Could not open file %r", pidfilename)
2483
2096
    
2484
 
    for name in ("_mandos", "mandos", "nobody"):
 
2097
    try:
 
2098
        uid = pwd.getpwnam("_mandos").pw_uid
 
2099
        gid = pwd.getpwnam("_mandos").pw_gid
 
2100
    except KeyError:
2485
2101
        try:
2486
 
            uid = pwd.getpwnam(name).pw_uid
2487
 
            gid = pwd.getpwnam(name).pw_gid
2488
 
            break
 
2102
            uid = pwd.getpwnam("mandos").pw_uid
 
2103
            gid = pwd.getpwnam("mandos").pw_gid
2489
2104
        except KeyError:
2490
 
            continue
2491
 
    else:
2492
 
        uid = 65534
2493
 
        gid = 65534
 
2105
            try:
 
2106
                uid = pwd.getpwnam("nobody").pw_uid
 
2107
                gid = pwd.getpwnam("nobody").pw_gid
 
2108
            except KeyError:
 
2109
                uid = 65534
 
2110
                gid = 65534
2494
2111
    try:
2495
2112
        os.setgid(gid)
2496
2113
        os.setuid(uid)
2497
2114
    except OSError as error:
2498
 
        if error.errno != errno.EPERM:
2499
 
            raise
 
2115
        if error[0] != errno.EPERM:
 
2116
            raise error
2500
2117
    
2501
2118
    if debug:
2502
2119
        # Enable all possible GnuTLS debugging
2513
2130
         .gnutls_global_set_log_function(debug_gnutls))
2514
2131
        
2515
2132
        # Redirect stdin so all checkers get /dev/null
2516
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2133
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2517
2134
        os.dup2(null, sys.stdin.fileno())
2518
2135
        if null > 2:
2519
2136
            os.close(null)
 
2137
    else:
 
2138
        # No console logging
 
2139
        logger.removeHandler(console)
2520
2140
    
2521
2141
    # Need to fork before connecting to D-Bus
2522
 
    if not foreground:
 
2142
    if not debug:
2523
2143
        # Close all input and output, do double fork, etc.
2524
2144
        daemon()
2525
2145
    
2526
 
    # multiprocessing will use threads, so before we use gobject we
2527
 
    # need to inform gobject that threads will be used.
2528
 
    gobject.threads_init()
2529
 
    
2530
2146
    global main_loop
2531
2147
    # From the Avahi example code
2532
 
    DBusGMainLoop(set_as_default=True)
 
2148
    DBusGMainLoop(set_as_default=True )
2533
2149
    main_loop = gobject.MainLoop()
2534
2150
    bus = dbus.SystemBus()
2535
2151
    # End of Avahi example code
2541
2157
                            ("se.bsnet.fukt.Mandos", bus,
2542
2158
                             do_not_queue=True))
2543
2159
        except dbus.exceptions.NameExistsException as e:
2544
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2160
            logger.error(unicode(e) + ", disabling D-Bus")
2545
2161
            use_dbus = False
2546
2162
            server_settings["use_dbus"] = False
2547
2163
            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"])))
 
2164
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2165
    service = AvahiServiceToSyslog(name =
 
2166
                                   server_settings["servicename"],
 
2167
                                   servicetype = "_mandos._tcp",
 
2168
                                   protocol = protocol, bus = bus)
 
2169
    if server_settings["interface"]:
 
2170
        service.interface = (if_nametoindex
 
2171
                             (str(server_settings["interface"])))
2557
2172
    
2558
2173
    global multiprocessing_manager
2559
2174
    multiprocessing_manager = multiprocessing.Manager()
2560
2175
    
2561
2176
    client_class = Client
2562
2177
    if use_dbus:
2563
 
        client_class = functools.partial(ClientDBus, bus = bus)
2564
 
    
2565
 
    client_settings = Client.config_parser(client_config)
 
2178
        client_class = functools.partial(ClientDBusTransitional,
 
2179
                                         bus = bus)
 
2180
    
 
2181
    special_settings = {
 
2182
        # Some settings need to be accessd by special methods;
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2184
        "approved_by_default":
 
2185
            lambda section:
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
2187
        "enabled":
 
2188
            lambda section:
 
2189
            client_config.getboolean(section, "enabled"),
 
2190
        }
 
2191
    # Construct a new dict of client settings of this form:
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
2193
    # with exceptions for any special settings as defined above
 
2194
    client_settings = dict((clientname,
 
2195
                           dict((setting,
 
2196
                                 (value
 
2197
                                  if setting not in special_settings
 
2198
                                  else special_settings[setting]
 
2199
                                  (clientname)))
 
2200
                                for setting, value in
 
2201
                                client_config.items(clientname)))
 
2202
                          for clientname in client_config.sections())
 
2203
    
2566
2204
    old_client_settings = {}
2567
 
    clients_data = {}
2568
 
    
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()
 
2205
    clients_data = []
2576
2206
    
2577
2207
    # Get client data and settings from last running state.
2578
2208
    if server_settings["restore"]:
2582
2212
                                                     (stored_state))
2583
2213
            os.remove(stored_state_path)
2584
2214
        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)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2591
2218
                raise
2592
 
        except EOFError as e:
2593
 
            logger.warning("Could not load persistent state: "
2594
 
                           "EOFError:", exc_info=e)
2595
2219
    
2596
 
    with PGPEngine() as pgp:
2597
 
        for client_name, client in clients_data.iteritems():
2598
 
            # Skip removed clients
2599
 
            if client_name not in client_settings:
2600
 
                continue
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
2601
2223
            
2602
2224
            # Decide which value to use after restoring saved state.
2603
2225
            # We have three different values: Old config file,
2612
2234
                    if (name != "secret" and
2613
2235
                        value != old_client_settings[client_name]
2614
2236
                        [name]):
2615
 
                        client[name] = value
 
2237
                        setattr(client, name, value)
2616
2238
                except KeyError:
2617
2239
                    pass
2618
2240
            
2619
2241
            # Clients who has passed its expire date can still be
2620
 
            # 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.
2624
 
            if client["enabled"]:
2625
 
                if datetime.datetime.utcnow() >= client["expires"]:
2626
 
                    if not client["last_checked_ok"]:
2627
 
                        logger.warning(
2628
 
                            "disabling client {0} - Client never "
2629
 
                            "performed a successful checker"
2630
 
                            .format(client_name))
2631
 
                        client["enabled"] = False
2632
 
                    elif client["last_checker_status"] != 0:
2633
 
                        logger.warning(
2634
 
                            "disabling client {0} - Client "
2635
 
                            "last checker failed with error code {1}"
2636
 
                            .format(client_name,
2637
 
                                    client["last_checker_status"]))
 
2242
            # enabled if its last checker was sucessful.  Clients
 
2243
            # whose checker failed before we stored its state is
 
2244
            # assumed to have failed all checkers during downtime.
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
2246
                if ((datetime.datetime.utcnow()
 
2247
                     - client["last_checked_ok"])
 
2248
                    > client["interval"]):
 
2249
                    if client["last_checker_status"] != 0:
2638
2250
                        client["enabled"] = False
2639
2251
                    else:
2640
2252
                        client["expires"] = (datetime.datetime
2641
2253
                                             .utcnow()
2642
2254
                                             + client["timeout"])
2643
 
                        logger.debug("Last checker succeeded,"
2644
 
                                     " keeping {0} enabled"
2645
 
                                     .format(client_name))
 
2255
            
 
2256
            client["changedstate"] = (multiprocessing_manager
 
2257
                                      .Condition
 
2258
                                      (multiprocessing_manager
 
2259
                                       .Lock()))
 
2260
            if use_dbus:
 
2261
                new_client = (ClientDBusTransitional.__new__
 
2262
                              (ClientDBusTransitional))
 
2263
                tcp_server.clients[client_name] = new_client
 
2264
                new_client.bus = bus
 
2265
                for name, value in client.iteritems():
 
2266
                    setattr(new_client, name, value)
 
2267
                client_object_name = unicode(client_name).translate(
 
2268
                    {ord("."): ord("_"),
 
2269
                     ord("-"): ord("_")})
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
2271
                                               ("/clients/"
 
2272
                                                + client_object_name))
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
2274
                                                  new_client.bus,
 
2275
                                                  new_client
 
2276
                                                  .dbus_object_path)
 
2277
            else:
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
2279
                                                   (Client))
 
2280
                for name, value in client.iteritems():
 
2281
                    setattr(tcp_server.clients[client_name],
 
2282
                            name, value)
 
2283
            
2646
2284
            try:
2647
 
                client["secret"] = (
2648
 
                    pgp.decrypt(client["encrypted_secret"],
2649
 
                                client_settings[client_name]
2650
 
                                ["secret"]))
2651
 
            except PGPError:
 
2285
                tcp_server.clients[client_name].secret = (
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
2287
                                  .encrypted_secret,
 
2288
                                  client_settings[client_name]
 
2289
                                  ["secret"]))
 
2290
            except CryptoError:
2652
2291
                # If decryption fails, we use secret from new settings
2653
 
                logger.debug("Failed to decrypt {0} old secret"
2654
 
                             .format(client_name))
2655
 
                client["secret"] = (
 
2292
                tcp_server.clients[client_name].secret = (
2656
2293
                    client_settings[client_name]["secret"])
2657
2294
    
2658
 
    # Add/remove clients based on new changes made to config
2659
 
    for client_name in (set(old_client_settings)
2660
 
                        - set(client_settings)):
2661
 
        del clients_data[client_name]
2662
 
    for client_name in (set(client_settings)
2663
 
                        - set(old_client_settings)):
2664
 
        clients_data[client_name] = client_settings[client_name]
2665
 
    
2666
 
    # Create all client objects
2667
 
    for client_name, client in clients_data.iteritems():
2668
 
        tcp_server.clients[client_name] = client_class(
2669
 
            name = client_name, settings = client,
2670
 
            server_settings = server_settings)
 
2295
    # Create/remove clients based on new changes made to config
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
2297
        del tcp_server.clients[clientname]
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2300
                                                       = clientname,
 
2301
                                                       config =
 
2302
                                                       client_settings
 
2303
                                                       [clientname]))
2671
2304
    
2672
2305
    if not tcp_server.clients:
2673
2306
        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
 
2307
        
 
2308
    if not debug:
 
2309
        try:
 
2310
            with pidfile:
 
2311
                pid = os.getpid()
 
2312
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2313
            del pidfile
 
2314
        except IOError:
 
2315
            logger.error("Could not write to file %r with PID %d",
 
2316
                         pidfilename, pid)
 
2317
        except NameError:
 
2318
            # "pidfile" was never created
 
2319
            pass
2685
2320
        del pidfilename
 
2321
        
 
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2686
2323
    
2687
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2688
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2689
2326
    
2690
2327
    if use_dbus:
2691
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2692
 
                                        "se.bsnet.fukt.Mandos"})
2693
 
        class MandosDBusService(DBusObjectWithProperties):
 
2328
        class MandosDBusService(dbus.service.Object):
2694
2329
            """A D-Bus proxy object"""
2695
2330
            def __init__(self):
2696
2331
                dbus.service.Object.__init__(self, bus, "/")
2697
2332
            _interface = "se.recompile.Mandos"
2698
2333
            
2699
 
            @dbus_interface_annotations(_interface)
2700
 
            def _foo(self):
2701
 
                return { "org.freedesktop.DBus.Property"
2702
 
                         ".EmitsChangedSignal":
2703
 
                             "false"}
2704
 
            
2705
2334
            @dbus.service.signal(_interface, signature="o")
2706
2335
            def ClientAdded(self, objpath):
2707
2336
                "D-Bus signal"
2749
2378
            
2750
2379
            del _interface
2751
2380
        
2752
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2753
2384
    
2754
2385
    def cleanup():
2755
2386
        "Cleanup function; run on exit"
2756
 
        if zeroconf:
2757
 
            service.cleanup()
 
2387
        service.cleanup()
2758
2388
        
2759
2389
        multiprocessing.active_children()
2760
 
        wnull.close()
2761
2390
        if not (tcp_server.clients or client_settings):
2762
2391
            return
2763
2392
        
2764
2393
        # Store client before exiting. Secrets are encrypted with key
2765
2394
        # based on what config file has. If config file is
2766
2395
        # removed/edited, old secret will thus be unrecovable.
2767
 
        clients = {}
2768
 
        with PGPEngine() as pgp:
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
2769
2398
            for client in tcp_server.clients.itervalues():
2770
2399
                key = client_settings[client.name]["secret"]
2771
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2772
 
                                                      key)
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
2773
2402
                client_dict = {}
2774
2403
                
2775
 
                # A list of attributes that can not be pickled
2776
 
                # + secret.
2777
 
                exclude = set(("bus", "changedstate", "secret",
2778
 
                               "checker", "server_settings"))
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
2779
2407
                for name, typ in (inspect.getmembers
2780
2408
                                  (dbus.service.Object)):
2781
2409
                    exclude.add(name)
2786
2414
                    if attr not in exclude:
2787
2415
                        client_dict[attr] = getattr(client, attr)
2788
2416
                
2789
 
                clients[client.name] = client_dict
 
2417
                clients.append(client_dict)
2790
2418
                del client_settings[client.name]["secret"]
2791
2419
        
2792
2420
        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:
 
2421
            with os.fdopen(os.open(stored_state_path,
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2423
                                   0600), "wb") as stored_state:
2797
2424
                pickle.dump((clients, client_settings), stored_state)
2798
 
                tempname=stored_state.name
2799
 
            os.rename(tempname, stored_state_path)
2800
2425
        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)
 
2426
            logger.warning("Could not save persistent state: {0}"
 
2427
                           .format(e))
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
2812
2429
                raise
2813
2430
        
2814
2431
        # Delete all clients, and settings from config
2839
2456
    tcp_server.server_activate()
2840
2457
    
2841
2458
    # Find out what port we got
2842
 
    if zeroconf:
2843
 
        service.port = tcp_server.socket.getsockname()[1]
 
2459
    service.port = tcp_server.socket.getsockname()[1]
2844
2460
    if use_ipv6:
2845
2461
        logger.info("Now listening on address %r, port %d,"
2846
 
                    " flowinfo %d, scope_id %d",
2847
 
                    *tcp_server.socket.getsockname())
 
2462
                    " flowinfo %d, scope_id %d"
 
2463
                    % tcp_server.socket.getsockname())
2848
2464
    else:                       # IPv4
2849
 
        logger.info("Now listening on address %r, port %d",
2850
 
                    *tcp_server.socket.getsockname())
 
2465
        logger.info("Now listening on address %r, port %d"
 
2466
                    % tcp_server.socket.getsockname())
2851
2467
    
2852
2468
    #service.interface = tcp_server.socket.getsockname()[3]
2853
2469
    
2854
2470
    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
 
2471
        # From the Avahi example code
 
2472
        try:
 
2473
            service.activate()
 
2474
        except dbus.exceptions.DBusException as error:
 
2475
            logger.critical("DBusException: %s", error)
 
2476
            cleanup()
 
2477
            sys.exit(1)
 
2478
        # End of Avahi example code
2864
2479
        
2865
2480
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2866
2481
                             lambda *args, **kwargs:
2870
2485
        logger.debug("Starting main loop")
2871
2486
        main_loop.run()
2872
2487
    except AvahiError as error:
2873
 
        logger.critical("Avahi Error", exc_info=error)
 
2488
        logger.critical("AvahiError: %s", error)
2874
2489
        cleanup()
2875
2490
        sys.exit(1)
2876
2491
    except KeyboardInterrupt:
2881
2496
    # Must run before the D-Bus bus name gets deregistered
2882
2497
    cleanup()
2883
2498
 
 
2499
 
2884
2500
if __name__ == '__main__':
2885
2501
    main()