/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(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
 
 
 
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)
210
102
 
211
103
class AvahiError(Exception):
212
104
    def __init__(self, value, *args, **kwargs):
267
159
                            " after %i retries, exiting.",
268
160
                            self.rename_count)
269
161
            raise AvahiServiceError("Too many renames")
270
 
        self.name = unicode(self.server
271
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
272
163
        logger.info("Changing Zeroconf service name to %r ...",
273
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
274
169
        self.remove()
275
170
        try:
276
171
            self.add()
296
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
297
192
        self.entry_group_state_changed_match = (
298
193
            self.group.connect_to_signal(
299
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
300
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
301
196
                     self.name, self.type)
302
197
        self.group.AddService(
328
223
            try:
329
224
                self.group.Free()
330
225
            except (dbus.exceptions.UnknownMethodException,
331
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
332
227
                pass
333
228
            self.group = None
334
229
        self.remove()
368
263
                                 self.server_state_changed)
369
264
        self.server_state_changed(self.server.GetState())
370
265
 
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
380
266
 
381
 
def timedelta_to_milliseconds(td):
 
267
def _timedelta_to_milliseconds(td):
382
268
    "Convert a datetime.timedelta() to milliseconds"
383
269
    return ((td.days * 24 * 60 * 60 * 1000)
384
270
            + (td.seconds * 1000)
388
274
    """A representation of a client host served by this server.
389
275
    
390
276
    Attributes:
391
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
277
    _approved:   bool(); 'None' if not yet approved/disapproved
392
278
    approval_delay: datetime.timedelta(); Time to wait for approval
393
279
    approval_duration: datetime.timedelta(); Duration of one approval
394
280
    checker:    subprocess.Popen(); a running checker process used
401
287
                     instance %(name)s can be used in the command.
402
288
    checker_initiator_tag: a gobject event source tag, or None
403
289
    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
406
290
    current_checker_command: string; current running checker_command
 
291
    disable_hook:  If set, called by disable() as disable_hook(self)
407
292
    disable_initiator_tag: a gobject event source tag, or None
408
293
    enabled:    bool()
409
294
    fingerprint: string (40 or 32 hexadecimal digits); used to
412
297
    interval:   datetime.timedelta(); How often to start a new checker
413
298
    last_approval_request: datetime.datetime(); (UTC) or None
414
299
    last_checked_ok: datetime.datetime(); (UTC) or None
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
 
300
    last_enabled: datetime.datetime(); (UTC)
419
301
    name:       string; from the config file, used in log messages and
420
302
                        D-Bus identifiers
421
303
    secret:     bytestring; sent verbatim (over TLS) to client
431
313
                          "created", "enabled", "fingerprint",
432
314
                          "host", "interval", "last_checked_ok",
433
315
                          "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
 
                        }
444
 
    
 
316
        
445
317
    def timeout_milliseconds(self):
446
318
        "Return the 'timeout' attribute in milliseconds"
447
 
        return timedelta_to_milliseconds(self.timeout)
448
 
    
 
319
        return _timedelta_to_milliseconds(self.timeout)
 
320
 
449
321
    def extended_timeout_milliseconds(self):
450
322
        "Return the 'extended_timeout' attribute in milliseconds"
451
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
323
        return _timedelta_to_milliseconds(self.extended_timeout)    
452
324
    
453
325
    def interval_milliseconds(self):
454
326
        "Return the 'interval' attribute in milliseconds"
455
 
        return timedelta_to_milliseconds(self.interval)
456
 
    
 
327
        return _timedelta_to_milliseconds(self.interval)
 
328
 
457
329
    def approval_delay_milliseconds(self):
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):
 
330
        return _timedelta_to_milliseconds(self.approval_delay)
 
331
    
 
332
    def __init__(self, name = None, disable_hook=None, config=None):
512
333
        """Note: the 'checker' key in 'config' sets the
513
334
        'checker_command' attribute and *not* the 'checker'
514
335
        attribute."""
515
336
        self.name = name
516
 
        # adding all client settings
517
 
        for setting, value in settings.iteritems():
518
 
            setattr(self, setting, value)
519
 
        
 
337
        if config is None:
 
338
            config = {}
520
339
        logger.debug("Creating client %r", self.name)
521
340
        # Uppercase and remove spaces from fingerprint for later
522
341
        # comparison purposes with return value from the fingerprint()
523
342
        # function
 
343
        self.fingerprint = (config["fingerprint"].upper()
 
344
                            .replace(" ", ""))
524
345
        logger.debug("  Fingerprint: %s", self.fingerprint)
525
 
        self.created = settings.get("created", datetime.datetime.utcnow())
526
 
 
527
 
        # 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
528
366
        self.checker = None
529
367
        self.checker_initiator_tag = None
530
368
        self.disable_initiator_tag = None
 
369
        self.expires = None
531
370
        self.checker_callback_tag = None
 
371
        self.checker_command = config["checker"]
532
372
        self.current_checker_command = None
533
 
        self.approved = None
 
373
        self.last_connect = None
 
374
        self._approved = None
 
375
        self.approved_by_default = config.get("approved_by_default",
 
376
                                              True)
534
377
        self.approvals_pending = 0
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)
 
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())
549
383
    
550
 
    # Send notice to process children that client state has changed
551
384
    def send_changedstate(self):
552
 
        with self.changedstate:
553
 
            self.changedstate.notify_all()
554
 
    
 
385
        self.changedstate.acquire()
 
386
        self.changedstate.notify_all()
 
387
        self.changedstate.release()
 
388
        
555
389
    def enable(self):
556
390
        """Start this client's checker and timeout hooks"""
557
391
        if getattr(self, "enabled", False):
558
392
            # Already enabled
559
393
            return
560
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
561
401
        self.expires = datetime.datetime.utcnow() + self.timeout
 
402
        self.disable_initiator_tag = (gobject.timeout_add
 
403
                                   (self.timeout_milliseconds(),
 
404
                                    self.disable))
562
405
        self.enabled = True
563
406
        self.last_enabled = datetime.datetime.utcnow()
564
 
        self.init_checker()
 
407
        # Also start a new checker *right now*.
 
408
        self.start_checker()
565
409
    
566
410
    def disable(self, quiet=True):
567
411
        """Disable this client."""
579
423
            gobject.source_remove(self.checker_initiator_tag)
580
424
            self.checker_initiator_tag = None
581
425
        self.stop_checker()
 
426
        if self.disable_hook:
 
427
            self.disable_hook(self)
582
428
        self.enabled = False
583
429
        # Do not run this again if called by a gobject.timeout_add
584
430
        return False
585
431
    
586
432
    def __del__(self):
 
433
        self.disable_hook = None
587
434
        self.disable()
588
435
    
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
 
    
602
436
    def checker_callback(self, pid, condition, command):
603
437
        """The checker has completed, so take appropriate actions."""
604
438
        self.checker_callback_tag = None
605
439
        self.checker = None
606
440
        if os.WIFEXITED(condition):
607
 
            self.last_checker_status = os.WEXITSTATUS(condition)
608
 
            if self.last_checker_status == 0:
 
441
            exitstatus = os.WEXITSTATUS(condition)
 
442
            if exitstatus == 0:
609
443
                logger.info("Checker for %(name)s succeeded",
610
444
                            vars(self))
611
445
                self.checked_ok()
613
447
                logger.info("Checker for %(name)s failed",
614
448
                            vars(self))
615
449
        else:
616
 
            self.last_checker_status = -1
617
450
            logger.warning("Checker for %(name)s crashed?",
618
451
                           vars(self))
619
452
    
626
459
        if timeout is None:
627
460
            timeout = self.timeout
628
461
        self.last_checked_ok = datetime.datetime.utcnow()
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
 
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))
636
467
    
637
468
    def need_approval(self):
638
469
        self.last_approval_request = datetime.datetime.utcnow()
678
509
                                       'replace')))
679
510
                    for attr in
680
511
                    self.runtime_expansions)
681
 
                
 
512
 
682
513
                try:
683
514
                    command = self.checker_command % escaped_attrs
684
515
                except TypeError as error:
730
561
                raise
731
562
        self.checker = None
732
563
 
733
 
 
734
564
def dbus_service_property(dbus_interface, signature="v",
735
565
                          access="readwrite", byte_arrays=False):
736
566
    """Decorators for marking methods of a DBusObjectWithProperties to
782
612
 
783
613
class DBusObjectWithProperties(dbus.service.Object):
784
614
    """A D-Bus object with properties.
785
 
    
 
615
 
786
616
    Classes inheriting from this can use the dbus_service_property
787
617
    decorator to expose methods as D-Bus properties.  It exposes the
788
618
    standard Get(), Set(), and GetAll() methods on the D-Bus.
795
625
    def _get_all_dbus_properties(self):
796
626
        """Returns a generator of (name, attribute) pairs
797
627
        """
798
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
799
 
                for cls in self.__class__.__mro__
 
628
        return ((prop._dbus_name, prop)
800
629
                for name, prop in
801
 
                inspect.getmembers(cls, self._is_dbus_property))
 
630
                inspect.getmembers(self, self._is_dbus_property))
802
631
    
803
632
    def _get_dbus_property(self, interface_name, property_name):
804
633
        """Returns a bound method if one exists which is a D-Bus
805
634
        property with the specified name and interface.
806
635
        """
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
 
        
 
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
814
646
        # No such property
815
647
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
648
                                   + interface_name + "."
850
682
    def GetAll(self, interface_name):
851
683
        """Standard D-Bus property GetAll() method, see D-Bus
852
684
        standard.
853
 
        
 
685
 
854
686
        Note: Will not include properties with access="write".
855
687
        """
856
 
        properties = {}
 
688
        all = {}
857
689
        for name, prop in self._get_all_dbus_properties():
858
690
            if (interface_name
859
691
                and interface_name != prop._dbus_interface):
864
696
                continue
865
697
            value = prop()
866
698
            if not hasattr(value, "variant_level"):
867
 
                properties[name] = value
 
699
                all[name] = value
868
700
                continue
869
 
            properties[name] = type(value)(value, variant_level=
870
 
                                           value.variant_level+1)
871
 
        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")
872
704
    
873
705
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
874
706
                         out_signature="s",
925
757
    return dbus.String(dt.isoformat(),
926
758
                       variant_level=variant_level)
927
759
 
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
 
 
1027
760
class ClientDBus(Client, DBusObjectWithProperties):
1028
761
    """A Client class using D-Bus
1029
762
    
1038
771
    # dbus.service.Object doesn't use super(), so we can't either.
1039
772
    
1040
773
    def __init__(self, bus = None, *args, **kwargs):
 
774
        self._approvals_pending = 0
1041
775
        self.bus = bus
1042
776
        Client.__init__(self, *args, **kwargs)
1043
 
        self._approvals_pending = 0
1044
 
        
1045
 
        self._approvals_pending = 0
1046
777
        # Only now, when this client is initialized, can it show up on
1047
778
        # the D-Bus
1048
779
        client_object_name = unicode(self.name).translate(
1056
787
    def notifychangeproperty(transform_func,
1057
788
                             dbus_name, type_func=lambda x: x,
1058
789
                             variant_level=1):
1059
 
        """ Modify a variable so that it's a property which announces
1060
 
        its changes to DBus.
1061
 
        
1062
 
        transform_fun: Function that takes a value and a variant_level
1063
 
                       and transforms it to a D-Bus type.
1064
 
        dbus_name: D-Bus name of the variable
 
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
1065
795
        type_func: Function that transform the value before sending it
1066
 
                   to the D-Bus.  Default: no transform
1067
 
        variant_level: D-Bus variant level.  Default: 1
 
796
                   to DBus
 
797
        variant_level: DBus variant level. default: 1
1068
798
        """
1069
 
        attrname = "_{0}".format(dbus_name)
 
799
        real_value = [None,]
1070
800
        def setter(self, value):
 
801
            old_value = real_value[0]
 
802
            real_value[0] = value
1071
803
            if hasattr(self, "dbus_object_path"):
1072
 
                if (not hasattr(self, attrname) or
1073
 
                    type_func(getattr(self, attrname, None))
1074
 
                    != type_func(value)):
1075
 
                    dbus_value = transform_func(type_func(value),
1076
 
                                                variant_level
1077
 
                                                =variant_level)
 
804
                if type_func(old_value) != type_func(real_value[0]):
 
805
                    dbus_value = transform_func(type_func(real_value[0]),
 
806
                                                variant_level)
1078
807
                    self.PropertyChanged(dbus.String(dbus_name),
1079
808
                                         dbus_value)
1080
 
            setattr(self, attrname, value)
1081
 
        
1082
 
        return property(lambda self: getattr(self, attrname), setter)
1083
 
    
1084
 
    
 
809
 
 
810
        return property(lambda self: real_value[0], setter)
 
811
 
 
812
 
1085
813
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1086
814
    approvals_pending = notifychangeproperty(dbus.Boolean,
1087
815
                                             "ApprovalPending",
1090
818
    last_enabled = notifychangeproperty(datetime_to_dbus,
1091
819
                                        "LastEnabled")
1092
820
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
 
                                   type_func = lambda checker:
1094
 
                                       checker is not None)
 
821
                                   type_func = lambda checker: checker is not None)
1095
822
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1096
823
                                           "LastCheckedOK")
1097
 
    last_approval_request = notifychangeproperty(
1098
 
        datetime_to_dbus, "LastApprovalRequest")
 
824
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
825
                                                 "LastApprovalRequest")
1099
826
    approved_by_default = notifychangeproperty(dbus.Boolean,
1100
827
                                               "ApprovedByDefault")
1101
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1102
 
                                          "ApprovalDelay",
1103
 
                                          type_func =
1104
 
                                          timedelta_to_milliseconds)
1105
 
    approval_duration = notifychangeproperty(
1106
 
        dbus.UInt64, "ApprovalDuration",
1107
 
        type_func = timedelta_to_milliseconds)
 
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)
1108
832
    host = notifychangeproperty(dbus.String, "Host")
1109
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1110
 
                                   type_func =
1111
 
                                   timedelta_to_milliseconds)
1112
 
    extended_timeout = notifychangeproperty(
1113
 
        dbus.UInt64, "ExtendedTimeout",
1114
 
        type_func = timedelta_to_milliseconds)
1115
 
    interval = notifychangeproperty(dbus.UInt64,
1116
 
                                    "Interval",
1117
 
                                    type_func =
1118
 
                                    timedelta_to_milliseconds)
 
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)
1119
839
    checker_command = notifychangeproperty(dbus.String, "Checker")
1120
840
    
1121
841
    del notifychangeproperty
1147
867
        
1148
868
        return Client.checker_callback(self, pid, condition, command,
1149
869
                                       *args, **kwargs)
1150
 
    
 
870
 
1151
871
    def start_checker(self, *args, **kwargs):
1152
872
        old_checker = self.checker
1153
873
        if self.checker is not None:
1163
883
        return r
1164
884
    
1165
885
    def _reset_approved(self):
1166
 
        self.approved = None
 
886
        self._approved = None
1167
887
        return False
1168
888
    
1169
889
    def approve(self, value=True):
1170
890
        self.send_changedstate()
1171
 
        self.approved = value
1172
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(_timedelta_to_milliseconds
1173
893
                            (self.approval_duration),
1174
894
                            self._reset_approved)
1175
895
    
1176
896
    
1177
897
    ## D-Bus methods, signals & properties
1178
 
    _interface = "se.recompile.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1179
899
    
1180
900
    ## Signals
1181
901
    
1218
938
        "D-Bus signal"
1219
939
        return self.need_approval()
1220
940
    
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
 
    
1229
941
    ## Methods
1230
942
    
1231
943
    # Approve - method
1289
1001
                           access="readwrite")
1290
1002
    def ApprovalDuration_dbus_property(self, value=None):
1291
1003
        if value is None:       # get
1292
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1004
            return dbus.UInt64(_timedelta_to_milliseconds(
1293
1005
                    self.approval_duration))
1294
1006
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1295
1007
    
1309
1021
    def Host_dbus_property(self, value=None):
1310
1022
        if value is None:       # get
1311
1023
            return dbus.String(self.host)
1312
 
        self.host = unicode(value)
 
1024
        self.host = value
1313
1025
    
1314
1026
    # Created - property
1315
1027
    @dbus_service_property(_interface, signature="s", access="read")
1316
1028
    def Created_dbus_property(self):
1317
 
        return datetime_to_dbus(self.created)
 
1029
        return dbus.String(datetime_to_dbus(self.created))
1318
1030
    
1319
1031
    # LastEnabled - property
1320
1032
    @dbus_service_property(_interface, signature="s", access="read")
1364
1076
        gobject.source_remove(self.disable_initiator_tag)
1365
1077
        self.disable_initiator_tag = None
1366
1078
        self.expires = None
1367
 
        time_to_die = timedelta_to_milliseconds((self
1368
 
                                                 .last_checked_ok
1369
 
                                                 + self.timeout)
1370
 
                                                - datetime.datetime
1371
 
                                                .utcnow())
 
1079
        time_to_die = (self.
 
1080
                       _timedelta_to_milliseconds((self
 
1081
                                                   .last_checked_ok
 
1082
                                                   + self.timeout)
 
1083
                                                  - datetime.datetime
 
1084
                                                  .utcnow()))
1372
1085
        if time_to_die <= 0:
1373
1086
            # The timeout has passed
1374
1087
            self.disable()
1375
1088
        else:
1376
1089
            self.expires = (datetime.datetime.utcnow()
1377
 
                            + datetime.timedelta(milliseconds =
1378
 
                                                 time_to_die))
 
1090
                            + datetime.timedelta(milliseconds = time_to_die))
1379
1091
            self.disable_initiator_tag = (gobject.timeout_add
1380
1092
                                          (time_to_die, self.disable))
1381
 
    
 
1093
 
1382
1094
    # ExtendedTimeout - property
1383
1095
    @dbus_service_property(_interface, signature="t",
1384
1096
                           access="readwrite")
1386
1098
        if value is None:       # get
1387
1099
            return dbus.UInt64(self.extended_timeout_milliseconds())
1388
1100
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1389
 
    
 
1101
 
1390
1102
    # Interval - property
1391
1103
    @dbus_service_property(_interface, signature="t",
1392
1104
                           access="readwrite")
1396
1108
        self.interval = datetime.timedelta(0, 0, 0, value)
1397
1109
        if getattr(self, "checker_initiator_tag", None) is None:
1398
1110
            return
1399
 
        if self.enabled:
1400
 
            # Reschedule checker run
1401
 
            gobject.source_remove(self.checker_initiator_tag)
1402
 
            self.checker_initiator_tag = (gobject.timeout_add
1403
 
                                          (value, self.start_checker))
1404
 
            self.start_checker()    # Start one now, too
1405
 
    
 
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
 
1406
1117
    # Checker - property
1407
1118
    @dbus_service_property(_interface, signature="s",
1408
1119
                           access="readwrite")
1409
1120
    def Checker_dbus_property(self, value=None):
1410
1121
        if value is None:       # get
1411
1122
            return dbus.String(self.checker_command)
1412
 
        self.checker_command = unicode(value)
 
1123
        self.checker_command = value
1413
1124
    
1414
1125
    # CheckerRunning - property
1415
1126
    @dbus_service_property(_interface, signature="b",
1442
1153
        self._pipe.send(('init', fpr, address))
1443
1154
        if not self._pipe.recv():
1444
1155
            raise KeyError()
1445
 
    
 
1156
 
1446
1157
    def __getattribute__(self, name):
1447
 
        if name == '_pipe':
 
1158
        if(name == '_pipe'):
1448
1159
            return super(ProxyClient, self).__getattribute__(name)
1449
1160
        self._pipe.send(('getattr', name))
1450
1161
        data = self._pipe.recv()
1455
1166
                self._pipe.send(('funcall', name, args, kwargs))
1456
1167
                return self._pipe.recv()[1]
1457
1168
            return func
1458
 
    
 
1169
 
1459
1170
    def __setattr__(self, name, value):
1460
 
        if name == '_pipe':
 
1171
        if(name == '_pipe'):
1461
1172
            return super(ProxyClient, self).__setattr__(name, value)
1462
1173
        self._pipe.send(('setattr', name, value))
1463
1174
 
1464
1175
 
1465
 
class ClientDBusTransitional(ClientDBus):
1466
 
    __metaclass__ = AlternateDBusNamesMetaclass
1467
 
 
1468
 
 
1469
1176
class ClientHandler(socketserver.BaseRequestHandler, object):
1470
1177
    """A class to handle client connections.
1471
1178
    
1478
1185
                        unicode(self.client_address))
1479
1186
            logger.debug("Pipe FD: %d",
1480
1187
                         self.server.child_pipe.fileno())
1481
 
            
 
1188
 
1482
1189
            session = (gnutls.connection
1483
1190
                       .ClientSession(self.request,
1484
1191
                                      gnutls.connection
1485
1192
                                      .X509Credentials()))
1486
 
            
 
1193
 
1487
1194
            # Note: gnutls.connection.X509Credentials is really a
1488
1195
            # generic GnuTLS certificate credentials object so long as
1489
1196
            # no X.509 keys are added to it.  Therefore, we can use it
1490
1197
            # here despite using OpenPGP certificates.
1491
 
            
 
1198
 
1492
1199
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1493
1200
            #                      "+AES-256-CBC", "+SHA1",
1494
1201
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1500
1207
            (gnutls.library.functions
1501
1208
             .gnutls_priority_set_direct(session._c_object,
1502
1209
                                         priority, None))
1503
 
            
 
1210
 
1504
1211
            # Start communication using the Mandos protocol
1505
1212
            # Get protocol number
1506
1213
            line = self.request.makefile().readline()
1511
1218
            except (ValueError, IndexError, RuntimeError) as error:
1512
1219
                logger.error("Unknown protocol version: %s", error)
1513
1220
                return
1514
 
            
 
1221
 
1515
1222
            # Start GnuTLS connection
1516
1223
            try:
1517
1224
                session.handshake()
1521
1228
                # established.  Just abandon the request.
1522
1229
                return
1523
1230
            logger.debug("Handshake succeeded")
1524
 
            
 
1231
 
1525
1232
            approval_required = False
1526
1233
            try:
1527
1234
                try:
1532
1239
                    logger.warning("Bad certificate: %s", error)
1533
1240
                    return
1534
1241
                logger.debug("Fingerprint: %s", fpr)
1535
 
                
 
1242
 
1536
1243
                try:
1537
1244
                    client = ProxyClient(child_pipe, fpr,
1538
1245
                                         self.client_address)
1539
1246
                except KeyError:
1540
1247
                    return
1541
1248
                
1542
 
                if self.server.use_dbus:
1543
 
                    # Emit D-Bus signal
1544
 
                    client.NewRequest(str(self.client_address))
1545
 
                
1546
1249
                if client.approval_delay:
1547
1250
                    delay = client.approval_delay
1548
1251
                    client.approvals_pending += 1
1554
1257
                                       client.name)
1555
1258
                        if self.server.use_dbus:
1556
1259
                            # Emit D-Bus signal
1557
 
                            client.Rejected("Disabled")
 
1260
                            client.Rejected("Disabled")                    
1558
1261
                        return
1559
1262
                    
1560
 
                    if client.approved or not client.approval_delay:
 
1263
                    if client._approved or not client.approval_delay:
1561
1264
                        #We are approved or approval is disabled
1562
1265
                        break
1563
 
                    elif client.approved is None:
 
1266
                    elif client._approved is None:
1564
1267
                        logger.info("Client %s needs approval",
1565
1268
                                    client.name)
1566
1269
                        if self.server.use_dbus:
1577
1280
                        return
1578
1281
                    
1579
1282
                    #wait until timeout or approved
 
1283
                    #x = float(client._timedelta_to_milliseconds(delay))
1580
1284
                    time = datetime.datetime.now()
1581
1285
                    client.changedstate.acquire()
1582
 
                    (client.changedstate.wait
1583
 
                     (float(client.timedelta_to_milliseconds(delay)
1584
 
                            / 1000)))
 
1286
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1585
1287
                    client.changedstate.release()
1586
1288
                    time2 = datetime.datetime.now()
1587
1289
                    if (time2 - time) >= delay:
1609
1311
                                 sent, len(client.secret)
1610
1312
                                 - (sent_size + sent))
1611
1313
                    sent_size += sent
1612
 
                
 
1314
 
1613
1315
                logger.info("Sending secret to %s", client.name)
1614
 
                # bump the timeout using extended_timeout
 
1316
                # bump the timeout as if seen
1615
1317
                client.checked_ok(client.extended_timeout)
1616
1318
                if self.server.use_dbus:
1617
1319
                    # Emit D-Bus signal
1685
1387
        # Convert the buffer to a Python bytestring
1686
1388
        fpr = ctypes.string_at(buf, buf_len.value)
1687
1389
        # Convert the bytestring to hexadecimal notation
1688
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1390
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1689
1391
        return hex_fpr
1690
1392
 
1691
1393
 
1694
1396
    def sub_process_main(self, request, address):
1695
1397
        try:
1696
1398
            self.finish_request(request, address)
1697
 
        except Exception:
 
1399
        except:
1698
1400
            self.handle_error(request, address)
1699
1401
        self.close_request(request)
1700
 
    
 
1402
            
1701
1403
    def process_request(self, request, address):
1702
1404
        """Start a new process to process the request."""
1703
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1704
 
                                       args = (request,
1705
 
                                               address))
1706
 
        proc.start()
1707
 
        return proc
1708
 
 
 
1405
        multiprocessing.Process(target = self.sub_process_main,
 
1406
                                args = (request, address)).start()
1709
1407
 
1710
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1711
1409
    """ adds a pipe to the MixIn """
1715
1413
        This function creates a new pipe in self.pipe
1716
1414
        """
1717
1415
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1718
 
        
1719
 
        proc = MultiprocessingMixIn.process_request(self, request,
1720
 
                                                    client_address)
 
1416
 
 
1417
        super(MultiprocessingMixInWithPipe,
 
1418
              self).process_request(request, client_address)
1721
1419
        self.child_pipe.close()
1722
 
        self.add_pipe(parent_pipe, proc)
1723
 
    
1724
 
    def add_pipe(self, parent_pipe, proc):
 
1420
        self.add_pipe(parent_pipe)
 
1421
 
 
1422
    def add_pipe(self, parent_pipe):
1725
1423
        """Dummy function; override as necessary"""
1726
1424
        raise NotImplementedError
1727
1425
 
1728
 
 
1729
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1730
1427
                     socketserver.TCPServer, object):
1731
1428
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1805
1502
        self.enabled = False
1806
1503
        self.clients = clients
1807
1504
        if self.clients is None:
1808
 
            self.clients = {}
 
1505
            self.clients = set()
1809
1506
        self.use_dbus = use_dbus
1810
1507
        self.gnutls_priority = gnutls_priority
1811
1508
        IPv6_TCPServer.__init__(self, server_address,
1815
1512
    def server_activate(self):
1816
1513
        if self.enabled:
1817
1514
            return socketserver.TCPServer.server_activate(self)
1818
 
    
1819
1515
    def enable(self):
1820
1516
        self.enabled = True
1821
 
    
1822
 
    def add_pipe(self, parent_pipe, proc):
 
1517
    def add_pipe(self, parent_pipe):
1823
1518
        # Call "handle_ipc" for both data and EOF events
1824
1519
        gobject.io_add_watch(parent_pipe.fileno(),
1825
1520
                             gobject.IO_IN | gobject.IO_HUP,
1826
1521
                             functools.partial(self.handle_ipc,
1827
 
                                               parent_pipe =
1828
 
                                               parent_pipe,
1829
 
                                               proc = proc))
1830
 
    
 
1522
                                               parent_pipe = parent_pipe))
 
1523
        
1831
1524
    def handle_ipc(self, source, condition, parent_pipe=None,
1832
 
                   proc = None, client_object=None):
 
1525
                   client_object=None):
1833
1526
        condition_names = {
1834
1527
            gobject.IO_IN: "IN",   # There is data to read.
1835
1528
            gobject.IO_OUT: "OUT", # Data can be written (without
1844
1537
                                       for cond, name in
1845
1538
                                       condition_names.iteritems()
1846
1539
                                       if cond & condition)
1847
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1540
        # error or the other end of multiprocessing.Pipe has closed
1848
1541
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1849
 
            # Wait for other process to exit
1850
 
            proc.join()
1851
1542
            return False
1852
1543
        
1853
1544
        # Read a request from the child
1858
1549
            fpr = request[1]
1859
1550
            address = request[2]
1860
1551
            
1861
 
            for c in self.clients.itervalues():
 
1552
            for c in self.clients:
1862
1553
                if c.fingerprint == fpr:
1863
1554
                    client = c
1864
1555
                    break
1867
1558
                            "dress: %s", fpr, address)
1868
1559
                if self.use_dbus:
1869
1560
                    # Emit D-Bus signal
1870
 
                    mandos_dbus_service.ClientNotFound(fpr,
1871
 
                                                       address[0])
 
1561
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1872
1562
                parent_pipe.send(False)
1873
1563
                return False
1874
1564
            
1875
1565
            gobject.io_add_watch(parent_pipe.fileno(),
1876
1566
                                 gobject.IO_IN | gobject.IO_HUP,
1877
1567
                                 functools.partial(self.handle_ipc,
1878
 
                                                   parent_pipe =
1879
 
                                                   parent_pipe,
1880
 
                                                   proc = proc,
1881
 
                                                   client_object =
1882
 
                                                   client))
 
1568
                                                   parent_pipe = parent_pipe,
 
1569
                                                   client_object = client))
1883
1570
            parent_pipe.send(True)
1884
 
            # remove the old hook in favor of the new above hook on
1885
 
            # same fileno
 
1571
            # remove the old hook in favor of the new above hook on same fileno
1886
1572
            return False
1887
1573
        if command == 'funcall':
1888
1574
            funcname = request[1]
1889
1575
            args = request[2]
1890
1576
            kwargs = request[3]
1891
1577
            
1892
 
            parent_pipe.send(('data', getattr(client_object,
1893
 
                                              funcname)(*args,
1894
 
                                                         **kwargs)))
1895
 
        
 
1578
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1579
 
1896
1580
        if command == 'getattr':
1897
1581
            attrname = request[1]
1898
1582
            if callable(client_object.__getattribute__(attrname)):
1899
1583
                parent_pipe.send(('function',))
1900
1584
            else:
1901
 
                parent_pipe.send(('data', client_object
1902
 
                                  .__getattribute__(attrname)))
 
1585
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1903
1586
        
1904
1587
        if command == 'setattr':
1905
1588
            attrname = request[1]
1906
1589
            value = request[2]
1907
1590
            setattr(client_object, attrname, value)
1908
 
        
 
1591
 
1909
1592
        return True
1910
1593
 
1911
1594
 
1948
1631
    return timevalue
1949
1632
 
1950
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
 
1951
1658
def daemon(nochdir = False, noclose = False):
1952
1659
    """See daemon(3).  Standard BSD Unix function.
1953
1660
    
2008
1715
                        " system bus interface")
2009
1716
    parser.add_argument("--no-ipv6", action="store_false",
2010
1717
                        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
 
    
2017
1718
    options = parser.parse_args()
2018
1719
    
2019
1720
    if options.check:
2032
1733
                        "use_dbus": "True",
2033
1734
                        "use_ipv6": "True",
2034
1735
                        "debuglevel": "",
2035
 
                        "restore": "True",
2036
 
                        "statedir": "/var/lib/mandos"
2037
1736
                        }
2038
1737
    
2039
1738
    # Parse config file for server-global settings
2056
1755
    # options, if set.
2057
1756
    for option in ("interface", "address", "port", "debug",
2058
1757
                   "priority", "servicename", "configdir",
2059
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2060
 
                   "statedir"):
 
1758
                   "use_dbus", "use_ipv6", "debuglevel"):
2061
1759
        value = getattr(options, option)
2062
1760
        if value is not None:
2063
1761
            server_settings[option] = value
2075
1773
    debuglevel = server_settings["debuglevel"]
2076
1774
    use_dbus = server_settings["use_dbus"]
2077
1775
    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)
2089
 
    
 
1776
 
2090
1777
    if server_settings["servicename"] != "Mandos":
2091
1778
        syslogger.setFormatter(logging.Formatter
2092
1779
                               ('Mandos (%s) [%%(process)d]:'
2094
1781
                                % server_settings["servicename"]))
2095
1782
    
2096
1783
    # Parse config file with clients
2097
 
    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)
2098
1793
    client_config.read(os.path.join(server_settings["configdir"],
2099
1794
                                    "clients.conf"))
2100
1795
    
2138
1833
        if error[0] != errno.EPERM:
2139
1834
            raise error
2140
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
 
2141
1844
    if debug:
2142
1845
        # Enable all possible GnuTLS debugging
2143
1846
        
2157
1860
        os.dup2(null, sys.stdin.fileno())
2158
1861
        if null > 2:
2159
1862
            os.close(null)
 
1863
    else:
 
1864
        # No console logging
 
1865
        logger.removeHandler(console)
2160
1866
    
2161
1867
    # Need to fork before connecting to D-Bus
2162
1868
    if not debug:
2163
1869
        # Close all input and output, do double fork, etc.
2164
1870
        daemon()
2165
1871
    
2166
 
    gobject.threads_init()
2167
 
    
2168
1872
    global main_loop
2169
1873
    # From the Avahi example code
2170
1874
    DBusGMainLoop(set_as_default=True )
2173
1877
    # End of Avahi example code
2174
1878
    if use_dbus:
2175
1879
        try:
2176
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1880
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2177
1881
                                            bus, do_not_queue=True)
2178
 
            old_bus_name = (dbus.service.BusName
2179
 
                            ("se.bsnet.fukt.Mandos", bus,
2180
 
                             do_not_queue=True))
2181
1882
        except dbus.exceptions.NameExistsException as e:
2182
1883
            logger.error(unicode(e) + ", disabling D-Bus")
2183
1884
            use_dbus = False
2184
1885
            server_settings["use_dbus"] = False
2185
1886
            tcp_server.use_dbus = False
2186
1887
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
 
    service = AvahiServiceToSyslog(name =
2188
 
                                   server_settings["servicename"],
2189
 
                                   servicetype = "_mandos._tcp",
2190
 
                                   protocol = protocol, bus = bus)
 
1888
    service = AvahiService(name = server_settings["servicename"],
 
1889
                           servicetype = "_mandos._tcp",
 
1890
                           protocol = protocol, bus = bus)
2191
1891
    if server_settings["interface"]:
2192
1892
        service.interface = (if_nametoindex
2193
1893
                             (str(server_settings["interface"])))
2197
1897
    
2198
1898
    client_class = Client
2199
1899
    if use_dbus:
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
 
                    
 
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):
2266
1908
            try:
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
 
    
 
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()))
2290
1918
    if not tcp_server.clients:
2291
1919
        logger.warning("No clients defined")
2292
1920
        
2303
1931
            # "pidfile" was never created
2304
1932
            pass
2305
1933
        del pidfilename
 
1934
        
2306
1935
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
 
    
 
1936
 
2308
1937
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
1938
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2310
1939
    
2313
1942
            """A D-Bus proxy object"""
2314
1943
            def __init__(self):
2315
1944
                dbus.service.Object.__init__(self, bus, "/")
2316
 
            _interface = "se.recompile.Mandos"
 
1945
            _interface = "se.bsnet.fukt.Mandos"
2317
1946
            
2318
1947
            @dbus.service.signal(_interface, signature="o")
2319
1948
            def ClientAdded(self, objpath):
2334
1963
            def GetAllClients(self):
2335
1964
                "D-Bus method"
2336
1965
                return dbus.Array(c.dbus_object_path
2337
 
                                  for c in
2338
 
                                  tcp_server.clients.itervalues())
 
1966
                                  for c in tcp_server.clients)
2339
1967
            
2340
1968
            @dbus.service.method(_interface,
2341
1969
                                 out_signature="a{oa{sv}}")
2343
1971
                "D-Bus method"
2344
1972
                return dbus.Dictionary(
2345
1973
                    ((c.dbus_object_path, c.GetAll(""))
2346
 
                     for c in tcp_server.clients.itervalues()),
 
1974
                     for c in tcp_server.clients),
2347
1975
                    signature="oa{sv}")
2348
1976
            
2349
1977
            @dbus.service.method(_interface, in_signature="o")
2350
1978
            def RemoveClient(self, object_path):
2351
1979
                "D-Bus method"
2352
 
                for c in tcp_server.clients.itervalues():
 
1980
                for c in tcp_server.clients:
2353
1981
                    if c.dbus_object_path == object_path:
2354
 
                        del tcp_server.clients[c.name]
 
1982
                        tcp_server.clients.remove(c)
2355
1983
                        c.remove_from_connection()
2356
1984
                        # Don't signal anything except ClientRemoved
2357
1985
                        c.disable(quiet=True)
2362
1990
            
2363
1991
            del _interface
2364
1992
        
2365
 
        class MandosDBusServiceTransitional(MandosDBusService):
2366
 
            __metaclass__ = AlternateDBusNamesMetaclass
2367
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1993
        mandos_dbus_service = MandosDBusService()
2368
1994
    
2369
1995
    def cleanup():
2370
1996
        "Cleanup function; run on exit"
2371
1997
        service.cleanup()
2372
1998
        
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
2426
1999
        while tcp_server.clients:
2427
 
            name, client = tcp_server.clients.popitem()
 
2000
            client = tcp_server.clients.pop()
2428
2001
            if use_dbus:
2429
2002
                client.remove_from_connection()
 
2003
            client.disable_hook = None
2430
2004
            # Don't signal anything except ClientRemoved
2431
2005
            client.disable(quiet=True)
2432
2006
            if use_dbus:
2433
2007
                # Emit D-Bus signal
2434
 
                mandos_dbus_service.ClientRemoved(client
2435
 
                                                  .dbus_object_path,
 
2008
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2436
2009
                                                  client.name)
2437
 
        client_settings.clear()
2438
2010
    
2439
2011
    atexit.register(cleanup)
2440
2012
    
2441
 
    for client in tcp_server.clients.itervalues():
 
2013
    for client in tcp_server.clients:
2442
2014
        if use_dbus:
2443
2015
            # Emit D-Bus signal
2444
2016
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2445
 
        # Need to initiate checking of clients
2446
 
        if client.enabled:
2447
 
            client.init_checker()
 
2017
        client.enable()
2448
2018
    
2449
2019
    tcp_server.enable()
2450
2020
    tcp_server.server_activate()