/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

The domain name has changed, so the D-Bus bus and interface names must
change.  This commit adds support for both the old and new names.

The new domain name is "recompile.se", so the new D-Bus bus name will
be "se.recompile.Mandos".

Show diffs side-by-side

added added

removed removed

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