/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
65
68
 
66
69
import dbus
67
70
import dbus.service
72
75
import ctypes.util
73
76
import xml.dom.minidom
74
77
import inspect
 
78
import GnuPGInterface
75
79
 
76
80
try:
77
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
85
    except ImportError:
82
86
        SO_BINDTODEVICE = None
83
87
 
84
 
 
85
 
version = "1.3.0"
86
 
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
88
version = "1.4.1"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
89
92
syslogger = (logging.handlers.SysLogHandler
90
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
94
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
95
 
 
96
try:
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
 
100
except (OSError, AttributeError):
 
101
    def if_nametoindex(interface):
 
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
        with contextlib.closing(socket.socket()) as s:
 
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
 
110
        return interface_index
 
111
 
 
112
 
 
113
def initlogger(level=logging.WARNING):
 
114
    """init logger and add loglevel"""
 
115
    
 
116
    syslogger.setFormatter(logging.Formatter
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
 
121
    console = logging.StreamHandler()
 
122
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
123
                                           ' [%(process)d]:'
 
124
                                           ' %(levelname)s:'
 
125
                                           ' %(message)s'))
 
126
    logger.addHandler(console)
 
127
    logger.setLevel(level)
 
128
 
 
129
 
 
130
class PGPError(Exception):
 
131
    """Exception if encryption/decryption fails"""
 
132
    pass
 
133
 
 
134
 
 
135
class PGPEngine(object):
 
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
137
    def __init__(self):
 
138
        self.gnupg = GnuPGInterface.GnuPG()
 
139
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
141
        self.gnupg.options.meta_interactive = False
 
142
        self.gnupg.options.homedir = self.tempdir
 
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
144
                                              '--quiet'])
 
145
    
 
146
    def __enter__(self):
 
147
        return self
 
148
    
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
 
150
        self._cleanup()
 
151
        return False
 
152
    
 
153
    def __del__(self):
 
154
        self._cleanup()
 
155
    
 
156
    def _cleanup(self):
 
157
        if self.tempdir is not None:
 
158
            # Delete contents of tempdir
 
159
            for root, dirs, files in os.walk(self.tempdir,
 
160
                                             topdown = False):
 
161
                for filename in files:
 
162
                    os.remove(os.path.join(root, filename))
 
163
                for dirname in dirs:
 
164
                    os.rmdir(os.path.join(root, dirname))
 
165
            # Remove tempdir
 
166
            os.rmdir(self.tempdir)
 
167
            self.tempdir = None
 
168
    
 
169
    def password_encode(self, password):
 
170
        # Passphrase can not be empty and can not contain newlines or
 
171
        # NUL bytes.  So we prefix it and hex encode it.
 
172
        return b"mandos" + binascii.hexlify(password)
 
173
    
 
174
    def encrypt(self, data, password):
 
175
        self.gnupg.passphrase = self.password_encode(password)
 
176
        with open(os.devnull) as devnull:
 
177
            try:
 
178
                proc = self.gnupg.run(['--symmetric'],
 
179
                                      create_fhs=['stdin', 'stdout'],
 
180
                                      attach_fhs={'stderr': devnull})
 
181
                with contextlib.closing(proc.handles['stdin']) as f:
 
182
                    f.write(data)
 
183
                with contextlib.closing(proc.handles['stdout']) as f:
 
184
                    ciphertext = f.read()
 
185
                proc.wait()
 
186
            except IOError as e:
 
187
                raise PGPError(e)
 
188
        self.gnupg.passphrase = None
 
189
        return ciphertext
 
190
    
 
191
    def decrypt(self, data, password):
 
192
        self.gnupg.passphrase = self.password_encode(password)
 
193
        with open(os.devnull) as devnull:
 
194
            try:
 
195
                proc = self.gnupg.run(['--decrypt'],
 
196
                                      create_fhs=['stdin', 'stdout'],
 
197
                                      attach_fhs={'stderr': devnull})
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
199
                    f.write(data)
 
200
                with contextlib.closing(proc.handles['stdout']) as f:
 
201
                    decrypted_plaintext = f.read()
 
202
                proc.wait()
 
203
            except IOError as e:
 
204
                raise PGPError(e)
 
205
        self.gnupg.passphrase = None
 
206
        return decrypted_plaintext
 
207
 
 
208
 
102
209
 
103
210
class AvahiError(Exception):
104
211
    def __init__(self, value, *args, **kwargs):
159
266
                            " after %i retries, exiting.",
160
267
                            self.rename_count)
161
268
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
269
        self.name = unicode(self.server
 
270
                            .GetAlternativeServiceName(self.name))
163
271
        logger.info("Changing Zeroconf service name to %r ...",
164
272
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
273
        self.remove()
170
274
        try:
171
275
            self.add()
176
280
        self.rename_count += 1
177
281
    def remove(self):
178
282
        """Derived from the Avahi example code"""
179
 
        if self.group is not None:
180
 
            try:
181
 
                self.group.Free()
182
 
            except (dbus.exceptions.UnknownMethodException,
183
 
                    dbus.exceptions.DBusException) as e:
184
 
                pass
185
 
            self.group = None
186
283
        if self.entry_group_state_changed_match is not None:
187
284
            self.entry_group_state_changed_match.remove()
188
285
            self.entry_group_state_changed_match = None
 
286
        if self.group is not None:
 
287
            self.group.Reset()
189
288
    def add(self):
190
289
        """Derived from the Avahi example code"""
191
290
        self.remove()
192
 
        self.group = dbus.Interface(
193
 
            self.bus.get_object(avahi.DBUS_NAME,
194
 
                                self.server.EntryGroupNew(),
195
 
                                follow_name_owner_changes=True),
196
 
            avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
291
        if self.group is None:
 
292
            self.group = dbus.Interface(
 
293
                self.bus.get_object(avahi.DBUS_NAME,
 
294
                                    self.server.EntryGroupNew()),
 
295
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
296
        self.entry_group_state_changed_match = (
198
297
            self.group.connect_to_signal(
199
 
                'StateChanged', self .entry_group_state_changed))
 
298
                'StateChanged', self.entry_group_state_changed))
200
299
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
201
300
                     self.name, self.type)
202
301
        self.group.AddService(
224
323
                                  % unicode(error))
225
324
    def cleanup(self):
226
325
        """Derived from the Avahi example code"""
 
326
        if self.group is not None:
 
327
            try:
 
328
                self.group.Free()
 
329
            except (dbus.exceptions.UnknownMethodException,
 
330
                    dbus.exceptions.DBusException):
 
331
                pass
 
332
            self.group = None
227
333
        self.remove()
228
334
    def server_state_changed(self, state, error=None):
229
335
        """Derived from the Avahi example code"""
236
342
                       avahi.SERVER_FAILURE:
237
343
                           "Zeroconf server failure" }
238
344
        if state in bad_states:
239
 
            if bad_states[state]:
240
 
                logger.error(bad_states[state])
241
 
            self.remove()
 
345
            if bad_states[state] is not None:
 
346
                if error is None:
 
347
                    logger.error(bad_states[state])
 
348
                else:
 
349
                    logger.error(bad_states[state] + ": %r", error)
 
350
            self.cleanup()
242
351
        elif state == avahi.SERVER_RUNNING:
243
352
            self.add()
244
353
        else:
245
 
            logger.debug("Unknown state: %r", state)
 
354
            if error is None:
 
355
                logger.debug("Unknown state: %r", state)
 
356
            else:
 
357
                logger.debug("Unknown state: %r: %r", state, error)
246
358
    def activate(self):
247
359
        """Derived from the Avahi example code"""
248
360
        if self.server is None:
255
367
                                 self.server_state_changed)
256
368
        self.server_state_changed(self.server.GetState())
257
369
 
 
370
class AvahiServiceToSyslog(AvahiService):
 
371
    def rename(self):
 
372
        """Add the new name to the syslog messages"""
 
373
        ret = AvahiService.rename(self)
 
374
        syslogger.setFormatter(logging.Formatter
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
 
378
        return ret
258
379
 
 
380
def timedelta_to_milliseconds(td):
 
381
    "Convert a datetime.timedelta() to milliseconds"
 
382
    return ((td.days * 24 * 60 * 60 * 1000)
 
383
            + (td.seconds * 1000)
 
384
            + (td.microseconds // 1000))
 
385
        
259
386
class Client(object):
260
387
    """A representation of a client host served by this server.
261
388
    
262
389
    Attributes:
263
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
390
    approved:   bool(); 'None' if not yet approved/disapproved
264
391
    approval_delay: datetime.timedelta(); Time to wait for approval
265
392
    approval_duration: datetime.timedelta(); Duration of one approval
266
393
    checker:    subprocess.Popen(); a running checker process used
273
400
                     instance %(name)s can be used in the command.
274
401
    checker_initiator_tag: a gobject event source tag, or None
275
402
    created:    datetime.datetime(); (UTC) object creation
 
403
    client_structure: Object describing what attributes a client has
 
404
                      and is used for storing the client at exit
276
405
    current_checker_command: string; current running checker_command
277
 
    disable_hook:  If set, called by disable() as disable_hook(self)
278
406
    disable_initiator_tag: a gobject event source tag, or None
279
407
    enabled:    bool()
280
408
    fingerprint: string (40 or 32 hexadecimal digits); used to
283
411
    interval:   datetime.timedelta(); How often to start a new checker
284
412
    last_approval_request: datetime.datetime(); (UTC) or None
285
413
    last_checked_ok: datetime.datetime(); (UTC) or None
286
 
    last_enabled: datetime.datetime(); (UTC)
 
414
    last_checker_status: integer between 0 and 255 reflecting exit
 
415
                         status of last checker. -1 reflects crashed
 
416
                         checker, or None.
 
417
    last_enabled: datetime.datetime(); (UTC) or None
287
418
    name:       string; from the config file, used in log messages and
288
419
                        D-Bus identifiers
289
420
    secret:     bytestring; sent verbatim (over TLS) to client
290
421
    timeout:    datetime.timedelta(); How long from last_checked_ok
291
422
                                      until this client is disabled
 
423
    extended_timeout:   extra long timeout when password has been sent
292
424
    runtime_expansions: Allowed attributes for runtime expansion.
 
425
    expires:    datetime.datetime(); time (UTC) when a client will be
 
426
                disabled, or None
293
427
    """
294
428
    
295
429
    runtime_expansions = ("approval_delay", "approval_duration",
296
430
                          "created", "enabled", "fingerprint",
297
431
                          "host", "interval", "last_checked_ok",
298
432
                          "last_enabled", "name", "timeout")
299
 
    
300
 
    @staticmethod
301
 
    def _timedelta_to_milliseconds(td):
302
 
        "Convert a datetime.timedelta() to milliseconds"
303
 
        return ((td.days * 24 * 60 * 60 * 1000)
304
 
                + (td.seconds * 1000)
305
 
                + (td.microseconds // 1000))
 
433
    client_defaults = { "timeout": "5m",
 
434
                        "extended_timeout": "15m",
 
435
                        "interval": "2m",
 
436
                        "checker": "fping -q -- %%(host)s",
 
437
                        "host": "",
 
438
                        "approval_delay": "0s",
 
439
                        "approval_duration": "1s",
 
440
                        "approved_by_default": "True",
 
441
                        "enabled": "True",
 
442
                        }
306
443
    
307
444
    def timeout_milliseconds(self):
308
445
        "Return the 'timeout' attribute in milliseconds"
309
 
        return self._timedelta_to_milliseconds(self.timeout)
 
446
        return timedelta_to_milliseconds(self.timeout)
 
447
    
 
448
    def extended_timeout_milliseconds(self):
 
449
        "Return the 'extended_timeout' attribute in milliseconds"
 
450
        return timedelta_to_milliseconds(self.extended_timeout)
310
451
    
311
452
    def interval_milliseconds(self):
312
453
        "Return the 'interval' attribute in milliseconds"
313
 
        return self._timedelta_to_milliseconds(self.interval)
314
 
 
 
454
        return timedelta_to_milliseconds(self.interval)
 
455
    
315
456
    def approval_delay_milliseconds(self):
316
 
        return self._timedelta_to_milliseconds(self.approval_delay)
317
 
    
318
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
457
        return timedelta_to_milliseconds(self.approval_delay)
 
458
 
 
459
    @staticmethod
 
460
    def config_parser(config):
 
461
        """ Construct a new dict of client settings of this form:
 
462
        { client_name: {setting_name: value, ...}, ...}
 
463
        with exceptions for any special settings as defined above"""
 
464
        settings = {}
 
465
        for client_name in config.sections():
 
466
            section = dict(config.items(client_name))
 
467
            client = settings[client_name] = {}
 
468
            
 
469
            client["host"] = section["host"]
 
470
            # Reformat values from string types to Python types
 
471
            client["approved_by_default"] = config.getboolean(
 
472
                client_name, "approved_by_default")
 
473
            client["enabled"] = config.getboolean(client_name, "enabled")
 
474
            
 
475
            client["fingerprint"] = (section["fingerprint"].upper()
 
476
                                     .replace(" ", ""))
 
477
            if "secret" in section:
 
478
                client["secret"] = section["secret"].decode("base64")
 
479
            elif "secfile" in section:
 
480
                with open(os.path.expanduser(os.path.expandvars
 
481
                                             (section["secfile"])),
 
482
                          "rb") as secfile:
 
483
                    client["secret"] = secfile.read()
 
484
            else:
 
485
                raise TypeError("No secret or secfile for section %s"
 
486
                                % section)
 
487
            client["timeout"] = string_to_delta(section["timeout"])
 
488
            client["extended_timeout"] = string_to_delta(
 
489
                section["extended_timeout"])
 
490
            client["interval"] = string_to_delta(section["interval"])
 
491
            client["approval_delay"] = string_to_delta(
 
492
                section["approval_delay"])
 
493
            client["approval_duration"] = string_to_delta(
 
494
                section["approval_duration"])
 
495
            client["checker_command"] = section["checker"]
 
496
            client["last_approval_request"] = None
 
497
            client["last_checked_ok"] = None
 
498
            client["last_checker_status"] = None
 
499
            if client["enabled"]:
 
500
                client["last_enabled"] = datetime.datetime.utcnow()
 
501
                client["expires"] = (datetime.datetime.utcnow()
 
502
                                     + client["timeout"])
 
503
            else:
 
504
                client["last_enabled"] = None
 
505
                client["expires"] = None
 
506
 
 
507
        return settings
 
508
        
 
509
        
 
510
    def __init__(self, settings, name = None):
319
511
        """Note: the 'checker' key in 'config' sets the
320
512
        'checker_command' attribute and *not* the 'checker'
321
513
        attribute."""
322
514
        self.name = name
323
 
        if config is None:
324
 
            config = {}
 
515
        # adding all client settings
 
516
        for setting, value in settings.iteritems():
 
517
            setattr(self, setting, value)
 
518
        
325
519
        logger.debug("Creating client %r", self.name)
326
520
        # Uppercase and remove spaces from fingerprint for later
327
521
        # comparison purposes with return value from the fingerprint()
328
522
        # function
329
 
        self.fingerprint = (config["fingerprint"].upper()
330
 
                            .replace(" ", ""))
331
523
        logger.debug("  Fingerprint: %s", self.fingerprint)
332
 
        if "secret" in config:
333
 
            self.secret = config["secret"].decode("base64")
334
 
        elif "secfile" in config:
335
 
            with open(os.path.expanduser(os.path.expandvars
336
 
                                         (config["secfile"])),
337
 
                      "rb") as secfile:
338
 
                self.secret = secfile.read()
339
 
        else:
340
 
            raise TypeError("No secret or secfile for client %s"
341
 
                            % self.name)
342
 
        self.host = config.get("host", "")
343
 
        self.created = datetime.datetime.utcnow()
344
 
        self.enabled = False
345
 
        self.last_approval_request = None
346
 
        self.last_enabled = None
347
 
        self.last_checked_ok = None
348
 
        self.timeout = string_to_delta(config["timeout"])
349
 
        self.interval = string_to_delta(config["interval"])
350
 
        self.disable_hook = disable_hook
 
524
        self.created = settings.get("created", datetime.datetime.utcnow())
 
525
 
 
526
        # attributes specific for this server instance
351
527
        self.checker = None
352
528
        self.checker_initiator_tag = None
353
529
        self.disable_initiator_tag = None
354
530
        self.checker_callback_tag = None
355
 
        self.checker_command = config["checker"]
356
531
        self.current_checker_command = None
357
 
        self.last_connect = None
358
 
        self._approved = None
359
 
        self.approved_by_default = config.get("approved_by_default",
360
 
                                              True)
 
532
        self.approved = None
361
533
        self.approvals_pending = 0
362
 
        self.approval_delay = string_to_delta(
363
 
            config["approval_delay"])
364
 
        self.approval_duration = string_to_delta(
365
 
            config["approval_duration"])
366
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
534
        self.changedstate = (multiprocessing_manager
 
535
                             .Condition(multiprocessing_manager
 
536
                                        .Lock()))
 
537
        self.client_structure = [attr for attr in
 
538
                                 self.__dict__.iterkeys()
 
539
                                 if not attr.startswith("_")]
 
540
        self.client_structure.append("client_structure")
 
541
        
 
542
        for name, t in inspect.getmembers(type(self),
 
543
                                          lambda obj:
 
544
                                              isinstance(obj,
 
545
                                                         property)):
 
546
            if not name.startswith("_"):
 
547
                self.client_structure.append(name)
367
548
    
 
549
    # Send notice to process children that client state has changed
368
550
    def send_changedstate(self):
369
 
        self.changedstate.acquire()
370
 
        self.changedstate.notify_all()
371
 
        self.changedstate.release()
372
 
        
 
551
        with self.changedstate:
 
552
            self.changedstate.notify_all()
 
553
    
373
554
    def enable(self):
374
555
        """Start this client's checker and timeout hooks"""
375
556
        if getattr(self, "enabled", False):
376
557
            # Already enabled
377
558
            return
378
559
        self.send_changedstate()
 
560
        self.expires = datetime.datetime.utcnow() + self.timeout
 
561
        self.enabled = True
379
562
        self.last_enabled = datetime.datetime.utcnow()
380
 
        # Schedule a new checker to be started an 'interval' from now,
381
 
        # and every interval from then on.
382
 
        self.checker_initiator_tag = (gobject.timeout_add
383
 
                                      (self.interval_milliseconds(),
384
 
                                       self.start_checker))
385
 
        # Schedule a disable() when 'timeout' has passed
386
 
        self.disable_initiator_tag = (gobject.timeout_add
387
 
                                   (self.timeout_milliseconds(),
388
 
                                    self.disable))
389
 
        self.enabled = True
390
 
        # Also start a new checker *right now*.
391
 
        self.start_checker()
 
563
        self.init_checker()
392
564
    
393
565
    def disable(self, quiet=True):
394
566
        """Disable this client."""
401
573
        if getattr(self, "disable_initiator_tag", False):
402
574
            gobject.source_remove(self.disable_initiator_tag)
403
575
            self.disable_initiator_tag = None
 
576
        self.expires = None
404
577
        if getattr(self, "checker_initiator_tag", False):
405
578
            gobject.source_remove(self.checker_initiator_tag)
406
579
            self.checker_initiator_tag = None
407
580
        self.stop_checker()
408
 
        if self.disable_hook:
409
 
            self.disable_hook(self)
410
581
        self.enabled = False
411
582
        # Do not run this again if called by a gobject.timeout_add
412
583
        return False
413
584
    
414
585
    def __del__(self):
415
 
        self.disable_hook = None
416
586
        self.disable()
417
587
    
 
588
    def init_checker(self):
 
589
        # Schedule a new checker to be started an 'interval' from now,
 
590
        # and every interval from then on.
 
591
        self.checker_initiator_tag = (gobject.timeout_add
 
592
                                      (self.interval_milliseconds(),
 
593
                                       self.start_checker))
 
594
        # Schedule a disable() when 'timeout' has passed
 
595
        self.disable_initiator_tag = (gobject.timeout_add
 
596
                                   (self.timeout_milliseconds(),
 
597
                                    self.disable))
 
598
        # Also start a new checker *right now*.
 
599
        self.start_checker()
 
600
    
418
601
    def checker_callback(self, pid, condition, command):
419
602
        """The checker has completed, so take appropriate actions."""
420
603
        self.checker_callback_tag = None
421
604
        self.checker = None
422
605
        if os.WIFEXITED(condition):
423
 
            exitstatus = os.WEXITSTATUS(condition)
424
 
            if exitstatus == 0:
 
606
            self.last_checker_status = os.WEXITSTATUS(condition)
 
607
            if self.last_checker_status == 0:
425
608
                logger.info("Checker for %(name)s succeeded",
426
609
                            vars(self))
427
610
                self.checked_ok()
429
612
                logger.info("Checker for %(name)s failed",
430
613
                            vars(self))
431
614
        else:
 
615
            self.last_checker_status = -1
432
616
            logger.warning("Checker for %(name)s crashed?",
433
617
                           vars(self))
434
618
    
435
 
    def checked_ok(self):
 
619
    def checked_ok(self, timeout=None):
436
620
        """Bump up the timeout for this client.
437
621
        
438
622
        This should only be called when the client has been seen,
439
623
        alive and well.
440
624
        """
 
625
        if timeout is None:
 
626
            timeout = self.timeout
441
627
        self.last_checked_ok = datetime.datetime.utcnow()
442
 
        gobject.source_remove(self.disable_initiator_tag)
443
 
        self.disable_initiator_tag = (gobject.timeout_add
444
 
                                      (self.timeout_milliseconds(),
445
 
                                       self.disable))
 
628
        if self.disable_initiator_tag is not None:
 
629
            gobject.source_remove(self.disable_initiator_tag)
 
630
        if getattr(self, "enabled", False):
 
631
            self.disable_initiator_tag = (gobject.timeout_add
 
632
                                          (timedelta_to_milliseconds
 
633
                                           (timeout), self.disable))
 
634
            self.expires = datetime.datetime.utcnow() + timeout
446
635
    
447
636
    def need_approval(self):
448
637
        self.last_approval_request = datetime.datetime.utcnow()
488
677
                                       'replace')))
489
678
                    for attr in
490
679
                    self.runtime_expansions)
491
 
 
 
680
                
492
681
                try:
493
682
                    command = self.checker_command % escaped_attrs
494
683
                except TypeError as error:
540
729
                raise
541
730
        self.checker = None
542
731
 
 
732
 
543
733
def dbus_service_property(dbus_interface, signature="v",
544
734
                          access="readwrite", byte_arrays=False):
545
735
    """Decorators for marking methods of a DBusObjectWithProperties to
591
781
 
592
782
class DBusObjectWithProperties(dbus.service.Object):
593
783
    """A D-Bus object with properties.
594
 
 
 
784
    
595
785
    Classes inheriting from this can use the dbus_service_property
596
786
    decorator to expose methods as D-Bus properties.  It exposes the
597
787
    standard Get(), Set(), and GetAll() methods on the D-Bus.
604
794
    def _get_all_dbus_properties(self):
605
795
        """Returns a generator of (name, attribute) pairs
606
796
        """
607
 
        return ((prop._dbus_name, prop)
 
797
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
798
                for cls in self.__class__.__mro__
608
799
                for name, prop in
609
 
                inspect.getmembers(self, self._is_dbus_property))
 
800
                inspect.getmembers(cls, self._is_dbus_property))
610
801
    
611
802
    def _get_dbus_property(self, interface_name, property_name):
612
803
        """Returns a bound method if one exists which is a D-Bus
613
804
        property with the specified name and interface.
614
805
        """
615
 
        for name in (property_name,
616
 
                     property_name + "_dbus_property"):
617
 
            prop = getattr(self, name, None)
618
 
            if (prop is None
619
 
                or not self._is_dbus_property(prop)
620
 
                or prop._dbus_name != property_name
621
 
                or (interface_name and prop._dbus_interface
622
 
                    and interface_name != prop._dbus_interface)):
623
 
                continue
624
 
            return prop
 
806
        for cls in  self.__class__.__mro__:
 
807
            for name, value in (inspect.getmembers
 
808
                                (cls, self._is_dbus_property)):
 
809
                if (value._dbus_name == property_name
 
810
                    and value._dbus_interface == interface_name):
 
811
                    return value.__get__(self)
 
812
        
625
813
        # No such property
626
814
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
815
                                   + interface_name + "."
661
849
    def GetAll(self, interface_name):
662
850
        """Standard D-Bus property GetAll() method, see D-Bus
663
851
        standard.
664
 
 
 
852
        
665
853
        Note: Will not include properties with access="write".
666
854
        """
667
 
        all = {}
 
855
        properties = {}
668
856
        for name, prop in self._get_all_dbus_properties():
669
857
            if (interface_name
670
858
                and interface_name != prop._dbus_interface):
675
863
                continue
676
864
            value = prop()
677
865
            if not hasattr(value, "variant_level"):
678
 
                all[name] = value
 
866
                properties[name] = value
679
867
                continue
680
 
            all[name] = type(value)(value, variant_level=
681
 
                                    value.variant_level+1)
682
 
        return dbus.Dictionary(all, signature="sv")
 
868
            properties[name] = type(value)(value, variant_level=
 
869
                                           value.variant_level+1)
 
870
        return dbus.Dictionary(properties, signature="sv")
683
871
    
684
872
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
685
873
                         out_signature="s",
729
917
        return xmlstring
730
918
 
731
919
 
 
920
def datetime_to_dbus (dt, variant_level=0):
 
921
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
922
    if dt is None:
 
923
        return dbus.String("", variant_level = variant_level)
 
924
    return dbus.String(dt.isoformat(),
 
925
                       variant_level=variant_level)
 
926
 
 
927
 
 
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
929
                                  .__metaclass__):
 
930
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
931
    will add additional D-Bus attributes matching a certain pattern.
 
932
    """
 
933
    def __new__(mcs, name, bases, attr):
 
934
        # Go through all the base classes which could have D-Bus
 
935
        # methods, signals, or properties in them
 
936
        for base in (b for b in bases
 
937
                     if issubclass(b, dbus.service.Object)):
 
938
            # Go though all attributes of the base class
 
939
            for attrname, attribute in inspect.getmembers(base):
 
940
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
941
                # with the wrong interface name
 
942
                if (not hasattr(attribute, "_dbus_interface")
 
943
                    or not attribute._dbus_interface
 
944
                    .startswith("se.recompile.Mandos")):
 
945
                    continue
 
946
                # Create an alternate D-Bus interface name based on
 
947
                # the current name
 
948
                alt_interface = (attribute._dbus_interface
 
949
                                 .replace("se.recompile.Mandos",
 
950
                                          "se.bsnet.fukt.Mandos"))
 
951
                # Is this a D-Bus signal?
 
952
                if getattr(attribute, "_dbus_is_signal", False):
 
953
                    # Extract the original non-method function by
 
954
                    # black magic
 
955
                    nonmethod_func = (dict(
 
956
                            zip(attribute.func_code.co_freevars,
 
957
                                attribute.__closure__))["func"]
 
958
                                      .cell_contents)
 
959
                    # Create a new, but exactly alike, function
 
960
                    # object, and decorate it to be a new D-Bus signal
 
961
                    # with the alternate D-Bus interface name
 
962
                    new_function = (dbus.service.signal
 
963
                                    (alt_interface,
 
964
                                     attribute._dbus_signature)
 
965
                                    (types.FunctionType(
 
966
                                nonmethod_func.func_code,
 
967
                                nonmethod_func.func_globals,
 
968
                                nonmethod_func.func_name,
 
969
                                nonmethod_func.func_defaults,
 
970
                                nonmethod_func.func_closure)))
 
971
                    # Define a creator of a function to call both the
 
972
                    # old and new functions, so both the old and new
 
973
                    # signals gets sent when the function is called
 
974
                    def fixscope(func1, func2):
 
975
                        """This function is a scope container to pass
 
976
                        func1 and func2 to the "call_both" function
 
977
                        outside of its arguments"""
 
978
                        def call_both(*args, **kwargs):
 
979
                            """This function will emit two D-Bus
 
980
                            signals by calling func1 and func2"""
 
981
                            func1(*args, **kwargs)
 
982
                            func2(*args, **kwargs)
 
983
                        return call_both
 
984
                    # Create the "call_both" function and add it to
 
985
                    # the class
 
986
                    attr[attrname] = fixscope(attribute,
 
987
                                              new_function)
 
988
                # Is this a D-Bus method?
 
989
                elif getattr(attribute, "_dbus_is_method", False):
 
990
                    # Create a new, but exactly alike, function
 
991
                    # object.  Decorate it to be a new D-Bus method
 
992
                    # with the alternate D-Bus interface name.  Add it
 
993
                    # to the class.
 
994
                    attr[attrname] = (dbus.service.method
 
995
                                      (alt_interface,
 
996
                                       attribute._dbus_in_signature,
 
997
                                       attribute._dbus_out_signature)
 
998
                                      (types.FunctionType
 
999
                                       (attribute.func_code,
 
1000
                                        attribute.func_globals,
 
1001
                                        attribute.func_name,
 
1002
                                        attribute.func_defaults,
 
1003
                                        attribute.func_closure)))
 
1004
                # Is this a D-Bus property?
 
1005
                elif getattr(attribute, "_dbus_is_property", False):
 
1006
                    # Create a new, but exactly alike, function
 
1007
                    # object, and decorate it to be a new D-Bus
 
1008
                    # property with the alternate D-Bus interface
 
1009
                    # name.  Add it to the class.
 
1010
                    attr[attrname] = (dbus_service_property
 
1011
                                      (alt_interface,
 
1012
                                       attribute._dbus_signature,
 
1013
                                       attribute._dbus_access,
 
1014
                                       attribute
 
1015
                                       ._dbus_get_args_options
 
1016
                                       ["byte_arrays"])
 
1017
                                      (types.FunctionType
 
1018
                                       (attribute.func_code,
 
1019
                                        attribute.func_globals,
 
1020
                                        attribute.func_name,
 
1021
                                        attribute.func_defaults,
 
1022
                                        attribute.func_closure)))
 
1023
        return type.__new__(mcs, name, bases, attr)
 
1024
 
 
1025
 
732
1026
class ClientDBus(Client, DBusObjectWithProperties):
733
1027
    """A Client class using D-Bus
734
1028
    
743
1037
    # dbus.service.Object doesn't use super(), so we can't either.
744
1038
    
745
1039
    def __init__(self, bus = None, *args, **kwargs):
746
 
        self._approvals_pending = 0
747
1040
        self.bus = bus
748
1041
        Client.__init__(self, *args, **kwargs)
 
1042
        self._approvals_pending = 0
 
1043
        
 
1044
        self._approvals_pending = 0
749
1045
        # Only now, when this client is initialized, can it show up on
750
1046
        # the D-Bus
751
1047
        client_object_name = unicode(self.name).translate(
756
1052
        DBusObjectWithProperties.__init__(self, self.bus,
757
1053
                                          self.dbus_object_path)
758
1054
        
759
 
    def _get_approvals_pending(self):
760
 
        return self._approvals_pending
761
 
    def _set_approvals_pending(self, value):
762
 
        old_value = self._approvals_pending
763
 
        self._approvals_pending = value
764
 
        bval = bool(value)
765
 
        if (hasattr(self, "dbus_object_path")
766
 
            and bval is not bool(old_value)):
767
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
768
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
769
 
                                 dbus_bool)
770
 
 
771
 
    approvals_pending = property(_get_approvals_pending,
772
 
                                 _set_approvals_pending)
773
 
    del _get_approvals_pending, _set_approvals_pending
774
 
    
775
 
    @staticmethod
776
 
    def _datetime_to_dbus(dt, variant_level=0):
777
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
778
 
        return dbus.String(dt.isoformat(),
779
 
                           variant_level=variant_level)
780
 
    
781
 
    def enable(self):
782
 
        oldstate = getattr(self, "enabled", False)
783
 
        r = Client.enable(self)
784
 
        if oldstate != self.enabled:
785
 
            # Emit D-Bus signals
786
 
            self.PropertyChanged(dbus.String("Enabled"),
787
 
                                 dbus.Boolean(True, variant_level=1))
788
 
            self.PropertyChanged(
789
 
                dbus.String("LastEnabled"),
790
 
                self._datetime_to_dbus(self.last_enabled,
791
 
                                       variant_level=1))
792
 
        return r
793
 
    
794
 
    def disable(self, quiet = False):
795
 
        oldstate = getattr(self, "enabled", False)
796
 
        r = Client.disable(self, quiet=quiet)
797
 
        if not quiet and oldstate != self.enabled:
798
 
            # Emit D-Bus signal
799
 
            self.PropertyChanged(dbus.String("Enabled"),
800
 
                                 dbus.Boolean(False, variant_level=1))
801
 
        return r
 
1055
    def notifychangeproperty(transform_func,
 
1056
                             dbus_name, type_func=lambda x: x,
 
1057
                             variant_level=1):
 
1058
        """ Modify a variable so that it's a property which announces
 
1059
        its changes to DBus.
 
1060
        
 
1061
        transform_fun: Function that takes a value and a variant_level
 
1062
                       and transforms it to a D-Bus type.
 
1063
        dbus_name: D-Bus name of the variable
 
1064
        type_func: Function that transform the value before sending it
 
1065
                   to the D-Bus.  Default: no transform
 
1066
        variant_level: D-Bus variant level.  Default: 1
 
1067
        """
 
1068
        attrname = "_{0}".format(dbus_name)
 
1069
        def setter(self, value):
 
1070
            if hasattr(self, "dbus_object_path"):
 
1071
                if (not hasattr(self, attrname) or
 
1072
                    type_func(getattr(self, attrname, None))
 
1073
                    != type_func(value)):
 
1074
                    dbus_value = transform_func(type_func(value),
 
1075
                                                variant_level
 
1076
                                                =variant_level)
 
1077
                    self.PropertyChanged(dbus.String(dbus_name),
 
1078
                                         dbus_value)
 
1079
            setattr(self, attrname, value)
 
1080
        
 
1081
        return property(lambda self: getattr(self, attrname), setter)
 
1082
    
 
1083
    
 
1084
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1085
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1086
                                             "ApprovalPending",
 
1087
                                             type_func = bool)
 
1088
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1089
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1090
                                        "LastEnabled")
 
1091
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1092
                                   type_func = lambda checker:
 
1093
                                       checker is not None)
 
1094
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1095
                                           "LastCheckedOK")
 
1096
    last_approval_request = notifychangeproperty(
 
1097
        datetime_to_dbus, "LastApprovalRequest")
 
1098
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1099
                                               "ApprovedByDefault")
 
1100
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1101
                                          "ApprovalDelay",
 
1102
                                          type_func =
 
1103
                                          timedelta_to_milliseconds)
 
1104
    approval_duration = notifychangeproperty(
 
1105
        dbus.UInt64, "ApprovalDuration",
 
1106
        type_func = timedelta_to_milliseconds)
 
1107
    host = notifychangeproperty(dbus.String, "Host")
 
1108
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1109
                                   type_func =
 
1110
                                   timedelta_to_milliseconds)
 
1111
    extended_timeout = notifychangeproperty(
 
1112
        dbus.UInt64, "ExtendedTimeout",
 
1113
        type_func = timedelta_to_milliseconds)
 
1114
    interval = notifychangeproperty(dbus.UInt64,
 
1115
                                    "Interval",
 
1116
                                    type_func =
 
1117
                                    timedelta_to_milliseconds)
 
1118
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1119
    
 
1120
    del notifychangeproperty
802
1121
    
803
1122
    def __del__(self, *args, **kwargs):
804
1123
        try:
813
1132
                         *args, **kwargs):
814
1133
        self.checker_callback_tag = None
815
1134
        self.checker = None
816
 
        # Emit D-Bus signal
817
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
818
 
                             dbus.Boolean(False, variant_level=1))
819
1135
        if os.WIFEXITED(condition):
820
1136
            exitstatus = os.WEXITSTATUS(condition)
821
1137
            # Emit D-Bus signal
831
1147
        return Client.checker_callback(self, pid, condition, command,
832
1148
                                       *args, **kwargs)
833
1149
    
834
 
    def checked_ok(self, *args, **kwargs):
835
 
        Client.checked_ok(self, *args, **kwargs)
836
 
        # Emit D-Bus signal
837
 
        self.PropertyChanged(
838
 
            dbus.String("LastCheckedOK"),
839
 
            (self._datetime_to_dbus(self.last_checked_ok,
840
 
                                    variant_level=1)))
841
 
    
842
 
    def need_approval(self, *args, **kwargs):
843
 
        r = Client.need_approval(self, *args, **kwargs)
844
 
        # Emit D-Bus signal
845
 
        self.PropertyChanged(
846
 
            dbus.String("LastApprovalRequest"),
847
 
            (self._datetime_to_dbus(self.last_approval_request,
848
 
                                    variant_level=1)))
849
 
        return r
850
 
    
851
1150
    def start_checker(self, *args, **kwargs):
852
1151
        old_checker = self.checker
853
1152
        if self.checker is not None:
860
1159
            and old_checker_pid != self.checker.pid):
861
1160
            # Emit D-Bus signal
862
1161
            self.CheckerStarted(self.current_checker_command)
863
 
            self.PropertyChanged(
864
 
                dbus.String("CheckerRunning"),
865
 
                dbus.Boolean(True, variant_level=1))
866
1162
        return r
867
1163
    
868
 
    def stop_checker(self, *args, **kwargs):
869
 
        old_checker = getattr(self, "checker", None)
870
 
        r = Client.stop_checker(self, *args, **kwargs)
871
 
        if (old_checker is not None
872
 
            and getattr(self, "checker", None) is None):
873
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
874
 
                                 dbus.Boolean(False, variant_level=1))
875
 
        return r
876
 
 
877
1164
    def _reset_approved(self):
878
 
        self._approved = None
 
1165
        self.approved = None
879
1166
        return False
880
1167
    
881
1168
    def approve(self, value=True):
882
1169
        self.send_changedstate()
883
 
        self._approved = value
884
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1170
        self.approved = value
 
1171
        gobject.timeout_add(timedelta_to_milliseconds
885
1172
                            (self.approval_duration),
886
1173
                            self._reset_approved)
887
1174
    
888
1175
    
889
1176
    ## D-Bus methods, signals & properties
890
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1177
    _interface = "se.recompile.Mandos.Client"
891
1178
    
892
1179
    ## Signals
893
1180
    
930
1217
        "D-Bus signal"
931
1218
        return self.need_approval()
932
1219
    
 
1220
    # NeRwequest - signal
 
1221
    @dbus.service.signal(_interface, signature="s")
 
1222
    def NewRequest(self, ip):
 
1223
        """D-Bus signal
 
1224
        Is sent after a client request a password.
 
1225
        """
 
1226
        pass
 
1227
    
933
1228
    ## Methods
934
1229
    
935
1230
    # Approve - method
979
1274
        if value is None:       # get
980
1275
            return dbus.Boolean(self.approved_by_default)
981
1276
        self.approved_by_default = bool(value)
982
 
        # Emit D-Bus signal
983
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
984
 
                             dbus.Boolean(value, variant_level=1))
985
1277
    
986
1278
    # ApprovalDelay - property
987
1279
    @dbus_service_property(_interface, signature="t",
990
1282
        if value is None:       # get
991
1283
            return dbus.UInt64(self.approval_delay_milliseconds())
992
1284
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
993
 
        # Emit D-Bus signal
994
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
995
 
                             dbus.UInt64(value, variant_level=1))
996
1285
    
997
1286
    # ApprovalDuration - property
998
1287
    @dbus_service_property(_interface, signature="t",
999
1288
                           access="readwrite")
1000
1289
    def ApprovalDuration_dbus_property(self, value=None):
1001
1290
        if value is None:       # get
1002
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1291
            return dbus.UInt64(timedelta_to_milliseconds(
1003
1292
                    self.approval_duration))
1004
1293
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1005
 
        # Emit D-Bus signal
1006
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
1007
 
                             dbus.UInt64(value, variant_level=1))
1008
1294
    
1009
1295
    # Name - property
1010
1296
    @dbus_service_property(_interface, signature="s", access="read")
1022
1308
    def Host_dbus_property(self, value=None):
1023
1309
        if value is None:       # get
1024
1310
            return dbus.String(self.host)
1025
 
        self.host = value
1026
 
        # Emit D-Bus signal
1027
 
        self.PropertyChanged(dbus.String("Host"),
1028
 
                             dbus.String(value, variant_level=1))
 
1311
        self.host = unicode(value)
1029
1312
    
1030
1313
    # Created - property
1031
1314
    @dbus_service_property(_interface, signature="s", access="read")
1032
1315
    def Created_dbus_property(self):
1033
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1316
        return datetime_to_dbus(self.created)
1034
1317
    
1035
1318
    # LastEnabled - property
1036
1319
    @dbus_service_property(_interface, signature="s", access="read")
1037
1320
    def LastEnabled_dbus_property(self):
1038
 
        if self.last_enabled is None:
1039
 
            return dbus.String("")
1040
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1321
        return datetime_to_dbus(self.last_enabled)
1041
1322
    
1042
1323
    # Enabled - property
1043
1324
    @dbus_service_property(_interface, signature="b",
1057
1338
        if value is not None:
1058
1339
            self.checked_ok()
1059
1340
            return
1060
 
        if self.last_checked_ok is None:
1061
 
            return dbus.String("")
1062
 
        return dbus.String(self._datetime_to_dbus(self
1063
 
                                                  .last_checked_ok))
 
1341
        return datetime_to_dbus(self.last_checked_ok)
 
1342
    
 
1343
    # Expires - property
 
1344
    @dbus_service_property(_interface, signature="s", access="read")
 
1345
    def Expires_dbus_property(self):
 
1346
        return datetime_to_dbus(self.expires)
1064
1347
    
1065
1348
    # LastApprovalRequest - property
1066
1349
    @dbus_service_property(_interface, signature="s", access="read")
1067
1350
    def LastApprovalRequest_dbus_property(self):
1068
 
        if self.last_approval_request is None:
1069
 
            return dbus.String("")
1070
 
        return dbus.String(self.
1071
 
                           _datetime_to_dbus(self
1072
 
                                             .last_approval_request))
 
1351
        return datetime_to_dbus(self.last_approval_request)
1073
1352
    
1074
1353
    # Timeout - property
1075
1354
    @dbus_service_property(_interface, signature="t",
1078
1357
        if value is None:       # get
1079
1358
            return dbus.UInt64(self.timeout_milliseconds())
1080
1359
        self.timeout = datetime.timedelta(0, 0, 0, value)
1081
 
        # Emit D-Bus signal
1082
 
        self.PropertyChanged(dbus.String("Timeout"),
1083
 
                             dbus.UInt64(value, variant_level=1))
1084
1360
        if getattr(self, "disable_initiator_tag", None) is None:
1085
1361
            return
1086
1362
        # Reschedule timeout
1087
1363
        gobject.source_remove(self.disable_initiator_tag)
1088
1364
        self.disable_initiator_tag = None
1089
 
        time_to_die = (self.
1090
 
                       _timedelta_to_milliseconds((self
1091
 
                                                   .last_checked_ok
1092
 
                                                   + self.timeout)
1093
 
                                                  - datetime.datetime
1094
 
                                                  .utcnow()))
 
1365
        self.expires = None
 
1366
        time_to_die = timedelta_to_milliseconds((self
 
1367
                                                 .last_checked_ok
 
1368
                                                 + self.timeout)
 
1369
                                                - datetime.datetime
 
1370
                                                .utcnow())
1095
1371
        if time_to_die <= 0:
1096
1372
            # The timeout has passed
1097
1373
            self.disable()
1098
1374
        else:
 
1375
            self.expires = (datetime.datetime.utcnow()
 
1376
                            + datetime.timedelta(milliseconds =
 
1377
                                                 time_to_die))
1099
1378
            self.disable_initiator_tag = (gobject.timeout_add
1100
1379
                                          (time_to_die, self.disable))
1101
1380
    
 
1381
    # ExtendedTimeout - property
 
1382
    @dbus_service_property(_interface, signature="t",
 
1383
                           access="readwrite")
 
1384
    def ExtendedTimeout_dbus_property(self, value=None):
 
1385
        if value is None:       # get
 
1386
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1387
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1388
    
1102
1389
    # Interval - property
1103
1390
    @dbus_service_property(_interface, signature="t",
1104
1391
                           access="readwrite")
1106
1393
        if value is None:       # get
1107
1394
            return dbus.UInt64(self.interval_milliseconds())
1108
1395
        self.interval = datetime.timedelta(0, 0, 0, value)
1109
 
        # Emit D-Bus signal
1110
 
        self.PropertyChanged(dbus.String("Interval"),
1111
 
                             dbus.UInt64(value, variant_level=1))
1112
1396
        if getattr(self, "checker_initiator_tag", None) is None:
1113
1397
            return
1114
 
        # Reschedule checker run
1115
 
        gobject.source_remove(self.checker_initiator_tag)
1116
 
        self.checker_initiator_tag = (gobject.timeout_add
1117
 
                                      (value, self.start_checker))
1118
 
        self.start_checker()    # Start one now, too
1119
 
 
 
1398
        if self.enabled:
 
1399
            # Reschedule checker run
 
1400
            gobject.source_remove(self.checker_initiator_tag)
 
1401
            self.checker_initiator_tag = (gobject.timeout_add
 
1402
                                          (value, self.start_checker))
 
1403
            self.start_checker()    # Start one now, too
 
1404
    
1120
1405
    # Checker - property
1121
1406
    @dbus_service_property(_interface, signature="s",
1122
1407
                           access="readwrite")
1123
1408
    def Checker_dbus_property(self, value=None):
1124
1409
        if value is None:       # get
1125
1410
            return dbus.String(self.checker_command)
1126
 
        self.checker_command = value
1127
 
        # Emit D-Bus signal
1128
 
        self.PropertyChanged(dbus.String("Checker"),
1129
 
                             dbus.String(self.checker_command,
1130
 
                                         variant_level=1))
 
1411
        self.checker_command = unicode(value)
1131
1412
    
1132
1413
    # CheckerRunning - property
1133
1414
    @dbus_service_property(_interface, signature="b",
1160
1441
        self._pipe.send(('init', fpr, address))
1161
1442
        if not self._pipe.recv():
1162
1443
            raise KeyError()
1163
 
 
 
1444
    
1164
1445
    def __getattribute__(self, name):
1165
 
        if(name == '_pipe'):
 
1446
        if name == '_pipe':
1166
1447
            return super(ProxyClient, self).__getattribute__(name)
1167
1448
        self._pipe.send(('getattr', name))
1168
1449
        data = self._pipe.recv()
1173
1454
                self._pipe.send(('funcall', name, args, kwargs))
1174
1455
                return self._pipe.recv()[1]
1175
1456
            return func
1176
 
 
 
1457
    
1177
1458
    def __setattr__(self, name, value):
1178
 
        if(name == '_pipe'):
 
1459
        if name == '_pipe':
1179
1460
            return super(ProxyClient, self).__setattr__(name, value)
1180
1461
        self._pipe.send(('setattr', name, value))
1181
1462
 
1182
1463
 
 
1464
class ClientDBusTransitional(ClientDBus):
 
1465
    __metaclass__ = AlternateDBusNamesMetaclass
 
1466
 
 
1467
 
1183
1468
class ClientHandler(socketserver.BaseRequestHandler, object):
1184
1469
    """A class to handle client connections.
1185
1470
    
1192
1477
                        unicode(self.client_address))
1193
1478
            logger.debug("Pipe FD: %d",
1194
1479
                         self.server.child_pipe.fileno())
1195
 
 
 
1480
            
1196
1481
            session = (gnutls.connection
1197
1482
                       .ClientSession(self.request,
1198
1483
                                      gnutls.connection
1199
1484
                                      .X509Credentials()))
1200
 
 
 
1485
            
1201
1486
            # Note: gnutls.connection.X509Credentials is really a
1202
1487
            # generic GnuTLS certificate credentials object so long as
1203
1488
            # no X.509 keys are added to it.  Therefore, we can use it
1204
1489
            # here despite using OpenPGP certificates.
1205
 
 
 
1490
            
1206
1491
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
1492
            #                      "+AES-256-CBC", "+SHA1",
1208
1493
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1214
1499
            (gnutls.library.functions
1215
1500
             .gnutls_priority_set_direct(session._c_object,
1216
1501
                                         priority, None))
1217
 
 
 
1502
            
1218
1503
            # Start communication using the Mandos protocol
1219
1504
            # Get protocol number
1220
1505
            line = self.request.makefile().readline()
1225
1510
            except (ValueError, IndexError, RuntimeError) as error:
1226
1511
                logger.error("Unknown protocol version: %s", error)
1227
1512
                return
1228
 
 
 
1513
            
1229
1514
            # Start GnuTLS connection
1230
1515
            try:
1231
1516
                session.handshake()
1235
1520
                # established.  Just abandon the request.
1236
1521
                return
1237
1522
            logger.debug("Handshake succeeded")
1238
 
 
 
1523
            
1239
1524
            approval_required = False
1240
1525
            try:
1241
1526
                try:
1246
1531
                    logger.warning("Bad certificate: %s", error)
1247
1532
                    return
1248
1533
                logger.debug("Fingerprint: %s", fpr)
1249
 
 
 
1534
                
1250
1535
                try:
1251
1536
                    client = ProxyClient(child_pipe, fpr,
1252
1537
                                         self.client_address)
1253
1538
                except KeyError:
1254
1539
                    return
1255
1540
                
 
1541
                if self.server.use_dbus:
 
1542
                    # Emit D-Bus signal
 
1543
                    client.NewRequest(str(self.client_address))
 
1544
                
1256
1545
                if client.approval_delay:
1257
1546
                    delay = client.approval_delay
1258
1547
                    client.approvals_pending += 1
1260
1549
                
1261
1550
                while True:
1262
1551
                    if not client.enabled:
1263
 
                        logger.warning("Client %s is disabled",
 
1552
                        logger.info("Client %s is disabled",
1264
1553
                                       client.name)
1265
1554
                        if self.server.use_dbus:
1266
1555
                            # Emit D-Bus signal
1267
 
                            client.Rejected("Disabled")                    
 
1556
                            client.Rejected("Disabled")
1268
1557
                        return
1269
1558
                    
1270
 
                    if client._approved or not client.approval_delay:
 
1559
                    if client.approved or not client.approval_delay:
1271
1560
                        #We are approved or approval is disabled
1272
1561
                        break
1273
 
                    elif client._approved is None:
 
1562
                    elif client.approved is None:
1274
1563
                        logger.info("Client %s needs approval",
1275
1564
                                    client.name)
1276
1565
                        if self.server.use_dbus:
1287
1576
                        return
1288
1577
                    
1289
1578
                    #wait until timeout or approved
1290
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1291
1579
                    time = datetime.datetime.now()
1292
1580
                    client.changedstate.acquire()
1293
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1581
                    (client.changedstate.wait
 
1582
                     (float(client.timedelta_to_milliseconds(delay)
 
1583
                            / 1000)))
1294
1584
                    client.changedstate.release()
1295
1585
                    time2 = datetime.datetime.now()
1296
1586
                    if (time2 - time) >= delay:
1318
1608
                                 sent, len(client.secret)
1319
1609
                                 - (sent_size + sent))
1320
1610
                    sent_size += sent
1321
 
 
 
1611
                
1322
1612
                logger.info("Sending secret to %s", client.name)
1323
 
                # bump the timeout as if seen
1324
 
                client.checked_ok()
 
1613
                # bump the timeout using extended_timeout
 
1614
                client.checked_ok(client.extended_timeout)
1325
1615
                if self.server.use_dbus:
1326
1616
                    # Emit D-Bus signal
1327
1617
                    client.GotSecret()
1394
1684
        # Convert the buffer to a Python bytestring
1395
1685
        fpr = ctypes.string_at(buf, buf_len.value)
1396
1686
        # Convert the bytestring to hexadecimal notation
1397
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1687
        hex_fpr = binascii.hexlify(fpr).upper()
1398
1688
        return hex_fpr
1399
1689
 
1400
1690
 
1403
1693
    def sub_process_main(self, request, address):
1404
1694
        try:
1405
1695
            self.finish_request(request, address)
1406
 
        except:
 
1696
        except Exception:
1407
1697
            self.handle_error(request, address)
1408
1698
        self.close_request(request)
1409
 
            
 
1699
    
1410
1700
    def process_request(self, request, address):
1411
1701
        """Start a new process to process the request."""
1412
 
        multiprocessing.Process(target = self.sub_process_main,
1413
 
                                args = (request, address)).start()
 
1702
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1703
                                       args = (request,
 
1704
                                               address))
 
1705
        proc.start()
 
1706
        return proc
 
1707
 
1414
1708
 
1415
1709
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1416
1710
    """ adds a pipe to the MixIn """
1420
1714
        This function creates a new pipe in self.pipe
1421
1715
        """
1422
1716
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1423
 
 
1424
 
        super(MultiprocessingMixInWithPipe,
1425
 
              self).process_request(request, client_address)
 
1717
        
 
1718
        proc = MultiprocessingMixIn.process_request(self, request,
 
1719
                                                    client_address)
1426
1720
        self.child_pipe.close()
1427
 
        self.add_pipe(parent_pipe)
1428
 
 
1429
 
    def add_pipe(self, parent_pipe):
 
1721
        self.add_pipe(parent_pipe, proc)
 
1722
    
 
1723
    def add_pipe(self, parent_pipe, proc):
1430
1724
        """Dummy function; override as necessary"""
1431
1725
        raise NotImplementedError
1432
1726
 
 
1727
 
1433
1728
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1434
1729
                     socketserver.TCPServer, object):
1435
1730
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1509
1804
        self.enabled = False
1510
1805
        self.clients = clients
1511
1806
        if self.clients is None:
1512
 
            self.clients = set()
 
1807
            self.clients = {}
1513
1808
        self.use_dbus = use_dbus
1514
1809
        self.gnutls_priority = gnutls_priority
1515
1810
        IPv6_TCPServer.__init__(self, server_address,
1519
1814
    def server_activate(self):
1520
1815
        if self.enabled:
1521
1816
            return socketserver.TCPServer.server_activate(self)
 
1817
    
1522
1818
    def enable(self):
1523
1819
        self.enabled = True
1524
 
    def add_pipe(self, parent_pipe):
 
1820
    
 
1821
    def add_pipe(self, parent_pipe, proc):
1525
1822
        # Call "handle_ipc" for both data and EOF events
1526
1823
        gobject.io_add_watch(parent_pipe.fileno(),
1527
1824
                             gobject.IO_IN | gobject.IO_HUP,
1528
1825
                             functools.partial(self.handle_ipc,
1529
 
                                               parent_pipe = parent_pipe))
1530
 
        
 
1826
                                               parent_pipe =
 
1827
                                               parent_pipe,
 
1828
                                               proc = proc))
 
1829
    
1531
1830
    def handle_ipc(self, source, condition, parent_pipe=None,
1532
 
                   client_object=None):
 
1831
                   proc = None, client_object=None):
1533
1832
        condition_names = {
1534
1833
            gobject.IO_IN: "IN",   # There is data to read.
1535
1834
            gobject.IO_OUT: "OUT", # Data can be written (without
1544
1843
                                       for cond, name in
1545
1844
                                       condition_names.iteritems()
1546
1845
                                       if cond & condition)
1547
 
        # error or the other end of multiprocessing.Pipe has closed
 
1846
        # error, or the other end of multiprocessing.Pipe has closed
1548
1847
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1848
            # Wait for other process to exit
 
1849
            proc.join()
1549
1850
            return False
1550
1851
        
1551
1852
        # Read a request from the child
1556
1857
            fpr = request[1]
1557
1858
            address = request[2]
1558
1859
            
1559
 
            for c in self.clients:
 
1860
            for c in self.clients.itervalues():
1560
1861
                if c.fingerprint == fpr:
1561
1862
                    client = c
1562
1863
                    break
1563
1864
            else:
1564
 
                logger.warning("Client not found for fingerprint: %s, ad"
1565
 
                               "dress: %s", fpr, address)
 
1865
                logger.info("Client not found for fingerprint: %s, ad"
 
1866
                            "dress: %s", fpr, address)
1566
1867
                if self.use_dbus:
1567
1868
                    # Emit D-Bus signal
1568
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1869
                    mandos_dbus_service.ClientNotFound(fpr,
 
1870
                                                       address[0])
1569
1871
                parent_pipe.send(False)
1570
1872
                return False
1571
1873
            
1572
1874
            gobject.io_add_watch(parent_pipe.fileno(),
1573
1875
                                 gobject.IO_IN | gobject.IO_HUP,
1574
1876
                                 functools.partial(self.handle_ipc,
1575
 
                                                   parent_pipe = parent_pipe,
1576
 
                                                   client_object = client))
 
1877
                                                   parent_pipe =
 
1878
                                                   parent_pipe,
 
1879
                                                   proc = proc,
 
1880
                                                   client_object =
 
1881
                                                   client))
1577
1882
            parent_pipe.send(True)
1578
 
            # remove the old hook in favor of the new above hook on same fileno
 
1883
            # remove the old hook in favor of the new above hook on
 
1884
            # same fileno
1579
1885
            return False
1580
1886
        if command == 'funcall':
1581
1887
            funcname = request[1]
1582
1888
            args = request[2]
1583
1889
            kwargs = request[3]
1584
1890
            
1585
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1586
 
 
 
1891
            parent_pipe.send(('data', getattr(client_object,
 
1892
                                              funcname)(*args,
 
1893
                                                         **kwargs)))
 
1894
        
1587
1895
        if command == 'getattr':
1588
1896
            attrname = request[1]
1589
1897
            if callable(client_object.__getattribute__(attrname)):
1590
1898
                parent_pipe.send(('function',))
1591
1899
            else:
1592
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1900
                parent_pipe.send(('data', client_object
 
1901
                                  .__getattribute__(attrname)))
1593
1902
        
1594
1903
        if command == 'setattr':
1595
1904
            attrname = request[1]
1596
1905
            value = request[2]
1597
1906
            setattr(client_object, attrname, value)
1598
 
 
 
1907
        
1599
1908
        return True
1600
1909
 
1601
1910
 
1638
1947
    return timevalue
1639
1948
 
1640
1949
 
1641
 
def if_nametoindex(interface):
1642
 
    """Call the C function if_nametoindex(), or equivalent
1643
 
    
1644
 
    Note: This function cannot accept a unicode string."""
1645
 
    global if_nametoindex
1646
 
    try:
1647
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1648
 
                          (ctypes.util.find_library("c"))
1649
 
                          .if_nametoindex)
1650
 
    except (OSError, AttributeError):
1651
 
        logger.warning("Doing if_nametoindex the hard way")
1652
 
        def if_nametoindex(interface):
1653
 
            "Get an interface index the hard way, i.e. using fcntl()"
1654
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1655
 
            with contextlib.closing(socket.socket()) as s:
1656
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1657
 
                                    struct.pack(str("16s16x"),
1658
 
                                                interface))
1659
 
            interface_index = struct.unpack(str("I"),
1660
 
                                            ifreq[16:20])[0]
1661
 
            return interface_index
1662
 
    return if_nametoindex(interface)
1663
 
 
1664
 
 
1665
1950
def daemon(nochdir = False, noclose = False):
1666
1951
    """See daemon(3).  Standard BSD Unix function.
1667
1952
    
1722
2007
                        " system bus interface")
1723
2008
    parser.add_argument("--no-ipv6", action="store_false",
1724
2009
                        dest="use_ipv6", help="Do not use IPv6")
 
2010
    parser.add_argument("--no-restore", action="store_false",
 
2011
                        dest="restore", help="Do not restore stored"
 
2012
                        " state")
 
2013
    parser.add_argument("--statedir", metavar="DIR",
 
2014
                        help="Directory to save/restore state in")
 
2015
    
1725
2016
    options = parser.parse_args()
1726
2017
    
1727
2018
    if options.check:
1740
2031
                        "use_dbus": "True",
1741
2032
                        "use_ipv6": "True",
1742
2033
                        "debuglevel": "",
 
2034
                        "restore": "True",
 
2035
                        "statedir": "/var/lib/mandos"
1743
2036
                        }
1744
2037
    
1745
2038
    # Parse config file for server-global settings
1762
2055
    # options, if set.
1763
2056
    for option in ("interface", "address", "port", "debug",
1764
2057
                   "priority", "servicename", "configdir",
1765
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2058
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2059
                   "statedir"):
1766
2060
        value = getattr(options, option)
1767
2061
        if value is not None:
1768
2062
            server_settings[option] = value
1780
2074
    debuglevel = server_settings["debuglevel"]
1781
2075
    use_dbus = server_settings["use_dbus"]
1782
2076
    use_ipv6 = server_settings["use_ipv6"]
1783
 
 
 
2077
    stored_state_path = os.path.join(server_settings["statedir"],
 
2078
                                     stored_state_file)
 
2079
    
 
2080
    if debug:
 
2081
        initlogger(logging.DEBUG)
 
2082
    else:
 
2083
        if not debuglevel:
 
2084
            initlogger()
 
2085
        else:
 
2086
            level = getattr(logging, debuglevel.upper())
 
2087
            initlogger(level)
 
2088
    
1784
2089
    if server_settings["servicename"] != "Mandos":
1785
2090
        syslogger.setFormatter(logging.Formatter
1786
2091
                               ('Mandos (%s) [%%(process)d]:'
1788
2093
                                % server_settings["servicename"]))
1789
2094
    
1790
2095
    # Parse config file with clients
1791
 
    client_defaults = { "timeout": "1h",
1792
 
                        "interval": "5m",
1793
 
                        "checker": "fping -q -- %%(host)s",
1794
 
                        "host": "",
1795
 
                        "approval_delay": "0s",
1796
 
                        "approval_duration": "1s",
1797
 
                        }
1798
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2096
    client_config = configparser.SafeConfigParser(Client.client_defaults)
1799
2097
    client_config.read(os.path.join(server_settings["configdir"],
1800
2098
                                    "clients.conf"))
1801
2099
    
1839
2137
        if error[0] != errno.EPERM:
1840
2138
            raise error
1841
2139
    
1842
 
    if not debug and not debuglevel:
1843
 
        syslogger.setLevel(logging.WARNING)
1844
 
        console.setLevel(logging.WARNING)
1845
 
    if debuglevel:
1846
 
        level = getattr(logging, debuglevel.upper())
1847
 
        syslogger.setLevel(level)
1848
 
        console.setLevel(level)
1849
 
 
1850
2140
    if debug:
1851
2141
        # Enable all possible GnuTLS debugging
1852
2142
        
1883
2173
    # End of Avahi example code
1884
2174
    if use_dbus:
1885
2175
        try:
1886
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1887
2177
                                            bus, do_not_queue=True)
 
2178
            old_bus_name = (dbus.service.BusName
 
2179
                            ("se.bsnet.fukt.Mandos", bus,
 
2180
                             do_not_queue=True))
1888
2181
        except dbus.exceptions.NameExistsException as e:
1889
2182
            logger.error(unicode(e) + ", disabling D-Bus")
1890
2183
            use_dbus = False
1891
2184
            server_settings["use_dbus"] = False
1892
2185
            tcp_server.use_dbus = False
1893
2186
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1894
 
    service = AvahiService(name = server_settings["servicename"],
1895
 
                           servicetype = "_mandos._tcp",
1896
 
                           protocol = protocol, bus = bus)
 
2187
    service = AvahiServiceToSyslog(name =
 
2188
                                   server_settings["servicename"],
 
2189
                                   servicetype = "_mandos._tcp",
 
2190
                                   protocol = protocol, bus = bus)
1897
2191
    if server_settings["interface"]:
1898
2192
        service.interface = (if_nametoindex
1899
2193
                             (str(server_settings["interface"])))
1903
2197
    
1904
2198
    client_class = Client
1905
2199
    if use_dbus:
1906
 
        client_class = functools.partial(ClientDBus, bus = bus)
1907
 
    def client_config_items(config, section):
1908
 
        special_settings = {
1909
 
            "approved_by_default":
1910
 
                lambda: config.getboolean(section,
1911
 
                                          "approved_by_default"),
1912
 
            }
1913
 
        for name, value in config.items(section):
 
2200
        client_class = functools.partial(ClientDBusTransitional,
 
2201
                                         bus = bus)
 
2202
    
 
2203
    client_settings = Client.config_parser(client_config)
 
2204
    old_client_settings = {}
 
2205
    clients_data = {}
 
2206
    
 
2207
    # Get client data and settings from last running state.
 
2208
    if server_settings["restore"]:
 
2209
        try:
 
2210
            with open(stored_state_path, "rb") as stored_state:
 
2211
                clients_data, old_client_settings = (pickle.load
 
2212
                                                     (stored_state))
 
2213
            os.remove(stored_state_path)
 
2214
        except IOError as e:
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
 
2218
                raise
 
2219
    
 
2220
    with PGPEngine() as pgp:
 
2221
        for client_name, client in clients_data.iteritems():
 
2222
            # Decide which value to use after restoring saved state.
 
2223
            # We have three different values: Old config file,
 
2224
            # new config file, and saved state.
 
2225
            # New config value takes precedence if it differs from old
 
2226
            # config value, otherwise use saved state.
 
2227
            for name, value in client_settings[client_name].items():
 
2228
                try:
 
2229
                    # For each value in new config, check if it
 
2230
                    # differs from the old config value (Except for
 
2231
                    # the "secret" attribute)
 
2232
                    if (name != "secret" and
 
2233
                        value != old_client_settings[client_name]
 
2234
                        [name]):
 
2235
                        client[name] = value
 
2236
                except KeyError:
 
2237
                    pass
 
2238
            
 
2239
            # Clients who has passed its expire date can still be
 
2240
            # enabled if its last checker was successful.  Clients
 
2241
            # whose checker failed before we stored its state is
 
2242
            # assumed to have failed all checkers during downtime.
 
2243
            if client["enabled"]:
 
2244
                if datetime.datetime.utcnow() >= client["expires"]:
 
2245
                    if not client["last_checked_ok"]:
 
2246
                        logger.warning(
 
2247
                            "disabling client {0} - Client never "
 
2248
                            "performed a successfull checker"
 
2249
                            .format(client["name"]))
 
2250
                        client["enabled"] = False
 
2251
                    elif client["last_checker_status"] != 0:
 
2252
                        logger.warning(
 
2253
                            "disabling client {0} - Client "
 
2254
                            "last checker failed with error code {1}"
 
2255
                            .format(client["name"],
 
2256
                                    client["last_checker_status"]))
 
2257
                        client["enabled"] = False
 
2258
                    else:
 
2259
                        client["expires"] = (datetime.datetime
 
2260
                                             .utcnow()
 
2261
                                             + client["timeout"])
 
2262
                    
1914
2263
            try:
1915
 
                yield (name, special_settings[name]())
1916
 
            except KeyError:
1917
 
                yield (name, value)
1918
 
    
1919
 
    tcp_server.clients.update(set(
1920
 
            client_class(name = section,
1921
 
                         config= dict(client_config_items(
1922
 
                        client_config, section)))
1923
 
            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) - set(client_settings):
 
2278
        del clients_data[client_name]
 
2279
    for client_name in set(client_settings) - set(old_client_settings):
 
2280
        clients_data[client_name] = client_settings[client_name]
 
2281
 
 
2282
    # Create clients all clients
 
2283
    for client_name, client in clients_data.iteritems():
 
2284
        tcp_server.clients[client_name] = client_class(
 
2285
            name = client_name, settings = client)
 
2286
    
1924
2287
    if not tcp_server.clients:
1925
2288
        logger.warning("No clients defined")
1926
2289
        
1937
2300
            # "pidfile" was never created
1938
2301
            pass
1939
2302
        del pidfilename
1940
 
        
1941
2303
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1942
 
 
 
2304
    
1943
2305
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1944
2306
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1945
2307
    
1948
2310
            """A D-Bus proxy object"""
1949
2311
            def __init__(self):
1950
2312
                dbus.service.Object.__init__(self, bus, "/")
1951
 
            _interface = "se.bsnet.fukt.Mandos"
 
2313
            _interface = "se.recompile.Mandos"
1952
2314
            
1953
2315
            @dbus.service.signal(_interface, signature="o")
1954
2316
            def ClientAdded(self, objpath):
1969
2331
            def GetAllClients(self):
1970
2332
                "D-Bus method"
1971
2333
                return dbus.Array(c.dbus_object_path
1972
 
                                  for c in tcp_server.clients)
 
2334
                                  for c in
 
2335
                                  tcp_server.clients.itervalues())
1973
2336
            
1974
2337
            @dbus.service.method(_interface,
1975
2338
                                 out_signature="a{oa{sv}}")
1977
2340
                "D-Bus method"
1978
2341
                return dbus.Dictionary(
1979
2342
                    ((c.dbus_object_path, c.GetAll(""))
1980
 
                     for c in tcp_server.clients),
 
2343
                     for c in tcp_server.clients.itervalues()),
1981
2344
                    signature="oa{sv}")
1982
2345
            
1983
2346
            @dbus.service.method(_interface, in_signature="o")
1984
2347
            def RemoveClient(self, object_path):
1985
2348
                "D-Bus method"
1986
 
                for c in tcp_server.clients:
 
2349
                for c in tcp_server.clients.itervalues():
1987
2350
                    if c.dbus_object_path == object_path:
1988
 
                        tcp_server.clients.remove(c)
 
2351
                        del tcp_server.clients[c.name]
1989
2352
                        c.remove_from_connection()
1990
2353
                        # Don't signal anything except ClientRemoved
1991
2354
                        c.disable(quiet=True)
1996
2359
            
1997
2360
            del _interface
1998
2361
        
1999
 
        mandos_dbus_service = MandosDBusService()
 
2362
        class MandosDBusServiceTransitional(MandosDBusService):
 
2363
            __metaclass__ = AlternateDBusNamesMetaclass
 
2364
        mandos_dbus_service = MandosDBusServiceTransitional()
2000
2365
    
2001
2366
    def cleanup():
2002
2367
        "Cleanup function; run on exit"
2003
2368
        service.cleanup()
2004
2369
        
 
2370
        multiprocessing.active_children()
 
2371
        if not (tcp_server.clients or client_settings):
 
2372
            return
 
2373
        
 
2374
        # Store client before exiting. Secrets are encrypted with key
 
2375
        # based on what config file has. If config file is
 
2376
        # removed/edited, old secret will thus be unrecovable.
 
2377
        clients = {}
 
2378
        with PGPEngine() as pgp:
 
2379
            for client in tcp_server.clients.itervalues():
 
2380
                key = client_settings[client.name]["secret"]
 
2381
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2382
                                                      key)
 
2383
                client_dict = {}
 
2384
                
 
2385
                # A list of attributes that can not be pickled
 
2386
                # + secret.
 
2387
                exclude = set(("bus", "changedstate", "secret",
 
2388
                               "checker"))
 
2389
                for name, typ in (inspect.getmembers
 
2390
                                  (dbus.service.Object)):
 
2391
                    exclude.add(name)
 
2392
                
 
2393
                client_dict["encrypted_secret"] = (client
 
2394
                                                   .encrypted_secret)
 
2395
                for attr in client.client_structure:
 
2396
                    if attr not in exclude:
 
2397
                        client_dict[attr] = getattr(client, attr)
 
2398
                
 
2399
                clients[client.name] = client_dict
 
2400
                del client_settings[client.name]["secret"]
 
2401
        
 
2402
        try:
 
2403
            with os.fdopen(os.open(stored_state_path,
 
2404
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2405
                                   0600), "wb") as stored_state:
 
2406
                pickle.dump((clients, client_settings), stored_state)
 
2407
        except (IOError, OSError) as e:
 
2408
            logger.warning("Could not save persistent state: {0}"
 
2409
                           .format(e))
 
2410
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2411
                raise
 
2412
        
 
2413
        # Delete all clients, and settings from config
2005
2414
        while tcp_server.clients:
2006
 
            client = tcp_server.clients.pop()
 
2415
            name, client = tcp_server.clients.popitem()
2007
2416
            if use_dbus:
2008
2417
                client.remove_from_connection()
2009
 
            client.disable_hook = None
2010
2418
            # Don't signal anything except ClientRemoved
2011
2419
            client.disable(quiet=True)
2012
2420
            if use_dbus:
2013
2421
                # Emit D-Bus signal
2014
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2422
                mandos_dbus_service.ClientRemoved(client
 
2423
                                                  .dbus_object_path,
2015
2424
                                                  client.name)
 
2425
        client_settings.clear()
2016
2426
    
2017
2427
    atexit.register(cleanup)
2018
2428
    
2019
 
    for client in tcp_server.clients:
 
2429
    for client in tcp_server.clients.itervalues():
2020
2430
        if use_dbus:
2021
2431
            # Emit D-Bus signal
2022
2432
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2023
 
        client.enable()
 
2433
        # Need to initiate checking of clients
 
2434
        if client.enabled:
 
2435
            client.init_checker()
2024
2436
    
2025
2437
    tcp_server.enable()
2026
2438
    tcp_server.server_activate()