/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

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,
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.5.0"
 
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(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
 
102
211
 
103
212
class AvahiError(Exception):
104
213
    def __init__(self, value, *args, **kwargs):
159
268
                            " after %i retries, exiting.",
160
269
                            self.rename_count)
161
270
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
163
273
        logger.info("Changing Zeroconf service name to %r ...",
164
274
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
275
        self.remove()
170
276
        try:
171
277
            self.add()
176
282
        self.rename_count += 1
177
283
    def remove(self):
178
284
        """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
285
        if self.entry_group_state_changed_match is not None:
187
286
            self.entry_group_state_changed_match.remove()
188
287
            self.entry_group_state_changed_match = None
 
288
        if self.group is not None:
 
289
            self.group.Reset()
189
290
    def add(self):
190
291
        """Derived from the Avahi example code"""
191
292
        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)
 
293
        if self.group is None:
 
294
            self.group = dbus.Interface(
 
295
                self.bus.get_object(avahi.DBUS_NAME,
 
296
                                    self.server.EntryGroupNew()),
 
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
298
        self.entry_group_state_changed_match = (
198
299
            self.group.connect_to_signal(
199
 
                'StateChanged', self .entry_group_state_changed))
 
300
                'StateChanged', self.entry_group_state_changed))
200
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
201
302
                     self.name, self.type)
202
303
        self.group.AddService(
224
325
                                  % unicode(error))
225
326
    def cleanup(self):
226
327
        """Derived from the Avahi example code"""
 
328
        if self.group is not None:
 
329
            try:
 
330
                self.group.Free()
 
331
            except (dbus.exceptions.UnknownMethodException,
 
332
                    dbus.exceptions.DBusException):
 
333
                pass
 
334
            self.group = None
227
335
        self.remove()
228
336
    def server_state_changed(self, state, error=None):
229
337
        """Derived from the Avahi example code"""
236
344
                       avahi.SERVER_FAILURE:
237
345
                           "Zeroconf server failure" }
238
346
        if state in bad_states:
239
 
            if bad_states[state]:
240
 
                logger.error(bad_states[state])
241
 
            self.remove()
 
347
            if bad_states[state] is not None:
 
348
                if error is None:
 
349
                    logger.error(bad_states[state])
 
350
                else:
 
351
                    logger.error(bad_states[state] + ": %r", error)
 
352
            self.cleanup()
242
353
        elif state == avahi.SERVER_RUNNING:
243
354
            self.add()
244
355
        else:
245
 
            logger.debug("Unknown state: %r", state)
 
356
            if error is None:
 
357
                logger.debug("Unknown state: %r", state)
 
358
            else:
 
359
                logger.debug("Unknown state: %r: %r", state, error)
246
360
    def activate(self):
247
361
        """Derived from the Avahi example code"""
248
362
        if self.server is None:
255
369
                                 self.server_state_changed)
256
370
        self.server_state_changed(self.server.GetState())
257
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
258
381
 
 
382
def timedelta_to_milliseconds(td):
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
            + (td.seconds * 1000)
 
386
            + (td.microseconds // 1000))
 
387
        
259
388
class Client(object):
260
389
    """A representation of a client host served by this server.
261
390
    
262
391
    Attributes:
263
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
264
393
    approval_delay: datetime.timedelta(); Time to wait for approval
265
394
    approval_duration: datetime.timedelta(); Duration of one approval
266
395
    checker:    subprocess.Popen(); a running checker process used
273
402
                     instance %(name)s can be used in the command.
274
403
    checker_initiator_tag: a gobject event source tag, or None
275
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
276
407
    current_checker_command: string; current running checker_command
277
 
    disable_hook:  If set, called by disable() as disable_hook(self)
278
408
    disable_initiator_tag: a gobject event source tag, or None
279
409
    enabled:    bool()
280
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
283
413
    interval:   datetime.timedelta(); How often to start a new checker
284
414
    last_approval_request: datetime.datetime(); (UTC) or None
285
415
    last_checked_ok: datetime.datetime(); (UTC) or None
286
 
    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
287
420
    name:       string; from the config file, used in log messages and
288
421
                        D-Bus identifiers
289
422
    secret:     bytestring; sent verbatim (over TLS) to client
290
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
291
424
                                      until this client is disabled
 
425
    extended_timeout:   extra long timeout when password has been sent
292
426
    runtime_expansions: Allowed attributes for runtime expansion.
 
427
    expires:    datetime.datetime(); time (UTC) when a client will be
 
428
                disabled, or None
293
429
    """
294
430
    
295
431
    runtime_expansions = ("approval_delay", "approval_duration",
296
432
                          "created", "enabled", "fingerprint",
297
433
                          "host", "interval", "last_checked_ok",
298
434
                          "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))
 
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
                        }
306
445
    
307
446
    def timeout_milliseconds(self):
308
447
        "Return the 'timeout' attribute in milliseconds"
309
 
        return self._timedelta_to_milliseconds(self.timeout)
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
 
450
    def extended_timeout_milliseconds(self):
 
451
        "Return the 'extended_timeout' attribute in milliseconds"
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
310
453
    
311
454
    def interval_milliseconds(self):
312
455
        "Return the 'interval' attribute in milliseconds"
313
 
        return self._timedelta_to_milliseconds(self.interval)
314
 
 
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
315
458
    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):
 
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):
319
510
        """Note: the 'checker' key in 'config' sets the
320
511
        'checker_command' attribute and *not* the 'checker'
321
512
        attribute."""
322
513
        self.name = name
323
 
        if config is None:
324
 
            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
       
325
528
        logger.debug("Creating client %r", self.name)
326
529
        # Uppercase and remove spaces from fingerprint for later
327
530
        # comparison purposes with return value from the fingerprint()
328
531
        # function
329
 
        self.fingerprint = (config["fingerprint"].upper()
330
 
                            .replace(" ", ""))
331
532
        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
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
351
537
        self.checker = None
352
538
        self.checker_initiator_tag = None
353
539
        self.disable_initiator_tag = None
354
540
        self.checker_callback_tag = None
355
 
        self.checker_command = config["checker"]
356
541
        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)
 
542
        self.approved = None
361
543
        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())
 
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)
367
558
    
 
559
    # Send notice to process children that client state has changed
368
560
    def send_changedstate(self):
369
 
        self.changedstate.acquire()
370
 
        self.changedstate.notify_all()
371
 
        self.changedstate.release()
372
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
373
564
    def enable(self):
374
565
        """Start this client's checker and timeout hooks"""
375
566
        if getattr(self, "enabled", False):
376
567
            # Already enabled
377
568
            return
378
569
        self.send_changedstate()
 
570
        self.expires = datetime.datetime.utcnow() + self.timeout
 
571
        self.enabled = True
379
572
        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()
 
573
        self.init_checker()
392
574
    
393
575
    def disable(self, quiet=True):
394
576
        """Disable this client."""
401
583
        if getattr(self, "disable_initiator_tag", False):
402
584
            gobject.source_remove(self.disable_initiator_tag)
403
585
            self.disable_initiator_tag = None
 
586
        self.expires = None
404
587
        if getattr(self, "checker_initiator_tag", False):
405
588
            gobject.source_remove(self.checker_initiator_tag)
406
589
            self.checker_initiator_tag = None
407
590
        self.stop_checker()
408
 
        if self.disable_hook:
409
 
            self.disable_hook(self)
410
591
        self.enabled = False
411
592
        # Do not run this again if called by a gobject.timeout_add
412
593
        return False
413
594
    
414
595
    def __del__(self):
415
 
        self.disable_hook = None
416
596
        self.disable()
417
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
    
418
611
    def checker_callback(self, pid, condition, command):
419
612
        """The checker has completed, so take appropriate actions."""
420
613
        self.checker_callback_tag = None
421
614
        self.checker = None
422
615
        if os.WIFEXITED(condition):
423
 
            exitstatus = os.WEXITSTATUS(condition)
424
 
            if exitstatus == 0:
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
425
618
                logger.info("Checker for %(name)s succeeded",
426
619
                            vars(self))
427
620
                self.checked_ok()
429
622
                logger.info("Checker for %(name)s failed",
430
623
                            vars(self))
431
624
        else:
 
625
            self.last_checker_status = -1
432
626
            logger.warning("Checker for %(name)s crashed?",
433
627
                           vars(self))
434
628
    
435
 
    def checked_ok(self):
 
629
    def checked_ok(self, timeout=None):
436
630
        """Bump up the timeout for this client.
437
631
        
438
632
        This should only be called when the client has been seen,
439
633
        alive and well.
440
634
        """
 
635
        if timeout is None:
 
636
            timeout = self.timeout
441
637
        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))
 
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
446
645
    
447
646
    def need_approval(self):
448
647
        self.last_approval_request = datetime.datetime.utcnow()
488
687
                                       'replace')))
489
688
                    for attr in
490
689
                    self.runtime_expansions)
491
 
 
 
690
                
492
691
                try:
493
692
                    command = self.checker_command % escaped_attrs
494
693
                except TypeError as error:
540
739
                raise
541
740
        self.checker = None
542
741
 
 
742
 
543
743
def dbus_service_property(dbus_interface, signature="v",
544
744
                          access="readwrite", byte_arrays=False):
545
745
    """Decorators for marking methods of a DBusObjectWithProperties to
591
791
 
592
792
class DBusObjectWithProperties(dbus.service.Object):
593
793
    """A D-Bus object with properties.
594
 
 
 
794
    
595
795
    Classes inheriting from this can use the dbus_service_property
596
796
    decorator to expose methods as D-Bus properties.  It exposes the
597
797
    standard Get(), Set(), and GetAll() methods on the D-Bus.
604
804
    def _get_all_dbus_properties(self):
605
805
        """Returns a generator of (name, attribute) pairs
606
806
        """
607
 
        return ((prop._dbus_name, prop)
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
808
                for cls in self.__class__.__mro__
608
809
                for name, prop in
609
 
                inspect.getmembers(self, self._is_dbus_property))
 
810
                inspect.getmembers(cls, self._is_dbus_property))
610
811
    
611
812
    def _get_dbus_property(self, interface_name, property_name):
612
813
        """Returns a bound method if one exists which is a D-Bus
613
814
        property with the specified name and interface.
614
815
        """
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
 
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)
 
822
        
625
823
        # No such property
626
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
825
                                   + interface_name + "."
652
850
            # signatures other than "ay".
653
851
            if prop._dbus_signature != "ay":
654
852
                raise ValueError
655
 
            value = dbus.ByteArray(''.join(unichr(byte)
656
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
657
855
        prop(value)
658
856
    
659
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
661
859
    def GetAll(self, interface_name):
662
860
        """Standard D-Bus property GetAll() method, see D-Bus
663
861
        standard.
664
 
 
 
862
        
665
863
        Note: Will not include properties with access="write".
666
864
        """
667
 
        all = {}
 
865
        properties = {}
668
866
        for name, prop in self._get_all_dbus_properties():
669
867
            if (interface_name
670
868
                and interface_name != prop._dbus_interface):
675
873
                continue
676
874
            value = prop()
677
875
            if not hasattr(value, "variant_level"):
678
 
                all[name] = value
 
876
                properties[name] = value
679
877
                continue
680
 
            all[name] = type(value)(value, variant_level=
681
 
                                    value.variant_level+1)
682
 
        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")
683
881
    
684
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
685
883
                         out_signature="s",
729
927
        return xmlstring
730
928
 
731
929
 
 
930
def datetime_to_dbus (dt, variant_level=0):
 
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
932
    if dt is None:
 
933
        return dbus.String("", variant_level = variant_level)
 
934
    return dbus.String(dt.isoformat(),
 
935
                       variant_level=variant_level)
 
936
 
 
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
    """
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
 
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
951
                # with the wrong interface name
 
952
                if (not hasattr(attribute, "_dbus_interface")
 
953
                    or not attribute._dbus_interface
 
954
                    .startswith("se.recompile.Mandos")):
 
955
                    continue
 
956
                # Create an alternate D-Bus interface name based on
 
957
                # the current name
 
958
                alt_interface = (attribute._dbus_interface
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
 
961
                # Is this a D-Bus signal?
 
962
                if getattr(attribute, "_dbus_is_signal", False):
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
 
965
                    nonmethod_func = (dict(
 
966
                            zip(attribute.func_code.co_freevars,
 
967
                                attribute.__closure__))["func"]
 
968
                                      .cell_contents)
 
969
                    # Create a new, but exactly alike, function
 
970
                    # object, and decorate it to be a new D-Bus signal
 
971
                    # with the alternate D-Bus interface name
 
972
                    new_function = (dbus.service.signal
 
973
                                    (alt_interface,
 
974
                                     attribute._dbus_signature)
 
975
                                    (types.FunctionType(
 
976
                                nonmethod_func.func_code,
 
977
                                nonmethod_func.func_globals,
 
978
                                nonmethod_func.func_name,
 
979
                                nonmethod_func.func_defaults,
 
980
                                nonmethod_func.func_closure)))
 
981
                    # Define a creator of a function to call both the
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
 
984
                    def fixscope(func1, func2):
 
985
                        """This function is a scope container to pass
 
986
                        func1 and func2 to the "call_both" function
 
987
                        outside of its arguments"""
 
988
                        def call_both(*args, **kwargs):
 
989
                            """This function will emit two D-Bus
 
990
                            signals by calling func1 and func2"""
 
991
                            func1(*args, **kwargs)
 
992
                            func2(*args, **kwargs)
 
993
                        return call_both
 
994
                    # Create the "call_both" function and add it to
 
995
                    # the class
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
 
998
                # Is this a D-Bus method?
 
999
                elif getattr(attribute, "_dbus_is_method", False):
 
1000
                    # Create a new, but exactly alike, function
 
1001
                    # object.  Decorate it to be a new D-Bus method
 
1002
                    # with the alternate D-Bus interface name.  Add it
 
1003
                    # to the class.
 
1004
                    attr[attrname] = (dbus.service.method
 
1005
                                      (alt_interface,
 
1006
                                       attribute._dbus_in_signature,
 
1007
                                       attribute._dbus_out_signature)
 
1008
                                      (types.FunctionType
 
1009
                                       (attribute.func_code,
 
1010
                                        attribute.func_globals,
 
1011
                                        attribute.func_name,
 
1012
                                        attribute.func_defaults,
 
1013
                                        attribute.func_closure)))
 
1014
                # Is this a D-Bus property?
 
1015
                elif getattr(attribute, "_dbus_is_property", False):
 
1016
                    # Create a new, but exactly alike, function
 
1017
                    # object, and decorate it to be a new D-Bus
 
1018
                    # property with the alternate D-Bus interface
 
1019
                    # name.  Add it to the class.
 
1020
                    attr[attrname] = (dbus_service_property
 
1021
                                      (alt_interface,
 
1022
                                       attribute._dbus_signature,
 
1023
                                       attribute._dbus_access,
 
1024
                                       attribute
 
1025
                                       ._dbus_get_args_options
 
1026
                                       ["byte_arrays"])
 
1027
                                      (types.FunctionType
 
1028
                                       (attribute.func_code,
 
1029
                                        attribute.func_globals,
 
1030
                                        attribute.func_name,
 
1031
                                        attribute.func_defaults,
 
1032
                                        attribute.func_closure)))
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
732
1036
class ClientDBus(Client, DBusObjectWithProperties):
733
1037
    """A Client class using D-Bus
734
1038
    
743
1047
    # dbus.service.Object doesn't use super(), so we can't either.
744
1048
    
745
1049
    def __init__(self, bus = None, *args, **kwargs):
746
 
        self._approvals_pending = 0
747
1050
        self.bus = bus
748
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
749
1055
        # Only now, when this client is initialized, can it show up on
750
1056
        # the D-Bus
751
1057
        client_object_name = unicode(self.name).translate(
756
1062
        DBusObjectWithProperties.__init__(self, self.bus,
757
1063
                                          self.dbus_object_path)
758
1064
        
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
 
1065
    def notifychangeproperty(transform_func,
 
1066
                             dbus_name, type_func=lambda x: x,
 
1067
                             variant_level=1):
 
1068
        """ Modify a variable so that it's a property which announces
 
1069
        its changes to DBus.
 
1070
        
 
1071
        transform_fun: Function that takes a value and a variant_level
 
1072
                       and transforms it to a D-Bus type.
 
1073
        dbus_name: D-Bus name of the variable
 
1074
        type_func: Function that transform the value before sending it
 
1075
                   to the D-Bus.  Default: no transform
 
1076
        variant_level: D-Bus variant level.  Default: 1
 
1077
        """
 
1078
        attrname = "_{0}".format(dbus_name)
 
1079
        def setter(self, value):
 
1080
            if hasattr(self, "dbus_object_path"):
 
1081
                if (not hasattr(self, attrname) or
 
1082
                    type_func(getattr(self, attrname, None))
 
1083
                    != type_func(value)):
 
1084
                    dbus_value = transform_func(type_func(value),
 
1085
                                                variant_level
 
1086
                                                =variant_level)
 
1087
                    self.PropertyChanged(dbus.String(dbus_name),
 
1088
                                         dbus_value)
 
1089
            setattr(self, attrname, value)
 
1090
        
 
1091
        return property(lambda self: getattr(self, attrname), setter)
 
1092
    
 
1093
    
 
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1096
                                             "ApprovalPending",
 
1097
                                             type_func = bool)
 
1098
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1099
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1100
                                        "LastEnabled")
 
1101
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1102
                                   type_func = lambda checker:
 
1103
                                       checker is not None)
 
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1105
                                           "LastCheckedOK")
 
1106
    last_approval_request = notifychangeproperty(
 
1107
        datetime_to_dbus, "LastApprovalRequest")
 
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1109
                                               "ApprovedByDefault")
 
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1111
                                          "ApprovalDelay",
 
1112
                                          type_func =
 
1113
                                          timedelta_to_milliseconds)
 
1114
    approval_duration = notifychangeproperty(
 
1115
        dbus.UInt64, "ApprovalDuration",
 
1116
        type_func = timedelta_to_milliseconds)
 
1117
    host = notifychangeproperty(dbus.String, "Host")
 
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1119
                                   type_func =
 
1120
                                   timedelta_to_milliseconds)
 
1121
    extended_timeout = notifychangeproperty(
 
1122
        dbus.UInt64, "ExtendedTimeout",
 
1123
        type_func = timedelta_to_milliseconds)
 
1124
    interval = notifychangeproperty(dbus.UInt64,
 
1125
                                    "Interval",
 
1126
                                    type_func =
 
1127
                                    timedelta_to_milliseconds)
 
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1129
    
 
1130
    del notifychangeproperty
802
1131
    
803
1132
    def __del__(self, *args, **kwargs):
804
1133
        try:
813
1142
                         *args, **kwargs):
814
1143
        self.checker_callback_tag = None
815
1144
        self.checker = None
816
 
        # Emit D-Bus signal
817
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
818
 
                             dbus.Boolean(False, variant_level=1))
819
1145
        if os.WIFEXITED(condition):
820
1146
            exitstatus = os.WEXITSTATUS(condition)
821
1147
            # Emit D-Bus signal
831
1157
        return Client.checker_callback(self, pid, condition, command,
832
1158
                                       *args, **kwargs)
833
1159
    
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
1160
    def start_checker(self, *args, **kwargs):
852
1161
        old_checker = self.checker
853
1162
        if self.checker is not None:
860
1169
            and old_checker_pid != self.checker.pid):
861
1170
            # Emit D-Bus signal
862
1171
            self.CheckerStarted(self.current_checker_command)
863
 
            self.PropertyChanged(
864
 
                dbus.String("CheckerRunning"),
865
 
                dbus.Boolean(True, variant_level=1))
866
1172
        return r
867
1173
    
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
1174
    def _reset_approved(self):
878
 
        self._approved = None
 
1175
        self.approved = None
879
1176
        return False
880
1177
    
881
1178
    def approve(self, value=True):
882
1179
        self.send_changedstate()
883
 
        self._approved = value
884
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1180
        self.approved = value
 
1181
        gobject.timeout_add(timedelta_to_milliseconds
885
1182
                            (self.approval_duration),
886
1183
                            self._reset_approved)
887
1184
    
888
1185
    
889
1186
    ## D-Bus methods, signals & properties
890
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1187
    _interface = "se.recompile.Mandos.Client"
891
1188
    
892
1189
    ## Signals
893
1190
    
930
1227
        "D-Bus signal"
931
1228
        return self.need_approval()
932
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
933
1238
    ## Methods
934
1239
    
935
1240
    # Approve - method
979
1284
        if value is None:       # get
980
1285
            return dbus.Boolean(self.approved_by_default)
981
1286
        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
1287
    
986
1288
    # ApprovalDelay - property
987
1289
    @dbus_service_property(_interface, signature="t",
990
1292
        if value is None:       # get
991
1293
            return dbus.UInt64(self.approval_delay_milliseconds())
992
1294
        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
1295
    
997
1296
    # ApprovalDuration - property
998
1297
    @dbus_service_property(_interface, signature="t",
999
1298
                           access="readwrite")
1000
1299
    def ApprovalDuration_dbus_property(self, value=None):
1001
1300
        if value is None:       # get
1002
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1301
            return dbus.UInt64(timedelta_to_milliseconds(
1003
1302
                    self.approval_duration))
1004
1303
        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
1304
    
1009
1305
    # Name - property
1010
1306
    @dbus_service_property(_interface, signature="s", access="read")
1022
1318
    def Host_dbus_property(self, value=None):
1023
1319
        if value is None:       # get
1024
1320
            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))
 
1321
        self.host = unicode(value)
1029
1322
    
1030
1323
    # Created - property
1031
1324
    @dbus_service_property(_interface, signature="s", access="read")
1032
1325
    def Created_dbus_property(self):
1033
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1326
        return datetime_to_dbus(self.created)
1034
1327
    
1035
1328
    # LastEnabled - property
1036
1329
    @dbus_service_property(_interface, signature="s", access="read")
1037
1330
    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))
 
1331
        return datetime_to_dbus(self.last_enabled)
1041
1332
    
1042
1333
    # Enabled - property
1043
1334
    @dbus_service_property(_interface, signature="b",
1057
1348
        if value is not None:
1058
1349
            self.checked_ok()
1059
1350
            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))
 
1351
        return datetime_to_dbus(self.last_checked_ok)
 
1352
    
 
1353
    # Expires - property
 
1354
    @dbus_service_property(_interface, signature="s", access="read")
 
1355
    def Expires_dbus_property(self):
 
1356
        return datetime_to_dbus(self.expires)
1064
1357
    
1065
1358
    # LastApprovalRequest - property
1066
1359
    @dbus_service_property(_interface, signature="s", access="read")
1067
1360
    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))
 
1361
        return datetime_to_dbus(self.last_approval_request)
1073
1362
    
1074
1363
    # Timeout - property
1075
1364
    @dbus_service_property(_interface, signature="t",
1078
1367
        if value is None:       # get
1079
1368
            return dbus.UInt64(self.timeout_milliseconds())
1080
1369
        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
 
        if getattr(self, "disable_initiator_tag", None) is None:
1085
 
            return
1086
1370
        # Reschedule timeout
1087
 
        gobject.source_remove(self.disable_initiator_tag)
1088
 
        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()))
1095
 
        if time_to_die <= 0:
1096
 
            # The timeout has passed
1097
 
            self.disable()
1098
 
        else:
1099
 
            self.disable_initiator_tag = (gobject.timeout_add
1100
 
                                          (time_to_die, self.disable))
 
1371
        if self.enabled:
 
1372
            now = datetime.datetime.utcnow()
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
 
1376
                # The timeout has passed
 
1377
                self.disable()
 
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
 
1382
                if (getattr(self, "disable_initiator_tag", None)
 
1383
                    is None):
 
1384
                    return
 
1385
                gobject.source_remove(self.disable_initiator_tag)
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
 
1389
    
 
1390
    # ExtendedTimeout - property
 
1391
    @dbus_service_property(_interface, signature="t",
 
1392
                           access="readwrite")
 
1393
    def ExtendedTimeout_dbus_property(self, value=None):
 
1394
        if value is None:       # get
 
1395
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1396
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1101
1397
    
1102
1398
    # Interval - property
1103
1399
    @dbus_service_property(_interface, signature="t",
1106
1402
        if value is None:       # get
1107
1403
            return dbus.UInt64(self.interval_milliseconds())
1108
1404
        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
1405
        if getattr(self, "checker_initiator_tag", None) is None:
1113
1406
            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
 
 
 
1407
        if self.enabled:
 
1408
            # Reschedule checker run
 
1409
            gobject.source_remove(self.checker_initiator_tag)
 
1410
            self.checker_initiator_tag = (gobject.timeout_add
 
1411
                                          (value, self.start_checker))
 
1412
            self.start_checker()    # Start one now, too
 
1413
    
1120
1414
    # Checker - property
1121
1415
    @dbus_service_property(_interface, signature="s",
1122
1416
                           access="readwrite")
1123
1417
    def Checker_dbus_property(self, value=None):
1124
1418
        if value is None:       # get
1125
1419
            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))
 
1420
        self.checker_command = unicode(value)
1131
1421
    
1132
1422
    # CheckerRunning - property
1133
1423
    @dbus_service_property(_interface, signature="b",
1160
1450
        self._pipe.send(('init', fpr, address))
1161
1451
        if not self._pipe.recv():
1162
1452
            raise KeyError()
1163
 
 
 
1453
    
1164
1454
    def __getattribute__(self, name):
1165
 
        if(name == '_pipe'):
 
1455
        if name == '_pipe':
1166
1456
            return super(ProxyClient, self).__getattribute__(name)
1167
1457
        self._pipe.send(('getattr', name))
1168
1458
        data = self._pipe.recv()
1173
1463
                self._pipe.send(('funcall', name, args, kwargs))
1174
1464
                return self._pipe.recv()[1]
1175
1465
            return func
1176
 
 
 
1466
    
1177
1467
    def __setattr__(self, name, value):
1178
 
        if(name == '_pipe'):
 
1468
        if name == '_pipe':
1179
1469
            return super(ProxyClient, self).__setattr__(name, value)
1180
1470
        self._pipe.send(('setattr', name, value))
1181
1471
 
1182
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1183
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1184
1478
    """A class to handle client connections.
1185
1479
    
1192
1486
                        unicode(self.client_address))
1193
1487
            logger.debug("Pipe FD: %d",
1194
1488
                         self.server.child_pipe.fileno())
1195
 
 
 
1489
            
1196
1490
            session = (gnutls.connection
1197
1491
                       .ClientSession(self.request,
1198
1492
                                      gnutls.connection
1199
1493
                                      .X509Credentials()))
1200
 
 
 
1494
            
1201
1495
            # Note: gnutls.connection.X509Credentials is really a
1202
1496
            # generic GnuTLS certificate credentials object so long as
1203
1497
            # no X.509 keys are added to it.  Therefore, we can use it
1204
1498
            # here despite using OpenPGP certificates.
1205
 
 
 
1499
            
1206
1500
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
1501
            #                      "+AES-256-CBC", "+SHA1",
1208
1502
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1214
1508
            (gnutls.library.functions
1215
1509
             .gnutls_priority_set_direct(session._c_object,
1216
1510
                                         priority, None))
1217
 
 
 
1511
            
1218
1512
            # Start communication using the Mandos protocol
1219
1513
            # Get protocol number
1220
1514
            line = self.request.makefile().readline()
1225
1519
            except (ValueError, IndexError, RuntimeError) as error:
1226
1520
                logger.error("Unknown protocol version: %s", error)
1227
1521
                return
1228
 
 
 
1522
            
1229
1523
            # Start GnuTLS connection
1230
1524
            try:
1231
1525
                session.handshake()
1235
1529
                # established.  Just abandon the request.
1236
1530
                return
1237
1531
            logger.debug("Handshake succeeded")
1238
 
 
 
1532
            
1239
1533
            approval_required = False
1240
1534
            try:
1241
1535
                try:
1246
1540
                    logger.warning("Bad certificate: %s", error)
1247
1541
                    return
1248
1542
                logger.debug("Fingerprint: %s", fpr)
1249
 
 
 
1543
                
1250
1544
                try:
1251
1545
                    client = ProxyClient(child_pipe, fpr,
1252
1546
                                         self.client_address)
1253
1547
                except KeyError:
1254
1548
                    return
1255
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1256
1554
                if client.approval_delay:
1257
1555
                    delay = client.approval_delay
1258
1556
                    client.approvals_pending += 1
1260
1558
                
1261
1559
                while True:
1262
1560
                    if not client.enabled:
1263
 
                        logger.warning("Client %s is disabled",
 
1561
                        logger.info("Client %s is disabled",
1264
1562
                                       client.name)
1265
1563
                        if self.server.use_dbus:
1266
1564
                            # Emit D-Bus signal
1267
 
                            client.Rejected("Disabled")                    
 
1565
                            client.Rejected("Disabled")
1268
1566
                        return
1269
1567
                    
1270
 
                    if client._approved or not client.approval_delay:
 
1568
                    if client.approved or not client.approval_delay:
1271
1569
                        #We are approved or approval is disabled
1272
1570
                        break
1273
 
                    elif client._approved is None:
 
1571
                    elif client.approved is None:
1274
1572
                        logger.info("Client %s needs approval",
1275
1573
                                    client.name)
1276
1574
                        if self.server.use_dbus:
1287
1585
                        return
1288
1586
                    
1289
1587
                    #wait until timeout or approved
1290
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1291
1588
                    time = datetime.datetime.now()
1292
1589
                    client.changedstate.acquire()
1293
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1294
1593
                    client.changedstate.release()
1295
1594
                    time2 = datetime.datetime.now()
1296
1595
                    if (time2 - time) >= delay:
1318
1617
                                 sent, len(client.secret)
1319
1618
                                 - (sent_size + sent))
1320
1619
                    sent_size += sent
1321
 
 
 
1620
                
1322
1621
                logger.info("Sending secret to %s", client.name)
1323
 
                # bump the timeout as if seen
1324
 
                client.checked_ok()
 
1622
                # bump the timeout using extended_timeout
 
1623
                client.checked_ok(client.extended_timeout)
1325
1624
                if self.server.use_dbus:
1326
1625
                    # Emit D-Bus signal
1327
1626
                    client.GotSecret()
1394
1693
        # Convert the buffer to a Python bytestring
1395
1694
        fpr = ctypes.string_at(buf, buf_len.value)
1396
1695
        # Convert the bytestring to hexadecimal notation
1397
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1696
        hex_fpr = binascii.hexlify(fpr).upper()
1398
1697
        return hex_fpr
1399
1698
 
1400
1699
 
1403
1702
    def sub_process_main(self, request, address):
1404
1703
        try:
1405
1704
            self.finish_request(request, address)
1406
 
        except:
 
1705
        except Exception:
1407
1706
            self.handle_error(request, address)
1408
1707
        self.close_request(request)
1409
 
            
 
1708
    
1410
1709
    def process_request(self, request, address):
1411
1710
        """Start a new process to process the request."""
1412
 
        multiprocessing.Process(target = self.sub_process_main,
1413
 
                                args = (request, address)).start()
 
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1712
                                       args = (request,
 
1713
                                               address))
 
1714
        proc.start()
 
1715
        return proc
 
1716
 
1414
1717
 
1415
1718
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1416
1719
    """ adds a pipe to the MixIn """
1420
1723
        This function creates a new pipe in self.pipe
1421
1724
        """
1422
1725
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1423
 
 
1424
 
        super(MultiprocessingMixInWithPipe,
1425
 
              self).process_request(request, client_address)
 
1726
        
 
1727
        proc = MultiprocessingMixIn.process_request(self, request,
 
1728
                                                    client_address)
1426
1729
        self.child_pipe.close()
1427
 
        self.add_pipe(parent_pipe)
1428
 
 
1429
 
    def add_pipe(self, parent_pipe):
 
1730
        self.add_pipe(parent_pipe, proc)
 
1731
    
 
1732
    def add_pipe(self, parent_pipe, proc):
1430
1733
        """Dummy function; override as necessary"""
1431
1734
        raise NotImplementedError
1432
1735
 
 
1736
 
1433
1737
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1434
1738
                     socketserver.TCPServer, object):
1435
1739
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1509
1813
        self.enabled = False
1510
1814
        self.clients = clients
1511
1815
        if self.clients is None:
1512
 
            self.clients = set()
 
1816
            self.clients = {}
1513
1817
        self.use_dbus = use_dbus
1514
1818
        self.gnutls_priority = gnutls_priority
1515
1819
        IPv6_TCPServer.__init__(self, server_address,
1519
1823
    def server_activate(self):
1520
1824
        if self.enabled:
1521
1825
            return socketserver.TCPServer.server_activate(self)
 
1826
    
1522
1827
    def enable(self):
1523
1828
        self.enabled = True
1524
 
    def add_pipe(self, parent_pipe):
 
1829
    
 
1830
    def add_pipe(self, parent_pipe, proc):
1525
1831
        # Call "handle_ipc" for both data and EOF events
1526
1832
        gobject.io_add_watch(parent_pipe.fileno(),
1527
1833
                             gobject.IO_IN | gobject.IO_HUP,
1528
1834
                             functools.partial(self.handle_ipc,
1529
 
                                               parent_pipe = parent_pipe))
1530
 
        
 
1835
                                               parent_pipe =
 
1836
                                               parent_pipe,
 
1837
                                               proc = proc))
 
1838
    
1531
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
1532
 
                   client_object=None):
 
1840
                   proc = None, client_object=None):
1533
1841
        condition_names = {
1534
1842
            gobject.IO_IN: "IN",   # There is data to read.
1535
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
1544
1852
                                       for cond, name in
1545
1853
                                       condition_names.iteritems()
1546
1854
                                       if cond & condition)
1547
 
        # error or the other end of multiprocessing.Pipe has closed
 
1855
        # error, or the other end of multiprocessing.Pipe has closed
1548
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1857
            # Wait for other process to exit
 
1858
            proc.join()
1549
1859
            return False
1550
1860
        
1551
1861
        # Read a request from the child
1556
1866
            fpr = request[1]
1557
1867
            address = request[2]
1558
1868
            
1559
 
            for c in self.clients:
 
1869
            for c in self.clients.itervalues():
1560
1870
                if c.fingerprint == fpr:
1561
1871
                    client = c
1562
1872
                    break
1563
1873
            else:
1564
 
                logger.warning("Client not found for fingerprint: %s, ad"
1565
 
                               "dress: %s", fpr, address)
 
1874
                logger.info("Client not found for fingerprint: %s, ad"
 
1875
                            "dress: %s", fpr, address)
1566
1876
                if self.use_dbus:
1567
1877
                    # Emit D-Bus signal
1568
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1878
                    mandos_dbus_service.ClientNotFound(fpr,
 
1879
                                                       address[0])
1569
1880
                parent_pipe.send(False)
1570
1881
                return False
1571
1882
            
1572
1883
            gobject.io_add_watch(parent_pipe.fileno(),
1573
1884
                                 gobject.IO_IN | gobject.IO_HUP,
1574
1885
                                 functools.partial(self.handle_ipc,
1575
 
                                                   parent_pipe = parent_pipe,
1576
 
                                                   client_object = client))
 
1886
                                                   parent_pipe =
 
1887
                                                   parent_pipe,
 
1888
                                                   proc = proc,
 
1889
                                                   client_object =
 
1890
                                                   client))
1577
1891
            parent_pipe.send(True)
1578
 
            # remove the old hook in favor of the new above hook on same fileno
 
1892
            # remove the old hook in favor of the new above hook on
 
1893
            # same fileno
1579
1894
            return False
1580
1895
        if command == 'funcall':
1581
1896
            funcname = request[1]
1582
1897
            args = request[2]
1583
1898
            kwargs = request[3]
1584
1899
            
1585
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1586
 
 
 
1900
            parent_pipe.send(('data', getattr(client_object,
 
1901
                                              funcname)(*args,
 
1902
                                                         **kwargs)))
 
1903
        
1587
1904
        if command == 'getattr':
1588
1905
            attrname = request[1]
1589
1906
            if callable(client_object.__getattribute__(attrname)):
1590
1907
                parent_pipe.send(('function',))
1591
1908
            else:
1592
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1909
                parent_pipe.send(('data', client_object
 
1910
                                  .__getattribute__(attrname)))
1593
1911
        
1594
1912
        if command == 'setattr':
1595
1913
            attrname = request[1]
1596
1914
            value = request[2]
1597
1915
            setattr(client_object, attrname, value)
1598
 
 
 
1916
        
1599
1917
        return True
1600
1918
 
1601
1919
 
1638
1956
    return timevalue
1639
1957
 
1640
1958
 
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
1959
def daemon(nochdir = False, noclose = False):
1666
1960
    """See daemon(3).  Standard BSD Unix function.
1667
1961
    
1722
2016
                        " system bus interface")
1723
2017
    parser.add_argument("--no-ipv6", action="store_false",
1724
2018
                        dest="use_ipv6", help="Do not use IPv6")
 
2019
    parser.add_argument("--no-restore", action="store_false",
 
2020
                        dest="restore", help="Do not restore stored"
 
2021
                        " state")
 
2022
    parser.add_argument("--statedir", metavar="DIR",
 
2023
                        help="Directory to save/restore state in")
 
2024
    
1725
2025
    options = parser.parse_args()
1726
2026
    
1727
2027
    if options.check:
1740
2040
                        "use_dbus": "True",
1741
2041
                        "use_ipv6": "True",
1742
2042
                        "debuglevel": "",
 
2043
                        "restore": "True",
 
2044
                        "statedir": "/var/lib/mandos"
1743
2045
                        }
1744
2046
    
1745
2047
    # Parse config file for server-global settings
1762
2064
    # options, if set.
1763
2065
    for option in ("interface", "address", "port", "debug",
1764
2066
                   "priority", "servicename", "configdir",
1765
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2068
                   "statedir"):
1766
2069
        value = getattr(options, option)
1767
2070
        if value is not None:
1768
2071
            server_settings[option] = value
1780
2083
    debuglevel = server_settings["debuglevel"]
1781
2084
    use_dbus = server_settings["use_dbus"]
1782
2085
    use_ipv6 = server_settings["use_ipv6"]
1783
 
 
 
2086
    stored_state_path = os.path.join(server_settings["statedir"],
 
2087
                                     stored_state_file)
 
2088
    
 
2089
    if debug:
 
2090
        initlogger(debug, logging.DEBUG)
 
2091
    else:
 
2092
        if not debuglevel:
 
2093
            initlogger(debug)
 
2094
        else:
 
2095
            level = getattr(logging, debuglevel.upper())
 
2096
            initlogger(debug, level)
 
2097
    
1784
2098
    if server_settings["servicename"] != "Mandos":
1785
2099
        syslogger.setFormatter(logging.Formatter
1786
2100
                               ('Mandos (%s) [%%(process)d]:'
1788
2102
                                % server_settings["servicename"]))
1789
2103
    
1790
2104
    # 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)
 
2105
    client_config = configparser.SafeConfigParser(Client
 
2106
                                                  .client_defaults)
1799
2107
    client_config.read(os.path.join(server_settings["configdir"],
1800
2108
                                    "clients.conf"))
1801
2109
    
1839
2147
        if error[0] != errno.EPERM:
1840
2148
            raise error
1841
2149
    
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
2150
    if debug:
1851
2151
        # Enable all possible GnuTLS debugging
1852
2152
        
1866
2166
        os.dup2(null, sys.stdin.fileno())
1867
2167
        if null > 2:
1868
2168
            os.close(null)
1869
 
    else:
1870
 
        # No console logging
1871
 
        logger.removeHandler(console)
1872
2169
    
1873
2170
    # Need to fork before connecting to D-Bus
1874
2171
    if not debug:
1875
2172
        # Close all input and output, do double fork, etc.
1876
2173
        daemon()
1877
2174
    
 
2175
    gobject.threads_init()
 
2176
    
1878
2177
    global main_loop
1879
2178
    # From the Avahi example code
1880
2179
    DBusGMainLoop(set_as_default=True )
1883
2182
    # End of Avahi example code
1884
2183
    if use_dbus:
1885
2184
        try:
1886
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2185
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1887
2186
                                            bus, do_not_queue=True)
 
2187
            old_bus_name = (dbus.service.BusName
 
2188
                            ("se.bsnet.fukt.Mandos", bus,
 
2189
                             do_not_queue=True))
1888
2190
        except dbus.exceptions.NameExistsException as e:
1889
2191
            logger.error(unicode(e) + ", disabling D-Bus")
1890
2192
            use_dbus = False
1891
2193
            server_settings["use_dbus"] = False
1892
2194
            tcp_server.use_dbus = False
1893
2195
    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)
 
2196
    service = AvahiServiceToSyslog(name =
 
2197
                                   server_settings["servicename"],
 
2198
                                   servicetype = "_mandos._tcp",
 
2199
                                   protocol = protocol, bus = bus)
1897
2200
    if server_settings["interface"]:
1898
2201
        service.interface = (if_nametoindex
1899
2202
                             (str(server_settings["interface"])))
1903
2206
    
1904
2207
    client_class = Client
1905
2208
    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):
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
 
2211
    
 
2212
    client_settings = Client.config_parser(client_config)
 
2213
    old_client_settings = {}
 
2214
    clients_data = {}
 
2215
    
 
2216
    # Get client data and settings from last running state.
 
2217
    if server_settings["restore"]:
 
2218
        try:
 
2219
            with open(stored_state_path, "rb") as stored_state:
 
2220
                clients_data, old_client_settings = (pickle.load
 
2221
                                                     (stored_state))
 
2222
            os.remove(stored_state_path)
 
2223
        except IOError as e:
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
 
2227
                raise
 
2228
        except EOFError as e:
 
2229
            logger.warning("Could not load persistent state: "
 
2230
                           "EOFError: {0}".format(e))
 
2231
    
 
2232
    with PGPEngine() as pgp:
 
2233
        for client_name, client in clients_data.iteritems():
 
2234
            # Decide which value to use after restoring saved state.
 
2235
            # We have three different values: Old config file,
 
2236
            # new config file, and saved state.
 
2237
            # New config value takes precedence if it differs from old
 
2238
            # config value, otherwise use saved state.
 
2239
            for name, value in client_settings[client_name].items():
 
2240
                try:
 
2241
                    # For each value in new config, check if it
 
2242
                    # differs from the old config value (Except for
 
2243
                    # the "secret" attribute)
 
2244
                    if (name != "secret" and
 
2245
                        value != old_client_settings[client_name]
 
2246
                        [name]):
 
2247
                        client[name] = value
 
2248
                except KeyError:
 
2249
                    pass
 
2250
            
 
2251
            # Clients who has passed its expire date can still be
 
2252
            # enabled if its last checker was successful.  Clients
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
 
2255
            if client["enabled"]:
 
2256
                if datetime.datetime.utcnow() >= client["expires"]:
 
2257
                    if not client["last_checked_ok"]:
 
2258
                        logger.warning(
 
2259
                            "disabling client {0} - Client never "
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
 
2262
                        client["enabled"] = False
 
2263
                    elif client["last_checker_status"] != 0:
 
2264
                        logger.warning(
 
2265
                            "disabling client {0} - Client "
 
2266
                            "last checker failed with error code {1}"
 
2267
                            .format(client["name"],
 
2268
                                    client["last_checker_status"]))
 
2269
                        client["enabled"] = False
 
2270
                    else:
 
2271
                        client["expires"] = (datetime.datetime
 
2272
                                             .utcnow()
 
2273
                                             + client["timeout"])
 
2274
                        logger.debug("Last checker succeeded,"
 
2275
                                     " keeping {0} enabled"
 
2276
                                     .format(client["name"]))
1914
2277
            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()))
 
2278
                client["secret"] = (
 
2279
                    pgp.decrypt(client["encrypted_secret"],
 
2280
                                client_settings[client_name]
 
2281
                                ["secret"]))
 
2282
            except PGPError:
 
2283
                # If decryption fails, we use secret from new settings
 
2284
                logger.debug("Failed to decrypt {0} old secret"
 
2285
                             .format(client_name))
 
2286
                client["secret"] = (
 
2287
                    client_settings[client_name]["secret"])
 
2288
 
 
2289
    
 
2290
    # Add/remove clients based on new changes made to config
 
2291
    for client_name in (set(old_client_settings)
 
2292
                        - set(client_settings)):
 
2293
        del clients_data[client_name]
 
2294
    for client_name in (set(client_settings)
 
2295
                        - set(old_client_settings)):
 
2296
        clients_data[client_name] = client_settings[client_name]
 
2297
 
 
2298
    # Create clients all clients
 
2299
    for client_name, client in clients_data.iteritems():
 
2300
        tcp_server.clients[client_name] = client_class(
 
2301
            name = client_name, settings = client)
 
2302
    
1924
2303
    if not tcp_server.clients:
1925
2304
        logger.warning("No clients defined")
1926
2305
        
1937
2316
            # "pidfile" was never created
1938
2317
            pass
1939
2318
        del pidfilename
1940
 
        
1941
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1942
 
 
 
2320
    
1943
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1944
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1945
2323
    
1948
2326
            """A D-Bus proxy object"""
1949
2327
            def __init__(self):
1950
2328
                dbus.service.Object.__init__(self, bus, "/")
1951
 
            _interface = "se.bsnet.fukt.Mandos"
 
2329
            _interface = "se.recompile.Mandos"
1952
2330
            
1953
2331
            @dbus.service.signal(_interface, signature="o")
1954
2332
            def ClientAdded(self, objpath):
1969
2347
            def GetAllClients(self):
1970
2348
                "D-Bus method"
1971
2349
                return dbus.Array(c.dbus_object_path
1972
 
                                  for c in tcp_server.clients)
 
2350
                                  for c in
 
2351
                                  tcp_server.clients.itervalues())
1973
2352
            
1974
2353
            @dbus.service.method(_interface,
1975
2354
                                 out_signature="a{oa{sv}}")
1977
2356
                "D-Bus method"
1978
2357
                return dbus.Dictionary(
1979
2358
                    ((c.dbus_object_path, c.GetAll(""))
1980
 
                     for c in tcp_server.clients),
 
2359
                     for c in tcp_server.clients.itervalues()),
1981
2360
                    signature="oa{sv}")
1982
2361
            
1983
2362
            @dbus.service.method(_interface, in_signature="o")
1984
2363
            def RemoveClient(self, object_path):
1985
2364
                "D-Bus method"
1986
 
                for c in tcp_server.clients:
 
2365
                for c in tcp_server.clients.itervalues():
1987
2366
                    if c.dbus_object_path == object_path:
1988
 
                        tcp_server.clients.remove(c)
 
2367
                        del tcp_server.clients[c.name]
1989
2368
                        c.remove_from_connection()
1990
2369
                        # Don't signal anything except ClientRemoved
1991
2370
                        c.disable(quiet=True)
1996
2375
            
1997
2376
            del _interface
1998
2377
        
1999
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2000
2381
    
2001
2382
    def cleanup():
2002
2383
        "Cleanup function; run on exit"
2003
2384
        service.cleanup()
2004
2385
        
 
2386
        multiprocessing.active_children()
 
2387
        if not (tcp_server.clients or client_settings):
 
2388
            return
 
2389
        
 
2390
        # Store client before exiting. Secrets are encrypted with key
 
2391
        # based on what config file has. If config file is
 
2392
        # removed/edited, old secret will thus be unrecovable.
 
2393
        clients = {}
 
2394
        with PGPEngine() as pgp:
 
2395
            for client in tcp_server.clients.itervalues():
 
2396
                key = client_settings[client.name]["secret"]
 
2397
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2398
                                                      key)
 
2399
                client_dict = {}
 
2400
                
 
2401
                # A list of attributes that can not be pickled
 
2402
                # + secret.
 
2403
                exclude = set(("bus", "changedstate", "secret",
 
2404
                               "checker"))
 
2405
                for name, typ in (inspect.getmembers
 
2406
                                  (dbus.service.Object)):
 
2407
                    exclude.add(name)
 
2408
                
 
2409
                client_dict["encrypted_secret"] = (client
 
2410
                                                   .encrypted_secret)
 
2411
                for attr in client.client_structure:
 
2412
                    if attr not in exclude:
 
2413
                        client_dict[attr] = getattr(client, attr)
 
2414
                
 
2415
                clients[client.name] = client_dict
 
2416
                del client_settings[client.name]["secret"]
 
2417
        
 
2418
        try:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
 
2424
                pickle.dump((clients, client_settings), stored_state)
 
2425
            os.rename(tempname, stored_state_path)
 
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
 
2429
            if not debug:
 
2430
                try:
 
2431
                    os.remove(tempname)
 
2432
                except NameError:
 
2433
                    pass
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
 
2436
                raise e
 
2437
        
 
2438
        # Delete all clients, and settings from config
2005
2439
        while tcp_server.clients:
2006
 
            client = tcp_server.clients.pop()
 
2440
            name, client = tcp_server.clients.popitem()
2007
2441
            if use_dbus:
2008
2442
                client.remove_from_connection()
2009
 
            client.disable_hook = None
2010
2443
            # Don't signal anything except ClientRemoved
2011
2444
            client.disable(quiet=True)
2012
2445
            if use_dbus:
2013
2446
                # Emit D-Bus signal
2014
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2447
                mandos_dbus_service.ClientRemoved(client
 
2448
                                                  .dbus_object_path,
2015
2449
                                                  client.name)
 
2450
        client_settings.clear()
2016
2451
    
2017
2452
    atexit.register(cleanup)
2018
2453
    
2019
 
    for client in tcp_server.clients:
 
2454
    for client in tcp_server.clients.itervalues():
2020
2455
        if use_dbus:
2021
2456
            # Emit D-Bus signal
2022
2457
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2023
 
        client.enable()
 
2458
        # Need to initiate checking of clients
 
2459
        if client.enabled:
 
2460
            client.init_checker()
2024
2461
    
2025
2462
    tcp_server.enable()
2026
2463
    tcp_server.server_activate()