/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 at bsnet
  • Date: 2011-11-12 18:15:29 UTC
  • mfrom: (521.1.1 doc-filename-class)
  • Revision ID: teddy@fukt.bsnet.se-20111112181529-v4emlw0v5fugv2tk
Merge doc markup fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
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
65
63
import cPickle as pickle
66
64
import multiprocessing
67
65
import types
68
 
import binascii
69
 
import tempfile
70
 
import itertools
71
 
import collections
 
66
import hashlib
72
67
 
73
68
import dbus
74
69
import dbus.service
79
74
import ctypes.util
80
75
import xml.dom.minidom
81
76
import inspect
 
77
import Crypto.Cipher.AES
82
78
 
83
79
try:
84
80
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
84
    except ImportError:
89
85
        SO_BINDTODEVICE = None
90
86
 
91
 
version = "1.6.0"
92
 
stored_state_file = "clients.pickle"
 
87
 
 
88
version = "1.4.1"
93
89
 
94
90
logger = logging.getLogger()
 
91
stored_state_path = "/var/lib/mandos/clients.pickle"
 
92
 
95
93
syslogger = (logging.handlers.SysLogHandler
96
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
95
              address = str("/dev/log")))
98
 
 
99
 
try:
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
101
 
                      (ctypes.util.find_library("c"))
102
 
                      .if_nametoindex)
103
 
except (OSError, AttributeError):
104
 
    def if_nametoindex(interface):
105
 
        "Get an interface index the hard way, i.e. using fcntl()"
106
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
107
 
        with contextlib.closing(socket.socket()) as s:
108
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
 
                                struct.pack(str("16s16x"),
110
 
                                            interface))
111
 
        interface_index = struct.unpack(str("I"),
112
 
                                        ifreq[16:20])[0]
113
 
        return interface_index
114
 
 
115
 
 
116
 
def initlogger(debug, level=logging.WARNING):
117
 
    """init logger and add loglevel"""
118
 
    
119
 
    syslogger.setFormatter(logging.Formatter
120
 
                           ('Mandos [%(process)d]: %(levelname)s:'
121
 
                            ' %(message)s'))
122
 
    logger.addHandler(syslogger)
123
 
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
131
 
    logger.setLevel(level)
132
 
 
133
 
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
136
 
    pass
137
 
 
138
 
 
139
 
class PGPEngine(object):
140
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
 
    def __init__(self):
142
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--no-use-agent']
148
 
    
149
 
    def __enter__(self):
150
 
        return self
151
 
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
153
 
        self._cleanup()
154
 
        return False
155
 
    
156
 
    def __del__(self):
157
 
        self._cleanup()
158
 
    
159
 
    def _cleanup(self):
160
 
        if self.tempdir is not None:
161
 
            # Delete contents of tempdir
162
 
            for root, dirs, files in os.walk(self.tempdir,
163
 
                                             topdown = False):
164
 
                for filename in files:
165
 
                    os.remove(os.path.join(root, filename))
166
 
                for dirname in dirs:
167
 
                    os.rmdir(os.path.join(root, dirname))
168
 
            # Remove tempdir
169
 
            os.rmdir(self.tempdir)
170
 
            self.tempdir = None
171
 
    
172
 
    def password_encode(self, password):
173
 
        # Passphrase can not be empty and can not contain newlines or
174
 
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
176
 
    
177
 
    def encrypt(self, data, password):
178
 
        passphrase = self.password_encode(password)
179
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
180
 
                                         ) as passfile:
181
 
            passfile.write(passphrase)
182
 
            passfile.flush()
183
 
            proc = subprocess.Popen(['gpg', '--symmetric',
184
 
                                     '--passphrase-file',
185
 
                                     passfile.name]
186
 
                                    + self.gnupgargs,
187
 
                                    stdin = subprocess.PIPE,
188
 
                                    stdout = subprocess.PIPE,
189
 
                                    stderr = subprocess.PIPE)
190
 
            ciphertext, err = proc.communicate(input = data)
191
 
        if proc.returncode != 0:
192
 
            raise PGPError(err)
193
 
        return ciphertext
194
 
    
195
 
    def decrypt(self, data, password):
196
 
        passphrase = self.password_encode(password)
197
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
198
 
                                         ) as passfile:
199
 
            passfile.write(passphrase)
200
 
            passfile.flush()
201
 
            proc = subprocess.Popen(['gpg', '--decrypt',
202
 
                                     '--passphrase-file',
203
 
                                     passfile.name]
204
 
                                    + self.gnupgargs,
205
 
                                    stdin = subprocess.PIPE,
206
 
                                    stdout = subprocess.PIPE,
207
 
                                    stderr = subprocess.PIPE)
208
 
            decrypted_plaintext, err = proc.communicate(input
209
 
                                                        = data)
210
 
        if proc.returncode != 0:
211
 
            raise PGPError(err)
212
 
        return decrypted_plaintext
 
96
syslogger.setFormatter(logging.Formatter
 
97
                       ('Mandos [%(process)d]: %(levelname)s:'
 
98
                        ' %(message)s'))
 
99
logger.addHandler(syslogger)
 
100
 
 
101
console = logging.StreamHandler()
 
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
103
                                       ' [%(process)d]:'
 
104
                                       ' %(levelname)s:'
 
105
                                       ' %(message)s'))
 
106
logger.addHandler(console)
213
107
 
214
108
 
215
109
class AvahiError(Exception):
234
128
               Used to optionally bind to the specified interface.
235
129
    name: string; Example: 'Mandos'
236
130
    type: string; Example: '_mandos._tcp'.
237
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
131
                  See <http://www.dns-sd.org/ServiceTypes.html>
238
132
    port: integer; what port to announce
239
133
    TXT: list of strings; TXT record for the service
240
134
    domain: string; Domain to publish on, default to .local if empty.
246
140
    server: D-Bus Server
247
141
    bus: dbus.SystemBus()
248
142
    """
249
 
    
250
143
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
144
                 servicetype = None, port = None, TXT = None,
252
145
                 domain = "", host = "", max_renames = 32768,
265
158
        self.server = None
266
159
        self.bus = bus
267
160
        self.entry_group_state_changed_match = None
268
 
    
269
161
    def rename(self):
270
162
        """Derived from the Avahi example code"""
271
163
        if self.rename_count >= self.max_renames:
281
173
        try:
282
174
            self.add()
283
175
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
176
            logger.critical("DBusException: %s", error)
285
177
            self.cleanup()
286
178
            os._exit(1)
287
179
        self.rename_count += 1
288
 
    
289
180
    def remove(self):
290
181
        """Derived from the Avahi example code"""
291
182
        if self.entry_group_state_changed_match is not None:
293
184
            self.entry_group_state_changed_match = None
294
185
        if self.group is not None:
295
186
            self.group.Reset()
296
 
    
297
187
    def add(self):
298
188
        """Derived from the Avahi example code"""
299
189
        self.remove()
316
206
            dbus.UInt16(self.port),
317
207
            avahi.string_array_to_txt_array(self.TXT))
318
208
        self.group.Commit()
319
 
    
320
209
    def entry_group_state_changed(self, state, error):
321
210
        """Derived from the Avahi example code"""
322
211
        logger.debug("Avahi entry group state change: %i", state)
329
218
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
219
            logger.critical("Avahi: Error in group state changed %s",
331
220
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
221
            raise AvahiGroupError("State changed: %s"
 
222
                                  % unicode(error))
335
223
    def cleanup(self):
336
224
        """Derived from the Avahi example code"""
337
225
        if self.group is not None:
338
226
            try:
339
227
                self.group.Free()
340
228
            except (dbus.exceptions.UnknownMethodException,
341
 
                    dbus.exceptions.DBusException):
 
229
                    dbus.exceptions.DBusException) as e:
342
230
                pass
343
231
            self.group = None
344
232
        self.remove()
345
 
    
346
233
    def server_state_changed(self, state, error=None):
347
234
        """Derived from the Avahi example code"""
348
235
        logger.debug("Avahi server state change: %i", state)
367
254
                logger.debug("Unknown state: %r", state)
368
255
            else:
369
256
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
257
    def activate(self):
372
258
        """Derived from the Avahi example code"""
373
259
        if self.server is None:
380
266
                                 self.server_state_changed)
381
267
        self.server_state_changed(self.server.GetState())
382
268
 
383
 
 
384
269
class AvahiServiceToSyslog(AvahiService):
385
270
    def rename(self):
386
271
        """Add the new name to the syslog messages"""
387
272
        ret = AvahiService.rename(self)
388
273
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
274
                               ('Mandos (%s) [%%(process)d]:'
 
275
                                ' %%(levelname)s: %%(message)s'
 
276
                                % self.name))
392
277
        return ret
393
278
 
394
 
 
395
 
def timedelta_to_milliseconds(td):
 
279
def _timedelta_to_milliseconds(td):
396
280
    "Convert a datetime.timedelta() to milliseconds"
397
281
    return ((td.days * 24 * 60 * 60 * 1000)
398
282
            + (td.seconds * 1000)
399
283
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
284
        
402
285
class Client(object):
403
286
    """A representation of a client host served by this server.
404
287
    
405
288
    Attributes:
406
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
289
    _approved:   bool(); 'None' if not yet approved/disapproved
407
290
    approval_delay: datetime.timedelta(); Time to wait for approval
408
291
    approval_duration: datetime.timedelta(); Duration of one approval
409
292
    checker:    subprocess.Popen(); a running checker process used
428
311
    last_approval_request: datetime.datetime(); (UTC) or None
429
312
    last_checked_ok: datetime.datetime(); (UTC) or None
430
313
    last_checker_status: integer between 0 and 255 reflecting exit
431
 
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
433
 
    last_enabled: datetime.datetime(); (UTC) or None
 
314
                         status of last checker. -1 reflect crashed
 
315
                         checker, or None.
 
316
    last_enabled: datetime.datetime(); (UTC)
434
317
    name:       string; from the config file, used in log messages and
435
318
                        D-Bus identifiers
436
319
    secret:     bytestring; sent verbatim (over TLS) to client
437
320
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
321
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
322
    extended_timeout:   extra long timeout when password has been sent
440
323
    runtime_expansions: Allowed attributes for runtime expansion.
441
324
    expires:    datetime.datetime(); time (UTC) when a client will be
442
325
                disabled, or None
443
 
    server_settings: The server_settings dict from main()
444
326
    """
445
327
    
446
328
    runtime_expansions = ("approval_delay", "approval_duration",
447
 
                          "created", "enabled", "expires",
448
 
                          "fingerprint", "host", "interval",
449
 
                          "last_approval_request", "last_checked_ok",
 
329
                          "created", "enabled", "fingerprint",
 
330
                          "host", "interval", "last_checked_ok",
450
331
                          "last_enabled", "name", "timeout")
451
 
    client_defaults = { "timeout": "PT5M",
452
 
                        "extended_timeout": "PT15M",
453
 
                        "interval": "PT2M",
454
 
                        "checker": "fping -q -- %%(host)s",
455
 
                        "host": "",
456
 
                        "approval_delay": "PT0S",
457
 
                        "approval_duration": "PT1S",
458
 
                        "approved_by_default": "True",
459
 
                        "enabled": "True",
460
 
                        }
461
332
    
462
333
    def timeout_milliseconds(self):
463
334
        "Return the 'timeout' attribute in milliseconds"
464
 
        return timedelta_to_milliseconds(self.timeout)
 
335
        return _timedelta_to_milliseconds(self.timeout)
465
336
    
466
337
    def extended_timeout_milliseconds(self):
467
338
        "Return the 'extended_timeout' attribute in milliseconds"
468
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
339
        return _timedelta_to_milliseconds(self.extended_timeout)
469
340
    
470
341
    def interval_milliseconds(self):
471
342
        "Return the 'interval' attribute in milliseconds"
472
 
        return timedelta_to_milliseconds(self.interval)
 
343
        return _timedelta_to_milliseconds(self.interval)
473
344
    
474
345
    def approval_delay_milliseconds(self):
475
 
        return timedelta_to_milliseconds(self.approval_delay)
476
 
    
477
 
    @staticmethod
478
 
    def config_parser(config):
479
 
        """Construct a new dict of client settings of this form:
480
 
        { client_name: {setting_name: value, ...}, ...}
481
 
        with exceptions for any special settings as defined above.
482
 
        NOTE: Must be a pure function. Must return the same result
483
 
        value given the same arguments.
484
 
        """
485
 
        settings = {}
486
 
        for client_name in config.sections():
487
 
            section = dict(config.items(client_name))
488
 
            client = settings[client_name] = {}
489
 
            
490
 
            client["host"] = section["host"]
491
 
            # Reformat values from string types to Python types
492
 
            client["approved_by_default"] = config.getboolean(
493
 
                client_name, "approved_by_default")
494
 
            client["enabled"] = config.getboolean(client_name,
495
 
                                                  "enabled")
496
 
            
497
 
            client["fingerprint"] = (section["fingerprint"].upper()
498
 
                                     .replace(" ", ""))
499
 
            if "secret" in section:
500
 
                client["secret"] = section["secret"].decode("base64")
501
 
            elif "secfile" in section:
502
 
                with open(os.path.expanduser(os.path.expandvars
503
 
                                             (section["secfile"])),
504
 
                          "rb") as secfile:
505
 
                    client["secret"] = secfile.read()
506
 
            else:
507
 
                raise TypeError("No secret or secfile for section {0}"
508
 
                                .format(section))
509
 
            client["timeout"] = string_to_delta(section["timeout"])
510
 
            client["extended_timeout"] = string_to_delta(
511
 
                section["extended_timeout"])
512
 
            client["interval"] = string_to_delta(section["interval"])
513
 
            client["approval_delay"] = string_to_delta(
514
 
                section["approval_delay"])
515
 
            client["approval_duration"] = string_to_delta(
516
 
                section["approval_duration"])
517
 
            client["checker_command"] = section["checker"]
518
 
            client["last_approval_request"] = None
519
 
            client["last_checked_ok"] = None
520
 
            client["last_checker_status"] = -2
521
 
        
522
 
        return settings
523
 
    
524
 
    def __init__(self, settings, name = None, server_settings=None):
 
346
        return _timedelta_to_milliseconds(self.approval_delay)
 
347
    
 
348
    def __init__(self, name = None, config=None):
 
349
        """Note: the 'checker' key in 'config' sets the
 
350
        'checker_command' attribute and *not* the 'checker'
 
351
        attribute."""
525
352
        self.name = name
526
 
        if server_settings is None:
527
 
            server_settings = {}
528
 
        self.server_settings = server_settings
529
 
        # adding all client settings
530
 
        for setting, value in settings.iteritems():
531
 
            setattr(self, setting, value)
532
 
        
533
 
        if self.enabled:
534
 
            if not hasattr(self, "last_enabled"):
535
 
                self.last_enabled = datetime.datetime.utcnow()
536
 
            if not hasattr(self, "expires"):
537
 
                self.expires = (datetime.datetime.utcnow()
538
 
                                + self.timeout)
539
 
        else:
540
 
            self.last_enabled = None
541
 
            self.expires = None
542
 
        
 
353
        if config is None:
 
354
            config = {}
543
355
        logger.debug("Creating client %r", self.name)
544
356
        # Uppercase and remove spaces from fingerprint for later
545
357
        # comparison purposes with return value from the fingerprint()
546
358
        # function
 
359
        self.fingerprint = (config["fingerprint"].upper()
 
360
                            .replace(" ", ""))
547
361
        logger.debug("  Fingerprint: %s", self.fingerprint)
548
 
        self.created = settings.get("created",
549
 
                                    datetime.datetime.utcnow())
550
 
        
551
 
        # attributes specific for this server instance
 
362
        if "secret" in config:
 
363
            self.secret = config["secret"].decode("base64")
 
364
        elif "secfile" in config:
 
365
            with open(os.path.expanduser(os.path.expandvars
 
366
                                         (config["secfile"])),
 
367
                      "rb") as secfile:
 
368
                self.secret = secfile.read()
 
369
        else:
 
370
            raise TypeError("No secret or secfile for client %s"
 
371
                            % self.name)
 
372
        self.host = config.get("host", "")
 
373
        self.created = datetime.datetime.utcnow()
 
374
        self.enabled = True
 
375
        self.last_approval_request = None
 
376
        self.last_enabled = datetime.datetime.utcnow()
 
377
        self.last_checked_ok = None
 
378
        self.last_checker_status = None
 
379
        self.timeout = string_to_delta(config["timeout"])
 
380
        self.extended_timeout = string_to_delta(config
 
381
                                                ["extended_timeout"])
 
382
        self.interval = string_to_delta(config["interval"])
552
383
        self.checker = None
553
384
        self.checker_initiator_tag = None
554
385
        self.disable_initiator_tag = None
 
386
        self.expires = datetime.datetime.utcnow() + self.timeout
555
387
        self.checker_callback_tag = None
 
388
        self.checker_command = config["checker"]
556
389
        self.current_checker_command = None
557
 
        self.approved = None
 
390
        self._approved = None
 
391
        self.approved_by_default = config.get("approved_by_default",
 
392
                                              True)
558
393
        self.approvals_pending = 0
 
394
        self.approval_delay = string_to_delta(
 
395
            config["approval_delay"])
 
396
        self.approval_duration = string_to_delta(
 
397
            config["approval_duration"])
559
398
        self.changedstate = (multiprocessing_manager
560
399
                             .Condition(multiprocessing_manager
561
400
                                        .Lock()))
562
 
        self.client_structure = [attr for attr in
563
 
                                 self.__dict__.iterkeys()
 
401
        self.client_structure = [attr for attr
 
402
                                 in self.__dict__.iterkeys()
564
403
                                 if not attr.startswith("_")]
565
404
        self.client_structure.append("client_structure")
566
 
        
 
405
 
 
406
 
567
407
        for name, t in inspect.getmembers(type(self),
568
408
                                          lambda obj:
569
409
                                              isinstance(obj,
581
421
        if getattr(self, "enabled", False):
582
422
            # Already enabled
583
423
            return
 
424
        self.send_changedstate()
584
425
        self.expires = datetime.datetime.utcnow() + self.timeout
585
426
        self.enabled = True
586
427
        self.last_enabled = datetime.datetime.utcnow()
587
428
        self.init_checker()
588
 
        self.send_changedstate()
589
429
    
590
430
    def disable(self, quiet=True):
591
431
        """Disable this client."""
592
432
        if not getattr(self, "enabled", False):
593
433
            return False
594
434
        if not quiet:
 
435
            self.send_changedstate()
 
436
        if not quiet:
595
437
            logger.info("Disabling client %s", self.name)
596
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
438
        if getattr(self, "disable_initiator_tag", False):
597
439
            gobject.source_remove(self.disable_initiator_tag)
598
440
            self.disable_initiator_tag = None
599
441
        self.expires = None
600
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
442
        if getattr(self, "checker_initiator_tag", False):
601
443
            gobject.source_remove(self.checker_initiator_tag)
602
444
            self.checker_initiator_tag = None
603
445
        self.stop_checker()
604
446
        self.enabled = False
605
 
        if not quiet:
606
 
            self.send_changedstate()
607
447
        # Do not run this again if called by a gobject.timeout_add
608
448
        return False
609
449
    
610
450
    def __del__(self):
611
451
        self.disable()
612
 
    
 
452
 
613
453
    def init_checker(self):
614
454
        # Schedule a new checker to be started an 'interval' from now,
615
455
        # and every interval from then on.
616
 
        if self.checker_initiator_tag is not None:
617
 
            gobject.source_remove(self.checker_initiator_tag)
618
456
        self.checker_initiator_tag = (gobject.timeout_add
619
457
                                      (self.interval_milliseconds(),
620
458
                                       self.start_checker))
621
459
        # Schedule a disable() when 'timeout' has passed
622
 
        if self.disable_initiator_tag is not None:
623
 
            gobject.source_remove(self.disable_initiator_tag)
624
460
        self.disable_initiator_tag = (gobject.timeout_add
625
461
                                   (self.timeout_milliseconds(),
626
462
                                    self.disable))
627
463
        # Also start a new checker *right now*.
628
464
        self.start_checker()
629
 
    
 
465
 
 
466
        
630
467
    def checker_callback(self, pid, condition, command):
631
468
        """The checker has completed, so take appropriate actions."""
632
469
        self.checker_callback_tag = None
633
470
        self.checker = None
634
471
        if os.WIFEXITED(condition):
635
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
472
            self.last_checker_status =  os.WEXITSTATUS(condition)
636
473
            if self.last_checker_status == 0:
637
474
                logger.info("Checker for %(name)s succeeded",
638
475
                            vars(self))
645
482
            logger.warning("Checker for %(name)s crashed?",
646
483
                           vars(self))
647
484
    
648
 
    def checked_ok(self):
649
 
        """Assert that the client has been seen, alive and well."""
650
 
        self.last_checked_ok = datetime.datetime.utcnow()
651
 
        self.last_checker_status = 0
652
 
        self.bump_timeout()
653
 
    
654
 
    def bump_timeout(self, timeout=None):
655
 
        """Bump up the timeout for this client."""
 
485
    def checked_ok(self, timeout=None):
 
486
        """Bump up the timeout for this client.
 
487
        
 
488
        This should only be called when the client has been seen,
 
489
        alive and well.
 
490
        """
656
491
        if timeout is None:
657
492
            timeout = self.timeout
 
493
        self.last_checked_ok = datetime.datetime.utcnow()
658
494
        if self.disable_initiator_tag is not None:
659
495
            gobject.source_remove(self.disable_initiator_tag)
660
 
            self.disable_initiator_tag = None
661
496
        if getattr(self, "enabled", False):
662
497
            self.disable_initiator_tag = (gobject.timeout_add
663
 
                                          (timedelta_to_milliseconds
 
498
                                          (_timedelta_to_milliseconds
664
499
                                           (timeout), self.disable))
665
500
            self.expires = datetime.datetime.utcnow() + timeout
666
501
    
673
508
        If a checker already exists, leave it running and do
674
509
        nothing."""
675
510
        # The reason for not killing a running checker is that if we
676
 
        # did that, and if a checker (for some reason) started running
677
 
        # slowly and taking more than 'interval' time, then the client
678
 
        # would inevitably timeout, since no checker would get a
679
 
        # chance to run to completion.  If we instead leave running
 
511
        # did that, then if a checker (for some reason) started
 
512
        # running slowly and taking more than 'interval' time, the
 
513
        # client would inevitably timeout, since no checker would get
 
514
        # a chance to run to completion.  If we instead leave running
680
515
        # checkers alone, the checker would have to take more time
681
516
        # than 'timeout' for the client to be disabled, which is as it
682
517
        # should be.
696
531
                                      self.current_checker_command)
697
532
        # Start a new checker if needed
698
533
        if self.checker is None:
699
 
            # Escape attributes for the shell
700
 
            escaped_attrs = dict(
701
 
                (attr, re.escape(unicode(getattr(self, attr))))
702
 
                for attr in
703
 
                self.runtime_expansions)
704
534
            try:
705
 
                command = self.checker_command % escaped_attrs
706
 
            except TypeError as error:
707
 
                logger.error('Could not format string "%s"',
708
 
                             self.checker_command, exc_info=error)
709
 
                return True # Try again later
 
535
                # In case checker_command has exactly one % operator
 
536
                command = self.checker_command % self.host
 
537
            except TypeError:
 
538
                # Escape attributes for the shell
 
539
                escaped_attrs = dict(
 
540
                    (attr,
 
541
                     re.escape(unicode(str(getattr(self, attr, "")),
 
542
                                       errors=
 
543
                                       'replace')))
 
544
                    for attr in
 
545
                    self.runtime_expansions)
 
546
                
 
547
                try:
 
548
                    command = self.checker_command % escaped_attrs
 
549
                except TypeError as error:
 
550
                    logger.error('Could not format string "%s":'
 
551
                                 ' %s', self.checker_command, error)
 
552
                    return True # Try again later
710
553
            self.current_checker_command = command
711
554
            try:
712
555
                logger.info("Starting checker %r for %s",
715
558
                # in normal mode, that is already done by daemon(),
716
559
                # and in debug mode we don't want to.  (Stdin is
717
560
                # always replaced by /dev/null.)
718
 
                # The exception is when not debugging but nevertheless
719
 
                # running in the foreground; use the previously
720
 
                # created wnull.
721
 
                popen_args = {}
722
 
                if (not self.server_settings["debug"]
723
 
                    and self.server_settings["foreground"]):
724
 
                    popen_args.update({"stdout": wnull,
725
 
                                       "stderr": wnull })
726
561
                self.checker = subprocess.Popen(command,
727
562
                                                close_fds=True,
728
 
                                                shell=True, cwd="/",
729
 
                                                **popen_args)
730
 
            except OSError as error:
731
 
                logger.error("Failed to start subprocess",
732
 
                             exc_info=error)
733
 
                return True
734
 
            self.checker_callback_tag = (gobject.child_watch_add
735
 
                                         (self.checker.pid,
736
 
                                          self.checker_callback,
737
 
                                          data=command))
738
 
            # The checker may have completed before the gobject
739
 
            # watch was added.  Check for this.
740
 
            try:
 
563
                                                shell=True, cwd="/")
 
564
                self.checker_callback_tag = (gobject.child_watch_add
 
565
                                             (self.checker.pid,
 
566
                                              self.checker_callback,
 
567
                                              data=command))
 
568
                # The checker may have completed before the gobject
 
569
                # watch was added.  Check for this.
741
570
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
571
                if pid:
 
572
                    gobject.source_remove(self.checker_callback_tag)
 
573
                    self.checker_callback(pid, status, command)
742
574
            except OSError as error:
743
 
                if error.errno == errno.ECHILD:
744
 
                    # This should never happen
745
 
                    logger.error("Child process vanished",
746
 
                                 exc_info=error)
747
 
                    return True
748
 
                raise
749
 
            if pid:
750
 
                gobject.source_remove(self.checker_callback_tag)
751
 
                self.checker_callback(pid, status, command)
 
575
                logger.error("Failed to start subprocess: %s",
 
576
                             error)
752
577
        # Re-run this periodically if run by gobject.timeout_add
753
578
        return True
754
579
    
761
586
            return
762
587
        logger.debug("Stopping checker for %(name)s", vars(self))
763
588
        try:
764
 
            self.checker.terminate()
 
589
            os.kill(self.checker.pid, signal.SIGTERM)
765
590
            #time.sleep(0.5)
766
591
            #if self.checker.poll() is None:
767
 
            #    self.checker.kill()
 
592
            #    os.kill(self.checker.pid, signal.SIGKILL)
768
593
        except OSError as error:
769
594
            if error.errno != errno.ESRCH: # No such process
770
595
                raise
771
596
        self.checker = None
772
597
 
 
598
    # Encrypts a client secret and stores it in a varible
 
599
    # encrypted_secret
 
600
    def encrypt_secret(self, key):
 
601
        # Encryption-key need to be of a specific size, so we hash
 
602
        # supplied key
 
603
        hasheng = hashlib.sha256()
 
604
        hasheng.update(key)
 
605
        encryptionkey = hasheng.digest()
 
606
 
 
607
        # Create validation hash so we know at decryption if it was
 
608
        # sucessful
 
609
        hasheng = hashlib.sha256()
 
610
        hasheng.update(self.secret)
 
611
        validationhash = hasheng.digest()
 
612
 
 
613
        # Encrypt secret
 
614
        iv = os.urandom(Crypto.Cipher.AES.block_size)
 
615
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
616
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
617
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
 
618
        self.encrypted_secret = (ciphertext, iv)
 
619
 
 
620
    # Decrypt a encrypted client secret
 
621
    def decrypt_secret(self, key):
 
622
        # Decryption-key need to be of a specific size, so we hash
 
623
        # supplied key
 
624
        hasheng = hashlib.sha256()
 
625
        hasheng.update(key)
 
626
        encryptionkey = hasheng.digest()
 
627
 
 
628
        # Decrypt encrypted secret
 
629
        ciphertext, iv = self.encrypted_secret
 
630
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
631
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
632
        plain = ciphereng.decrypt(ciphertext)
 
633
 
 
634
        # Validate decrypted secret to know if it was succesful
 
635
        hasheng = hashlib.sha256()
 
636
        validationhash = plain[:hasheng.digest_size]
 
637
        secret = plain[hasheng.digest_size:]
 
638
        hasheng.update(secret)
 
639
 
 
640
        # If validation fails, we use key as new secret. Otherwise, we
 
641
        # use the decrypted secret
 
642
        if hasheng.digest() == validationhash:
 
643
            self.secret = secret
 
644
        else:
 
645
            self.secret = key
 
646
        del self.encrypted_secret
 
647
 
773
648
 
774
649
def dbus_service_property(dbus_interface, signature="v",
775
650
                          access="readwrite", byte_arrays=False):
787
662
    # "Set" method, so we fail early here:
788
663
    if byte_arrays and signature != "ay":
789
664
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
665
                         " signature %r" % signature)
791
666
    def decorator(func):
792
667
        func._dbus_is_property = True
793
668
        func._dbus_interface = dbus_interface
801
676
    return decorator
802
677
 
803
678
 
804
 
def dbus_interface_annotations(dbus_interface):
805
 
    """Decorator for marking functions returning interface annotations
806
 
    
807
 
    Usage:
808
 
    
809
 
    @dbus_interface_annotations("org.example.Interface")
810
 
    def _foo(self):  # Function name does not matter
811
 
        return {"org.freedesktop.DBus.Deprecated": "true",
812
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
813
 
                    "false"}
814
 
    """
815
 
    def decorator(func):
816
 
        func._dbus_is_interface = True
817
 
        func._dbus_interface = dbus_interface
818
 
        func._dbus_name = dbus_interface
819
 
        return func
820
 
    return decorator
821
 
 
822
 
 
823
 
def dbus_annotations(annotations):
824
 
    """Decorator to annotate D-Bus methods, signals or properties
825
 
    Usage:
826
 
    
827
 
    @dbus_service_property("org.example.Interface", signature="b",
828
 
                           access="r")
829
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
 
                        "org.freedesktop.DBus.Property."
831
 
                        "EmitsChangedSignal": "false"})
832
 
    def Property_dbus_property(self):
833
 
        return dbus.Boolean(False)
834
 
    """
835
 
    def decorator(func):
836
 
        func._dbus_annotations = annotations
837
 
        return func
838
 
    return decorator
839
 
 
840
 
 
841
679
class DBusPropertyException(dbus.exceptions.DBusException):
842
680
    """A base class for D-Bus property-related exceptions
843
681
    """
866
704
    """
867
705
    
868
706
    @staticmethod
869
 
    def _is_dbus_thing(thing):
870
 
        """Returns a function testing if an attribute is a D-Bus thing
871
 
        
872
 
        If called like _is_dbus_thing("method") it returns a function
873
 
        suitable for use as predicate to inspect.getmembers().
874
 
        """
875
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
876
 
                                   False)
 
707
    def _is_dbus_property(obj):
 
708
        return getattr(obj, "_dbus_is_property", False)
877
709
    
878
 
    def _get_all_dbus_things(self, thing):
 
710
    def _get_all_dbus_properties(self):
879
711
        """Returns a generator of (name, attribute) pairs
880
712
        """
881
 
        return ((getattr(athing.__get__(self), "_dbus_name",
882
 
                         name),
883
 
                 athing.__get__(self))
 
713
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
714
                for cls in self.__class__.__mro__
885
 
                for name, athing in
886
 
                inspect.getmembers(cls,
887
 
                                   self._is_dbus_thing(thing)))
 
715
                for name, prop in
 
716
                inspect.getmembers(cls, self._is_dbus_property))
888
717
    
889
718
    def _get_dbus_property(self, interface_name, property_name):
890
719
        """Returns a bound method if one exists which is a D-Bus
892
721
        """
893
722
        for cls in  self.__class__.__mro__:
894
723
            for name, value in (inspect.getmembers
895
 
                                (cls,
896
 
                                 self._is_dbus_thing("property"))):
 
724
                                (cls, self._is_dbus_property)):
897
725
                if (value._dbus_name == property_name
898
726
                    and value._dbus_interface == interface_name):
899
727
                    return value.__get__(self)
928
756
            # signatures other than "ay".
929
757
            if prop._dbus_signature != "ay":
930
758
                raise ValueError
931
 
            value = dbus.ByteArray(b''.join(chr(byte)
932
 
                                            for byte in value))
 
759
            value = dbus.ByteArray(''.join(unichr(byte)
 
760
                                           for byte in value))
933
761
        prop(value)
934
762
    
935
763
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
940
768
        
941
769
        Note: Will not include properties with access="write".
942
770
        """
943
 
        properties = {}
944
 
        for name, prop in self._get_all_dbus_things("property"):
 
771
        all = {}
 
772
        for name, prop in self._get_all_dbus_properties():
945
773
            if (interface_name
946
774
                and interface_name != prop._dbus_interface):
947
775
                # Interface non-empty but did not match
951
779
                continue
952
780
            value = prop()
953
781
            if not hasattr(value, "variant_level"):
954
 
                properties[name] = value
 
782
                all[name] = value
955
783
                continue
956
 
            properties[name] = type(value)(value, variant_level=
957
 
                                           value.variant_level+1)
958
 
        return dbus.Dictionary(properties, signature="sv")
 
784
            all[name] = type(value)(value, variant_level=
 
785
                                    value.variant_level+1)
 
786
        return dbus.Dictionary(all, signature="sv")
959
787
    
960
788
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
961
789
                         out_signature="s",
962
790
                         path_keyword='object_path',
963
791
                         connection_keyword='connection')
964
792
    def Introspect(self, object_path, connection):
965
 
        """Overloading of standard D-Bus method.
966
 
        
967
 
        Inserts property tags and interface annotation tags.
 
793
        """Standard D-Bus method, overloaded to insert property tags.
968
794
        """
969
795
        xmlstring = dbus.service.Object.Introspect(self, object_path,
970
796
                                                   connection)
977
803
                e.setAttribute("access", prop._dbus_access)
978
804
                return e
979
805
            for if_tag in document.getElementsByTagName("interface"):
980
 
                # Add property tags
981
806
                for tag in (make_tag(document, name, prop)
982
807
                            for name, prop
983
 
                            in self._get_all_dbus_things("property")
 
808
                            in self._get_all_dbus_properties()
984
809
                            if prop._dbus_interface
985
810
                            == if_tag.getAttribute("name")):
986
811
                    if_tag.appendChild(tag)
987
 
                # Add annotation tags
988
 
                for typ in ("method", "signal", "property"):
989
 
                    for tag in if_tag.getElementsByTagName(typ):
990
 
                        annots = dict()
991
 
                        for name, prop in (self.
992
 
                                           _get_all_dbus_things(typ)):
993
 
                            if (name == tag.getAttribute("name")
994
 
                                and prop._dbus_interface
995
 
                                == if_tag.getAttribute("name")):
996
 
                                annots.update(getattr
997
 
                                              (prop,
998
 
                                               "_dbus_annotations",
999
 
                                               {}))
1000
 
                        for name, value in annots.iteritems():
1001
 
                            ann_tag = document.createElement(
1002
 
                                "annotation")
1003
 
                            ann_tag.setAttribute("name", name)
1004
 
                            ann_tag.setAttribute("value", value)
1005
 
                            tag.appendChild(ann_tag)
1006
 
                # Add interface annotation tags
1007
 
                for annotation, value in dict(
1008
 
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
1010
 
                        for name, annotations in
1011
 
                        self._get_all_dbus_things("interface")
1012
 
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
1014
 
                    ann_tag = document.createElement("annotation")
1015
 
                    ann_tag.setAttribute("name", annotation)
1016
 
                    ann_tag.setAttribute("value", value)
1017
 
                    if_tag.appendChild(ann_tag)
1018
812
                # Add the names to the return values for the
1019
813
                # "org.freedesktop.DBus.Properties" methods
1020
814
                if (if_tag.getAttribute("name")
1035
829
        except (AttributeError, xml.dom.DOMException,
1036
830
                xml.parsers.expat.ExpatError) as error:
1037
831
            logger.error("Failed to override Introspection method",
1038
 
                         exc_info=error)
 
832
                         error)
1039
833
        return xmlstring
1040
834
 
1041
835
 
1042
 
def datetime_to_dbus(dt, variant_level=0):
 
836
def datetime_to_dbus (dt, variant_level=0):
1043
837
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
838
    if dt is None:
1045
839
        return dbus.String("", variant_level = variant_level)
1046
840
    return dbus.String(dt.isoformat(),
1047
841
                       variant_level=variant_level)
1048
842
 
1049
 
 
1050
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1051
 
    """A class decorator; applied to a subclass of
1052
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1053
 
    interface names according to the "alt_interface_names" mapping.
1054
 
    Usage:
1055
 
    
1056
 
    @alternate_dbus_interfaces({"org.example.Interface":
1057
 
                                    "net.example.AlternateInterface"})
1058
 
    class SampleDBusObject(dbus.service.Object):
1059
 
        @dbus.service.method("org.example.Interface")
1060
 
        def SampleDBusMethod():
1061
 
            pass
1062
 
    
1063
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1064
 
    reachable via two interfaces: "org.example.Interface" and
1065
 
    "net.example.AlternateInterface", the latter of which will have
1066
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1067
 
    "true", unless "deprecate" is passed with a False value.
1068
 
    
1069
 
    This works for methods and signals, and also for D-Bus properties
1070
 
    (from DBusObjectWithProperties) and interfaces (from the
1071
 
    dbus_interface_annotations decorator).
 
843
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
844
                                  .__metaclass__):
 
845
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
846
    will add additional D-Bus attributes matching a certain pattern.
1072
847
    """
1073
 
    def wrapper(cls):
1074
 
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
1076
 
            attr = {}
1077
 
            interface_names = set()
1078
 
            # Go though all attributes of the class
1079
 
            for attrname, attribute in inspect.getmembers(cls):
 
848
    def __new__(mcs, name, bases, attr):
 
849
        # Go through all the base classes which could have D-Bus
 
850
        # methods, signals, or properties in them
 
851
        for base in (b for b in bases
 
852
                     if issubclass(b, dbus.service.Object)):
 
853
            # Go though all attributes of the base class
 
854
            for attrname, attribute in inspect.getmembers(base):
1080
855
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
856
                # with the wrong interface name
1082
857
                if (not hasattr(attribute, "_dbus_interface")
1083
858
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
859
                    .startswith("se.recompile.Mandos")):
1085
860
                    continue
1086
861
                # Create an alternate D-Bus interface name based on
1087
862
                # the current name
1088
863
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
1091
 
                interface_names.add(alt_interface)
 
864
                                 .replace("se.recompile.Mandos",
 
865
                                          "se.bsnet.fukt.Mandos"))
1092
866
                # Is this a D-Bus signal?
1093
867
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
 
868
                    # Extract the original non-method function by
 
869
                    # black magic
1096
870
                    nonmethod_func = (dict(
1097
871
                            zip(attribute.func_code.co_freevars,
1098
872
                                attribute.__closure__))["func"]
1109
883
                                nonmethod_func.func_name,
1110
884
                                nonmethod_func.func_defaults,
1111
885
                                nonmethod_func.func_closure)))
1112
 
                    # Copy annotations, if any
1113
 
                    try:
1114
 
                        new_function._dbus_annotations = (
1115
 
                            dict(attribute._dbus_annotations))
1116
 
                    except AttributeError:
1117
 
                        pass
1118
886
                    # Define a creator of a function to call both the
1119
 
                    # original and alternate functions, so both the
1120
 
                    # original and alternate signals gets sent when
1121
 
                    # the function is called
 
887
                    # old and new functions, so both the old and new
 
888
                    # signals gets sent when the function is called
1122
889
                    def fixscope(func1, func2):
1123
890
                        """This function is a scope container to pass
1124
891
                        func1 and func2 to the "call_both" function
1131
898
                        return call_both
1132
899
                    # Create the "call_both" function and add it to
1133
900
                    # the class
1134
 
                    attr[attrname] = fixscope(attribute, new_function)
 
901
                    attr[attrname] = fixscope(attribute,
 
902
                                              new_function)
1135
903
                # Is this a D-Bus method?
1136
904
                elif getattr(attribute, "_dbus_is_method", False):
1137
905
                    # Create a new, but exactly alike, function
1148
916
                                        attribute.func_name,
1149
917
                                        attribute.func_defaults,
1150
918
                                        attribute.func_closure)))
1151
 
                    # Copy annotations, if any
1152
 
                    try:
1153
 
                        attr[attrname]._dbus_annotations = (
1154
 
                            dict(attribute._dbus_annotations))
1155
 
                    except AttributeError:
1156
 
                        pass
1157
919
                # Is this a D-Bus property?
1158
920
                elif getattr(attribute, "_dbus_is_property", False):
1159
921
                    # Create a new, but exactly alike, function
1173
935
                                        attribute.func_name,
1174
936
                                        attribute.func_defaults,
1175
937
                                        attribute.func_closure)))
1176
 
                    # Copy annotations, if any
1177
 
                    try:
1178
 
                        attr[attrname]._dbus_annotations = (
1179
 
                            dict(attribute._dbus_annotations))
1180
 
                    except AttributeError:
1181
 
                        pass
1182
 
                # Is this a D-Bus interface?
1183
 
                elif getattr(attribute, "_dbus_is_interface", False):
1184
 
                    # Create a new, but exactly alike, function
1185
 
                    # object.  Decorate it to be a new D-Bus interface
1186
 
                    # with the alternate D-Bus interface name.  Add it
1187
 
                    # to the class.
1188
 
                    attr[attrname] = (dbus_interface_annotations
1189
 
                                      (alt_interface)
1190
 
                                      (types.FunctionType
1191
 
                                       (attribute.func_code,
1192
 
                                        attribute.func_globals,
1193
 
                                        attribute.func_name,
1194
 
                                        attribute.func_defaults,
1195
 
                                        attribute.func_closure)))
1196
 
            if deprecate:
1197
 
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1199
 
                for interface_name in interface_names:
1200
 
                    @dbus_interface_annotations(interface_name)
1201
 
                    def func(self):
1202
 
                        return { "org.freedesktop.DBus.Deprecated":
1203
 
                                     "true" }
1204
 
                    # Find an unused name
1205
 
                    for aname in (iname.format(i)
1206
 
                                  for i in itertools.count()):
1207
 
                        if aname not in attr:
1208
 
                            attr[aname] = func
1209
 
                            break
1210
 
            if interface_names:
1211
 
                # Replace the class with a new subclass of it with
1212
 
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1214
 
                           (cls,), attr)
1215
 
        return cls
1216
 
    return wrapper
1217
 
 
1218
 
 
1219
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
 
                                "se.bsnet.fukt.Mandos"})
 
938
        return type.__new__(mcs, name, bases, attr)
 
939
 
1221
940
class ClientDBus(Client, DBusObjectWithProperties):
1222
941
    """A Client class using D-Bus
1223
942
    
1233
952
    
1234
953
    def __init__(self, bus = None, *args, **kwargs):
1235
954
        self.bus = bus
 
955
        self._approvals_pending = 0
1236
956
        Client.__init__(self, *args, **kwargs)
 
957
        self.add_to_dbus()
 
958
    
 
959
    def add_to_dbus(self):
1237
960
        # Only now, when this client is initialized, can it show up on
1238
961
        # the D-Bus
1239
962
        client_object_name = unicode(self.name).translate(
1243
966
                                 ("/clients/" + client_object_name))
1244
967
        DBusObjectWithProperties.__init__(self, self.bus,
1245
968
                                          self.dbus_object_path)
1246
 
    
 
969
        
1247
970
    def notifychangeproperty(transform_func,
1248
971
                             dbus_name, type_func=lambda x: x,
1249
972
                             variant_level=1):
1250
973
        """ Modify a variable so that it's a property which announces
1251
974
        its changes to DBus.
1252
 
        
 
975
 
1253
976
        transform_fun: Function that takes a value and a variant_level
1254
977
                       and transforms it to a D-Bus type.
1255
978
        dbus_name: D-Bus name of the variable
1272
995
        
1273
996
        return property(lambda self: getattr(self, attrname), setter)
1274
997
    
 
998
    
1275
999
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1276
1000
    approvals_pending = notifychangeproperty(dbus.Boolean,
1277
1001
                                             "ApprovalPending",
1284
1008
                                       checker is not None)
1285
1009
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
1010
                                           "LastCheckedOK")
1287
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1288
 
                                               "LastCheckerStatus")
1289
1011
    last_approval_request = notifychangeproperty(
1290
1012
        datetime_to_dbus, "LastApprovalRequest")
1291
1013
    approved_by_default = notifychangeproperty(dbus.Boolean,
1292
1014
                                               "ApprovedByDefault")
1293
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1015
    approval_delay = notifychangeproperty(dbus.UInt16,
1294
1016
                                          "ApprovalDelay",
1295
1017
                                          type_func =
1296
 
                                          timedelta_to_milliseconds)
 
1018
                                          _timedelta_to_milliseconds)
1297
1019
    approval_duration = notifychangeproperty(
1298
 
        dbus.UInt64, "ApprovalDuration",
1299
 
        type_func = timedelta_to_milliseconds)
 
1020
        dbus.UInt16, "ApprovalDuration",
 
1021
        type_func = _timedelta_to_milliseconds)
1300
1022
    host = notifychangeproperty(dbus.String, "Host")
1301
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1023
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1302
1024
                                   type_func =
1303
 
                                   timedelta_to_milliseconds)
 
1025
                                   _timedelta_to_milliseconds)
1304
1026
    extended_timeout = notifychangeproperty(
1305
 
        dbus.UInt64, "ExtendedTimeout",
1306
 
        type_func = timedelta_to_milliseconds)
1307
 
    interval = notifychangeproperty(dbus.UInt64,
 
1027
        dbus.UInt16, "ExtendedTimeout",
 
1028
        type_func = _timedelta_to_milliseconds)
 
1029
    interval = notifychangeproperty(dbus.UInt16,
1308
1030
                                    "Interval",
1309
1031
                                    type_func =
1310
 
                                    timedelta_to_milliseconds)
 
1032
                                    _timedelta_to_milliseconds)
1311
1033
    checker_command = notifychangeproperty(dbus.String, "Checker")
1312
1034
    
1313
1035
    del notifychangeproperty
1355
1077
        return r
1356
1078
    
1357
1079
    def _reset_approved(self):
1358
 
        self.approved = None
 
1080
        self._approved = None
1359
1081
        return False
1360
1082
    
1361
1083
    def approve(self, value=True):
1362
 
        self.approved = value
1363
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1084
        self.send_changedstate()
 
1085
        self._approved = value
 
1086
        gobject.timeout_add(_timedelta_to_milliseconds
1364
1087
                            (self.approval_duration),
1365
1088
                            self._reset_approved)
1366
 
        self.send_changedstate()
 
1089
    
1367
1090
    
1368
1091
    ## D-Bus methods, signals & properties
1369
1092
    _interface = "se.recompile.Mandos.Client"
1370
1093
    
1371
 
    ## Interfaces
1372
 
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1094
    ## Signals
1379
1095
    
1380
1096
    # CheckerCompleted - signal
1479
1195
                           access="readwrite")
1480
1196
    def ApprovalDuration_dbus_property(self, value=None):
1481
1197
        if value is None:       # get
1482
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1198
            return dbus.UInt64(_timedelta_to_milliseconds(
1483
1199
                    self.approval_duration))
1484
1200
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1485
1201
    
1499
1215
    def Host_dbus_property(self, value=None):
1500
1216
        if value is None:       # get
1501
1217
            return dbus.String(self.host)
1502
 
        self.host = unicode(value)
 
1218
        self.host = value
1503
1219
    
1504
1220
    # Created - property
1505
1221
    @dbus_service_property(_interface, signature="s", access="read")
1506
1222
    def Created_dbus_property(self):
1507
 
        return datetime_to_dbus(self.created)
 
1223
        return dbus.String(datetime_to_dbus(self.created))
1508
1224
    
1509
1225
    # LastEnabled - property
1510
1226
    @dbus_service_property(_interface, signature="s", access="read")
1531
1247
            return
1532
1248
        return datetime_to_dbus(self.last_checked_ok)
1533
1249
    
1534
 
    # LastCheckerStatus - property
1535
 
    @dbus_service_property(_interface, signature="n",
1536
 
                           access="read")
1537
 
    def LastCheckerStatus_dbus_property(self):
1538
 
        return dbus.Int16(self.last_checker_status)
1539
 
    
1540
1250
    # Expires - property
1541
1251
    @dbus_service_property(_interface, signature="s", access="read")
1542
1252
    def Expires_dbus_property(self):
1553
1263
    def Timeout_dbus_property(self, value=None):
1554
1264
        if value is None:       # get
1555
1265
            return dbus.UInt64(self.timeout_milliseconds())
1556
 
        old_timeout = self.timeout
1557
1266
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
 
        # Reschedule disabling
1559
 
        if self.enabled:
1560
 
            now = datetime.datetime.utcnow()
1561
 
            self.expires += self.timeout - old_timeout
1562
 
            if self.expires <= now:
1563
 
                # The timeout has passed
1564
 
                self.disable()
1565
 
            else:
1566
 
                if (getattr(self, "disable_initiator_tag", None)
1567
 
                    is None):
1568
 
                    return
1569
 
                gobject.source_remove(self.disable_initiator_tag)
1570
 
                self.disable_initiator_tag = (
1571
 
                    gobject.timeout_add(
1572
 
                        timedelta_to_milliseconds(self.expires - now),
1573
 
                        self.disable))
 
1267
        if getattr(self, "disable_initiator_tag", None) is None:
 
1268
            return
 
1269
        # Reschedule timeout
 
1270
        gobject.source_remove(self.disable_initiator_tag)
 
1271
        self.disable_initiator_tag = None
 
1272
        self.expires = None
 
1273
        time_to_die = _timedelta_to_milliseconds((self
 
1274
                                                  .last_checked_ok
 
1275
                                                  + self.timeout)
 
1276
                                                 - datetime.datetime
 
1277
                                                 .utcnow())
 
1278
        if time_to_die <= 0:
 
1279
            # The timeout has passed
 
1280
            self.disable()
 
1281
        else:
 
1282
            self.expires = (datetime.datetime.utcnow()
 
1283
                            + datetime.timedelta(milliseconds =
 
1284
                                                 time_to_die))
 
1285
            self.disable_initiator_tag = (gobject.timeout_add
 
1286
                                          (time_to_die, self.disable))
1574
1287
    
1575
1288
    # ExtendedTimeout - property
1576
1289
    @dbus_service_property(_interface, signature="t",
1589
1302
        self.interval = datetime.timedelta(0, 0, 0, value)
1590
1303
        if getattr(self, "checker_initiator_tag", None) is None:
1591
1304
            return
1592
 
        if self.enabled:
1593
 
            # Reschedule checker run
1594
 
            gobject.source_remove(self.checker_initiator_tag)
1595
 
            self.checker_initiator_tag = (gobject.timeout_add
1596
 
                                          (value, self.start_checker))
1597
 
            self.start_checker()    # Start one now, too
 
1305
        # Reschedule checker run
 
1306
        gobject.source_remove(self.checker_initiator_tag)
 
1307
        self.checker_initiator_tag = (gobject.timeout_add
 
1308
                                      (value, self.start_checker))
 
1309
        self.start_checker()    # Start one now, too
1598
1310
    
1599
1311
    # Checker - property
1600
1312
    @dbus_service_property(_interface, signature="s",
1602
1314
    def Checker_dbus_property(self, value=None):
1603
1315
        if value is None:       # get
1604
1316
            return dbus.String(self.checker_command)
1605
 
        self.checker_command = unicode(value)
 
1317
        self.checker_command = value
1606
1318
    
1607
1319
    # CheckerRunning - property
1608
1320
    @dbus_service_property(_interface, signature="b",
1637
1349
            raise KeyError()
1638
1350
    
1639
1351
    def __getattribute__(self, name):
1640
 
        if name == '_pipe':
 
1352
        if(name == '_pipe'):
1641
1353
            return super(ProxyClient, self).__getattribute__(name)
1642
1354
        self._pipe.send(('getattr', name))
1643
1355
        data = self._pipe.recv()
1650
1362
            return func
1651
1363
    
1652
1364
    def __setattr__(self, name, value):
1653
 
        if name == '_pipe':
 
1365
        if(name == '_pipe'):
1654
1366
            return super(ProxyClient, self).__setattr__(name, value)
1655
1367
        self._pipe.send(('setattr', name, value))
1656
1368
 
 
1369
class ClientDBusTransitional(ClientDBus):
 
1370
    __metaclass__ = AlternateDBusNamesMetaclass
1657
1371
 
1658
1372
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
1373
    """A class to handle client connections.
1742
1456
                            client.Rejected("Disabled")
1743
1457
                        return
1744
1458
                    
1745
 
                    if client.approved or not client.approval_delay:
 
1459
                    if client._approved or not client.approval_delay:
1746
1460
                        #We are approved or approval is disabled
1747
1461
                        break
1748
 
                    elif client.approved is None:
 
1462
                    elif client._approved is None:
1749
1463
                        logger.info("Client %s needs approval",
1750
1464
                                    client.name)
1751
1465
                        if self.server.use_dbus:
1764
1478
                    #wait until timeout or approved
1765
1479
                    time = datetime.datetime.now()
1766
1480
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1481
                    (client.changedstate.wait
 
1482
                     (float(client._timedelta_to_milliseconds(delay)
 
1483
                            / 1000)))
1770
1484
                    client.changedstate.release()
1771
1485
                    time2 = datetime.datetime.now()
1772
1486
                    if (time2 - time) >= delay:
1788
1502
                    try:
1789
1503
                        sent = session.send(client.secret[sent_size:])
1790
1504
                    except gnutls.errors.GNUTLSError as error:
1791
 
                        logger.warning("gnutls send failed",
1792
 
                                       exc_info=error)
 
1505
                        logger.warning("gnutls send failed")
1793
1506
                        return
1794
1507
                    logger.debug("Sent: %d, remaining: %d",
1795
1508
                                 sent, len(client.secret)
1798
1511
                
1799
1512
                logger.info("Sending secret to %s", client.name)
1800
1513
                # bump the timeout using extended_timeout
1801
 
                client.bump_timeout(client.extended_timeout)
 
1514
                client.checked_ok(client.extended_timeout)
1802
1515
                if self.server.use_dbus:
1803
1516
                    # Emit D-Bus signal
1804
1517
                    client.GotSecret()
1809
1522
                try:
1810
1523
                    session.bye()
1811
1524
                except gnutls.errors.GNUTLSError as error:
1812
 
                    logger.warning("GnuTLS bye failed",
1813
 
                                   exc_info=error)
 
1525
                    logger.warning("GnuTLS bye failed")
1814
1526
    
1815
1527
    @staticmethod
1816
1528
    def peer_certificate(session):
1872
1584
        # Convert the buffer to a Python bytestring
1873
1585
        fpr = ctypes.string_at(buf, buf_len.value)
1874
1586
        # Convert the bytestring to hexadecimal notation
1875
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1587
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1876
1588
        return hex_fpr
1877
1589
 
1878
1590
 
1881
1593
    def sub_process_main(self, request, address):
1882
1594
        try:
1883
1595
            self.finish_request(request, address)
1884
 
        except Exception:
 
1596
        except:
1885
1597
            self.handle_error(request, address)
1886
1598
        self.close_request(request)
1887
1599
    
1888
1600
    def process_request(self, request, address):
1889
1601
        """Start a new process to process the request."""
1890
1602
        proc = multiprocessing.Process(target = self.sub_process_main,
1891
 
                                       args = (request, address))
 
1603
                                       args = (request,
 
1604
                                               address))
1892
1605
        proc.start()
1893
1606
        return proc
1894
1607
 
1922
1635
        use_ipv6:       Boolean; to use IPv6 or not
1923
1636
    """
1924
1637
    def __init__(self, server_address, RequestHandlerClass,
1925
 
                 interface=None, use_ipv6=True, socketfd=None):
1926
 
        """If socketfd is set, use that file descriptor instead of
1927
 
        creating a new one with socket.socket().
1928
 
        """
 
1638
                 interface=None, use_ipv6=True):
1929
1639
        self.interface = interface
1930
1640
        if use_ipv6:
1931
1641
            self.address_family = socket.AF_INET6
1932
 
        if socketfd is not None:
1933
 
            # Save the file descriptor
1934
 
            self.socketfd = socketfd
1935
 
            # Save the original socket.socket() function
1936
 
            self.socket_socket = socket.socket
1937
 
            # To implement --socket, we monkey patch socket.socket.
1938
 
            # 
1939
 
            # (When socketserver.TCPServer is a new-style class, we
1940
 
            # could make self.socket into a property instead of monkey
1941
 
            # patching socket.socket.)
1942
 
            # 
1943
 
            # Create a one-time-only replacement for socket.socket()
1944
 
            @functools.wraps(socket.socket)
1945
 
            def socket_wrapper(*args, **kwargs):
1946
 
                # Restore original function so subsequent calls are
1947
 
                # not affected.
1948
 
                socket.socket = self.socket_socket
1949
 
                del self.socket_socket
1950
 
                # This time only, return a new socket object from the
1951
 
                # saved file descriptor.
1952
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1953
 
            # Replace socket.socket() function with wrapper
1954
 
            socket.socket = socket_wrapper
1955
 
        # The socketserver.TCPServer.__init__ will call
1956
 
        # socket.socket(), which might be our replacement,
1957
 
        # socket_wrapper(), if socketfd was set.
1958
1642
        socketserver.TCPServer.__init__(self, server_address,
1959
1643
                                        RequestHandlerClass)
1960
 
    
1961
1644
    def server_bind(self):
1962
1645
        """This overrides the normal server_bind() function
1963
1646
        to bind to an interface if one was specified, and also NOT to
1971
1654
                try:
1972
1655
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1656
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1657
                                           str(self.interface
 
1658
                                               + '\0'))
1975
1659
                except socket.error as error:
1976
 
                    if error.errno == errno.EPERM:
1977
 
                        logger.error("No permission to bind to"
1978
 
                                     " interface %s", self.interface)
1979
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1660
                    if error[0] == errno.EPERM:
 
1661
                        logger.error("No permission to"
 
1662
                                     " bind to interface %s",
 
1663
                                     self.interface)
 
1664
                    elif error[0] == errno.ENOPROTOOPT:
1980
1665
                        logger.error("SO_BINDTODEVICE not available;"
1981
1666
                                     " cannot bind to interface %s",
1982
1667
                                     self.interface)
1983
 
                    elif error.errno == errno.ENODEV:
1984
 
                        logger.error("Interface %s does not exist,"
1985
 
                                     " cannot bind", self.interface)
1986
1668
                    else:
1987
1669
                        raise
1988
1670
        # Only bind(2) the socket if we really need to.
1991
1673
                if self.address_family == socket.AF_INET6:
1992
1674
                    any_address = "::" # in6addr_any
1993
1675
                else:
1994
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1676
                    any_address = socket.INADDR_ANY
1995
1677
                self.server_address = (any_address,
1996
1678
                                       self.server_address[1])
1997
1679
            elif not self.server_address[1]:
2018
1700
    """
2019
1701
    def __init__(self, server_address, RequestHandlerClass,
2020
1702
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1703
                 gnutls_priority=None, use_dbus=True):
2022
1704
        self.enabled = False
2023
1705
        self.clients = clients
2024
1706
        if self.clients is None:
2028
1710
        IPv6_TCPServer.__init__(self, server_address,
2029
1711
                                RequestHandlerClass,
2030
1712
                                interface = interface,
2031
 
                                use_ipv6 = use_ipv6,
2032
 
                                socketfd = socketfd)
 
1713
                                use_ipv6 = use_ipv6)
2033
1714
    def server_activate(self):
2034
1715
        if self.enabled:
2035
1716
            return socketserver.TCPServer.server_activate(self)
2048
1729
    
2049
1730
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
1731
                   proc = None, client_object=None):
 
1732
        condition_names = {
 
1733
            gobject.IO_IN: "IN",   # There is data to read.
 
1734
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1735
                                    # blocking).
 
1736
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1737
            gobject.IO_ERR: "ERR", # Error condition.
 
1738
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1739
                                    # broken, usually for pipes and
 
1740
                                    # sockets).
 
1741
            }
 
1742
        conditions_string = ' | '.join(name
 
1743
                                       for cond, name in
 
1744
                                       condition_names.iteritems()
 
1745
                                       if cond & condition)
2051
1746
        # error, or the other end of multiprocessing.Pipe has closed
2052
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1747
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2053
1748
            # Wait for other process to exit
2054
1749
            proc.join()
2055
1750
            return False
2113
1808
        return True
2114
1809
 
2115
1810
 
2116
 
def rfc3339_duration_to_delta(duration):
2117
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2118
 
    
2119
 
    >>> rfc3339_duration_to_delta("P7D")
2120
 
    datetime.timedelta(7)
2121
 
    >>> rfc3339_duration_to_delta("PT60S")
2122
 
    datetime.timedelta(0, 60)
2123
 
    >>> rfc3339_duration_to_delta("PT60M")
2124
 
    datetime.timedelta(0, 3600)
2125
 
    >>> rfc3339_duration_to_delta("PT24H")
2126
 
    datetime.timedelta(1)
2127
 
    >>> rfc3339_duration_to_delta("P1W")
2128
 
    datetime.timedelta(7)
2129
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2130
 
    datetime.timedelta(0, 330)
2131
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2132
 
    datetime.timedelta(1, 200)
2133
 
    """
2134
 
    
2135
 
    # Parsing an RFC 3339 duration with regular expressions is not
2136
 
    # possible - there would have to be multiple places for the same
2137
 
    # values, like seconds.  The current code, while more esoteric, is
2138
 
    # cleaner without depending on a parsing library.  If Python had a
2139
 
    # built-in library for parsing we would use it, but we'd like to
2140
 
    # avoid excessive use of external libraries.
2141
 
    
2142
 
    # New type for defining tokens, syntax, and semantics all-in-one
2143
 
    Token = collections.namedtuple("Token",
2144
 
                                   ("regexp", # To match token; if
2145
 
                                              # "value" is not None,
2146
 
                                              # must have a "group"
2147
 
                                              # containing digits
2148
 
                                    "value",  # datetime.timedelta or
2149
 
                                              # None
2150
 
                                    "followers")) # Tokens valid after
2151
 
                                                  # this token
2152
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2154
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2155
 
    token_second = Token(re.compile(r"(\d+)S"),
2156
 
                         datetime.timedelta(seconds=1),
2157
 
                         frozenset((token_end,)))
2158
 
    token_minute = Token(re.compile(r"(\d+)M"),
2159
 
                         datetime.timedelta(minutes=1),
2160
 
                         frozenset((token_second, token_end)))
2161
 
    token_hour = Token(re.compile(r"(\d+)H"),
2162
 
                       datetime.timedelta(hours=1),
2163
 
                       frozenset((token_minute, token_end)))
2164
 
    token_time = Token(re.compile(r"T"),
2165
 
                       None,
2166
 
                       frozenset((token_hour, token_minute,
2167
 
                                  token_second)))
2168
 
    token_day = Token(re.compile(r"(\d+)D"),
2169
 
                      datetime.timedelta(days=1),
2170
 
                      frozenset((token_time, token_end)))
2171
 
    token_month = Token(re.compile(r"(\d+)M"),
2172
 
                        datetime.timedelta(weeks=4),
2173
 
                        frozenset((token_day, token_end)))
2174
 
    token_year = Token(re.compile(r"(\d+)Y"),
2175
 
                       datetime.timedelta(weeks=52),
2176
 
                       frozenset((token_month, token_end)))
2177
 
    token_week = Token(re.compile(r"(\d+)W"),
2178
 
                       datetime.timedelta(weeks=1),
2179
 
                       frozenset((token_end,)))
2180
 
    token_duration = Token(re.compile(r"P"), None,
2181
 
                           frozenset((token_year, token_month,
2182
 
                                      token_day, token_time,
2183
 
                                      token_week))),
2184
 
    # Define starting values
2185
 
    value = datetime.timedelta() # Value so far
2186
 
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
2188
 
    s = duration                # String left to parse
2189
 
    # Loop until end token is found
2190
 
    while found_token is not token_end:
2191
 
        # Search for any currently valid tokens
2192
 
        for token in followers:
2193
 
            match = token.regexp.match(s)
2194
 
            if match is not None:
2195
 
                # Token found
2196
 
                if token.value is not None:
2197
 
                    # Value found, parse digits
2198
 
                    factor = int(match.group(1), 10)
2199
 
                    # Add to value so far
2200
 
                    value += factor * token.value
2201
 
                # Strip token from string
2202
 
                s = token.regexp.sub("", s, 1)
2203
 
                # Go to found token
2204
 
                found_token = token
2205
 
                # Set valid next tokens
2206
 
                followers = found_token.followers
2207
 
                break
2208
 
        else:
2209
 
            # No currently valid tokens were found
2210
 
            raise ValueError("Invalid RFC 3339 duration")
2211
 
    # End token found
2212
 
    return value
2213
 
 
2214
 
 
2215
1811
def string_to_delta(interval):
2216
1812
    """Parse a string and return a datetime.timedelta
2217
1813
    
2228
1824
    >>> string_to_delta('5m 30s')
2229
1825
    datetime.timedelta(0, 330)
2230
1826
    """
2231
 
    
2232
 
    try:
2233
 
        return rfc3339_duration_to_delta(interval)
2234
 
    except ValueError:
2235
 
        pass
2236
 
    
2237
1827
    timevalue = datetime.timedelta(0)
2238
1828
    for s in interval.split():
2239
1829
        try:
2250
1840
            elif suffix == "w":
2251
1841
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
1842
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
2254
 
                                 .format(suffix))
 
1843
                raise ValueError("Unknown suffix %r" % suffix)
2255
1844
        except (ValueError, IndexError) as e:
2256
1845
            raise ValueError(*(e.args))
2257
1846
        timevalue += delta
2258
1847
    return timevalue
2259
1848
 
2260
1849
 
 
1850
def if_nametoindex(interface):
 
1851
    """Call the C function if_nametoindex(), or equivalent
 
1852
    
 
1853
    Note: This function cannot accept a unicode string."""
 
1854
    global if_nametoindex
 
1855
    try:
 
1856
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1857
                          (ctypes.util.find_library("c"))
 
1858
                          .if_nametoindex)
 
1859
    except (OSError, AttributeError):
 
1860
        logger.warning("Doing if_nametoindex the hard way")
 
1861
        def if_nametoindex(interface):
 
1862
            "Get an interface index the hard way, i.e. using fcntl()"
 
1863
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1864
            with contextlib.closing(socket.socket()) as s:
 
1865
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1866
                                    struct.pack(str("16s16x"),
 
1867
                                                interface))
 
1868
            interface_index = struct.unpack(str("I"),
 
1869
                                            ifreq[16:20])[0]
 
1870
            return interface_index
 
1871
    return if_nametoindex(interface)
 
1872
 
 
1873
 
2261
1874
def daemon(nochdir = False, noclose = False):
2262
1875
    """See daemon(3).  Standard BSD Unix function.
2263
1876
    
2271
1884
        sys.exit()
2272
1885
    if not noclose:
2273
1886
        # Close all standard open file descriptors
2274
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1887
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2275
1888
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
1889
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
2278
 
                          .format(os.devnull))
 
1890
                          "%s not a character device"
 
1891
                          % os.path.devnull)
2279
1892
        os.dup2(null, sys.stdin.fileno())
2280
1893
        os.dup2(null, sys.stdout.fileno())
2281
1894
        os.dup2(null, sys.stderr.fileno())
2290
1903
    
2291
1904
    parser = argparse.ArgumentParser()
2292
1905
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
1906
                        version = "%%(prog)s %s" % version,
2294
1907
                        help="show version number and exit")
2295
1908
    parser.add_argument("-i", "--interface", metavar="IF",
2296
1909
                        help="Bind to interface IF")
2302
1915
                        help="Run self-test")
2303
1916
    parser.add_argument("--debug", action="store_true",
2304
1917
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal", default=None)
 
1918
                        " to terminal")
2306
1919
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
1920
                        help="Debug level for stdout output")
2308
1921
    parser.add_argument("--priority", help="GnuTLS"
2315
1928
                        " files")
2316
1929
    parser.add_argument("--no-dbus", action="store_false",
2317
1930
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface", default=None)
 
1931
                        " system bus interface")
2319
1932
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6",
2321
 
                        default=None)
 
1933
                        dest="use_ipv6", help="Do not use IPv6")
2322
1934
    parser.add_argument("--no-restore", action="store_false",
2323
 
                        dest="restore", help="Do not restore stored"
2324
 
                        " state", default=None)
2325
 
    parser.add_argument("--socket", type=int,
2326
 
                        help="Specify a file descriptor to a network"
2327
 
                        " socket to use instead of creating one")
2328
 
    parser.add_argument("--statedir", metavar="DIR",
2329
 
                        help="Directory to save/restore state in")
2330
 
    parser.add_argument("--foreground", action="store_true",
2331
 
                        help="Run in foreground", default=None)
2332
 
    
 
1935
                        dest="restore",
 
1936
                        help="Do not restore stored state",
 
1937
                        default=True)
 
1938
 
2333
1939
    options = parser.parse_args()
2334
1940
    
2335
1941
    if options.check:
2343
1949
                        "port": "",
2344
1950
                        "debug": "False",
2345
1951
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
1952
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2347
1953
                        "servicename": "Mandos",
2348
1954
                        "use_dbus": "True",
2349
1955
                        "use_ipv6": "True",
2350
1956
                        "debuglevel": "",
2351
 
                        "restore": "True",
2352
 
                        "socket": "",
2353
 
                        "statedir": "/var/lib/mandos",
2354
 
                        "foreground": "False",
2355
1957
                        }
2356
1958
    
2357
1959
    # Parse config file for server-global settings
2362
1964
    # Convert the SafeConfigParser object to a dict
2363
1965
    server_settings = server_config.defaults()
2364
1966
    # Use the appropriate methods on the non-string config options
2365
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1967
    for option in ("debug", "use_dbus", "use_ipv6"):
2366
1968
        server_settings[option] = server_config.getboolean("DEFAULT",
2367
1969
                                                           option)
2368
1970
    if server_settings["port"]:
2369
1971
        server_settings["port"] = server_config.getint("DEFAULT",
2370
1972
                                                       "port")
2371
 
    if server_settings["socket"]:
2372
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2373
 
                                                         "socket")
2374
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2375
 
        # over with an opened os.devnull.  But we don't want this to
2376
 
        # happen with a supplied network socket.
2377
 
        if 0 <= server_settings["socket"] <= 2:
2378
 
            server_settings["socket"] = os.dup(server_settings
2379
 
                                               ["socket"])
2380
1973
    del server_config
2381
1974
    
2382
1975
    # Override the settings from the config file with command line
2383
1976
    # options, if set.
2384
1977
    for option in ("interface", "address", "port", "debug",
2385
1978
                   "priority", "servicename", "configdir",
2386
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
1979
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
2388
1980
        value = getattr(options, option)
2389
1981
        if value is not None:
2390
1982
            server_settings[option] = value
2393
1985
    for option in server_settings.keys():
2394
1986
        if type(server_settings[option]) is str:
2395
1987
            server_settings[option] = unicode(server_settings[option])
2396
 
    # Force all boolean options to be boolean
2397
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
2399
 
        server_settings[option] = bool(server_settings[option])
2400
 
    # Debug implies foreground
2401
 
    if server_settings["debug"]:
2402
 
        server_settings["foreground"] = True
2403
1988
    # Now we have our good server settings in "server_settings"
2404
1989
    
2405
1990
    ##################################################################
2409
1994
    debuglevel = server_settings["debuglevel"]
2410
1995
    use_dbus = server_settings["use_dbus"]
2411
1996
    use_ipv6 = server_settings["use_ipv6"]
2412
 
    stored_state_path = os.path.join(server_settings["statedir"],
2413
 
                                     stored_state_file)
2414
 
    foreground = server_settings["foreground"]
2415
 
    
2416
 
    if debug:
2417
 
        initlogger(debug, logging.DEBUG)
2418
 
    else:
2419
 
        if not debuglevel:
2420
 
            initlogger(debug)
2421
 
        else:
2422
 
            level = getattr(logging, debuglevel.upper())
2423
 
            initlogger(debug, level)
2424
1997
    
2425
1998
    if server_settings["servicename"] != "Mandos":
2426
1999
        syslogger.setFormatter(logging.Formatter
2427
 
                               ('Mandos ({0}) [%(process)d]:'
2428
 
                                ' %(levelname)s: %(message)s'
2429
 
                                .format(server_settings
2430
 
                                        ["servicename"])))
 
2000
                               ('Mandos (%s) [%%(process)d]:'
 
2001
                                ' %%(levelname)s: %%(message)s'
 
2002
                                % server_settings["servicename"]))
2431
2003
    
2432
2004
    # Parse config file with clients
2433
 
    client_config = configparser.SafeConfigParser(Client
2434
 
                                                  .client_defaults)
 
2005
    client_defaults = { "timeout": "5m",
 
2006
                        "extended_timeout": "15m",
 
2007
                        "interval": "2m",
 
2008
                        "checker": "fping -q -- %%(host)s",
 
2009
                        "host": "",
 
2010
                        "approval_delay": "0s",
 
2011
                        "approval_duration": "1s",
 
2012
                        }
 
2013
    client_config = configparser.SafeConfigParser(client_defaults)
2435
2014
    client_config.read(os.path.join(server_settings["configdir"],
2436
2015
                                    "clients.conf"))
2437
2016
    
2446
2025
                              use_ipv6=use_ipv6,
2447
2026
                              gnutls_priority=
2448
2027
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
2452
 
    if not foreground:
 
2028
                              use_dbus=use_dbus)
 
2029
    if not debug:
2453
2030
        pidfilename = "/var/run/mandos.pid"
2454
 
        pidfile = None
2455
2031
        try:
2456
2032
            pidfile = open(pidfilename, "w")
2457
 
        except IOError as e:
2458
 
            logger.error("Could not open file %r", pidfilename,
2459
 
                         exc_info=e)
 
2033
        except IOError:
 
2034
            logger.error("Could not open file %r", pidfilename)
2460
2035
    
2461
 
    for name in ("_mandos", "mandos", "nobody"):
 
2036
    try:
 
2037
        uid = pwd.getpwnam("_mandos").pw_uid
 
2038
        gid = pwd.getpwnam("_mandos").pw_gid
 
2039
    except KeyError:
2462
2040
        try:
2463
 
            uid = pwd.getpwnam(name).pw_uid
2464
 
            gid = pwd.getpwnam(name).pw_gid
2465
 
            break
 
2041
            uid = pwd.getpwnam("mandos").pw_uid
 
2042
            gid = pwd.getpwnam("mandos").pw_gid
2466
2043
        except KeyError:
2467
 
            continue
2468
 
    else:
2469
 
        uid = 65534
2470
 
        gid = 65534
 
2044
            try:
 
2045
                uid = pwd.getpwnam("nobody").pw_uid
 
2046
                gid = pwd.getpwnam("nobody").pw_gid
 
2047
            except KeyError:
 
2048
                uid = 65534
 
2049
                gid = 65534
2471
2050
    try:
2472
2051
        os.setgid(gid)
2473
2052
        os.setuid(uid)
2474
2053
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
 
2054
        if error[0] != errno.EPERM:
2476
2055
            raise error
2477
2056
    
 
2057
    if not debug and not debuglevel:
 
2058
        logger.setLevel(logging.WARNING)
 
2059
    if debuglevel:
 
2060
        level = getattr(logging, debuglevel.upper())
 
2061
        logger.setLevel(level)
 
2062
    
2478
2063
    if debug:
 
2064
        logger.setLevel(logging.DEBUG)
2479
2065
        # Enable all possible GnuTLS debugging
2480
2066
        
2481
2067
        # "Use a log level over 10 to enable all debugging options."
2490
2076
         .gnutls_global_set_log_function(debug_gnutls))
2491
2077
        
2492
2078
        # Redirect stdin so all checkers get /dev/null
2493
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2079
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
2080
        os.dup2(null, sys.stdin.fileno())
2495
2081
        if null > 2:
2496
2082
            os.close(null)
 
2083
    else:
 
2084
        # No console logging
 
2085
        logger.removeHandler(console)
2497
2086
    
2498
2087
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2088
    if not debug:
2500
2089
        # Close all input and output, do double fork, etc.
2501
2090
        daemon()
2502
2091
    
2503
 
    # multiprocessing will use threads, so before we use gobject we
2504
 
    # need to inform gobject that threads will be used.
2505
 
    gobject.threads_init()
2506
 
    
2507
2092
    global main_loop
2508
2093
    # From the Avahi example code
2509
 
    DBusGMainLoop(set_as_default=True)
 
2094
    DBusGMainLoop(set_as_default=True )
2510
2095
    main_loop = gobject.MainLoop()
2511
2096
    bus = dbus.SystemBus()
2512
2097
    # End of Avahi example code
2518
2103
                            ("se.bsnet.fukt.Mandos", bus,
2519
2104
                             do_not_queue=True))
2520
2105
        except dbus.exceptions.NameExistsException as e:
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2106
            logger.error(unicode(e) + ", disabling D-Bus")
2522
2107
            use_dbus = False
2523
2108
            server_settings["use_dbus"] = False
2524
2109
            tcp_server.use_dbus = False
2536
2121
    
2537
2122
    client_class = Client
2538
2123
    if use_dbus:
2539
 
        client_class = functools.partial(ClientDBus, bus = bus)
2540
 
    
2541
 
    client_settings = Client.config_parser(client_config)
 
2124
        client_class = functools.partial(ClientDBusTransitional,
 
2125
                                         bus = bus)
 
2126
    
 
2127
    special_settings = {
 
2128
        # Some settings need to be accessd by special methods;
 
2129
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2130
        "approved_by_default":
 
2131
            lambda section:
 
2132
            client_config.getboolean(section, "approved_by_default"),
 
2133
        }
 
2134
    # Construct a new dict of client settings of this form:
 
2135
    # { client_name: {setting_name: value, ...}, ...}
 
2136
    # with exceptions for any special settings as defined above
 
2137
    client_settings = dict((clientname,
 
2138
                           dict((setting,
 
2139
                                 (value if
 
2140
                                  setting not in special_settings
 
2141
                                  else special_settings[setting]
 
2142
                                  (clientname)))
 
2143
                                for setting, value
 
2144
                                in client_config.items(clientname)))
 
2145
                          for clientname in client_config.sections())
 
2146
    
2542
2147
    old_client_settings = {}
2543
 
    clients_data = {}
2544
 
    
2545
 
    # This is used to redirect stdout and stderr for checker processes
2546
 
    global wnull
2547
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2548
 
    # Only used if server is running in foreground but not in debug
2549
 
    # mode
2550
 
    if debug or not foreground:
2551
 
        wnull.close()
2552
 
    
2553
 
    # Get client data and settings from last running state.
 
2148
    clients_data = []
 
2149
 
 
2150
    # Get client data and settings from last running state. 
2554
2151
    if server_settings["restore"]:
2555
2152
        try:
2556
2153
            with open(stored_state_path, "rb") as stored_state:
2557
 
                clients_data, old_client_settings = (pickle.load
2558
 
                                                     (stored_state))
 
2154
                clients_data, old_client_settings = (
 
2155
                    pickle.load(stored_state))
2559
2156
            os.remove(stored_state_path)
2560
2157
        except IOError as e:
2561
 
            if e.errno == errno.ENOENT:
2562
 
                logger.warning("Could not load persistent state: {0}"
2563
 
                                .format(os.strerror(e.errno)))
2564
 
            else:
2565
 
                logger.critical("Could not load persistent state:",
2566
 
                                exc_info=e)
 
2158
            logger.warning("Could not load persistant state: {0}"
 
2159
                           .format(e))
 
2160
            if e.errno != errno.ENOENT:
2567
2161
                raise
2568
 
        except EOFError as e:
2569
 
            logger.warning("Could not load persistent state: "
2570
 
                           "EOFError:", exc_info=e)
2571
 
    
2572
 
    with PGPEngine() as pgp:
2573
 
        for client_name, client in clients_data.iteritems():
2574
 
            # Skip removed clients
2575
 
            if client_name not in client_settings:
2576
 
                continue
2577
 
            
2578
 
            # Decide which value to use after restoring saved state.
2579
 
            # We have three different values: Old config file,
2580
 
            # new config file, and saved state.
2581
 
            # New config value takes precedence if it differs from old
2582
 
            # config value, otherwise use saved state.
2583
 
            for name, value in client_settings[client_name].items():
2584
 
                try:
2585
 
                    # For each value in new config, check if it
2586
 
                    # differs from the old config value (Except for
2587
 
                    # the "secret" attribute)
2588
 
                    if (name != "secret" and
2589
 
                        value != old_client_settings[client_name]
2590
 
                        [name]):
2591
 
                        client[name] = value
2592
 
                except KeyError:
2593
 
                    pass
2594
 
            
2595
 
            # Clients who has passed its expire date can still be
2596
 
            # enabled if its last checker was successful.  Clients
2597
 
            # whose checker succeeded before we stored its state is
2598
 
            # assumed to have successfully run all checkers during
2599
 
            # downtime.
2600
 
            if client["enabled"]:
2601
 
                if datetime.datetime.utcnow() >= client["expires"]:
2602
 
                    if not client["last_checked_ok"]:
2603
 
                        logger.warning(
2604
 
                            "disabling client {0} - Client never "
2605
 
                            "performed a successful checker"
2606
 
                            .format(client_name))
2607
 
                        client["enabled"] = False
2608
 
                    elif client["last_checker_status"] != 0:
2609
 
                        logger.warning(
2610
 
                            "disabling client {0} - Client "
2611
 
                            "last checker failed with error code {1}"
2612
 
                            .format(client_name,
2613
 
                                    client["last_checker_status"]))
2614
 
                        client["enabled"] = False
2615
 
                    else:
2616
 
                        client["expires"] = (datetime.datetime
2617
 
                                             .utcnow()
2618
 
                                             + client["timeout"])
2619
 
                        logger.debug("Last checker succeeded,"
2620
 
                                     " keeping {0} enabled"
2621
 
                                     .format(client_name))
 
2162
 
 
2163
    for client in clients_data:
 
2164
        client_name = client["name"]
 
2165
        
 
2166
        # Decide which value to use after restoring saved state.
 
2167
        # We have three different values: Old config file,
 
2168
        # new config file, and saved state.
 
2169
        # New config value takes precedence if it differs from old
 
2170
        # config value, otherwise use saved state.
 
2171
        for name, value in client_settings[client_name].items():
2622
2172
            try:
2623
 
                client["secret"] = (
2624
 
                    pgp.decrypt(client["encrypted_secret"],
2625
 
                                client_settings[client_name]
2626
 
                                ["secret"]))
2627
 
            except PGPError:
2628
 
                # If decryption fails, we use secret from new settings
2629
 
                logger.debug("Failed to decrypt {0} old secret"
2630
 
                             .format(client_name))
2631
 
                client["secret"] = (
2632
 
                    client_settings[client_name]["secret"])
2633
 
    
2634
 
    # Add/remove clients based on new changes made to config
2635
 
    for client_name in (set(old_client_settings)
2636
 
                        - set(client_settings)):
2637
 
        del clients_data[client_name]
2638
 
    for client_name in (set(client_settings)
2639
 
                        - set(old_client_settings)):
2640
 
        clients_data[client_name] = client_settings[client_name]
2641
 
    
2642
 
    # Create all client objects
2643
 
    for client_name, client in clients_data.iteritems():
2644
 
        tcp_server.clients[client_name] = client_class(
2645
 
            name = client_name, settings = client,
2646
 
            server_settings = server_settings)
 
2173
                # For each value in new config, check if it differs
 
2174
                # from the old config value (Except for the "secret"
 
2175
                # attribute)
 
2176
                if (name != "secret" and
 
2177
                    value != old_client_settings[client_name][name]):
 
2178
                    setattr(client, name, value)
 
2179
            except KeyError:
 
2180
                pass
 
2181
 
 
2182
        # Clients who has passed its expire date, can still be enabled
 
2183
        # if its last checker was sucessful. Clients who checkers
 
2184
        # failed before we stored it state is asumed to had failed
 
2185
        # checker during downtime.
 
2186
        if client["enabled"] and client["last_checked_ok"]:
 
2187
            if ((datetime.datetime.utcnow()
 
2188
                 - client["last_checked_ok"]) > client["interval"]):
 
2189
                if client["last_checker_status"] != 0:
 
2190
                    client["enabled"] = False
 
2191
                else:
 
2192
                    client["expires"] = (datetime.datetime.utcnow()
 
2193
                                         + client["timeout"])
 
2194
 
 
2195
        client["changedstate"] = (multiprocessing_manager
 
2196
                                  .Condition(multiprocessing_manager
 
2197
                                             .Lock()))
 
2198
        if use_dbus:
 
2199
            new_client = ClientDBusTransitional.__new__(
 
2200
                ClientDBusTransitional)
 
2201
            tcp_server.clients[client_name] = new_client
 
2202
            new_client.bus = bus
 
2203
            for name, value in client.iteritems():
 
2204
                setattr(new_client, name, value)
 
2205
            new_client._approvals_pending = 0
 
2206
            new_client.add_to_dbus()
 
2207
        else:
 
2208
            tcp_server.clients[client_name] = Client.__new__(Client)
 
2209
            for name, value in client.iteritems():
 
2210
                setattr(tcp_server.clients[client_name], name, value)
 
2211
                
 
2212
        tcp_server.clients[client_name].decrypt_secret(
 
2213
            client_settings[client_name]["secret"])            
 
2214
        
 
2215
    # Create/remove clients based on new changes made to config
 
2216
    for clientname in set(old_client_settings) - set(client_settings):
 
2217
        del tcp_server.clients[clientname]
 
2218
    for clientname in set(client_settings) - set(old_client_settings):
 
2219
        tcp_server.clients[clientname] = client_class(name
 
2220
                                                      = clientname,
 
2221
                                                      config =
 
2222
                                                      client_settings
 
2223
                                                      [clientname])
2647
2224
    
2648
2225
    if not tcp_server.clients:
2649
2226
        logger.warning("No clients defined")
2650
 
    
2651
 
    if not foreground:
2652
 
        if pidfile is not None:
2653
 
            try:
2654
 
                with pidfile:
2655
 
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2657
 
            except IOError:
2658
 
                logger.error("Could not write to file %r with PID %d",
2659
 
                             pidfilename, pid)
2660
 
        del pidfile
 
2227
        
 
2228
    if not debug:
 
2229
        try:
 
2230
            with pidfile:
 
2231
                pid = os.getpid()
 
2232
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2233
            del pidfile
 
2234
        except IOError:
 
2235
            logger.error("Could not write to file %r with PID %d",
 
2236
                         pidfilename, pid)
 
2237
        except NameError:
 
2238
            # "pidfile" was never created
 
2239
            pass
2661
2240
        del pidfilename
 
2241
        
 
2242
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2662
2243
    
2663
2244
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
2245
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2246
    
2666
2247
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
2669
 
        class MandosDBusService(DBusObjectWithProperties):
 
2248
        class MandosDBusService(dbus.service.Object):
2670
2249
            """A D-Bus proxy object"""
2671
2250
            def __init__(self):
2672
2251
                dbus.service.Object.__init__(self, bus, "/")
2673
2252
            _interface = "se.recompile.Mandos"
2674
2253
            
2675
 
            @dbus_interface_annotations(_interface)
2676
 
            def _foo(self):
2677
 
                return { "org.freedesktop.DBus.Property"
2678
 
                         ".EmitsChangedSignal":
2679
 
                             "false"}
2680
 
            
2681
2254
            @dbus.service.signal(_interface, signature="o")
2682
2255
            def ClientAdded(self, objpath):
2683
2256
                "D-Bus signal"
2725
2298
            
2726
2299
            del _interface
2727
2300
        
2728
 
        mandos_dbus_service = MandosDBusService()
 
2301
        class MandosDBusServiceTransitional(MandosDBusService):
 
2302
            __metaclass__ = AlternateDBusNamesMetaclass
 
2303
        mandos_dbus_service = MandosDBusServiceTransitional()
2729
2304
    
2730
2305
    def cleanup():
2731
2306
        "Cleanup function; run on exit"
2732
2307
        service.cleanup()
2733
2308
        
2734
2309
        multiprocessing.active_children()
2735
 
        wnull.close()
2736
2310
        if not (tcp_server.clients or client_settings):
2737
2311
            return
2738
 
        
 
2312
 
2739
2313
        # Store client before exiting. Secrets are encrypted with key
2740
2314
        # based on what config file has. If config file is
2741
2315
        # removed/edited, old secret will thus be unrecovable.
2742
 
        clients = {}
2743
 
        with PGPEngine() as pgp:
2744
 
            for client in tcp_server.clients.itervalues():
2745
 
                key = client_settings[client.name]["secret"]
2746
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2747
 
                                                      key)
2748
 
                client_dict = {}
2749
 
                
2750
 
                # A list of attributes that can not be pickled
2751
 
                # + secret.
2752
 
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
2754
 
                for name, typ in (inspect.getmembers
2755
 
                                  (dbus.service.Object)):
2756
 
                    exclude.add(name)
2757
 
                
2758
 
                client_dict["encrypted_secret"] = (client
2759
 
                                                   .encrypted_secret)
2760
 
                for attr in client.client_structure:
2761
 
                    if attr not in exclude:
2762
 
                        client_dict[attr] = getattr(client, attr)
2763
 
                
2764
 
                clients[client.name] = client_dict
2765
 
                del client_settings[client.name]["secret"]
2766
 
        
 
2316
        clients = []
 
2317
        for client in tcp_server.clients.itervalues():
 
2318
            client.encrypt_secret(
 
2319
                client_settings[client.name]["secret"])
 
2320
 
 
2321
            client_dict = {}
 
2322
 
 
2323
            # A list of attributes that will not be stored when
 
2324
            # shutting down.
 
2325
            exclude = set(("bus", "changedstate", "secret"))
 
2326
            for name, typ in inspect.getmembers(dbus.service.Object):
 
2327
                exclude.add(name)
 
2328
                
 
2329
            client_dict["encrypted_secret"] = client.encrypted_secret
 
2330
            for attr in client.client_structure:
 
2331
                if attr not in exclude:
 
2332
                    client_dict[attr] = getattr(client, attr)
 
2333
 
 
2334
            clients.append(client_dict) 
 
2335
            del client_settings[client.name]["secret"]
 
2336
            
2767
2337
        try:
2768
 
            with (tempfile.NamedTemporaryFile
2769
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2770
 
                   dir=os.path.dirname(stored_state_path),
2771
 
                   delete=False)) as stored_state:
 
2338
            with os.fdopen(os.open(stored_state_path,
 
2339
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2340
                                   stat.S_IRUSR | stat.S_IWUSR),
 
2341
                           "wb") as stored_state:
2772
2342
                pickle.dump((clients, client_settings), stored_state)
2773
 
                tempname=stored_state.name
2774
 
            os.rename(tempname, stored_state_path)
2775
 
        except (IOError, OSError) as e:
2776
 
            if not debug:
2777
 
                try:
2778
 
                    os.remove(tempname)
2779
 
                except NameError:
2780
 
                    pass
2781
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
 
                logger.warning("Could not save persistent state: {0}"
2783
 
                               .format(os.strerror(e.errno)))
2784
 
            else:
2785
 
                logger.warning("Could not save persistent state:",
2786
 
                               exc_info=e)
2787
 
                raise e
2788
 
        
 
2343
        except IOError as e:
 
2344
            logger.warning("Could not save persistant state: {0}"
 
2345
                           .format(e))
 
2346
            if e.errno != errno.ENOENT:
 
2347
                raise
 
2348
 
2789
2349
        # Delete all clients, and settings from config
2790
2350
        while tcp_server.clients:
2791
2351
            name, client = tcp_server.clients.popitem()
2809
2369
        # Need to initiate checking of clients
2810
2370
        if client.enabled:
2811
2371
            client.init_checker()
 
2372
 
2812
2373
    
2813
2374
    tcp_server.enable()
2814
2375
    tcp_server.server_activate()
2817
2378
    service.port = tcp_server.socket.getsockname()[1]
2818
2379
    if use_ipv6:
2819
2380
        logger.info("Now listening on address %r, port %d,"
2820
 
                    " flowinfo %d, scope_id %d",
2821
 
                    *tcp_server.socket.getsockname())
 
2381
                    " flowinfo %d, scope_id %d"
 
2382
                    % tcp_server.socket.getsockname())
2822
2383
    else:                       # IPv4
2823
 
        logger.info("Now listening on address %r, port %d",
2824
 
                    *tcp_server.socket.getsockname())
 
2384
        logger.info("Now listening on address %r, port %d"
 
2385
                    % tcp_server.socket.getsockname())
2825
2386
    
2826
2387
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2388
    
2830
2391
        try:
2831
2392
            service.activate()
2832
2393
        except dbus.exceptions.DBusException as error:
2833
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2394
            logger.critical("DBusException: %s", error)
2834
2395
            cleanup()
2835
2396
            sys.exit(1)
2836
2397
        # End of Avahi example code
2843
2404
        logger.debug("Starting main loop")
2844
2405
        main_loop.run()
2845
2406
    except AvahiError as error:
2846
 
        logger.critical("Avahi Error", exc_info=error)
 
2407
        logger.critical("AvahiError: %s", error)
2847
2408
        cleanup()
2848
2409
        sys.exit(1)
2849
2410
    except KeyboardInterrupt:
2854
2415
    # Must run before the D-Bus bus name gets deregistered
2855
2416
    cleanup()
2856
2417
 
 
2418
 
2857
2419
if __name__ == '__main__':
2858
2420
    main()