/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

merge

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-2013 Teddy Hogeborn
15
 
# Copyright © 2008-2013 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.1"
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
 
        encoded = b"mandos" + binascii.hexlify(password)
176
 
        if len(encoded) > 2048:
177
 
            # GnuPG can't handle long passwords, so encode differently
178
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
 
                       .replace(b"\n", b"\\n")
180
 
                       .replace(b"\0", b"\\x00"))
181
 
        return encoded
182
 
    
183
 
    def encrypt(self, data, password):
184
 
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
187
 
            passfile.write(passphrase)
188
 
            passfile.flush()
189
 
            proc = subprocess.Popen(['gpg', '--symmetric',
190
 
                                     '--passphrase-file',
191
 
                                     passfile.name]
192
 
                                    + self.gnupgargs,
193
 
                                    stdin = subprocess.PIPE,
194
 
                                    stdout = subprocess.PIPE,
195
 
                                    stderr = subprocess.PIPE)
196
 
            ciphertext, err = proc.communicate(input = data)
197
 
        if proc.returncode != 0:
198
 
            raise PGPError(err)
199
 
        return ciphertext
200
 
    
201
 
    def decrypt(self, data, password):
202
 
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
205
 
            passfile.write(passphrase)
206
 
            passfile.flush()
207
 
            proc = subprocess.Popen(['gpg', '--decrypt',
208
 
                                     '--passphrase-file',
209
 
                                     passfile.name]
210
 
                                    + self.gnupgargs,
211
 
                                    stdin = subprocess.PIPE,
212
 
                                    stdout = subprocess.PIPE,
213
 
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
216
 
        if proc.returncode != 0:
217
 
            raise PGPError(err)
218
 
        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)
219
107
 
220
108
 
221
109
class AvahiError(Exception):
240
128
               Used to optionally bind to the specified interface.
241
129
    name: string; Example: 'Mandos'
242
130
    type: string; Example: '_mandos._tcp'.
243
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
131
                  See <http://www.dns-sd.org/ServiceTypes.html>
244
132
    port: integer; what port to announce
245
133
    TXT: list of strings; TXT record for the service
246
134
    domain: string; Domain to publish on, default to .local if empty.
252
140
    server: D-Bus Server
253
141
    bus: dbus.SystemBus()
254
142
    """
255
 
    
256
143
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
144
                 servicetype = None, port = None, TXT = None,
258
145
                 domain = "", host = "", max_renames = 32768,
271
158
        self.server = None
272
159
        self.bus = bus
273
160
        self.entry_group_state_changed_match = None
274
 
    
275
161
    def rename(self):
276
162
        """Derived from the Avahi example code"""
277
163
        if self.rename_count >= self.max_renames:
287
173
        try:
288
174
            self.add()
289
175
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
 
176
            logger.critical("DBusException: %s", error)
291
177
            self.cleanup()
292
178
            os._exit(1)
293
179
        self.rename_count += 1
294
 
    
295
180
    def remove(self):
296
181
        """Derived from the Avahi example code"""
297
182
        if self.entry_group_state_changed_match is not None:
299
184
            self.entry_group_state_changed_match = None
300
185
        if self.group is not None:
301
186
            self.group.Reset()
302
 
    
303
187
    def add(self):
304
188
        """Derived from the Avahi example code"""
305
189
        self.remove()
322
206
            dbus.UInt16(self.port),
323
207
            avahi.string_array_to_txt_array(self.TXT))
324
208
        self.group.Commit()
325
 
    
326
209
    def entry_group_state_changed(self, state, error):
327
210
        """Derived from the Avahi example code"""
328
211
        logger.debug("Avahi entry group state change: %i", state)
335
218
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
219
            logger.critical("Avahi: Error in group state changed %s",
337
220
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {0!s}"
339
 
                                  .format(error))
340
 
    
 
221
            raise AvahiGroupError("State changed: %s"
 
222
                                  % unicode(error))
341
223
    def cleanup(self):
342
224
        """Derived from the Avahi example code"""
343
225
        if self.group is not None:
344
226
            try:
345
227
                self.group.Free()
346
228
            except (dbus.exceptions.UnknownMethodException,
347
 
                    dbus.exceptions.DBusException):
 
229
                    dbus.exceptions.DBusException) as e:
348
230
                pass
349
231
            self.group = None
350
232
        self.remove()
351
 
    
352
233
    def server_state_changed(self, state, error=None):
353
234
        """Derived from the Avahi example code"""
354
235
        logger.debug("Avahi server state change: %i", state)
373
254
                logger.debug("Unknown state: %r", state)
374
255
            else:
375
256
                logger.debug("Unknown state: %r: %r", state, error)
376
 
    
377
257
    def activate(self):
378
258
        """Derived from the Avahi example code"""
379
259
        if self.server is None:
386
266
                                 self.server_state_changed)
387
267
        self.server_state_changed(self.server.GetState())
388
268
 
389
 
 
390
269
class AvahiServiceToSyslog(AvahiService):
391
270
    def rename(self):
392
271
        """Add the new name to the syslog messages"""
393
272
        ret = AvahiService.rename(self)
394
273
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({0}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
274
                               ('Mandos (%s) [%%(process)d]:'
 
275
                                ' %%(levelname)s: %%(message)s'
 
276
                                % self.name))
398
277
        return ret
399
278
 
400
 
 
401
 
def timedelta_to_milliseconds(td):
 
279
def _timedelta_to_milliseconds(td):
402
280
    "Convert a datetime.timedelta() to milliseconds"
403
281
    return ((td.days * 24 * 60 * 60 * 1000)
404
282
            + (td.seconds * 1000)
405
283
            + (td.microseconds // 1000))
406
 
 
407
 
 
 
284
        
408
285
class Client(object):
409
286
    """A representation of a client host served by this server.
410
287
    
411
288
    Attributes:
412
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
289
    _approved:   bool(); 'None' if not yet approved/disapproved
413
290
    approval_delay: datetime.timedelta(); Time to wait for approval
414
291
    approval_duration: datetime.timedelta(); Duration of one approval
415
292
    checker:    subprocess.Popen(); a running checker process used
433
310
    interval:   datetime.timedelta(); How often to start a new checker
434
311
    last_approval_request: datetime.datetime(); (UTC) or None
435
312
    last_checked_ok: datetime.datetime(); (UTC) or None
436
 
    last_checker_status: integer between 0 and 255 reflecting exit
437
 
                         status of last checker. -1 reflects crashed
438
 
                         checker, -2 means no checker completed yet.
439
 
    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)
440
317
    name:       string; from the config file, used in log messages and
441
318
                        D-Bus identifiers
442
319
    secret:     bytestring; sent verbatim (over TLS) to client
443
320
    timeout:    datetime.timedelta(); How long from last_checked_ok
444
321
                                      until this client is disabled
445
 
    extended_timeout:   extra long timeout when secret has been sent
 
322
    extended_timeout:   extra long timeout when password has been sent
446
323
    runtime_expansions: Allowed attributes for runtime expansion.
447
324
    expires:    datetime.datetime(); time (UTC) when a client will be
448
325
                disabled, or None
449
 
    server_settings: The server_settings dict from main()
450
326
    """
451
327
    
452
328
    runtime_expansions = ("approval_delay", "approval_duration",
453
 
                          "created", "enabled", "expires",
454
 
                          "fingerprint", "host", "interval",
455
 
                          "last_approval_request", "last_checked_ok",
 
329
                          "created", "enabled", "fingerprint",
 
330
                          "host", "interval", "last_checked_ok",
456
331
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
460
 
                        "checker": "fping -q -- %%(host)s",
461
 
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
464
 
                        "approved_by_default": "True",
465
 
                        "enabled": "True",
466
 
                        }
467
332
    
468
333
    def timeout_milliseconds(self):
469
334
        "Return the 'timeout' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.timeout)
 
335
        return _timedelta_to_milliseconds(self.timeout)
471
336
    
472
337
    def extended_timeout_milliseconds(self):
473
338
        "Return the 'extended_timeout' attribute in milliseconds"
474
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
339
        return _timedelta_to_milliseconds(self.extended_timeout)
475
340
    
476
341
    def interval_milliseconds(self):
477
342
        "Return the 'interval' attribute in milliseconds"
478
 
        return timedelta_to_milliseconds(self.interval)
 
343
        return _timedelta_to_milliseconds(self.interval)
479
344
    
480
345
    def approval_delay_milliseconds(self):
481
 
        return timedelta_to_milliseconds(self.approval_delay)
482
 
    
483
 
    @staticmethod
484
 
    def config_parser(config):
485
 
        """Construct a new dict of client settings of this form:
486
 
        { client_name: {setting_name: value, ...}, ...}
487
 
        with exceptions for any special settings as defined above.
488
 
        NOTE: Must be a pure function. Must return the same result
489
 
        value given the same arguments.
490
 
        """
491
 
        settings = {}
492
 
        for client_name in config.sections():
493
 
            section = dict(config.items(client_name))
494
 
            client = settings[client_name] = {}
495
 
            
496
 
            client["host"] = section["host"]
497
 
            # Reformat values from string types to Python types
498
 
            client["approved_by_default"] = config.getboolean(
499
 
                client_name, "approved_by_default")
500
 
            client["enabled"] = config.getboolean(client_name,
501
 
                                                  "enabled")
502
 
            
503
 
            client["fingerprint"] = (section["fingerprint"].upper()
504
 
                                     .replace(" ", ""))
505
 
            if "secret" in section:
506
 
                client["secret"] = section["secret"].decode("base64")
507
 
            elif "secfile" in section:
508
 
                with open(os.path.expanduser(os.path.expandvars
509
 
                                             (section["secfile"])),
510
 
                          "rb") as secfile:
511
 
                    client["secret"] = secfile.read()
512
 
            else:
513
 
                raise TypeError("No secret or secfile for section {0}"
514
 
                                .format(section))
515
 
            client["timeout"] = string_to_delta(section["timeout"])
516
 
            client["extended_timeout"] = string_to_delta(
517
 
                section["extended_timeout"])
518
 
            client["interval"] = string_to_delta(section["interval"])
519
 
            client["approval_delay"] = string_to_delta(
520
 
                section["approval_delay"])
521
 
            client["approval_duration"] = string_to_delta(
522
 
                section["approval_duration"])
523
 
            client["checker_command"] = section["checker"]
524
 
            client["last_approval_request"] = None
525
 
            client["last_checked_ok"] = None
526
 
            client["last_checker_status"] = -2
527
 
        
528
 
        return settings
529
 
    
530
 
    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."""
531
352
        self.name = name
532
 
        if server_settings is None:
533
 
            server_settings = {}
534
 
        self.server_settings = server_settings
535
 
        # adding all client settings
536
 
        for setting, value in settings.iteritems():
537
 
            setattr(self, setting, value)
538
 
        
539
 
        if self.enabled:
540
 
            if not hasattr(self, "last_enabled"):
541
 
                self.last_enabled = datetime.datetime.utcnow()
542
 
            if not hasattr(self, "expires"):
543
 
                self.expires = (datetime.datetime.utcnow()
544
 
                                + self.timeout)
545
 
        else:
546
 
            self.last_enabled = None
547
 
            self.expires = None
548
 
        
 
353
        if config is None:
 
354
            config = {}
549
355
        logger.debug("Creating client %r", self.name)
550
356
        # Uppercase and remove spaces from fingerprint for later
551
357
        # comparison purposes with return value from the fingerprint()
552
358
        # function
 
359
        self.fingerprint = (config["fingerprint"].upper()
 
360
                            .replace(" ", ""))
553
361
        logger.debug("  Fingerprint: %s", self.fingerprint)
554
 
        self.created = settings.get("created",
555
 
                                    datetime.datetime.utcnow())
556
 
        
557
 
        # 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"])
558
383
        self.checker = None
559
384
        self.checker_initiator_tag = None
560
385
        self.disable_initiator_tag = None
 
386
        self.expires = datetime.datetime.utcnow() + self.timeout
561
387
        self.checker_callback_tag = None
 
388
        self.checker_command = config["checker"]
562
389
        self.current_checker_command = None
563
 
        self.approved = None
 
390
        self._approved = None
 
391
        self.approved_by_default = config.get("approved_by_default",
 
392
                                              True)
564
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"])
565
398
        self.changedstate = (multiprocessing_manager
566
399
                             .Condition(multiprocessing_manager
567
400
                                        .Lock()))
568
 
        self.client_structure = [attr for attr in
569
 
                                 self.__dict__.iterkeys()
570
 
                                 if not attr.startswith("_")]
 
401
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
571
402
        self.client_structure.append("client_structure")
572
 
        
 
403
 
 
404
 
573
405
        for name, t in inspect.getmembers(type(self),
574
 
                                          lambda obj:
575
 
                                              isinstance(obj,
576
 
                                                         property)):
 
406
                                          lambda obj: isinstance(obj, property)):
577
407
            if not name.startswith("_"):
578
408
                self.client_structure.append(name)
579
409
    
587
417
        if getattr(self, "enabled", False):
588
418
            # Already enabled
589
419
            return
 
420
        self.send_changedstate()
590
421
        self.expires = datetime.datetime.utcnow() + self.timeout
591
422
        self.enabled = True
592
423
        self.last_enabled = datetime.datetime.utcnow()
593
424
        self.init_checker()
594
 
        self.send_changedstate()
595
425
    
596
426
    def disable(self, quiet=True):
597
427
        """Disable this client."""
598
428
        if not getattr(self, "enabled", False):
599
429
            return False
600
430
        if not quiet:
 
431
            self.send_changedstate()
 
432
        if not quiet:
601
433
            logger.info("Disabling client %s", self.name)
602
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
434
        if getattr(self, "disable_initiator_tag", False):
603
435
            gobject.source_remove(self.disable_initiator_tag)
604
436
            self.disable_initiator_tag = None
605
437
        self.expires = None
606
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
438
        if getattr(self, "checker_initiator_tag", False):
607
439
            gobject.source_remove(self.checker_initiator_tag)
608
440
            self.checker_initiator_tag = None
609
441
        self.stop_checker()
610
442
        self.enabled = False
611
 
        if not quiet:
612
 
            self.send_changedstate()
613
443
        # Do not run this again if called by a gobject.timeout_add
614
444
        return False
615
445
    
616
446
    def __del__(self):
617
447
        self.disable()
618
 
    
 
448
 
619
449
    def init_checker(self):
620
450
        # Schedule a new checker to be started an 'interval' from now,
621
451
        # and every interval from then on.
622
 
        if self.checker_initiator_tag is not None:
623
 
            gobject.source_remove(self.checker_initiator_tag)
624
452
        self.checker_initiator_tag = (gobject.timeout_add
625
453
                                      (self.interval_milliseconds(),
626
454
                                       self.start_checker))
627
455
        # Schedule a disable() when 'timeout' has passed
628
 
        if self.disable_initiator_tag is not None:
629
 
            gobject.source_remove(self.disable_initiator_tag)
630
456
        self.disable_initiator_tag = (gobject.timeout_add
631
457
                                   (self.timeout_milliseconds(),
632
458
                                    self.disable))
633
459
        # Also start a new checker *right now*.
634
460
        self.start_checker()
635
 
    
 
461
 
 
462
        
636
463
    def checker_callback(self, pid, condition, command):
637
464
        """The checker has completed, so take appropriate actions."""
638
465
        self.checker_callback_tag = None
639
466
        self.checker = None
640
467
        if os.WIFEXITED(condition):
641
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
468
            self.last_checker_status =  os.WEXITSTATUS(condition)
642
469
            if self.last_checker_status == 0:
643
470
                logger.info("Checker for %(name)s succeeded",
644
471
                            vars(self))
651
478
            logger.warning("Checker for %(name)s crashed?",
652
479
                           vars(self))
653
480
    
654
 
    def checked_ok(self):
655
 
        """Assert that the client has been seen, alive and well."""
656
 
        self.last_checked_ok = datetime.datetime.utcnow()
657
 
        self.last_checker_status = 0
658
 
        self.bump_timeout()
659
 
    
660
 
    def bump_timeout(self, timeout=None):
661
 
        """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
        """
662
487
        if timeout is None:
663
488
            timeout = self.timeout
 
489
        self.last_checked_ok = datetime.datetime.utcnow()
664
490
        if self.disable_initiator_tag is not None:
665
491
            gobject.source_remove(self.disable_initiator_tag)
666
 
            self.disable_initiator_tag = None
667
492
        if getattr(self, "enabled", False):
668
493
            self.disable_initiator_tag = (gobject.timeout_add
669
 
                                          (timedelta_to_milliseconds
 
494
                                          (_timedelta_to_milliseconds
670
495
                                           (timeout), self.disable))
671
496
            self.expires = datetime.datetime.utcnow() + timeout
672
497
    
679
504
        If a checker already exists, leave it running and do
680
505
        nothing."""
681
506
        # The reason for not killing a running checker is that if we
682
 
        # did that, and if a checker (for some reason) started running
683
 
        # slowly and taking more than 'interval' time, then the client
684
 
        # would inevitably timeout, since no checker would get a
685
 
        # 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
686
511
        # checkers alone, the checker would have to take more time
687
512
        # than 'timeout' for the client to be disabled, which is as it
688
513
        # should be.
702
527
                                      self.current_checker_command)
703
528
        # Start a new checker if needed
704
529
        if self.checker is None:
705
 
            # Escape attributes for the shell
706
 
            escaped_attrs = dict(
707
 
                (attr, re.escape(unicode(getattr(self, attr))))
708
 
                for attr in
709
 
                self.runtime_expansions)
710
530
            try:
711
 
                command = self.checker_command % escaped_attrs
712
 
            except TypeError as error:
713
 
                logger.error('Could not format string "%s"',
714
 
                             self.checker_command, exc_info=error)
715
 
                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
716
549
            self.current_checker_command = command
717
550
            try:
718
551
                logger.info("Starting checker %r for %s",
721
554
                # in normal mode, that is already done by daemon(),
722
555
                # and in debug mode we don't want to.  (Stdin is
723
556
                # always replaced by /dev/null.)
724
 
                # The exception is when not debugging but nevertheless
725
 
                # running in the foreground; use the previously
726
 
                # created wnull.
727
 
                popen_args = {}
728
 
                if (not self.server_settings["debug"]
729
 
                    and self.server_settings["foreground"]):
730
 
                    popen_args.update({"stdout": wnull,
731
 
                                       "stderr": wnull })
732
557
                self.checker = subprocess.Popen(command,
733
558
                                                close_fds=True,
734
 
                                                shell=True, cwd="/",
735
 
                                                **popen_args)
736
 
            except OSError as error:
737
 
                logger.error("Failed to start subprocess",
738
 
                             exc_info=error)
739
 
                return True
740
 
            self.checker_callback_tag = (gobject.child_watch_add
741
 
                                         (self.checker.pid,
742
 
                                          self.checker_callback,
743
 
                                          data=command))
744
 
            # The checker may have completed before the gobject
745
 
            # watch was added.  Check for this.
746
 
            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.
747
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)
748
570
            except OSError as error:
749
 
                if error.errno == errno.ECHILD:
750
 
                    # This should never happen
751
 
                    logger.error("Child process vanished",
752
 
                                 exc_info=error)
753
 
                    return True
754
 
                raise
755
 
            if pid:
756
 
                gobject.source_remove(self.checker_callback_tag)
757
 
                self.checker_callback(pid, status, command)
 
571
                logger.error("Failed to start subprocess: %s",
 
572
                             error)
758
573
        # Re-run this periodically if run by gobject.timeout_add
759
574
        return True
760
575
    
767
582
            return
768
583
        logger.debug("Stopping checker for %(name)s", vars(self))
769
584
        try:
770
 
            self.checker.terminate()
 
585
            os.kill(self.checker.pid, signal.SIGTERM)
771
586
            #time.sleep(0.5)
772
587
            #if self.checker.poll() is None:
773
 
            #    self.checker.kill()
 
588
            #    os.kill(self.checker.pid, signal.SIGKILL)
774
589
        except OSError as error:
775
590
            if error.errno != errno.ESRCH: # No such process
776
591
                raise
777
592
        self.checker = None
778
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
 
779
640
 
780
641
def dbus_service_property(dbus_interface, signature="v",
781
642
                          access="readwrite", byte_arrays=False):
793
654
    # "Set" method, so we fail early here:
794
655
    if byte_arrays and signature != "ay":
795
656
        raise ValueError("Byte arrays not supported for non-'ay'"
796
 
                         " signature {0!r}".format(signature))
 
657
                         " signature %r" % signature)
797
658
    def decorator(func):
798
659
        func._dbus_is_property = True
799
660
        func._dbus_interface = dbus_interface
807
668
    return decorator
808
669
 
809
670
 
810
 
def dbus_interface_annotations(dbus_interface):
811
 
    """Decorator for marking functions returning interface annotations
812
 
    
813
 
    Usage:
814
 
    
815
 
    @dbus_interface_annotations("org.example.Interface")
816
 
    def _foo(self):  # Function name does not matter
817
 
        return {"org.freedesktop.DBus.Deprecated": "true",
818
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
819
 
                    "false"}
820
 
    """
821
 
    def decorator(func):
822
 
        func._dbus_is_interface = True
823
 
        func._dbus_interface = dbus_interface
824
 
        func._dbus_name = dbus_interface
825
 
        return func
826
 
    return decorator
827
 
 
828
 
 
829
 
def dbus_annotations(annotations):
830
 
    """Decorator to annotate D-Bus methods, signals or properties
831
 
    Usage:
832
 
    
833
 
    @dbus_service_property("org.example.Interface", signature="b",
834
 
                           access="r")
835
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
 
                        "org.freedesktop.DBus.Property."
837
 
                        "EmitsChangedSignal": "false"})
838
 
    def Property_dbus_property(self):
839
 
        return dbus.Boolean(False)
840
 
    """
841
 
    def decorator(func):
842
 
        func._dbus_annotations = annotations
843
 
        return func
844
 
    return decorator
845
 
 
846
 
 
847
671
class DBusPropertyException(dbus.exceptions.DBusException):
848
672
    """A base class for D-Bus property-related exceptions
849
673
    """
872
696
    """
873
697
    
874
698
    @staticmethod
875
 
    def _is_dbus_thing(thing):
876
 
        """Returns a function testing if an attribute is a D-Bus thing
877
 
        
878
 
        If called like _is_dbus_thing("method") it returns a function
879
 
        suitable for use as predicate to inspect.getmembers().
880
 
        """
881
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
882
 
                                   False)
 
699
    def _is_dbus_property(obj):
 
700
        return getattr(obj, "_dbus_is_property", False)
883
701
    
884
 
    def _get_all_dbus_things(self, thing):
 
702
    def _get_all_dbus_properties(self):
885
703
        """Returns a generator of (name, attribute) pairs
886
704
        """
887
 
        return ((getattr(athing.__get__(self), "_dbus_name",
888
 
                         name),
889
 
                 athing.__get__(self))
 
705
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
890
706
                for cls in self.__class__.__mro__
891
 
                for name, athing in
892
 
                inspect.getmembers(cls,
893
 
                                   self._is_dbus_thing(thing)))
 
707
                for name, prop in
 
708
                inspect.getmembers(cls, self._is_dbus_property))
894
709
    
895
710
    def _get_dbus_property(self, interface_name, property_name):
896
711
        """Returns a bound method if one exists which is a D-Bus
898
713
        """
899
714
        for cls in  self.__class__.__mro__:
900
715
            for name, value in (inspect.getmembers
901
 
                                (cls,
902
 
                                 self._is_dbus_thing("property"))):
 
716
                                (cls, self._is_dbus_property)):
903
717
                if (value._dbus_name == property_name
904
718
                    and value._dbus_interface == interface_name):
905
719
                    return value.__get__(self)
934
748
            # signatures other than "ay".
935
749
            if prop._dbus_signature != "ay":
936
750
                raise ValueError
937
 
            value = dbus.ByteArray(b''.join(chr(byte)
938
 
                                            for byte in value))
 
751
            value = dbus.ByteArray(''.join(unichr(byte)
 
752
                                           for byte in value))
939
753
        prop(value)
940
754
    
941
755
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
946
760
        
947
761
        Note: Will not include properties with access="write".
948
762
        """
949
 
        properties = {}
950
 
        for name, prop in self._get_all_dbus_things("property"):
 
763
        all = {}
 
764
        for name, prop in self._get_all_dbus_properties():
951
765
            if (interface_name
952
766
                and interface_name != prop._dbus_interface):
953
767
                # Interface non-empty but did not match
957
771
                continue
958
772
            value = prop()
959
773
            if not hasattr(value, "variant_level"):
960
 
                properties[name] = value
 
774
                all[name] = value
961
775
                continue
962
 
            properties[name] = type(value)(value, variant_level=
963
 
                                           value.variant_level+1)
964
 
        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")
965
779
    
966
780
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
967
781
                         out_signature="s",
968
782
                         path_keyword='object_path',
969
783
                         connection_keyword='connection')
970
784
    def Introspect(self, object_path, connection):
971
 
        """Overloading of standard D-Bus method.
972
 
        
973
 
        Inserts property tags and interface annotation tags.
 
785
        """Standard D-Bus method, overloaded to insert property tags.
974
786
        """
975
787
        xmlstring = dbus.service.Object.Introspect(self, object_path,
976
788
                                                   connection)
983
795
                e.setAttribute("access", prop._dbus_access)
984
796
                return e
985
797
            for if_tag in document.getElementsByTagName("interface"):
986
 
                # Add property tags
987
798
                for tag in (make_tag(document, name, prop)
988
799
                            for name, prop
989
 
                            in self._get_all_dbus_things("property")
 
800
                            in self._get_all_dbus_properties()
990
801
                            if prop._dbus_interface
991
802
                            == if_tag.getAttribute("name")):
992
803
                    if_tag.appendChild(tag)
993
 
                # Add annotation tags
994
 
                for typ in ("method", "signal", "property"):
995
 
                    for tag in if_tag.getElementsByTagName(typ):
996
 
                        annots = dict()
997
 
                        for name, prop in (self.
998
 
                                           _get_all_dbus_things(typ)):
999
 
                            if (name == tag.getAttribute("name")
1000
 
                                and prop._dbus_interface
1001
 
                                == if_tag.getAttribute("name")):
1002
 
                                annots.update(getattr
1003
 
                                              (prop,
1004
 
                                               "_dbus_annotations",
1005
 
                                               {}))
1006
 
                        for name, value in annots.iteritems():
1007
 
                            ann_tag = document.createElement(
1008
 
                                "annotation")
1009
 
                            ann_tag.setAttribute("name", name)
1010
 
                            ann_tag.setAttribute("value", value)
1011
 
                            tag.appendChild(ann_tag)
1012
 
                # Add interface annotation tags
1013
 
                for annotation, value in dict(
1014
 
                    itertools.chain.from_iterable(
1015
 
                        annotations().iteritems()
1016
 
                        for name, annotations in
1017
 
                        self._get_all_dbus_things("interface")
1018
 
                        if name == if_tag.getAttribute("name")
1019
 
                        )).iteritems():
1020
 
                    ann_tag = document.createElement("annotation")
1021
 
                    ann_tag.setAttribute("name", annotation)
1022
 
                    ann_tag.setAttribute("value", value)
1023
 
                    if_tag.appendChild(ann_tag)
1024
804
                # Add the names to the return values for the
1025
805
                # "org.freedesktop.DBus.Properties" methods
1026
806
                if (if_tag.getAttribute("name")
1041
821
        except (AttributeError, xml.dom.DOMException,
1042
822
                xml.parsers.expat.ExpatError) as error:
1043
823
            logger.error("Failed to override Introspection method",
1044
 
                         exc_info=error)
 
824
                         error)
1045
825
        return xmlstring
1046
826
 
1047
827
 
1048
 
def datetime_to_dbus(dt, variant_level=0):
 
828
def datetime_to_dbus (dt, variant_level=0):
1049
829
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1050
830
    if dt is None:
1051
831
        return dbus.String("", variant_level = variant_level)
1052
832
    return dbus.String(dt.isoformat(),
1053
833
                       variant_level=variant_level)
1054
834
 
1055
 
 
1056
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
 
    """A class decorator; applied to a subclass of
1058
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1059
 
    interface names according to the "alt_interface_names" mapping.
1060
 
    Usage:
1061
 
    
1062
 
    @alternate_dbus_interfaces({"org.example.Interface":
1063
 
                                    "net.example.AlternateInterface"})
1064
 
    class SampleDBusObject(dbus.service.Object):
1065
 
        @dbus.service.method("org.example.Interface")
1066
 
        def SampleDBusMethod():
1067
 
            pass
1068
 
    
1069
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1070
 
    reachable via two interfaces: "org.example.Interface" and
1071
 
    "net.example.AlternateInterface", the latter of which will have
1072
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1073
 
    "true", unless "deprecate" is passed with a False value.
1074
 
    
1075
 
    This works for methods and signals, and also for D-Bus properties
1076
 
    (from DBusObjectWithProperties) and interfaces (from the
1077
 
    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.
1078
839
    """
1079
 
    def wrapper(cls):
1080
 
        for orig_interface_name, alt_interface_name in (
1081
 
            alt_interface_names.iteritems()):
1082
 
            attr = {}
1083
 
            interface_names = set()
1084
 
            # Go though all attributes of the class
1085
 
            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):
1086
847
                # Ignore non-D-Bus attributes, and D-Bus attributes
1087
848
                # with the wrong interface name
1088
849
                if (not hasattr(attribute, "_dbus_interface")
1089
850
                    or not attribute._dbus_interface
1090
 
                    .startswith(orig_interface_name)):
 
851
                    .startswith("se.recompile.Mandos")):
1091
852
                    continue
1092
853
                # Create an alternate D-Bus interface name based on
1093
854
                # the current name
1094
855
                alt_interface = (attribute._dbus_interface
1095
 
                                 .replace(orig_interface_name,
1096
 
                                          alt_interface_name))
1097
 
                interface_names.add(alt_interface)
 
856
                                 .replace("se.recompile.Mandos",
 
857
                                          "se.bsnet.fukt.Mandos"))
1098
858
                # Is this a D-Bus signal?
1099
859
                if getattr(attribute, "_dbus_is_signal", False):
1100
 
                    # Extract the original non-method undecorated
1101
 
                    # function by black magic
 
860
                    # Extract the original non-method function by
 
861
                    # black magic
1102
862
                    nonmethod_func = (dict(
1103
863
                            zip(attribute.func_code.co_freevars,
1104
864
                                attribute.__closure__))["func"]
1115
875
                                nonmethod_func.func_name,
1116
876
                                nonmethod_func.func_defaults,
1117
877
                                nonmethod_func.func_closure)))
1118
 
                    # Copy annotations, if any
1119
 
                    try:
1120
 
                        new_function._dbus_annotations = (
1121
 
                            dict(attribute._dbus_annotations))
1122
 
                    except AttributeError:
1123
 
                        pass
1124
878
                    # Define a creator of a function to call both the
1125
 
                    # original and alternate functions, so both the
1126
 
                    # original and alternate signals gets sent when
1127
 
                    # the function is called
 
879
                    # old and new functions, so both the old and new
 
880
                    # signals gets sent when the function is called
1128
881
                    def fixscope(func1, func2):
1129
882
                        """This function is a scope container to pass
1130
883
                        func1 and func2 to the "call_both" function
1137
890
                        return call_both
1138
891
                    # Create the "call_both" function and add it to
1139
892
                    # the class
1140
 
                    attr[attrname] = fixscope(attribute, new_function)
 
893
                    attr[attrname] = fixscope(attribute,
 
894
                                              new_function)
1141
895
                # Is this a D-Bus method?
1142
896
                elif getattr(attribute, "_dbus_is_method", False):
1143
897
                    # Create a new, but exactly alike, function
1154
908
                                        attribute.func_name,
1155
909
                                        attribute.func_defaults,
1156
910
                                        attribute.func_closure)))
1157
 
                    # Copy annotations, if any
1158
 
                    try:
1159
 
                        attr[attrname]._dbus_annotations = (
1160
 
                            dict(attribute._dbus_annotations))
1161
 
                    except AttributeError:
1162
 
                        pass
1163
911
                # Is this a D-Bus property?
1164
912
                elif getattr(attribute, "_dbus_is_property", False):
1165
913
                    # Create a new, but exactly alike, function
1179
927
                                        attribute.func_name,
1180
928
                                        attribute.func_defaults,
1181
929
                                        attribute.func_closure)))
1182
 
                    # Copy annotations, if any
1183
 
                    try:
1184
 
                        attr[attrname]._dbus_annotations = (
1185
 
                            dict(attribute._dbus_annotations))
1186
 
                    except AttributeError:
1187
 
                        pass
1188
 
                # Is this a D-Bus interface?
1189
 
                elif getattr(attribute, "_dbus_is_interface", False):
1190
 
                    # Create a new, but exactly alike, function
1191
 
                    # object.  Decorate it to be a new D-Bus interface
1192
 
                    # with the alternate D-Bus interface name.  Add it
1193
 
                    # to the class.
1194
 
                    attr[attrname] = (dbus_interface_annotations
1195
 
                                      (alt_interface)
1196
 
                                      (types.FunctionType
1197
 
                                       (attribute.func_code,
1198
 
                                        attribute.func_globals,
1199
 
                                        attribute.func_name,
1200
 
                                        attribute.func_defaults,
1201
 
                                        attribute.func_closure)))
1202
 
            if deprecate:
1203
 
                # Deprecate all alternate interfaces
1204
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1205
 
                for interface_name in interface_names:
1206
 
                    @dbus_interface_annotations(interface_name)
1207
 
                    def func(self):
1208
 
                        return { "org.freedesktop.DBus.Deprecated":
1209
 
                                     "true" }
1210
 
                    # Find an unused name
1211
 
                    for aname in (iname.format(i)
1212
 
                                  for i in itertools.count()):
1213
 
                        if aname not in attr:
1214
 
                            attr[aname] = func
1215
 
                            break
1216
 
            if interface_names:
1217
 
                # Replace the class with a new subclass of it with
1218
 
                # methods, signals, etc. as created above.
1219
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1220
 
                           (cls,), attr)
1221
 
        return cls
1222
 
    return wrapper
1223
 
 
1224
 
 
1225
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
 
                                "se.bsnet.fukt.Mandos"})
 
930
        return type.__new__(mcs, name, bases, attr)
 
931
 
1227
932
class ClientDBus(Client, DBusObjectWithProperties):
1228
933
    """A Client class using D-Bus
1229
934
    
1240
945
    def __init__(self, bus = None, *args, **kwargs):
1241
946
        self.bus = bus
1242
947
        Client.__init__(self, *args, **kwargs)
 
948
 
 
949
        self._approvals_pending = 0
1243
950
        # Only now, when this client is initialized, can it show up on
1244
951
        # the D-Bus
1245
952
        client_object_name = unicode(self.name).translate(
1249
956
                                 ("/clients/" + client_object_name))
1250
957
        DBusObjectWithProperties.__init__(self, self.bus,
1251
958
                                          self.dbus_object_path)
1252
 
    
 
959
        
1253
960
    def notifychangeproperty(transform_func,
1254
961
                             dbus_name, type_func=lambda x: x,
1255
962
                             variant_level=1):
1256
963
        """ Modify a variable so that it's a property which announces
1257
964
        its changes to DBus.
1258
 
        
 
965
 
1259
966
        transform_fun: Function that takes a value and a variant_level
1260
967
                       and transforms it to a D-Bus type.
1261
968
        dbus_name: D-Bus name of the variable
1278
985
        
1279
986
        return property(lambda self: getattr(self, attrname), setter)
1280
987
    
 
988
    
1281
989
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1282
990
    approvals_pending = notifychangeproperty(dbus.Boolean,
1283
991
                                             "ApprovalPending",
1290
998
                                       checker is not None)
1291
999
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1292
1000
                                           "LastCheckedOK")
1293
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1294
 
                                               "LastCheckerStatus")
1295
1001
    last_approval_request = notifychangeproperty(
1296
1002
        datetime_to_dbus, "LastApprovalRequest")
1297
1003
    approved_by_default = notifychangeproperty(dbus.Boolean,
1298
1004
                                               "ApprovedByDefault")
1299
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1005
    approval_delay = notifychangeproperty(dbus.UInt16,
1300
1006
                                          "ApprovalDelay",
1301
1007
                                          type_func =
1302
 
                                          timedelta_to_milliseconds)
 
1008
                                          _timedelta_to_milliseconds)
1303
1009
    approval_duration = notifychangeproperty(
1304
 
        dbus.UInt64, "ApprovalDuration",
1305
 
        type_func = timedelta_to_milliseconds)
 
1010
        dbus.UInt16, "ApprovalDuration",
 
1011
        type_func = _timedelta_to_milliseconds)
1306
1012
    host = notifychangeproperty(dbus.String, "Host")
1307
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1013
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1308
1014
                                   type_func =
1309
 
                                   timedelta_to_milliseconds)
 
1015
                                   _timedelta_to_milliseconds)
1310
1016
    extended_timeout = notifychangeproperty(
1311
 
        dbus.UInt64, "ExtendedTimeout",
1312
 
        type_func = timedelta_to_milliseconds)
1313
 
    interval = notifychangeproperty(dbus.UInt64,
 
1017
        dbus.UInt16, "ExtendedTimeout",
 
1018
        type_func = _timedelta_to_milliseconds)
 
1019
    interval = notifychangeproperty(dbus.UInt16,
1314
1020
                                    "Interval",
1315
1021
                                    type_func =
1316
 
                                    timedelta_to_milliseconds)
 
1022
                                    _timedelta_to_milliseconds)
1317
1023
    checker_command = notifychangeproperty(dbus.String, "Checker")
1318
1024
    
1319
1025
    del notifychangeproperty
1361
1067
        return r
1362
1068
    
1363
1069
    def _reset_approved(self):
1364
 
        self.approved = None
 
1070
        self._approved = None
1365
1071
        return False
1366
1072
    
1367
1073
    def approve(self, value=True):
1368
 
        self.approved = value
1369
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1074
        self.send_changedstate()
 
1075
        self._approved = value
 
1076
        gobject.timeout_add(_timedelta_to_milliseconds
1370
1077
                            (self.approval_duration),
1371
1078
                            self._reset_approved)
1372
 
        self.send_changedstate()
 
1079
    
1373
1080
    
1374
1081
    ## D-Bus methods, signals & properties
1375
1082
    _interface = "se.recompile.Mandos.Client"
1376
1083
    
1377
 
    ## Interfaces
1378
 
    
1379
 
    @dbus_interface_annotations(_interface)
1380
 
    def _foo(self):
1381
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1382
 
                     "false"}
1383
 
    
1384
1084
    ## Signals
1385
1085
    
1386
1086
    # CheckerCompleted - signal
1485
1185
                           access="readwrite")
1486
1186
    def ApprovalDuration_dbus_property(self, value=None):
1487
1187
        if value is None:       # get
1488
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1188
            return dbus.UInt64(_timedelta_to_milliseconds(
1489
1189
                    self.approval_duration))
1490
1190
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1491
1191
    
1505
1205
    def Host_dbus_property(self, value=None):
1506
1206
        if value is None:       # get
1507
1207
            return dbus.String(self.host)
1508
 
        self.host = unicode(value)
 
1208
        self.host = value
1509
1209
    
1510
1210
    # Created - property
1511
1211
    @dbus_service_property(_interface, signature="s", access="read")
1512
1212
    def Created_dbus_property(self):
1513
 
        return datetime_to_dbus(self.created)
 
1213
        return dbus.String(datetime_to_dbus(self.created))
1514
1214
    
1515
1215
    # LastEnabled - property
1516
1216
    @dbus_service_property(_interface, signature="s", access="read")
1537
1237
            return
1538
1238
        return datetime_to_dbus(self.last_checked_ok)
1539
1239
    
1540
 
    # LastCheckerStatus - property
1541
 
    @dbus_service_property(_interface, signature="n",
1542
 
                           access="read")
1543
 
    def LastCheckerStatus_dbus_property(self):
1544
 
        return dbus.Int16(self.last_checker_status)
1545
 
    
1546
1240
    # Expires - property
1547
1241
    @dbus_service_property(_interface, signature="s", access="read")
1548
1242
    def Expires_dbus_property(self):
1559
1253
    def Timeout_dbus_property(self, value=None):
1560
1254
        if value is None:       # get
1561
1255
            return dbus.UInt64(self.timeout_milliseconds())
1562
 
        old_timeout = self.timeout
1563
1256
        self.timeout = datetime.timedelta(0, 0, 0, value)
1564
 
        # Reschedule disabling
1565
 
        if self.enabled:
1566
 
            now = datetime.datetime.utcnow()
1567
 
            self.expires += self.timeout - old_timeout
1568
 
            if self.expires <= now:
1569
 
                # The timeout has passed
1570
 
                self.disable()
1571
 
            else:
1572
 
                if (getattr(self, "disable_initiator_tag", None)
1573
 
                    is None):
1574
 
                    return
1575
 
                gobject.source_remove(self.disable_initiator_tag)
1576
 
                self.disable_initiator_tag = (
1577
 
                    gobject.timeout_add(
1578
 
                        timedelta_to_milliseconds(self.expires - now),
1579
 
                        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))
1580
1277
    
1581
1278
    # ExtendedTimeout - property
1582
1279
    @dbus_service_property(_interface, signature="t",
1595
1292
        self.interval = datetime.timedelta(0, 0, 0, value)
1596
1293
        if getattr(self, "checker_initiator_tag", None) is None:
1597
1294
            return
1598
 
        if self.enabled:
1599
 
            # Reschedule checker run
1600
 
            gobject.source_remove(self.checker_initiator_tag)
1601
 
            self.checker_initiator_tag = (gobject.timeout_add
1602
 
                                          (value, self.start_checker))
1603
 
            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
1604
1300
    
1605
1301
    # Checker - property
1606
1302
    @dbus_service_property(_interface, signature="s",
1608
1304
    def Checker_dbus_property(self, value=None):
1609
1305
        if value is None:       # get
1610
1306
            return dbus.String(self.checker_command)
1611
 
        self.checker_command = unicode(value)
 
1307
        self.checker_command = value
1612
1308
    
1613
1309
    # CheckerRunning - property
1614
1310
    @dbus_service_property(_interface, signature="b",
1643
1339
            raise KeyError()
1644
1340
    
1645
1341
    def __getattribute__(self, name):
1646
 
        if name == '_pipe':
 
1342
        if(name == '_pipe'):
1647
1343
            return super(ProxyClient, self).__getattribute__(name)
1648
1344
        self._pipe.send(('getattr', name))
1649
1345
        data = self._pipe.recv()
1656
1352
            return func
1657
1353
    
1658
1354
    def __setattr__(self, name, value):
1659
 
        if name == '_pipe':
 
1355
        if(name == '_pipe'):
1660
1356
            return super(ProxyClient, self).__setattr__(name, value)
1661
1357
        self._pipe.send(('setattr', name, value))
1662
1358
 
 
1359
class ClientDBusTransitional(ClientDBus):
 
1360
    __metaclass__ = AlternateDBusNamesMetaclass
1663
1361
 
1664
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
1363
    """A class to handle client connections.
1748
1446
                            client.Rejected("Disabled")
1749
1447
                        return
1750
1448
                    
1751
 
                    if client.approved or not client.approval_delay:
 
1449
                    if client._approved or not client.approval_delay:
1752
1450
                        #We are approved or approval is disabled
1753
1451
                        break
1754
 
                    elif client.approved is None:
 
1452
                    elif client._approved is None:
1755
1453
                        logger.info("Client %s needs approval",
1756
1454
                                    client.name)
1757
1455
                        if self.server.use_dbus:
1770
1468
                    #wait until timeout or approved
1771
1469
                    time = datetime.datetime.now()
1772
1470
                    client.changedstate.acquire()
1773
 
                    client.changedstate.wait(
1774
 
                        float(timedelta_to_milliseconds(delay)
1775
 
                              / 1000))
 
1471
                    (client.changedstate.wait
 
1472
                     (float(client._timedelta_to_milliseconds(delay)
 
1473
                            / 1000)))
1776
1474
                    client.changedstate.release()
1777
1475
                    time2 = datetime.datetime.now()
1778
1476
                    if (time2 - time) >= delay:
1794
1492
                    try:
1795
1493
                        sent = session.send(client.secret[sent_size:])
1796
1494
                    except gnutls.errors.GNUTLSError as error:
1797
 
                        logger.warning("gnutls send failed",
1798
 
                                       exc_info=error)
 
1495
                        logger.warning("gnutls send failed")
1799
1496
                        return
1800
1497
                    logger.debug("Sent: %d, remaining: %d",
1801
1498
                                 sent, len(client.secret)
1804
1501
                
1805
1502
                logger.info("Sending secret to %s", client.name)
1806
1503
                # bump the timeout using extended_timeout
1807
 
                client.bump_timeout(client.extended_timeout)
 
1504
                client.checked_ok(client.extended_timeout)
1808
1505
                if self.server.use_dbus:
1809
1506
                    # Emit D-Bus signal
1810
1507
                    client.GotSecret()
1815
1512
                try:
1816
1513
                    session.bye()
1817
1514
                except gnutls.errors.GNUTLSError as error:
1818
 
                    logger.warning("GnuTLS bye failed",
1819
 
                                   exc_info=error)
 
1515
                    logger.warning("GnuTLS bye failed")
1820
1516
    
1821
1517
    @staticmethod
1822
1518
    def peer_certificate(session):
1878
1574
        # Convert the buffer to a Python bytestring
1879
1575
        fpr = ctypes.string_at(buf, buf_len.value)
1880
1576
        # Convert the bytestring to hexadecimal notation
1881
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1577
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1882
1578
        return hex_fpr
1883
1579
 
1884
1580
 
1887
1583
    def sub_process_main(self, request, address):
1888
1584
        try:
1889
1585
            self.finish_request(request, address)
1890
 
        except Exception:
 
1586
        except:
1891
1587
            self.handle_error(request, address)
1892
1588
        self.close_request(request)
1893
1589
    
1894
1590
    def process_request(self, request, address):
1895
1591
        """Start a new process to process the request."""
1896
1592
        proc = multiprocessing.Process(target = self.sub_process_main,
1897
 
                                       args = (request, address))
 
1593
                                       args = (request,
 
1594
                                               address))
1898
1595
        proc.start()
1899
1596
        return proc
1900
1597
 
1928
1625
        use_ipv6:       Boolean; to use IPv6 or not
1929
1626
    """
1930
1627
    def __init__(self, server_address, RequestHandlerClass,
1931
 
                 interface=None, use_ipv6=True, socketfd=None):
1932
 
        """If socketfd is set, use that file descriptor instead of
1933
 
        creating a new one with socket.socket().
1934
 
        """
 
1628
                 interface=None, use_ipv6=True):
1935
1629
        self.interface = interface
1936
1630
        if use_ipv6:
1937
1631
            self.address_family = socket.AF_INET6
1938
 
        if socketfd is not None:
1939
 
            # Save the file descriptor
1940
 
            self.socketfd = socketfd
1941
 
            # Save the original socket.socket() function
1942
 
            self.socket_socket = socket.socket
1943
 
            # To implement --socket, we monkey patch socket.socket.
1944
 
            # 
1945
 
            # (When socketserver.TCPServer is a new-style class, we
1946
 
            # could make self.socket into a property instead of monkey
1947
 
            # patching socket.socket.)
1948
 
            # 
1949
 
            # Create a one-time-only replacement for socket.socket()
1950
 
            @functools.wraps(socket.socket)
1951
 
            def socket_wrapper(*args, **kwargs):
1952
 
                # Restore original function so subsequent calls are
1953
 
                # not affected.
1954
 
                socket.socket = self.socket_socket
1955
 
                del self.socket_socket
1956
 
                # This time only, return a new socket object from the
1957
 
                # saved file descriptor.
1958
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1959
 
            # Replace socket.socket() function with wrapper
1960
 
            socket.socket = socket_wrapper
1961
 
        # The socketserver.TCPServer.__init__ will call
1962
 
        # socket.socket(), which might be our replacement,
1963
 
        # socket_wrapper(), if socketfd was set.
1964
1632
        socketserver.TCPServer.__init__(self, server_address,
1965
1633
                                        RequestHandlerClass)
1966
 
    
1967
1634
    def server_bind(self):
1968
1635
        """This overrides the normal server_bind() function
1969
1636
        to bind to an interface if one was specified, and also NOT to
1977
1644
                try:
1978
1645
                    self.socket.setsockopt(socket.SOL_SOCKET,
1979
1646
                                           SO_BINDTODEVICE,
1980
 
                                           str(self.interface + '\0'))
 
1647
                                           str(self.interface
 
1648
                                               + '\0'))
1981
1649
                except socket.error as error:
1982
 
                    if error.errno == errno.EPERM:
1983
 
                        logger.error("No permission to bind to"
1984
 
                                     " interface %s", self.interface)
1985
 
                    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:
1986
1655
                        logger.error("SO_BINDTODEVICE not available;"
1987
1656
                                     " cannot bind to interface %s",
1988
1657
                                     self.interface)
1989
 
                    elif error.errno == errno.ENODEV:
1990
 
                        logger.error("Interface %s does not exist,"
1991
 
                                     " cannot bind", self.interface)
1992
1658
                    else:
1993
1659
                        raise
1994
1660
        # Only bind(2) the socket if we really need to.
1997
1663
                if self.address_family == socket.AF_INET6:
1998
1664
                    any_address = "::" # in6addr_any
1999
1665
                else:
2000
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1666
                    any_address = socket.INADDR_ANY
2001
1667
                self.server_address = (any_address,
2002
1668
                                       self.server_address[1])
2003
1669
            elif not self.server_address[1]:
2024
1690
    """
2025
1691
    def __init__(self, server_address, RequestHandlerClass,
2026
1692
                 interface=None, use_ipv6=True, clients=None,
2027
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1693
                 gnutls_priority=None, use_dbus=True):
2028
1694
        self.enabled = False
2029
1695
        self.clients = clients
2030
1696
        if self.clients is None:
2034
1700
        IPv6_TCPServer.__init__(self, server_address,
2035
1701
                                RequestHandlerClass,
2036
1702
                                interface = interface,
2037
 
                                use_ipv6 = use_ipv6,
2038
 
                                socketfd = socketfd)
 
1703
                                use_ipv6 = use_ipv6)
2039
1704
    def server_activate(self):
2040
1705
        if self.enabled:
2041
1706
            return socketserver.TCPServer.server_activate(self)
2054
1719
    
2055
1720
    def handle_ipc(self, source, condition, parent_pipe=None,
2056
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)
2057
1736
        # error, or the other end of multiprocessing.Pipe has closed
2058
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1737
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2059
1738
            # Wait for other process to exit
2060
1739
            proc.join()
2061
1740
            return False
2119
1798
        return True
2120
1799
 
2121
1800
 
2122
 
def rfc3339_duration_to_delta(duration):
2123
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2124
 
    
2125
 
    >>> rfc3339_duration_to_delta("P7D")
2126
 
    datetime.timedelta(7)
2127
 
    >>> rfc3339_duration_to_delta("PT60S")
2128
 
    datetime.timedelta(0, 60)
2129
 
    >>> rfc3339_duration_to_delta("PT60M")
2130
 
    datetime.timedelta(0, 3600)
2131
 
    >>> rfc3339_duration_to_delta("PT24H")
2132
 
    datetime.timedelta(1)
2133
 
    >>> rfc3339_duration_to_delta("P1W")
2134
 
    datetime.timedelta(7)
2135
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2136
 
    datetime.timedelta(0, 330)
2137
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2138
 
    datetime.timedelta(1, 200)
2139
 
    """
2140
 
    
2141
 
    # Parsing an RFC 3339 duration with regular expressions is not
2142
 
    # possible - there would have to be multiple places for the same
2143
 
    # values, like seconds.  The current code, while more esoteric, is
2144
 
    # cleaner without depending on a parsing library.  If Python had a
2145
 
    # built-in library for parsing we would use it, but we'd like to
2146
 
    # avoid excessive use of external libraries.
2147
 
    
2148
 
    # New type for defining tokens, syntax, and semantics all-in-one
2149
 
    Token = collections.namedtuple("Token",
2150
 
                                   ("regexp", # To match token; if
2151
 
                                              # "value" is not None,
2152
 
                                              # must have a "group"
2153
 
                                              # containing digits
2154
 
                                    "value",  # datetime.timedelta or
2155
 
                                              # None
2156
 
                                    "followers")) # Tokens valid after
2157
 
                                                  # this token
2158
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2160
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2161
 
    token_second = Token(re.compile(r"(\d+)S"),
2162
 
                         datetime.timedelta(seconds=1),
2163
 
                         frozenset((token_end,)))
2164
 
    token_minute = Token(re.compile(r"(\d+)M"),
2165
 
                         datetime.timedelta(minutes=1),
2166
 
                         frozenset((token_second, token_end)))
2167
 
    token_hour = Token(re.compile(r"(\d+)H"),
2168
 
                       datetime.timedelta(hours=1),
2169
 
                       frozenset((token_minute, token_end)))
2170
 
    token_time = Token(re.compile(r"T"),
2171
 
                       None,
2172
 
                       frozenset((token_hour, token_minute,
2173
 
                                  token_second)))
2174
 
    token_day = Token(re.compile(r"(\d+)D"),
2175
 
                      datetime.timedelta(days=1),
2176
 
                      frozenset((token_time, token_end)))
2177
 
    token_month = Token(re.compile(r"(\d+)M"),
2178
 
                        datetime.timedelta(weeks=4),
2179
 
                        frozenset((token_day, token_end)))
2180
 
    token_year = Token(re.compile(r"(\d+)Y"),
2181
 
                       datetime.timedelta(weeks=52),
2182
 
                       frozenset((token_month, token_end)))
2183
 
    token_week = Token(re.compile(r"(\d+)W"),
2184
 
                       datetime.timedelta(weeks=1),
2185
 
                       frozenset((token_end,)))
2186
 
    token_duration = Token(re.compile(r"P"), None,
2187
 
                           frozenset((token_year, token_month,
2188
 
                                      token_day, token_time,
2189
 
                                      token_week))),
2190
 
    # Define starting values
2191
 
    value = datetime.timedelta() # Value so far
2192
 
    found_token = None
2193
 
    followers = frozenset(token_duration,) # Following valid tokens
2194
 
    s = duration                # String left to parse
2195
 
    # Loop until end token is found
2196
 
    while found_token is not token_end:
2197
 
        # Search for any currently valid tokens
2198
 
        for token in followers:
2199
 
            match = token.regexp.match(s)
2200
 
            if match is not None:
2201
 
                # Token found
2202
 
                if token.value is not None:
2203
 
                    # Value found, parse digits
2204
 
                    factor = int(match.group(1), 10)
2205
 
                    # Add to value so far
2206
 
                    value += factor * token.value
2207
 
                # Strip token from string
2208
 
                s = token.regexp.sub("", s, 1)
2209
 
                # Go to found token
2210
 
                found_token = token
2211
 
                # Set valid next tokens
2212
 
                followers = found_token.followers
2213
 
                break
2214
 
        else:
2215
 
            # No currently valid tokens were found
2216
 
            raise ValueError("Invalid RFC 3339 duration")
2217
 
    # End token found
2218
 
    return value
2219
 
 
2220
 
 
2221
1801
def string_to_delta(interval):
2222
1802
    """Parse a string and return a datetime.timedelta
2223
1803
    
2234
1814
    >>> string_to_delta('5m 30s')
2235
1815
    datetime.timedelta(0, 330)
2236
1816
    """
2237
 
    
2238
 
    try:
2239
 
        return rfc3339_duration_to_delta(interval)
2240
 
    except ValueError:
2241
 
        pass
2242
 
    
2243
1817
    timevalue = datetime.timedelta(0)
2244
1818
    for s in interval.split():
2245
1819
        try:
2256
1830
            elif suffix == "w":
2257
1831
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2258
1832
            else:
2259
 
                raise ValueError("Unknown suffix {0!r}"
2260
 
                                 .format(suffix))
 
1833
                raise ValueError("Unknown suffix %r" % suffix)
2261
1834
        except (ValueError, IndexError) as e:
2262
1835
            raise ValueError(*(e.args))
2263
1836
        timevalue += delta
2264
1837
    return timevalue
2265
1838
 
2266
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
 
2267
1864
def daemon(nochdir = False, noclose = False):
2268
1865
    """See daemon(3).  Standard BSD Unix function.
2269
1866
    
2277
1874
        sys.exit()
2278
1875
    if not noclose:
2279
1876
        # Close all standard open file descriptors
2280
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1877
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2281
1878
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2282
1879
            raise OSError(errno.ENODEV,
2283
 
                          "{0} not a character device"
2284
 
                          .format(os.devnull))
 
1880
                          "%s not a character device"
 
1881
                          % os.path.devnull)
2285
1882
        os.dup2(null, sys.stdin.fileno())
2286
1883
        os.dup2(null, sys.stdout.fileno())
2287
1884
        os.dup2(null, sys.stderr.fileno())
2296
1893
    
2297
1894
    parser = argparse.ArgumentParser()
2298
1895
    parser.add_argument("-v", "--version", action="version",
2299
 
                        version = "%(prog)s {0}".format(version),
 
1896
                        version = "%%(prog)s %s" % version,
2300
1897
                        help="show version number and exit")
2301
1898
    parser.add_argument("-i", "--interface", metavar="IF",
2302
1899
                        help="Bind to interface IF")
2308
1905
                        help="Run self-test")
2309
1906
    parser.add_argument("--debug", action="store_true",
2310
1907
                        help="Debug mode; run in foreground and log"
2311
 
                        " to terminal", default=None)
 
1908
                        " to terminal")
2312
1909
    parser.add_argument("--debuglevel", metavar="LEVEL",
2313
1910
                        help="Debug level for stdout output")
2314
1911
    parser.add_argument("--priority", help="GnuTLS"
2321
1918
                        " files")
2322
1919
    parser.add_argument("--no-dbus", action="store_false",
2323
1920
                        dest="use_dbus", help="Do not provide D-Bus"
2324
 
                        " system bus interface", default=None)
 
1921
                        " system bus interface")
2325
1922
    parser.add_argument("--no-ipv6", action="store_false",
2326
 
                        dest="use_ipv6", help="Do not use IPv6",
2327
 
                        default=None)
 
1923
                        dest="use_ipv6", help="Do not use IPv6")
2328
1924
    parser.add_argument("--no-restore", action="store_false",
2329
 
                        dest="restore", help="Do not restore stored"
2330
 
                        " state", default=None)
2331
 
    parser.add_argument("--socket", type=int,
2332
 
                        help="Specify a file descriptor to a network"
2333
 
                        " socket to use instead of creating one")
2334
 
    parser.add_argument("--statedir", metavar="DIR",
2335
 
                        help="Directory to save/restore state in")
2336
 
    parser.add_argument("--foreground", action="store_true",
2337
 
                        help="Run in foreground", default=None)
2338
 
    
 
1925
                        dest="restore", help="Do not restore stored state",
 
1926
                        default=True)
 
1927
 
2339
1928
    options = parser.parse_args()
2340
1929
    
2341
1930
    if options.check:
2349
1938
                        "port": "",
2350
1939
                        "debug": "False",
2351
1940
                        "priority":
2352
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
1941
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2353
1942
                        "servicename": "Mandos",
2354
1943
                        "use_dbus": "True",
2355
1944
                        "use_ipv6": "True",
2356
1945
                        "debuglevel": "",
2357
 
                        "restore": "True",
2358
 
                        "socket": "",
2359
 
                        "statedir": "/var/lib/mandos",
2360
 
                        "foreground": "False",
2361
1946
                        }
2362
1947
    
2363
1948
    # Parse config file for server-global settings
2368
1953
    # Convert the SafeConfigParser object to a dict
2369
1954
    server_settings = server_config.defaults()
2370
1955
    # Use the appropriate methods on the non-string config options
2371
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1956
    for option in ("debug", "use_dbus", "use_ipv6"):
2372
1957
        server_settings[option] = server_config.getboolean("DEFAULT",
2373
1958
                                                           option)
2374
1959
    if server_settings["port"]:
2375
1960
        server_settings["port"] = server_config.getint("DEFAULT",
2376
1961
                                                       "port")
2377
 
    if server_settings["socket"]:
2378
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2379
 
                                                         "socket")
2380
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2381
 
        # over with an opened os.devnull.  But we don't want this to
2382
 
        # happen with a supplied network socket.
2383
 
        if 0 <= server_settings["socket"] <= 2:
2384
 
            server_settings["socket"] = os.dup(server_settings
2385
 
                                               ["socket"])
2386
1962
    del server_config
2387
1963
    
2388
1964
    # Override the settings from the config file with command line
2389
1965
    # options, if set.
2390
1966
    for option in ("interface", "address", "port", "debug",
2391
1967
                   "priority", "servicename", "configdir",
2392
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2393
 
                   "statedir", "socket", "foreground"):
 
1968
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
2394
1969
        value = getattr(options, option)
2395
1970
        if value is not None:
2396
1971
            server_settings[option] = value
2399
1974
    for option in server_settings.keys():
2400
1975
        if type(server_settings[option]) is str:
2401
1976
            server_settings[option] = unicode(server_settings[option])
2402
 
    # Force all boolean options to be boolean
2403
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2404
 
                   "foreground"):
2405
 
        server_settings[option] = bool(server_settings[option])
2406
 
    # Debug implies foreground
2407
 
    if server_settings["debug"]:
2408
 
        server_settings["foreground"] = True
2409
1977
    # Now we have our good server settings in "server_settings"
2410
1978
    
2411
1979
    ##################################################################
2415
1983
    debuglevel = server_settings["debuglevel"]
2416
1984
    use_dbus = server_settings["use_dbus"]
2417
1985
    use_ipv6 = server_settings["use_ipv6"]
2418
 
    stored_state_path = os.path.join(server_settings["statedir"],
2419
 
                                     stored_state_file)
2420
 
    foreground = server_settings["foreground"]
2421
 
    
2422
 
    if debug:
2423
 
        initlogger(debug, logging.DEBUG)
2424
 
    else:
2425
 
        if not debuglevel:
2426
 
            initlogger(debug)
2427
 
        else:
2428
 
            level = getattr(logging, debuglevel.upper())
2429
 
            initlogger(debug, level)
2430
1986
    
2431
1987
    if server_settings["servicename"] != "Mandos":
2432
1988
        syslogger.setFormatter(logging.Formatter
2433
 
                               ('Mandos ({0}) [%(process)d]:'
2434
 
                                ' %(levelname)s: %(message)s'
2435
 
                                .format(server_settings
2436
 
                                        ["servicename"])))
 
1989
                               ('Mandos (%s) [%%(process)d]:'
 
1990
                                ' %%(levelname)s: %%(message)s'
 
1991
                                % server_settings["servicename"]))
2437
1992
    
2438
1993
    # Parse config file with clients
2439
 
    client_config = configparser.SafeConfigParser(Client
2440
 
                                                  .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)
2441
2003
    client_config.read(os.path.join(server_settings["configdir"],
2442
2004
                                    "clients.conf"))
2443
2005
    
2452
2014
                              use_ipv6=use_ipv6,
2453
2015
                              gnutls_priority=
2454
2016
                              server_settings["priority"],
2455
 
                              use_dbus=use_dbus,
2456
 
                              socketfd=(server_settings["socket"]
2457
 
                                        or None))
2458
 
    if not foreground:
2459
 
        pidfilename = "/run/mandos.pid"
2460
 
        pidfile = None
 
2017
                              use_dbus=use_dbus)
 
2018
    if not debug:
 
2019
        pidfilename = "/var/run/mandos.pid"
2461
2020
        try:
2462
2021
            pidfile = open(pidfilename, "w")
2463
 
        except IOError as e:
2464
 
            logger.error("Could not open file %r", pidfilename,
2465
 
                         exc_info=e)
 
2022
        except IOError:
 
2023
            logger.error("Could not open file %r", pidfilename)
2466
2024
    
2467
 
    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:
2468
2029
        try:
2469
 
            uid = pwd.getpwnam(name).pw_uid
2470
 
            gid = pwd.getpwnam(name).pw_gid
2471
 
            break
 
2030
            uid = pwd.getpwnam("mandos").pw_uid
 
2031
            gid = pwd.getpwnam("mandos").pw_gid
2472
2032
        except KeyError:
2473
 
            continue
2474
 
    else:
2475
 
        uid = 65534
2476
 
        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
2477
2039
    try:
2478
2040
        os.setgid(gid)
2479
2041
        os.setuid(uid)
2480
2042
    except OSError as error:
2481
 
        if error.errno != errno.EPERM:
 
2043
        if error[0] != errno.EPERM:
2482
2044
            raise error
2483
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
    
2484
2052
    if debug:
 
2053
        logger.setLevel(logging.DEBUG)
2485
2054
        # Enable all possible GnuTLS debugging
2486
2055
        
2487
2056
        # "Use a log level over 10 to enable all debugging options."
2496
2065
         .gnutls_global_set_log_function(debug_gnutls))
2497
2066
        
2498
2067
        # Redirect stdin so all checkers get /dev/null
2499
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2068
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2500
2069
        os.dup2(null, sys.stdin.fileno())
2501
2070
        if null > 2:
2502
2071
            os.close(null)
 
2072
    else:
 
2073
        # No console logging
 
2074
        logger.removeHandler(console)
2503
2075
    
2504
2076
    # Need to fork before connecting to D-Bus
2505
 
    if not foreground:
 
2077
    if not debug:
2506
2078
        # Close all input and output, do double fork, etc.
2507
2079
        daemon()
2508
2080
    
2509
 
    # multiprocessing will use threads, so before we use gobject we
2510
 
    # need to inform gobject that threads will be used.
2511
 
    gobject.threads_init()
2512
 
    
2513
2081
    global main_loop
2514
2082
    # From the Avahi example code
2515
 
    DBusGMainLoop(set_as_default=True)
 
2083
    DBusGMainLoop(set_as_default=True )
2516
2084
    main_loop = gobject.MainLoop()
2517
2085
    bus = dbus.SystemBus()
2518
2086
    # End of Avahi example code
2524
2092
                            ("se.bsnet.fukt.Mandos", bus,
2525
2093
                             do_not_queue=True))
2526
2094
        except dbus.exceptions.NameExistsException as e:
2527
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2095
            logger.error(unicode(e) + ", disabling D-Bus")
2528
2096
            use_dbus = False
2529
2097
            server_settings["use_dbus"] = False
2530
2098
            tcp_server.use_dbus = False
2542
2110
    
2543
2111
    client_class = Client
2544
2112
    if use_dbus:
2545
 
        client_class = functools.partial(ClientDBus, bus = bus)
2546
 
    
2547
 
    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
    
2548
2133
    old_client_settings = {}
2549
 
    clients_data = {}
2550
 
    
2551
 
    # This is used to redirect stdout and stderr for checker processes
2552
 
    global wnull
2553
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2554
 
    # Only used if server is running in foreground but not in debug
2555
 
    # mode
2556
 
    if debug or not foreground:
2557
 
        wnull.close()
2558
 
    
2559
 
    # Get client data and settings from last running state.
 
2134
    clients_data = []
 
2135
 
 
2136
    # Get client data and settings from last running state. 
2560
2137
    if server_settings["restore"]:
2561
2138
        try:
2562
2139
            with open(stored_state_path, "rb") as stored_state:
2563
 
                clients_data, old_client_settings = (pickle.load
2564
 
                                                     (stored_state))
 
2140
                clients_data, old_client_settings = pickle.load(stored_state)
2565
2141
            os.remove(stored_state_path)
2566
2142
        except IOError as e:
2567
 
            if e.errno == errno.ENOENT:
2568
 
                logger.warning("Could not load persistent state: {0}"
2569
 
                                .format(os.strerror(e.errno)))
2570
 
            else:
2571
 
                logger.critical("Could not load persistent state:",
2572
 
                                exc_info=e)
 
2143
            logger.warning("Could not load persistant state: {0}".format(e))
 
2144
            if e.errno != errno.ENOENT:
2573
2145
                raise
2574
 
        except EOFError as e:
2575
 
            logger.warning("Could not load persistent state: "
2576
 
                           "EOFError:", exc_info=e)
2577
 
    
2578
 
    with PGPEngine() as pgp:
2579
 
        for client_name, client in clients_data.iteritems():
2580
 
            # Skip removed clients
2581
 
            if client_name not in client_settings:
2582
 
                continue
2583
 
            
2584
 
            # Decide which value to use after restoring saved state.
2585
 
            # We have three different values: Old config file,
2586
 
            # new config file, and saved state.
2587
 
            # New config value takes precedence if it differs from old
2588
 
            # config value, otherwise use saved state.
2589
 
            for name, value in client_settings[client_name].items():
2590
 
                try:
2591
 
                    # For each value in new config, check if it
2592
 
                    # differs from the old config value (Except for
2593
 
                    # the "secret" attribute)
2594
 
                    if (name != "secret" and
2595
 
                        value != old_client_settings[client_name]
2596
 
                        [name]):
2597
 
                        client[name] = value
2598
 
                except KeyError:
2599
 
                    pass
2600
 
            
2601
 
            # Clients who has passed its expire date can still be
2602
 
            # enabled if its last checker was successful.  Clients
2603
 
            # whose checker succeeded before we stored its state is
2604
 
            # assumed to have successfully run all checkers during
2605
 
            # downtime.
2606
 
            if client["enabled"]:
2607
 
                if datetime.datetime.utcnow() >= client["expires"]:
2608
 
                    if not client["last_checked_ok"]:
2609
 
                        logger.warning(
2610
 
                            "disabling client {0} - Client never "
2611
 
                            "performed a successful checker"
2612
 
                            .format(client_name))
2613
 
                        client["enabled"] = False
2614
 
                    elif client["last_checker_status"] != 0:
2615
 
                        logger.warning(
2616
 
                            "disabling client {0} - Client "
2617
 
                            "last checker failed with error code {1}"
2618
 
                            .format(client_name,
2619
 
                                    client["last_checker_status"]))
2620
 
                        client["enabled"] = False
2621
 
                    else:
2622
 
                        client["expires"] = (datetime.datetime
2623
 
                                             .utcnow()
2624
 
                                             + client["timeout"])
2625
 
                        logger.debug("Last checker succeeded,"
2626
 
                                     " keeping {0} enabled"
2627
 
                                     .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():
2628
2156
            try:
2629
 
                client["secret"] = (
2630
 
                    pgp.decrypt(client["encrypted_secret"],
2631
 
                                client_settings[client_name]
2632
 
                                ["secret"]))
2633
 
            except PGPError:
2634
 
                # If decryption fails, we use secret from new settings
2635
 
                logger.debug("Failed to decrypt {0} old secret"
2636
 
                             .format(client_name))
2637
 
                client["secret"] = (
2638
 
                    client_settings[client_name]["secret"])
2639
 
    
2640
 
    # Add/remove clients based on new changes made to config
2641
 
    for client_name in (set(old_client_settings)
2642
 
                        - set(client_settings)):
2643
 
        del clients_data[client_name]
2644
 
    for client_name in (set(client_settings)
2645
 
                        - set(old_client_settings)):
2646
 
        clients_data[client_name] = client_settings[client_name]
2647
 
    
2648
 
    # Create all client objects
2649
 
    for client_name, client in clients_data.iteritems():
2650
 
        tcp_server.clients[client_name] = client_class(
2651
 
            name = client_name, settings = client,
2652
 
            server_settings = server_settings)
2653
 
    
 
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
 
2654
2211
    if not tcp_server.clients:
2655
2212
        logger.warning("No clients defined")
2656
 
    
2657
 
    if not foreground:
2658
 
        if pidfile is not None:
2659
 
            try:
2660
 
                with pidfile:
2661
 
                    pid = os.getpid()
2662
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2663
 
            except IOError:
2664
 
                logger.error("Could not write to file %r with PID %d",
2665
 
                             pidfilename, pid)
2666
 
        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
2667
2226
        del pidfilename
 
2227
        
 
2228
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2668
2229
    
2669
2230
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2670
2231
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2671
2232
    
2672
2233
    if use_dbus:
2673
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2674
 
                                        "se.bsnet.fukt.Mandos"})
2675
 
        class MandosDBusService(DBusObjectWithProperties):
 
2234
        class MandosDBusService(dbus.service.Object):
2676
2235
            """A D-Bus proxy object"""
2677
2236
            def __init__(self):
2678
2237
                dbus.service.Object.__init__(self, bus, "/")
2679
2238
            _interface = "se.recompile.Mandos"
2680
2239
            
2681
 
            @dbus_interface_annotations(_interface)
2682
 
            def _foo(self):
2683
 
                return { "org.freedesktop.DBus.Property"
2684
 
                         ".EmitsChangedSignal":
2685
 
                             "false"}
2686
 
            
2687
2240
            @dbus.service.signal(_interface, signature="o")
2688
2241
            def ClientAdded(self, objpath):
2689
2242
                "D-Bus signal"
2731
2284
            
2732
2285
            del _interface
2733
2286
        
2734
 
        mandos_dbus_service = MandosDBusService()
 
2287
        class MandosDBusServiceTransitional(MandosDBusService):
 
2288
            __metaclass__ = AlternateDBusNamesMetaclass
 
2289
        mandos_dbus_service = MandosDBusServiceTransitional()
2735
2290
    
2736
2291
    def cleanup():
2737
2292
        "Cleanup function; run on exit"
2738
2293
        service.cleanup()
2739
2294
        
2740
2295
        multiprocessing.active_children()
2741
 
        wnull.close()
2742
2296
        if not (tcp_server.clients or client_settings):
2743
2297
            return
2744
 
        
2745
 
        # Store client before exiting. Secrets are encrypted with key
2746
 
        # based on what config file has. If config file is
2747
 
        # removed/edited, old secret will thus be unrecovable.
2748
 
        clients = {}
2749
 
        with PGPEngine() as pgp:
2750
 
            for client in tcp_server.clients.itervalues():
2751
 
                key = client_settings[client.name]["secret"]
2752
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2753
 
                                                      key)
2754
 
                client_dict = {}
2755
 
                
2756
 
                # A list of attributes that can not be pickled
2757
 
                # + secret.
2758
 
                exclude = set(("bus", "changedstate", "secret",
2759
 
                               "checker", "server_settings"))
2760
 
                for name, typ in (inspect.getmembers
2761
 
                                  (dbus.service.Object)):
2762
 
                    exclude.add(name)
2763
 
                
2764
 
                client_dict["encrypted_secret"] = (client
2765
 
                                                   .encrypted_secret)
2766
 
                for attr in client.client_structure:
2767
 
                    if attr not in exclude:
2768
 
                        client_dict[attr] = getattr(client, attr)
2769
 
                
2770
 
                clients[client.name] = client_dict
2771
 
                del client_settings[client.name]["secret"]
2772
 
        
 
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
            
2773
2321
        try:
2774
 
            with (tempfile.NamedTemporaryFile
2775
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2776
 
                   dir=os.path.dirname(stored_state_path),
2777
 
                   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:
2778
2323
                pickle.dump((clients, client_settings), stored_state)
2779
 
                tempname=stored_state.name
2780
 
            os.rename(tempname, stored_state_path)
2781
 
        except (IOError, OSError) as e:
2782
 
            if not debug:
2783
 
                try:
2784
 
                    os.remove(tempname)
2785
 
                except NameError:
2786
 
                    pass
2787
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2788
 
                logger.warning("Could not save persistent state: {0}"
2789
 
                               .format(os.strerror(e.errno)))
2790
 
            else:
2791
 
                logger.warning("Could not save persistent state:",
2792
 
                               exc_info=e)
2793
 
                raise e
2794
 
        
 
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
 
2795
2329
        # Delete all clients, and settings from config
2796
2330
        while tcp_server.clients:
2797
2331
            name, client = tcp_server.clients.popitem()
2815
2349
        # Need to initiate checking of clients
2816
2350
        if client.enabled:
2817
2351
            client.init_checker()
 
2352
 
2818
2353
    
2819
2354
    tcp_server.enable()
2820
2355
    tcp_server.server_activate()
2823
2358
    service.port = tcp_server.socket.getsockname()[1]
2824
2359
    if use_ipv6:
2825
2360
        logger.info("Now listening on address %r, port %d,"
2826
 
                    " flowinfo %d, scope_id %d",
2827
 
                    *tcp_server.socket.getsockname())
 
2361
                    " flowinfo %d, scope_id %d"
 
2362
                    % tcp_server.socket.getsockname())
2828
2363
    else:                       # IPv4
2829
 
        logger.info("Now listening on address %r, port %d",
2830
 
                    *tcp_server.socket.getsockname())
 
2364
        logger.info("Now listening on address %r, port %d"
 
2365
                    % tcp_server.socket.getsockname())
2831
2366
    
2832
2367
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2368
    
2836
2371
        try:
2837
2372
            service.activate()
2838
2373
        except dbus.exceptions.DBusException as error:
2839
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2374
            logger.critical("DBusException: %s", error)
2840
2375
            cleanup()
2841
2376
            sys.exit(1)
2842
2377
        # End of Avahi example code
2849
2384
        logger.debug("Starting main loop")
2850
2385
        main_loop.run()
2851
2386
    except AvahiError as error:
2852
 
        logger.critical("Avahi Error", exc_info=error)
 
2387
        logger.critical("AvahiError: %s", error)
2853
2388
        cleanup()
2854
2389
        sys.exit(1)
2855
2390
    except KeyboardInterrupt:
2860
2395
    # Must run before the D-Bus bus name gets deregistered
2861
2396
    cleanup()
2862
2397
 
 
2398
 
2863
2399
if __name__ == '__main__':
2864
2400
    main()