/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-08-08 21:12:37 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110808211237-jejsz5brjytrjot8
* Makefile (DOCS): Added "intro.8mandos".
  (intro.8mandos, intro.8mandos.xhtml): New.
* README: Replaced text with link, reference and short summary.
* intro.xml: New.
* mandos-clients.conf.xml (SEE ALSO): Added "intro(8mandos)".
* mandos-ctl.xml (SEE ALSO): - '' -
* mandos-keygen.xml (SEE ALSO): - '' -
* mandos-monitor.xml (SEE ALSO): - '' -
* mandos.conf.xml (SEE ALSO): - '' -
* mandos.xml (SEE ALSO): - '' -
* plugin-runner.xml (SEE ALSO): - '' -
* plugins.d/askpass-fifo.xml (SEE ALSO): - '' -
* plugins.d/mandos-client.xml (SEE ALSO): - '' -
* plugins.d/password-prompt.xml (SEE ALSO): - '' -
* plugins.d/plymouth.xml (SEE ALSO): - '' -
* plugins.d/splashy.xml (SEE ALSO): - '' -
* plugins.d/usplash.xml (SEE ALSO): - '' -

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