/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

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