/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
65
68
 
66
69
import dbus
67
70
import dbus.service
72
75
import ctypes.util
73
76
import xml.dom.minidom
74
77
import inspect
 
78
import GnuPGInterface
75
79
 
76
80
try:
77
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
85
    except ImportError:
82
86
        SO_BINDTODEVICE = None
83
87
 
84
 
 
85
 
version = "1.3.1"
86
 
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
88
version = "1.5.0"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
89
92
syslogger = (logging.handlers.SysLogHandler
90
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
94
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
95
 
 
96
try:
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
 
100
except (OSError, AttributeError):
 
101
    def if_nametoindex(interface):
 
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
        with contextlib.closing(socket.socket()) as s:
 
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
 
110
        return interface_index
 
111
 
 
112
 
 
113
def initlogger(debug, level=logging.WARNING):
 
114
    """init logger and add loglevel"""
 
115
    
 
116
    syslogger.setFormatter(logging.Formatter
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
 
121
    if debug:
 
122
        console = logging.StreamHandler()
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
 
128
    logger.setLevel(level)
 
129
 
 
130
 
 
131
class PGPError(Exception):
 
132
    """Exception if encryption/decryption fails"""
 
133
    pass
 
134
 
 
135
 
 
136
class PGPEngine(object):
 
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
 
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
 
147
    
 
148
    def __enter__(self):
 
149
        return self
 
150
    
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
        self._cleanup()
 
153
        return False
 
154
    
 
155
    def __del__(self):
 
156
        self._cleanup()
 
157
    
 
158
    def _cleanup(self):
 
159
        if self.tempdir is not None:
 
160
            # Delete contents of tempdir
 
161
            for root, dirs, files in os.walk(self.tempdir,
 
162
                                             topdown = False):
 
163
                for filename in files:
 
164
                    os.remove(os.path.join(root, filename))
 
165
                for dirname in dirs:
 
166
                    os.rmdir(os.path.join(root, dirname))
 
167
            # Remove tempdir
 
168
            os.rmdir(self.tempdir)
 
169
            self.tempdir = None
 
170
    
 
171
    def password_encode(self, password):
 
172
        # Passphrase can not be empty and can not contain newlines or
 
173
        # NUL bytes.  So we prefix it and hex encode it.
 
174
        return b"mandos" + binascii.hexlify(password)
 
175
    
 
176
    def encrypt(self, data, password):
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
 
191
        return ciphertext
 
192
    
 
193
    def decrypt(self, data, password):
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
 
208
        return decrypted_plaintext
 
209
 
 
210
 
102
211
 
103
212
class AvahiError(Exception):
104
213
    def __init__(self, value, *args, **kwargs):
159
268
                            " after %i retries, exiting.",
160
269
                            self.rename_count)
161
270
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
163
273
        logger.info("Changing Zeroconf service name to %r ...",
164
274
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
275
        self.remove()
170
276
        try:
171
277
            self.add()
191
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
298
        self.entry_group_state_changed_match = (
193
299
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
 
300
                'StateChanged', self.entry_group_state_changed))
195
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
196
302
                     self.name, self.type)
197
303
        self.group.AddService(
223
329
            try:
224
330
                self.group.Free()
225
331
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
 
332
                    dbus.exceptions.DBusException):
227
333
                pass
228
334
            self.group = None
229
335
        self.remove()
263
369
                                 self.server_state_changed)
264
370
        self.server_state_changed(self.server.GetState())
265
371
 
 
372
class AvahiServiceToSyslog(AvahiService):
 
373
    def rename(self):
 
374
        """Add the new name to the syslog messages"""
 
375
        ret = AvahiService.rename(self)
 
376
        syslogger.setFormatter(logging.Formatter
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
 
380
        return ret
266
381
 
 
382
def timedelta_to_milliseconds(td):
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
            + (td.seconds * 1000)
 
386
            + (td.microseconds // 1000))
 
387
        
267
388
class Client(object):
268
389
    """A representation of a client host served by this server.
269
390
    
270
391
    Attributes:
271
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
272
393
    approval_delay: datetime.timedelta(); Time to wait for approval
273
394
    approval_duration: datetime.timedelta(); Duration of one approval
274
395
    checker:    subprocess.Popen(); a running checker process used
281
402
                     instance %(name)s can be used in the command.
282
403
    checker_initiator_tag: a gobject event source tag, or None
283
404
    created:    datetime.datetime(); (UTC) object creation
 
405
    client_structure: Object describing what attributes a client has
 
406
                      and is used for storing the client at exit
284
407
    current_checker_command: string; current running checker_command
285
 
    disable_hook:  If set, called by disable() as disable_hook(self)
286
408
    disable_initiator_tag: a gobject event source tag, or None
287
409
    enabled:    bool()
288
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
291
413
    interval:   datetime.timedelta(); How often to start a new checker
292
414
    last_approval_request: datetime.datetime(); (UTC) or None
293
415
    last_checked_ok: datetime.datetime(); (UTC) or None
294
 
    last_enabled: datetime.datetime(); (UTC)
 
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
                         status of last checker. -1 reflects crashed
 
418
                         checker, or None.
 
419
    last_enabled: datetime.datetime(); (UTC) or None
295
420
    name:       string; from the config file, used in log messages and
296
421
                        D-Bus identifiers
297
422
    secret:     bytestring; sent verbatim (over TLS) to client
307
432
                          "created", "enabled", "fingerprint",
308
433
                          "host", "interval", "last_checked_ok",
309
434
                          "last_enabled", "name", "timeout")
310
 
    
311
 
    @staticmethod
312
 
    def _timedelta_to_milliseconds(td):
313
 
        "Convert a datetime.timedelta() to milliseconds"
314
 
        return ((td.days * 24 * 60 * 60 * 1000)
315
 
                + (td.seconds * 1000)
316
 
                + (td.microseconds // 1000))
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
 
438
                        "checker": "fping -q -- %%(host)s",
 
439
                        "host": "",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
 
442
                        "approved_by_default": "True",
 
443
                        "enabled": "True",
 
444
                        }
317
445
    
318
446
    def timeout_milliseconds(self):
319
447
        "Return the 'timeout' attribute in milliseconds"
320
 
        return self._timedelta_to_milliseconds(self.timeout)
321
 
 
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
322
450
    def extended_timeout_milliseconds(self):
323
451
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return self._timedelta_to_milliseconds(self.extended_timeout)    
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
325
453
    
326
454
    def interval_milliseconds(self):
327
455
        "Return the 'interval' attribute in milliseconds"
328
 
        return self._timedelta_to_milliseconds(self.interval)
329
 
 
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
330
458
    def approval_delay_milliseconds(self):
331
 
        return self._timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
 
461
    @staticmethod
 
462
    def config_parser(config):
 
463
        """Construct a new dict of client settings of this form:
 
464
        { client_name: {setting_name: value, ...}, ...}
 
465
        with exceptions for any special settings as defined above.
 
466
        NOTE: Must be a pure function. Must return the same result
 
467
        value given the same arguments.
 
468
        """
 
469
        settings = {}
 
470
        for client_name in config.sections():
 
471
            section = dict(config.items(client_name))
 
472
            client = settings[client_name] = {}
 
473
            
 
474
            client["host"] = section["host"]
 
475
            # Reformat values from string types to Python types
 
476
            client["approved_by_default"] = config.getboolean(
 
477
                client_name, "approved_by_default")
 
478
            client["enabled"] = config.getboolean(client_name,
 
479
                                                  "enabled")
 
480
            
 
481
            client["fingerprint"] = (section["fingerprint"].upper()
 
482
                                     .replace(" ", ""))
 
483
            if "secret" in section:
 
484
                client["secret"] = section["secret"].decode("base64")
 
485
            elif "secfile" in section:
 
486
                with open(os.path.expanduser(os.path.expandvars
 
487
                                             (section["secfile"])),
 
488
                          "rb") as secfile:
 
489
                    client["secret"] = secfile.read()
 
490
            else:
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
 
493
            client["timeout"] = string_to_delta(section["timeout"])
 
494
            client["extended_timeout"] = string_to_delta(
 
495
                section["extended_timeout"])
 
496
            client["interval"] = string_to_delta(section["interval"])
 
497
            client["approval_delay"] = string_to_delta(
 
498
                section["approval_delay"])
 
499
            client["approval_duration"] = string_to_delta(
 
500
                section["approval_duration"])
 
501
            client["checker_command"] = section["checker"]
 
502
            client["last_approval_request"] = None
 
503
            client["last_checked_ok"] = None
 
504
            client["last_checker_status"] = None
 
505
        
 
506
        return settings
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
334
510
        """Note: the 'checker' key in 'config' sets the
335
511
        'checker_command' attribute and *not* the 'checker'
336
512
        attribute."""
337
513
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
514
        # adding all client settings
 
515
        for setting, value in settings.iteritems():
 
516
            setattr(self, setting, value)
 
517
        
 
518
        if self.enabled:
 
519
            if not hasattr(self, "last_enabled"):
 
520
                self.last_enabled = datetime.datetime.utcnow()
 
521
            if not hasattr(self, "expires"):
 
522
                self.expires = (datetime.datetime.utcnow()
 
523
                                + self.timeout)
 
524
        else:
 
525
            self.last_enabled = None
 
526
            self.expires = None
 
527
       
340
528
        logger.debug("Creating client %r", self.name)
341
529
        # Uppercase and remove spaces from fingerprint for later
342
530
        # comparison purposes with return value from the fingerprint()
343
531
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
347
 
        if "secret" in config:
348
 
            self.secret = config["secret"].decode("base64")
349
 
        elif "secfile" in config:
350
 
            with open(os.path.expanduser(os.path.expandvars
351
 
                                         (config["secfile"])),
352
 
                      "rb") as secfile:
353
 
                self.secret = secfile.read()
354
 
        else:
355
 
            raise TypeError("No secret or secfile for client %s"
356
 
                            % self.name)
357
 
        self.host = config.get("host", "")
358
 
        self.created = datetime.datetime.utcnow()
359
 
        self.enabled = False
360
 
        self.last_approval_request = None
361
 
        self.last_enabled = None
362
 
        self.last_checked_ok = None
363
 
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
365
 
        self.interval = string_to_delta(config["interval"])
366
 
        self.disable_hook = disable_hook
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
367
537
        self.checker = None
368
538
        self.checker_initiator_tag = None
369
539
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
540
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
541
        self.current_checker_command = None
374
 
        self.last_connect = None
375
 
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
377
 
                                              True)
 
542
        self.approved = None
378
543
        self.approvals_pending = 0
379
 
        self.approval_delay = string_to_delta(
380
 
            config["approval_delay"])
381
 
        self.approval_duration = string_to_delta(
382
 
            config["approval_duration"])
383
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
544
        self.changedstate = (multiprocessing_manager
 
545
                             .Condition(multiprocessing_manager
 
546
                                        .Lock()))
 
547
        self.client_structure = [attr for attr in
 
548
                                 self.__dict__.iterkeys()
 
549
                                 if not attr.startswith("_")]
 
550
        self.client_structure.append("client_structure")
 
551
        
 
552
        for name, t in inspect.getmembers(type(self),
 
553
                                          lambda obj:
 
554
                                              isinstance(obj,
 
555
                                                         property)):
 
556
            if not name.startswith("_"):
 
557
                self.client_structure.append(name)
384
558
    
 
559
    # Send notice to process children that client state has changed
385
560
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
390
564
    def enable(self):
391
565
        """Start this client's checker and timeout hooks"""
392
566
        if getattr(self, "enabled", False):
393
567
            # Already enabled
394
568
            return
395
569
        self.send_changedstate()
 
570
        self.expires = datetime.datetime.utcnow() + self.timeout
 
571
        self.enabled = True
396
572
        self.last_enabled = datetime.datetime.utcnow()
397
 
        # Schedule a new checker to be started an 'interval' from now,
398
 
        # and every interval from then on.
399
 
        self.checker_initiator_tag = (gobject.timeout_add
400
 
                                      (self.interval_milliseconds(),
401
 
                                       self.start_checker))
402
 
        # Schedule a disable() when 'timeout' has passed
403
 
        self.expires = datetime.datetime.utcnow() + self.timeout
404
 
        self.disable_initiator_tag = (gobject.timeout_add
405
 
                                   (self.timeout_milliseconds(),
406
 
                                    self.disable))
407
 
        self.enabled = True
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
573
        self.init_checker()
410
574
    
411
575
    def disable(self, quiet=True):
412
576
        """Disable this client."""
424
588
            gobject.source_remove(self.checker_initiator_tag)
425
589
            self.checker_initiator_tag = None
426
590
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
591
        self.enabled = False
430
592
        # Do not run this again if called by a gobject.timeout_add
431
593
        return False
432
594
    
433
595
    def __del__(self):
434
 
        self.disable_hook = None
435
596
        self.disable()
436
597
    
 
598
    def init_checker(self):
 
599
        # Schedule a new checker to be started an 'interval' from now,
 
600
        # and every interval from then on.
 
601
        self.checker_initiator_tag = (gobject.timeout_add
 
602
                                      (self.interval_milliseconds(),
 
603
                                       self.start_checker))
 
604
        # Schedule a disable() when 'timeout' has passed
 
605
        self.disable_initiator_tag = (gobject.timeout_add
 
606
                                   (self.timeout_milliseconds(),
 
607
                                    self.disable))
 
608
        # Also start a new checker *right now*.
 
609
        self.start_checker()
 
610
    
437
611
    def checker_callback(self, pid, condition, command):
438
612
        """The checker has completed, so take appropriate actions."""
439
613
        self.checker_callback_tag = None
440
614
        self.checker = None
441
615
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
444
618
                logger.info("Checker for %(name)s succeeded",
445
619
                            vars(self))
446
620
                self.checked_ok()
448
622
                logger.info("Checker for %(name)s failed",
449
623
                            vars(self))
450
624
        else:
 
625
            self.last_checker_status = -1
451
626
            logger.warning("Checker for %(name)s crashed?",
452
627
                           vars(self))
453
628
    
460
635
        if timeout is None:
461
636
            timeout = self.timeout
462
637
        self.last_checked_ok = datetime.datetime.utcnow()
463
 
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
 
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (self._timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
638
        if self.disable_initiator_tag is not None:
 
639
            gobject.source_remove(self.disable_initiator_tag)
 
640
        if getattr(self, "enabled", False):
 
641
            self.disable_initiator_tag = (gobject.timeout_add
 
642
                                          (timedelta_to_milliseconds
 
643
                                           (timeout), self.disable))
 
644
            self.expires = datetime.datetime.utcnow() + timeout
468
645
    
469
646
    def need_approval(self):
470
647
        self.last_approval_request = datetime.datetime.utcnow()
510
687
                                       'replace')))
511
688
                    for attr in
512
689
                    self.runtime_expansions)
513
 
 
 
690
                
514
691
                try:
515
692
                    command = self.checker_command % escaped_attrs
516
693
                except TypeError as error:
562
739
                raise
563
740
        self.checker = None
564
741
 
 
742
 
565
743
def dbus_service_property(dbus_interface, signature="v",
566
744
                          access="readwrite", byte_arrays=False):
567
745
    """Decorators for marking methods of a DBusObjectWithProperties to
613
791
 
614
792
class DBusObjectWithProperties(dbus.service.Object):
615
793
    """A D-Bus object with properties.
616
 
 
 
794
    
617
795
    Classes inheriting from this can use the dbus_service_property
618
796
    decorator to expose methods as D-Bus properties.  It exposes the
619
797
    standard Get(), Set(), and GetAll() methods on the D-Bus.
626
804
    def _get_all_dbus_properties(self):
627
805
        """Returns a generator of (name, attribute) pairs
628
806
        """
629
 
        return ((prop._dbus_name, prop)
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
808
                for cls in self.__class__.__mro__
630
809
                for name, prop in
631
 
                inspect.getmembers(self, self._is_dbus_property))
 
810
                inspect.getmembers(cls, self._is_dbus_property))
632
811
    
633
812
    def _get_dbus_property(self, interface_name, property_name):
634
813
        """Returns a bound method if one exists which is a D-Bus
635
814
        property with the specified name and interface.
636
815
        """
637
 
        for name in (property_name,
638
 
                     property_name + "_dbus_property"):
639
 
            prop = getattr(self, name, None)
640
 
            if (prop is None
641
 
                or not self._is_dbus_property(prop)
642
 
                or prop._dbus_name != property_name
643
 
                or (interface_name and prop._dbus_interface
644
 
                    and interface_name != prop._dbus_interface)):
645
 
                continue
646
 
            return prop
 
816
        for cls in  self.__class__.__mro__:
 
817
            for name, value in (inspect.getmembers
 
818
                                (cls, self._is_dbus_property)):
 
819
                if (value._dbus_name == property_name
 
820
                    and value._dbus_interface == interface_name):
 
821
                    return value.__get__(self)
 
822
        
647
823
        # No such property
648
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
825
                                   + interface_name + "."
674
850
            # signatures other than "ay".
675
851
            if prop._dbus_signature != "ay":
676
852
                raise ValueError
677
 
            value = dbus.ByteArray(''.join(unichr(byte)
678
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
679
855
        prop(value)
680
856
    
681
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
683
859
    def GetAll(self, interface_name):
684
860
        """Standard D-Bus property GetAll() method, see D-Bus
685
861
        standard.
686
 
 
 
862
        
687
863
        Note: Will not include properties with access="write".
688
864
        """
689
 
        all = {}
 
865
        properties = {}
690
866
        for name, prop in self._get_all_dbus_properties():
691
867
            if (interface_name
692
868
                and interface_name != prop._dbus_interface):
697
873
                continue
698
874
            value = prop()
699
875
            if not hasattr(value, "variant_level"):
700
 
                all[name] = value
 
876
                properties[name] = value
701
877
                continue
702
 
            all[name] = type(value)(value, variant_level=
703
 
                                    value.variant_level+1)
704
 
        return dbus.Dictionary(all, signature="sv")
 
878
            properties[name] = type(value)(value, variant_level=
 
879
                                           value.variant_level+1)
 
880
        return dbus.Dictionary(properties, signature="sv")
705
881
    
706
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
883
                         out_signature="s",
751
927
        return xmlstring
752
928
 
753
929
 
 
930
def datetime_to_dbus (dt, variant_level=0):
 
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
932
    if dt is None:
 
933
        return dbus.String("", variant_level = variant_level)
 
934
    return dbus.String(dt.isoformat(),
 
935
                       variant_level=variant_level)
 
936
 
 
937
 
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
 
942
    """
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
 
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
951
                # with the wrong interface name
 
952
                if (not hasattr(attribute, "_dbus_interface")
 
953
                    or not attribute._dbus_interface
 
954
                    .startswith("se.recompile.Mandos")):
 
955
                    continue
 
956
                # Create an alternate D-Bus interface name based on
 
957
                # the current name
 
958
                alt_interface = (attribute._dbus_interface
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
 
961
                # Is this a D-Bus signal?
 
962
                if getattr(attribute, "_dbus_is_signal", False):
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
 
965
                    nonmethod_func = (dict(
 
966
                            zip(attribute.func_code.co_freevars,
 
967
                                attribute.__closure__))["func"]
 
968
                                      .cell_contents)
 
969
                    # Create a new, but exactly alike, function
 
970
                    # object, and decorate it to be a new D-Bus signal
 
971
                    # with the alternate D-Bus interface name
 
972
                    new_function = (dbus.service.signal
 
973
                                    (alt_interface,
 
974
                                     attribute._dbus_signature)
 
975
                                    (types.FunctionType(
 
976
                                nonmethod_func.func_code,
 
977
                                nonmethod_func.func_globals,
 
978
                                nonmethod_func.func_name,
 
979
                                nonmethod_func.func_defaults,
 
980
                                nonmethod_func.func_closure)))
 
981
                    # Define a creator of a function to call both the
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
 
984
                    def fixscope(func1, func2):
 
985
                        """This function is a scope container to pass
 
986
                        func1 and func2 to the "call_both" function
 
987
                        outside of its arguments"""
 
988
                        def call_both(*args, **kwargs):
 
989
                            """This function will emit two D-Bus
 
990
                            signals by calling func1 and func2"""
 
991
                            func1(*args, **kwargs)
 
992
                            func2(*args, **kwargs)
 
993
                        return call_both
 
994
                    # Create the "call_both" function and add it to
 
995
                    # the class
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
 
998
                # Is this a D-Bus method?
 
999
                elif getattr(attribute, "_dbus_is_method", False):
 
1000
                    # Create a new, but exactly alike, function
 
1001
                    # object.  Decorate it to be a new D-Bus method
 
1002
                    # with the alternate D-Bus interface name.  Add it
 
1003
                    # to the class.
 
1004
                    attr[attrname] = (dbus.service.method
 
1005
                                      (alt_interface,
 
1006
                                       attribute._dbus_in_signature,
 
1007
                                       attribute._dbus_out_signature)
 
1008
                                      (types.FunctionType
 
1009
                                       (attribute.func_code,
 
1010
                                        attribute.func_globals,
 
1011
                                        attribute.func_name,
 
1012
                                        attribute.func_defaults,
 
1013
                                        attribute.func_closure)))
 
1014
                # Is this a D-Bus property?
 
1015
                elif getattr(attribute, "_dbus_is_property", False):
 
1016
                    # Create a new, but exactly alike, function
 
1017
                    # object, and decorate it to be a new D-Bus
 
1018
                    # property with the alternate D-Bus interface
 
1019
                    # name.  Add it to the class.
 
1020
                    attr[attrname] = (dbus_service_property
 
1021
                                      (alt_interface,
 
1022
                                       attribute._dbus_signature,
 
1023
                                       attribute._dbus_access,
 
1024
                                       attribute
 
1025
                                       ._dbus_get_args_options
 
1026
                                       ["byte_arrays"])
 
1027
                                      (types.FunctionType
 
1028
                                       (attribute.func_code,
 
1029
                                        attribute.func_globals,
 
1030
                                        attribute.func_name,
 
1031
                                        attribute.func_defaults,
 
1032
                                        attribute.func_closure)))
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
754
1036
class ClientDBus(Client, DBusObjectWithProperties):
755
1037
    """A Client class using D-Bus
756
1038
    
765
1047
    # dbus.service.Object doesn't use super(), so we can't either.
766
1048
    
767
1049
    def __init__(self, bus = None, *args, **kwargs):
768
 
        self._approvals_pending = 0
769
1050
        self.bus = bus
770
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
771
1055
        # Only now, when this client is initialized, can it show up on
772
1056
        # the D-Bus
773
1057
        client_object_name = unicode(self.name).translate(
777
1061
                                 ("/clients/" + client_object_name))
778
1062
        DBusObjectWithProperties.__init__(self, self.bus,
779
1063
                                          self.dbus_object_path)
780
 
    def _set_expires(self, value):
781
 
        old_value = getattr(self, "_expires", None)
782
 
        self._expires = value
783
 
        if hasattr(self, "dbus_object_path") and old_value != value:
784
 
            dbus_time = (self._datetime_to_dbus(self._expires,
785
 
                                                variant_level=1))
786
 
            self.PropertyChanged(dbus.String("Expires"),
787
 
                                 dbus_time)
788
 
    expires = property(lambda self: self._expires, _set_expires)
789
 
    del _set_expires
790
 
        
791
 
    def _get_approvals_pending(self):
792
 
        return self._approvals_pending
793
 
    def _set_approvals_pending(self, value):
794
 
        old_value = self._approvals_pending
795
 
        self._approvals_pending = value
796
 
        bval = bool(value)
797
 
        if (hasattr(self, "dbus_object_path")
798
 
            and bval is not bool(old_value)):
799
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
800
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
801
 
                                 dbus_bool)
802
 
 
803
 
    approvals_pending = property(_get_approvals_pending,
804
 
                                 _set_approvals_pending)
805
 
    del _get_approvals_pending, _set_approvals_pending
806
 
    
807
 
    @staticmethod
808
 
    def _datetime_to_dbus(dt, variant_level=0):
809
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
810
 
        if dt is None:
811
 
            return dbus.String("", variant_level = variant_level)
812
 
        return dbus.String(dt.isoformat(),
813
 
                           variant_level=variant_level)
814
 
    
815
 
    def enable(self):
816
 
        oldstate = getattr(self, "enabled", False)
817
 
        r = Client.enable(self)
818
 
        if oldstate != self.enabled:
819
 
            # Emit D-Bus signals
820
 
            self.PropertyChanged(dbus.String("Enabled"),
821
 
                                 dbus.Boolean(True, variant_level=1))
822
 
            self.PropertyChanged(
823
 
                dbus.String("LastEnabled"),
824
 
                self._datetime_to_dbus(self.last_enabled,
825
 
                                       variant_level=1))
826
 
        return r
827
 
    
828
 
    def disable(self, quiet = False):
829
 
        oldstate = getattr(self, "enabled", False)
830
 
        r = Client.disable(self, quiet=quiet)
831
 
        if not quiet and oldstate != self.enabled:
832
 
            # Emit D-Bus signal
833
 
            self.PropertyChanged(dbus.String("Enabled"),
834
 
                                 dbus.Boolean(False, variant_level=1))
835
 
        return r
 
1064
        
 
1065
    def notifychangeproperty(transform_func,
 
1066
                             dbus_name, type_func=lambda x: x,
 
1067
                             variant_level=1):
 
1068
        """ Modify a variable so that it's a property which announces
 
1069
        its changes to DBus.
 
1070
        
 
1071
        transform_fun: Function that takes a value and a variant_level
 
1072
                       and transforms it to a D-Bus type.
 
1073
        dbus_name: D-Bus name of the variable
 
1074
        type_func: Function that transform the value before sending it
 
1075
                   to the D-Bus.  Default: no transform
 
1076
        variant_level: D-Bus variant level.  Default: 1
 
1077
        """
 
1078
        attrname = "_{0}".format(dbus_name)
 
1079
        def setter(self, value):
 
1080
            if hasattr(self, "dbus_object_path"):
 
1081
                if (not hasattr(self, attrname) or
 
1082
                    type_func(getattr(self, attrname, None))
 
1083
                    != type_func(value)):
 
1084
                    dbus_value = transform_func(type_func(value),
 
1085
                                                variant_level
 
1086
                                                =variant_level)
 
1087
                    self.PropertyChanged(dbus.String(dbus_name),
 
1088
                                         dbus_value)
 
1089
            setattr(self, attrname, value)
 
1090
        
 
1091
        return property(lambda self: getattr(self, attrname), setter)
 
1092
    
 
1093
    
 
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1096
                                             "ApprovalPending",
 
1097
                                             type_func = bool)
 
1098
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1099
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1100
                                        "LastEnabled")
 
1101
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1102
                                   type_func = lambda checker:
 
1103
                                       checker is not None)
 
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1105
                                           "LastCheckedOK")
 
1106
    last_approval_request = notifychangeproperty(
 
1107
        datetime_to_dbus, "LastApprovalRequest")
 
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1109
                                               "ApprovedByDefault")
 
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1111
                                          "ApprovalDelay",
 
1112
                                          type_func =
 
1113
                                          timedelta_to_milliseconds)
 
1114
    approval_duration = notifychangeproperty(
 
1115
        dbus.UInt64, "ApprovalDuration",
 
1116
        type_func = timedelta_to_milliseconds)
 
1117
    host = notifychangeproperty(dbus.String, "Host")
 
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1119
                                   type_func =
 
1120
                                   timedelta_to_milliseconds)
 
1121
    extended_timeout = notifychangeproperty(
 
1122
        dbus.UInt64, "ExtendedTimeout",
 
1123
        type_func = timedelta_to_milliseconds)
 
1124
    interval = notifychangeproperty(dbus.UInt64,
 
1125
                                    "Interval",
 
1126
                                    type_func =
 
1127
                                    timedelta_to_milliseconds)
 
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1129
    
 
1130
    del notifychangeproperty
836
1131
    
837
1132
    def __del__(self, *args, **kwargs):
838
1133
        try:
847
1142
                         *args, **kwargs):
848
1143
        self.checker_callback_tag = None
849
1144
        self.checker = None
850
 
        # Emit D-Bus signal
851
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
852
 
                             dbus.Boolean(False, variant_level=1))
853
1145
        if os.WIFEXITED(condition):
854
1146
            exitstatus = os.WEXITSTATUS(condition)
855
1147
            # Emit D-Bus signal
865
1157
        return Client.checker_callback(self, pid, condition, command,
866
1158
                                       *args, **kwargs)
867
1159
    
868
 
    def checked_ok(self, *args, **kwargs):
869
 
        Client.checked_ok(self, *args, **kwargs)
870
 
        # Emit D-Bus signal
871
 
        self.PropertyChanged(
872
 
            dbus.String("LastCheckedOK"),
873
 
            (self._datetime_to_dbus(self.last_checked_ok,
874
 
                                    variant_level=1)))
875
 
    
876
 
    def need_approval(self, *args, **kwargs):
877
 
        r = Client.need_approval(self, *args, **kwargs)
878
 
        # Emit D-Bus signal
879
 
        self.PropertyChanged(
880
 
            dbus.String("LastApprovalRequest"),
881
 
            (self._datetime_to_dbus(self.last_approval_request,
882
 
                                    variant_level=1)))
883
 
        return r
884
 
    
885
1160
    def start_checker(self, *args, **kwargs):
886
1161
        old_checker = self.checker
887
1162
        if self.checker is not None:
894
1169
            and old_checker_pid != self.checker.pid):
895
1170
            # Emit D-Bus signal
896
1171
            self.CheckerStarted(self.current_checker_command)
897
 
            self.PropertyChanged(
898
 
                dbus.String("CheckerRunning"),
899
 
                dbus.Boolean(True, variant_level=1))
900
1172
        return r
901
1173
    
902
 
    def stop_checker(self, *args, **kwargs):
903
 
        old_checker = getattr(self, "checker", None)
904
 
        r = Client.stop_checker(self, *args, **kwargs)
905
 
        if (old_checker is not None
906
 
            and getattr(self, "checker", None) is None):
907
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
908
 
                                 dbus.Boolean(False, variant_level=1))
909
 
        return r
910
 
 
911
1174
    def _reset_approved(self):
912
 
        self._approved = None
 
1175
        self.approved = None
913
1176
        return False
914
1177
    
915
1178
    def approve(self, value=True):
916
1179
        self.send_changedstate()
917
 
        self._approved = value
918
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1180
        self.approved = value
 
1181
        gobject.timeout_add(timedelta_to_milliseconds
919
1182
                            (self.approval_duration),
920
1183
                            self._reset_approved)
921
1184
    
922
1185
    
923
1186
    ## D-Bus methods, signals & properties
924
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1187
    _interface = "se.recompile.Mandos.Client"
925
1188
    
926
1189
    ## Signals
927
1190
    
964
1227
        "D-Bus signal"
965
1228
        return self.need_approval()
966
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
967
1238
    ## Methods
968
1239
    
969
1240
    # Approve - method
1012
1283
    def ApprovedByDefault_dbus_property(self, value=None):
1013
1284
        if value is None:       # get
1014
1285
            return dbus.Boolean(self.approved_by_default)
1015
 
        old_value = self.approved_by_default
1016
1286
        self.approved_by_default = bool(value)
1017
 
        # Emit D-Bus signal
1018
 
        if old_value != self.approved_by_default:
1019
 
            self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
 
                                 dbus.Boolean(value, variant_level=1))
1021
1287
    
1022
1288
    # ApprovalDelay - property
1023
1289
    @dbus_service_property(_interface, signature="t",
1025
1291
    def ApprovalDelay_dbus_property(self, value=None):
1026
1292
        if value is None:       # get
1027
1293
            return dbus.UInt64(self.approval_delay_milliseconds())
1028
 
        old_value = self.approval_delay
1029
1294
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
 
        # Emit D-Bus signal
1031
 
        if old_value != self.approval_delay:
1032
 
            self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
 
                                 dbus.UInt64(value, variant_level=1))
1034
1295
    
1035
1296
    # ApprovalDuration - property
1036
1297
    @dbus_service_property(_interface, signature="t",
1037
1298
                           access="readwrite")
1038
1299
    def ApprovalDuration_dbus_property(self, value=None):
1039
1300
        if value is None:       # get
1040
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1301
            return dbus.UInt64(timedelta_to_milliseconds(
1041
1302
                    self.approval_duration))
1042
 
        old_value = self.approval_duration
1043
1303
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
 
        # Emit D-Bus signal
1045
 
        if old_value != self.approval_duration:
1046
 
            self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
 
                                 dbus.UInt64(value, variant_level=1))
1048
1304
    
1049
1305
    # Name - property
1050
1306
    @dbus_service_property(_interface, signature="s", access="read")
1062
1318
    def Host_dbus_property(self, value=None):
1063
1319
        if value is None:       # get
1064
1320
            return dbus.String(self.host)
1065
 
        old_value = self.host
1066
 
        self.host = value
1067
 
        # Emit D-Bus signal
1068
 
        if old_value != self.host:
1069
 
            self.PropertyChanged(dbus.String("Host"),
1070
 
                                 dbus.String(value, variant_level=1))
 
1321
        self.host = unicode(value)
1071
1322
    
1072
1323
    # Created - property
1073
1324
    @dbus_service_property(_interface, signature="s", access="read")
1074
1325
    def Created_dbus_property(self):
1075
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1326
        return datetime_to_dbus(self.created)
1076
1327
    
1077
1328
    # LastEnabled - property
1078
1329
    @dbus_service_property(_interface, signature="s", access="read")
1079
1330
    def LastEnabled_dbus_property(self):
1080
 
        return self._datetime_to_dbus(self.last_enabled)
 
1331
        return datetime_to_dbus(self.last_enabled)
1081
1332
    
1082
1333
    # Enabled - property
1083
1334
    @dbus_service_property(_interface, signature="b",
1097
1348
        if value is not None:
1098
1349
            self.checked_ok()
1099
1350
            return
1100
 
        return self._datetime_to_dbus(self.last_checked_ok)
 
1351
        return datetime_to_dbus(self.last_checked_ok)
1101
1352
    
1102
1353
    # Expires - property
1103
1354
    @dbus_service_property(_interface, signature="s", access="read")
1104
1355
    def Expires_dbus_property(self):
1105
 
        return self._datetime_to_dbus(self.expires)
 
1356
        return datetime_to_dbus(self.expires)
1106
1357
    
1107
1358
    # LastApprovalRequest - property
1108
1359
    @dbus_service_property(_interface, signature="s", access="read")
1109
1360
    def LastApprovalRequest_dbus_property(self):
1110
 
        return self._datetime_to_dbus(self.last_approval_request)
 
1361
        return datetime_to_dbus(self.last_approval_request)
1111
1362
    
1112
1363
    # Timeout - property
1113
1364
    @dbus_service_property(_interface, signature="t",
1115
1366
    def Timeout_dbus_property(self, value=None):
1116
1367
        if value is None:       # get
1117
1368
            return dbus.UInt64(self.timeout_milliseconds())
1118
 
        old_value = self.timeout
1119
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1120
 
        # Emit D-Bus signal
1121
 
        if old_value != self.timeout:
1122
 
            self.PropertyChanged(dbus.String("Timeout"),
1123
 
                                 dbus.UInt64(value, variant_level=1))
1124
 
        if getattr(self, "disable_initiator_tag", None) is None:
1125
 
            return
1126
1370
        # Reschedule timeout
1127
 
        gobject.source_remove(self.disable_initiator_tag)
1128
 
        self.disable_initiator_tag = None
1129
 
        self.expires = None
1130
 
        time_to_die = (self.
1131
 
                       _timedelta_to_milliseconds((self
1132
 
                                                   .last_checked_ok
1133
 
                                                   + self.timeout)
1134
 
                                                  - datetime.datetime
1135
 
                                                  .utcnow()))
1136
 
        if time_to_die <= 0:
1137
 
            # The timeout has passed
1138
 
            self.disable()
1139
 
        else:
1140
 
            self.expires = (datetime.datetime.utcnow()
1141
 
                            + datetime.timedelta(milliseconds = time_to_die))
1142
 
            self.disable_initiator_tag = (gobject.timeout_add
1143
 
                                          (time_to_die, self.disable))
1144
 
 
 
1371
        if self.enabled:
 
1372
            now = datetime.datetime.utcnow()
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
 
1376
                # The timeout has passed
 
1377
                self.disable()
 
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
 
1382
                if (getattr(self, "disable_initiator_tag", None)
 
1383
                    is None):
 
1384
                    return
 
1385
                gobject.source_remove(self.disable_initiator_tag)
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
 
1389
    
1145
1390
    # ExtendedTimeout - property
1146
1391
    @dbus_service_property(_interface, signature="t",
1147
1392
                           access="readwrite")
1148
1393
    def ExtendedTimeout_dbus_property(self, value=None):
1149
1394
        if value is None:       # get
1150
1395
            return dbus.UInt64(self.extended_timeout_milliseconds())
1151
 
        old_value = self.extended_timeout
1152
1396
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1153
 
        # Emit D-Bus signal
1154
 
        if old_value != self.extended_timeout:
1155
 
            self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
 
                                 dbus.UInt64(value, variant_level=1))
1157
 
 
 
1397
    
1158
1398
    # Interval - property
1159
1399
    @dbus_service_property(_interface, signature="t",
1160
1400
                           access="readwrite")
1161
1401
    def Interval_dbus_property(self, value=None):
1162
1402
        if value is None:       # get
1163
1403
            return dbus.UInt64(self.interval_milliseconds())
1164
 
        old_value = self.interval
1165
1404
        self.interval = datetime.timedelta(0, 0, 0, value)
1166
 
        # Emit D-Bus signal
1167
 
        if old_value != self.interval:
1168
 
            self.PropertyChanged(dbus.String("Interval"),
1169
 
                                 dbus.UInt64(value, variant_level=1))
1170
1405
        if getattr(self, "checker_initiator_tag", None) is None:
1171
1406
            return
1172
 
        # Reschedule checker run
1173
 
        gobject.source_remove(self.checker_initiator_tag)
1174
 
        self.checker_initiator_tag = (gobject.timeout_add
1175
 
                                      (value, self.start_checker))
1176
 
        self.start_checker()    # Start one now, too
1177
 
 
 
1407
        if self.enabled:
 
1408
            # Reschedule checker run
 
1409
            gobject.source_remove(self.checker_initiator_tag)
 
1410
            self.checker_initiator_tag = (gobject.timeout_add
 
1411
                                          (value, self.start_checker))
 
1412
            self.start_checker()    # Start one now, too
 
1413
    
1178
1414
    # Checker - property
1179
1415
    @dbus_service_property(_interface, signature="s",
1180
1416
                           access="readwrite")
1181
1417
    def Checker_dbus_property(self, value=None):
1182
1418
        if value is None:       # get
1183
1419
            return dbus.String(self.checker_command)
1184
 
        old_value = self.checker_command
1185
 
        self.checker_command = value
1186
 
        # Emit D-Bus signal
1187
 
        if old_value != self.checker_command:
1188
 
            self.PropertyChanged(dbus.String("Checker"),
1189
 
                                 dbus.String(self.checker_command,
1190
 
                                             variant_level=1))
 
1420
        self.checker_command = unicode(value)
1191
1421
    
1192
1422
    # CheckerRunning - property
1193
1423
    @dbus_service_property(_interface, signature="b",
1220
1450
        self._pipe.send(('init', fpr, address))
1221
1451
        if not self._pipe.recv():
1222
1452
            raise KeyError()
1223
 
 
 
1453
    
1224
1454
    def __getattribute__(self, name):
1225
 
        if(name == '_pipe'):
 
1455
        if name == '_pipe':
1226
1456
            return super(ProxyClient, self).__getattribute__(name)
1227
1457
        self._pipe.send(('getattr', name))
1228
1458
        data = self._pipe.recv()
1233
1463
                self._pipe.send(('funcall', name, args, kwargs))
1234
1464
                return self._pipe.recv()[1]
1235
1465
            return func
1236
 
 
 
1466
    
1237
1467
    def __setattr__(self, name, value):
1238
 
        if(name == '_pipe'):
 
1468
        if name == '_pipe':
1239
1469
            return super(ProxyClient, self).__setattr__(name, value)
1240
1470
        self._pipe.send(('setattr', name, value))
1241
1471
 
1242
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1243
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1244
1478
    """A class to handle client connections.
1245
1479
    
1252
1486
                        unicode(self.client_address))
1253
1487
            logger.debug("Pipe FD: %d",
1254
1488
                         self.server.child_pipe.fileno())
1255
 
 
 
1489
            
1256
1490
            session = (gnutls.connection
1257
1491
                       .ClientSession(self.request,
1258
1492
                                      gnutls.connection
1259
1493
                                      .X509Credentials()))
1260
 
 
 
1494
            
1261
1495
            # Note: gnutls.connection.X509Credentials is really a
1262
1496
            # generic GnuTLS certificate credentials object so long as
1263
1497
            # no X.509 keys are added to it.  Therefore, we can use it
1264
1498
            # here despite using OpenPGP certificates.
1265
 
 
 
1499
            
1266
1500
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
1501
            #                      "+AES-256-CBC", "+SHA1",
1268
1502
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1274
1508
            (gnutls.library.functions
1275
1509
             .gnutls_priority_set_direct(session._c_object,
1276
1510
                                         priority, None))
1277
 
 
 
1511
            
1278
1512
            # Start communication using the Mandos protocol
1279
1513
            # Get protocol number
1280
1514
            line = self.request.makefile().readline()
1285
1519
            except (ValueError, IndexError, RuntimeError) as error:
1286
1520
                logger.error("Unknown protocol version: %s", error)
1287
1521
                return
1288
 
 
 
1522
            
1289
1523
            # Start GnuTLS connection
1290
1524
            try:
1291
1525
                session.handshake()
1295
1529
                # established.  Just abandon the request.
1296
1530
                return
1297
1531
            logger.debug("Handshake succeeded")
1298
 
 
 
1532
            
1299
1533
            approval_required = False
1300
1534
            try:
1301
1535
                try:
1306
1540
                    logger.warning("Bad certificate: %s", error)
1307
1541
                    return
1308
1542
                logger.debug("Fingerprint: %s", fpr)
1309
 
 
 
1543
                
1310
1544
                try:
1311
1545
                    client = ProxyClient(child_pipe, fpr,
1312
1546
                                         self.client_address)
1313
1547
                except KeyError:
1314
1548
                    return
1315
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1316
1554
                if client.approval_delay:
1317
1555
                    delay = client.approval_delay
1318
1556
                    client.approvals_pending += 1
1324
1562
                                       client.name)
1325
1563
                        if self.server.use_dbus:
1326
1564
                            # Emit D-Bus signal
1327
 
                            client.Rejected("Disabled")                    
 
1565
                            client.Rejected("Disabled")
1328
1566
                        return
1329
1567
                    
1330
 
                    if client._approved or not client.approval_delay:
 
1568
                    if client.approved or not client.approval_delay:
1331
1569
                        #We are approved or approval is disabled
1332
1570
                        break
1333
 
                    elif client._approved is None:
 
1571
                    elif client.approved is None:
1334
1572
                        logger.info("Client %s needs approval",
1335
1573
                                    client.name)
1336
1574
                        if self.server.use_dbus:
1347
1585
                        return
1348
1586
                    
1349
1587
                    #wait until timeout or approved
1350
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1351
1588
                    time = datetime.datetime.now()
1352
1589
                    client.changedstate.acquire()
1353
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1354
1593
                    client.changedstate.release()
1355
1594
                    time2 = datetime.datetime.now()
1356
1595
                    if (time2 - time) >= delay:
1378
1617
                                 sent, len(client.secret)
1379
1618
                                 - (sent_size + sent))
1380
1619
                    sent_size += sent
1381
 
 
 
1620
                
1382
1621
                logger.info("Sending secret to %s", client.name)
1383
 
                # bump the timeout as if seen
 
1622
                # bump the timeout using extended_timeout
1384
1623
                client.checked_ok(client.extended_timeout)
1385
1624
                if self.server.use_dbus:
1386
1625
                    # Emit D-Bus signal
1454
1693
        # Convert the buffer to a Python bytestring
1455
1694
        fpr = ctypes.string_at(buf, buf_len.value)
1456
1695
        # Convert the bytestring to hexadecimal notation
1457
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1696
        hex_fpr = binascii.hexlify(fpr).upper()
1458
1697
        return hex_fpr
1459
1698
 
1460
1699
 
1463
1702
    def sub_process_main(self, request, address):
1464
1703
        try:
1465
1704
            self.finish_request(request, address)
1466
 
        except:
 
1705
        except Exception:
1467
1706
            self.handle_error(request, address)
1468
1707
        self.close_request(request)
1469
 
            
 
1708
    
1470
1709
    def process_request(self, request, address):
1471
1710
        """Start a new process to process the request."""
1472
 
        multiprocessing.Process(target = self.sub_process_main,
1473
 
                                args = (request, address)).start()
 
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1712
                                       args = (request,
 
1713
                                               address))
 
1714
        proc.start()
 
1715
        return proc
 
1716
 
1474
1717
 
1475
1718
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1476
1719
    """ adds a pipe to the MixIn """
1480
1723
        This function creates a new pipe in self.pipe
1481
1724
        """
1482
1725
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1483
 
 
1484
 
        super(MultiprocessingMixInWithPipe,
1485
 
              self).process_request(request, client_address)
 
1726
        
 
1727
        proc = MultiprocessingMixIn.process_request(self, request,
 
1728
                                                    client_address)
1486
1729
        self.child_pipe.close()
1487
 
        self.add_pipe(parent_pipe)
1488
 
 
1489
 
    def add_pipe(self, parent_pipe):
 
1730
        self.add_pipe(parent_pipe, proc)
 
1731
    
 
1732
    def add_pipe(self, parent_pipe, proc):
1490
1733
        """Dummy function; override as necessary"""
1491
1734
        raise NotImplementedError
1492
1735
 
 
1736
 
1493
1737
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1494
1738
                     socketserver.TCPServer, object):
1495
1739
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1569
1813
        self.enabled = False
1570
1814
        self.clients = clients
1571
1815
        if self.clients is None:
1572
 
            self.clients = set()
 
1816
            self.clients = {}
1573
1817
        self.use_dbus = use_dbus
1574
1818
        self.gnutls_priority = gnutls_priority
1575
1819
        IPv6_TCPServer.__init__(self, server_address,
1579
1823
    def server_activate(self):
1580
1824
        if self.enabled:
1581
1825
            return socketserver.TCPServer.server_activate(self)
 
1826
    
1582
1827
    def enable(self):
1583
1828
        self.enabled = True
1584
 
    def add_pipe(self, parent_pipe):
 
1829
    
 
1830
    def add_pipe(self, parent_pipe, proc):
1585
1831
        # Call "handle_ipc" for both data and EOF events
1586
1832
        gobject.io_add_watch(parent_pipe.fileno(),
1587
1833
                             gobject.IO_IN | gobject.IO_HUP,
1588
1834
                             functools.partial(self.handle_ipc,
1589
 
                                               parent_pipe = parent_pipe))
1590
 
        
 
1835
                                               parent_pipe =
 
1836
                                               parent_pipe,
 
1837
                                               proc = proc))
 
1838
    
1591
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
1592
 
                   client_object=None):
 
1840
                   proc = None, client_object=None):
1593
1841
        condition_names = {
1594
1842
            gobject.IO_IN: "IN",   # There is data to read.
1595
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
1604
1852
                                       for cond, name in
1605
1853
                                       condition_names.iteritems()
1606
1854
                                       if cond & condition)
1607
 
        # error or the other end of multiprocessing.Pipe has closed
 
1855
        # error, or the other end of multiprocessing.Pipe has closed
1608
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1857
            # Wait for other process to exit
 
1858
            proc.join()
1609
1859
            return False
1610
1860
        
1611
1861
        # Read a request from the child
1616
1866
            fpr = request[1]
1617
1867
            address = request[2]
1618
1868
            
1619
 
            for c in self.clients:
 
1869
            for c in self.clients.itervalues():
1620
1870
                if c.fingerprint == fpr:
1621
1871
                    client = c
1622
1872
                    break
1625
1875
                            "dress: %s", fpr, address)
1626
1876
                if self.use_dbus:
1627
1877
                    # Emit D-Bus signal
1628
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1878
                    mandos_dbus_service.ClientNotFound(fpr,
 
1879
                                                       address[0])
1629
1880
                parent_pipe.send(False)
1630
1881
                return False
1631
1882
            
1632
1883
            gobject.io_add_watch(parent_pipe.fileno(),
1633
1884
                                 gobject.IO_IN | gobject.IO_HUP,
1634
1885
                                 functools.partial(self.handle_ipc,
1635
 
                                                   parent_pipe = parent_pipe,
1636
 
                                                   client_object = client))
 
1886
                                                   parent_pipe =
 
1887
                                                   parent_pipe,
 
1888
                                                   proc = proc,
 
1889
                                                   client_object =
 
1890
                                                   client))
1637
1891
            parent_pipe.send(True)
1638
 
            # remove the old hook in favor of the new above hook on same fileno
 
1892
            # remove the old hook in favor of the new above hook on
 
1893
            # same fileno
1639
1894
            return False
1640
1895
        if command == 'funcall':
1641
1896
            funcname = request[1]
1642
1897
            args = request[2]
1643
1898
            kwargs = request[3]
1644
1899
            
1645
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1646
 
 
 
1900
            parent_pipe.send(('data', getattr(client_object,
 
1901
                                              funcname)(*args,
 
1902
                                                         **kwargs)))
 
1903
        
1647
1904
        if command == 'getattr':
1648
1905
            attrname = request[1]
1649
1906
            if callable(client_object.__getattribute__(attrname)):
1650
1907
                parent_pipe.send(('function',))
1651
1908
            else:
1652
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1909
                parent_pipe.send(('data', client_object
 
1910
                                  .__getattribute__(attrname)))
1653
1911
        
1654
1912
        if command == 'setattr':
1655
1913
            attrname = request[1]
1656
1914
            value = request[2]
1657
1915
            setattr(client_object, attrname, value)
1658
 
 
 
1916
        
1659
1917
        return True
1660
1918
 
1661
1919
 
1698
1956
    return timevalue
1699
1957
 
1700
1958
 
1701
 
def if_nametoindex(interface):
1702
 
    """Call the C function if_nametoindex(), or equivalent
1703
 
    
1704
 
    Note: This function cannot accept a unicode string."""
1705
 
    global if_nametoindex
1706
 
    try:
1707
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1708
 
                          (ctypes.util.find_library("c"))
1709
 
                          .if_nametoindex)
1710
 
    except (OSError, AttributeError):
1711
 
        logger.warning("Doing if_nametoindex the hard way")
1712
 
        def if_nametoindex(interface):
1713
 
            "Get an interface index the hard way, i.e. using fcntl()"
1714
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1715
 
            with contextlib.closing(socket.socket()) as s:
1716
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
 
                                    struct.pack(str("16s16x"),
1718
 
                                                interface))
1719
 
            interface_index = struct.unpack(str("I"),
1720
 
                                            ifreq[16:20])[0]
1721
 
            return interface_index
1722
 
    return if_nametoindex(interface)
1723
 
 
1724
 
 
1725
1959
def daemon(nochdir = False, noclose = False):
1726
1960
    """See daemon(3).  Standard BSD Unix function.
1727
1961
    
1782
2016
                        " system bus interface")
1783
2017
    parser.add_argument("--no-ipv6", action="store_false",
1784
2018
                        dest="use_ipv6", help="Do not use IPv6")
 
2019
    parser.add_argument("--no-restore", action="store_false",
 
2020
                        dest="restore", help="Do not restore stored"
 
2021
                        " state")
 
2022
    parser.add_argument("--statedir", metavar="DIR",
 
2023
                        help="Directory to save/restore state in")
 
2024
    
1785
2025
    options = parser.parse_args()
1786
2026
    
1787
2027
    if options.check:
1800
2040
                        "use_dbus": "True",
1801
2041
                        "use_ipv6": "True",
1802
2042
                        "debuglevel": "",
 
2043
                        "restore": "True",
 
2044
                        "statedir": "/var/lib/mandos"
1803
2045
                        }
1804
2046
    
1805
2047
    # Parse config file for server-global settings
1822
2064
    # options, if set.
1823
2065
    for option in ("interface", "address", "port", "debug",
1824
2066
                   "priority", "servicename", "configdir",
1825
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2068
                   "statedir"):
1826
2069
        value = getattr(options, option)
1827
2070
        if value is not None:
1828
2071
            server_settings[option] = value
1840
2083
    debuglevel = server_settings["debuglevel"]
1841
2084
    use_dbus = server_settings["use_dbus"]
1842
2085
    use_ipv6 = server_settings["use_ipv6"]
1843
 
 
 
2086
    stored_state_path = os.path.join(server_settings["statedir"],
 
2087
                                     stored_state_file)
 
2088
    
 
2089
    if debug:
 
2090
        initlogger(debug, logging.DEBUG)
 
2091
    else:
 
2092
        if not debuglevel:
 
2093
            initlogger(debug)
 
2094
        else:
 
2095
            level = getattr(logging, debuglevel.upper())
 
2096
            initlogger(debug, level)
 
2097
    
1844
2098
    if server_settings["servicename"] != "Mandos":
1845
2099
        syslogger.setFormatter(logging.Formatter
1846
2100
                               ('Mandos (%s) [%%(process)d]:'
1848
2102
                                % server_settings["servicename"]))
1849
2103
    
1850
2104
    # Parse config file with clients
1851
 
    client_defaults = { "timeout": "5m",
1852
 
                        "extended_timeout": "15m",
1853
 
                        "interval": "2m",
1854
 
                        "checker": "fping -q -- %%(host)s",
1855
 
                        "host": "",
1856
 
                        "approval_delay": "0s",
1857
 
                        "approval_duration": "1s",
1858
 
                        }
1859
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2105
    client_config = configparser.SafeConfigParser(Client
 
2106
                                                  .client_defaults)
1860
2107
    client_config.read(os.path.join(server_settings["configdir"],
1861
2108
                                    "clients.conf"))
1862
2109
    
1900
2147
        if error[0] != errno.EPERM:
1901
2148
            raise error
1902
2149
    
1903
 
    if not debug and not debuglevel:
1904
 
        syslogger.setLevel(logging.WARNING)
1905
 
        console.setLevel(logging.WARNING)
1906
 
    if debuglevel:
1907
 
        level = getattr(logging, debuglevel.upper())
1908
 
        syslogger.setLevel(level)
1909
 
        console.setLevel(level)
1910
 
 
1911
2150
    if debug:
1912
2151
        # Enable all possible GnuTLS debugging
1913
2152
        
1927
2166
        os.dup2(null, sys.stdin.fileno())
1928
2167
        if null > 2:
1929
2168
            os.close(null)
1930
 
    else:
1931
 
        # No console logging
1932
 
        logger.removeHandler(console)
1933
2169
    
1934
2170
    # Need to fork before connecting to D-Bus
1935
2171
    if not debug:
1936
2172
        # Close all input and output, do double fork, etc.
1937
2173
        daemon()
1938
2174
    
 
2175
    gobject.threads_init()
 
2176
    
1939
2177
    global main_loop
1940
2178
    # From the Avahi example code
1941
2179
    DBusGMainLoop(set_as_default=True )
1944
2182
    # End of Avahi example code
1945
2183
    if use_dbus:
1946
2184
        try:
1947
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2185
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1948
2186
                                            bus, do_not_queue=True)
 
2187
            old_bus_name = (dbus.service.BusName
 
2188
                            ("se.bsnet.fukt.Mandos", bus,
 
2189
                             do_not_queue=True))
1949
2190
        except dbus.exceptions.NameExistsException as e:
1950
2191
            logger.error(unicode(e) + ", disabling D-Bus")
1951
2192
            use_dbus = False
1952
2193
            server_settings["use_dbus"] = False
1953
2194
            tcp_server.use_dbus = False
1954
2195
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
 
    service = AvahiService(name = server_settings["servicename"],
1956
 
                           servicetype = "_mandos._tcp",
1957
 
                           protocol = protocol, bus = bus)
 
2196
    service = AvahiServiceToSyslog(name =
 
2197
                                   server_settings["servicename"],
 
2198
                                   servicetype = "_mandos._tcp",
 
2199
                                   protocol = protocol, bus = bus)
1958
2200
    if server_settings["interface"]:
1959
2201
        service.interface = (if_nametoindex
1960
2202
                             (str(server_settings["interface"])))
1964
2206
    
1965
2207
    client_class = Client
1966
2208
    if use_dbus:
1967
 
        client_class = functools.partial(ClientDBus, bus = bus)
1968
 
    def client_config_items(config, section):
1969
 
        special_settings = {
1970
 
            "approved_by_default":
1971
 
                lambda: config.getboolean(section,
1972
 
                                          "approved_by_default"),
1973
 
            }
1974
 
        for name, value in config.items(section):
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
 
2211
    
 
2212
    client_settings = Client.config_parser(client_config)
 
2213
    old_client_settings = {}
 
2214
    clients_data = {}
 
2215
    
 
2216
    # Get client data and settings from last running state.
 
2217
    if server_settings["restore"]:
 
2218
        try:
 
2219
            with open(stored_state_path, "rb") as stored_state:
 
2220
                clients_data, old_client_settings = (pickle.load
 
2221
                                                     (stored_state))
 
2222
            os.remove(stored_state_path)
 
2223
        except IOError as e:
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
 
2227
                raise
 
2228
        except EOFError as e:
 
2229
            logger.warning("Could not load persistent state: "
 
2230
                           "EOFError: {0}".format(e))
 
2231
    
 
2232
    with PGPEngine() as pgp:
 
2233
        for client_name, client in clients_data.iteritems():
 
2234
            # Decide which value to use after restoring saved state.
 
2235
            # We have three different values: Old config file,
 
2236
            # new config file, and saved state.
 
2237
            # New config value takes precedence if it differs from old
 
2238
            # config value, otherwise use saved state.
 
2239
            for name, value in client_settings[client_name].items():
 
2240
                try:
 
2241
                    # For each value in new config, check if it
 
2242
                    # differs from the old config value (Except for
 
2243
                    # the "secret" attribute)
 
2244
                    if (name != "secret" and
 
2245
                        value != old_client_settings[client_name]
 
2246
                        [name]):
 
2247
                        client[name] = value
 
2248
                except KeyError:
 
2249
                    pass
 
2250
            
 
2251
            # Clients who has passed its expire date can still be
 
2252
            # enabled if its last checker was successful.  Clients
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
 
2255
            if client["enabled"]:
 
2256
                if datetime.datetime.utcnow() >= client["expires"]:
 
2257
                    if not client["last_checked_ok"]:
 
2258
                        logger.warning(
 
2259
                            "disabling client {0} - Client never "
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
 
2262
                        client["enabled"] = False
 
2263
                    elif client["last_checker_status"] != 0:
 
2264
                        logger.warning(
 
2265
                            "disabling client {0} - Client "
 
2266
                            "last checker failed with error code {1}"
 
2267
                            .format(client["name"],
 
2268
                                    client["last_checker_status"]))
 
2269
                        client["enabled"] = False
 
2270
                    else:
 
2271
                        client["expires"] = (datetime.datetime
 
2272
                                             .utcnow()
 
2273
                                             + client["timeout"])
 
2274
                        logger.debug("Last checker succeeded,"
 
2275
                                     " keeping {0} enabled"
 
2276
                                     .format(client["name"]))
1975
2277
            try:
1976
 
                yield (name, special_settings[name]())
1977
 
            except KeyError:
1978
 
                yield (name, value)
1979
 
    
1980
 
    tcp_server.clients.update(set(
1981
 
            client_class(name = section,
1982
 
                         config= dict(client_config_items(
1983
 
                        client_config, section)))
1984
 
            for section in client_config.sections()))
 
2278
                client["secret"] = (
 
2279
                    pgp.decrypt(client["encrypted_secret"],
 
2280
                                client_settings[client_name]
 
2281
                                ["secret"]))
 
2282
            except PGPError:
 
2283
                # If decryption fails, we use secret from new settings
 
2284
                logger.debug("Failed to decrypt {0} old secret"
 
2285
                             .format(client_name))
 
2286
                client["secret"] = (
 
2287
                    client_settings[client_name]["secret"])
 
2288
 
 
2289
    
 
2290
    # Add/remove clients based on new changes made to config
 
2291
    for client_name in (set(old_client_settings)
 
2292
                        - set(client_settings)):
 
2293
        del clients_data[client_name]
 
2294
    for client_name in (set(client_settings)
 
2295
                        - set(old_client_settings)):
 
2296
        clients_data[client_name] = client_settings[client_name]
 
2297
 
 
2298
    # Create clients all clients
 
2299
    for client_name, client in clients_data.iteritems():
 
2300
        tcp_server.clients[client_name] = client_class(
 
2301
            name = client_name, settings = client)
 
2302
    
1985
2303
    if not tcp_server.clients:
1986
2304
        logger.warning("No clients defined")
1987
2305
        
1998
2316
            # "pidfile" was never created
1999
2317
            pass
2000
2318
        del pidfilename
2001
 
        
2002
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2003
 
 
 
2320
    
2004
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2005
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2006
2323
    
2009
2326
            """A D-Bus proxy object"""
2010
2327
            def __init__(self):
2011
2328
                dbus.service.Object.__init__(self, bus, "/")
2012
 
            _interface = "se.bsnet.fukt.Mandos"
 
2329
            _interface = "se.recompile.Mandos"
2013
2330
            
2014
2331
            @dbus.service.signal(_interface, signature="o")
2015
2332
            def ClientAdded(self, objpath):
2030
2347
            def GetAllClients(self):
2031
2348
                "D-Bus method"
2032
2349
                return dbus.Array(c.dbus_object_path
2033
 
                                  for c in tcp_server.clients)
 
2350
                                  for c in
 
2351
                                  tcp_server.clients.itervalues())
2034
2352
            
2035
2353
            @dbus.service.method(_interface,
2036
2354
                                 out_signature="a{oa{sv}}")
2038
2356
                "D-Bus method"
2039
2357
                return dbus.Dictionary(
2040
2358
                    ((c.dbus_object_path, c.GetAll(""))
2041
 
                     for c in tcp_server.clients),
 
2359
                     for c in tcp_server.clients.itervalues()),
2042
2360
                    signature="oa{sv}")
2043
2361
            
2044
2362
            @dbus.service.method(_interface, in_signature="o")
2045
2363
            def RemoveClient(self, object_path):
2046
2364
                "D-Bus method"
2047
 
                for c in tcp_server.clients:
 
2365
                for c in tcp_server.clients.itervalues():
2048
2366
                    if c.dbus_object_path == object_path:
2049
 
                        tcp_server.clients.remove(c)
 
2367
                        del tcp_server.clients[c.name]
2050
2368
                        c.remove_from_connection()
2051
2369
                        # Don't signal anything except ClientRemoved
2052
2370
                        c.disable(quiet=True)
2057
2375
            
2058
2376
            del _interface
2059
2377
        
2060
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2061
2381
    
2062
2382
    def cleanup():
2063
2383
        "Cleanup function; run on exit"
2064
2384
        service.cleanup()
2065
2385
        
 
2386
        multiprocessing.active_children()
 
2387
        if not (tcp_server.clients or client_settings):
 
2388
            return
 
2389
        
 
2390
        # Store client before exiting. Secrets are encrypted with key
 
2391
        # based on what config file has. If config file is
 
2392
        # removed/edited, old secret will thus be unrecovable.
 
2393
        clients = {}
 
2394
        with PGPEngine() as pgp:
 
2395
            for client in tcp_server.clients.itervalues():
 
2396
                key = client_settings[client.name]["secret"]
 
2397
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2398
                                                      key)
 
2399
                client_dict = {}
 
2400
                
 
2401
                # A list of attributes that can not be pickled
 
2402
                # + secret.
 
2403
                exclude = set(("bus", "changedstate", "secret",
 
2404
                               "checker"))
 
2405
                for name, typ in (inspect.getmembers
 
2406
                                  (dbus.service.Object)):
 
2407
                    exclude.add(name)
 
2408
                
 
2409
                client_dict["encrypted_secret"] = (client
 
2410
                                                   .encrypted_secret)
 
2411
                for attr in client.client_structure:
 
2412
                    if attr not in exclude:
 
2413
                        client_dict[attr] = getattr(client, attr)
 
2414
                
 
2415
                clients[client.name] = client_dict
 
2416
                del client_settings[client.name]["secret"]
 
2417
        
 
2418
        try:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
 
2424
                pickle.dump((clients, client_settings), stored_state)
 
2425
            os.rename(tempname, stored_state_path)
 
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
 
2429
            if not debug:
 
2430
                try:
 
2431
                    os.remove(tempname)
 
2432
                except NameError:
 
2433
                    pass
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
 
2436
                raise e
 
2437
        
 
2438
        # Delete all clients, and settings from config
2066
2439
        while tcp_server.clients:
2067
 
            client = tcp_server.clients.pop()
 
2440
            name, client = tcp_server.clients.popitem()
2068
2441
            if use_dbus:
2069
2442
                client.remove_from_connection()
2070
 
            client.disable_hook = None
2071
2443
            # Don't signal anything except ClientRemoved
2072
2444
            client.disable(quiet=True)
2073
2445
            if use_dbus:
2074
2446
                # Emit D-Bus signal
2075
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2447
                mandos_dbus_service.ClientRemoved(client
 
2448
                                                  .dbus_object_path,
2076
2449
                                                  client.name)
 
2450
        client_settings.clear()
2077
2451
    
2078
2452
    atexit.register(cleanup)
2079
2453
    
2080
 
    for client in tcp_server.clients:
 
2454
    for client in tcp_server.clients.itervalues():
2081
2455
        if use_dbus:
2082
2456
            # Emit D-Bus signal
2083
2457
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2084
 
        client.enable()
 
2458
        # Need to initiate checking of clients
 
2459
        if client.enabled:
 
2460
            client.init_checker()
2085
2461
    
2086
2462
    tcp_server.enable()
2087
2463
    tcp_server.server_activate()