/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 Hogeborn
  • Date: 2011-09-26 19:36:18 UTC
  • mfrom: (24.1.184 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110926193618-vtj5c9hena1maixx
Merge from Björn

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@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
65
 
69
66
import dbus
70
67
import dbus.service
75
72
import ctypes.util
76
73
import xml.dom.minidom
77
74
import inspect
78
 
import GnuPGInterface
79
75
 
80
76
try:
81
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
81
    except ImportError:
86
82
        SO_BINDTODEVICE = None
87
83
 
88
 
version = "1.4.1"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.1"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
92
89
syslogger = (logging.handlers.SysLogHandler
93
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
91
              address = str("/dev/log")))
95
 
 
96
 
try:
97
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
98
 
                      (ctypes.util.find_library("c"))
99
 
                      .if_nametoindex)
100
 
except (OSError, AttributeError):
101
 
    def if_nametoindex(interface):
102
 
        "Get an interface index the hard way, i.e. using fcntl()"
103
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
104
 
        with contextlib.closing(socket.socket()) as s:
105
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
 
                                struct.pack(str("16s16x"),
107
 
                                            interface))
108
 
        interface_index = struct.unpack(str("I"),
109
 
                                        ifreq[16:20])[0]
110
 
        return interface_index
111
 
 
112
 
 
113
 
def initlogger(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
 
 
 
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)
209
102
 
210
103
class AvahiError(Exception):
211
104
    def __init__(self, value, *args, **kwargs):
266
159
                            " after %i retries, exiting.",
267
160
                            self.rename_count)
268
161
            raise AvahiServiceError("Too many renames")
269
 
        self.name = unicode(self.server
270
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
271
163
        logger.info("Changing Zeroconf service name to %r ...",
272
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
273
169
        self.remove()
274
170
        try:
275
171
            self.add()
295
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
296
192
        self.entry_group_state_changed_match = (
297
193
            self.group.connect_to_signal(
298
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
299
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
300
196
                     self.name, self.type)
301
197
        self.group.AddService(
327
223
            try:
328
224
                self.group.Free()
329
225
            except (dbus.exceptions.UnknownMethodException,
330
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
331
227
                pass
332
228
            self.group = None
333
229
        self.remove()
367
263
                                 self.server_state_changed)
368
264
        self.server_state_changed(self.server.GetState())
369
265
 
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
379
266
 
380
 
def timedelta_to_milliseconds(td):
 
267
def _timedelta_to_milliseconds(td):
381
268
    "Convert a datetime.timedelta() to milliseconds"
382
269
    return ((td.days * 24 * 60 * 60 * 1000)
383
270
            + (td.seconds * 1000)
387
274
    """A representation of a client host served by this server.
388
275
    
389
276
    Attributes:
390
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
277
    _approved:   bool(); 'None' if not yet approved/disapproved
391
278
    approval_delay: datetime.timedelta(); Time to wait for approval
392
279
    approval_duration: datetime.timedelta(); Duration of one approval
393
280
    checker:    subprocess.Popen(); a running checker process used
400
287
                     instance %(name)s can be used in the command.
401
288
    checker_initiator_tag: a gobject event source tag, or None
402
289
    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
405
290
    current_checker_command: string; current running checker_command
 
291
    disable_hook:  If set, called by disable() as disable_hook(self)
406
292
    disable_initiator_tag: a gobject event source tag, or None
407
293
    enabled:    bool()
408
294
    fingerprint: string (40 or 32 hexadecimal digits); used to
411
297
    interval:   datetime.timedelta(); How often to start a new checker
412
298
    last_approval_request: datetime.datetime(); (UTC) or None
413
299
    last_checked_ok: datetime.datetime(); (UTC) or None
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
 
300
    last_enabled: datetime.datetime(); (UTC)
418
301
    name:       string; from the config file, used in log messages and
419
302
                        D-Bus identifiers
420
303
    secret:     bytestring; sent verbatim (over TLS) to client
430
313
                          "created", "enabled", "fingerprint",
431
314
                          "host", "interval", "last_checked_ok",
432
315
                          "last_enabled", "name", "timeout")
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
 
    
 
316
        
444
317
    def timeout_milliseconds(self):
445
318
        "Return the 'timeout' attribute in milliseconds"
446
 
        return timedelta_to_milliseconds(self.timeout)
447
 
    
 
319
        return _timedelta_to_milliseconds(self.timeout)
 
320
 
448
321
    def extended_timeout_milliseconds(self):
449
322
        "Return the 'extended_timeout' attribute in milliseconds"
450
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
323
        return _timedelta_to_milliseconds(self.extended_timeout)    
451
324
    
452
325
    def interval_milliseconds(self):
453
326
        "Return the 'interval' attribute in milliseconds"
454
 
        return timedelta_to_milliseconds(self.interval)
455
 
    
 
327
        return _timedelta_to_milliseconds(self.interval)
 
328
 
456
329
    def approval_delay_milliseconds(self):
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):
 
330
        return _timedelta_to_milliseconds(self.approval_delay)
 
331
    
 
332
    def __init__(self, name = None, disable_hook=None, config=None):
511
333
        """Note: the 'checker' key in 'config' sets the
512
334
        'checker_command' attribute and *not* the 'checker'
513
335
        attribute."""
514
336
        self.name = name
515
 
        # adding all client settings
516
 
        for setting, value in settings.iteritems():
517
 
            setattr(self, setting, value)
518
 
        
 
337
        if config is None:
 
338
            config = {}
519
339
        logger.debug("Creating client %r", self.name)
520
340
        # Uppercase and remove spaces from fingerprint for later
521
341
        # comparison purposes with return value from the fingerprint()
522
342
        # function
 
343
        self.fingerprint = (config["fingerprint"].upper()
 
344
                            .replace(" ", ""))
523
345
        logger.debug("  Fingerprint: %s", self.fingerprint)
524
 
        self.created = settings.get("created", datetime.datetime.utcnow())
525
 
 
526
 
        # attributes specific for this server instance
 
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
527
366
        self.checker = None
528
367
        self.checker_initiator_tag = None
529
368
        self.disable_initiator_tag = None
 
369
        self.expires = None
530
370
        self.checker_callback_tag = None
 
371
        self.checker_command = config["checker"]
531
372
        self.current_checker_command = None
532
 
        self.approved = None
 
373
        self.last_connect = None
 
374
        self._approved = None
 
375
        self.approved_by_default = config.get("approved_by_default",
 
376
                                              True)
533
377
        self.approvals_pending = 0
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)
 
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())
548
383
    
549
 
    # Send notice to process children that client state has changed
550
384
    def send_changedstate(self):
551
 
        with self.changedstate:
552
 
            self.changedstate.notify_all()
553
 
    
 
385
        self.changedstate.acquire()
 
386
        self.changedstate.notify_all()
 
387
        self.changedstate.release()
 
388
        
554
389
    def enable(self):
555
390
        """Start this client's checker and timeout hooks"""
556
391
        if getattr(self, "enabled", False):
557
392
            # Already enabled
558
393
            return
559
394
        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
560
401
        self.expires = datetime.datetime.utcnow() + self.timeout
 
402
        self.disable_initiator_tag = (gobject.timeout_add
 
403
                                   (self.timeout_milliseconds(),
 
404
                                    self.disable))
561
405
        self.enabled = True
562
406
        self.last_enabled = datetime.datetime.utcnow()
563
 
        self.init_checker()
 
407
        # Also start a new checker *right now*.
 
408
        self.start_checker()
564
409
    
565
410
    def disable(self, quiet=True):
566
411
        """Disable this client."""
578
423
            gobject.source_remove(self.checker_initiator_tag)
579
424
            self.checker_initiator_tag = None
580
425
        self.stop_checker()
 
426
        if self.disable_hook:
 
427
            self.disable_hook(self)
581
428
        self.enabled = False
582
429
        # Do not run this again if called by a gobject.timeout_add
583
430
        return False
584
431
    
585
432
    def __del__(self):
 
433
        self.disable_hook = None
586
434
        self.disable()
587
435
    
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
 
    
601
436
    def checker_callback(self, pid, condition, command):
602
437
        """The checker has completed, so take appropriate actions."""
603
438
        self.checker_callback_tag = None
604
439
        self.checker = None
605
440
        if os.WIFEXITED(condition):
606
 
            self.last_checker_status = os.WEXITSTATUS(condition)
607
 
            if self.last_checker_status == 0:
 
441
            exitstatus = os.WEXITSTATUS(condition)
 
442
            if exitstatus == 0:
608
443
                logger.info("Checker for %(name)s succeeded",
609
444
                            vars(self))
610
445
                self.checked_ok()
612
447
                logger.info("Checker for %(name)s failed",
613
448
                            vars(self))
614
449
        else:
615
 
            self.last_checker_status = -1
616
450
            logger.warning("Checker for %(name)s crashed?",
617
451
                           vars(self))
618
452
    
625
459
        if timeout is None:
626
460
            timeout = self.timeout
627
461
        self.last_checked_ok = datetime.datetime.utcnow()
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
 
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))
635
467
    
636
468
    def need_approval(self):
637
469
        self.last_approval_request = datetime.datetime.utcnow()
677
509
                                       'replace')))
678
510
                    for attr in
679
511
                    self.runtime_expansions)
680
 
                
 
512
 
681
513
                try:
682
514
                    command = self.checker_command % escaped_attrs
683
515
                except TypeError as error:
729
561
                raise
730
562
        self.checker = None
731
563
 
732
 
 
733
564
def dbus_service_property(dbus_interface, signature="v",
734
565
                          access="readwrite", byte_arrays=False):
735
566
    """Decorators for marking methods of a DBusObjectWithProperties to
781
612
 
782
613
class DBusObjectWithProperties(dbus.service.Object):
783
614
    """A D-Bus object with properties.
784
 
    
 
615
 
785
616
    Classes inheriting from this can use the dbus_service_property
786
617
    decorator to expose methods as D-Bus properties.  It exposes the
787
618
    standard Get(), Set(), and GetAll() methods on the D-Bus.
794
625
    def _get_all_dbus_properties(self):
795
626
        """Returns a generator of (name, attribute) pairs
796
627
        """
797
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
798
 
                for cls in self.__class__.__mro__
 
628
        return ((prop._dbus_name, prop)
799
629
                for name, prop in
800
 
                inspect.getmembers(cls, self._is_dbus_property))
 
630
                inspect.getmembers(self, self._is_dbus_property))
801
631
    
802
632
    def _get_dbus_property(self, interface_name, property_name):
803
633
        """Returns a bound method if one exists which is a D-Bus
804
634
        property with the specified name and interface.
805
635
        """
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
 
        
 
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
813
646
        # No such property
814
647
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
815
648
                                   + interface_name + "."
849
682
    def GetAll(self, interface_name):
850
683
        """Standard D-Bus property GetAll() method, see D-Bus
851
684
        standard.
852
 
        
 
685
 
853
686
        Note: Will not include properties with access="write".
854
687
        """
855
 
        properties = {}
 
688
        all = {}
856
689
        for name, prop in self._get_all_dbus_properties():
857
690
            if (interface_name
858
691
                and interface_name != prop._dbus_interface):
863
696
                continue
864
697
            value = prop()
865
698
            if not hasattr(value, "variant_level"):
866
 
                properties[name] = value
 
699
                all[name] = value
867
700
                continue
868
 
            properties[name] = type(value)(value, variant_level=
869
 
                                           value.variant_level+1)
870
 
        return dbus.Dictionary(properties, signature="sv")
 
701
            all[name] = type(value)(value, variant_level=
 
702
                                    value.variant_level+1)
 
703
        return dbus.Dictionary(all, signature="sv")
871
704
    
872
705
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
873
706
                         out_signature="s",
924
757
    return dbus.String(dt.isoformat(),
925
758
                       variant_level=variant_level)
926
759
 
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
 
 
1026
760
class ClientDBus(Client, DBusObjectWithProperties):
1027
761
    """A Client class using D-Bus
1028
762
    
1037
771
    # dbus.service.Object doesn't use super(), so we can't either.
1038
772
    
1039
773
    def __init__(self, bus = None, *args, **kwargs):
 
774
        self._approvals_pending = 0
1040
775
        self.bus = bus
1041
776
        Client.__init__(self, *args, **kwargs)
1042
 
        self._approvals_pending = 0
1043
 
        
1044
 
        self._approvals_pending = 0
1045
777
        # Only now, when this client is initialized, can it show up on
1046
778
        # the D-Bus
1047
779
        client_object_name = unicode(self.name).translate(
1055
787
    def notifychangeproperty(transform_func,
1056
788
                             dbus_name, type_func=lambda x: x,
1057
789
                             variant_level=1):
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
 
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
1064
795
        type_func: Function that transform the value before sending it
1065
 
                   to the D-Bus.  Default: no transform
1066
 
        variant_level: D-Bus variant level.  Default: 1
 
796
                   to DBus
 
797
        variant_level: DBus variant level. default: 1
1067
798
        """
1068
 
        attrname = "_{0}".format(dbus_name)
 
799
        real_value = [None,]
1069
800
        def setter(self, value):
 
801
            old_value = real_value[0]
 
802
            real_value[0] = value
1070
803
            if hasattr(self, "dbus_object_path"):
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)
 
804
                if type_func(old_value) != type_func(real_value[0]):
 
805
                    dbus_value = transform_func(type_func(real_value[0]),
 
806
                                                variant_level)
1077
807
                    self.PropertyChanged(dbus.String(dbus_name),
1078
808
                                         dbus_value)
1079
 
            setattr(self, attrname, value)
1080
 
        
1081
 
        return property(lambda self: getattr(self, attrname), setter)
1082
 
    
1083
 
    
 
809
 
 
810
        return property(lambda self: real_value[0], setter)
 
811
 
 
812
 
1084
813
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1085
814
    approvals_pending = notifychangeproperty(dbus.Boolean,
1086
815
                                             "ApprovalPending",
1089
818
    last_enabled = notifychangeproperty(datetime_to_dbus,
1090
819
                                        "LastEnabled")
1091
820
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1092
 
                                   type_func = lambda checker:
1093
 
                                       checker is not None)
 
821
                                   type_func = lambda checker: checker is not None)
1094
822
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1095
823
                                           "LastCheckedOK")
1096
 
    last_approval_request = notifychangeproperty(
1097
 
        datetime_to_dbus, "LastApprovalRequest")
 
824
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
825
                                                 "LastApprovalRequest")
1098
826
    approved_by_default = notifychangeproperty(dbus.Boolean,
1099
827
                                               "ApprovedByDefault")
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)
 
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)
1107
832
    host = notifychangeproperty(dbus.String, "Host")
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)
 
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)
1118
839
    checker_command = notifychangeproperty(dbus.String, "Checker")
1119
840
    
1120
841
    del notifychangeproperty
1146
867
        
1147
868
        return Client.checker_callback(self, pid, condition, command,
1148
869
                                       *args, **kwargs)
1149
 
    
 
870
 
1150
871
    def start_checker(self, *args, **kwargs):
1151
872
        old_checker = self.checker
1152
873
        if self.checker is not None:
1162
883
        return r
1163
884
    
1164
885
    def _reset_approved(self):
1165
 
        self.approved = None
 
886
        self._approved = None
1166
887
        return False
1167
888
    
1168
889
    def approve(self, value=True):
1169
890
        self.send_changedstate()
1170
 
        self.approved = value
1171
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(_timedelta_to_milliseconds
1172
893
                            (self.approval_duration),
1173
894
                            self._reset_approved)
1174
895
    
1175
896
    
1176
897
    ## D-Bus methods, signals & properties
1177
 
    _interface = "se.recompile.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1178
899
    
1179
900
    ## Signals
1180
901
    
1217
938
        "D-Bus signal"
1218
939
        return self.need_approval()
1219
940
    
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
 
    
1228
941
    ## Methods
1229
942
    
1230
943
    # Approve - method
1288
1001
                           access="readwrite")
1289
1002
    def ApprovalDuration_dbus_property(self, value=None):
1290
1003
        if value is None:       # get
1291
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1004
            return dbus.UInt64(_timedelta_to_milliseconds(
1292
1005
                    self.approval_duration))
1293
1006
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1294
1007
    
1308
1021
    def Host_dbus_property(self, value=None):
1309
1022
        if value is None:       # get
1310
1023
            return dbus.String(self.host)
1311
 
        self.host = unicode(value)
 
1024
        self.host = value
1312
1025
    
1313
1026
    # Created - property
1314
1027
    @dbus_service_property(_interface, signature="s", access="read")
1315
1028
    def Created_dbus_property(self):
1316
 
        return datetime_to_dbus(self.created)
 
1029
        return dbus.String(datetime_to_dbus(self.created))
1317
1030
    
1318
1031
    # LastEnabled - property
1319
1032
    @dbus_service_property(_interface, signature="s", access="read")
1363
1076
        gobject.source_remove(self.disable_initiator_tag)
1364
1077
        self.disable_initiator_tag = None
1365
1078
        self.expires = None
1366
 
        time_to_die = timedelta_to_milliseconds((self
1367
 
                                                 .last_checked_ok
1368
 
                                                 + self.timeout)
1369
 
                                                - datetime.datetime
1370
 
                                                .utcnow())
 
1079
        time_to_die = (self.
 
1080
                       _timedelta_to_milliseconds((self
 
1081
                                                   .last_checked_ok
 
1082
                                                   + self.timeout)
 
1083
                                                  - datetime.datetime
 
1084
                                                  .utcnow()))
1371
1085
        if time_to_die <= 0:
1372
1086
            # The timeout has passed
1373
1087
            self.disable()
1374
1088
        else:
1375
1089
            self.expires = (datetime.datetime.utcnow()
1376
 
                            + datetime.timedelta(milliseconds =
1377
 
                                                 time_to_die))
 
1090
                            + datetime.timedelta(milliseconds = time_to_die))
1378
1091
            self.disable_initiator_tag = (gobject.timeout_add
1379
1092
                                          (time_to_die, self.disable))
1380
 
    
 
1093
 
1381
1094
    # ExtendedTimeout - property
1382
1095
    @dbus_service_property(_interface, signature="t",
1383
1096
                           access="readwrite")
1385
1098
        if value is None:       # get
1386
1099
            return dbus.UInt64(self.extended_timeout_milliseconds())
1387
1100
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1388
 
    
 
1101
 
1389
1102
    # Interval - property
1390
1103
    @dbus_service_property(_interface, signature="t",
1391
1104
                           access="readwrite")
1395
1108
        self.interval = datetime.timedelta(0, 0, 0, value)
1396
1109
        if getattr(self, "checker_initiator_tag", None) is None:
1397
1110
            return
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
 
    
 
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
 
1405
1117
    # Checker - property
1406
1118
    @dbus_service_property(_interface, signature="s",
1407
1119
                           access="readwrite")
1408
1120
    def Checker_dbus_property(self, value=None):
1409
1121
        if value is None:       # get
1410
1122
            return dbus.String(self.checker_command)
1411
 
        self.checker_command = unicode(value)
 
1123
        self.checker_command = value
1412
1124
    
1413
1125
    # CheckerRunning - property
1414
1126
    @dbus_service_property(_interface, signature="b",
1441
1153
        self._pipe.send(('init', fpr, address))
1442
1154
        if not self._pipe.recv():
1443
1155
            raise KeyError()
1444
 
    
 
1156
 
1445
1157
    def __getattribute__(self, name):
1446
 
        if name == '_pipe':
 
1158
        if(name == '_pipe'):
1447
1159
            return super(ProxyClient, self).__getattribute__(name)
1448
1160
        self._pipe.send(('getattr', name))
1449
1161
        data = self._pipe.recv()
1454
1166
                self._pipe.send(('funcall', name, args, kwargs))
1455
1167
                return self._pipe.recv()[1]
1456
1168
            return func
1457
 
    
 
1169
 
1458
1170
    def __setattr__(self, name, value):
1459
 
        if name == '_pipe':
 
1171
        if(name == '_pipe'):
1460
1172
            return super(ProxyClient, self).__setattr__(name, value)
1461
1173
        self._pipe.send(('setattr', name, value))
1462
1174
 
1463
1175
 
1464
 
class ClientDBusTransitional(ClientDBus):
1465
 
    __metaclass__ = AlternateDBusNamesMetaclass
1466
 
 
1467
 
 
1468
1176
class ClientHandler(socketserver.BaseRequestHandler, object):
1469
1177
    """A class to handle client connections.
1470
1178
    
1477
1185
                        unicode(self.client_address))
1478
1186
            logger.debug("Pipe FD: %d",
1479
1187
                         self.server.child_pipe.fileno())
1480
 
            
 
1188
 
1481
1189
            session = (gnutls.connection
1482
1190
                       .ClientSession(self.request,
1483
1191
                                      gnutls.connection
1484
1192
                                      .X509Credentials()))
1485
 
            
 
1193
 
1486
1194
            # Note: gnutls.connection.X509Credentials is really a
1487
1195
            # generic GnuTLS certificate credentials object so long as
1488
1196
            # no X.509 keys are added to it.  Therefore, we can use it
1489
1197
            # here despite using OpenPGP certificates.
1490
 
            
 
1198
 
1491
1199
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1492
1200
            #                      "+AES-256-CBC", "+SHA1",
1493
1201
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1499
1207
            (gnutls.library.functions
1500
1208
             .gnutls_priority_set_direct(session._c_object,
1501
1209
                                         priority, None))
1502
 
            
 
1210
 
1503
1211
            # Start communication using the Mandos protocol
1504
1212
            # Get protocol number
1505
1213
            line = self.request.makefile().readline()
1510
1218
            except (ValueError, IndexError, RuntimeError) as error:
1511
1219
                logger.error("Unknown protocol version: %s", error)
1512
1220
                return
1513
 
            
 
1221
 
1514
1222
            # Start GnuTLS connection
1515
1223
            try:
1516
1224
                session.handshake()
1520
1228
                # established.  Just abandon the request.
1521
1229
                return
1522
1230
            logger.debug("Handshake succeeded")
1523
 
            
 
1231
 
1524
1232
            approval_required = False
1525
1233
            try:
1526
1234
                try:
1531
1239
                    logger.warning("Bad certificate: %s", error)
1532
1240
                    return
1533
1241
                logger.debug("Fingerprint: %s", fpr)
1534
 
                
 
1242
 
1535
1243
                try:
1536
1244
                    client = ProxyClient(child_pipe, fpr,
1537
1245
                                         self.client_address)
1538
1246
                except KeyError:
1539
1247
                    return
1540
1248
                
1541
 
                if self.server.use_dbus:
1542
 
                    # Emit D-Bus signal
1543
 
                    client.NewRequest(str(self.client_address))
1544
 
                
1545
1249
                if client.approval_delay:
1546
1250
                    delay = client.approval_delay
1547
1251
                    client.approvals_pending += 1
1553
1257
                                       client.name)
1554
1258
                        if self.server.use_dbus:
1555
1259
                            # Emit D-Bus signal
1556
 
                            client.Rejected("Disabled")
 
1260
                            client.Rejected("Disabled")                    
1557
1261
                        return
1558
1262
                    
1559
 
                    if client.approved or not client.approval_delay:
 
1263
                    if client._approved or not client.approval_delay:
1560
1264
                        #We are approved or approval is disabled
1561
1265
                        break
1562
 
                    elif client.approved is None:
 
1266
                    elif client._approved is None:
1563
1267
                        logger.info("Client %s needs approval",
1564
1268
                                    client.name)
1565
1269
                        if self.server.use_dbus:
1576
1280
                        return
1577
1281
                    
1578
1282
                    #wait until timeout or approved
 
1283
                    #x = float(client._timedelta_to_milliseconds(delay))
1579
1284
                    time = datetime.datetime.now()
1580
1285
                    client.changedstate.acquire()
1581
 
                    (client.changedstate.wait
1582
 
                     (float(client.timedelta_to_milliseconds(delay)
1583
 
                            / 1000)))
 
1286
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1584
1287
                    client.changedstate.release()
1585
1288
                    time2 = datetime.datetime.now()
1586
1289
                    if (time2 - time) >= delay:
1608
1311
                                 sent, len(client.secret)
1609
1312
                                 - (sent_size + sent))
1610
1313
                    sent_size += sent
1611
 
                
 
1314
 
1612
1315
                logger.info("Sending secret to %s", client.name)
1613
 
                # bump the timeout using extended_timeout
 
1316
                # bump the timeout as if seen
1614
1317
                client.checked_ok(client.extended_timeout)
1615
1318
                if self.server.use_dbus:
1616
1319
                    # Emit D-Bus signal
1684
1387
        # Convert the buffer to a Python bytestring
1685
1388
        fpr = ctypes.string_at(buf, buf_len.value)
1686
1389
        # Convert the bytestring to hexadecimal notation
1687
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1390
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1688
1391
        return hex_fpr
1689
1392
 
1690
1393
 
1693
1396
    def sub_process_main(self, request, address):
1694
1397
        try:
1695
1398
            self.finish_request(request, address)
1696
 
        except Exception:
 
1399
        except:
1697
1400
            self.handle_error(request, address)
1698
1401
        self.close_request(request)
1699
 
    
 
1402
            
1700
1403
    def process_request(self, request, address):
1701
1404
        """Start a new process to process the request."""
1702
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1703
 
                                       args = (request,
1704
 
                                               address))
1705
 
        proc.start()
1706
 
        return proc
1707
 
 
 
1405
        multiprocessing.Process(target = self.sub_process_main,
 
1406
                                args = (request, address)).start()
1708
1407
 
1709
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1710
1409
    """ adds a pipe to the MixIn """
1714
1413
        This function creates a new pipe in self.pipe
1715
1414
        """
1716
1415
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1717
 
        
1718
 
        proc = MultiprocessingMixIn.process_request(self, request,
1719
 
                                                    client_address)
 
1416
 
 
1417
        super(MultiprocessingMixInWithPipe,
 
1418
              self).process_request(request, client_address)
1720
1419
        self.child_pipe.close()
1721
 
        self.add_pipe(parent_pipe, proc)
1722
 
    
1723
 
    def add_pipe(self, parent_pipe, proc):
 
1420
        self.add_pipe(parent_pipe)
 
1421
 
 
1422
    def add_pipe(self, parent_pipe):
1724
1423
        """Dummy function; override as necessary"""
1725
1424
        raise NotImplementedError
1726
1425
 
1727
 
 
1728
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1729
1427
                     socketserver.TCPServer, object):
1730
1428
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1804
1502
        self.enabled = False
1805
1503
        self.clients = clients
1806
1504
        if self.clients is None:
1807
 
            self.clients = {}
 
1505
            self.clients = set()
1808
1506
        self.use_dbus = use_dbus
1809
1507
        self.gnutls_priority = gnutls_priority
1810
1508
        IPv6_TCPServer.__init__(self, server_address,
1814
1512
    def server_activate(self):
1815
1513
        if self.enabled:
1816
1514
            return socketserver.TCPServer.server_activate(self)
1817
 
    
1818
1515
    def enable(self):
1819
1516
        self.enabled = True
1820
 
    
1821
 
    def add_pipe(self, parent_pipe, proc):
 
1517
    def add_pipe(self, parent_pipe):
1822
1518
        # Call "handle_ipc" for both data and EOF events
1823
1519
        gobject.io_add_watch(parent_pipe.fileno(),
1824
1520
                             gobject.IO_IN | gobject.IO_HUP,
1825
1521
                             functools.partial(self.handle_ipc,
1826
 
                                               parent_pipe =
1827
 
                                               parent_pipe,
1828
 
                                               proc = proc))
1829
 
    
 
1522
                                               parent_pipe = parent_pipe))
 
1523
        
1830
1524
    def handle_ipc(self, source, condition, parent_pipe=None,
1831
 
                   proc = None, client_object=None):
 
1525
                   client_object=None):
1832
1526
        condition_names = {
1833
1527
            gobject.IO_IN: "IN",   # There is data to read.
1834
1528
            gobject.IO_OUT: "OUT", # Data can be written (without
1843
1537
                                       for cond, name in
1844
1538
                                       condition_names.iteritems()
1845
1539
                                       if cond & condition)
1846
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1540
        # error or the other end of multiprocessing.Pipe has closed
1847
1541
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1848
 
            # Wait for other process to exit
1849
 
            proc.join()
1850
1542
            return False
1851
1543
        
1852
1544
        # Read a request from the child
1857
1549
            fpr = request[1]
1858
1550
            address = request[2]
1859
1551
            
1860
 
            for c in self.clients.itervalues():
 
1552
            for c in self.clients:
1861
1553
                if c.fingerprint == fpr:
1862
1554
                    client = c
1863
1555
                    break
1866
1558
                            "dress: %s", fpr, address)
1867
1559
                if self.use_dbus:
1868
1560
                    # Emit D-Bus signal
1869
 
                    mandos_dbus_service.ClientNotFound(fpr,
1870
 
                                                       address[0])
 
1561
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1871
1562
                parent_pipe.send(False)
1872
1563
                return False
1873
1564
            
1874
1565
            gobject.io_add_watch(parent_pipe.fileno(),
1875
1566
                                 gobject.IO_IN | gobject.IO_HUP,
1876
1567
                                 functools.partial(self.handle_ipc,
1877
 
                                                   parent_pipe =
1878
 
                                                   parent_pipe,
1879
 
                                                   proc = proc,
1880
 
                                                   client_object =
1881
 
                                                   client))
 
1568
                                                   parent_pipe = parent_pipe,
 
1569
                                                   client_object = client))
1882
1570
            parent_pipe.send(True)
1883
 
            # remove the old hook in favor of the new above hook on
1884
 
            # same fileno
 
1571
            # remove the old hook in favor of the new above hook on same fileno
1885
1572
            return False
1886
1573
        if command == 'funcall':
1887
1574
            funcname = request[1]
1888
1575
            args = request[2]
1889
1576
            kwargs = request[3]
1890
1577
            
1891
 
            parent_pipe.send(('data', getattr(client_object,
1892
 
                                              funcname)(*args,
1893
 
                                                         **kwargs)))
1894
 
        
 
1578
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1579
 
1895
1580
        if command == 'getattr':
1896
1581
            attrname = request[1]
1897
1582
            if callable(client_object.__getattribute__(attrname)):
1898
1583
                parent_pipe.send(('function',))
1899
1584
            else:
1900
 
                parent_pipe.send(('data', client_object
1901
 
                                  .__getattribute__(attrname)))
 
1585
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1902
1586
        
1903
1587
        if command == 'setattr':
1904
1588
            attrname = request[1]
1905
1589
            value = request[2]
1906
1590
            setattr(client_object, attrname, value)
1907
 
        
 
1591
 
1908
1592
        return True
1909
1593
 
1910
1594
 
1947
1631
    return timevalue
1948
1632
 
1949
1633
 
 
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
 
1950
1658
def daemon(nochdir = False, noclose = False):
1951
1659
    """See daemon(3).  Standard BSD Unix function.
1952
1660
    
2007
1715
                        " system bus interface")
2008
1716
    parser.add_argument("--no-ipv6", action="store_false",
2009
1717
                        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
 
    
2016
1718
    options = parser.parse_args()
2017
1719
    
2018
1720
    if options.check:
2031
1733
                        "use_dbus": "True",
2032
1734
                        "use_ipv6": "True",
2033
1735
                        "debuglevel": "",
2034
 
                        "restore": "True",
2035
 
                        "statedir": "/var/lib/mandos"
2036
1736
                        }
2037
1737
    
2038
1738
    # Parse config file for server-global settings
2055
1755
    # options, if set.
2056
1756
    for option in ("interface", "address", "port", "debug",
2057
1757
                   "priority", "servicename", "configdir",
2058
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2059
 
                   "statedir"):
 
1758
                   "use_dbus", "use_ipv6", "debuglevel"):
2060
1759
        value = getattr(options, option)
2061
1760
        if value is not None:
2062
1761
            server_settings[option] = value
2074
1773
    debuglevel = server_settings["debuglevel"]
2075
1774
    use_dbus = server_settings["use_dbus"]
2076
1775
    use_ipv6 = server_settings["use_ipv6"]
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
 
    
 
1776
 
2089
1777
    if server_settings["servicename"] != "Mandos":
2090
1778
        syslogger.setFormatter(logging.Formatter
2091
1779
                               ('Mandos (%s) [%%(process)d]:'
2093
1781
                                % server_settings["servicename"]))
2094
1782
    
2095
1783
    # Parse config file with clients
2096
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
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)
2097
1793
    client_config.read(os.path.join(server_settings["configdir"],
2098
1794
                                    "clients.conf"))
2099
1795
    
2137
1833
        if error[0] != errno.EPERM:
2138
1834
            raise error
2139
1835
    
 
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
 
2140
1844
    if debug:
2141
1845
        # Enable all possible GnuTLS debugging
2142
1846
        
2165
1869
        # Close all input and output, do double fork, etc.
2166
1870
        daemon()
2167
1871
    
2168
 
    gobject.threads_init()
2169
 
    
2170
1872
    global main_loop
2171
1873
    # From the Avahi example code
2172
1874
    DBusGMainLoop(set_as_default=True )
2175
1877
    # End of Avahi example code
2176
1878
    if use_dbus:
2177
1879
        try:
2178
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1880
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2179
1881
                                            bus, do_not_queue=True)
2180
 
            old_bus_name = (dbus.service.BusName
2181
 
                            ("se.bsnet.fukt.Mandos", bus,
2182
 
                             do_not_queue=True))
2183
1882
        except dbus.exceptions.NameExistsException as e:
2184
1883
            logger.error(unicode(e) + ", disabling D-Bus")
2185
1884
            use_dbus = False
2186
1885
            server_settings["use_dbus"] = False
2187
1886
            tcp_server.use_dbus = False
2188
1887
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2189
 
    service = AvahiServiceToSyslog(name =
2190
 
                                   server_settings["servicename"],
2191
 
                                   servicetype = "_mandos._tcp",
2192
 
                                   protocol = protocol, bus = bus)
 
1888
    service = AvahiService(name = server_settings["servicename"],
 
1889
                           servicetype = "_mandos._tcp",
 
1890
                           protocol = protocol, bus = bus)
2193
1891
    if server_settings["interface"]:
2194
1892
        service.interface = (if_nametoindex
2195
1893
                             (str(server_settings["interface"])))
2199
1897
    
2200
1898
    client_class = Client
2201
1899
    if use_dbus:
2202
 
        client_class = functools.partial(ClientDBusTransitional,
2203
 
                                         bus = bus)
2204
 
    
2205
 
    client_settings = Client.config_parser(client_config)
2206
 
    old_client_settings = {}
2207
 
    clients_data = {}
2208
 
    
2209
 
    # Get client data and settings from last running state.
2210
 
    if server_settings["restore"]:
2211
 
        try:
2212
 
            with open(stored_state_path, "rb") as stored_state:
2213
 
                clients_data, old_client_settings = (pickle.load
2214
 
                                                     (stored_state))
2215
 
            os.remove(stored_state_path)
2216
 
        except IOError as e:
2217
 
            logger.warning("Could not load persistent state: {0}"
2218
 
                           .format(e))
2219
 
            if e.errno != errno.ENOENT:
2220
 
                raise
2221
 
        except EOFError as e:
2222
 
            logger.warning("Could not load persistent state: "
2223
 
                           "EOFError: {0}".format(e))
2224
 
    
2225
 
    with PGPEngine() as pgp:
2226
 
        for client_name, client in clients_data.iteritems():
2227
 
            # Decide which value to use after restoring saved state.
2228
 
            # We have three different values: Old config file,
2229
 
            # new config file, and saved state.
2230
 
            # New config value takes precedence if it differs from old
2231
 
            # config value, otherwise use saved state.
2232
 
            for name, value in client_settings[client_name].items():
2233
 
                try:
2234
 
                    # For each value in new config, check if it
2235
 
                    # differs from the old config value (Except for
2236
 
                    # the "secret" attribute)
2237
 
                    if (name != "secret" and
2238
 
                        value != old_client_settings[client_name]
2239
 
                        [name]):
2240
 
                        client[name] = value
2241
 
                except KeyError:
2242
 
                    pass
2243
 
            
2244
 
            # Clients who has passed its expire date can still be
2245
 
            # enabled if its last checker was successful.  Clients
2246
 
            # whose checker failed before we stored its state is
2247
 
            # assumed to have failed all checkers during downtime.
2248
 
            if client["enabled"]:
2249
 
                if datetime.datetime.utcnow() >= client["expires"]:
2250
 
                    if not client["last_checked_ok"]:
2251
 
                        logger.warning(
2252
 
                            "disabling client {0} - Client never "
2253
 
                            "performed a successfull checker"
2254
 
                            .format(client["name"]))
2255
 
                        client["enabled"] = False
2256
 
                    elif client["last_checker_status"] != 0:
2257
 
                        logger.warning(
2258
 
                            "disabling client {0} - Client "
2259
 
                            "last checker failed with error code {1}"
2260
 
                            .format(client["name"],
2261
 
                                    client["last_checker_status"]))
2262
 
                        client["enabled"] = False
2263
 
                    else:
2264
 
                        client["expires"] = (datetime.datetime
2265
 
                                             .utcnow()
2266
 
                                             + client["timeout"])
2267
 
                    
 
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):
2268
1908
            try:
2269
 
                client["secret"] = (
2270
 
                    pgp.decrypt(client["encrypted_secret"],
2271
 
                                client_settings[client_name]
2272
 
                                ["secret"]))
2273
 
            except PGPError:
2274
 
                # If decryption fails, we use secret from new settings
2275
 
                logger.debug("Failed to decrypt {0} old secret"
2276
 
                             .format(client_name))
2277
 
                client["secret"] = (
2278
 
                    client_settings[client_name]["secret"])
2279
 
 
2280
 
    
2281
 
    # Add/remove clients based on new changes made to config
2282
 
    for client_name in set(old_client_settings) - set(client_settings):
2283
 
        del clients_data[client_name]
2284
 
    for client_name in set(client_settings) - set(old_client_settings):
2285
 
        clients_data[client_name] = client_settings[client_name]
2286
 
 
2287
 
    # Create clients all clients
2288
 
    for client_name, client in clients_data.iteritems():
2289
 
        tcp_server.clients[client_name] = client_class(
2290
 
            name = client_name, settings = client)
2291
 
    
 
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()))
2292
1918
    if not tcp_server.clients:
2293
1919
        logger.warning("No clients defined")
2294
1920
        
2305
1931
            # "pidfile" was never created
2306
1932
            pass
2307
1933
        del pidfilename
 
1934
        
2308
1935
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2309
 
    
 
1936
 
2310
1937
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2311
1938
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2312
1939
    
2315
1942
            """A D-Bus proxy object"""
2316
1943
            def __init__(self):
2317
1944
                dbus.service.Object.__init__(self, bus, "/")
2318
 
            _interface = "se.recompile.Mandos"
 
1945
            _interface = "se.bsnet.fukt.Mandos"
2319
1946
            
2320
1947
            @dbus.service.signal(_interface, signature="o")
2321
1948
            def ClientAdded(self, objpath):
2336
1963
            def GetAllClients(self):
2337
1964
                "D-Bus method"
2338
1965
                return dbus.Array(c.dbus_object_path
2339
 
                                  for c in
2340
 
                                  tcp_server.clients.itervalues())
 
1966
                                  for c in tcp_server.clients)
2341
1967
            
2342
1968
            @dbus.service.method(_interface,
2343
1969
                                 out_signature="a{oa{sv}}")
2345
1971
                "D-Bus method"
2346
1972
                return dbus.Dictionary(
2347
1973
                    ((c.dbus_object_path, c.GetAll(""))
2348
 
                     for c in tcp_server.clients.itervalues()),
 
1974
                     for c in tcp_server.clients),
2349
1975
                    signature="oa{sv}")
2350
1976
            
2351
1977
            @dbus.service.method(_interface, in_signature="o")
2352
1978
            def RemoveClient(self, object_path):
2353
1979
                "D-Bus method"
2354
 
                for c in tcp_server.clients.itervalues():
 
1980
                for c in tcp_server.clients:
2355
1981
                    if c.dbus_object_path == object_path:
2356
 
                        del tcp_server.clients[c.name]
 
1982
                        tcp_server.clients.remove(c)
2357
1983
                        c.remove_from_connection()
2358
1984
                        # Don't signal anything except ClientRemoved
2359
1985
                        c.disable(quiet=True)
2364
1990
            
2365
1991
            del _interface
2366
1992
        
2367
 
        class MandosDBusServiceTransitional(MandosDBusService):
2368
 
            __metaclass__ = AlternateDBusNamesMetaclass
2369
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1993
        mandos_dbus_service = MandosDBusService()
2370
1994
    
2371
1995
    def cleanup():
2372
1996
        "Cleanup function; run on exit"
2373
1997
        service.cleanup()
2374
1998
        
2375
 
        multiprocessing.active_children()
2376
 
        if not (tcp_server.clients or client_settings):
2377
 
            return
2378
 
        
2379
 
        # Store client before exiting. Secrets are encrypted with key
2380
 
        # based on what config file has. If config file is
2381
 
        # removed/edited, old secret will thus be unrecovable.
2382
 
        clients = {}
2383
 
        with PGPEngine() as pgp:
2384
 
            for client in tcp_server.clients.itervalues():
2385
 
                key = client_settings[client.name]["secret"]
2386
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2387
 
                                                      key)
2388
 
                client_dict = {}
2389
 
                
2390
 
                # A list of attributes that can not be pickled
2391
 
                # + secret.
2392
 
                exclude = set(("bus", "changedstate", "secret",
2393
 
                               "checker"))
2394
 
                for name, typ in (inspect.getmembers
2395
 
                                  (dbus.service.Object)):
2396
 
                    exclude.add(name)
2397
 
                
2398
 
                client_dict["encrypted_secret"] = (client
2399
 
                                                   .encrypted_secret)
2400
 
                for attr in client.client_structure:
2401
 
                    if attr not in exclude:
2402
 
                        client_dict[attr] = getattr(client, attr)
2403
 
                
2404
 
                clients[client.name] = client_dict
2405
 
                del client_settings[client.name]["secret"]
2406
 
        
2407
 
        try:
2408
 
            with os.fdopen(os.open(stored_state_path,
2409
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2410
 
                                   0600), "wb") as stored_state:
2411
 
                pickle.dump((clients, client_settings), stored_state)
2412
 
        except (IOError, OSError) as e:
2413
 
            logger.warning("Could not save persistent state: {0}"
2414
 
                           .format(e))
2415
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2416
 
                raise
2417
 
        
2418
 
        # Delete all clients, and settings from config
2419
1999
        while tcp_server.clients:
2420
 
            name, client = tcp_server.clients.popitem()
 
2000
            client = tcp_server.clients.pop()
2421
2001
            if use_dbus:
2422
2002
                client.remove_from_connection()
 
2003
            client.disable_hook = None
2423
2004
            # Don't signal anything except ClientRemoved
2424
2005
            client.disable(quiet=True)
2425
2006
            if use_dbus:
2426
2007
                # Emit D-Bus signal
2427
 
                mandos_dbus_service.ClientRemoved(client
2428
 
                                                  .dbus_object_path,
 
2008
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2429
2009
                                                  client.name)
2430
 
        client_settings.clear()
2431
2010
    
2432
2011
    atexit.register(cleanup)
2433
2012
    
2434
 
    for client in tcp_server.clients.itervalues():
 
2013
    for client in tcp_server.clients:
2435
2014
        if use_dbus:
2436
2015
            # Emit D-Bus signal
2437
2016
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2438
 
        # Need to initiate checking of clients
2439
 
        if client.enabled:
2440
 
            client.init_checker()
 
2017
        client.enable()
2441
2018
    
2442
2019
    tcp_server.enable()
2443
2020
    tcp_server.server_activate()