/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-12-30 17:57:46 UTC
  • mto: (237.7.89 trunk)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111230175746-qz41pq522ljm0vw9
* network-hooks.d/wireless (start): Bug fixes: Don't shadow "$DELAY".
                                    Supress unwanted error messages.
  (modules): Bug fix: Parse new config file syntax.

Show diffs side-by-side

added added

removed removed

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