/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: Björn Påhlsson
  • Date: 2011-09-18 16:00:55 UTC
  • mto: This revision was merged to the branch mainline in revision 498.
  • Revision ID: belorn@fukt.bsnet.se-20110918160055-04y4aoz1j87iyjo2
updated DBUS-API documentation for extended timeout

Show diffs side-by-side

added added

removed removed

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