/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: Björn Påhlsson
  • Date: 2011-11-09 17:16:03 UTC
  • mfrom: (518.1.1 mandos-persistent)
  • Revision ID: belorn@fukt.bsnet.se-20111109171603-srz21uoclpldp5ve
merge persistent state

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
427
310
    interval:   datetime.timedelta(); How often to start a new checker
428
311
    last_approval_request: datetime.datetime(); (UTC) or None
429
312
    last_checked_ok: datetime.datetime(); (UTC) or None
430
 
    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
 
313
    last_checker_status: integer between 0 and 255 reflecting exit status
 
314
                         of last checker. -1 reflect crashed checker,
 
315
                         or None.
 
316
    last_enabled: datetime.datetime(); (UTC)
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()
564
 
                                 if not attr.startswith("_")]
 
401
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
565
402
        self.client_structure.append("client_structure")
566
 
        
 
403
 
 
404
 
567
405
        for name, t in inspect.getmembers(type(self),
568
 
                                          lambda obj:
569
 
                                              isinstance(obj,
570
 
                                                         property)):
 
406
                                          lambda obj: isinstance(obj, property)):
571
407
            if not name.startswith("_"):
572
408
                self.client_structure.append(name)
573
409
    
581
417
        if getattr(self, "enabled", False):
582
418
            # Already enabled
583
419
            return
 
420
        self.send_changedstate()
584
421
        self.expires = datetime.datetime.utcnow() + self.timeout
585
422
        self.enabled = True
586
423
        self.last_enabled = datetime.datetime.utcnow()
587
424
        self.init_checker()
588
 
        self.send_changedstate()
589
425
    
590
426
    def disable(self, quiet=True):
591
427
        """Disable this client."""
592
428
        if not getattr(self, "enabled", False):
593
429
            return False
594
430
        if not quiet:
 
431
            self.send_changedstate()
 
432
        if not quiet:
595
433
            logger.info("Disabling client %s", self.name)
596
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
434
        if getattr(self, "disable_initiator_tag", False):
597
435
            gobject.source_remove(self.disable_initiator_tag)
598
436
            self.disable_initiator_tag = None
599
437
        self.expires = None
600
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
438
        if getattr(self, "checker_initiator_tag", False):
601
439
            gobject.source_remove(self.checker_initiator_tag)
602
440
            self.checker_initiator_tag = None
603
441
        self.stop_checker()
604
442
        self.enabled = False
605
 
        if not quiet:
606
 
            self.send_changedstate()
607
443
        # Do not run this again if called by a gobject.timeout_add
608
444
        return False
609
445
    
610
446
    def __del__(self):
611
447
        self.disable()
612
 
    
 
448
 
613
449
    def init_checker(self):
614
450
        # Schedule a new checker to be started an 'interval' from now,
615
451
        # and every interval from then on.
616
 
        if self.checker_initiator_tag is not None:
617
 
            gobject.source_remove(self.checker_initiator_tag)
618
452
        self.checker_initiator_tag = (gobject.timeout_add
619
453
                                      (self.interval_milliseconds(),
620
454
                                       self.start_checker))
621
455
        # 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
456
        self.disable_initiator_tag = (gobject.timeout_add
625
457
                                   (self.timeout_milliseconds(),
626
458
                                    self.disable))
627
459
        # Also start a new checker *right now*.
628
460
        self.start_checker()
629
 
    
 
461
 
 
462
        
630
463
    def checker_callback(self, pid, condition, command):
631
464
        """The checker has completed, so take appropriate actions."""
632
465
        self.checker_callback_tag = None
633
466
        self.checker = None
634
467
        if os.WIFEXITED(condition):
635
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
468
            self.last_checker_status =  os.WEXITSTATUS(condition)
636
469
            if self.last_checker_status == 0:
637
470
                logger.info("Checker for %(name)s succeeded",
638
471
                            vars(self))
645
478
            logger.warning("Checker for %(name)s crashed?",
646
479
                           vars(self))
647
480
    
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."""
 
481
    def checked_ok(self, timeout=None):
 
482
        """Bump up the timeout for this client.
 
483
        
 
484
        This should only be called when the client has been seen,
 
485
        alive and well.
 
486
        """
656
487
        if timeout is None:
657
488
            timeout = self.timeout
 
489
        self.last_checked_ok = datetime.datetime.utcnow()
658
490
        if self.disable_initiator_tag is not None:
659
491
            gobject.source_remove(self.disable_initiator_tag)
660
 
            self.disable_initiator_tag = None
661
492
        if getattr(self, "enabled", False):
662
493
            self.disable_initiator_tag = (gobject.timeout_add
663
 
                                          (timedelta_to_milliseconds
 
494
                                          (_timedelta_to_milliseconds
664
495
                                           (timeout), self.disable))
665
496
            self.expires = datetime.datetime.utcnow() + timeout
666
497
    
673
504
        If a checker already exists, leave it running and do
674
505
        nothing."""
675
506
        # 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
 
507
        # did that, then if a checker (for some reason) started
 
508
        # running slowly and taking more than 'interval' time, the
 
509
        # client would inevitably timeout, since no checker would get
 
510
        # a chance to run to completion.  If we instead leave running
680
511
        # checkers alone, the checker would have to take more time
681
512
        # than 'timeout' for the client to be disabled, which is as it
682
513
        # should be.
696
527
                                      self.current_checker_command)
697
528
        # Start a new checker if needed
698
529
        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
530
            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
 
531
                # In case checker_command has exactly one % operator
 
532
                command = self.checker_command % self.host
 
533
            except TypeError:
 
534
                # Escape attributes for the shell
 
535
                escaped_attrs = dict(
 
536
                    (attr,
 
537
                     re.escape(unicode(str(getattr(self, attr, "")),
 
538
                                       errors=
 
539
                                       'replace')))
 
540
                    for attr in
 
541
                    self.runtime_expansions)
 
542
                
 
543
                try:
 
544
                    command = self.checker_command % escaped_attrs
 
545
                except TypeError as error:
 
546
                    logger.error('Could not format string "%s":'
 
547
                                 ' %s', self.checker_command, error)
 
548
                    return True # Try again later
710
549
            self.current_checker_command = command
711
550
            try:
712
551
                logger.info("Starting checker %r for %s",
715
554
                # in normal mode, that is already done by daemon(),
716
555
                # and in debug mode we don't want to.  (Stdin is
717
556
                # 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
557
                self.checker = subprocess.Popen(command,
727
558
                                                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:
 
559
                                                shell=True, cwd="/")
 
560
                self.checker_callback_tag = (gobject.child_watch_add
 
561
                                             (self.checker.pid,
 
562
                                              self.checker_callback,
 
563
                                              data=command))
 
564
                # The checker may have completed before the gobject
 
565
                # watch was added.  Check for this.
741
566
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
567
                if pid:
 
568
                    gobject.source_remove(self.checker_callback_tag)
 
569
                    self.checker_callback(pid, status, command)
742
570
            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)
 
571
                logger.error("Failed to start subprocess: %s",
 
572
                             error)
752
573
        # Re-run this periodically if run by gobject.timeout_add
753
574
        return True
754
575
    
761
582
            return
762
583
        logger.debug("Stopping checker for %(name)s", vars(self))
763
584
        try:
764
 
            self.checker.terminate()
 
585
            os.kill(self.checker.pid, signal.SIGTERM)
765
586
            #time.sleep(0.5)
766
587
            #if self.checker.poll() is None:
767
 
            #    self.checker.kill()
 
588
            #    os.kill(self.checker.pid, signal.SIGKILL)
768
589
        except OSError as error:
769
590
            if error.errno != errno.ESRCH: # No such process
770
591
                raise
771
592
        self.checker = None
772
593
 
 
594
    # Encrypts a client secret and stores it in a varible encrypted_secret
 
595
    def encrypt_secret(self, key):
 
596
        # Encryption-key need to be of a specific size, so we hash inputed key
 
597
        hasheng = hashlib.sha256()
 
598
        hasheng.update(key)
 
599
        encryptionkey = hasheng.digest()
 
600
 
 
601
        # Create validation hash so we know at decryption if it was sucessful
 
602
        hasheng = hashlib.sha256()
 
603
        hasheng.update(self.secret)
 
604
        validationhash = hasheng.digest()
 
605
 
 
606
        # Encrypt secret
 
607
        iv = os.urandom(Crypto.Cipher.AES.block_size)
 
608
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
609
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
610
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
 
611
        self.encrypted_secret = (ciphertext, iv)
 
612
 
 
613
    # Decrypt a encrypted client secret
 
614
    def decrypt_secret(self, key):
 
615
        # Decryption-key need to be of a specific size, so we hash inputed key
 
616
        hasheng = hashlib.sha256()
 
617
        hasheng.update(key)
 
618
        encryptionkey = hasheng.digest()
 
619
 
 
620
        # Decrypt encrypted secret
 
621
        ciphertext, iv = self.encrypted_secret
 
622
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
623
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
624
        plain = ciphereng.decrypt(ciphertext)
 
625
 
 
626
        # Validate decrypted secret to know if it was succesful
 
627
        hasheng = hashlib.sha256()
 
628
        validationhash = plain[:hasheng.digest_size]
 
629
        secret = plain[hasheng.digest_size:]
 
630
        hasheng.update(secret)
 
631
 
 
632
        # if validation fails, we use key as new secret. Otherwhise, we use
 
633
        # the decrypted secret
 
634
        if hasheng.digest() == validationhash:
 
635
            self.secret = secret
 
636
        else:
 
637
            self.secret = key
 
638
        del self.encrypted_secret
 
639
 
773
640
 
774
641
def dbus_service_property(dbus_interface, signature="v",
775
642
                          access="readwrite", byte_arrays=False):
787
654
    # "Set" method, so we fail early here:
788
655
    if byte_arrays and signature != "ay":
789
656
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
657
                         " signature %r" % signature)
791
658
    def decorator(func):
792
659
        func._dbus_is_property = True
793
660
        func._dbus_interface = dbus_interface
801
668
    return decorator
802
669
 
803
670
 
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
671
class DBusPropertyException(dbus.exceptions.DBusException):
842
672
    """A base class for D-Bus property-related exceptions
843
673
    """
866
696
    """
867
697
    
868
698
    @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)
 
699
    def _is_dbus_property(obj):
 
700
        return getattr(obj, "_dbus_is_property", False)
877
701
    
878
 
    def _get_all_dbus_things(self, thing):
 
702
    def _get_all_dbus_properties(self):
879
703
        """Returns a generator of (name, attribute) pairs
880
704
        """
881
 
        return ((getattr(athing.__get__(self), "_dbus_name",
882
 
                         name),
883
 
                 athing.__get__(self))
 
705
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
706
                for cls in self.__class__.__mro__
885
 
                for name, athing in
886
 
                inspect.getmembers(cls,
887
 
                                   self._is_dbus_thing(thing)))
 
707
                for name, prop in
 
708
                inspect.getmembers(cls, self._is_dbus_property))
888
709
    
889
710
    def _get_dbus_property(self, interface_name, property_name):
890
711
        """Returns a bound method if one exists which is a D-Bus
892
713
        """
893
714
        for cls in  self.__class__.__mro__:
894
715
            for name, value in (inspect.getmembers
895
 
                                (cls,
896
 
                                 self._is_dbus_thing("property"))):
 
716
                                (cls, self._is_dbus_property)):
897
717
                if (value._dbus_name == property_name
898
718
                    and value._dbus_interface == interface_name):
899
719
                    return value.__get__(self)
928
748
            # signatures other than "ay".
929
749
            if prop._dbus_signature != "ay":
930
750
                raise ValueError
931
 
            value = dbus.ByteArray(b''.join(chr(byte)
932
 
                                            for byte in value))
 
751
            value = dbus.ByteArray(''.join(unichr(byte)
 
752
                                           for byte in value))
933
753
        prop(value)
934
754
    
935
755
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
940
760
        
941
761
        Note: Will not include properties with access="write".
942
762
        """
943
 
        properties = {}
944
 
        for name, prop in self._get_all_dbus_things("property"):
 
763
        all = {}
 
764
        for name, prop in self._get_all_dbus_properties():
945
765
            if (interface_name
946
766
                and interface_name != prop._dbus_interface):
947
767
                # Interface non-empty but did not match
951
771
                continue
952
772
            value = prop()
953
773
            if not hasattr(value, "variant_level"):
954
 
                properties[name] = value
 
774
                all[name] = value
955
775
                continue
956
 
            properties[name] = type(value)(value, variant_level=
957
 
                                           value.variant_level+1)
958
 
        return dbus.Dictionary(properties, signature="sv")
 
776
            all[name] = type(value)(value, variant_level=
 
777
                                    value.variant_level+1)
 
778
        return dbus.Dictionary(all, signature="sv")
959
779
    
960
780
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
961
781
                         out_signature="s",
962
782
                         path_keyword='object_path',
963
783
                         connection_keyword='connection')
964
784
    def Introspect(self, object_path, connection):
965
 
        """Overloading of standard D-Bus method.
966
 
        
967
 
        Inserts property tags and interface annotation tags.
 
785
        """Standard D-Bus method, overloaded to insert property tags.
968
786
        """
969
787
        xmlstring = dbus.service.Object.Introspect(self, object_path,
970
788
                                                   connection)
977
795
                e.setAttribute("access", prop._dbus_access)
978
796
                return e
979
797
            for if_tag in document.getElementsByTagName("interface"):
980
 
                # Add property tags
981
798
                for tag in (make_tag(document, name, prop)
982
799
                            for name, prop
983
 
                            in self._get_all_dbus_things("property")
 
800
                            in self._get_all_dbus_properties()
984
801
                            if prop._dbus_interface
985
802
                            == if_tag.getAttribute("name")):
986
803
                    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
804
                # Add the names to the return values for the
1019
805
                # "org.freedesktop.DBus.Properties" methods
1020
806
                if (if_tag.getAttribute("name")
1035
821
        except (AttributeError, xml.dom.DOMException,
1036
822
                xml.parsers.expat.ExpatError) as error:
1037
823
            logger.error("Failed to override Introspection method",
1038
 
                         exc_info=error)
 
824
                         error)
1039
825
        return xmlstring
1040
826
 
1041
827
 
1042
 
def datetime_to_dbus(dt, variant_level=0):
 
828
def datetime_to_dbus (dt, variant_level=0):
1043
829
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
830
    if dt is None:
1045
831
        return dbus.String("", variant_level = variant_level)
1046
832
    return dbus.String(dt.isoformat(),
1047
833
                       variant_level=variant_level)
1048
834
 
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).
 
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
836
                                  .__metaclass__):
 
837
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
838
    will add additional D-Bus attributes matching a certain pattern.
1072
839
    """
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):
 
840
    def __new__(mcs, name, bases, attr):
 
841
        # Go through all the base classes which could have D-Bus
 
842
        # methods, signals, or properties in them
 
843
        for base in (b for b in bases
 
844
                     if issubclass(b, dbus.service.Object)):
 
845
            # Go though all attributes of the base class
 
846
            for attrname, attribute in inspect.getmembers(base):
1080
847
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
848
                # with the wrong interface name
1082
849
                if (not hasattr(attribute, "_dbus_interface")
1083
850
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
851
                    .startswith("se.recompile.Mandos")):
1085
852
                    continue
1086
853
                # Create an alternate D-Bus interface name based on
1087
854
                # the current name
1088
855
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
1091
 
                interface_names.add(alt_interface)
 
856
                                 .replace("se.recompile.Mandos",
 
857
                                          "se.bsnet.fukt.Mandos"))
1092
858
                # Is this a D-Bus signal?
1093
859
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
 
860
                    # Extract the original non-method function by
 
861
                    # black magic
1096
862
                    nonmethod_func = (dict(
1097
863
                            zip(attribute.func_code.co_freevars,
1098
864
                                attribute.__closure__))["func"]
1109
875
                                nonmethod_func.func_name,
1110
876
                                nonmethod_func.func_defaults,
1111
877
                                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
878
                    # 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
 
879
                    # old and new functions, so both the old and new
 
880
                    # signals gets sent when the function is called
1122
881
                    def fixscope(func1, func2):
1123
882
                        """This function is a scope container to pass
1124
883
                        func1 and func2 to the "call_both" function
1131
890
                        return call_both
1132
891
                    # Create the "call_both" function and add it to
1133
892
                    # the class
1134
 
                    attr[attrname] = fixscope(attribute, new_function)
 
893
                    attr[attrname] = fixscope(attribute,
 
894
                                              new_function)
1135
895
                # Is this a D-Bus method?
1136
896
                elif getattr(attribute, "_dbus_is_method", False):
1137
897
                    # Create a new, but exactly alike, function
1148
908
                                        attribute.func_name,
1149
909
                                        attribute.func_defaults,
1150
910
                                        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
911
                # Is this a D-Bus property?
1158
912
                elif getattr(attribute, "_dbus_is_property", False):
1159
913
                    # Create a new, but exactly alike, function
1173
927
                                        attribute.func_name,
1174
928
                                        attribute.func_defaults,
1175
929
                                        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"})
 
930
        return type.__new__(mcs, name, bases, attr)
 
931
 
1221
932
class ClientDBus(Client, DBusObjectWithProperties):
1222
933
    """A Client class using D-Bus
1223
934
    
1234
945
    def __init__(self, bus = None, *args, **kwargs):
1235
946
        self.bus = bus
1236
947
        Client.__init__(self, *args, **kwargs)
 
948
 
 
949
        self._approvals_pending = 0
1237
950
        # Only now, when this client is initialized, can it show up on
1238
951
        # the D-Bus
1239
952
        client_object_name = unicode(self.name).translate(
1243
956
                                 ("/clients/" + client_object_name))
1244
957
        DBusObjectWithProperties.__init__(self, self.bus,
1245
958
                                          self.dbus_object_path)
1246
 
    
 
959
        
1247
960
    def notifychangeproperty(transform_func,
1248
961
                             dbus_name, type_func=lambda x: x,
1249
962
                             variant_level=1):
1250
963
        """ Modify a variable so that it's a property which announces
1251
964
        its changes to DBus.
1252
 
        
 
965
 
1253
966
        transform_fun: Function that takes a value and a variant_level
1254
967
                       and transforms it to a D-Bus type.
1255
968
        dbus_name: D-Bus name of the variable
1272
985
        
1273
986
        return property(lambda self: getattr(self, attrname), setter)
1274
987
    
 
988
    
1275
989
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1276
990
    approvals_pending = notifychangeproperty(dbus.Boolean,
1277
991
                                             "ApprovalPending",
1284
998
                                       checker is not None)
1285
999
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
1000
                                           "LastCheckedOK")
1287
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1288
 
                                               "LastCheckerStatus")
1289
1001
    last_approval_request = notifychangeproperty(
1290
1002
        datetime_to_dbus, "LastApprovalRequest")
1291
1003
    approved_by_default = notifychangeproperty(dbus.Boolean,
1292
1004
                                               "ApprovedByDefault")
1293
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1005
    approval_delay = notifychangeproperty(dbus.UInt16,
1294
1006
                                          "ApprovalDelay",
1295
1007
                                          type_func =
1296
 
                                          timedelta_to_milliseconds)
 
1008
                                          _timedelta_to_milliseconds)
1297
1009
    approval_duration = notifychangeproperty(
1298
 
        dbus.UInt64, "ApprovalDuration",
1299
 
        type_func = timedelta_to_milliseconds)
 
1010
        dbus.UInt16, "ApprovalDuration",
 
1011
        type_func = _timedelta_to_milliseconds)
1300
1012
    host = notifychangeproperty(dbus.String, "Host")
1301
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1013
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1302
1014
                                   type_func =
1303
 
                                   timedelta_to_milliseconds)
 
1015
                                   _timedelta_to_milliseconds)
1304
1016
    extended_timeout = notifychangeproperty(
1305
 
        dbus.UInt64, "ExtendedTimeout",
1306
 
        type_func = timedelta_to_milliseconds)
1307
 
    interval = notifychangeproperty(dbus.UInt64,
 
1017
        dbus.UInt16, "ExtendedTimeout",
 
1018
        type_func = _timedelta_to_milliseconds)
 
1019
    interval = notifychangeproperty(dbus.UInt16,
1308
1020
                                    "Interval",
1309
1021
                                    type_func =
1310
 
                                    timedelta_to_milliseconds)
 
1022
                                    _timedelta_to_milliseconds)
1311
1023
    checker_command = notifychangeproperty(dbus.String, "Checker")
1312
1024
    
1313
1025
    del notifychangeproperty
1355
1067
        return r
1356
1068
    
1357
1069
    def _reset_approved(self):
1358
 
        self.approved = None
 
1070
        self._approved = None
1359
1071
        return False
1360
1072
    
1361
1073
    def approve(self, value=True):
1362
 
        self.approved = value
1363
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1074
        self.send_changedstate()
 
1075
        self._approved = value
 
1076
        gobject.timeout_add(_timedelta_to_milliseconds
1364
1077
                            (self.approval_duration),
1365
1078
                            self._reset_approved)
1366
 
        self.send_changedstate()
 
1079
    
1367
1080
    
1368
1081
    ## D-Bus methods, signals & properties
1369
1082
    _interface = "se.recompile.Mandos.Client"
1370
1083
    
1371
 
    ## Interfaces
1372
 
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1084
    ## Signals
1379
1085
    
1380
1086
    # CheckerCompleted - signal
1479
1185
                           access="readwrite")
1480
1186
    def ApprovalDuration_dbus_property(self, value=None):
1481
1187
        if value is None:       # get
1482
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1188
            return dbus.UInt64(_timedelta_to_milliseconds(
1483
1189
                    self.approval_duration))
1484
1190
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1485
1191
    
1499
1205
    def Host_dbus_property(self, value=None):
1500
1206
        if value is None:       # get
1501
1207
            return dbus.String(self.host)
1502
 
        self.host = unicode(value)
 
1208
        self.host = value
1503
1209
    
1504
1210
    # Created - property
1505
1211
    @dbus_service_property(_interface, signature="s", access="read")
1506
1212
    def Created_dbus_property(self):
1507
 
        return datetime_to_dbus(self.created)
 
1213
        return dbus.String(datetime_to_dbus(self.created))
1508
1214
    
1509
1215
    # LastEnabled - property
1510
1216
    @dbus_service_property(_interface, signature="s", access="read")
1531
1237
            return
1532
1238
        return datetime_to_dbus(self.last_checked_ok)
1533
1239
    
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
1240
    # Expires - property
1541
1241
    @dbus_service_property(_interface, signature="s", access="read")
1542
1242
    def Expires_dbus_property(self):
1553
1253
    def Timeout_dbus_property(self, value=None):
1554
1254
        if value is None:       # get
1555
1255
            return dbus.UInt64(self.timeout_milliseconds())
1556
 
        old_timeout = self.timeout
1557
1256
        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))
 
1257
        if getattr(self, "disable_initiator_tag", None) is None:
 
1258
            return
 
1259
        # Reschedule timeout
 
1260
        gobject.source_remove(self.disable_initiator_tag)
 
1261
        self.disable_initiator_tag = None
 
1262
        self.expires = None
 
1263
        time_to_die = _timedelta_to_milliseconds((self
 
1264
                                                  .last_checked_ok
 
1265
                                                  + self.timeout)
 
1266
                                                 - datetime.datetime
 
1267
                                                 .utcnow())
 
1268
        if time_to_die <= 0:
 
1269
            # The timeout has passed
 
1270
            self.disable()
 
1271
        else:
 
1272
            self.expires = (datetime.datetime.utcnow()
 
1273
                            + datetime.timedelta(milliseconds =
 
1274
                                                 time_to_die))
 
1275
            self.disable_initiator_tag = (gobject.timeout_add
 
1276
                                          (time_to_die, self.disable))
1574
1277
    
1575
1278
    # ExtendedTimeout - property
1576
1279
    @dbus_service_property(_interface, signature="t",
1589
1292
        self.interval = datetime.timedelta(0, 0, 0, value)
1590
1293
        if getattr(self, "checker_initiator_tag", None) is None:
1591
1294
            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
 
1295
        # Reschedule checker run
 
1296
        gobject.source_remove(self.checker_initiator_tag)
 
1297
        self.checker_initiator_tag = (gobject.timeout_add
 
1298
                                      (value, self.start_checker))
 
1299
        self.start_checker()    # Start one now, too
1598
1300
    
1599
1301
    # Checker - property
1600
1302
    @dbus_service_property(_interface, signature="s",
1602
1304
    def Checker_dbus_property(self, value=None):
1603
1305
        if value is None:       # get
1604
1306
            return dbus.String(self.checker_command)
1605
 
        self.checker_command = unicode(value)
 
1307
        self.checker_command = value
1606
1308
    
1607
1309
    # CheckerRunning - property
1608
1310
    @dbus_service_property(_interface, signature="b",
1637
1339
            raise KeyError()
1638
1340
    
1639
1341
    def __getattribute__(self, name):
1640
 
        if name == '_pipe':
 
1342
        if(name == '_pipe'):
1641
1343
            return super(ProxyClient, self).__getattribute__(name)
1642
1344
        self._pipe.send(('getattr', name))
1643
1345
        data = self._pipe.recv()
1650
1352
            return func
1651
1353
    
1652
1354
    def __setattr__(self, name, value):
1653
 
        if name == '_pipe':
 
1355
        if(name == '_pipe'):
1654
1356
            return super(ProxyClient, self).__setattr__(name, value)
1655
1357
        self._pipe.send(('setattr', name, value))
1656
1358
 
 
1359
class ClientDBusTransitional(ClientDBus):
 
1360
    __metaclass__ = AlternateDBusNamesMetaclass
1657
1361
 
1658
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
1363
    """A class to handle client connections.
1742
1446
                            client.Rejected("Disabled")
1743
1447
                        return
1744
1448
                    
1745
 
                    if client.approved or not client.approval_delay:
 
1449
                    if client._approved or not client.approval_delay:
1746
1450
                        #We are approved or approval is disabled
1747
1451
                        break
1748
 
                    elif client.approved is None:
 
1452
                    elif client._approved is None:
1749
1453
                        logger.info("Client %s needs approval",
1750
1454
                                    client.name)
1751
1455
                        if self.server.use_dbus:
1764
1468
                    #wait until timeout or approved
1765
1469
                    time = datetime.datetime.now()
1766
1470
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1471
                    (client.changedstate.wait
 
1472
                     (float(client._timedelta_to_milliseconds(delay)
 
1473
                            / 1000)))
1770
1474
                    client.changedstate.release()
1771
1475
                    time2 = datetime.datetime.now()
1772
1476
                    if (time2 - time) >= delay:
1788
1492
                    try:
1789
1493
                        sent = session.send(client.secret[sent_size:])
1790
1494
                    except gnutls.errors.GNUTLSError as error:
1791
 
                        logger.warning("gnutls send failed",
1792
 
                                       exc_info=error)
 
1495
                        logger.warning("gnutls send failed")
1793
1496
                        return
1794
1497
                    logger.debug("Sent: %d, remaining: %d",
1795
1498
                                 sent, len(client.secret)
1798
1501
                
1799
1502
                logger.info("Sending secret to %s", client.name)
1800
1503
                # bump the timeout using extended_timeout
1801
 
                client.bump_timeout(client.extended_timeout)
 
1504
                client.checked_ok(client.extended_timeout)
1802
1505
                if self.server.use_dbus:
1803
1506
                    # Emit D-Bus signal
1804
1507
                    client.GotSecret()
1809
1512
                try:
1810
1513
                    session.bye()
1811
1514
                except gnutls.errors.GNUTLSError as error:
1812
 
                    logger.warning("GnuTLS bye failed",
1813
 
                                   exc_info=error)
 
1515
                    logger.warning("GnuTLS bye failed")
1814
1516
    
1815
1517
    @staticmethod
1816
1518
    def peer_certificate(session):
1872
1574
        # Convert the buffer to a Python bytestring
1873
1575
        fpr = ctypes.string_at(buf, buf_len.value)
1874
1576
        # Convert the bytestring to hexadecimal notation
1875
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1577
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1876
1578
        return hex_fpr
1877
1579
 
1878
1580
 
1881
1583
    def sub_process_main(self, request, address):
1882
1584
        try:
1883
1585
            self.finish_request(request, address)
1884
 
        except Exception:
 
1586
        except:
1885
1587
            self.handle_error(request, address)
1886
1588
        self.close_request(request)
1887
1589
    
1888
1590
    def process_request(self, request, address):
1889
1591
        """Start a new process to process the request."""
1890
1592
        proc = multiprocessing.Process(target = self.sub_process_main,
1891
 
                                       args = (request, address))
 
1593
                                       args = (request,
 
1594
                                               address))
1892
1595
        proc.start()
1893
1596
        return proc
1894
1597
 
1922
1625
        use_ipv6:       Boolean; to use IPv6 or not
1923
1626
    """
1924
1627
    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
 
        """
 
1628
                 interface=None, use_ipv6=True):
1929
1629
        self.interface = interface
1930
1630
        if use_ipv6:
1931
1631
            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
1632
        socketserver.TCPServer.__init__(self, server_address,
1959
1633
                                        RequestHandlerClass)
1960
 
    
1961
1634
    def server_bind(self):
1962
1635
        """This overrides the normal server_bind() function
1963
1636
        to bind to an interface if one was specified, and also NOT to
1971
1644
                try:
1972
1645
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1646
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1647
                                           str(self.interface
 
1648
                                               + '\0'))
1975
1649
                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:
 
1650
                    if error[0] == errno.EPERM:
 
1651
                        logger.error("No permission to"
 
1652
                                     " bind to interface %s",
 
1653
                                     self.interface)
 
1654
                    elif error[0] == errno.ENOPROTOOPT:
1980
1655
                        logger.error("SO_BINDTODEVICE not available;"
1981
1656
                                     " cannot bind to interface %s",
1982
1657
                                     self.interface)
1983
 
                    elif error.errno == errno.ENODEV:
1984
 
                        logger.error("Interface %s does not exist,"
1985
 
                                     " cannot bind", self.interface)
1986
1658
                    else:
1987
1659
                        raise
1988
1660
        # Only bind(2) the socket if we really need to.
1991
1663
                if self.address_family == socket.AF_INET6:
1992
1664
                    any_address = "::" # in6addr_any
1993
1665
                else:
1994
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1666
                    any_address = socket.INADDR_ANY
1995
1667
                self.server_address = (any_address,
1996
1668
                                       self.server_address[1])
1997
1669
            elif not self.server_address[1]:
2018
1690
    """
2019
1691
    def __init__(self, server_address, RequestHandlerClass,
2020
1692
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1693
                 gnutls_priority=None, use_dbus=True):
2022
1694
        self.enabled = False
2023
1695
        self.clients = clients
2024
1696
        if self.clients is None:
2028
1700
        IPv6_TCPServer.__init__(self, server_address,
2029
1701
                                RequestHandlerClass,
2030
1702
                                interface = interface,
2031
 
                                use_ipv6 = use_ipv6,
2032
 
                                socketfd = socketfd)
 
1703
                                use_ipv6 = use_ipv6)
2033
1704
    def server_activate(self):
2034
1705
        if self.enabled:
2035
1706
            return socketserver.TCPServer.server_activate(self)
2048
1719
    
2049
1720
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
1721
                   proc = None, client_object=None):
 
1722
        condition_names = {
 
1723
            gobject.IO_IN: "IN",   # There is data to read.
 
1724
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1725
                                    # blocking).
 
1726
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1727
            gobject.IO_ERR: "ERR", # Error condition.
 
1728
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1729
                                    # broken, usually for pipes and
 
1730
                                    # sockets).
 
1731
            }
 
1732
        conditions_string = ' | '.join(name
 
1733
                                       for cond, name in
 
1734
                                       condition_names.iteritems()
 
1735
                                       if cond & condition)
2051
1736
        # error, or the other end of multiprocessing.Pipe has closed
2052
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1737
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2053
1738
            # Wait for other process to exit
2054
1739
            proc.join()
2055
1740
            return False
2113
1798
        return True
2114
1799
 
2115
1800
 
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
1801
def string_to_delta(interval):
2216
1802
    """Parse a string and return a datetime.timedelta
2217
1803
    
2228
1814
    >>> string_to_delta('5m 30s')
2229
1815
    datetime.timedelta(0, 330)
2230
1816
    """
2231
 
    
2232
 
    try:
2233
 
        return rfc3339_duration_to_delta(interval)
2234
 
    except ValueError:
2235
 
        pass
2236
 
    
2237
1817
    timevalue = datetime.timedelta(0)
2238
1818
    for s in interval.split():
2239
1819
        try:
2250
1830
            elif suffix == "w":
2251
1831
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
1832
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
2254
 
                                 .format(suffix))
 
1833
                raise ValueError("Unknown suffix %r" % suffix)
2255
1834
        except (ValueError, IndexError) as e:
2256
1835
            raise ValueError(*(e.args))
2257
1836
        timevalue += delta
2258
1837
    return timevalue
2259
1838
 
2260
1839
 
 
1840
def if_nametoindex(interface):
 
1841
    """Call the C function if_nametoindex(), or equivalent
 
1842
    
 
1843
    Note: This function cannot accept a unicode string."""
 
1844
    global if_nametoindex
 
1845
    try:
 
1846
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1847
                          (ctypes.util.find_library("c"))
 
1848
                          .if_nametoindex)
 
1849
    except (OSError, AttributeError):
 
1850
        logger.warning("Doing if_nametoindex the hard way")
 
1851
        def if_nametoindex(interface):
 
1852
            "Get an interface index the hard way, i.e. using fcntl()"
 
1853
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1854
            with contextlib.closing(socket.socket()) as s:
 
1855
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1856
                                    struct.pack(str("16s16x"),
 
1857
                                                interface))
 
1858
            interface_index = struct.unpack(str("I"),
 
1859
                                            ifreq[16:20])[0]
 
1860
            return interface_index
 
1861
    return if_nametoindex(interface)
 
1862
 
 
1863
 
2261
1864
def daemon(nochdir = False, noclose = False):
2262
1865
    """See daemon(3).  Standard BSD Unix function.
2263
1866
    
2271
1874
        sys.exit()
2272
1875
    if not noclose:
2273
1876
        # Close all standard open file descriptors
2274
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1877
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2275
1878
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
1879
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
2278
 
                          .format(os.devnull))
 
1880
                          "%s not a character device"
 
1881
                          % os.path.devnull)
2279
1882
        os.dup2(null, sys.stdin.fileno())
2280
1883
        os.dup2(null, sys.stdout.fileno())
2281
1884
        os.dup2(null, sys.stderr.fileno())
2290
1893
    
2291
1894
    parser = argparse.ArgumentParser()
2292
1895
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
1896
                        version = "%%(prog)s %s" % version,
2294
1897
                        help="show version number and exit")
2295
1898
    parser.add_argument("-i", "--interface", metavar="IF",
2296
1899
                        help="Bind to interface IF")
2302
1905
                        help="Run self-test")
2303
1906
    parser.add_argument("--debug", action="store_true",
2304
1907
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal", default=None)
 
1908
                        " to terminal")
2306
1909
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
1910
                        help="Debug level for stdout output")
2308
1911
    parser.add_argument("--priority", help="GnuTLS"
2315
1918
                        " files")
2316
1919
    parser.add_argument("--no-dbus", action="store_false",
2317
1920
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface", default=None)
 
1921
                        " system bus interface")
2319
1922
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6",
2321
 
                        default=None)
 
1923
                        dest="use_ipv6", help="Do not use IPv6")
2322
1924
    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
 
    
 
1925
                        dest="restore", help="Do not restore stored state",
 
1926
                        default=True)
 
1927
 
2333
1928
    options = parser.parse_args()
2334
1929
    
2335
1930
    if options.check:
2343
1938
                        "port": "",
2344
1939
                        "debug": "False",
2345
1940
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
1941
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2347
1942
                        "servicename": "Mandos",
2348
1943
                        "use_dbus": "True",
2349
1944
                        "use_ipv6": "True",
2350
1945
                        "debuglevel": "",
2351
 
                        "restore": "True",
2352
 
                        "socket": "",
2353
 
                        "statedir": "/var/lib/mandos",
2354
 
                        "foreground": "False",
2355
1946
                        }
2356
1947
    
2357
1948
    # Parse config file for server-global settings
2362
1953
    # Convert the SafeConfigParser object to a dict
2363
1954
    server_settings = server_config.defaults()
2364
1955
    # Use the appropriate methods on the non-string config options
2365
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1956
    for option in ("debug", "use_dbus", "use_ipv6"):
2366
1957
        server_settings[option] = server_config.getboolean("DEFAULT",
2367
1958
                                                           option)
2368
1959
    if server_settings["port"]:
2369
1960
        server_settings["port"] = server_config.getint("DEFAULT",
2370
1961
                                                       "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
1962
    del server_config
2381
1963
    
2382
1964
    # Override the settings from the config file with command line
2383
1965
    # options, if set.
2384
1966
    for option in ("interface", "address", "port", "debug",
2385
1967
                   "priority", "servicename", "configdir",
2386
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
1968
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
2388
1969
        value = getattr(options, option)
2389
1970
        if value is not None:
2390
1971
            server_settings[option] = value
2393
1974
    for option in server_settings.keys():
2394
1975
        if type(server_settings[option]) is str:
2395
1976
            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
1977
    # Now we have our good server settings in "server_settings"
2404
1978
    
2405
1979
    ##################################################################
2409
1983
    debuglevel = server_settings["debuglevel"]
2410
1984
    use_dbus = server_settings["use_dbus"]
2411
1985
    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
1986
    
2425
1987
    if server_settings["servicename"] != "Mandos":
2426
1988
        syslogger.setFormatter(logging.Formatter
2427
 
                               ('Mandos ({0}) [%(process)d]:'
2428
 
                                ' %(levelname)s: %(message)s'
2429
 
                                .format(server_settings
2430
 
                                        ["servicename"])))
 
1989
                               ('Mandos (%s) [%%(process)d]:'
 
1990
                                ' %%(levelname)s: %%(message)s'
 
1991
                                % server_settings["servicename"]))
2431
1992
    
2432
1993
    # Parse config file with clients
2433
 
    client_config = configparser.SafeConfigParser(Client
2434
 
                                                  .client_defaults)
 
1994
    client_defaults = { "timeout": "5m",
 
1995
                        "extended_timeout": "15m",
 
1996
                        "interval": "2m",
 
1997
                        "checker": "fping -q -- %%(host)s",
 
1998
                        "host": "",
 
1999
                        "approval_delay": "0s",
 
2000
                        "approval_duration": "1s",
 
2001
                        }
 
2002
    client_config = configparser.SafeConfigParser(client_defaults)
2435
2003
    client_config.read(os.path.join(server_settings["configdir"],
2436
2004
                                    "clients.conf"))
2437
2005
    
2446
2014
                              use_ipv6=use_ipv6,
2447
2015
                              gnutls_priority=
2448
2016
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
2452
 
    if not foreground:
 
2017
                              use_dbus=use_dbus)
 
2018
    if not debug:
2453
2019
        pidfilename = "/var/run/mandos.pid"
2454
 
        pidfile = None
2455
2020
        try:
2456
2021
            pidfile = open(pidfilename, "w")
2457
 
        except IOError as e:
2458
 
            logger.error("Could not open file %r", pidfilename,
2459
 
                         exc_info=e)
 
2022
        except IOError:
 
2023
            logger.error("Could not open file %r", pidfilename)
2460
2024
    
2461
 
    for name in ("_mandos", "mandos", "nobody"):
 
2025
    try:
 
2026
        uid = pwd.getpwnam("_mandos").pw_uid
 
2027
        gid = pwd.getpwnam("_mandos").pw_gid
 
2028
    except KeyError:
2462
2029
        try:
2463
 
            uid = pwd.getpwnam(name).pw_uid
2464
 
            gid = pwd.getpwnam(name).pw_gid
2465
 
            break
 
2030
            uid = pwd.getpwnam("mandos").pw_uid
 
2031
            gid = pwd.getpwnam("mandos").pw_gid
2466
2032
        except KeyError:
2467
 
            continue
2468
 
    else:
2469
 
        uid = 65534
2470
 
        gid = 65534
 
2033
            try:
 
2034
                uid = pwd.getpwnam("nobody").pw_uid
 
2035
                gid = pwd.getpwnam("nobody").pw_gid
 
2036
            except KeyError:
 
2037
                uid = 65534
 
2038
                gid = 65534
2471
2039
    try:
2472
2040
        os.setgid(gid)
2473
2041
        os.setuid(uid)
2474
2042
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
 
2043
        if error[0] != errno.EPERM:
2476
2044
            raise error
2477
2045
    
 
2046
    if not debug and not debuglevel:
 
2047
        logger.setLevel(logging.WARNING)
 
2048
    if debuglevel:
 
2049
        level = getattr(logging, debuglevel.upper())
 
2050
        logger.setLevel(level)
 
2051
    
2478
2052
    if debug:
 
2053
        logger.setLevel(logging.DEBUG)
2479
2054
        # Enable all possible GnuTLS debugging
2480
2055
        
2481
2056
        # "Use a log level over 10 to enable all debugging options."
2490
2065
         .gnutls_global_set_log_function(debug_gnutls))
2491
2066
        
2492
2067
        # Redirect stdin so all checkers get /dev/null
2493
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2068
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
2069
        os.dup2(null, sys.stdin.fileno())
2495
2070
        if null > 2:
2496
2071
            os.close(null)
 
2072
    else:
 
2073
        # No console logging
 
2074
        logger.removeHandler(console)
2497
2075
    
2498
2076
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2077
    if not debug:
2500
2078
        # Close all input and output, do double fork, etc.
2501
2079
        daemon()
2502
2080
    
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
2081
    global main_loop
2508
2082
    # From the Avahi example code
2509
 
    DBusGMainLoop(set_as_default=True)
 
2083
    DBusGMainLoop(set_as_default=True )
2510
2084
    main_loop = gobject.MainLoop()
2511
2085
    bus = dbus.SystemBus()
2512
2086
    # End of Avahi example code
2518
2092
                            ("se.bsnet.fukt.Mandos", bus,
2519
2093
                             do_not_queue=True))
2520
2094
        except dbus.exceptions.NameExistsException as e:
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2095
            logger.error(unicode(e) + ", disabling D-Bus")
2522
2096
            use_dbus = False
2523
2097
            server_settings["use_dbus"] = False
2524
2098
            tcp_server.use_dbus = False
2536
2110
    
2537
2111
    client_class = Client
2538
2112
    if use_dbus:
2539
 
        client_class = functools.partial(ClientDBus, bus = bus)
2540
 
    
2541
 
    client_settings = Client.config_parser(client_config)
 
2113
        client_class = functools.partial(ClientDBusTransitional,
 
2114
                                         bus = bus)
 
2115
    
 
2116
    special_settings = {
 
2117
        # Some settings need to be accessd by special methods;
 
2118
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2119
        "approved_by_default":
 
2120
            lambda section:
 
2121
            client_config.getboolean(section, "approved_by_default"),
 
2122
        }
 
2123
    # Construct a new dict of client settings of this form:
 
2124
    # { client_name: {setting_name: value, ...}, ...}
 
2125
    # with exceptions for any special settings as defined above
 
2126
    client_settings = dict((clientname,
 
2127
                           dict((setting,
 
2128
                                 (value if setting not in special_settings
 
2129
                                  else special_settings[setting](clientname)))
 
2130
                                for setting, value in client_config.items(clientname)))
 
2131
                          for clientname in client_config.sections())
 
2132
    
2542
2133
    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.
 
2134
    clients_data = []
 
2135
 
 
2136
    # Get client data and settings from last running state. 
2554
2137
    if server_settings["restore"]:
2555
2138
        try:
2556
2139
            with open(stored_state_path, "rb") as stored_state:
2557
 
                clients_data, old_client_settings = (pickle.load
2558
 
                                                     (stored_state))
 
2140
                clients_data, old_client_settings = pickle.load(stored_state)
2559
2141
            os.remove(stored_state_path)
2560
2142
        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)
 
2143
            logger.warning("Could not load persistant state: {0}".format(e))
 
2144
            if e.errno != errno.ENOENT:
2567
2145
                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))
 
2146
 
 
2147
    for client in clients_data:
 
2148
        client_name = client["name"]
 
2149
        
 
2150
        # Decide which value to use after restoring saved state.
 
2151
        # We have three different values: Old config file,
 
2152
        # new config file, and saved state.
 
2153
        # New config value takes precedence if it differs from old
 
2154
        # config value, otherwise use saved state.
 
2155
        for name, value in client_settings[client_name].items():
2622
2156
            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)
2647
 
    
 
2157
                # For each value in new config, check if it differs
 
2158
                # from the old config value (Except for the "secret"
 
2159
                # attribute)
 
2160
                if name != "secret" and value != old_client_settings[client_name][name]:
 
2161
                    setattr(client, name, value)
 
2162
            except KeyError:
 
2163
                pass
 
2164
 
 
2165
        # Clients who has passed its expire date, can still be enabled if its
 
2166
        # last checker was sucessful. Clients who checkers failed before we
 
2167
        # stored it state is asumed to had failed checker during downtime.
 
2168
        if client["enabled"] and client["last_checked_ok"]:
 
2169
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
 
2170
                > client["interval"]):
 
2171
                if client["last_checker_status"] != 0:
 
2172
                    client["enabled"] = False
 
2173
                else:
 
2174
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
 
2175
 
 
2176
        client["changedstate"] = (multiprocessing_manager
 
2177
                                  .Condition(multiprocessing_manager
 
2178
                                             .Lock()))
 
2179
        if use_dbus:
 
2180
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
 
2181
            tcp_server.clients[client_name] = new_client
 
2182
            new_client.bus = bus
 
2183
            for name, value in client.iteritems():
 
2184
                setattr(new_client, name, value)
 
2185
            client_object_name = unicode(client_name).translate(
 
2186
                {ord("."): ord("_"),
 
2187
                 ord("-"): ord("_")})
 
2188
            new_client.dbus_object_path = (dbus.ObjectPath
 
2189
                                     ("/clients/" + client_object_name))
 
2190
            DBusObjectWithProperties.__init__(new_client,
 
2191
                                              new_client.bus,
 
2192
                                              new_client.dbus_object_path)
 
2193
        else:
 
2194
            tcp_server.clients[client_name] = Client.__new__(Client)
 
2195
            for name, value in client.iteritems():
 
2196
                setattr(tcp_server.clients[client_name], name, value)
 
2197
                
 
2198
        tcp_server.clients[client_name].decrypt_secret(
 
2199
            client_settings[client_name]["secret"])            
 
2200
        
 
2201
    # Create/remove clients based on new changes made to config
 
2202
    for clientname in set(old_client_settings) - set(client_settings):
 
2203
        del tcp_server.clients[clientname]
 
2204
    for clientname in set(client_settings) - set(old_client_settings):
 
2205
        tcp_server.clients[clientname] = (client_class(name = clientname,
 
2206
                                                       config =
 
2207
                                                       client_settings
 
2208
                                                       [clientname]))
 
2209
    
 
2210
 
2648
2211
    if not tcp_server.clients:
2649
2212
        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
 
2213
        
 
2214
    if not debug:
 
2215
        try:
 
2216
            with pidfile:
 
2217
                pid = os.getpid()
 
2218
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2219
            del pidfile
 
2220
        except IOError:
 
2221
            logger.error("Could not write to file %r with PID %d",
 
2222
                         pidfilename, pid)
 
2223
        except NameError:
 
2224
            # "pidfile" was never created
 
2225
            pass
2661
2226
        del pidfilename
 
2227
        
 
2228
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2662
2229
    
2663
2230
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
2231
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2232
    
2666
2233
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
2669
 
        class MandosDBusService(DBusObjectWithProperties):
 
2234
        class MandosDBusService(dbus.service.Object):
2670
2235
            """A D-Bus proxy object"""
2671
2236
            def __init__(self):
2672
2237
                dbus.service.Object.__init__(self, bus, "/")
2673
2238
            _interface = "se.recompile.Mandos"
2674
2239
            
2675
 
            @dbus_interface_annotations(_interface)
2676
 
            def _foo(self):
2677
 
                return { "org.freedesktop.DBus.Property"
2678
 
                         ".EmitsChangedSignal":
2679
 
                             "false"}
2680
 
            
2681
2240
            @dbus.service.signal(_interface, signature="o")
2682
2241
            def ClientAdded(self, objpath):
2683
2242
                "D-Bus signal"
2725
2284
            
2726
2285
            del _interface
2727
2286
        
2728
 
        mandos_dbus_service = MandosDBusService()
 
2287
        class MandosDBusServiceTransitional(MandosDBusService):
 
2288
            __metaclass__ = AlternateDBusNamesMetaclass
 
2289
        mandos_dbus_service = MandosDBusServiceTransitional()
2729
2290
    
2730
2291
    def cleanup():
2731
2292
        "Cleanup function; run on exit"
2732
2293
        service.cleanup()
2733
2294
        
2734
2295
        multiprocessing.active_children()
2735
 
        wnull.close()
2736
2296
        if not (tcp_server.clients or client_settings):
2737
2297
            return
2738
 
        
2739
 
        # Store client before exiting. Secrets are encrypted with key
2740
 
        # based on what config file has. If config file is
2741
 
        # 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
 
        
 
2298
 
 
2299
        # Store client before exiting. Secrets are encrypted with key based
 
2300
        # on what config file has. If config file is removed/edited, old
 
2301
        # secret will thus be unrecovable.
 
2302
        clients = []
 
2303
        for client in tcp_server.clients.itervalues():
 
2304
            client.encrypt_secret(client_settings[client.name]["secret"])
 
2305
 
 
2306
            client_dict = {}
 
2307
 
 
2308
            # A list of attributes that will not be stored when shuting down.
 
2309
            exclude = set(("bus", "changedstate", "secret"))            
 
2310
            for name, typ in inspect.getmembers(dbus.service.Object):
 
2311
                exclude.add(name)
 
2312
                
 
2313
            client_dict["encrypted_secret"] = client.encrypted_secret
 
2314
            for attr in client.client_structure:
 
2315
                if attr not in exclude:
 
2316
                    client_dict[attr] = getattr(client, attr)
 
2317
 
 
2318
            clients.append(client_dict) 
 
2319
            del client_settings[client.name]["secret"]
 
2320
            
2767
2321
        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:
 
2322
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2772
2323
                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
 
        
 
2324
        except IOError as e:
 
2325
            logger.warning("Could not save persistant state: {0}".format(e))
 
2326
            if e.errno != errno.ENOENT:
 
2327
                raise
 
2328
 
2789
2329
        # Delete all clients, and settings from config
2790
2330
        while tcp_server.clients:
2791
2331
            name, client = tcp_server.clients.popitem()
2809
2349
        # Need to initiate checking of clients
2810
2350
        if client.enabled:
2811
2351
            client.init_checker()
 
2352
 
2812
2353
    
2813
2354
    tcp_server.enable()
2814
2355
    tcp_server.server_activate()
2817
2358
    service.port = tcp_server.socket.getsockname()[1]
2818
2359
    if use_ipv6:
2819
2360
        logger.info("Now listening on address %r, port %d,"
2820
 
                    " flowinfo %d, scope_id %d",
2821
 
                    *tcp_server.socket.getsockname())
 
2361
                    " flowinfo %d, scope_id %d"
 
2362
                    % tcp_server.socket.getsockname())
2822
2363
    else:                       # IPv4
2823
 
        logger.info("Now listening on address %r, port %d",
2824
 
                    *tcp_server.socket.getsockname())
 
2364
        logger.info("Now listening on address %r, port %d"
 
2365
                    % tcp_server.socket.getsockname())
2825
2366
    
2826
2367
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2368
    
2830
2371
        try:
2831
2372
            service.activate()
2832
2373
        except dbus.exceptions.DBusException as error:
2833
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2374
            logger.critical("DBusException: %s", error)
2834
2375
            cleanup()
2835
2376
            sys.exit(1)
2836
2377
        # End of Avahi example code
2843
2384
        logger.debug("Starting main loop")
2844
2385
        main_loop.run()
2845
2386
    except AvahiError as error:
2846
 
        logger.critical("Avahi Error", exc_info=error)
 
2387
        logger.critical("AvahiError: %s", error)
2847
2388
        cleanup()
2848
2389
        sys.exit(1)
2849
2390
    except KeyboardInterrupt:
2854
2395
    # Must run before the D-Bus bus name gets deregistered
2855
2396
    cleanup()
2856
2397
 
 
2398
 
2857
2399
if __name__ == '__main__':
2858
2400
    main()