/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2011-07-31 13:05:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110731130534-v4d9hsvek80ms9uo
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
  (main): Disallow "--retry" arguments < 0.  Allow brackets [] around
          IPv6 addresses, as recommended by RFC 5952.  Bug fix: When
          using --connect, really use retry_interval, not 1 second.
* plugins.d/mandos-client.xml (DESCRIPTION): Add retry info.
  (--retry): Remove repeated word.

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