/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: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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@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,
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
 
66
import binascii
 
67
import tempfile
66
68
 
67
69
import dbus
68
70
import dbus.service
73
75
import ctypes.util
74
76
import xml.dom.minidom
75
77
import inspect
 
78
import GnuPGInterface
76
79
 
77
80
try:
78
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
85
    except ImportError:
83
86
        SO_BINDTODEVICE = None
84
87
 
85
 
 
86
 
version = "1.3.1"
87
 
 
88
 
#logger = logging.getLogger('mandos')
89
 
logger = logging.Logger('mandos')
 
88
version = "1.5.2"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
90
92
syslogger = (logging.handlers.SysLogHandler
91
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
94
              address = str("/dev/log")))
93
 
syslogger.setFormatter(logging.Formatter
94
 
                       ('Mandos [%(process)d]: %(levelname)s:'
95
 
                        ' %(message)s'))
96
 
logger.addHandler(syslogger)
97
 
 
98
 
console = logging.StreamHandler()
99
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
102
 
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
                                              '--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
 
103
211
 
104
212
class AvahiError(Exception):
105
213
    def __init__(self, value, *args, **kwargs):
160
268
                            " after %i retries, exiting.",
161
269
                            self.rename_count)
162
270
            raise AvahiServiceError("Too many renames")
163
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
164
273
        logger.info("Changing Zeroconf service name to %r ...",
165
274
                    self.name)
166
 
        syslogger.setFormatter(logging.Formatter
167
 
                               ('Mandos (%s) [%%(process)d]:'
168
 
                                ' %%(levelname)s: %%(message)s'
169
 
                                % self.name))
170
275
        self.remove()
171
276
        try:
172
277
            self.add()
192
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
298
        self.entry_group_state_changed_match = (
194
299
            self.group.connect_to_signal(
195
 
                'StateChanged', self .entry_group_state_changed))
 
300
                'StateChanged', self.entry_group_state_changed))
196
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
197
302
                     self.name, self.type)
198
303
        self.group.AddService(
224
329
            try:
225
330
                self.group.Free()
226
331
            except (dbus.exceptions.UnknownMethodException,
227
 
                    dbus.exceptions.DBusException) as e:
 
332
                    dbus.exceptions.DBusException):
228
333
                pass
229
334
            self.group = None
230
335
        self.remove()
264
369
                                 self.server_state_changed)
265
370
        self.server_state_changed(self.server.GetState())
266
371
 
 
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
267
381
 
268
 
def _timedelta_to_milliseconds(td):
 
382
def timedelta_to_milliseconds(td):
269
383
    "Convert a datetime.timedelta() to milliseconds"
270
384
    return ((td.days * 24 * 60 * 60 * 1000)
271
385
            + (td.seconds * 1000)
275
389
    """A representation of a client host served by this server.
276
390
    
277
391
    Attributes:
278
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
279
393
    approval_delay: datetime.timedelta(); Time to wait for approval
280
394
    approval_duration: datetime.timedelta(); Duration of one approval
281
395
    checker:    subprocess.Popen(); a running checker process used
288
402
                     instance %(name)s can be used in the command.
289
403
    checker_initiator_tag: a gobject event source tag, or None
290
404
    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
291
407
    current_checker_command: string; current running checker_command
292
 
    disable_hook:  If set, called by disable() as disable_hook(self)
293
408
    disable_initiator_tag: a gobject event source tag, or None
294
409
    enabled:    bool()
295
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
298
413
    interval:   datetime.timedelta(); How often to start a new checker
299
414
    last_approval_request: datetime.datetime(); (UTC) or None
300
415
    last_checked_ok: datetime.datetime(); (UTC) or None
301
 
    last_enabled: datetime.datetime(); (UTC)
 
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
                         status of last checker. -1 reflects crashed
 
418
                         checker, or None.
 
419
    last_enabled: datetime.datetime(); (UTC) or None
302
420
    name:       string; from the config file, used in log messages and
303
421
                        D-Bus identifiers
304
422
    secret:     bytestring; sent verbatim (over TLS) to client
305
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
306
424
                                      until this client is disabled
307
 
    extended_timeout:   extra long timeout when password has been sent
 
425
    extended_timeout:   extra long timeout when secret has been sent
308
426
    runtime_expansions: Allowed attributes for runtime expansion.
309
427
    expires:    datetime.datetime(); time (UTC) when a client will be
310
428
                disabled, or None
314
432
                          "created", "enabled", "fingerprint",
315
433
                          "host", "interval", "last_checked_ok",
316
434
                          "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
                        }
317
445
    
318
446
    def timeout_milliseconds(self):
319
447
        "Return the 'timeout' attribute in milliseconds"
320
 
        return _timedelta_to_milliseconds(self.timeout)
 
448
        return timedelta_to_milliseconds(self.timeout)
321
449
    
322
450
    def extended_timeout_milliseconds(self):
323
451
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
325
453
    
326
454
    def interval_milliseconds(self):
327
455
        "Return the 'interval' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.interval)
 
456
        return timedelta_to_milliseconds(self.interval)
329
457
    
330
458
    def approval_delay_milliseconds(self):
331
 
        return _timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
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"] = None
 
505
        
 
506
        return settings
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
334
510
        """Note: the 'checker' key in 'config' sets the
335
511
        'checker_command' attribute and *not* the 'checker'
336
512
        attribute."""
337
513
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
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
       
340
528
        logger.debug("Creating client %r", self.name)
341
529
        # Uppercase and remove spaces from fingerprint for later
342
530
        # comparison purposes with return value from the fingerprint()
343
531
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
532
        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
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
367
537
        self.checker = None
368
538
        self.checker_initiator_tag = None
369
539
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
540
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
541
        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)
 
542
        self.approved = None
378
543
        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())
 
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)
384
558
    
 
559
    # Send notice to process children that client state has changed
385
560
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
390
564
    def enable(self):
391
565
        """Start this client's checker and timeout hooks"""
392
566
        if getattr(self, "enabled", False):
393
567
            # Already enabled
394
568
            return
395
569
        self.send_changedstate()
396
 
        # Schedule a new checker to be started an 'interval' from now,
397
 
        # and every interval from then on.
398
 
        self.checker_initiator_tag = (gobject.timeout_add
399
 
                                      (self.interval_milliseconds(),
400
 
                                       self.start_checker))
401
 
        # Schedule a disable() when 'timeout' has passed
402
570
        self.expires = datetime.datetime.utcnow() + self.timeout
403
 
        self.disable_initiator_tag = (gobject.timeout_add
404
 
                                   (self.timeout_milliseconds(),
405
 
                                    self.disable))
406
571
        self.enabled = True
407
572
        self.last_enabled = datetime.datetime.utcnow()
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
573
        self.init_checker()
410
574
    
411
575
    def disable(self, quiet=True):
412
576
        """Disable this client."""
424
588
            gobject.source_remove(self.checker_initiator_tag)
425
589
            self.checker_initiator_tag = None
426
590
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
591
        self.enabled = False
430
592
        # Do not run this again if called by a gobject.timeout_add
431
593
        return False
432
594
    
433
595
    def __del__(self):
434
 
        self.disable_hook = None
435
596
        self.disable()
436
597
    
 
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
    
437
611
    def checker_callback(self, pid, condition, command):
438
612
        """The checker has completed, so take appropriate actions."""
439
613
        self.checker_callback_tag = None
440
614
        self.checker = None
441
615
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
444
618
                logger.info("Checker for %(name)s succeeded",
445
619
                            vars(self))
446
620
                self.checked_ok()
448
622
                logger.info("Checker for %(name)s failed",
449
623
                            vars(self))
450
624
        else:
 
625
            self.last_checker_status = -1
451
626
            logger.warning("Checker for %(name)s crashed?",
452
627
                           vars(self))
453
628
    
460
635
        if timeout is None:
461
636
            timeout = self.timeout
462
637
        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
 
                                      (_timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
638
        if self.disable_initiator_tag is not None:
 
639
            gobject.source_remove(self.disable_initiator_tag)
 
640
        if getattr(self, "enabled", False):
 
641
            self.disable_initiator_tag = (gobject.timeout_add
 
642
                                          (timedelta_to_milliseconds
 
643
                                           (timeout), self.disable))
 
644
            self.expires = datetime.datetime.utcnow() + timeout
468
645
    
469
646
    def need_approval(self):
470
647
        self.last_approval_request = datetime.datetime.utcnow()
629
806
        """
630
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
631
808
                for cls in self.__class__.__mro__
632
 
                for name, prop in inspect.getmembers(cls, self._is_dbus_property))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
633
811
    
634
812
    def _get_dbus_property(self, interface_name, property_name):
635
813
        """Returns a bound method if one exists which is a D-Bus
636
814
        property with the specified name and interface.
637
815
        """
638
816
        for cls in  self.__class__.__mro__:
639
 
            for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
 
                if value._dbus_name == property_name and value._dbus_interface == interface_name:
 
817
            for name, value in (inspect.getmembers
 
818
                                (cls, self._is_dbus_property)):
 
819
                if (value._dbus_name == property_name
 
820
                    and value._dbus_interface == interface_name):
641
821
                    return value.__get__(self)
642
822
        
643
823
        # No such property
644
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
825
                                   + interface_name + "."
646
826
                                   + property_name)
647
 
 
648
827
    
649
828
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
650
829
                         out_signature="v")
671
850
            # signatures other than "ay".
672
851
            if prop._dbus_signature != "ay":
673
852
                raise ValueError
674
 
            value = dbus.ByteArray(''.join(unichr(byte)
675
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
676
855
        prop(value)
677
856
    
678
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
683
862
        
684
863
        Note: Will not include properties with access="write".
685
864
        """
686
 
        all = {}
 
865
        properties = {}
687
866
        for name, prop in self._get_all_dbus_properties():
688
867
            if (interface_name
689
868
                and interface_name != prop._dbus_interface):
694
873
                continue
695
874
            value = prop()
696
875
            if not hasattr(value, "variant_level"):
697
 
                all[name] = value
 
876
                properties[name] = value
698
877
                continue
699
 
            all[name] = type(value)(value, variant_level=
700
 
                                    value.variant_level+1)
701
 
        return dbus.Dictionary(all, signature="sv")
 
878
            properties[name] = type(value)(value, variant_level=
 
879
                                           value.variant_level+1)
 
880
        return dbus.Dictionary(properties, signature="sv")
702
881
    
703
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
704
883
                         out_signature="s",
755
934
    return dbus.String(dt.isoformat(),
756
935
                       variant_level=variant_level)
757
936
 
758
 
class transitional_dbus_metaclass(DBusObjectWithProperties.__metaclass__):
 
937
 
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
 
942
    """
759
943
    def __new__(mcs, name, bases, attr):
760
 
        for attrname, old_dbusobj in inspect.getmembers(bases[0]):
761
 
            new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
762
 
            if (getattr(old_dbusobj, "_dbus_is_signal", False)
763
 
                and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
764
 
                unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
765
 
                                    old_dbusobj.__closure__))["func"].cell_contents
766
 
                newfunc = types.FunctionType(unwrappedfunc.func_code,
767
 
                                             unwrappedfunc.func_globals,
768
 
                                             unwrappedfunc.func_name,
769
 
                                             unwrappedfunc.func_defaults,
770
 
                                             unwrappedfunc.func_closure)
771
 
                new_dbusfunc = dbus.service.signal(
772
 
                    new_interface, old_dbusobj._dbus_signature)(newfunc)            
773
 
                attr["_transitional_" + attrname] = new_dbusfunc
774
 
 
775
 
                def fixscope(func1, func2):
776
 
                    def newcall(*args, **kwargs):
777
 
                        func1(*args, **kwargs)
778
 
                        func2(*args, **kwargs)
779
 
                    return newcall
780
 
 
781
 
                attr[attrname] = fixscope(old_dbusobj, new_dbusfunc)
782
 
            
783
 
            elif (getattr(old_dbusobj, "_dbus_is_method", False)
784
 
                and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
785
 
                new_dbusfunc = (dbus.service.method
786
 
                                (new_interface,
787
 
                                 old_dbusobj._dbus_in_signature,
788
 
                                 old_dbusobj._dbus_out_signature)
789
 
                                (types.FunctionType
790
 
                                 (old_dbusobj.func_code,
791
 
                                  old_dbusobj.func_globals,
792
 
                                  old_dbusobj.func_name,
793
 
                                  old_dbusobj.func_defaults,
794
 
                                  old_dbusobj.func_closure)))
795
 
 
796
 
                attr[attrname] = new_dbusfunc
797
 
            elif (getattr(old_dbusobj, "_dbus_is_property", False)
798
 
                  and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
799
 
                new_dbusfunc = (dbus_service_property
800
 
                                (new_interface,
801
 
                                 old_dbusobj._dbus_signature,
802
 
                                 old_dbusobj._dbus_access,
803
 
                                 old_dbusobj._dbus_get_args_options["byte_arrays"])
804
 
                                (types.FunctionType
805
 
                                 (old_dbusobj.func_code,
806
 
                                  old_dbusobj.func_globals,
807
 
                                  old_dbusobj.func_name,
808
 
                                  old_dbusobj.func_defaults,
809
 
                                  old_dbusobj.func_closure)))
810
 
 
811
 
                attr[attrname] = new_dbusfunc
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
 
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
951
                # with the wrong interface name
 
952
                if (not hasattr(attribute, "_dbus_interface")
 
953
                    or not attribute._dbus_interface
 
954
                    .startswith("se.recompile.Mandos")):
 
955
                    continue
 
956
                # Create an alternate D-Bus interface name based on
 
957
                # the current name
 
958
                alt_interface = (attribute._dbus_interface
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
 
961
                # Is this a D-Bus signal?
 
962
                if getattr(attribute, "_dbus_is_signal", False):
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
 
965
                    nonmethod_func = (dict(
 
966
                            zip(attribute.func_code.co_freevars,
 
967
                                attribute.__closure__))["func"]
 
968
                                      .cell_contents)
 
969
                    # Create a new, but exactly alike, function
 
970
                    # object, and decorate it to be a new D-Bus signal
 
971
                    # with the alternate D-Bus interface name
 
972
                    new_function = (dbus.service.signal
 
973
                                    (alt_interface,
 
974
                                     attribute._dbus_signature)
 
975
                                    (types.FunctionType(
 
976
                                nonmethod_func.func_code,
 
977
                                nonmethod_func.func_globals,
 
978
                                nonmethod_func.func_name,
 
979
                                nonmethod_func.func_defaults,
 
980
                                nonmethod_func.func_closure)))
 
981
                    # Define a creator of a function to call both the
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
 
984
                    def fixscope(func1, func2):
 
985
                        """This function is a scope container to pass
 
986
                        func1 and func2 to the "call_both" function
 
987
                        outside of its arguments"""
 
988
                        def call_both(*args, **kwargs):
 
989
                            """This function will emit two D-Bus
 
990
                            signals by calling func1 and func2"""
 
991
                            func1(*args, **kwargs)
 
992
                            func2(*args, **kwargs)
 
993
                        return call_both
 
994
                    # Create the "call_both" function and add it to
 
995
                    # the class
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
 
998
                # Is this a D-Bus method?
 
999
                elif getattr(attribute, "_dbus_is_method", False):
 
1000
                    # Create a new, but exactly alike, function
 
1001
                    # object.  Decorate it to be a new D-Bus method
 
1002
                    # with the alternate D-Bus interface name.  Add it
 
1003
                    # to the class.
 
1004
                    attr[attrname] = (dbus.service.method
 
1005
                                      (alt_interface,
 
1006
                                       attribute._dbus_in_signature,
 
1007
                                       attribute._dbus_out_signature)
 
1008
                                      (types.FunctionType
 
1009
                                       (attribute.func_code,
 
1010
                                        attribute.func_globals,
 
1011
                                        attribute.func_name,
 
1012
                                        attribute.func_defaults,
 
1013
                                        attribute.func_closure)))
 
1014
                # Is this a D-Bus property?
 
1015
                elif getattr(attribute, "_dbus_is_property", False):
 
1016
                    # Create a new, but exactly alike, function
 
1017
                    # object, and decorate it to be a new D-Bus
 
1018
                    # property with the alternate D-Bus interface
 
1019
                    # name.  Add it to the class.
 
1020
                    attr[attrname] = (dbus_service_property
 
1021
                                      (alt_interface,
 
1022
                                       attribute._dbus_signature,
 
1023
                                       attribute._dbus_access,
 
1024
                                       attribute
 
1025
                                       ._dbus_get_args_options
 
1026
                                       ["byte_arrays"])
 
1027
                                      (types.FunctionType
 
1028
                                       (attribute.func_code,
 
1029
                                        attribute.func_globals,
 
1030
                                        attribute.func_name,
 
1031
                                        attribute.func_defaults,
 
1032
                                        attribute.func_closure)))
812
1033
        return type.__new__(mcs, name, bases, attr)
813
1034
 
 
1035
 
814
1036
class ClientDBus(Client, DBusObjectWithProperties):
815
1037
    """A Client class using D-Bus
816
1038
    
825
1047
    # dbus.service.Object doesn't use super(), so we can't either.
826
1048
    
827
1049
    def __init__(self, bus = None, *args, **kwargs):
828
 
        self._approvals_pending = 0
829
1050
        self.bus = bus
830
1051
        Client.__init__(self, *args, **kwargs)
831
1052
        # Only now, when this client is initialized, can it show up on
841
1062
    def notifychangeproperty(transform_func,
842
1063
                             dbus_name, type_func=lambda x: x,
843
1064
                             variant_level=1):
844
 
        """ Modify a variable so that its a property that announce its
845
 
        changes to DBus.
846
 
        transform_fun: Function that takes a value and transform it to
847
 
                       DBus type.
848
 
        dbus_name: DBus name of the variable
 
1065
        """ Modify a variable so that it's a property which announces
 
1066
        its changes to DBus.
 
1067
        
 
1068
        transform_fun: Function that takes a value and a variant_level
 
1069
                       and transforms it to a D-Bus type.
 
1070
        dbus_name: D-Bus name of the variable
849
1071
        type_func: Function that transform the value before sending it
850
 
                   to DBus
851
 
        variant_level: DBus variant level. default: 1
 
1072
                   to the D-Bus.  Default: no transform
 
1073
        variant_level: D-Bus variant level.  Default: 1
852
1074
        """
853
 
        real_value = [None,]
 
1075
        attrname = "_{0}".format(dbus_name)
854
1076
        def setter(self, value):
855
 
            old_value = real_value[0]
856
 
            real_value[0] = value
857
1077
            if hasattr(self, "dbus_object_path"):
858
 
                if type_func(old_value) != type_func(real_value[0]):
859
 
                    dbus_value = transform_func(type_func(real_value[0]),
860
 
                                                variant_level)
 
1078
                if (not hasattr(self, attrname) or
 
1079
                    type_func(getattr(self, attrname, None))
 
1080
                    != type_func(value)):
 
1081
                    dbus_value = transform_func(type_func(value),
 
1082
                                                variant_level
 
1083
                                                =variant_level)
861
1084
                    self.PropertyChanged(dbus.String(dbus_name),
862
1085
                                         dbus_value)
 
1086
            setattr(self, attrname, value)
863
1087
        
864
 
        return property(lambda self: real_value[0], setter)
 
1088
        return property(lambda self: getattr(self, attrname), setter)
865
1089
    
866
1090
    
867
1091
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
872
1096
    last_enabled = notifychangeproperty(datetime_to_dbus,
873
1097
                                        "LastEnabled")
874
1098
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
875
 
                                   type_func = lambda checker: checker is not None)
 
1099
                                   type_func = lambda checker:
 
1100
                                       checker is not None)
876
1101
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
877
1102
                                           "LastCheckedOK")
878
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
879
 
                                                 "LastApprovalRequest")
 
1103
    last_approval_request = notifychangeproperty(
 
1104
        datetime_to_dbus, "LastApprovalRequest")
880
1105
    approved_by_default = notifychangeproperty(dbus.Boolean,
881
1106
                                               "ApprovedByDefault")
882
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
883
 
                                          type_func = _timedelta_to_milliseconds)
884
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
885
 
                                             type_func = _timedelta_to_milliseconds)
 
1107
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1108
                                          "ApprovalDelay",
 
1109
                                          type_func =
 
1110
                                          timedelta_to_milliseconds)
 
1111
    approval_duration = notifychangeproperty(
 
1112
        dbus.UInt64, "ApprovalDuration",
 
1113
        type_func = timedelta_to_milliseconds)
886
1114
    host = notifychangeproperty(dbus.String, "Host")
887
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
888
 
                                   type_func = _timedelta_to_milliseconds)
889
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
890
 
                                            type_func = _timedelta_to_milliseconds)
891
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
892
 
                                    type_func = _timedelta_to_milliseconds)
 
1115
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1116
                                   type_func =
 
1117
                                   timedelta_to_milliseconds)
 
1118
    extended_timeout = notifychangeproperty(
 
1119
        dbus.UInt64, "ExtendedTimeout",
 
1120
        type_func = timedelta_to_milliseconds)
 
1121
    interval = notifychangeproperty(dbus.UInt64,
 
1122
                                    "Interval",
 
1123
                                    type_func =
 
1124
                                    timedelta_to_milliseconds)
893
1125
    checker_command = notifychangeproperty(dbus.String, "Checker")
894
1126
    
895
1127
    del notifychangeproperty
937
1169
        return r
938
1170
    
939
1171
    def _reset_approved(self):
940
 
        self._approved = None
 
1172
        self.approved = None
941
1173
        return False
942
1174
    
943
1175
    def approve(self, value=True):
944
1176
        self.send_changedstate()
945
 
        self._approved = value
946
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1177
        self.approved = value
 
1178
        gobject.timeout_add(timedelta_to_milliseconds
947
1179
                            (self.approval_duration),
948
1180
                            self._reset_approved)
949
1181
    
950
1182
    
951
1183
    ## D-Bus methods, signals & properties
952
 
    _interface = "se.bsnet.fukt.Mandos.Client"
953
 
 
 
1184
    _interface = "se.recompile.Mandos.Client"
 
1185
    
954
1186
    ## Signals
955
1187
    
956
1188
    # CheckerCompleted - signal
1055
1287
                           access="readwrite")
1056
1288
    def ApprovalDuration_dbus_property(self, value=None):
1057
1289
        if value is None:       # get
1058
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1290
            return dbus.UInt64(timedelta_to_milliseconds(
1059
1291
                    self.approval_duration))
1060
1292
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1061
1293
    
1075
1307
    def Host_dbus_property(self, value=None):
1076
1308
        if value is None:       # get
1077
1309
            return dbus.String(self.host)
1078
 
        self.host = value
 
1310
        self.host = unicode(value)
1079
1311
    
1080
1312
    # Created - property
1081
1313
    @dbus_service_property(_interface, signature="s", access="read")
1082
1314
    def Created_dbus_property(self):
1083
 
        return dbus.String(datetime_to_dbus(self.created))
 
1315
        return datetime_to_dbus(self.created)
1084
1316
    
1085
1317
    # LastEnabled - property
1086
1318
    @dbus_service_property(_interface, signature="s", access="read")
1124
1356
        if value is None:       # get
1125
1357
            return dbus.UInt64(self.timeout_milliseconds())
1126
1358
        self.timeout = datetime.timedelta(0, 0, 0, value)
1127
 
        if getattr(self, "disable_initiator_tag", None) is None:
1128
 
            return
1129
1359
        # Reschedule timeout
1130
 
        gobject.source_remove(self.disable_initiator_tag)
1131
 
        self.disable_initiator_tag = None
1132
 
        self.expires = None
1133
 
        time_to_die = (self.
1134
 
                       _timedelta_to_milliseconds((self
1135
 
                                                   .last_checked_ok
1136
 
                                                   + self.timeout)
1137
 
                                                  - datetime.datetime
1138
 
                                                  .utcnow()))
1139
 
        if time_to_die <= 0:
1140
 
            # The timeout has passed
1141
 
            self.disable()
1142
 
        else:
1143
 
            self.expires = (datetime.datetime.utcnow()
1144
 
                            + datetime.timedelta(milliseconds = time_to_die))
1145
 
            self.disable_initiator_tag = (gobject.timeout_add
1146
 
                                          (time_to_die, self.disable))
 
1360
        if self.enabled:
 
1361
            now = datetime.datetime.utcnow()
 
1362
            time_to_die = timedelta_to_milliseconds(
 
1363
                (self.last_checked_ok + self.timeout) - now)
 
1364
            if time_to_die <= 0:
 
1365
                # The timeout has passed
 
1366
                self.disable()
 
1367
            else:
 
1368
                self.expires = (now +
 
1369
                                datetime.timedelta(milliseconds =
 
1370
                                                   time_to_die))
 
1371
                if (getattr(self, "disable_initiator_tag", None)
 
1372
                    is None):
 
1373
                    return
 
1374
                gobject.source_remove(self.disable_initiator_tag)
 
1375
                self.disable_initiator_tag = (gobject.timeout_add
 
1376
                                              (time_to_die,
 
1377
                                               self.disable))
1147
1378
    
1148
1379
    # ExtendedTimeout - property
1149
1380
    @dbus_service_property(_interface, signature="t",
1162
1393
        self.interval = datetime.timedelta(0, 0, 0, value)
1163
1394
        if getattr(self, "checker_initiator_tag", None) is None:
1164
1395
            return
1165
 
        # Reschedule checker run
1166
 
        gobject.source_remove(self.checker_initiator_tag)
1167
 
        self.checker_initiator_tag = (gobject.timeout_add
1168
 
                                      (value, self.start_checker))
1169
 
        self.start_checker()    # Start one now, too
 
1396
        if self.enabled:
 
1397
            # Reschedule checker run
 
1398
            gobject.source_remove(self.checker_initiator_tag)
 
1399
            self.checker_initiator_tag = (gobject.timeout_add
 
1400
                                          (value, self.start_checker))
 
1401
            self.start_checker()    # Start one now, too
1170
1402
    
1171
1403
    # Checker - property
1172
1404
    @dbus_service_property(_interface, signature="s",
1174
1406
    def Checker_dbus_property(self, value=None):
1175
1407
        if value is None:       # get
1176
1408
            return dbus.String(self.checker_command)
1177
 
        self.checker_command = value
 
1409
        self.checker_command = unicode(value)
1178
1410
    
1179
1411
    # CheckerRunning - property
1180
1412
    @dbus_service_property(_interface, signature="b",
1209
1441
            raise KeyError()
1210
1442
    
1211
1443
    def __getattribute__(self, name):
1212
 
        if(name == '_pipe'):
 
1444
        if name == '_pipe':
1213
1445
            return super(ProxyClient, self).__getattribute__(name)
1214
1446
        self._pipe.send(('getattr', name))
1215
1447
        data = self._pipe.recv()
1222
1454
            return func
1223
1455
    
1224
1456
    def __setattr__(self, name, value):
1225
 
        if(name == '_pipe'):
 
1457
        if name == '_pipe':
1226
1458
            return super(ProxyClient, self).__setattr__(name, value)
1227
1459
        self._pipe.send(('setattr', name, value))
1228
1460
 
 
1461
 
1229
1462
class ClientDBusTransitional(ClientDBus):
1230
 
    __metaclass__ = transitional_dbus_metaclass
 
1463
    __metaclass__ = AlternateDBusNamesMetaclass
 
1464
 
1231
1465
 
1232
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
1233
1467
    """A class to handle client connections.
1313
1547
                                       client.name)
1314
1548
                        if self.server.use_dbus:
1315
1549
                            # Emit D-Bus signal
1316
 
                            client.Rejected("Disabled")                    
 
1550
                            client.Rejected("Disabled")
1317
1551
                        return
1318
1552
                    
1319
 
                    if client._approved or not client.approval_delay:
 
1553
                    if client.approved or not client.approval_delay:
1320
1554
                        #We are approved or approval is disabled
1321
1555
                        break
1322
 
                    elif client._approved is None:
 
1556
                    elif client.approved is None:
1323
1557
                        logger.info("Client %s needs approval",
1324
1558
                                    client.name)
1325
1559
                        if self.server.use_dbus:
1336
1570
                        return
1337
1571
                    
1338
1572
                    #wait until timeout or approved
1339
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1340
1573
                    time = datetime.datetime.now()
1341
1574
                    client.changedstate.acquire()
1342
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1575
                    (client.changedstate.wait
 
1576
                     (float(client.timedelta_to_milliseconds(delay)
 
1577
                            / 1000)))
1343
1578
                    client.changedstate.release()
1344
1579
                    time2 = datetime.datetime.now()
1345
1580
                    if (time2 - time) >= delay:
1369
1604
                    sent_size += sent
1370
1605
                
1371
1606
                logger.info("Sending secret to %s", client.name)
1372
 
                # bump the timeout as if seen
 
1607
                # bump the timeout using extended_timeout
1373
1608
                client.checked_ok(client.extended_timeout)
1374
1609
                if self.server.use_dbus:
1375
1610
                    # Emit D-Bus signal
1443
1678
        # Convert the buffer to a Python bytestring
1444
1679
        fpr = ctypes.string_at(buf, buf_len.value)
1445
1680
        # Convert the bytestring to hexadecimal notation
1446
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1681
        hex_fpr = binascii.hexlify(fpr).upper()
1447
1682
        return hex_fpr
1448
1683
 
1449
1684
 
1452
1687
    def sub_process_main(self, request, address):
1453
1688
        try:
1454
1689
            self.finish_request(request, address)
1455
 
        except:
 
1690
        except Exception:
1456
1691
            self.handle_error(request, address)
1457
1692
        self.close_request(request)
1458
 
            
 
1693
    
1459
1694
    def process_request(self, request, address):
1460
1695
        """Start a new process to process the request."""
1461
 
        multiprocessing.Process(target = self.sub_process_main,
1462
 
                                args = (request, address)).start()
 
1696
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1697
                                       args = (request,
 
1698
                                               address))
 
1699
        proc.start()
 
1700
        return proc
1463
1701
 
1464
1702
 
1465
1703
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1471
1709
        """
1472
1710
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1473
1711
        
1474
 
        super(MultiprocessingMixInWithPipe,
1475
 
              self).process_request(request, client_address)
 
1712
        proc = MultiprocessingMixIn.process_request(self, request,
 
1713
                                                    client_address)
1476
1714
        self.child_pipe.close()
1477
 
        self.add_pipe(parent_pipe)
 
1715
        self.add_pipe(parent_pipe, proc)
1478
1716
    
1479
 
    def add_pipe(self, parent_pipe):
 
1717
    def add_pipe(self, parent_pipe, proc):
1480
1718
        """Dummy function; override as necessary"""
1481
1719
        raise NotImplementedError
1482
1720
 
1560
1798
        self.enabled = False
1561
1799
        self.clients = clients
1562
1800
        if self.clients is None:
1563
 
            self.clients = set()
 
1801
            self.clients = {}
1564
1802
        self.use_dbus = use_dbus
1565
1803
        self.gnutls_priority = gnutls_priority
1566
1804
        IPv6_TCPServer.__init__(self, server_address,
1570
1808
    def server_activate(self):
1571
1809
        if self.enabled:
1572
1810
            return socketserver.TCPServer.server_activate(self)
 
1811
    
1573
1812
    def enable(self):
1574
1813
        self.enabled = True
1575
 
    def add_pipe(self, parent_pipe):
 
1814
    
 
1815
    def add_pipe(self, parent_pipe, proc):
1576
1816
        # Call "handle_ipc" for both data and EOF events
1577
1817
        gobject.io_add_watch(parent_pipe.fileno(),
1578
1818
                             gobject.IO_IN | gobject.IO_HUP,
1579
1819
                             functools.partial(self.handle_ipc,
1580
 
                                               parent_pipe = parent_pipe))
1581
 
        
 
1820
                                               parent_pipe =
 
1821
                                               parent_pipe,
 
1822
                                               proc = proc))
 
1823
    
1582
1824
    def handle_ipc(self, source, condition, parent_pipe=None,
1583
 
                   client_object=None):
 
1825
                   proc = None, client_object=None):
1584
1826
        condition_names = {
1585
1827
            gobject.IO_IN: "IN",   # There is data to read.
1586
1828
            gobject.IO_OUT: "OUT", # Data can be written (without
1595
1837
                                       for cond, name in
1596
1838
                                       condition_names.iteritems()
1597
1839
                                       if cond & condition)
1598
 
        # error or the other end of multiprocessing.Pipe has closed
 
1840
        # error, or the other end of multiprocessing.Pipe has closed
1599
1841
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1842
            # Wait for other process to exit
 
1843
            proc.join()
1600
1844
            return False
1601
1845
        
1602
1846
        # Read a request from the child
1607
1851
            fpr = request[1]
1608
1852
            address = request[2]
1609
1853
            
1610
 
            for c in self.clients:
 
1854
            for c in self.clients.itervalues():
1611
1855
                if c.fingerprint == fpr:
1612
1856
                    client = c
1613
1857
                    break
1616
1860
                            "dress: %s", fpr, address)
1617
1861
                if self.use_dbus:
1618
1862
                    # Emit D-Bus signal
1619
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1863
                    mandos_dbus_service.ClientNotFound(fpr,
 
1864
                                                       address[0])
1620
1865
                parent_pipe.send(False)
1621
1866
                return False
1622
1867
            
1623
1868
            gobject.io_add_watch(parent_pipe.fileno(),
1624
1869
                                 gobject.IO_IN | gobject.IO_HUP,
1625
1870
                                 functools.partial(self.handle_ipc,
1626
 
                                                   parent_pipe = parent_pipe,
1627
 
                                                   client_object = client))
 
1871
                                                   parent_pipe =
 
1872
                                                   parent_pipe,
 
1873
                                                   proc = proc,
 
1874
                                                   client_object =
 
1875
                                                   client))
1628
1876
            parent_pipe.send(True)
1629
 
            # remove the old hook in favor of the new above hook on same fileno
 
1877
            # remove the old hook in favor of the new above hook on
 
1878
            # same fileno
1630
1879
            return False
1631
1880
        if command == 'funcall':
1632
1881
            funcname = request[1]
1633
1882
            args = request[2]
1634
1883
            kwargs = request[3]
1635
1884
            
1636
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1885
            parent_pipe.send(('data', getattr(client_object,
 
1886
                                              funcname)(*args,
 
1887
                                                         **kwargs)))
1637
1888
        
1638
1889
        if command == 'getattr':
1639
1890
            attrname = request[1]
1640
1891
            if callable(client_object.__getattribute__(attrname)):
1641
1892
                parent_pipe.send(('function',))
1642
1893
            else:
1643
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1894
                parent_pipe.send(('data', client_object
 
1895
                                  .__getattribute__(attrname)))
1644
1896
        
1645
1897
        if command == 'setattr':
1646
1898
            attrname = request[1]
1689
1941
    return timevalue
1690
1942
 
1691
1943
 
1692
 
def if_nametoindex(interface):
1693
 
    """Call the C function if_nametoindex(), or equivalent
1694
 
    
1695
 
    Note: This function cannot accept a unicode string."""
1696
 
    global if_nametoindex
1697
 
    try:
1698
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1699
 
                          (ctypes.util.find_library("c"))
1700
 
                          .if_nametoindex)
1701
 
    except (OSError, AttributeError):
1702
 
        logger.warning("Doing if_nametoindex the hard way")
1703
 
        def if_nametoindex(interface):
1704
 
            "Get an interface index the hard way, i.e. using fcntl()"
1705
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1706
 
            with contextlib.closing(socket.socket()) as s:
1707
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1708
 
                                    struct.pack(str("16s16x"),
1709
 
                                                interface))
1710
 
            interface_index = struct.unpack(str("I"),
1711
 
                                            ifreq[16:20])[0]
1712
 
            return interface_index
1713
 
    return if_nametoindex(interface)
1714
 
 
1715
 
 
1716
1944
def daemon(nochdir = False, noclose = False):
1717
1945
    """See daemon(3).  Standard BSD Unix function.
1718
1946
    
1773
2001
                        " system bus interface")
1774
2002
    parser.add_argument("--no-ipv6", action="store_false",
1775
2003
                        dest="use_ipv6", help="Do not use IPv6")
 
2004
    parser.add_argument("--no-restore", action="store_false",
 
2005
                        dest="restore", help="Do not restore stored"
 
2006
                        " state")
 
2007
    parser.add_argument("--statedir", metavar="DIR",
 
2008
                        help="Directory to save/restore state in")
 
2009
    
1776
2010
    options = parser.parse_args()
1777
2011
    
1778
2012
    if options.check:
1791
2025
                        "use_dbus": "True",
1792
2026
                        "use_ipv6": "True",
1793
2027
                        "debuglevel": "",
 
2028
                        "restore": "True",
 
2029
                        "statedir": "/var/lib/mandos"
1794
2030
                        }
1795
2031
    
1796
2032
    # Parse config file for server-global settings
1813
2049
    # options, if set.
1814
2050
    for option in ("interface", "address", "port", "debug",
1815
2051
                   "priority", "servicename", "configdir",
1816
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2052
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2053
                   "statedir"):
1817
2054
        value = getattr(options, option)
1818
2055
        if value is not None:
1819
2056
            server_settings[option] = value
1831
2068
    debuglevel = server_settings["debuglevel"]
1832
2069
    use_dbus = server_settings["use_dbus"]
1833
2070
    use_ipv6 = server_settings["use_ipv6"]
 
2071
    stored_state_path = os.path.join(server_settings["statedir"],
 
2072
                                     stored_state_file)
 
2073
    
 
2074
    if debug:
 
2075
        initlogger(debug, logging.DEBUG)
 
2076
    else:
 
2077
        if not debuglevel:
 
2078
            initlogger(debug)
 
2079
        else:
 
2080
            level = getattr(logging, debuglevel.upper())
 
2081
            initlogger(debug, level)
1834
2082
    
1835
2083
    if server_settings["servicename"] != "Mandos":
1836
2084
        syslogger.setFormatter(logging.Formatter
1839
2087
                                % server_settings["servicename"]))
1840
2088
    
1841
2089
    # Parse config file with clients
1842
 
    client_defaults = { "timeout": "5m",
1843
 
                        "extended_timeout": "15m",
1844
 
                        "interval": "2m",
1845
 
                        "checker": "fping -q -- %%(host)s",
1846
 
                        "host": "",
1847
 
                        "approval_delay": "0s",
1848
 
                        "approval_duration": "1s",
1849
 
                        }
1850
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2090
    client_config = configparser.SafeConfigParser(Client
 
2091
                                                  .client_defaults)
1851
2092
    client_config.read(os.path.join(server_settings["configdir"],
1852
2093
                                    "clients.conf"))
1853
2094
    
1891
2132
        if error[0] != errno.EPERM:
1892
2133
            raise error
1893
2134
    
1894
 
    if not debug and not debuglevel:
1895
 
        syslogger.setLevel(logging.WARNING)
1896
 
        console.setLevel(logging.WARNING)
1897
 
    if debuglevel:
1898
 
        level = getattr(logging, debuglevel.upper())
1899
 
        syslogger.setLevel(level)
1900
 
        console.setLevel(level)
1901
 
    
1902
2135
    if debug:
1903
2136
        # Enable all possible GnuTLS debugging
1904
2137
        
1918
2151
        os.dup2(null, sys.stdin.fileno())
1919
2152
        if null > 2:
1920
2153
            os.close(null)
1921
 
    else:
1922
 
        # No console logging
1923
 
        logger.removeHandler(console)
1924
2154
    
1925
2155
    # Need to fork before connecting to D-Bus
1926
2156
    if not debug:
1927
2157
        # Close all input and output, do double fork, etc.
1928
2158
        daemon()
1929
2159
    
 
2160
    gobject.threads_init()
 
2161
    
1930
2162
    global main_loop
1931
2163
    # From the Avahi example code
1932
2164
    DBusGMainLoop(set_as_default=True )
1935
2167
    # End of Avahi example code
1936
2168
    if use_dbus:
1937
2169
        try:
1938
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1939
 
                                            bus, do_not_queue=True)
1940
 
            bus_name2 = dbus.service.BusName("se.recompile.Mandos",
1941
 
                                            bus, do_not_queue=True)
 
2170
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2171
                                            bus, do_not_queue=True)
 
2172
            old_bus_name = (dbus.service.BusName
 
2173
                            ("se.bsnet.fukt.Mandos", bus,
 
2174
                             do_not_queue=True))
1942
2175
        except dbus.exceptions.NameExistsException as e:
1943
2176
            logger.error(unicode(e) + ", disabling D-Bus")
1944
2177
            use_dbus = False
1945
2178
            server_settings["use_dbus"] = False
1946
2179
            tcp_server.use_dbus = False
1947
2180
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1948
 
    service = AvahiService(name = server_settings["servicename"],
1949
 
                           servicetype = "_mandos._tcp",
1950
 
                           protocol = protocol, bus = bus)
 
2181
    service = AvahiServiceToSyslog(name =
 
2182
                                   server_settings["servicename"],
 
2183
                                   servicetype = "_mandos._tcp",
 
2184
                                   protocol = protocol, bus = bus)
1951
2185
    if server_settings["interface"]:
1952
2186
        service.interface = (if_nametoindex
1953
2187
                             (str(server_settings["interface"])))
1957
2191
    
1958
2192
    client_class = Client
1959
2193
    if use_dbus:
1960
 
        client_class = functools.partial(ClientDBusTransitional, bus = bus)        
1961
 
    def client_config_items(config, section):
1962
 
        special_settings = {
1963
 
            "approved_by_default":
1964
 
                lambda: config.getboolean(section,
1965
 
                                          "approved_by_default"),
1966
 
            }
1967
 
        for name, value in config.items(section):
 
2194
        client_class = functools.partial(ClientDBusTransitional,
 
2195
                                         bus = bus)
 
2196
    
 
2197
    client_settings = Client.config_parser(client_config)
 
2198
    old_client_settings = {}
 
2199
    clients_data = {}
 
2200
    
 
2201
    # Get client data and settings from last running state.
 
2202
    if server_settings["restore"]:
 
2203
        try:
 
2204
            with open(stored_state_path, "rb") as stored_state:
 
2205
                clients_data, old_client_settings = (pickle.load
 
2206
                                                     (stored_state))
 
2207
            os.remove(stored_state_path)
 
2208
        except IOError as e:
 
2209
            logger.warning("Could not load persistent state: {0}"
 
2210
                           .format(e))
 
2211
            if e.errno != errno.ENOENT:
 
2212
                raise
 
2213
        except EOFError as e:
 
2214
            logger.warning("Could not load persistent state: "
 
2215
                           "EOFError: {0}".format(e))
 
2216
    
 
2217
    with PGPEngine() as pgp:
 
2218
        for client_name, client in clients_data.iteritems():
 
2219
            # Decide which value to use after restoring saved state.
 
2220
            # We have three different values: Old config file,
 
2221
            # new config file, and saved state.
 
2222
            # New config value takes precedence if it differs from old
 
2223
            # config value, otherwise use saved state.
 
2224
            for name, value in client_settings[client_name].items():
 
2225
                try:
 
2226
                    # For each value in new config, check if it
 
2227
                    # differs from the old config value (Except for
 
2228
                    # the "secret" attribute)
 
2229
                    if (name != "secret" and
 
2230
                        value != old_client_settings[client_name]
 
2231
                        [name]):
 
2232
                        client[name] = value
 
2233
                except KeyError:
 
2234
                    pass
 
2235
            
 
2236
            # Clients who has passed its expire date can still be
 
2237
            # enabled if its last checker was successful.  Clients
 
2238
            # whose checker succeeded before we stored its state is
 
2239
            # assumed to have successfully run all checkers during
 
2240
            # downtime.
 
2241
            if client["enabled"]:
 
2242
                if datetime.datetime.utcnow() >= client["expires"]:
 
2243
                    if not client["last_checked_ok"]:
 
2244
                        logger.warning(
 
2245
                            "disabling client {0} - Client never "
 
2246
                            "performed a successful checker"
 
2247
                            .format(client_name))
 
2248
                        client["enabled"] = False
 
2249
                    elif client["last_checker_status"] != 0:
 
2250
                        logger.warning(
 
2251
                            "disabling client {0} - Client "
 
2252
                            "last checker failed with error code {1}"
 
2253
                            .format(client_name,
 
2254
                                    client["last_checker_status"]))
 
2255
                        client["enabled"] = False
 
2256
                    else:
 
2257
                        client["expires"] = (datetime.datetime
 
2258
                                             .utcnow()
 
2259
                                             + client["timeout"])
 
2260
                        logger.debug("Last checker succeeded,"
 
2261
                                     " keeping {0} enabled"
 
2262
                                     .format(client_name))
1968
2263
            try:
1969
 
                yield (name, special_settings[name]())
1970
 
            except KeyError:
1971
 
                yield (name, value)
1972
 
    
1973
 
    tcp_server.clients.update(set(
1974
 
            client_class(name = section,
1975
 
                         config= dict(client_config_items(
1976
 
                        client_config, section)))
1977
 
            for section in client_config.sections()))
 
2264
                client["secret"] = (
 
2265
                    pgp.decrypt(client["encrypted_secret"],
 
2266
                                client_settings[client_name]
 
2267
                                ["secret"]))
 
2268
            except PGPError:
 
2269
                # If decryption fails, we use secret from new settings
 
2270
                logger.debug("Failed to decrypt {0} old secret"
 
2271
                             .format(client_name))
 
2272
                client["secret"] = (
 
2273
                    client_settings[client_name]["secret"])
 
2274
 
 
2275
    
 
2276
    # Add/remove clients based on new changes made to config
 
2277
    for client_name in (set(old_client_settings)
 
2278
                        - set(client_settings)):
 
2279
        del clients_data[client_name]
 
2280
    for client_name in (set(client_settings)
 
2281
                        - set(old_client_settings)):
 
2282
        clients_data[client_name] = client_settings[client_name]
 
2283
 
 
2284
    # Create all client objects
 
2285
    for client_name, client in clients_data.iteritems():
 
2286
        tcp_server.clients[client_name] = client_class(
 
2287
            name = client_name, settings = client)
 
2288
    
1978
2289
    if not tcp_server.clients:
1979
2290
        logger.warning("No clients defined")
1980
2291
        
1991
2302
            # "pidfile" was never created
1992
2303
            pass
1993
2304
        del pidfilename
1994
 
        
1995
2305
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1996
2306
    
1997
2307
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2002
2312
            """A D-Bus proxy object"""
2003
2313
            def __init__(self):
2004
2314
                dbus.service.Object.__init__(self, bus, "/")
2005
 
            _interface = "se.bsnet.fukt.Mandos"
 
2315
            _interface = "se.recompile.Mandos"
2006
2316
            
2007
2317
            @dbus.service.signal(_interface, signature="o")
2008
2318
            def ClientAdded(self, objpath):
2023
2333
            def GetAllClients(self):
2024
2334
                "D-Bus method"
2025
2335
                return dbus.Array(c.dbus_object_path
2026
 
                                  for c in tcp_server.clients)
 
2336
                                  for c in
 
2337
                                  tcp_server.clients.itervalues())
2027
2338
            
2028
2339
            @dbus.service.method(_interface,
2029
2340
                                 out_signature="a{oa{sv}}")
2031
2342
                "D-Bus method"
2032
2343
                return dbus.Dictionary(
2033
2344
                    ((c.dbus_object_path, c.GetAll(""))
2034
 
                     for c in tcp_server.clients),
 
2345
                     for c in tcp_server.clients.itervalues()),
2035
2346
                    signature="oa{sv}")
2036
2347
            
2037
2348
            @dbus.service.method(_interface, in_signature="o")
2038
2349
            def RemoveClient(self, object_path):
2039
2350
                "D-Bus method"
2040
 
                for c in tcp_server.clients:
 
2351
                for c in tcp_server.clients.itervalues():
2041
2352
                    if c.dbus_object_path == object_path:
2042
 
                        tcp_server.clients.remove(c)
 
2353
                        del tcp_server.clients[c.name]
2043
2354
                        c.remove_from_connection()
2044
2355
                        # Don't signal anything except ClientRemoved
2045
2356
                        c.disable(quiet=True)
2051
2362
            del _interface
2052
2363
        
2053
2364
        class MandosDBusServiceTransitional(MandosDBusService):
2054
 
            __metaclass__ = transitional_dbus_metaclass
 
2365
            __metaclass__ = AlternateDBusNamesMetaclass
2055
2366
        mandos_dbus_service = MandosDBusServiceTransitional()
2056
2367
    
2057
2368
    def cleanup():
2058
2369
        "Cleanup function; run on exit"
2059
2370
        service.cleanup()
2060
2371
        
 
2372
        multiprocessing.active_children()
 
2373
        if not (tcp_server.clients or client_settings):
 
2374
            return
 
2375
        
 
2376
        # Store client before exiting. Secrets are encrypted with key
 
2377
        # based on what config file has. If config file is
 
2378
        # removed/edited, old secret will thus be unrecovable.
 
2379
        clients = {}
 
2380
        with PGPEngine() as pgp:
 
2381
            for client in tcp_server.clients.itervalues():
 
2382
                key = client_settings[client.name]["secret"]
 
2383
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2384
                                                      key)
 
2385
                client_dict = {}
 
2386
                
 
2387
                # A list of attributes that can not be pickled
 
2388
                # + secret.
 
2389
                exclude = set(("bus", "changedstate", "secret",
 
2390
                               "checker"))
 
2391
                for name, typ in (inspect.getmembers
 
2392
                                  (dbus.service.Object)):
 
2393
                    exclude.add(name)
 
2394
                
 
2395
                client_dict["encrypted_secret"] = (client
 
2396
                                                   .encrypted_secret)
 
2397
                for attr in client.client_structure:
 
2398
                    if attr not in exclude:
 
2399
                        client_dict[attr] = getattr(client, attr)
 
2400
                
 
2401
                clients[client.name] = client_dict
 
2402
                del client_settings[client.name]["secret"]
 
2403
        
 
2404
        try:
 
2405
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2406
                                                prefix="clients-",
 
2407
                                                dir=os.path.dirname
 
2408
                                                (stored_state_path))
 
2409
            with os.fdopen(tempfd, "wb") as stored_state:
 
2410
                pickle.dump((clients, client_settings), stored_state)
 
2411
            os.rename(tempname, stored_state_path)
 
2412
        except (IOError, OSError) as e:
 
2413
            logger.warning("Could not save persistent state: {0}"
 
2414
                           .format(e))
 
2415
            if not debug:
 
2416
                try:
 
2417
                    os.remove(tempname)
 
2418
                except NameError:
 
2419
                    pass
 
2420
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2421
                                   errno.EEXIST)):
 
2422
                raise e
 
2423
        
 
2424
        # Delete all clients, and settings from config
2061
2425
        while tcp_server.clients:
2062
 
            client = tcp_server.clients.pop()
 
2426
            name, client = tcp_server.clients.popitem()
2063
2427
            if use_dbus:
2064
2428
                client.remove_from_connection()
2065
 
            client.disable_hook = None
2066
2429
            # Don't signal anything except ClientRemoved
2067
2430
            client.disable(quiet=True)
2068
2431
            if use_dbus:
2069
2432
                # Emit D-Bus signal
2070
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2433
                mandos_dbus_service.ClientRemoved(client
 
2434
                                                  .dbus_object_path,
2071
2435
                                                  client.name)
 
2436
        client_settings.clear()
2072
2437
    
2073
2438
    atexit.register(cleanup)
2074
2439
    
2075
 
    for client in tcp_server.clients:
 
2440
    for client in tcp_server.clients.itervalues():
2076
2441
        if use_dbus:
2077
2442
            # Emit D-Bus signal
2078
2443
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2079
 
        client.enable()
 
2444
        # Need to initiate checking of clients
 
2445
        if client.enabled:
 
2446
            client.init_checker()
2080
2447
    
2081
2448
    tcp_server.enable()
2082
2449
    tcp_server.server_activate()
2122
2489
    # Must run before the D-Bus bus name gets deregistered
2123
2490
    cleanup()
2124
2491
 
2125
 
 
2126
2492
if __name__ == '__main__':
2127
2493
    main()