/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-27 14:15:40 UTC
  • Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries

Show diffs side-by-side

added added

removed removed

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