/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

Remove se.recompile.Mandos.NewRequest signal - its implemetation was
buggy and its utility was questionable.

* DBUS-API (se.recompile.Mandos.NewRequest): Removed.
* mandos (ClientDBus.NewRequest): Removed.  All emitters altered.

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
 
66
import binascii
 
67
import tempfile
66
68
 
67
69
import dbus
68
70
import dbus.service
73
75
import ctypes.util
74
76
import xml.dom.minidom
75
77
import inspect
 
78
import GnuPGInterface
76
79
 
77
80
try:
78
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
85
    except ImportError:
83
86
        SO_BINDTODEVICE = None
84
87
 
85
 
 
86
 
version = "1.3.1"
87
 
 
88
 
#logger = logging.getLogger('mandos')
89
 
logger = logging.Logger('mandos')
 
88
version = "1.5.1"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
90
92
syslogger = (logging.handlers.SysLogHandler
91
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
94
              address = str("/dev/log")))
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)
 
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
 
103
211
 
104
212
class AvahiError(Exception):
105
213
    def __init__(self, value, *args, **kwargs):
160
268
                            " after %i retries, exiting.",
161
269
                            self.rename_count)
162
270
            raise AvahiServiceError("Too many renames")
163
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
164
273
        logger.info("Changing Zeroconf service name to %r ...",
165
274
                    self.name)
166
 
        syslogger.setFormatter(logging.Formatter
167
 
                               ('Mandos (%s) [%%(process)d]:'
168
 
                                ' %%(levelname)s: %%(message)s'
169
 
                                % self.name))
170
275
        self.remove()
171
276
        try:
172
277
            self.add()
192
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
298
        self.entry_group_state_changed_match = (
194
299
            self.group.connect_to_signal(
195
 
                'StateChanged', self .entry_group_state_changed))
 
300
                'StateChanged', self.entry_group_state_changed))
196
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
197
302
                     self.name, self.type)
198
303
        self.group.AddService(
224
329
            try:
225
330
                self.group.Free()
226
331
            except (dbus.exceptions.UnknownMethodException,
227
 
                    dbus.exceptions.DBusException) as e:
 
332
                    dbus.exceptions.DBusException):
228
333
                pass
229
334
            self.group = None
230
335
        self.remove()
264
369
                                 self.server_state_changed)
265
370
        self.server_state_changed(self.server.GetState())
266
371
 
 
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
267
381
 
268
 
def _timedelta_to_milliseconds(td):
 
382
def timedelta_to_milliseconds(td):
269
383
    "Convert a datetime.timedelta() to milliseconds"
270
384
    return ((td.days * 24 * 60 * 60 * 1000)
271
385
            + (td.seconds * 1000)
275
389
    """A representation of a client host served by this server.
276
390
    
277
391
    Attributes:
278
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
279
393
    approval_delay: datetime.timedelta(); Time to wait for approval
280
394
    approval_duration: datetime.timedelta(); Duration of one approval
281
395
    checker:    subprocess.Popen(); a running checker process used
288
402
                     instance %(name)s can be used in the command.
289
403
    checker_initiator_tag: a gobject event source tag, or None
290
404
    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
291
407
    current_checker_command: string; current running checker_command
292
 
    disable_hook:  If set, called by disable() as disable_hook(self)
293
408
    disable_initiator_tag: a gobject event source tag, or None
294
409
    enabled:    bool()
295
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
298
413
    interval:   datetime.timedelta(); How often to start a new checker
299
414
    last_approval_request: datetime.datetime(); (UTC) or None
300
415
    last_checked_ok: datetime.datetime(); (UTC) or None
301
 
    last_enabled: datetime.datetime(); (UTC)
 
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
302
420
    name:       string; from the config file, used in log messages and
303
421
                        D-Bus identifiers
304
422
    secret:     bytestring; sent verbatim (over TLS) to client
305
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
306
424
                                      until this client is disabled
307
 
    extended_timeout:   extra long timeout when password has been sent
 
425
    extended_timeout:   extra long timeout when secret has been sent
308
426
    runtime_expansions: Allowed attributes for runtime expansion.
309
427
    expires:    datetime.datetime(); time (UTC) when a client will be
310
428
                disabled, or None
314
432
                          "created", "enabled", "fingerprint",
315
433
                          "host", "interval", "last_checked_ok",
316
434
                          "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
                        }
317
445
    
318
446
    def timeout_milliseconds(self):
319
447
        "Return the 'timeout' attribute in milliseconds"
320
 
        return _timedelta_to_milliseconds(self.timeout)
 
448
        return timedelta_to_milliseconds(self.timeout)
321
449
    
322
450
    def extended_timeout_milliseconds(self):
323
451
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
325
453
    
326
454
    def interval_milliseconds(self):
327
455
        "Return the 'interval' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.interval)
 
456
        return timedelta_to_milliseconds(self.interval)
329
457
    
330
458
    def approval_delay_milliseconds(self):
331
 
        return _timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
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):
334
510
        """Note: the 'checker' key in 'config' sets the
335
511
        'checker_command' attribute and *not* the 'checker'
336
512
        attribute."""
337
513
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
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
       
340
528
        logger.debug("Creating client %r", self.name)
341
529
        # Uppercase and remove spaces from fingerprint for later
342
530
        # comparison purposes with return value from the fingerprint()
343
531
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
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
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
367
537
        self.checker = None
368
538
        self.checker_initiator_tag = None
369
539
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
540
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
541
        self.current_checker_command = None
374
 
        self.last_connect = None
375
 
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
377
 
                                              True)
 
542
        self.approved = None
378
543
        self.approvals_pending = 0
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())
 
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)
384
558
    
 
559
    # Send notice to process children that client state has changed
385
560
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
390
564
    def enable(self):
391
565
        """Start this client's checker and timeout hooks"""
392
566
        if getattr(self, "enabled", False):
393
567
            # Already enabled
394
568
            return
395
569
        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
402
570
        self.expires = datetime.datetime.utcnow() + self.timeout
403
 
        self.disable_initiator_tag = (gobject.timeout_add
404
 
                                   (self.timeout_milliseconds(),
405
 
                                    self.disable))
406
571
        self.enabled = True
407
572
        self.last_enabled = datetime.datetime.utcnow()
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
573
        self.init_checker()
410
574
    
411
575
    def disable(self, quiet=True):
412
576
        """Disable this client."""
424
588
            gobject.source_remove(self.checker_initiator_tag)
425
589
            self.checker_initiator_tag = None
426
590
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
591
        self.enabled = False
430
592
        # Do not run this again if called by a gobject.timeout_add
431
593
        return False
432
594
    
433
595
    def __del__(self):
434
 
        self.disable_hook = None
435
596
        self.disable()
436
597
    
 
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
    
437
611
    def checker_callback(self, pid, condition, command):
438
612
        """The checker has completed, so take appropriate actions."""
439
613
        self.checker_callback_tag = None
440
614
        self.checker = None
441
615
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
444
618
                logger.info("Checker for %(name)s succeeded",
445
619
                            vars(self))
446
620
                self.checked_ok()
448
622
                logger.info("Checker for %(name)s failed",
449
623
                            vars(self))
450
624
        else:
 
625
            self.last_checker_status = -1
451
626
            logger.warning("Checker for %(name)s crashed?",
452
627
                           vars(self))
453
628
    
460
635
        if timeout is None:
461
636
            timeout = self.timeout
462
637
        self.last_checked_ok = datetime.datetime.utcnow()
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))
 
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
468
645
    
469
646
    def need_approval(self):
470
647
        self.last_approval_request = datetime.datetime.utcnow()
627
804
    def _get_all_dbus_properties(self):
628
805
        """Returns a generator of (name, attribute) pairs
629
806
        """
630
 
        return ((prop._dbus_name, prop)
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
808
                for cls in self.__class__.__mro__
631
809
                for name, prop in
632
 
                inspect.getmembers(self, self._is_dbus_property))
 
810
                inspect.getmembers(cls, self._is_dbus_property))
633
811
    
634
 
#    def _get_dbus_property(self, interface_name, property_name):
635
 
#        """Returns a bound method if one exists which is a D-Bus
636
 
#        property with the specified name and interface.
637
 
#        """
638
 
#        print("get_property({0!r}, {1!r}".format(interface_name, property_name),file=sys.stderr)
639
 
#        print(dir(self), sys.stderr)
640
 
#        for name in (property_name,
641
 
#                     property_name + "_dbus_property"):
642
 
#            prop = getattr(self, name, None)
643
 
#            if (prop is None
644
 
#                or not self._is_dbus_property(prop)
645
 
#                or prop._dbus_name != property_name
646
 
#                or (interface_name and prop._dbus_interface
647
 
#                    and interface_name != prop._dbus_interface)):
648
 
#                continue
649
 
#            return prop
650
 
#        # No such property
651
 
#        raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
 
#                                   + interface_name + "."
653
 
#                                   + property_name)
654
 
 
655
812
    def _get_dbus_property(self, interface_name, property_name):
656
813
        """Returns a bound method if one exists which is a D-Bus
657
814
        property with the specified name and interface.
658
815
        """
659
 
        for name, value in inspect.getmembers(self, self._is_dbus_property):
660
 
            if value._dbus_name == property_name and value._dbus_interface == interface_name:
661
 
                return value
 
816
        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):
 
821
                    return value.__get__(self)
662
822
        
663
823
        # No such property
664
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
665
825
                                   + interface_name + "."
666
826
                                   + property_name)
667
 
 
668
827
    
669
828
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
670
829
                         out_signature="v")
691
850
            # signatures other than "ay".
692
851
            if prop._dbus_signature != "ay":
693
852
                raise ValueError
694
 
            value = dbus.ByteArray(''.join(unichr(byte)
695
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
696
855
        prop(value)
697
856
    
698
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
703
862
        
704
863
        Note: Will not include properties with access="write".
705
864
        """
706
 
        all = {}
 
865
        properties = {}
707
866
        for name, prop in self._get_all_dbus_properties():
708
867
            if (interface_name
709
868
                and interface_name != prop._dbus_interface):
714
873
                continue
715
874
            value = prop()
716
875
            if not hasattr(value, "variant_level"):
717
 
                all[name] = value
 
876
                properties[name] = value
718
877
                continue
719
 
            all[name] = type(value)(value, variant_level=
720
 
                                    value.variant_level+1)
721
 
        return dbus.Dictionary(all, signature="sv")
 
878
            properties[name] = type(value)(value, variant_level=
 
879
                                           value.variant_level+1)
 
880
        return dbus.Dictionary(properties, signature="sv")
722
881
    
723
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
724
883
                         out_signature="s",
775
934
    return dbus.String(dt.isoformat(),
776
935
                       variant_level=variant_level)
777
936
 
778
 
class transitional_clientdbus(DBusObjectWithProperties.__metaclass__):
 
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
    """
779
943
    def __new__(mcs, name, bases, attr):
780
 
        for key, old_dbusobj in attr.items():
781
 
            new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
782
 
            if getattr(old_dbusobj, "_dbus_is_signal", False):
783
 
                unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
784
 
                                    old_dbusobj.__closure__))["func"].cell_contents
785
 
                newfunc = types.FunctionType(unwrappedfunc.func_code,
786
 
                                             unwrappedfunc.func_globals,
787
 
                                             unwrappedfunc.func_name,
788
 
                                             unwrappedfunc.func_defaults,
789
 
                                             unwrappedfunc.func_closure)
790
 
                new_dbusfunc = dbus.service.signal(
791
 
                    new_interface, old_dbusobj._dbus_signature)(newfunc)            
792
 
                attr["_transitional_{0}_1".format(key)] = new_dbusfunc
793
 
                attr["_transitional_{0}_0".format(key)] = old_dbusobj                
794
 
                def fixscope(func1, func2):
795
 
                    def newcall(*args, **kwargs):
796
 
                        func1(*args, **kwargs)
797
 
                        func2(*args, **kwargs)
798
 
                    return newcall
799
 
 
800
 
                attr[key] = fixscope(
801
 
                    old_dbusobj, attr["_transitional_{0}_1".format(key)])
802
 
            
803
 
            if getattr(old_dbusobj, "_dbus_is_method", False):
804
 
                new_dbusfunc = (dbus.service.method
805
 
                                (new_interface,
806
 
                                 old_dbusobj._dbus_in_signature,
807
 
                                 old_dbusobj._dbus_out_signature)
808
 
                                (types.FunctionType
809
 
                                 (old_dbusobj.func_code,
810
 
                                  old_dbusobj.func_globals,
811
 
                                  old_dbusobj.func_name,
812
 
                                  old_dbusobj.func_defaults,
813
 
                                  old_dbusobj.func_closure)))
814
 
 
815
 
                attr["_transitional_{0}".format(key)] = new_dbusfunc
816
 
            if getattr(old_dbusobj, "_dbus_is_property", False):
817
 
                new_dbusfunc = (dbus_service_property
818
 
                                (new_interface,
819
 
                                 old_dbusobj._dbus_signature,
820
 
                                 old_dbusobj._dbus_access,
821
 
                                 old_dbusobj._dbus_get_args_options["byte_arrays"])
822
 
                                (types.FunctionType
823
 
                                 (old_dbusobj.func_code,
824
 
                                  old_dbusobj.func_globals,
825
 
                                  old_dbusobj.func_name,
826
 
                                  old_dbusobj.func_defaults,
827
 
                                  old_dbusobj.func_closure)))
828
 
 
829
 
                attr["_transitional_{0}".format(key)] = new_dbusfunc
 
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)))
830
1033
        return type.__new__(mcs, name, bases, attr)
831
1034
 
 
1035
 
832
1036
class ClientDBus(Client, DBusObjectWithProperties):
833
1037
    """A Client class using D-Bus
834
1038
    
839
1043
    
840
1044
    runtime_expansions = (Client.runtime_expansions
841
1045
                          + ("dbus_object_path",))
842
 
 
843
 
    __metaclass__ = transitional_clientdbus
844
1046
    
845
1047
    # dbus.service.Object doesn't use super(), so we can't either.
846
1048
    
847
1049
    def __init__(self, bus = None, *args, **kwargs):
848
 
        self._approvals_pending = 0
849
1050
        self.bus = bus
850
1051
        Client.__init__(self, *args, **kwargs)
851
1052
        # Only now, when this client is initialized, can it show up on
861
1062
    def notifychangeproperty(transform_func,
862
1063
                             dbus_name, type_func=lambda x: x,
863
1064
                             variant_level=1):
864
 
        """ Modify a variable so that its a property that announce its
865
 
        changes to DBus.
866
 
        transform_fun: Function that takes a value and transform it to
867
 
                       DBus type.
868
 
        dbus_name: DBus name of the variable
 
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
869
1071
        type_func: Function that transform the value before sending it
870
 
                   to DBus
871
 
        variant_level: DBus variant level. default: 1
 
1072
                   to the D-Bus.  Default: no transform
 
1073
        variant_level: D-Bus variant level.  Default: 1
872
1074
        """
873
 
        real_value = [None,]
 
1075
        attrname = "_{0}".format(dbus_name)
874
1076
        def setter(self, value):
875
 
            old_value = real_value[0]
876
 
            real_value[0] = value
877
1077
            if hasattr(self, "dbus_object_path"):
878
 
                if type_func(old_value) != type_func(real_value[0]):
879
 
                    dbus_value = transform_func(type_func(real_value[0]),
880
 
                                                variant_level)
 
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)
881
1084
                    self.PropertyChanged(dbus.String(dbus_name),
882
1085
                                         dbus_value)
 
1086
            setattr(self, attrname, value)
883
1087
        
884
 
        return property(lambda self: real_value[0], setter)
 
1088
        return property(lambda self: getattr(self, attrname), setter)
885
1089
    
886
1090
    
887
1091
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
892
1096
    last_enabled = notifychangeproperty(datetime_to_dbus,
893
1097
                                        "LastEnabled")
894
1098
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
895
 
                                   type_func = lambda checker: checker is not None)
 
1099
                                   type_func = lambda checker:
 
1100
                                       checker is not None)
896
1101
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
897
1102
                                           "LastCheckedOK")
898
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
899
 
                                                 "LastApprovalRequest")
 
1103
    last_approval_request = notifychangeproperty(
 
1104
        datetime_to_dbus, "LastApprovalRequest")
900
1105
    approved_by_default = notifychangeproperty(dbus.Boolean,
901
1106
                                               "ApprovedByDefault")
902
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
903
 
                                          type_func = _timedelta_to_milliseconds)
904
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
905
 
                                             type_func = _timedelta_to_milliseconds)
 
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)
906
1114
    host = notifychangeproperty(dbus.String, "Host")
907
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
908
 
                                   type_func = _timedelta_to_milliseconds)
909
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
910
 
                                            type_func = _timedelta_to_milliseconds)
911
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
912
 
                                    type_func = _timedelta_to_milliseconds)
 
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)
913
1125
    checker_command = notifychangeproperty(dbus.String, "Checker")
914
1126
    
915
1127
    del notifychangeproperty
957
1169
        return r
958
1170
    
959
1171
    def _reset_approved(self):
960
 
        self._approved = None
 
1172
        self.approved = None
961
1173
        return False
962
1174
    
963
1175
    def approve(self, value=True):
964
1176
        self.send_changedstate()
965
 
        self._approved = value
966
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1177
        self.approved = value
 
1178
        gobject.timeout_add(timedelta_to_milliseconds
967
1179
                            (self.approval_duration),
968
1180
                            self._reset_approved)
969
1181
    
970
1182
    
971
1183
    ## D-Bus methods, signals & properties
972
 
    _interface = "se.bsnet.fukt.Mandos.Client"
973
 
 
 
1184
    _interface = "se.recompile.Mandos.Client"
 
1185
    
974
1186
    ## Signals
975
1187
    
976
1188
    # CheckerCompleted - signal
1075
1287
                           access="readwrite")
1076
1288
    def ApprovalDuration_dbus_property(self, value=None):
1077
1289
        if value is None:       # get
1078
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1290
            return dbus.UInt64(timedelta_to_milliseconds(
1079
1291
                    self.approval_duration))
1080
1292
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1081
1293
    
1095
1307
    def Host_dbus_property(self, value=None):
1096
1308
        if value is None:       # get
1097
1309
            return dbus.String(self.host)
1098
 
        self.host = value
 
1310
        self.host = unicode(value)
1099
1311
    
1100
1312
    # Created - property
1101
1313
    @dbus_service_property(_interface, signature="s", access="read")
1102
1314
    def Created_dbus_property(self):
1103
 
        return dbus.String(datetime_to_dbus(self.created))
 
1315
        return datetime_to_dbus(self.created)
1104
1316
    
1105
1317
    # LastEnabled - property
1106
1318
    @dbus_service_property(_interface, signature="s", access="read")
1144
1356
        if value is None:       # get
1145
1357
            return dbus.UInt64(self.timeout_milliseconds())
1146
1358
        self.timeout = datetime.timedelta(0, 0, 0, value)
1147
 
        if getattr(self, "disable_initiator_tag", None) is None:
1148
 
            return
1149
1359
        # Reschedule timeout
1150
 
        gobject.source_remove(self.disable_initiator_tag)
1151
 
        self.disable_initiator_tag = None
1152
 
        self.expires = None
1153
 
        time_to_die = (self.
1154
 
                       _timedelta_to_milliseconds((self
1155
 
                                                   .last_checked_ok
1156
 
                                                   + self.timeout)
1157
 
                                                  - datetime.datetime
1158
 
                                                  .utcnow()))
1159
 
        if time_to_die <= 0:
1160
 
            # The timeout has passed
1161
 
            self.disable()
1162
 
        else:
1163
 
            self.expires = (datetime.datetime.utcnow()
1164
 
                            + datetime.timedelta(milliseconds = time_to_die))
1165
 
            self.disable_initiator_tag = (gobject.timeout_add
1166
 
                                          (time_to_die, self.disable))
 
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))
1167
1378
    
1168
1379
    # ExtendedTimeout - property
1169
1380
    @dbus_service_property(_interface, signature="t",
1182
1393
        self.interval = datetime.timedelta(0, 0, 0, value)
1183
1394
        if getattr(self, "checker_initiator_tag", None) is None:
1184
1395
            return
1185
 
        # Reschedule checker run
1186
 
        gobject.source_remove(self.checker_initiator_tag)
1187
 
        self.checker_initiator_tag = (gobject.timeout_add
1188
 
                                      (value, self.start_checker))
1189
 
        self.start_checker()    # Start one now, too
 
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
1190
1402
    
1191
1403
    # Checker - property
1192
1404
    @dbus_service_property(_interface, signature="s",
1194
1406
    def Checker_dbus_property(self, value=None):
1195
1407
        if value is None:       # get
1196
1408
            return dbus.String(self.checker_command)
1197
 
        self.checker_command = value
 
1409
        self.checker_command = unicode(value)
1198
1410
    
1199
1411
    # CheckerRunning - property
1200
1412
    @dbus_service_property(_interface, signature="b",
1229
1441
            raise KeyError()
1230
1442
    
1231
1443
    def __getattribute__(self, name):
1232
 
        if(name == '_pipe'):
 
1444
        if name == '_pipe':
1233
1445
            return super(ProxyClient, self).__getattribute__(name)
1234
1446
        self._pipe.send(('getattr', name))
1235
1447
        data = self._pipe.recv()
1242
1454
            return func
1243
1455
    
1244
1456
    def __setattr__(self, name, value):
1245
 
        if(name == '_pipe'):
 
1457
        if name == '_pipe':
1246
1458
            return super(ProxyClient, self).__setattr__(name, value)
1247
1459
        self._pipe.send(('setattr', name, value))
1248
1460
 
1249
1461
 
 
1462
class ClientDBusTransitional(ClientDBus):
 
1463
    __metaclass__ = AlternateDBusNamesMetaclass
 
1464
 
 
1465
 
1250
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
1251
1467
    """A class to handle client connections.
1252
1468
    
1331
1547
                                       client.name)
1332
1548
                        if self.server.use_dbus:
1333
1549
                            # Emit D-Bus signal
1334
 
                            client.Rejected("Disabled")                    
 
1550
                            client.Rejected("Disabled")
1335
1551
                        return
1336
1552
                    
1337
 
                    if client._approved or not client.approval_delay:
 
1553
                    if client.approved or not client.approval_delay:
1338
1554
                        #We are approved or approval is disabled
1339
1555
                        break
1340
 
                    elif client._approved is None:
 
1556
                    elif client.approved is None:
1341
1557
                        logger.info("Client %s needs approval",
1342
1558
                                    client.name)
1343
1559
                        if self.server.use_dbus:
1354
1570
                        return
1355
1571
                    
1356
1572
                    #wait until timeout or approved
1357
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1358
1573
                    time = datetime.datetime.now()
1359
1574
                    client.changedstate.acquire()
1360
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1575
                    (client.changedstate.wait
 
1576
                     (float(client.timedelta_to_milliseconds(delay)
 
1577
                            / 1000)))
1361
1578
                    client.changedstate.release()
1362
1579
                    time2 = datetime.datetime.now()
1363
1580
                    if (time2 - time) >= delay:
1387
1604
                    sent_size += sent
1388
1605
                
1389
1606
                logger.info("Sending secret to %s", client.name)
1390
 
                # bump the timeout as if seen
 
1607
                # bump the timeout using extended_timeout
1391
1608
                client.checked_ok(client.extended_timeout)
1392
1609
                if self.server.use_dbus:
1393
1610
                    # Emit D-Bus signal
1461
1678
        # Convert the buffer to a Python bytestring
1462
1679
        fpr = ctypes.string_at(buf, buf_len.value)
1463
1680
        # Convert the bytestring to hexadecimal notation
1464
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1681
        hex_fpr = binascii.hexlify(fpr).upper()
1465
1682
        return hex_fpr
1466
1683
 
1467
1684
 
1470
1687
    def sub_process_main(self, request, address):
1471
1688
        try:
1472
1689
            self.finish_request(request, address)
1473
 
        except:
 
1690
        except Exception:
1474
1691
            self.handle_error(request, address)
1475
1692
        self.close_request(request)
1476
 
            
 
1693
    
1477
1694
    def process_request(self, request, address):
1478
1695
        """Start a new process to process the request."""
1479
 
        multiprocessing.Process(target = self.sub_process_main,
1480
 
                                args = (request, address)).start()
 
1696
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1697
                                       args = (request,
 
1698
                                               address))
 
1699
        proc.start()
 
1700
        return proc
1481
1701
 
1482
1702
 
1483
1703
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1489
1709
        """
1490
1710
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1491
1711
        
1492
 
        super(MultiprocessingMixInWithPipe,
1493
 
              self).process_request(request, client_address)
 
1712
        proc = MultiprocessingMixIn.process_request(self, request,
 
1713
                                                    client_address)
1494
1714
        self.child_pipe.close()
1495
 
        self.add_pipe(parent_pipe)
 
1715
        self.add_pipe(parent_pipe, proc)
1496
1716
    
1497
 
    def add_pipe(self, parent_pipe):
 
1717
    def add_pipe(self, parent_pipe, proc):
1498
1718
        """Dummy function; override as necessary"""
1499
1719
        raise NotImplementedError
1500
1720
 
1578
1798
        self.enabled = False
1579
1799
        self.clients = clients
1580
1800
        if self.clients is None:
1581
 
            self.clients = set()
 
1801
            self.clients = {}
1582
1802
        self.use_dbus = use_dbus
1583
1803
        self.gnutls_priority = gnutls_priority
1584
1804
        IPv6_TCPServer.__init__(self, server_address,
1588
1808
    def server_activate(self):
1589
1809
        if self.enabled:
1590
1810
            return socketserver.TCPServer.server_activate(self)
 
1811
    
1591
1812
    def enable(self):
1592
1813
        self.enabled = True
1593
 
    def add_pipe(self, parent_pipe):
 
1814
    
 
1815
    def add_pipe(self, parent_pipe, proc):
1594
1816
        # Call "handle_ipc" for both data and EOF events
1595
1817
        gobject.io_add_watch(parent_pipe.fileno(),
1596
1818
                             gobject.IO_IN | gobject.IO_HUP,
1597
1819
                             functools.partial(self.handle_ipc,
1598
 
                                               parent_pipe = parent_pipe))
1599
 
        
 
1820
                                               parent_pipe =
 
1821
                                               parent_pipe,
 
1822
                                               proc = proc))
 
1823
    
1600
1824
    def handle_ipc(self, source, condition, parent_pipe=None,
1601
 
                   client_object=None):
 
1825
                   proc = None, client_object=None):
1602
1826
        condition_names = {
1603
1827
            gobject.IO_IN: "IN",   # There is data to read.
1604
1828
            gobject.IO_OUT: "OUT", # Data can be written (without
1613
1837
                                       for cond, name in
1614
1838
                                       condition_names.iteritems()
1615
1839
                                       if cond & condition)
1616
 
        # error or the other end of multiprocessing.Pipe has closed
 
1840
        # error, or the other end of multiprocessing.Pipe has closed
1617
1841
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1842
            # Wait for other process to exit
 
1843
            proc.join()
1618
1844
            return False
1619
1845
        
1620
1846
        # Read a request from the child
1625
1851
            fpr = request[1]
1626
1852
            address = request[2]
1627
1853
            
1628
 
            for c in self.clients:
 
1854
            for c in self.clients.itervalues():
1629
1855
                if c.fingerprint == fpr:
1630
1856
                    client = c
1631
1857
                    break
1634
1860
                            "dress: %s", fpr, address)
1635
1861
                if self.use_dbus:
1636
1862
                    # Emit D-Bus signal
1637
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1863
                    mandos_dbus_service.ClientNotFound(fpr,
 
1864
                                                       address[0])
1638
1865
                parent_pipe.send(False)
1639
1866
                return False
1640
1867
            
1641
1868
            gobject.io_add_watch(parent_pipe.fileno(),
1642
1869
                                 gobject.IO_IN | gobject.IO_HUP,
1643
1870
                                 functools.partial(self.handle_ipc,
1644
 
                                                   parent_pipe = parent_pipe,
1645
 
                                                   client_object = client))
 
1871
                                                   parent_pipe =
 
1872
                                                   parent_pipe,
 
1873
                                                   proc = proc,
 
1874
                                                   client_object =
 
1875
                                                   client))
1646
1876
            parent_pipe.send(True)
1647
 
            # remove the old hook in favor of the new above hook on same fileno
 
1877
            # remove the old hook in favor of the new above hook on
 
1878
            # same fileno
1648
1879
            return False
1649
1880
        if command == 'funcall':
1650
1881
            funcname = request[1]
1651
1882
            args = request[2]
1652
1883
            kwargs = request[3]
1653
1884
            
1654
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1885
            parent_pipe.send(('data', getattr(client_object,
 
1886
                                              funcname)(*args,
 
1887
                                                         **kwargs)))
1655
1888
        
1656
1889
        if command == 'getattr':
1657
1890
            attrname = request[1]
1658
1891
            if callable(client_object.__getattribute__(attrname)):
1659
1892
                parent_pipe.send(('function',))
1660
1893
            else:
1661
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1894
                parent_pipe.send(('data', client_object
 
1895
                                  .__getattribute__(attrname)))
1662
1896
        
1663
1897
        if command == 'setattr':
1664
1898
            attrname = request[1]
1707
1941
    return timevalue
1708
1942
 
1709
1943
 
1710
 
def if_nametoindex(interface):
1711
 
    """Call the C function if_nametoindex(), or equivalent
1712
 
    
1713
 
    Note: This function cannot accept a unicode string."""
1714
 
    global if_nametoindex
1715
 
    try:
1716
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1717
 
                          (ctypes.util.find_library("c"))
1718
 
                          .if_nametoindex)
1719
 
    except (OSError, AttributeError):
1720
 
        logger.warning("Doing if_nametoindex the hard way")
1721
 
        def if_nametoindex(interface):
1722
 
            "Get an interface index the hard way, i.e. using fcntl()"
1723
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1724
 
            with contextlib.closing(socket.socket()) as s:
1725
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1726
 
                                    struct.pack(str("16s16x"),
1727
 
                                                interface))
1728
 
            interface_index = struct.unpack(str("I"),
1729
 
                                            ifreq[16:20])[0]
1730
 
            return interface_index
1731
 
    return if_nametoindex(interface)
1732
 
 
1733
 
 
1734
1944
def daemon(nochdir = False, noclose = False):
1735
1945
    """See daemon(3).  Standard BSD Unix function.
1736
1946
    
1791
2001
                        " system bus interface")
1792
2002
    parser.add_argument("--no-ipv6", action="store_false",
1793
2003
                        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
    
1794
2010
    options = parser.parse_args()
1795
2011
    
1796
2012
    if options.check:
1809
2025
                        "use_dbus": "True",
1810
2026
                        "use_ipv6": "True",
1811
2027
                        "debuglevel": "",
 
2028
                        "restore": "True",
 
2029
                        "statedir": "/var/lib/mandos"
1812
2030
                        }
1813
2031
    
1814
2032
    # Parse config file for server-global settings
1831
2049
    # options, if set.
1832
2050
    for option in ("interface", "address", "port", "debug",
1833
2051
                   "priority", "servicename", "configdir",
1834
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2052
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2053
                   "statedir"):
1835
2054
        value = getattr(options, option)
1836
2055
        if value is not None:
1837
2056
            server_settings[option] = value
1849
2068
    debuglevel = server_settings["debuglevel"]
1850
2069
    use_dbus = server_settings["use_dbus"]
1851
2070
    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)
1852
2082
    
1853
2083
    if server_settings["servicename"] != "Mandos":
1854
2084
        syslogger.setFormatter(logging.Formatter
1857
2087
                                % server_settings["servicename"]))
1858
2088
    
1859
2089
    # Parse config file with clients
1860
 
    client_defaults = { "timeout": "5m",
1861
 
                        "extended_timeout": "15m",
1862
 
                        "interval": "2m",
1863
 
                        "checker": "fping -q -- %%(host)s",
1864
 
                        "host": "",
1865
 
                        "approval_delay": "0s",
1866
 
                        "approval_duration": "1s",
1867
 
                        }
1868
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2090
    client_config = configparser.SafeConfigParser(Client
 
2091
                                                  .client_defaults)
1869
2092
    client_config.read(os.path.join(server_settings["configdir"],
1870
2093
                                    "clients.conf"))
1871
2094
    
1909
2132
        if error[0] != errno.EPERM:
1910
2133
            raise error
1911
2134
    
1912
 
    if not debug and not debuglevel:
1913
 
        syslogger.setLevel(logging.WARNING)
1914
 
        console.setLevel(logging.WARNING)
1915
 
    if debuglevel:
1916
 
        level = getattr(logging, debuglevel.upper())
1917
 
        syslogger.setLevel(level)
1918
 
        console.setLevel(level)
1919
 
    
1920
2135
    if debug:
1921
2136
        # Enable all possible GnuTLS debugging
1922
2137
        
1936
2151
        os.dup2(null, sys.stdin.fileno())
1937
2152
        if null > 2:
1938
2153
            os.close(null)
1939
 
    else:
1940
 
        # No console logging
1941
 
        logger.removeHandler(console)
1942
2154
    
1943
2155
    # Need to fork before connecting to D-Bus
1944
2156
    if not debug:
1945
2157
        # Close all input and output, do double fork, etc.
1946
2158
        daemon()
1947
2159
    
 
2160
    gobject.threads_init()
 
2161
    
1948
2162
    global main_loop
1949
2163
    # From the Avahi example code
1950
2164
    DBusGMainLoop(set_as_default=True )
1953
2167
    # End of Avahi example code
1954
2168
    if use_dbus:
1955
2169
        try:
1956
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1957
 
                                            bus, do_not_queue=True)
1958
 
            bus_name2 = dbus.service.BusName("se.recompile.Mandos",
1959
 
                                            bus, do_not_queue=True)
 
2170
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2171
                                            bus, do_not_queue=True)
 
2172
            old_bus_name = (dbus.service.BusName
 
2173
                            ("se.bsnet.fukt.Mandos", bus,
 
2174
                             do_not_queue=True))
1960
2175
        except dbus.exceptions.NameExistsException as e:
1961
2176
            logger.error(unicode(e) + ", disabling D-Bus")
1962
2177
            use_dbus = False
1963
2178
            server_settings["use_dbus"] = False
1964
2179
            tcp_server.use_dbus = False
1965
2180
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1966
 
    service = AvahiService(name = server_settings["servicename"],
1967
 
                           servicetype = "_mandos._tcp",
1968
 
                           protocol = protocol, bus = bus)
 
2181
    service = AvahiServiceToSyslog(name =
 
2182
                                   server_settings["servicename"],
 
2183
                                   servicetype = "_mandos._tcp",
 
2184
                                   protocol = protocol, bus = bus)
1969
2185
    if server_settings["interface"]:
1970
2186
        service.interface = (if_nametoindex
1971
2187
                             (str(server_settings["interface"])))
1975
2191
    
1976
2192
    client_class = Client
1977
2193
    if use_dbus:
1978
 
        client_class = functools.partial(ClientDBus, bus = bus)
1979
 
    def client_config_items(config, section):
1980
 
        special_settings = {
1981
 
            "approved_by_default":
1982
 
                lambda: config.getboolean(section,
1983
 
                                          "approved_by_default"),
1984
 
            }
1985
 
        for name, value in config.items(section):
 
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))
1986
2263
            try:
1987
 
                yield (name, special_settings[name]())
1988
 
            except KeyError:
1989
 
                yield (name, value)
1990
 
    
1991
 
    tcp_server.clients.update(set(
1992
 
            client_class(name = section,
1993
 
                         config= dict(client_config_items(
1994
 
                        client_config, section)))
1995
 
            for section in client_config.sections()))
 
2264
                client["secret"] = (
 
2265
                    pgp.decrypt(client["encrypted_secret"],
 
2266
                                client_settings[client_name]
 
2267
                                ["secret"]))
 
2268
            except PGPError:
 
2269
                # If decryption fails, we use secret from new settings
 
2270
                logger.debug("Failed to decrypt {0} old secret"
 
2271
                             .format(client_name))
 
2272
                client["secret"] = (
 
2273
                    client_settings[client_name]["secret"])
 
2274
 
 
2275
    
 
2276
    # Add/remove clients based on new changes made to config
 
2277
    for client_name in (set(old_client_settings)
 
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
    
1996
2289
    if not tcp_server.clients:
1997
2290
        logger.warning("No clients defined")
1998
2291
        
2009
2302
            # "pidfile" was never created
2010
2303
            pass
2011
2304
        del pidfilename
2012
 
        
2013
2305
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2014
2306
    
2015
2307
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2020
2312
            """A D-Bus proxy object"""
2021
2313
            def __init__(self):
2022
2314
                dbus.service.Object.__init__(self, bus, "/")
2023
 
            _interface = "se.bsnet.fukt.Mandos"
 
2315
            _interface = "se.recompile.Mandos"
2024
2316
            
2025
2317
            @dbus.service.signal(_interface, signature="o")
2026
2318
            def ClientAdded(self, objpath):
2041
2333
            def GetAllClients(self):
2042
2334
                "D-Bus method"
2043
2335
                return dbus.Array(c.dbus_object_path
2044
 
                                  for c in tcp_server.clients)
 
2336
                                  for c in
 
2337
                                  tcp_server.clients.itervalues())
2045
2338
            
2046
2339
            @dbus.service.method(_interface,
2047
2340
                                 out_signature="a{oa{sv}}")
2049
2342
                "D-Bus method"
2050
2343
                return dbus.Dictionary(
2051
2344
                    ((c.dbus_object_path, c.GetAll(""))
2052
 
                     for c in tcp_server.clients),
 
2345
                     for c in tcp_server.clients.itervalues()),
2053
2346
                    signature="oa{sv}")
2054
2347
            
2055
2348
            @dbus.service.method(_interface, in_signature="o")
2056
2349
            def RemoveClient(self, object_path):
2057
2350
                "D-Bus method"
2058
 
                for c in tcp_server.clients:
 
2351
                for c in tcp_server.clients.itervalues():
2059
2352
                    if c.dbus_object_path == object_path:
2060
 
                        tcp_server.clients.remove(c)
 
2353
                        del tcp_server.clients[c.name]
2061
2354
                        c.remove_from_connection()
2062
2355
                        # Don't signal anything except ClientRemoved
2063
2356
                        c.disable(quiet=True)
2068
2361
            
2069
2362
            del _interface
2070
2363
        
2071
 
        mandos_dbus_service = MandosDBusService()
 
2364
        class MandosDBusServiceTransitional(MandosDBusService):
 
2365
            __metaclass__ = AlternateDBusNamesMetaclass
 
2366
        mandos_dbus_service = MandosDBusServiceTransitional()
2072
2367
    
2073
2368
    def cleanup():
2074
2369
        "Cleanup function; run on exit"
2075
2370
        service.cleanup()
2076
2371
        
 
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
2077
2425
        while tcp_server.clients:
2078
 
            client = tcp_server.clients.pop()
 
2426
            name, client = tcp_server.clients.popitem()
2079
2427
            if use_dbus:
2080
2428
                client.remove_from_connection()
2081
 
            client.disable_hook = None
2082
2429
            # Don't signal anything except ClientRemoved
2083
2430
            client.disable(quiet=True)
2084
2431
            if use_dbus:
2085
2432
                # Emit D-Bus signal
2086
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2433
                mandos_dbus_service.ClientRemoved(client
 
2434
                                                  .dbus_object_path,
2087
2435
                                                  client.name)
 
2436
        client_settings.clear()
2088
2437
    
2089
2438
    atexit.register(cleanup)
2090
2439
    
2091
 
    for client in tcp_server.clients:
 
2440
    for client in tcp_server.clients.itervalues():
2092
2441
        if use_dbus:
2093
2442
            # Emit D-Bus signal
2094
2443
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2095
 
        client.enable()
 
2444
        # Need to initiate checking of clients
 
2445
        if client.enabled:
 
2446
            client.init_checker()
2096
2447
    
2097
2448
    tcp_server.enable()
2098
2449
    tcp_server.server_activate()
2138
2489
    # Must run before the D-Bus bus name gets deregistered
2139
2490
    cleanup()
2140
2491
 
2141
 
 
2142
2492
if __name__ == '__main__':
2143
2493
    main()