/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-04-03 00:46:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110403004651-yyrzgwwkoq4ts2vi
* mandos: Never call .Reset() on a defunct Avahi entry group.
  (AvahiService.remove): Only do group.Reset(), as before.
  (AvahiService.add): Only create new group if necessary.
  (AvahiService.cleanup): Also do group.Free() if a group exists.
  (AvahiService.server_state_changed): Call .cleanup() on errors.
                                       Also log error parameter, if
                                       passed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.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
68
65
 
69
66
import dbus
70
67
import dbus.service
75
72
import ctypes.util
76
73
import xml.dom.minidom
77
74
import inspect
78
 
import GnuPGInterface
79
75
 
80
76
try:
81
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
81
    except ImportError:
86
82
        SO_BINDTODEVICE = None
87
83
 
88
 
version = "1.4.1"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.0"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
92
89
syslogger = (logging.handlers.SysLogHandler
93
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
91
              address = str("/dev/log")))
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
 
    
147
 
    def __enter__(self):
148
 
        return self
149
 
    
150
 
    def __exit__ (self, exc_type, exc_value, traceback):
151
 
        self._cleanup()
152
 
        return False
153
 
    
154
 
    def __del__(self):
155
 
        self._cleanup()
156
 
    
157
 
    def _cleanup(self):
158
 
        if self.tempdir is not None:
159
 
            # Delete contents of tempdir
160
 
            for root, dirs, files in os.walk(self.tempdir,
161
 
                                             topdown = False):
162
 
                for filename in files:
163
 
                    os.remove(os.path.join(root, filename))
164
 
                for dirname in dirs:
165
 
                    os.rmdir(os.path.join(root, dirname))
166
 
            # Remove tempdir
167
 
            os.rmdir(self.tempdir)
168
 
            self.tempdir = None
169
 
    
170
 
    def password_encode(self, password):
171
 
        # Passphrase can not be empty and can not contain newlines or
172
 
        # NUL bytes.  So we prefix it and hex encode it.
173
 
        return b"mandos" + binascii.hexlify(password)
174
 
    
175
 
    def encrypt(self, data, password):
176
 
        self.gnupg.passphrase = self.password_encode(password)
177
 
        with open(os.devnull) as devnull:
178
 
            try:
179
 
                proc = self.gnupg.run(['--symmetric'],
180
 
                                      create_fhs=['stdin', 'stdout'],
181
 
                                      attach_fhs={'stderr': devnull})
182
 
                with contextlib.closing(proc.handles['stdin']) as f:
183
 
                    f.write(data)
184
 
                with contextlib.closing(proc.handles['stdout']) as f:
185
 
                    ciphertext = f.read()
186
 
                proc.wait()
187
 
            except IOError as e:
188
 
                raise PGPError(e)
189
 
        self.gnupg.passphrase = None
190
 
        return ciphertext
191
 
    
192
 
    def decrypt(self, data, password):
193
 
        self.gnupg.passphrase = self.password_encode(password)
194
 
        with open(os.devnull) as devnull:
195
 
            try:
196
 
                proc = self.gnupg.run(['--decrypt'],
197
 
                                      create_fhs=['stdin', 'stdout'],
198
 
                                      attach_fhs={'stderr': devnull})
199
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
200
 
                    f.write(data)
201
 
                with contextlib.closing(proc.handles['stdout']) as f:
202
 
                    decrypted_plaintext = f.read()
203
 
                proc.wait()
204
 
            except IOError as e:
205
 
                raise PGPError(e)
206
 
        self.gnupg.passphrase = None
207
 
        return decrypted_plaintext
208
 
 
209
 
 
 
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)
210
102
 
211
103
class AvahiError(Exception):
212
104
    def __init__(self, value, *args, **kwargs):
267
159
                            " after %i retries, exiting.",
268
160
                            self.rename_count)
269
161
            raise AvahiServiceError("Too many renames")
270
 
        self.name = unicode(self.server
271
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
272
163
        logger.info("Changing Zeroconf service name to %r ...",
273
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
274
169
        self.remove()
275
170
        try:
276
171
            self.add()
296
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
297
192
        self.entry_group_state_changed_match = (
298
193
            self.group.connect_to_signal(
299
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
300
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
301
196
                     self.name, self.type)
302
197
        self.group.AddService(
328
223
            try:
329
224
                self.group.Free()
330
225
            except (dbus.exceptions.UnknownMethodException,
331
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
332
227
                pass
333
228
            self.group = None
334
229
        self.remove()
368
263
                                 self.server_state_changed)
369
264
        self.server_state_changed(self.server.GetState())
370
265
 
371
 
class AvahiServiceToSyslog(AvahiService):
372
 
    def rename(self):
373
 
        """Add the new name to the syslog messages"""
374
 
        ret = AvahiService.rename(self)
375
 
        syslogger.setFormatter(logging.Formatter
376
 
                               ('Mandos (%s) [%%(process)d]:'
377
 
                                ' %%(levelname)s: %%(message)s'
378
 
                                % self.name))
379
 
        return ret
380
266
 
381
 
def timedelta_to_milliseconds(td):
382
 
    "Convert a datetime.timedelta() to milliseconds"
383
 
    return ((td.days * 24 * 60 * 60 * 1000)
384
 
            + (td.seconds * 1000)
385
 
            + (td.microseconds // 1000))
386
 
        
387
267
class Client(object):
388
268
    """A representation of a client host served by this server.
389
269
    
390
270
    Attributes:
391
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
271
    _approved:   bool(); 'None' if not yet approved/disapproved
392
272
    approval_delay: datetime.timedelta(); Time to wait for approval
393
273
    approval_duration: datetime.timedelta(); Duration of one approval
394
274
    checker:    subprocess.Popen(); a running checker process used
401
281
                     instance %(name)s can be used in the command.
402
282
    checker_initiator_tag: a gobject event source tag, or None
403
283
    created:    datetime.datetime(); (UTC) object creation
404
 
    client_structure: Object describing what attributes a client has
405
 
                      and is used for storing the client at exit
406
284
    current_checker_command: string; current running checker_command
 
285
    disable_hook:  If set, called by disable() as disable_hook(self)
407
286
    disable_initiator_tag: a gobject event source tag, or None
408
287
    enabled:    bool()
409
288
    fingerprint: string (40 or 32 hexadecimal digits); used to
412
291
    interval:   datetime.timedelta(); How often to start a new checker
413
292
    last_approval_request: datetime.datetime(); (UTC) or None
414
293
    last_checked_ok: datetime.datetime(); (UTC) or None
415
 
    last_checker_status: integer between 0 and 255 reflecting exit
416
 
                         status of last checker. -1 reflects crashed
417
 
                         checker, or None.
418
 
    last_enabled: datetime.datetime(); (UTC) or None
 
294
    last_enabled: datetime.datetime(); (UTC)
419
295
    name:       string; from the config file, used in log messages and
420
296
                        D-Bus identifiers
421
297
    secret:     bytestring; sent verbatim (over TLS) to client
422
298
    timeout:    datetime.timedelta(); How long from last_checked_ok
423
299
                                      until this client is disabled
424
 
    extended_timeout:   extra long timeout when password has been sent
425
300
    runtime_expansions: Allowed attributes for runtime expansion.
426
 
    expires:    datetime.datetime(); time (UTC) when a client will be
427
 
                disabled, or None
428
301
    """
429
302
    
430
303
    runtime_expansions = ("approval_delay", "approval_duration",
431
304
                          "created", "enabled", "fingerprint",
432
305
                          "host", "interval", "last_checked_ok",
433
306
                          "last_enabled", "name", "timeout")
434
 
    client_defaults = { "timeout": "5m",
435
 
                        "extended_timeout": "15m",
436
 
                        "interval": "2m",
437
 
                        "checker": "fping -q -- %%(host)s",
438
 
                        "host": "",
439
 
                        "approval_delay": "0s",
440
 
                        "approval_duration": "1s",
441
 
                        "approved_by_default": "True",
442
 
                        "enabled": "True",
443
 
                        }
 
307
    
 
308
    @staticmethod
 
309
    def _timedelta_to_milliseconds(td):
 
310
        "Convert a datetime.timedelta() to milliseconds"
 
311
        return ((td.days * 24 * 60 * 60 * 1000)
 
312
                + (td.seconds * 1000)
 
313
                + (td.microseconds // 1000))
444
314
    
445
315
    def timeout_milliseconds(self):
446
316
        "Return the 'timeout' attribute in milliseconds"
447
 
        return timedelta_to_milliseconds(self.timeout)
448
 
    
449
 
    def extended_timeout_milliseconds(self):
450
 
        "Return the 'extended_timeout' attribute in milliseconds"
451
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
317
        return self._timedelta_to_milliseconds(self.timeout)
452
318
    
453
319
    def interval_milliseconds(self):
454
320
        "Return the 'interval' attribute in milliseconds"
455
 
        return timedelta_to_milliseconds(self.interval)
456
 
    
 
321
        return self._timedelta_to_milliseconds(self.interval)
 
322
 
457
323
    def approval_delay_milliseconds(self):
458
 
        return timedelta_to_milliseconds(self.approval_delay)
459
 
 
460
 
    @staticmethod
461
 
    def config_parser(config):
462
 
        """ Construct a new dict of client settings of this form:
463
 
        { client_name: {setting_name: value, ...}, ...}
464
 
        with exceptions for any special settings as defined above"""
465
 
        settings = {}
466
 
        for client_name in config.sections():
467
 
            section = dict(config.items(client_name))
468
 
            client = settings[client_name] = {}
469
 
            
470
 
            client["host"] = section["host"]
471
 
            # Reformat values from string types to Python types
472
 
            client["approved_by_default"] = config.getboolean(
473
 
                client_name, "approved_by_default")
474
 
            client["enabled"] = config.getboolean(client_name, "enabled")
475
 
            
476
 
            client["fingerprint"] = (section["fingerprint"].upper()
477
 
                                     .replace(" ", ""))
478
 
            if "secret" in section:
479
 
                client["secret"] = section["secret"].decode("base64")
480
 
            elif "secfile" in section:
481
 
                with open(os.path.expanduser(os.path.expandvars
482
 
                                             (section["secfile"])),
483
 
                          "rb") as secfile:
484
 
                    client["secret"] = secfile.read()
485
 
            else:
486
 
                raise TypeError("No secret or secfile for section %s"
487
 
                                % section)
488
 
            client["timeout"] = string_to_delta(section["timeout"])
489
 
            client["extended_timeout"] = string_to_delta(
490
 
                section["extended_timeout"])
491
 
            client["interval"] = string_to_delta(section["interval"])
492
 
            client["approval_delay"] = string_to_delta(
493
 
                section["approval_delay"])
494
 
            client["approval_duration"] = string_to_delta(
495
 
                section["approval_duration"])
496
 
            client["checker_command"] = section["checker"]
497
 
            client["last_approval_request"] = None
498
 
            client["last_checked_ok"] = None
499
 
            client["last_checker_status"] = None
500
 
            if client["enabled"]:
501
 
                client["last_enabled"] = datetime.datetime.utcnow()
502
 
                client["expires"] = (datetime.datetime.utcnow()
503
 
                                     + client["timeout"])
504
 
            else:
505
 
                client["last_enabled"] = None
506
 
                client["expires"] = None
507
 
 
508
 
        return settings
509
 
        
510
 
        
511
 
    def __init__(self, settings, name = None):
 
324
        return self._timedelta_to_milliseconds(self.approval_delay)
 
325
    
 
326
    def __init__(self, name = None, disable_hook=None, config=None):
512
327
        """Note: the 'checker' key in 'config' sets the
513
328
        'checker_command' attribute and *not* the 'checker'
514
329
        attribute."""
515
330
        self.name = name
516
 
        # adding all client settings
517
 
        for setting, value in settings.iteritems():
518
 
            setattr(self, setting, value)
519
 
        
 
331
        if config is None:
 
332
            config = {}
520
333
        logger.debug("Creating client %r", self.name)
521
334
        # Uppercase and remove spaces from fingerprint for later
522
335
        # comparison purposes with return value from the fingerprint()
523
336
        # function
 
337
        self.fingerprint = (config["fingerprint"].upper()
 
338
                            .replace(" ", ""))
524
339
        logger.debug("  Fingerprint: %s", self.fingerprint)
525
 
        self.created = settings.get("created", datetime.datetime.utcnow())
526
 
 
527
 
        # attributes specific for this server instance
 
340
        if "secret" in config:
 
341
            self.secret = config["secret"].decode("base64")
 
342
        elif "secfile" in config:
 
343
            with open(os.path.expanduser(os.path.expandvars
 
344
                                         (config["secfile"])),
 
345
                      "rb") as secfile:
 
346
                self.secret = secfile.read()
 
347
        else:
 
348
            raise TypeError("No secret or secfile for client %s"
 
349
                            % self.name)
 
350
        self.host = config.get("host", "")
 
351
        self.created = datetime.datetime.utcnow()
 
352
        self.enabled = False
 
353
        self.last_approval_request = None
 
354
        self.last_enabled = None
 
355
        self.last_checked_ok = None
 
356
        self.timeout = string_to_delta(config["timeout"])
 
357
        self.interval = string_to_delta(config["interval"])
 
358
        self.disable_hook = disable_hook
528
359
        self.checker = None
529
360
        self.checker_initiator_tag = None
530
361
        self.disable_initiator_tag = None
531
362
        self.checker_callback_tag = None
 
363
        self.checker_command = config["checker"]
532
364
        self.current_checker_command = None
533
 
        self.approved = None
 
365
        self.last_connect = None
 
366
        self._approved = None
 
367
        self.approved_by_default = config.get("approved_by_default",
 
368
                                              True)
534
369
        self.approvals_pending = 0
535
 
        self.changedstate = (multiprocessing_manager
536
 
                             .Condition(multiprocessing_manager
537
 
                                        .Lock()))
538
 
        self.client_structure = [attr for attr in
539
 
                                 self.__dict__.iterkeys()
540
 
                                 if not attr.startswith("_")]
541
 
        self.client_structure.append("client_structure")
542
 
        
543
 
        for name, t in inspect.getmembers(type(self),
544
 
                                          lambda obj:
545
 
                                              isinstance(obj,
546
 
                                                         property)):
547
 
            if not name.startswith("_"):
548
 
                self.client_structure.append(name)
 
370
        self.approval_delay = string_to_delta(
 
371
            config["approval_delay"])
 
372
        self.approval_duration = string_to_delta(
 
373
            config["approval_duration"])
 
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
549
375
    
550
 
    # Send notice to process children that client state has changed
551
376
    def send_changedstate(self):
552
 
        with self.changedstate:
553
 
            self.changedstate.notify_all()
554
 
    
 
377
        self.changedstate.acquire()
 
378
        self.changedstate.notify_all()
 
379
        self.changedstate.release()
 
380
        
555
381
    def enable(self):
556
382
        """Start this client's checker and timeout hooks"""
557
383
        if getattr(self, "enabled", False):
558
384
            # Already enabled
559
385
            return
560
386
        self.send_changedstate()
561
 
        self.expires = datetime.datetime.utcnow() + self.timeout
562
 
        self.enabled = True
563
387
        self.last_enabled = datetime.datetime.utcnow()
564
 
        self.init_checker()
 
388
        # Schedule a new checker to be started an 'interval' from now,
 
389
        # and every interval from then on.
 
390
        self.checker_initiator_tag = (gobject.timeout_add
 
391
                                      (self.interval_milliseconds(),
 
392
                                       self.start_checker))
 
393
        # Schedule a disable() when 'timeout' has passed
 
394
        self.disable_initiator_tag = (gobject.timeout_add
 
395
                                   (self.timeout_milliseconds(),
 
396
                                    self.disable))
 
397
        self.enabled = True
 
398
        # Also start a new checker *right now*.
 
399
        self.start_checker()
565
400
    
566
401
    def disable(self, quiet=True):
567
402
        """Disable this client."""
574
409
        if getattr(self, "disable_initiator_tag", False):
575
410
            gobject.source_remove(self.disable_initiator_tag)
576
411
            self.disable_initiator_tag = None
577
 
        self.expires = None
578
412
        if getattr(self, "checker_initiator_tag", False):
579
413
            gobject.source_remove(self.checker_initiator_tag)
580
414
            self.checker_initiator_tag = None
581
415
        self.stop_checker()
 
416
        if self.disable_hook:
 
417
            self.disable_hook(self)
582
418
        self.enabled = False
583
419
        # Do not run this again if called by a gobject.timeout_add
584
420
        return False
585
421
    
586
422
    def __del__(self):
 
423
        self.disable_hook = None
587
424
        self.disable()
588
425
    
589
 
    def init_checker(self):
590
 
        # Schedule a new checker to be started an 'interval' from now,
591
 
        # and every interval from then on.
592
 
        self.checker_initiator_tag = (gobject.timeout_add
593
 
                                      (self.interval_milliseconds(),
594
 
                                       self.start_checker))
595
 
        # Schedule a disable() when 'timeout' has passed
596
 
        self.disable_initiator_tag = (gobject.timeout_add
597
 
                                   (self.timeout_milliseconds(),
598
 
                                    self.disable))
599
 
        # Also start a new checker *right now*.
600
 
        self.start_checker()
601
 
    
602
426
    def checker_callback(self, pid, condition, command):
603
427
        """The checker has completed, so take appropriate actions."""
604
428
        self.checker_callback_tag = None
605
429
        self.checker = None
606
430
        if os.WIFEXITED(condition):
607
 
            self.last_checker_status = os.WEXITSTATUS(condition)
608
 
            if self.last_checker_status == 0:
 
431
            exitstatus = os.WEXITSTATUS(condition)
 
432
            if exitstatus == 0:
609
433
                logger.info("Checker for %(name)s succeeded",
610
434
                            vars(self))
611
435
                self.checked_ok()
613
437
                logger.info("Checker for %(name)s failed",
614
438
                            vars(self))
615
439
        else:
616
 
            self.last_checker_status = -1
617
440
            logger.warning("Checker for %(name)s crashed?",
618
441
                           vars(self))
619
442
    
620
 
    def checked_ok(self, timeout=None):
 
443
    def checked_ok(self):
621
444
        """Bump up the timeout for this client.
622
445
        
623
446
        This should only be called when the client has been seen,
624
447
        alive and well.
625
448
        """
626
 
        if timeout is None:
627
 
            timeout = self.timeout
628
449
        self.last_checked_ok = datetime.datetime.utcnow()
629
 
        if self.disable_initiator_tag is not None:
630
 
            gobject.source_remove(self.disable_initiator_tag)
631
 
        if getattr(self, "enabled", False):
632
 
            self.disable_initiator_tag = (gobject.timeout_add
633
 
                                          (timedelta_to_milliseconds
634
 
                                           (timeout), self.disable))
635
 
            self.expires = datetime.datetime.utcnow() + timeout
 
450
        gobject.source_remove(self.disable_initiator_tag)
 
451
        self.disable_initiator_tag = (gobject.timeout_add
 
452
                                      (self.timeout_milliseconds(),
 
453
                                       self.disable))
636
454
    
637
455
    def need_approval(self):
638
456
        self.last_approval_request = datetime.datetime.utcnow()
678
496
                                       'replace')))
679
497
                    for attr in
680
498
                    self.runtime_expansions)
681
 
                
 
499
 
682
500
                try:
683
501
                    command = self.checker_command % escaped_attrs
684
502
                except TypeError as error:
730
548
                raise
731
549
        self.checker = None
732
550
 
733
 
 
734
551
def dbus_service_property(dbus_interface, signature="v",
735
552
                          access="readwrite", byte_arrays=False):
736
553
    """Decorators for marking methods of a DBusObjectWithProperties to
782
599
 
783
600
class DBusObjectWithProperties(dbus.service.Object):
784
601
    """A D-Bus object with properties.
785
 
    
 
602
 
786
603
    Classes inheriting from this can use the dbus_service_property
787
604
    decorator to expose methods as D-Bus properties.  It exposes the
788
605
    standard Get(), Set(), and GetAll() methods on the D-Bus.
795
612
    def _get_all_dbus_properties(self):
796
613
        """Returns a generator of (name, attribute) pairs
797
614
        """
798
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
799
 
                for cls in self.__class__.__mro__
 
615
        return ((prop._dbus_name, prop)
800
616
                for name, prop in
801
 
                inspect.getmembers(cls, self._is_dbus_property))
 
617
                inspect.getmembers(self, self._is_dbus_property))
802
618
    
803
619
    def _get_dbus_property(self, interface_name, property_name):
804
620
        """Returns a bound method if one exists which is a D-Bus
805
621
        property with the specified name and interface.
806
622
        """
807
 
        for cls in  self.__class__.__mro__:
808
 
            for name, value in (inspect.getmembers
809
 
                                (cls, self._is_dbus_property)):
810
 
                if (value._dbus_name == property_name
811
 
                    and value._dbus_interface == interface_name):
812
 
                    return value.__get__(self)
813
 
        
 
623
        for name in (property_name,
 
624
                     property_name + "_dbus_property"):
 
625
            prop = getattr(self, name, None)
 
626
            if (prop is None
 
627
                or not self._is_dbus_property(prop)
 
628
                or prop._dbus_name != property_name
 
629
                or (interface_name and prop._dbus_interface
 
630
                    and interface_name != prop._dbus_interface)):
 
631
                continue
 
632
            return prop
814
633
        # No such property
815
634
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
635
                                   + interface_name + "."
850
669
    def GetAll(self, interface_name):
851
670
        """Standard D-Bus property GetAll() method, see D-Bus
852
671
        standard.
853
 
        
 
672
 
854
673
        Note: Will not include properties with access="write".
855
674
        """
856
 
        properties = {}
 
675
        all = {}
857
676
        for name, prop in self._get_all_dbus_properties():
858
677
            if (interface_name
859
678
                and interface_name != prop._dbus_interface):
864
683
                continue
865
684
            value = prop()
866
685
            if not hasattr(value, "variant_level"):
867
 
                properties[name] = value
 
686
                all[name] = value
868
687
                continue
869
 
            properties[name] = type(value)(value, variant_level=
870
 
                                           value.variant_level+1)
871
 
        return dbus.Dictionary(properties, signature="sv")
 
688
            all[name] = type(value)(value, variant_level=
 
689
                                    value.variant_level+1)
 
690
        return dbus.Dictionary(all, signature="sv")
872
691
    
873
692
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
874
693
                         out_signature="s",
918
737
        return xmlstring
919
738
 
920
739
 
921
 
def datetime_to_dbus (dt, variant_level=0):
922
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
923
 
    if dt is None:
924
 
        return dbus.String("", variant_level = variant_level)
925
 
    return dbus.String(dt.isoformat(),
926
 
                       variant_level=variant_level)
927
 
 
928
 
 
929
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
 
                                  .__metaclass__):
931
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
932
 
    will add additional D-Bus attributes matching a certain pattern.
933
 
    """
934
 
    def __new__(mcs, name, bases, attr):
935
 
        # Go through all the base classes which could have D-Bus
936
 
        # methods, signals, or properties in them
937
 
        for base in (b for b in bases
938
 
                     if issubclass(b, dbus.service.Object)):
939
 
            # Go though all attributes of the base class
940
 
            for attrname, attribute in inspect.getmembers(base):
941
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
942
 
                # with the wrong interface name
943
 
                if (not hasattr(attribute, "_dbus_interface")
944
 
                    or not attribute._dbus_interface
945
 
                    .startswith("se.recompile.Mandos")):
946
 
                    continue
947
 
                # Create an alternate D-Bus interface name based on
948
 
                # the current name
949
 
                alt_interface = (attribute._dbus_interface
950
 
                                 .replace("se.recompile.Mandos",
951
 
                                          "se.bsnet.fukt.Mandos"))
952
 
                # Is this a D-Bus signal?
953
 
                if getattr(attribute, "_dbus_is_signal", False):
954
 
                    # Extract the original non-method function by
955
 
                    # black magic
956
 
                    nonmethod_func = (dict(
957
 
                            zip(attribute.func_code.co_freevars,
958
 
                                attribute.__closure__))["func"]
959
 
                                      .cell_contents)
960
 
                    # Create a new, but exactly alike, function
961
 
                    # object, and decorate it to be a new D-Bus signal
962
 
                    # with the alternate D-Bus interface name
963
 
                    new_function = (dbus.service.signal
964
 
                                    (alt_interface,
965
 
                                     attribute._dbus_signature)
966
 
                                    (types.FunctionType(
967
 
                                nonmethod_func.func_code,
968
 
                                nonmethod_func.func_globals,
969
 
                                nonmethod_func.func_name,
970
 
                                nonmethod_func.func_defaults,
971
 
                                nonmethod_func.func_closure)))
972
 
                    # Define a creator of a function to call both the
973
 
                    # old and new functions, so both the old and new
974
 
                    # signals gets sent when the function is called
975
 
                    def fixscope(func1, func2):
976
 
                        """This function is a scope container to pass
977
 
                        func1 and func2 to the "call_both" function
978
 
                        outside of its arguments"""
979
 
                        def call_both(*args, **kwargs):
980
 
                            """This function will emit two D-Bus
981
 
                            signals by calling func1 and func2"""
982
 
                            func1(*args, **kwargs)
983
 
                            func2(*args, **kwargs)
984
 
                        return call_both
985
 
                    # Create the "call_both" function and add it to
986
 
                    # the class
987
 
                    attr[attrname] = fixscope(attribute,
988
 
                                              new_function)
989
 
                # Is this a D-Bus method?
990
 
                elif getattr(attribute, "_dbus_is_method", False):
991
 
                    # Create a new, but exactly alike, function
992
 
                    # object.  Decorate it to be a new D-Bus method
993
 
                    # with the alternate D-Bus interface name.  Add it
994
 
                    # to the class.
995
 
                    attr[attrname] = (dbus.service.method
996
 
                                      (alt_interface,
997
 
                                       attribute._dbus_in_signature,
998
 
                                       attribute._dbus_out_signature)
999
 
                                      (types.FunctionType
1000
 
                                       (attribute.func_code,
1001
 
                                        attribute.func_globals,
1002
 
                                        attribute.func_name,
1003
 
                                        attribute.func_defaults,
1004
 
                                        attribute.func_closure)))
1005
 
                # Is this a D-Bus property?
1006
 
                elif getattr(attribute, "_dbus_is_property", False):
1007
 
                    # Create a new, but exactly alike, function
1008
 
                    # object, and decorate it to be a new D-Bus
1009
 
                    # property with the alternate D-Bus interface
1010
 
                    # name.  Add it to the class.
1011
 
                    attr[attrname] = (dbus_service_property
1012
 
                                      (alt_interface,
1013
 
                                       attribute._dbus_signature,
1014
 
                                       attribute._dbus_access,
1015
 
                                       attribute
1016
 
                                       ._dbus_get_args_options
1017
 
                                       ["byte_arrays"])
1018
 
                                      (types.FunctionType
1019
 
                                       (attribute.func_code,
1020
 
                                        attribute.func_globals,
1021
 
                                        attribute.func_name,
1022
 
                                        attribute.func_defaults,
1023
 
                                        attribute.func_closure)))
1024
 
        return type.__new__(mcs, name, bases, attr)
1025
 
 
1026
 
 
1027
740
class ClientDBus(Client, DBusObjectWithProperties):
1028
741
    """A Client class using D-Bus
1029
742
    
1038
751
    # dbus.service.Object doesn't use super(), so we can't either.
1039
752
    
1040
753
    def __init__(self, bus = None, *args, **kwargs):
 
754
        self._approvals_pending = 0
1041
755
        self.bus = bus
1042
756
        Client.__init__(self, *args, **kwargs)
1043
 
        self._approvals_pending = 0
1044
 
        
1045
 
        self._approvals_pending = 0
1046
757
        # Only now, when this client is initialized, can it show up on
1047
758
        # the D-Bus
1048
759
        client_object_name = unicode(self.name).translate(
1053
764
        DBusObjectWithProperties.__init__(self, self.bus,
1054
765
                                          self.dbus_object_path)
1055
766
        
1056
 
    def notifychangeproperty(transform_func,
1057
 
                             dbus_name, type_func=lambda x: x,
1058
 
                             variant_level=1):
1059
 
        """ Modify a variable so that it's a property which announces
1060
 
        its changes to DBus.
1061
 
        
1062
 
        transform_fun: Function that takes a value and a variant_level
1063
 
                       and transforms it to a D-Bus type.
1064
 
        dbus_name: D-Bus name of the variable
1065
 
        type_func: Function that transform the value before sending it
1066
 
                   to the D-Bus.  Default: no transform
1067
 
        variant_level: D-Bus variant level.  Default: 1
1068
 
        """
1069
 
        attrname = "_{0}".format(dbus_name)
1070
 
        def setter(self, value):
1071
 
            if hasattr(self, "dbus_object_path"):
1072
 
                if (not hasattr(self, attrname) or
1073
 
                    type_func(getattr(self, attrname, None))
1074
 
                    != type_func(value)):
1075
 
                    dbus_value = transform_func(type_func(value),
1076
 
                                                variant_level
1077
 
                                                =variant_level)
1078
 
                    self.PropertyChanged(dbus.String(dbus_name),
1079
 
                                         dbus_value)
1080
 
            setattr(self, attrname, value)
1081
 
        
1082
 
        return property(lambda self: getattr(self, attrname), setter)
1083
 
    
1084
 
    
1085
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1086
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1087
 
                                             "ApprovalPending",
1088
 
                                             type_func = bool)
1089
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1090
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1091
 
                                        "LastEnabled")
1092
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
 
                                   type_func = lambda checker:
1094
 
                                       checker is not None)
1095
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1096
 
                                           "LastCheckedOK")
1097
 
    last_approval_request = notifychangeproperty(
1098
 
        datetime_to_dbus, "LastApprovalRequest")
1099
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1100
 
                                               "ApprovedByDefault")
1101
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1102
 
                                          "ApprovalDelay",
1103
 
                                          type_func =
1104
 
                                          timedelta_to_milliseconds)
1105
 
    approval_duration = notifychangeproperty(
1106
 
        dbus.UInt64, "ApprovalDuration",
1107
 
        type_func = timedelta_to_milliseconds)
1108
 
    host = notifychangeproperty(dbus.String, "Host")
1109
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1110
 
                                   type_func =
1111
 
                                   timedelta_to_milliseconds)
1112
 
    extended_timeout = notifychangeproperty(
1113
 
        dbus.UInt64, "ExtendedTimeout",
1114
 
        type_func = timedelta_to_milliseconds)
1115
 
    interval = notifychangeproperty(dbus.UInt64,
1116
 
                                    "Interval",
1117
 
                                    type_func =
1118
 
                                    timedelta_to_milliseconds)
1119
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1120
 
    
1121
 
    del notifychangeproperty
 
767
    def _get_approvals_pending(self):
 
768
        return self._approvals_pending
 
769
    def _set_approvals_pending(self, value):
 
770
        old_value = self._approvals_pending
 
771
        self._approvals_pending = value
 
772
        bval = bool(value)
 
773
        if (hasattr(self, "dbus_object_path")
 
774
            and bval is not bool(old_value)):
 
775
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
776
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
777
                                 dbus_bool)
 
778
 
 
779
    approvals_pending = property(_get_approvals_pending,
 
780
                                 _set_approvals_pending)
 
781
    del _get_approvals_pending, _set_approvals_pending
 
782
    
 
783
    @staticmethod
 
784
    def _datetime_to_dbus(dt, variant_level=0):
 
785
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
786
        return dbus.String(dt.isoformat(),
 
787
                           variant_level=variant_level)
 
788
    
 
789
    def enable(self):
 
790
        oldstate = getattr(self, "enabled", False)
 
791
        r = Client.enable(self)
 
792
        if oldstate != self.enabled:
 
793
            # Emit D-Bus signals
 
794
            self.PropertyChanged(dbus.String("Enabled"),
 
795
                                 dbus.Boolean(True, variant_level=1))
 
796
            self.PropertyChanged(
 
797
                dbus.String("LastEnabled"),
 
798
                self._datetime_to_dbus(self.last_enabled,
 
799
                                       variant_level=1))
 
800
        return r
 
801
    
 
802
    def disable(self, quiet = False):
 
803
        oldstate = getattr(self, "enabled", False)
 
804
        r = Client.disable(self, quiet=quiet)
 
805
        if not quiet and oldstate != self.enabled:
 
806
            # Emit D-Bus signal
 
807
            self.PropertyChanged(dbus.String("Enabled"),
 
808
                                 dbus.Boolean(False, variant_level=1))
 
809
        return r
1122
810
    
1123
811
    def __del__(self, *args, **kwargs):
1124
812
        try:
1133
821
                         *args, **kwargs):
1134
822
        self.checker_callback_tag = None
1135
823
        self.checker = None
 
824
        # Emit D-Bus signal
 
825
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
826
                             dbus.Boolean(False, variant_level=1))
1136
827
        if os.WIFEXITED(condition):
1137
828
            exitstatus = os.WEXITSTATUS(condition)
1138
829
            # Emit D-Bus signal
1148
839
        return Client.checker_callback(self, pid, condition, command,
1149
840
                                       *args, **kwargs)
1150
841
    
 
842
    def checked_ok(self, *args, **kwargs):
 
843
        Client.checked_ok(self, *args, **kwargs)
 
844
        # Emit D-Bus signal
 
845
        self.PropertyChanged(
 
846
            dbus.String("LastCheckedOK"),
 
847
            (self._datetime_to_dbus(self.last_checked_ok,
 
848
                                    variant_level=1)))
 
849
    
 
850
    def need_approval(self, *args, **kwargs):
 
851
        r = Client.need_approval(self, *args, **kwargs)
 
852
        # Emit D-Bus signal
 
853
        self.PropertyChanged(
 
854
            dbus.String("LastApprovalRequest"),
 
855
            (self._datetime_to_dbus(self.last_approval_request,
 
856
                                    variant_level=1)))
 
857
        return r
 
858
    
1151
859
    def start_checker(self, *args, **kwargs):
1152
860
        old_checker = self.checker
1153
861
        if self.checker is not None:
1160
868
            and old_checker_pid != self.checker.pid):
1161
869
            # Emit D-Bus signal
1162
870
            self.CheckerStarted(self.current_checker_command)
 
871
            self.PropertyChanged(
 
872
                dbus.String("CheckerRunning"),
 
873
                dbus.Boolean(True, variant_level=1))
1163
874
        return r
1164
875
    
 
876
    def stop_checker(self, *args, **kwargs):
 
877
        old_checker = getattr(self, "checker", None)
 
878
        r = Client.stop_checker(self, *args, **kwargs)
 
879
        if (old_checker is not None
 
880
            and getattr(self, "checker", None) is None):
 
881
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
882
                                 dbus.Boolean(False, variant_level=1))
 
883
        return r
 
884
 
1165
885
    def _reset_approved(self):
1166
 
        self.approved = None
 
886
        self._approved = None
1167
887
        return False
1168
888
    
1169
889
    def approve(self, value=True):
1170
890
        self.send_changedstate()
1171
 
        self.approved = value
1172
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(self._timedelta_to_milliseconds
1173
893
                            (self.approval_duration),
1174
894
                            self._reset_approved)
1175
895
    
1176
896
    
1177
897
    ## D-Bus methods, signals & properties
1178
 
    _interface = "se.recompile.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1179
899
    
1180
900
    ## Signals
1181
901
    
1218
938
        "D-Bus signal"
1219
939
        return self.need_approval()
1220
940
    
1221
 
    # NeRwequest - signal
1222
 
    @dbus.service.signal(_interface, signature="s")
1223
 
    def NewRequest(self, ip):
1224
 
        """D-Bus signal
1225
 
        Is sent after a client request a password.
1226
 
        """
1227
 
        pass
1228
 
    
1229
941
    ## Methods
1230
942
    
1231
943
    # Approve - method
1275
987
        if value is None:       # get
1276
988
            return dbus.Boolean(self.approved_by_default)
1277
989
        self.approved_by_default = bool(value)
 
990
        # Emit D-Bus signal
 
991
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
992
                             dbus.Boolean(value, variant_level=1))
1278
993
    
1279
994
    # ApprovalDelay - property
1280
995
    @dbus_service_property(_interface, signature="t",
1283
998
        if value is None:       # get
1284
999
            return dbus.UInt64(self.approval_delay_milliseconds())
1285
1000
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1001
        # Emit D-Bus signal
 
1002
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
1003
                             dbus.UInt64(value, variant_level=1))
1286
1004
    
1287
1005
    # ApprovalDuration - property
1288
1006
    @dbus_service_property(_interface, signature="t",
1289
1007
                           access="readwrite")
1290
1008
    def ApprovalDuration_dbus_property(self, value=None):
1291
1009
        if value is None:       # get
1292
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1010
            return dbus.UInt64(self._timedelta_to_milliseconds(
1293
1011
                    self.approval_duration))
1294
1012
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1013
        # Emit D-Bus signal
 
1014
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
1015
                             dbus.UInt64(value, variant_level=1))
1295
1016
    
1296
1017
    # Name - property
1297
1018
    @dbus_service_property(_interface, signature="s", access="read")
1309
1030
    def Host_dbus_property(self, value=None):
1310
1031
        if value is None:       # get
1311
1032
            return dbus.String(self.host)
1312
 
        self.host = unicode(value)
 
1033
        self.host = value
 
1034
        # Emit D-Bus signal
 
1035
        self.PropertyChanged(dbus.String("Host"),
 
1036
                             dbus.String(value, variant_level=1))
1313
1037
    
1314
1038
    # Created - property
1315
1039
    @dbus_service_property(_interface, signature="s", access="read")
1316
1040
    def Created_dbus_property(self):
1317
 
        return datetime_to_dbus(self.created)
 
1041
        return dbus.String(self._datetime_to_dbus(self.created))
1318
1042
    
1319
1043
    # LastEnabled - property
1320
1044
    @dbus_service_property(_interface, signature="s", access="read")
1321
1045
    def LastEnabled_dbus_property(self):
1322
 
        return datetime_to_dbus(self.last_enabled)
 
1046
        if self.last_enabled is None:
 
1047
            return dbus.String("")
 
1048
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1323
1049
    
1324
1050
    # Enabled - property
1325
1051
    @dbus_service_property(_interface, signature="b",
1339
1065
        if value is not None:
1340
1066
            self.checked_ok()
1341
1067
            return
1342
 
        return datetime_to_dbus(self.last_checked_ok)
1343
 
    
1344
 
    # Expires - property
1345
 
    @dbus_service_property(_interface, signature="s", access="read")
1346
 
    def Expires_dbus_property(self):
1347
 
        return datetime_to_dbus(self.expires)
 
1068
        if self.last_checked_ok is None:
 
1069
            return dbus.String("")
 
1070
        return dbus.String(self._datetime_to_dbus(self
 
1071
                                                  .last_checked_ok))
1348
1072
    
1349
1073
    # LastApprovalRequest - property
1350
1074
    @dbus_service_property(_interface, signature="s", access="read")
1351
1075
    def LastApprovalRequest_dbus_property(self):
1352
 
        return datetime_to_dbus(self.last_approval_request)
 
1076
        if self.last_approval_request is None:
 
1077
            return dbus.String("")
 
1078
        return dbus.String(self.
 
1079
                           _datetime_to_dbus(self
 
1080
                                             .last_approval_request))
1353
1081
    
1354
1082
    # Timeout - property
1355
1083
    @dbus_service_property(_interface, signature="t",
1358
1086
        if value is None:       # get
1359
1087
            return dbus.UInt64(self.timeout_milliseconds())
1360
1088
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1089
        # Emit D-Bus signal
 
1090
        self.PropertyChanged(dbus.String("Timeout"),
 
1091
                             dbus.UInt64(value, variant_level=1))
1361
1092
        if getattr(self, "disable_initiator_tag", None) is None:
1362
1093
            return
1363
1094
        # Reschedule timeout
1364
1095
        gobject.source_remove(self.disable_initiator_tag)
1365
1096
        self.disable_initiator_tag = None
1366
 
        self.expires = None
1367
 
        time_to_die = timedelta_to_milliseconds((self
1368
 
                                                 .last_checked_ok
1369
 
                                                 + self.timeout)
1370
 
                                                - datetime.datetime
1371
 
                                                .utcnow())
 
1097
        time_to_die = (self.
 
1098
                       _timedelta_to_milliseconds((self
 
1099
                                                   .last_checked_ok
 
1100
                                                   + self.timeout)
 
1101
                                                  - datetime.datetime
 
1102
                                                  .utcnow()))
1372
1103
        if time_to_die <= 0:
1373
1104
            # The timeout has passed
1374
1105
            self.disable()
1375
1106
        else:
1376
 
            self.expires = (datetime.datetime.utcnow()
1377
 
                            + datetime.timedelta(milliseconds =
1378
 
                                                 time_to_die))
1379
1107
            self.disable_initiator_tag = (gobject.timeout_add
1380
1108
                                          (time_to_die, self.disable))
1381
1109
    
1382
 
    # ExtendedTimeout - property
1383
 
    @dbus_service_property(_interface, signature="t",
1384
 
                           access="readwrite")
1385
 
    def ExtendedTimeout_dbus_property(self, value=None):
1386
 
        if value is None:       # get
1387
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1388
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1389
 
    
1390
1110
    # Interval - property
1391
1111
    @dbus_service_property(_interface, signature="t",
1392
1112
                           access="readwrite")
1394
1114
        if value is None:       # get
1395
1115
            return dbus.UInt64(self.interval_milliseconds())
1396
1116
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1117
        # Emit D-Bus signal
 
1118
        self.PropertyChanged(dbus.String("Interval"),
 
1119
                             dbus.UInt64(value, variant_level=1))
1397
1120
        if getattr(self, "checker_initiator_tag", None) is None:
1398
1121
            return
1399
 
        if self.enabled:
1400
 
            # Reschedule checker run
1401
 
            gobject.source_remove(self.checker_initiator_tag)
1402
 
            self.checker_initiator_tag = (gobject.timeout_add
1403
 
                                          (value, self.start_checker))
1404
 
            self.start_checker()    # Start one now, too
1405
 
    
 
1122
        # Reschedule checker run
 
1123
        gobject.source_remove(self.checker_initiator_tag)
 
1124
        self.checker_initiator_tag = (gobject.timeout_add
 
1125
                                      (value, self.start_checker))
 
1126
        self.start_checker()    # Start one now, too
 
1127
 
1406
1128
    # Checker - property
1407
1129
    @dbus_service_property(_interface, signature="s",
1408
1130
                           access="readwrite")
1409
1131
    def Checker_dbus_property(self, value=None):
1410
1132
        if value is None:       # get
1411
1133
            return dbus.String(self.checker_command)
1412
 
        self.checker_command = unicode(value)
 
1134
        self.checker_command = value
 
1135
        # Emit D-Bus signal
 
1136
        self.PropertyChanged(dbus.String("Checker"),
 
1137
                             dbus.String(self.checker_command,
 
1138
                                         variant_level=1))
1413
1139
    
1414
1140
    # CheckerRunning - property
1415
1141
    @dbus_service_property(_interface, signature="b",
1442
1168
        self._pipe.send(('init', fpr, address))
1443
1169
        if not self._pipe.recv():
1444
1170
            raise KeyError()
1445
 
    
 
1171
 
1446
1172
    def __getattribute__(self, name):
1447
 
        if name == '_pipe':
 
1173
        if(name == '_pipe'):
1448
1174
            return super(ProxyClient, self).__getattribute__(name)
1449
1175
        self._pipe.send(('getattr', name))
1450
1176
        data = self._pipe.recv()
1455
1181
                self._pipe.send(('funcall', name, args, kwargs))
1456
1182
                return self._pipe.recv()[1]
1457
1183
            return func
1458
 
    
 
1184
 
1459
1185
    def __setattr__(self, name, value):
1460
 
        if name == '_pipe':
 
1186
        if(name == '_pipe'):
1461
1187
            return super(ProxyClient, self).__setattr__(name, value)
1462
1188
        self._pipe.send(('setattr', name, value))
1463
1189
 
1464
1190
 
1465
 
class ClientDBusTransitional(ClientDBus):
1466
 
    __metaclass__ = AlternateDBusNamesMetaclass
1467
 
 
1468
 
 
1469
1191
class ClientHandler(socketserver.BaseRequestHandler, object):
1470
1192
    """A class to handle client connections.
1471
1193
    
1478
1200
                        unicode(self.client_address))
1479
1201
            logger.debug("Pipe FD: %d",
1480
1202
                         self.server.child_pipe.fileno())
1481
 
            
 
1203
 
1482
1204
            session = (gnutls.connection
1483
1205
                       .ClientSession(self.request,
1484
1206
                                      gnutls.connection
1485
1207
                                      .X509Credentials()))
1486
 
            
 
1208
 
1487
1209
            # Note: gnutls.connection.X509Credentials is really a
1488
1210
            # generic GnuTLS certificate credentials object so long as
1489
1211
            # no X.509 keys are added to it.  Therefore, we can use it
1490
1212
            # here despite using OpenPGP certificates.
1491
 
            
 
1213
 
1492
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1493
1215
            #                      "+AES-256-CBC", "+SHA1",
1494
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1500
1222
            (gnutls.library.functions
1501
1223
             .gnutls_priority_set_direct(session._c_object,
1502
1224
                                         priority, None))
1503
 
            
 
1225
 
1504
1226
            # Start communication using the Mandos protocol
1505
1227
            # Get protocol number
1506
1228
            line = self.request.makefile().readline()
1511
1233
            except (ValueError, IndexError, RuntimeError) as error:
1512
1234
                logger.error("Unknown protocol version: %s", error)
1513
1235
                return
1514
 
            
 
1236
 
1515
1237
            # Start GnuTLS connection
1516
1238
            try:
1517
1239
                session.handshake()
1521
1243
                # established.  Just abandon the request.
1522
1244
                return
1523
1245
            logger.debug("Handshake succeeded")
1524
 
            
 
1246
 
1525
1247
            approval_required = False
1526
1248
            try:
1527
1249
                try:
1532
1254
                    logger.warning("Bad certificate: %s", error)
1533
1255
                    return
1534
1256
                logger.debug("Fingerprint: %s", fpr)
1535
 
                
 
1257
 
1536
1258
                try:
1537
1259
                    client = ProxyClient(child_pipe, fpr,
1538
1260
                                         self.client_address)
1539
1261
                except KeyError:
1540
1262
                    return
1541
1263
                
1542
 
                if self.server.use_dbus:
1543
 
                    # Emit D-Bus signal
1544
 
                    client.NewRequest(str(self.client_address))
1545
 
                
1546
1264
                if client.approval_delay:
1547
1265
                    delay = client.approval_delay
1548
1266
                    client.approvals_pending += 1
1550
1268
                
1551
1269
                while True:
1552
1270
                    if not client.enabled:
1553
 
                        logger.info("Client %s is disabled",
 
1271
                        logger.warning("Client %s is disabled",
1554
1272
                                       client.name)
1555
1273
                        if self.server.use_dbus:
1556
1274
                            # Emit D-Bus signal
1557
 
                            client.Rejected("Disabled")
 
1275
                            client.Rejected("Disabled")                    
1558
1276
                        return
1559
1277
                    
1560
 
                    if client.approved or not client.approval_delay:
 
1278
                    if client._approved or not client.approval_delay:
1561
1279
                        #We are approved or approval is disabled
1562
1280
                        break
1563
 
                    elif client.approved is None:
 
1281
                    elif client._approved is None:
1564
1282
                        logger.info("Client %s needs approval",
1565
1283
                                    client.name)
1566
1284
                        if self.server.use_dbus:
1577
1295
                        return
1578
1296
                    
1579
1297
                    #wait until timeout or approved
 
1298
                    #x = float(client._timedelta_to_milliseconds(delay))
1580
1299
                    time = datetime.datetime.now()
1581
1300
                    client.changedstate.acquire()
1582
 
                    (client.changedstate.wait
1583
 
                     (float(client.timedelta_to_milliseconds(delay)
1584
 
                            / 1000)))
 
1301
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1585
1302
                    client.changedstate.release()
1586
1303
                    time2 = datetime.datetime.now()
1587
1304
                    if (time2 - time) >= delay:
1609
1326
                                 sent, len(client.secret)
1610
1327
                                 - (sent_size + sent))
1611
1328
                    sent_size += sent
1612
 
                
 
1329
 
1613
1330
                logger.info("Sending secret to %s", client.name)
1614
 
                # bump the timeout using extended_timeout
1615
 
                client.checked_ok(client.extended_timeout)
 
1331
                # bump the timeout as if seen
 
1332
                client.checked_ok()
1616
1333
                if self.server.use_dbus:
1617
1334
                    # Emit D-Bus signal
1618
1335
                    client.GotSecret()
1685
1402
        # Convert the buffer to a Python bytestring
1686
1403
        fpr = ctypes.string_at(buf, buf_len.value)
1687
1404
        # Convert the bytestring to hexadecimal notation
1688
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1689
1406
        return hex_fpr
1690
1407
 
1691
1408
 
1694
1411
    def sub_process_main(self, request, address):
1695
1412
        try:
1696
1413
            self.finish_request(request, address)
1697
 
        except Exception:
 
1414
        except:
1698
1415
            self.handle_error(request, address)
1699
1416
        self.close_request(request)
1700
 
    
 
1417
            
1701
1418
    def process_request(self, request, address):
1702
1419
        """Start a new process to process the request."""
1703
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1704
 
                                       args = (request,
1705
 
                                               address))
1706
 
        proc.start()
1707
 
        return proc
1708
 
 
 
1420
        multiprocessing.Process(target = self.sub_process_main,
 
1421
                                args = (request, address)).start()
1709
1422
 
1710
1423
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1711
1424
    """ adds a pipe to the MixIn """
1715
1428
        This function creates a new pipe in self.pipe
1716
1429
        """
1717
1430
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1718
 
        
1719
 
        proc = MultiprocessingMixIn.process_request(self, request,
1720
 
                                                    client_address)
 
1431
 
 
1432
        super(MultiprocessingMixInWithPipe,
 
1433
              self).process_request(request, client_address)
1721
1434
        self.child_pipe.close()
1722
 
        self.add_pipe(parent_pipe, proc)
1723
 
    
1724
 
    def add_pipe(self, parent_pipe, proc):
 
1435
        self.add_pipe(parent_pipe)
 
1436
 
 
1437
    def add_pipe(self, parent_pipe):
1725
1438
        """Dummy function; override as necessary"""
1726
1439
        raise NotImplementedError
1727
1440
 
1728
 
 
1729
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1730
1442
                     socketserver.TCPServer, object):
1731
1443
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1805
1517
        self.enabled = False
1806
1518
        self.clients = clients
1807
1519
        if self.clients is None:
1808
 
            self.clients = {}
 
1520
            self.clients = set()
1809
1521
        self.use_dbus = use_dbus
1810
1522
        self.gnutls_priority = gnutls_priority
1811
1523
        IPv6_TCPServer.__init__(self, server_address,
1815
1527
    def server_activate(self):
1816
1528
        if self.enabled:
1817
1529
            return socketserver.TCPServer.server_activate(self)
1818
 
    
1819
1530
    def enable(self):
1820
1531
        self.enabled = True
1821
 
    
1822
 
    def add_pipe(self, parent_pipe, proc):
 
1532
    def add_pipe(self, parent_pipe):
1823
1533
        # Call "handle_ipc" for both data and EOF events
1824
1534
        gobject.io_add_watch(parent_pipe.fileno(),
1825
1535
                             gobject.IO_IN | gobject.IO_HUP,
1826
1536
                             functools.partial(self.handle_ipc,
1827
 
                                               parent_pipe =
1828
 
                                               parent_pipe,
1829
 
                                               proc = proc))
1830
 
    
 
1537
                                               parent_pipe = parent_pipe))
 
1538
        
1831
1539
    def handle_ipc(self, source, condition, parent_pipe=None,
1832
 
                   proc = None, client_object=None):
 
1540
                   client_object=None):
1833
1541
        condition_names = {
1834
1542
            gobject.IO_IN: "IN",   # There is data to read.
1835
1543
            gobject.IO_OUT: "OUT", # Data can be written (without
1844
1552
                                       for cond, name in
1845
1553
                                       condition_names.iteritems()
1846
1554
                                       if cond & condition)
1847
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1555
        # error or the other end of multiprocessing.Pipe has closed
1848
1556
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1849
 
            # Wait for other process to exit
1850
 
            proc.join()
1851
1557
            return False
1852
1558
        
1853
1559
        # Read a request from the child
1858
1564
            fpr = request[1]
1859
1565
            address = request[2]
1860
1566
            
1861
 
            for c in self.clients.itervalues():
 
1567
            for c in self.clients:
1862
1568
                if c.fingerprint == fpr:
1863
1569
                    client = c
1864
1570
                    break
1865
1571
            else:
1866
 
                logger.info("Client not found for fingerprint: %s, ad"
1867
 
                            "dress: %s", fpr, address)
 
1572
                logger.warning("Client not found for fingerprint: %s, ad"
 
1573
                               "dress: %s", fpr, address)
1868
1574
                if self.use_dbus:
1869
1575
                    # Emit D-Bus signal
1870
 
                    mandos_dbus_service.ClientNotFound(fpr,
1871
 
                                                       address[0])
 
1576
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1872
1577
                parent_pipe.send(False)
1873
1578
                return False
1874
1579
            
1875
1580
            gobject.io_add_watch(parent_pipe.fileno(),
1876
1581
                                 gobject.IO_IN | gobject.IO_HUP,
1877
1582
                                 functools.partial(self.handle_ipc,
1878
 
                                                   parent_pipe =
1879
 
                                                   parent_pipe,
1880
 
                                                   proc = proc,
1881
 
                                                   client_object =
1882
 
                                                   client))
 
1583
                                                   parent_pipe = parent_pipe,
 
1584
                                                   client_object = client))
1883
1585
            parent_pipe.send(True)
1884
 
            # remove the old hook in favor of the new above hook on
1885
 
            # same fileno
 
1586
            # remove the old hook in favor of the new above hook on same fileno
1886
1587
            return False
1887
1588
        if command == 'funcall':
1888
1589
            funcname = request[1]
1889
1590
            args = request[2]
1890
1591
            kwargs = request[3]
1891
1592
            
1892
 
            parent_pipe.send(('data', getattr(client_object,
1893
 
                                              funcname)(*args,
1894
 
                                                         **kwargs)))
1895
 
        
 
1593
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1594
 
1896
1595
        if command == 'getattr':
1897
1596
            attrname = request[1]
1898
1597
            if callable(client_object.__getattribute__(attrname)):
1899
1598
                parent_pipe.send(('function',))
1900
1599
            else:
1901
 
                parent_pipe.send(('data', client_object
1902
 
                                  .__getattribute__(attrname)))
 
1600
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1903
1601
        
1904
1602
        if command == 'setattr':
1905
1603
            attrname = request[1]
1906
1604
            value = request[2]
1907
1605
            setattr(client_object, attrname, value)
1908
 
        
 
1606
 
1909
1607
        return True
1910
1608
 
1911
1609
 
1948
1646
    return timevalue
1949
1647
 
1950
1648
 
 
1649
def if_nametoindex(interface):
 
1650
    """Call the C function if_nametoindex(), or equivalent
 
1651
    
 
1652
    Note: This function cannot accept a unicode string."""
 
1653
    global if_nametoindex
 
1654
    try:
 
1655
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1656
                          (ctypes.util.find_library("c"))
 
1657
                          .if_nametoindex)
 
1658
    except (OSError, AttributeError):
 
1659
        logger.warning("Doing if_nametoindex the hard way")
 
1660
        def if_nametoindex(interface):
 
1661
            "Get an interface index the hard way, i.e. using fcntl()"
 
1662
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1663
            with contextlib.closing(socket.socket()) as s:
 
1664
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1665
                                    struct.pack(str("16s16x"),
 
1666
                                                interface))
 
1667
            interface_index = struct.unpack(str("I"),
 
1668
                                            ifreq[16:20])[0]
 
1669
            return interface_index
 
1670
    return if_nametoindex(interface)
 
1671
 
 
1672
 
1951
1673
def daemon(nochdir = False, noclose = False):
1952
1674
    """See daemon(3).  Standard BSD Unix function.
1953
1675
    
2008
1730
                        " system bus interface")
2009
1731
    parser.add_argument("--no-ipv6", action="store_false",
2010
1732
                        dest="use_ipv6", help="Do not use IPv6")
2011
 
    parser.add_argument("--no-restore", action="store_false",
2012
 
                        dest="restore", help="Do not restore stored"
2013
 
                        " state")
2014
 
    parser.add_argument("--statedir", metavar="DIR",
2015
 
                        help="Directory to save/restore state in")
2016
 
    
2017
1733
    options = parser.parse_args()
2018
1734
    
2019
1735
    if options.check:
2032
1748
                        "use_dbus": "True",
2033
1749
                        "use_ipv6": "True",
2034
1750
                        "debuglevel": "",
2035
 
                        "restore": "True",
2036
 
                        "statedir": "/var/lib/mandos"
2037
1751
                        }
2038
1752
    
2039
1753
    # Parse config file for server-global settings
2056
1770
    # options, if set.
2057
1771
    for option in ("interface", "address", "port", "debug",
2058
1772
                   "priority", "servicename", "configdir",
2059
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2060
 
                   "statedir"):
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
2061
1774
        value = getattr(options, option)
2062
1775
        if value is not None:
2063
1776
            server_settings[option] = value
2075
1788
    debuglevel = server_settings["debuglevel"]
2076
1789
    use_dbus = server_settings["use_dbus"]
2077
1790
    use_ipv6 = server_settings["use_ipv6"]
2078
 
    stored_state_path = os.path.join(server_settings["statedir"],
2079
 
                                     stored_state_file)
2080
 
    
2081
 
    if debug:
2082
 
        initlogger(debug, logging.DEBUG)
2083
 
    else:
2084
 
        if not debuglevel:
2085
 
            initlogger(debug)
2086
 
        else:
2087
 
            level = getattr(logging, debuglevel.upper())
2088
 
            initlogger(debug, level)
2089
 
    
 
1791
 
2090
1792
    if server_settings["servicename"] != "Mandos":
2091
1793
        syslogger.setFormatter(logging.Formatter
2092
1794
                               ('Mandos (%s) [%%(process)d]:'
2094
1796
                                % server_settings["servicename"]))
2095
1797
    
2096
1798
    # Parse config file with clients
2097
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
1799
    client_defaults = { "timeout": "1h",
 
1800
                        "interval": "5m",
 
1801
                        "checker": "fping -q -- %%(host)s",
 
1802
                        "host": "",
 
1803
                        "approval_delay": "0s",
 
1804
                        "approval_duration": "1s",
 
1805
                        }
 
1806
    client_config = configparser.SafeConfigParser(client_defaults)
2098
1807
    client_config.read(os.path.join(server_settings["configdir"],
2099
1808
                                    "clients.conf"))
2100
1809
    
2138
1847
        if error[0] != errno.EPERM:
2139
1848
            raise error
2140
1849
    
 
1850
    if not debug and not debuglevel:
 
1851
        syslogger.setLevel(logging.WARNING)
 
1852
        console.setLevel(logging.WARNING)
 
1853
    if debuglevel:
 
1854
        level = getattr(logging, debuglevel.upper())
 
1855
        syslogger.setLevel(level)
 
1856
        console.setLevel(level)
 
1857
 
2141
1858
    if debug:
2142
1859
        # Enable all possible GnuTLS debugging
2143
1860
        
2157
1874
        os.dup2(null, sys.stdin.fileno())
2158
1875
        if null > 2:
2159
1876
            os.close(null)
 
1877
    else:
 
1878
        # No console logging
 
1879
        logger.removeHandler(console)
2160
1880
    
2161
1881
    # Need to fork before connecting to D-Bus
2162
1882
    if not debug:
2163
1883
        # Close all input and output, do double fork, etc.
2164
1884
        daemon()
2165
1885
    
2166
 
    gobject.threads_init()
2167
 
    
2168
1886
    global main_loop
2169
1887
    # From the Avahi example code
2170
1888
    DBusGMainLoop(set_as_default=True )
2173
1891
    # End of Avahi example code
2174
1892
    if use_dbus:
2175
1893
        try:
2176
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2177
1895
                                            bus, do_not_queue=True)
2178
 
            old_bus_name = (dbus.service.BusName
2179
 
                            ("se.bsnet.fukt.Mandos", bus,
2180
 
                             do_not_queue=True))
2181
1896
        except dbus.exceptions.NameExistsException as e:
2182
1897
            logger.error(unicode(e) + ", disabling D-Bus")
2183
1898
            use_dbus = False
2184
1899
            server_settings["use_dbus"] = False
2185
1900
            tcp_server.use_dbus = False
2186
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
 
    service = AvahiServiceToSyslog(name =
2188
 
                                   server_settings["servicename"],
2189
 
                                   servicetype = "_mandos._tcp",
2190
 
                                   protocol = protocol, bus = bus)
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
1903
                           servicetype = "_mandos._tcp",
 
1904
                           protocol = protocol, bus = bus)
2191
1905
    if server_settings["interface"]:
2192
1906
        service.interface = (if_nametoindex
2193
1907
                             (str(server_settings["interface"])))
2197
1911
    
2198
1912
    client_class = Client
2199
1913
    if use_dbus:
2200
 
        client_class = functools.partial(ClientDBusTransitional,
2201
 
                                         bus = bus)
2202
 
    
2203
 
    client_settings = Client.config_parser(client_config)
2204
 
    old_client_settings = {}
2205
 
    clients_data = {}
2206
 
    
2207
 
    # Get client data and settings from last running state.
2208
 
    if server_settings["restore"]:
2209
 
        try:
2210
 
            with open(stored_state_path, "rb") as stored_state:
2211
 
                clients_data, old_client_settings = (pickle.load
2212
 
                                                     (stored_state))
2213
 
            os.remove(stored_state_path)
2214
 
        except IOError as e:
2215
 
            logger.warning("Could not load persistent state: {0}"
2216
 
                           .format(e))
2217
 
            if e.errno != errno.ENOENT:
2218
 
                raise
2219
 
        except EOFError as e:
2220
 
            logger.warning("Could not load persistent state: "
2221
 
                           "EOFError: {0}".format(e))
2222
 
    
2223
 
    with PGPEngine() as pgp:
2224
 
        for client_name, client in clients_data.iteritems():
2225
 
            # Decide which value to use after restoring saved state.
2226
 
            # We have three different values: Old config file,
2227
 
            # new config file, and saved state.
2228
 
            # New config value takes precedence if it differs from old
2229
 
            # config value, otherwise use saved state.
2230
 
            for name, value in client_settings[client_name].items():
2231
 
                try:
2232
 
                    # For each value in new config, check if it
2233
 
                    # differs from the old config value (Except for
2234
 
                    # the "secret" attribute)
2235
 
                    if (name != "secret" and
2236
 
                        value != old_client_settings[client_name]
2237
 
                        [name]):
2238
 
                        client[name] = value
2239
 
                except KeyError:
2240
 
                    pass
2241
 
            
2242
 
            # Clients who has passed its expire date can still be
2243
 
            # enabled if its last checker was successful.  Clients
2244
 
            # whose checker failed before we stored its state is
2245
 
            # assumed to have failed all checkers during downtime.
2246
 
            if client["enabled"]:
2247
 
                if datetime.datetime.utcnow() >= client["expires"]:
2248
 
                    if not client["last_checked_ok"]:
2249
 
                        logger.warning(
2250
 
                            "disabling client {0} - Client never "
2251
 
                            "performed a successfull checker"
2252
 
                            .format(client["name"]))
2253
 
                        client["enabled"] = False
2254
 
                    elif client["last_checker_status"] != 0:
2255
 
                        logger.warning(
2256
 
                            "disabling client {0} - Client "
2257
 
                            "last checker failed with error code {1}"
2258
 
                            .format(client["name"],
2259
 
                                    client["last_checker_status"]))
2260
 
                        client["enabled"] = False
2261
 
                    else:
2262
 
                        client["expires"] = (datetime.datetime
2263
 
                                             .utcnow()
2264
 
                                             + client["timeout"])
2265
 
                    
 
1914
        client_class = functools.partial(ClientDBus, bus = bus)
 
1915
    def client_config_items(config, section):
 
1916
        special_settings = {
 
1917
            "approved_by_default":
 
1918
                lambda: config.getboolean(section,
 
1919
                                          "approved_by_default"),
 
1920
            }
 
1921
        for name, value in config.items(section):
2266
1922
            try:
2267
 
                client["secret"] = (
2268
 
                    pgp.decrypt(client["encrypted_secret"],
2269
 
                                client_settings[client_name]
2270
 
                                ["secret"]))
2271
 
            except PGPError:
2272
 
                # If decryption fails, we use secret from new settings
2273
 
                logger.debug("Failed to decrypt {0} old secret"
2274
 
                             .format(client_name))
2275
 
                client["secret"] = (
2276
 
                    client_settings[client_name]["secret"])
2277
 
 
2278
 
    
2279
 
    # Add/remove clients based on new changes made to config
2280
 
    for client_name in set(old_client_settings) - set(client_settings):
2281
 
        del clients_data[client_name]
2282
 
    for client_name in set(client_settings) - set(old_client_settings):
2283
 
        clients_data[client_name] = client_settings[client_name]
2284
 
 
2285
 
    # Create clients all clients
2286
 
    for client_name, client in clients_data.iteritems():
2287
 
        tcp_server.clients[client_name] = client_class(
2288
 
            name = client_name, settings = client)
2289
 
    
 
1923
                yield (name, special_settings[name]())
 
1924
            except KeyError:
 
1925
                yield (name, value)
 
1926
    
 
1927
    tcp_server.clients.update(set(
 
1928
            client_class(name = section,
 
1929
                         config= dict(client_config_items(
 
1930
                        client_config, section)))
 
1931
            for section in client_config.sections()))
2290
1932
    if not tcp_server.clients:
2291
1933
        logger.warning("No clients defined")
2292
1934
        
2303
1945
            # "pidfile" was never created
2304
1946
            pass
2305
1947
        del pidfilename
 
1948
        
2306
1949
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
 
    
 
1950
 
2308
1951
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
1952
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2310
1953
    
2313
1956
            """A D-Bus proxy object"""
2314
1957
            def __init__(self):
2315
1958
                dbus.service.Object.__init__(self, bus, "/")
2316
 
            _interface = "se.recompile.Mandos"
 
1959
            _interface = "se.bsnet.fukt.Mandos"
2317
1960
            
2318
1961
            @dbus.service.signal(_interface, signature="o")
2319
1962
            def ClientAdded(self, objpath):
2334
1977
            def GetAllClients(self):
2335
1978
                "D-Bus method"
2336
1979
                return dbus.Array(c.dbus_object_path
2337
 
                                  for c in
2338
 
                                  tcp_server.clients.itervalues())
 
1980
                                  for c in tcp_server.clients)
2339
1981
            
2340
1982
            @dbus.service.method(_interface,
2341
1983
                                 out_signature="a{oa{sv}}")
2343
1985
                "D-Bus method"
2344
1986
                return dbus.Dictionary(
2345
1987
                    ((c.dbus_object_path, c.GetAll(""))
2346
 
                     for c in tcp_server.clients.itervalues()),
 
1988
                     for c in tcp_server.clients),
2347
1989
                    signature="oa{sv}")
2348
1990
            
2349
1991
            @dbus.service.method(_interface, in_signature="o")
2350
1992
            def RemoveClient(self, object_path):
2351
1993
                "D-Bus method"
2352
 
                for c in tcp_server.clients.itervalues():
 
1994
                for c in tcp_server.clients:
2353
1995
                    if c.dbus_object_path == object_path:
2354
 
                        del tcp_server.clients[c.name]
 
1996
                        tcp_server.clients.remove(c)
2355
1997
                        c.remove_from_connection()
2356
1998
                        # Don't signal anything except ClientRemoved
2357
1999
                        c.disable(quiet=True)
2362
2004
            
2363
2005
            del _interface
2364
2006
        
2365
 
        class MandosDBusServiceTransitional(MandosDBusService):
2366
 
            __metaclass__ = AlternateDBusNamesMetaclass
2367
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2007
        mandos_dbus_service = MandosDBusService()
2368
2008
    
2369
2009
    def cleanup():
2370
2010
        "Cleanup function; run on exit"
2371
2011
        service.cleanup()
2372
2012
        
2373
 
        multiprocessing.active_children()
2374
 
        if not (tcp_server.clients or client_settings):
2375
 
            return
2376
 
        
2377
 
        # Store client before exiting. Secrets are encrypted with key
2378
 
        # based on what config file has. If config file is
2379
 
        # removed/edited, old secret will thus be unrecovable.
2380
 
        clients = {}
2381
 
        with PGPEngine() as pgp:
2382
 
            for client in tcp_server.clients.itervalues():
2383
 
                key = client_settings[client.name]["secret"]
2384
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2385
 
                                                      key)
2386
 
                client_dict = {}
2387
 
                
2388
 
                # A list of attributes that can not be pickled
2389
 
                # + secret.
2390
 
                exclude = set(("bus", "changedstate", "secret",
2391
 
                               "checker"))
2392
 
                for name, typ in (inspect.getmembers
2393
 
                                  (dbus.service.Object)):
2394
 
                    exclude.add(name)
2395
 
                
2396
 
                client_dict["encrypted_secret"] = (client
2397
 
                                                   .encrypted_secret)
2398
 
                for attr in client.client_structure:
2399
 
                    if attr not in exclude:
2400
 
                        client_dict[attr] = getattr(client, attr)
2401
 
                
2402
 
                clients[client.name] = client_dict
2403
 
                del client_settings[client.name]["secret"]
2404
 
        
2405
 
        try:
2406
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2407
 
                                                prefix="clients-",
2408
 
                                                dir=os.path.dirname
2409
 
                                                (stored_state_path))
2410
 
            with os.fdopen(tempfd, "wb") as stored_state:
2411
 
                pickle.dump((clients, client_settings), stored_state)
2412
 
            os.rename(tempname, stored_state_path)
2413
 
        except (IOError, OSError) as e:
2414
 
            logger.warning("Could not save persistent state: {0}"
2415
 
                           .format(e))
2416
 
            if not debug:
2417
 
                try:
2418
 
                    os.remove(tempname)
2419
 
                except NameError:
2420
 
                    pass
2421
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2422
 
                                   errno.EEXIST)):
2423
 
                raise e
2424
 
        
2425
 
        # Delete all clients, and settings from config
2426
2013
        while tcp_server.clients:
2427
 
            name, client = tcp_server.clients.popitem()
 
2014
            client = tcp_server.clients.pop()
2428
2015
            if use_dbus:
2429
2016
                client.remove_from_connection()
 
2017
            client.disable_hook = None
2430
2018
            # Don't signal anything except ClientRemoved
2431
2019
            client.disable(quiet=True)
2432
2020
            if use_dbus:
2433
2021
                # Emit D-Bus signal
2434
 
                mandos_dbus_service.ClientRemoved(client
2435
 
                                                  .dbus_object_path,
 
2022
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2436
2023
                                                  client.name)
2437
 
        client_settings.clear()
2438
2024
    
2439
2025
    atexit.register(cleanup)
2440
2026
    
2441
 
    for client in tcp_server.clients.itervalues():
 
2027
    for client in tcp_server.clients:
2442
2028
        if use_dbus:
2443
2029
            # Emit D-Bus signal
2444
2030
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2445
 
        # Need to initiate checking of clients
2446
 
        if client.enabled:
2447
 
            client.init_checker()
 
2031
        client.enable()
2448
2032
    
2449
2033
    tcp_server.enable()
2450
2034
    tcp_server.server_activate()