/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-04-02 06:37:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers.  Also Changed to new
          "except x as y" exception syntax.
  (AvahiService.entry_group_state_changed_match): New; contains the
                                                  SignalMatch object.
  (AvahiService.remove): Really remove the group and the signal
                         connection, if any.
  (AvahiService.add): Always create a new group and signal connection.
  (AvahiService.cleanup): Changed to simply call remove().
  (AvahiService.server_state_changed): Handle and log more bad states.
  (AvahiService.activate): Set "follow_name_owner_changes=True" on the
                           Avahi Server proxy object.
  (ClientDBus.checked_ok): Do not return anything.
  (ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
65
 
69
66
import dbus
70
67
import dbus.service
75
72
import ctypes.util
76
73
import xml.dom.minidom
77
74
import inspect
78
 
import GnuPGInterface
79
75
 
80
76
try:
81
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
81
    except ImportError:
86
82
        SO_BINDTODEVICE = None
87
83
 
88
 
version = "1.5.2"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.0"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
92
89
syslogger = (logging.handlers.SysLogHandler
93
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
91
              address = str("/dev/log")))
95
 
 
96
 
try:
97
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
98
 
                      (ctypes.util.find_library("c"))
99
 
                      .if_nametoindex)
100
 
except (OSError, AttributeError):
101
 
    def if_nametoindex(interface):
102
 
        "Get an interface index the hard way, i.e. using fcntl()"
103
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
104
 
        with contextlib.closing(socket.socket()) as s:
105
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
 
                                struct.pack(str("16s16x"),
107
 
                                            interface))
108
 
        interface_index = struct.unpack(str("I"),
109
 
                                        ifreq[16:20])[0]
110
 
        return interface_index
111
 
 
112
 
 
113
 
def initlogger(debug, level=logging.WARNING):
114
 
    """init logger and add loglevel"""
115
 
    
116
 
    syslogger.setFormatter(logging.Formatter
117
 
                           ('Mandos [%(process)d]: %(levelname)s:'
118
 
                            ' %(message)s'))
119
 
    logger.addHandler(syslogger)
120
 
    
121
 
    if debug:
122
 
        console = logging.StreamHandler()
123
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
 
                                               ' [%(process)d]:'
125
 
                                               ' %(levelname)s:'
126
 
                                               ' %(message)s'))
127
 
        logger.addHandler(console)
128
 
    logger.setLevel(level)
129
 
 
130
 
 
131
 
class PGPError(Exception):
132
 
    """Exception if encryption/decryption fails"""
133
 
    pass
134
 
 
135
 
 
136
 
class PGPEngine(object):
137
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
138
 
    def __init__(self):
139
 
        self.gnupg = GnuPGInterface.GnuPG()
140
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
 
        self.gnupg = GnuPGInterface.GnuPG()
142
 
        self.gnupg.options.meta_interactive = False
143
 
        self.gnupg.options.homedir = self.tempdir
144
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
145
 
                                              '--quiet',
146
 
                                              '--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
 
 
 
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)
211
102
 
212
103
class AvahiError(Exception):
213
104
    def __init__(self, value, *args, **kwargs):
268
159
                            " after %i retries, exiting.",
269
160
                            self.rename_count)
270
161
            raise AvahiServiceError("Too many renames")
271
 
        self.name = unicode(self.server
272
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
273
163
        logger.info("Changing Zeroconf service name to %r ...",
274
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
275
169
        self.remove()
276
170
        try:
277
171
            self.add()
282
176
        self.rename_count += 1
283
177
    def remove(self):
284
178
        """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
285
186
        if self.entry_group_state_changed_match is not None:
286
187
            self.entry_group_state_changed_match.remove()
287
188
            self.entry_group_state_changed_match = None
288
 
        if self.group is not None:
289
 
            self.group.Reset()
290
189
    def add(self):
291
190
        """Derived from the Avahi example code"""
292
191
        self.remove()
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)
 
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)
298
197
        self.entry_group_state_changed_match = (
299
198
            self.group.connect_to_signal(
300
 
                'StateChanged', self.entry_group_state_changed))
 
199
                'StateChanged', self .entry_group_state_changed))
301
200
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
302
201
                     self.name, self.type)
303
202
        self.group.AddService(
325
224
                                  % unicode(error))
326
225
    def cleanup(self):
327
226
        """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
335
227
        self.remove()
336
228
    def server_state_changed(self, state, error=None):
337
229
        """Derived from the Avahi example code"""
344
236
                       avahi.SERVER_FAILURE:
345
237
                           "Zeroconf server failure" }
346
238
        if state in bad_states:
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()
 
239
            if bad_states[state]:
 
240
                logger.error(bad_states[state])
 
241
            self.remove()
353
242
        elif state == avahi.SERVER_RUNNING:
354
243
            self.add()
355
244
        else:
356
 
            if error is None:
357
 
                logger.debug("Unknown state: %r", state)
358
 
            else:
359
 
                logger.debug("Unknown state: %r: %r", state, error)
 
245
            logger.debug("Unknown state: %r", state)
360
246
    def activate(self):
361
247
        """Derived from the Avahi example code"""
362
248
        if self.server is None:
369
255
                                 self.server_state_changed)
370
256
        self.server_state_changed(self.server.GetState())
371
257
 
372
 
class AvahiServiceToSyslog(AvahiService):
373
 
    def rename(self):
374
 
        """Add the new name to the syslog messages"""
375
 
        ret = AvahiService.rename(self)
376
 
        syslogger.setFormatter(logging.Formatter
377
 
                               ('Mandos (%s) [%%(process)d]:'
378
 
                                ' %%(levelname)s: %%(message)s'
379
 
                                % self.name))
380
 
        return ret
381
258
 
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
 
        
388
259
class Client(object):
389
260
    """A representation of a client host served by this server.
390
261
    
391
262
    Attributes:
392
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
263
    _approved:   bool(); 'None' if not yet approved/disapproved
393
264
    approval_delay: datetime.timedelta(); Time to wait for approval
394
265
    approval_duration: datetime.timedelta(); Duration of one approval
395
266
    checker:    subprocess.Popen(); a running checker process used
402
273
                     instance %(name)s can be used in the command.
403
274
    checker_initiator_tag: a gobject event source tag, or None
404
275
    created:    datetime.datetime(); (UTC) object creation
405
 
    client_structure: Object describing what attributes a client has
406
 
                      and is used for storing the client at exit
407
276
    current_checker_command: string; current running checker_command
 
277
    disable_hook:  If set, called by disable() as disable_hook(self)
408
278
    disable_initiator_tag: a gobject event source tag, or None
409
279
    enabled:    bool()
410
280
    fingerprint: string (40 or 32 hexadecimal digits); used to
413
283
    interval:   datetime.timedelta(); How often to start a new checker
414
284
    last_approval_request: datetime.datetime(); (UTC) or None
415
285
    last_checked_ok: datetime.datetime(); (UTC) or None
416
 
    last_checker_status: integer between 0 and 255 reflecting exit
417
 
                         status of last checker. -1 reflects crashed
418
 
                         checker, -2 means no checker completed yet.
419
 
    last_enabled: datetime.datetime(); (UTC) or None
 
286
    last_enabled: datetime.datetime(); (UTC)
420
287
    name:       string; from the config file, used in log messages and
421
288
                        D-Bus identifiers
422
289
    secret:     bytestring; sent verbatim (over TLS) to client
423
290
    timeout:    datetime.timedelta(); How long from last_checked_ok
424
291
                                      until this client is disabled
425
 
    extended_timeout:   extra long timeout when secret has been sent
426
292
    runtime_expansions: Allowed attributes for runtime expansion.
427
 
    expires:    datetime.datetime(); time (UTC) when a client will be
428
 
                disabled, or None
429
293
    """
430
294
    
431
295
    runtime_expansions = ("approval_delay", "approval_duration",
432
296
                          "created", "enabled", "fingerprint",
433
297
                          "host", "interval", "last_checked_ok",
434
298
                          "last_enabled", "name", "timeout")
435
 
    client_defaults = { "timeout": "5m",
436
 
                        "extended_timeout": "15m",
437
 
                        "interval": "2m",
438
 
                        "checker": "fping -q -- %%(host)s",
439
 
                        "host": "",
440
 
                        "approval_delay": "0s",
441
 
                        "approval_duration": "1s",
442
 
                        "approved_by_default": "True",
443
 
                        "enabled": "True",
444
 
                        }
 
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))
445
306
    
446
307
    def timeout_milliseconds(self):
447
308
        "Return the 'timeout' attribute in milliseconds"
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)
 
309
        return self._timedelta_to_milliseconds(self.timeout)
453
310
    
454
311
    def interval_milliseconds(self):
455
312
        "Return the 'interval' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.interval)
457
 
    
 
313
        return self._timedelta_to_milliseconds(self.interval)
 
314
 
458
315
    def approval_delay_milliseconds(self):
459
 
        return timedelta_to_milliseconds(self.approval_delay)
460
 
 
461
 
    @staticmethod
462
 
    def config_parser(config):
463
 
        """Construct a new dict of client settings of this form:
464
 
        { client_name: {setting_name: value, ...}, ...}
465
 
        with exceptions for any special settings as defined above.
466
 
        NOTE: Must be a pure function. Must return the same result
467
 
        value given the same arguments.
468
 
        """
469
 
        settings = {}
470
 
        for client_name in config.sections():
471
 
            section = dict(config.items(client_name))
472
 
            client = settings[client_name] = {}
473
 
            
474
 
            client["host"] = section["host"]
475
 
            # Reformat values from string types to Python types
476
 
            client["approved_by_default"] = config.getboolean(
477
 
                client_name, "approved_by_default")
478
 
            client["enabled"] = config.getboolean(client_name,
479
 
                                                  "enabled")
480
 
            
481
 
            client["fingerprint"] = (section["fingerprint"].upper()
482
 
                                     .replace(" ", ""))
483
 
            if "secret" in section:
484
 
                client["secret"] = section["secret"].decode("base64")
485
 
            elif "secfile" in section:
486
 
                with open(os.path.expanduser(os.path.expandvars
487
 
                                             (section["secfile"])),
488
 
                          "rb") as secfile:
489
 
                    client["secret"] = secfile.read()
490
 
            else:
491
 
                raise TypeError("No secret or secfile for section %s"
492
 
                                % section)
493
 
            client["timeout"] = string_to_delta(section["timeout"])
494
 
            client["extended_timeout"] = string_to_delta(
495
 
                section["extended_timeout"])
496
 
            client["interval"] = string_to_delta(section["interval"])
497
 
            client["approval_delay"] = string_to_delta(
498
 
                section["approval_delay"])
499
 
            client["approval_duration"] = string_to_delta(
500
 
                section["approval_duration"])
501
 
            client["checker_command"] = section["checker"]
502
 
            client["last_approval_request"] = None
503
 
            client["last_checked_ok"] = None
504
 
            client["last_checker_status"] = -2
505
 
        
506
 
        return settings
507
 
        
508
 
        
509
 
    def __init__(self, settings, name = None):
 
316
        return self._timedelta_to_milliseconds(self.approval_delay)
 
317
    
 
318
    def __init__(self, name = None, disable_hook=None, config=None):
510
319
        """Note: the 'checker' key in 'config' sets the
511
320
        'checker_command' attribute and *not* the 'checker'
512
321
        attribute."""
513
322
        self.name = name
514
 
        # adding all client settings
515
 
        for setting, value in settings.iteritems():
516
 
            setattr(self, setting, value)
517
 
        
518
 
        if self.enabled:
519
 
            if not hasattr(self, "last_enabled"):
520
 
                self.last_enabled = datetime.datetime.utcnow()
521
 
            if not hasattr(self, "expires"):
522
 
                self.expires = (datetime.datetime.utcnow()
523
 
                                + self.timeout)
524
 
        else:
525
 
            self.last_enabled = None
526
 
            self.expires = None
527
 
       
 
323
        if config is None:
 
324
            config = {}
528
325
        logger.debug("Creating client %r", self.name)
529
326
        # Uppercase and remove spaces from fingerprint for later
530
327
        # comparison purposes with return value from the fingerprint()
531
328
        # function
 
329
        self.fingerprint = (config["fingerprint"].upper()
 
330
                            .replace(" ", ""))
532
331
        logger.debug("  Fingerprint: %s", self.fingerprint)
533
 
        self.created = settings.get("created",
534
 
                                    datetime.datetime.utcnow())
535
 
 
536
 
        # attributes specific for this server instance
 
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
537
351
        self.checker = None
538
352
        self.checker_initiator_tag = None
539
353
        self.disable_initiator_tag = None
540
354
        self.checker_callback_tag = None
 
355
        self.checker_command = config["checker"]
541
356
        self.current_checker_command = None
542
 
        self.approved = None
 
357
        self.last_connect = None
 
358
        self._approved = None
 
359
        self.approved_by_default = config.get("approved_by_default",
 
360
                                              True)
543
361
        self.approvals_pending = 0
544
 
        self.changedstate = (multiprocessing_manager
545
 
                             .Condition(multiprocessing_manager
546
 
                                        .Lock()))
547
 
        self.client_structure = [attr for attr in
548
 
                                 self.__dict__.iterkeys()
549
 
                                 if not attr.startswith("_")]
550
 
        self.client_structure.append("client_structure")
551
 
        
552
 
        for name, t in inspect.getmembers(type(self),
553
 
                                          lambda obj:
554
 
                                              isinstance(obj,
555
 
                                                         property)):
556
 
            if not name.startswith("_"):
557
 
                self.client_structure.append(name)
 
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())
558
367
    
559
 
    # Send notice to process children that client state has changed
560
368
    def send_changedstate(self):
561
 
        with self.changedstate:
562
 
            self.changedstate.notify_all()
563
 
    
 
369
        self.changedstate.acquire()
 
370
        self.changedstate.notify_all()
 
371
        self.changedstate.release()
 
372
        
564
373
    def enable(self):
565
374
        """Start this client's checker and timeout hooks"""
566
375
        if getattr(self, "enabled", False):
567
376
            # Already enabled
568
377
            return
569
378
        self.send_changedstate()
570
 
        self.expires = datetime.datetime.utcnow() + self.timeout
571
 
        self.enabled = True
572
379
        self.last_enabled = datetime.datetime.utcnow()
573
 
        self.init_checker()
 
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()
574
392
    
575
393
    def disable(self, quiet=True):
576
394
        """Disable this client."""
583
401
        if getattr(self, "disable_initiator_tag", False):
584
402
            gobject.source_remove(self.disable_initiator_tag)
585
403
            self.disable_initiator_tag = None
586
 
        self.expires = None
587
404
        if getattr(self, "checker_initiator_tag", False):
588
405
            gobject.source_remove(self.checker_initiator_tag)
589
406
            self.checker_initiator_tag = None
590
407
        self.stop_checker()
 
408
        if self.disable_hook:
 
409
            self.disable_hook(self)
591
410
        self.enabled = False
592
411
        # Do not run this again if called by a gobject.timeout_add
593
412
        return False
594
413
    
595
414
    def __del__(self):
 
415
        self.disable_hook = None
596
416
        self.disable()
597
417
    
598
 
    def init_checker(self):
599
 
        # Schedule a new checker to be started an 'interval' from now,
600
 
        # and every interval from then on.
601
 
        self.checker_initiator_tag = (gobject.timeout_add
602
 
                                      (self.interval_milliseconds(),
603
 
                                       self.start_checker))
604
 
        # Schedule a disable() when 'timeout' has passed
605
 
        self.disable_initiator_tag = (gobject.timeout_add
606
 
                                   (self.timeout_milliseconds(),
607
 
                                    self.disable))
608
 
        # Also start a new checker *right now*.
609
 
        self.start_checker()
610
 
    
611
418
    def checker_callback(self, pid, condition, command):
612
419
        """The checker has completed, so take appropriate actions."""
613
420
        self.checker_callback_tag = None
614
421
        self.checker = None
615
422
        if os.WIFEXITED(condition):
616
 
            self.last_checker_status = os.WEXITSTATUS(condition)
617
 
            if self.last_checker_status == 0:
 
423
            exitstatus = os.WEXITSTATUS(condition)
 
424
            if exitstatus == 0:
618
425
                logger.info("Checker for %(name)s succeeded",
619
426
                            vars(self))
620
427
                self.checked_ok()
622
429
                logger.info("Checker for %(name)s failed",
623
430
                            vars(self))
624
431
        else:
625
 
            self.last_checker_status = -1
626
432
            logger.warning("Checker for %(name)s crashed?",
627
433
                           vars(self))
628
434
    
629
435
    def checked_ok(self):
630
 
        """Assert that the client has been seen, alive and well."""
 
436
        """Bump up the timeout for this client.
 
437
        
 
438
        This should only be called when the client has been seen,
 
439
        alive and well.
 
440
        """
631
441
        self.last_checked_ok = datetime.datetime.utcnow()
632
 
        self.last_checker_status = 0
633
 
        self.bump_timeout()
634
 
    
635
 
    def bump_timeout(self, timeout=None):
636
 
        """Bump up the timeout for this client."""
637
 
        if timeout is None:
638
 
            timeout = self.timeout
639
 
        if self.disable_initiator_tag is not None:
640
 
            gobject.source_remove(self.disable_initiator_tag)
641
 
        if getattr(self, "enabled", False):
642
 
            self.disable_initiator_tag = (gobject.timeout_add
643
 
                                          (timedelta_to_milliseconds
644
 
                                           (timeout), self.disable))
645
 
            self.expires = datetime.datetime.utcnow() + timeout
 
442
        gobject.source_remove(self.disable_initiator_tag)
 
443
        self.disable_initiator_tag = (gobject.timeout_add
 
444
                                      (self.timeout_milliseconds(),
 
445
                                       self.disable))
646
446
    
647
447
    def need_approval(self):
648
448
        self.last_approval_request = datetime.datetime.utcnow()
688
488
                                       'replace')))
689
489
                    for attr in
690
490
                    self.runtime_expansions)
691
 
                
 
491
 
692
492
                try:
693
493
                    command = self.checker_command % escaped_attrs
694
494
                except TypeError as error:
740
540
                raise
741
541
        self.checker = None
742
542
 
743
 
 
744
543
def dbus_service_property(dbus_interface, signature="v",
745
544
                          access="readwrite", byte_arrays=False):
746
545
    """Decorators for marking methods of a DBusObjectWithProperties to
792
591
 
793
592
class DBusObjectWithProperties(dbus.service.Object):
794
593
    """A D-Bus object with properties.
795
 
    
 
594
 
796
595
    Classes inheriting from this can use the dbus_service_property
797
596
    decorator to expose methods as D-Bus properties.  It exposes the
798
597
    standard Get(), Set(), and GetAll() methods on the D-Bus.
805
604
    def _get_all_dbus_properties(self):
806
605
        """Returns a generator of (name, attribute) pairs
807
606
        """
808
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
809
 
                for cls in self.__class__.__mro__
 
607
        return ((prop._dbus_name, prop)
810
608
                for name, prop in
811
 
                inspect.getmembers(cls, self._is_dbus_property))
 
609
                inspect.getmembers(self, self._is_dbus_property))
812
610
    
813
611
    def _get_dbus_property(self, interface_name, property_name):
814
612
        """Returns a bound method if one exists which is a D-Bus
815
613
        property with the specified name and interface.
816
614
        """
817
 
        for cls in  self.__class__.__mro__:
818
 
            for name, value in (inspect.getmembers
819
 
                                (cls, self._is_dbus_property)):
820
 
                if (value._dbus_name == property_name
821
 
                    and value._dbus_interface == interface_name):
822
 
                    return value.__get__(self)
823
 
        
 
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
824
625
        # No such property
825
626
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
627
                                   + interface_name + "."
851
652
            # signatures other than "ay".
852
653
            if prop._dbus_signature != "ay":
853
654
                raise ValueError
854
 
            value = dbus.ByteArray(b''.join(chr(byte)
855
 
                                            for byte in value))
 
655
            value = dbus.ByteArray(''.join(unichr(byte)
 
656
                                           for byte in value))
856
657
        prop(value)
857
658
    
858
659
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
860
661
    def GetAll(self, interface_name):
861
662
        """Standard D-Bus property GetAll() method, see D-Bus
862
663
        standard.
863
 
        
 
664
 
864
665
        Note: Will not include properties with access="write".
865
666
        """
866
 
        properties = {}
 
667
        all = {}
867
668
        for name, prop in self._get_all_dbus_properties():
868
669
            if (interface_name
869
670
                and interface_name != prop._dbus_interface):
874
675
                continue
875
676
            value = prop()
876
677
            if not hasattr(value, "variant_level"):
877
 
                properties[name] = value
 
678
                all[name] = value
878
679
                continue
879
 
            properties[name] = type(value)(value, variant_level=
880
 
                                           value.variant_level+1)
881
 
        return dbus.Dictionary(properties, signature="sv")
 
680
            all[name] = type(value)(value, variant_level=
 
681
                                    value.variant_level+1)
 
682
        return dbus.Dictionary(all, signature="sv")
882
683
    
883
684
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
685
                         out_signature="s",
928
729
        return xmlstring
929
730
 
930
731
 
931
 
def datetime_to_dbus (dt, variant_level=0):
932
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
933
 
    if dt is None:
934
 
        return dbus.String("", variant_level = variant_level)
935
 
    return dbus.String(dt.isoformat(),
936
 
                       variant_level=variant_level)
937
 
 
938
 
 
939
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
 
                                  .__metaclass__):
941
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
942
 
    will add additional D-Bus attributes matching a certain pattern.
943
 
    """
944
 
    def __new__(mcs, name, bases, attr):
945
 
        # Go through all the base classes which could have D-Bus
946
 
        # methods, signals, or properties in them
947
 
        for base in (b for b in bases
948
 
                     if issubclass(b, dbus.service.Object)):
949
 
            # Go though all attributes of the base class
950
 
            for attrname, attribute in inspect.getmembers(base):
951
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
952
 
                # with the wrong interface name
953
 
                if (not hasattr(attribute, "_dbus_interface")
954
 
                    or not attribute._dbus_interface
955
 
                    .startswith("se.recompile.Mandos")):
956
 
                    continue
957
 
                # Create an alternate D-Bus interface name based on
958
 
                # the current name
959
 
                alt_interface = (attribute._dbus_interface
960
 
                                 .replace("se.recompile.Mandos",
961
 
                                          "se.bsnet.fukt.Mandos"))
962
 
                # Is this a D-Bus signal?
963
 
                if getattr(attribute, "_dbus_is_signal", False):
964
 
                    # Extract the original non-method function by
965
 
                    # black magic
966
 
                    nonmethod_func = (dict(
967
 
                            zip(attribute.func_code.co_freevars,
968
 
                                attribute.__closure__))["func"]
969
 
                                      .cell_contents)
970
 
                    # Create a new, but exactly alike, function
971
 
                    # object, and decorate it to be a new D-Bus signal
972
 
                    # with the alternate D-Bus interface name
973
 
                    new_function = (dbus.service.signal
974
 
                                    (alt_interface,
975
 
                                     attribute._dbus_signature)
976
 
                                    (types.FunctionType(
977
 
                                nonmethod_func.func_code,
978
 
                                nonmethod_func.func_globals,
979
 
                                nonmethod_func.func_name,
980
 
                                nonmethod_func.func_defaults,
981
 
                                nonmethod_func.func_closure)))
982
 
                    # Define a creator of a function to call both the
983
 
                    # old and new functions, so both the old and new
984
 
                    # signals gets sent when the function is called
985
 
                    def fixscope(func1, func2):
986
 
                        """This function is a scope container to pass
987
 
                        func1 and func2 to the "call_both" function
988
 
                        outside of its arguments"""
989
 
                        def call_both(*args, **kwargs):
990
 
                            """This function will emit two D-Bus
991
 
                            signals by calling func1 and func2"""
992
 
                            func1(*args, **kwargs)
993
 
                            func2(*args, **kwargs)
994
 
                        return call_both
995
 
                    # Create the "call_both" function and add it to
996
 
                    # the class
997
 
                    attr[attrname] = fixscope(attribute,
998
 
                                              new_function)
999
 
                # Is this a D-Bus method?
1000
 
                elif getattr(attribute, "_dbus_is_method", False):
1001
 
                    # Create a new, but exactly alike, function
1002
 
                    # object.  Decorate it to be a new D-Bus method
1003
 
                    # with the alternate D-Bus interface name.  Add it
1004
 
                    # to the class.
1005
 
                    attr[attrname] = (dbus.service.method
1006
 
                                      (alt_interface,
1007
 
                                       attribute._dbus_in_signature,
1008
 
                                       attribute._dbus_out_signature)
1009
 
                                      (types.FunctionType
1010
 
                                       (attribute.func_code,
1011
 
                                        attribute.func_globals,
1012
 
                                        attribute.func_name,
1013
 
                                        attribute.func_defaults,
1014
 
                                        attribute.func_closure)))
1015
 
                # Is this a D-Bus property?
1016
 
                elif getattr(attribute, "_dbus_is_property", False):
1017
 
                    # Create a new, but exactly alike, function
1018
 
                    # object, and decorate it to be a new D-Bus
1019
 
                    # property with the alternate D-Bus interface
1020
 
                    # name.  Add it to the class.
1021
 
                    attr[attrname] = (dbus_service_property
1022
 
                                      (alt_interface,
1023
 
                                       attribute._dbus_signature,
1024
 
                                       attribute._dbus_access,
1025
 
                                       attribute
1026
 
                                       ._dbus_get_args_options
1027
 
                                       ["byte_arrays"])
1028
 
                                      (types.FunctionType
1029
 
                                       (attribute.func_code,
1030
 
                                        attribute.func_globals,
1031
 
                                        attribute.func_name,
1032
 
                                        attribute.func_defaults,
1033
 
                                        attribute.func_closure)))
1034
 
        return type.__new__(mcs, name, bases, attr)
1035
 
 
1036
 
 
1037
732
class ClientDBus(Client, DBusObjectWithProperties):
1038
733
    """A Client class using D-Bus
1039
734
    
1048
743
    # dbus.service.Object doesn't use super(), so we can't either.
1049
744
    
1050
745
    def __init__(self, bus = None, *args, **kwargs):
 
746
        self._approvals_pending = 0
1051
747
        self.bus = bus
1052
748
        Client.__init__(self, *args, **kwargs)
1053
749
        # Only now, when this client is initialized, can it show up on
1060
756
        DBusObjectWithProperties.__init__(self, self.bus,
1061
757
                                          self.dbus_object_path)
1062
758
        
1063
 
    def notifychangeproperty(transform_func,
1064
 
                             dbus_name, type_func=lambda x: x,
1065
 
                             variant_level=1):
1066
 
        """ Modify a variable so that it's a property which announces
1067
 
        its changes to DBus.
1068
 
        
1069
 
        transform_fun: Function that takes a value and a variant_level
1070
 
                       and transforms it to a D-Bus type.
1071
 
        dbus_name: D-Bus name of the variable
1072
 
        type_func: Function that transform the value before sending it
1073
 
                   to the D-Bus.  Default: no transform
1074
 
        variant_level: D-Bus variant level.  Default: 1
1075
 
        """
1076
 
        attrname = "_{0}".format(dbus_name)
1077
 
        def setter(self, value):
1078
 
            if hasattr(self, "dbus_object_path"):
1079
 
                if (not hasattr(self, attrname) or
1080
 
                    type_func(getattr(self, attrname, None))
1081
 
                    != type_func(value)):
1082
 
                    dbus_value = transform_func(type_func(value),
1083
 
                                                variant_level
1084
 
                                                =variant_level)
1085
 
                    self.PropertyChanged(dbus.String(dbus_name),
1086
 
                                         dbus_value)
1087
 
            setattr(self, attrname, value)
1088
 
        
1089
 
        return property(lambda self: getattr(self, attrname), setter)
1090
 
    
1091
 
    
1092
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1094
 
                                             "ApprovalPending",
1095
 
                                             type_func = bool)
1096
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1097
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1098
 
                                        "LastEnabled")
1099
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1100
 
                                   type_func = lambda checker:
1101
 
                                       checker is not None)
1102
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
 
                                           "LastCheckedOK")
1104
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1105
 
                                               "LastCheckerStatus")
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
 
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
1131
802
    
1132
803
    def __del__(self, *args, **kwargs):
1133
804
        try:
1142
813
                         *args, **kwargs):
1143
814
        self.checker_callback_tag = None
1144
815
        self.checker = None
 
816
        # Emit D-Bus signal
 
817
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
818
                             dbus.Boolean(False, variant_level=1))
1145
819
        if os.WIFEXITED(condition):
1146
820
            exitstatus = os.WEXITSTATUS(condition)
1147
821
            # Emit D-Bus signal
1157
831
        return Client.checker_callback(self, pid, condition, command,
1158
832
                                       *args, **kwargs)
1159
833
    
 
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
    
1160
851
    def start_checker(self, *args, **kwargs):
1161
852
        old_checker = self.checker
1162
853
        if self.checker is not None:
1169
860
            and old_checker_pid != self.checker.pid):
1170
861
            # Emit D-Bus signal
1171
862
            self.CheckerStarted(self.current_checker_command)
 
863
            self.PropertyChanged(
 
864
                dbus.String("CheckerRunning"),
 
865
                dbus.Boolean(True, variant_level=1))
1172
866
        return r
1173
867
    
 
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
 
1174
877
    def _reset_approved(self):
1175
 
        self.approved = None
 
878
        self._approved = None
1176
879
        return False
1177
880
    
1178
881
    def approve(self, value=True):
1179
882
        self.send_changedstate()
1180
 
        self.approved = value
1181
 
        gobject.timeout_add(timedelta_to_milliseconds
 
883
        self._approved = value
 
884
        gobject.timeout_add(self._timedelta_to_milliseconds
1182
885
                            (self.approval_duration),
1183
886
                            self._reset_approved)
1184
887
    
1185
888
    
1186
889
    ## D-Bus methods, signals & properties
1187
 
    _interface = "se.recompile.Mandos.Client"
 
890
    _interface = "se.bsnet.fukt.Mandos.Client"
1188
891
    
1189
892
    ## Signals
1190
893
    
1276
979
        if value is None:       # get
1277
980
            return dbus.Boolean(self.approved_by_default)
1278
981
        self.approved_by_default = bool(value)
 
982
        # Emit D-Bus signal
 
983
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
984
                             dbus.Boolean(value, variant_level=1))
1279
985
    
1280
986
    # ApprovalDelay - property
1281
987
    @dbus_service_property(_interface, signature="t",
1284
990
        if value is None:       # get
1285
991
            return dbus.UInt64(self.approval_delay_milliseconds())
1286
992
        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))
1287
996
    
1288
997
    # ApprovalDuration - property
1289
998
    @dbus_service_property(_interface, signature="t",
1290
999
                           access="readwrite")
1291
1000
    def ApprovalDuration_dbus_property(self, value=None):
1292
1001
        if value is None:       # get
1293
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1002
            return dbus.UInt64(self._timedelta_to_milliseconds(
1294
1003
                    self.approval_duration))
1295
1004
        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))
1296
1008
    
1297
1009
    # Name - property
1298
1010
    @dbus_service_property(_interface, signature="s", access="read")
1310
1022
    def Host_dbus_property(self, value=None):
1311
1023
        if value is None:       # get
1312
1024
            return dbus.String(self.host)
1313
 
        self.host = unicode(value)
 
1025
        self.host = value
 
1026
        # Emit D-Bus signal
 
1027
        self.PropertyChanged(dbus.String("Host"),
 
1028
                             dbus.String(value, variant_level=1))
1314
1029
    
1315
1030
    # Created - property
1316
1031
    @dbus_service_property(_interface, signature="s", access="read")
1317
1032
    def Created_dbus_property(self):
1318
 
        return datetime_to_dbus(self.created)
 
1033
        return dbus.String(self._datetime_to_dbus(self.created))
1319
1034
    
1320
1035
    # LastEnabled - property
1321
1036
    @dbus_service_property(_interface, signature="s", access="read")
1322
1037
    def LastEnabled_dbus_property(self):
1323
 
        return datetime_to_dbus(self.last_enabled)
 
1038
        if self.last_enabled is None:
 
1039
            return dbus.String("")
 
1040
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1324
1041
    
1325
1042
    # Enabled - property
1326
1043
    @dbus_service_property(_interface, signature="b",
1340
1057
        if value is not None:
1341
1058
            self.checked_ok()
1342
1059
            return
1343
 
        return datetime_to_dbus(self.last_checked_ok)
1344
 
    
1345
 
    # LastCheckerStatus - property
1346
 
    @dbus_service_property(_interface, signature="n",
1347
 
                           access="read")
1348
 
    def LastCheckerStatus_dbus_property(self):
1349
 
        return dbus.Int16(self.last_checker_status)
1350
 
    
1351
 
    # Expires - property
1352
 
    @dbus_service_property(_interface, signature="s", access="read")
1353
 
    def Expires_dbus_property(self):
1354
 
        return datetime_to_dbus(self.expires)
 
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))
1355
1064
    
1356
1065
    # LastApprovalRequest - property
1357
1066
    @dbus_service_property(_interface, signature="s", access="read")
1358
1067
    def LastApprovalRequest_dbus_property(self):
1359
 
        return datetime_to_dbus(self.last_approval_request)
 
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))
1360
1073
    
1361
1074
    # Timeout - property
1362
1075
    @dbus_service_property(_interface, signature="t",
1365
1078
        if value is None:       # get
1366
1079
            return dbus.UInt64(self.timeout_milliseconds())
1367
1080
        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
1368
1086
        # Reschedule timeout
1369
 
        if self.enabled:
1370
 
            now = datetime.datetime.utcnow()
1371
 
            time_to_die = timedelta_to_milliseconds(
1372
 
                (self.last_checked_ok + self.timeout) - now)
1373
 
            if time_to_die <= 0:
1374
 
                # The timeout has passed
1375
 
                self.disable()
1376
 
            else:
1377
 
                self.expires = (now +
1378
 
                                datetime.timedelta(milliseconds =
1379
 
                                                   time_to_die))
1380
 
                if (getattr(self, "disable_initiator_tag", None)
1381
 
                    is None):
1382
 
                    return
1383
 
                gobject.source_remove(self.disable_initiator_tag)
1384
 
                self.disable_initiator_tag = (gobject.timeout_add
1385
 
                                              (time_to_die,
1386
 
                                               self.disable))
1387
 
    
1388
 
    # ExtendedTimeout - property
1389
 
    @dbus_service_property(_interface, signature="t",
1390
 
                           access="readwrite")
1391
 
    def ExtendedTimeout_dbus_property(self, value=None):
1392
 
        if value is None:       # get
1393
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1394
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
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))
1395
1101
    
1396
1102
    # Interval - property
1397
1103
    @dbus_service_property(_interface, signature="t",
1400
1106
        if value is None:       # get
1401
1107
            return dbus.UInt64(self.interval_milliseconds())
1402
1108
        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))
1403
1112
        if getattr(self, "checker_initiator_tag", None) is None:
1404
1113
            return
1405
 
        if self.enabled:
1406
 
            # Reschedule checker run
1407
 
            gobject.source_remove(self.checker_initiator_tag)
1408
 
            self.checker_initiator_tag = (gobject.timeout_add
1409
 
                                          (value, self.start_checker))
1410
 
            self.start_checker()    # Start one now, too
1411
 
    
 
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
 
1412
1120
    # Checker - property
1413
1121
    @dbus_service_property(_interface, signature="s",
1414
1122
                           access="readwrite")
1415
1123
    def Checker_dbus_property(self, value=None):
1416
1124
        if value is None:       # get
1417
1125
            return dbus.String(self.checker_command)
1418
 
        self.checker_command = unicode(value)
 
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))
1419
1131
    
1420
1132
    # CheckerRunning - property
1421
1133
    @dbus_service_property(_interface, signature="b",
1448
1160
        self._pipe.send(('init', fpr, address))
1449
1161
        if not self._pipe.recv():
1450
1162
            raise KeyError()
1451
 
    
 
1163
 
1452
1164
    def __getattribute__(self, name):
1453
 
        if name == '_pipe':
 
1165
        if(name == '_pipe'):
1454
1166
            return super(ProxyClient, self).__getattribute__(name)
1455
1167
        self._pipe.send(('getattr', name))
1456
1168
        data = self._pipe.recv()
1461
1173
                self._pipe.send(('funcall', name, args, kwargs))
1462
1174
                return self._pipe.recv()[1]
1463
1175
            return func
1464
 
    
 
1176
 
1465
1177
    def __setattr__(self, name, value):
1466
 
        if name == '_pipe':
 
1178
        if(name == '_pipe'):
1467
1179
            return super(ProxyClient, self).__setattr__(name, value)
1468
1180
        self._pipe.send(('setattr', name, value))
1469
1181
 
1470
1182
 
1471
 
class ClientDBusTransitional(ClientDBus):
1472
 
    __metaclass__ = AlternateDBusNamesMetaclass
1473
 
 
1474
 
 
1475
1183
class ClientHandler(socketserver.BaseRequestHandler, object):
1476
1184
    """A class to handle client connections.
1477
1185
    
1484
1192
                        unicode(self.client_address))
1485
1193
            logger.debug("Pipe FD: %d",
1486
1194
                         self.server.child_pipe.fileno())
1487
 
            
 
1195
 
1488
1196
            session = (gnutls.connection
1489
1197
                       .ClientSession(self.request,
1490
1198
                                      gnutls.connection
1491
1199
                                      .X509Credentials()))
1492
 
            
 
1200
 
1493
1201
            # Note: gnutls.connection.X509Credentials is really a
1494
1202
            # generic GnuTLS certificate credentials object so long as
1495
1203
            # no X.509 keys are added to it.  Therefore, we can use it
1496
1204
            # here despite using OpenPGP certificates.
1497
 
            
 
1205
 
1498
1206
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1499
1207
            #                      "+AES-256-CBC", "+SHA1",
1500
1208
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1506
1214
            (gnutls.library.functions
1507
1215
             .gnutls_priority_set_direct(session._c_object,
1508
1216
                                         priority, None))
1509
 
            
 
1217
 
1510
1218
            # Start communication using the Mandos protocol
1511
1219
            # Get protocol number
1512
1220
            line = self.request.makefile().readline()
1517
1225
            except (ValueError, IndexError, RuntimeError) as error:
1518
1226
                logger.error("Unknown protocol version: %s", error)
1519
1227
                return
1520
 
            
 
1228
 
1521
1229
            # Start GnuTLS connection
1522
1230
            try:
1523
1231
                session.handshake()
1527
1235
                # established.  Just abandon the request.
1528
1236
                return
1529
1237
            logger.debug("Handshake succeeded")
1530
 
            
 
1238
 
1531
1239
            approval_required = False
1532
1240
            try:
1533
1241
                try:
1538
1246
                    logger.warning("Bad certificate: %s", error)
1539
1247
                    return
1540
1248
                logger.debug("Fingerprint: %s", fpr)
1541
 
                
 
1249
 
1542
1250
                try:
1543
1251
                    client = ProxyClient(child_pipe, fpr,
1544
1252
                                         self.client_address)
1552
1260
                
1553
1261
                while True:
1554
1262
                    if not client.enabled:
1555
 
                        logger.info("Client %s is disabled",
 
1263
                        logger.warning("Client %s is disabled",
1556
1264
                                       client.name)
1557
1265
                        if self.server.use_dbus:
1558
1266
                            # Emit D-Bus signal
1559
 
                            client.Rejected("Disabled")
 
1267
                            client.Rejected("Disabled")                    
1560
1268
                        return
1561
1269
                    
1562
 
                    if client.approved or not client.approval_delay:
 
1270
                    if client._approved or not client.approval_delay:
1563
1271
                        #We are approved or approval is disabled
1564
1272
                        break
1565
 
                    elif client.approved is None:
 
1273
                    elif client._approved is None:
1566
1274
                        logger.info("Client %s needs approval",
1567
1275
                                    client.name)
1568
1276
                        if self.server.use_dbus:
1579
1287
                        return
1580
1288
                    
1581
1289
                    #wait until timeout or approved
 
1290
                    #x = float(client._timedelta_to_milliseconds(delay))
1582
1291
                    time = datetime.datetime.now()
1583
1292
                    client.changedstate.acquire()
1584
 
                    (client.changedstate.wait
1585
 
                     (float(client.timedelta_to_milliseconds(delay)
1586
 
                            / 1000)))
 
1293
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1587
1294
                    client.changedstate.release()
1588
1295
                    time2 = datetime.datetime.now()
1589
1296
                    if (time2 - time) >= delay:
1611
1318
                                 sent, len(client.secret)
1612
1319
                                 - (sent_size + sent))
1613
1320
                    sent_size += sent
1614
 
                
 
1321
 
1615
1322
                logger.info("Sending secret to %s", client.name)
1616
 
                # bump the timeout using extended_timeout
1617
 
                client.bump_timeout(client.extended_timeout)
 
1323
                # bump the timeout as if seen
 
1324
                client.checked_ok()
1618
1325
                if self.server.use_dbus:
1619
1326
                    # Emit D-Bus signal
1620
1327
                    client.GotSecret()
1687
1394
        # Convert the buffer to a Python bytestring
1688
1395
        fpr = ctypes.string_at(buf, buf_len.value)
1689
1396
        # Convert the bytestring to hexadecimal notation
1690
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1397
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1691
1398
        return hex_fpr
1692
1399
 
1693
1400
 
1696
1403
    def sub_process_main(self, request, address):
1697
1404
        try:
1698
1405
            self.finish_request(request, address)
1699
 
        except Exception:
 
1406
        except:
1700
1407
            self.handle_error(request, address)
1701
1408
        self.close_request(request)
1702
 
    
 
1409
            
1703
1410
    def process_request(self, request, address):
1704
1411
        """Start a new process to process the request."""
1705
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1706
 
                                       args = (request,
1707
 
                                               address))
1708
 
        proc.start()
1709
 
        return proc
1710
 
 
 
1412
        multiprocessing.Process(target = self.sub_process_main,
 
1413
                                args = (request, address)).start()
1711
1414
 
1712
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1713
1416
    """ adds a pipe to the MixIn """
1717
1420
        This function creates a new pipe in self.pipe
1718
1421
        """
1719
1422
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1720
 
        
1721
 
        proc = MultiprocessingMixIn.process_request(self, request,
1722
 
                                                    client_address)
 
1423
 
 
1424
        super(MultiprocessingMixInWithPipe,
 
1425
              self).process_request(request, client_address)
1723
1426
        self.child_pipe.close()
1724
 
        self.add_pipe(parent_pipe, proc)
1725
 
    
1726
 
    def add_pipe(self, parent_pipe, proc):
 
1427
        self.add_pipe(parent_pipe)
 
1428
 
 
1429
    def add_pipe(self, parent_pipe):
1727
1430
        """Dummy function; override as necessary"""
1728
1431
        raise NotImplementedError
1729
1432
 
1730
 
 
1731
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1732
1434
                     socketserver.TCPServer, object):
1733
1435
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1807
1509
        self.enabled = False
1808
1510
        self.clients = clients
1809
1511
        if self.clients is None:
1810
 
            self.clients = {}
 
1512
            self.clients = set()
1811
1513
        self.use_dbus = use_dbus
1812
1514
        self.gnutls_priority = gnutls_priority
1813
1515
        IPv6_TCPServer.__init__(self, server_address,
1817
1519
    def server_activate(self):
1818
1520
        if self.enabled:
1819
1521
            return socketserver.TCPServer.server_activate(self)
1820
 
    
1821
1522
    def enable(self):
1822
1523
        self.enabled = True
1823
 
    
1824
 
    def add_pipe(self, parent_pipe, proc):
 
1524
    def add_pipe(self, parent_pipe):
1825
1525
        # Call "handle_ipc" for both data and EOF events
1826
1526
        gobject.io_add_watch(parent_pipe.fileno(),
1827
1527
                             gobject.IO_IN | gobject.IO_HUP,
1828
1528
                             functools.partial(self.handle_ipc,
1829
 
                                               parent_pipe =
1830
 
                                               parent_pipe,
1831
 
                                               proc = proc))
1832
 
    
 
1529
                                               parent_pipe = parent_pipe))
 
1530
        
1833
1531
    def handle_ipc(self, source, condition, parent_pipe=None,
1834
 
                   proc = None, client_object=None):
 
1532
                   client_object=None):
1835
1533
        condition_names = {
1836
1534
            gobject.IO_IN: "IN",   # There is data to read.
1837
1535
            gobject.IO_OUT: "OUT", # Data can be written (without
1846
1544
                                       for cond, name in
1847
1545
                                       condition_names.iteritems()
1848
1546
                                       if cond & condition)
1849
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1547
        # error or the other end of multiprocessing.Pipe has closed
1850
1548
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1851
 
            # Wait for other process to exit
1852
 
            proc.join()
1853
1549
            return False
1854
1550
        
1855
1551
        # Read a request from the child
1860
1556
            fpr = request[1]
1861
1557
            address = request[2]
1862
1558
            
1863
 
            for c in self.clients.itervalues():
 
1559
            for c in self.clients:
1864
1560
                if c.fingerprint == fpr:
1865
1561
                    client = c
1866
1562
                    break
1867
1563
            else:
1868
 
                logger.info("Client not found for fingerprint: %s, ad"
1869
 
                            "dress: %s", fpr, address)
 
1564
                logger.warning("Client not found for fingerprint: %s, ad"
 
1565
                               "dress: %s", fpr, address)
1870
1566
                if self.use_dbus:
1871
1567
                    # Emit D-Bus signal
1872
 
                    mandos_dbus_service.ClientNotFound(fpr,
1873
 
                                                       address[0])
 
1568
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1874
1569
                parent_pipe.send(False)
1875
1570
                return False
1876
1571
            
1877
1572
            gobject.io_add_watch(parent_pipe.fileno(),
1878
1573
                                 gobject.IO_IN | gobject.IO_HUP,
1879
1574
                                 functools.partial(self.handle_ipc,
1880
 
                                                   parent_pipe =
1881
 
                                                   parent_pipe,
1882
 
                                                   proc = proc,
1883
 
                                                   client_object =
1884
 
                                                   client))
 
1575
                                                   parent_pipe = parent_pipe,
 
1576
                                                   client_object = client))
1885
1577
            parent_pipe.send(True)
1886
 
            # remove the old hook in favor of the new above hook on
1887
 
            # same fileno
 
1578
            # remove the old hook in favor of the new above hook on same fileno
1888
1579
            return False
1889
1580
        if command == 'funcall':
1890
1581
            funcname = request[1]
1891
1582
            args = request[2]
1892
1583
            kwargs = request[3]
1893
1584
            
1894
 
            parent_pipe.send(('data', getattr(client_object,
1895
 
                                              funcname)(*args,
1896
 
                                                         **kwargs)))
1897
 
        
 
1585
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1586
 
1898
1587
        if command == 'getattr':
1899
1588
            attrname = request[1]
1900
1589
            if callable(client_object.__getattribute__(attrname)):
1901
1590
                parent_pipe.send(('function',))
1902
1591
            else:
1903
 
                parent_pipe.send(('data', client_object
1904
 
                                  .__getattribute__(attrname)))
 
1592
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1905
1593
        
1906
1594
        if command == 'setattr':
1907
1595
            attrname = request[1]
1908
1596
            value = request[2]
1909
1597
            setattr(client_object, attrname, value)
1910
 
        
 
1598
 
1911
1599
        return True
1912
1600
 
1913
1601
 
1950
1638
    return timevalue
1951
1639
 
1952
1640
 
 
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
 
1953
1665
def daemon(nochdir = False, noclose = False):
1954
1666
    """See daemon(3).  Standard BSD Unix function.
1955
1667
    
2010
1722
                        " system bus interface")
2011
1723
    parser.add_argument("--no-ipv6", action="store_false",
2012
1724
                        dest="use_ipv6", help="Do not use IPv6")
2013
 
    parser.add_argument("--no-restore", action="store_false",
2014
 
                        dest="restore", help="Do not restore stored"
2015
 
                        " state")
2016
 
    parser.add_argument("--statedir", metavar="DIR",
2017
 
                        help="Directory to save/restore state in")
2018
 
    
2019
1725
    options = parser.parse_args()
2020
1726
    
2021
1727
    if options.check:
2034
1740
                        "use_dbus": "True",
2035
1741
                        "use_ipv6": "True",
2036
1742
                        "debuglevel": "",
2037
 
                        "restore": "True",
2038
 
                        "statedir": "/var/lib/mandos"
2039
1743
                        }
2040
1744
    
2041
1745
    # Parse config file for server-global settings
2058
1762
    # options, if set.
2059
1763
    for option in ("interface", "address", "port", "debug",
2060
1764
                   "priority", "servicename", "configdir",
2061
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2062
 
                   "statedir"):
 
1765
                   "use_dbus", "use_ipv6", "debuglevel"):
2063
1766
        value = getattr(options, option)
2064
1767
        if value is not None:
2065
1768
            server_settings[option] = value
2077
1780
    debuglevel = server_settings["debuglevel"]
2078
1781
    use_dbus = server_settings["use_dbus"]
2079
1782
    use_ipv6 = server_settings["use_ipv6"]
2080
 
    stored_state_path = os.path.join(server_settings["statedir"],
2081
 
                                     stored_state_file)
2082
 
    
2083
 
    if debug:
2084
 
        initlogger(debug, logging.DEBUG)
2085
 
    else:
2086
 
        if not debuglevel:
2087
 
            initlogger(debug)
2088
 
        else:
2089
 
            level = getattr(logging, debuglevel.upper())
2090
 
            initlogger(debug, level)
2091
 
    
 
1783
 
2092
1784
    if server_settings["servicename"] != "Mandos":
2093
1785
        syslogger.setFormatter(logging.Formatter
2094
1786
                               ('Mandos (%s) [%%(process)d]:'
2096
1788
                                % server_settings["servicename"]))
2097
1789
    
2098
1790
    # Parse config file with clients
2099
 
    client_config = configparser.SafeConfigParser(Client
2100
 
                                                  .client_defaults)
 
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)
2101
1799
    client_config.read(os.path.join(server_settings["configdir"],
2102
1800
                                    "clients.conf"))
2103
1801
    
2141
1839
        if error[0] != errno.EPERM:
2142
1840
            raise error
2143
1841
    
 
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
 
2144
1850
    if debug:
2145
1851
        # Enable all possible GnuTLS debugging
2146
1852
        
2160
1866
        os.dup2(null, sys.stdin.fileno())
2161
1867
        if null > 2:
2162
1868
            os.close(null)
 
1869
    else:
 
1870
        # No console logging
 
1871
        logger.removeHandler(console)
2163
1872
    
2164
1873
    # Need to fork before connecting to D-Bus
2165
1874
    if not debug:
2166
1875
        # Close all input and output, do double fork, etc.
2167
1876
        daemon()
2168
1877
    
2169
 
    gobject.threads_init()
2170
 
    
2171
1878
    global main_loop
2172
1879
    # From the Avahi example code
2173
1880
    DBusGMainLoop(set_as_default=True )
2176
1883
    # End of Avahi example code
2177
1884
    if use_dbus:
2178
1885
        try:
2179
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1886
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2180
1887
                                            bus, do_not_queue=True)
2181
 
            old_bus_name = (dbus.service.BusName
2182
 
                            ("se.bsnet.fukt.Mandos", bus,
2183
 
                             do_not_queue=True))
2184
1888
        except dbus.exceptions.NameExistsException as e:
2185
1889
            logger.error(unicode(e) + ", disabling D-Bus")
2186
1890
            use_dbus = False
2187
1891
            server_settings["use_dbus"] = False
2188
1892
            tcp_server.use_dbus = False
2189
1893
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2190
 
    service = AvahiServiceToSyslog(name =
2191
 
                                   server_settings["servicename"],
2192
 
                                   servicetype = "_mandos._tcp",
2193
 
                                   protocol = protocol, bus = bus)
 
1894
    service = AvahiService(name = server_settings["servicename"],
 
1895
                           servicetype = "_mandos._tcp",
 
1896
                           protocol = protocol, bus = bus)
2194
1897
    if server_settings["interface"]:
2195
1898
        service.interface = (if_nametoindex
2196
1899
                             (str(server_settings["interface"])))
2200
1903
    
2201
1904
    client_class = Client
2202
1905
    if use_dbus:
2203
 
        client_class = functools.partial(ClientDBusTransitional,
2204
 
                                         bus = bus)
2205
 
    
2206
 
    client_settings = Client.config_parser(client_config)
2207
 
    old_client_settings = {}
2208
 
    clients_data = {}
2209
 
    
2210
 
    # Get client data and settings from last running state.
2211
 
    if server_settings["restore"]:
2212
 
        try:
2213
 
            with open(stored_state_path, "rb") as stored_state:
2214
 
                clients_data, old_client_settings = (pickle.load
2215
 
                                                     (stored_state))
2216
 
            os.remove(stored_state_path)
2217
 
        except IOError as e:
2218
 
            logger.warning("Could not load persistent state: {0}"
2219
 
                           .format(e))
2220
 
            if e.errno != errno.ENOENT:
2221
 
                raise
2222
 
        except EOFError as e:
2223
 
            logger.warning("Could not load persistent state: "
2224
 
                           "EOFError: {0}".format(e))
2225
 
    
2226
 
    with PGPEngine() as pgp:
2227
 
        for client_name, client in clients_data.iteritems():
2228
 
            # Decide which value to use after restoring saved state.
2229
 
            # We have three different values: Old config file,
2230
 
            # new config file, and saved state.
2231
 
            # New config value takes precedence if it differs from old
2232
 
            # config value, otherwise use saved state.
2233
 
            for name, value in client_settings[client_name].items():
2234
 
                try:
2235
 
                    # For each value in new config, check if it
2236
 
                    # differs from the old config value (Except for
2237
 
                    # the "secret" attribute)
2238
 
                    if (name != "secret" and
2239
 
                        value != old_client_settings[client_name]
2240
 
                        [name]):
2241
 
                        client[name] = value
2242
 
                except KeyError:
2243
 
                    pass
2244
 
            
2245
 
            # Clients who has passed its expire date can still be
2246
 
            # enabled if its last checker was successful.  Clients
2247
 
            # whose checker succeeded before we stored its state is
2248
 
            # assumed to have successfully run all checkers during
2249
 
            # downtime.
2250
 
            if client["enabled"]:
2251
 
                if datetime.datetime.utcnow() >= client["expires"]:
2252
 
                    if not client["last_checked_ok"]:
2253
 
                        logger.warning(
2254
 
                            "disabling client {0} - Client never "
2255
 
                            "performed a successful checker"
2256
 
                            .format(client_name))
2257
 
                        client["enabled"] = False
2258
 
                    elif client["last_checker_status"] != 0:
2259
 
                        logger.warning(
2260
 
                            "disabling client {0} - Client "
2261
 
                            "last checker failed with error code {1}"
2262
 
                            .format(client_name,
2263
 
                                    client["last_checker_status"]))
2264
 
                        client["enabled"] = False
2265
 
                    else:
2266
 
                        client["expires"] = (datetime.datetime
2267
 
                                             .utcnow()
2268
 
                                             + client["timeout"])
2269
 
                        logger.debug("Last checker succeeded,"
2270
 
                                     " keeping {0} enabled"
2271
 
                                     .format(client_name))
 
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):
2272
1914
            try:
2273
 
                client["secret"] = (
2274
 
                    pgp.decrypt(client["encrypted_secret"],
2275
 
                                client_settings[client_name]
2276
 
                                ["secret"]))
2277
 
            except PGPError:
2278
 
                # If decryption fails, we use secret from new settings
2279
 
                logger.debug("Failed to decrypt {0} old secret"
2280
 
                             .format(client_name))
2281
 
                client["secret"] = (
2282
 
                    client_settings[client_name]["secret"])
2283
 
 
2284
 
    
2285
 
    # Add/remove clients based on new changes made to config
2286
 
    for client_name in (set(old_client_settings)
2287
 
                        - set(client_settings)):
2288
 
        del clients_data[client_name]
2289
 
    for client_name in (set(client_settings)
2290
 
                        - set(old_client_settings)):
2291
 
        clients_data[client_name] = client_settings[client_name]
2292
 
 
2293
 
    # Create all client objects
2294
 
    for client_name, client in clients_data.iteritems():
2295
 
        tcp_server.clients[client_name] = client_class(
2296
 
            name = client_name, settings = client)
2297
 
    
 
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()))
2298
1924
    if not tcp_server.clients:
2299
1925
        logger.warning("No clients defined")
2300
1926
        
2311
1937
            # "pidfile" was never created
2312
1938
            pass
2313
1939
        del pidfilename
 
1940
        
2314
1941
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2315
 
    
 
1942
 
2316
1943
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
1944
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2318
1945
    
2321
1948
            """A D-Bus proxy object"""
2322
1949
            def __init__(self):
2323
1950
                dbus.service.Object.__init__(self, bus, "/")
2324
 
            _interface = "se.recompile.Mandos"
 
1951
            _interface = "se.bsnet.fukt.Mandos"
2325
1952
            
2326
1953
            @dbus.service.signal(_interface, signature="o")
2327
1954
            def ClientAdded(self, objpath):
2342
1969
            def GetAllClients(self):
2343
1970
                "D-Bus method"
2344
1971
                return dbus.Array(c.dbus_object_path
2345
 
                                  for c in
2346
 
                                  tcp_server.clients.itervalues())
 
1972
                                  for c in tcp_server.clients)
2347
1973
            
2348
1974
            @dbus.service.method(_interface,
2349
1975
                                 out_signature="a{oa{sv}}")
2351
1977
                "D-Bus method"
2352
1978
                return dbus.Dictionary(
2353
1979
                    ((c.dbus_object_path, c.GetAll(""))
2354
 
                     for c in tcp_server.clients.itervalues()),
 
1980
                     for c in tcp_server.clients),
2355
1981
                    signature="oa{sv}")
2356
1982
            
2357
1983
            @dbus.service.method(_interface, in_signature="o")
2358
1984
            def RemoveClient(self, object_path):
2359
1985
                "D-Bus method"
2360
 
                for c in tcp_server.clients.itervalues():
 
1986
                for c in tcp_server.clients:
2361
1987
                    if c.dbus_object_path == object_path:
2362
 
                        del tcp_server.clients[c.name]
 
1988
                        tcp_server.clients.remove(c)
2363
1989
                        c.remove_from_connection()
2364
1990
                        # Don't signal anything except ClientRemoved
2365
1991
                        c.disable(quiet=True)
2370
1996
            
2371
1997
            del _interface
2372
1998
        
2373
 
        class MandosDBusServiceTransitional(MandosDBusService):
2374
 
            __metaclass__ = AlternateDBusNamesMetaclass
2375
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1999
        mandos_dbus_service = MandosDBusService()
2376
2000
    
2377
2001
    def cleanup():
2378
2002
        "Cleanup function; run on exit"
2379
2003
        service.cleanup()
2380
2004
        
2381
 
        multiprocessing.active_children()
2382
 
        if not (tcp_server.clients or client_settings):
2383
 
            return
2384
 
        
2385
 
        # Store client before exiting. Secrets are encrypted with key
2386
 
        # based on what config file has. If config file is
2387
 
        # removed/edited, old secret will thus be unrecovable.
2388
 
        clients = {}
2389
 
        with PGPEngine() as pgp:
2390
 
            for client in tcp_server.clients.itervalues():
2391
 
                key = client_settings[client.name]["secret"]
2392
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2393
 
                                                      key)
2394
 
                client_dict = {}
2395
 
                
2396
 
                # A list of attributes that can not be pickled
2397
 
                # + secret.
2398
 
                exclude = set(("bus", "changedstate", "secret",
2399
 
                               "checker"))
2400
 
                for name, typ in (inspect.getmembers
2401
 
                                  (dbus.service.Object)):
2402
 
                    exclude.add(name)
2403
 
                
2404
 
                client_dict["encrypted_secret"] = (client
2405
 
                                                   .encrypted_secret)
2406
 
                for attr in client.client_structure:
2407
 
                    if attr not in exclude:
2408
 
                        client_dict[attr] = getattr(client, attr)
2409
 
                
2410
 
                clients[client.name] = client_dict
2411
 
                del client_settings[client.name]["secret"]
2412
 
        
2413
 
        try:
2414
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2415
 
                                                prefix="clients-",
2416
 
                                                dir=os.path.dirname
2417
 
                                                (stored_state_path))
2418
 
            with os.fdopen(tempfd, "wb") as stored_state:
2419
 
                pickle.dump((clients, client_settings), stored_state)
2420
 
            os.rename(tempname, stored_state_path)
2421
 
        except (IOError, OSError) as e:
2422
 
            logger.warning("Could not save persistent state: {0}"
2423
 
                           .format(e))
2424
 
            if not debug:
2425
 
                try:
2426
 
                    os.remove(tempname)
2427
 
                except NameError:
2428
 
                    pass
2429
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2430
 
                                   errno.EEXIST)):
2431
 
                raise e
2432
 
        
2433
 
        # Delete all clients, and settings from config
2434
2005
        while tcp_server.clients:
2435
 
            name, client = tcp_server.clients.popitem()
 
2006
            client = tcp_server.clients.pop()
2436
2007
            if use_dbus:
2437
2008
                client.remove_from_connection()
 
2009
            client.disable_hook = None
2438
2010
            # Don't signal anything except ClientRemoved
2439
2011
            client.disable(quiet=True)
2440
2012
            if use_dbus:
2441
2013
                # Emit D-Bus signal
2442
 
                mandos_dbus_service.ClientRemoved(client
2443
 
                                                  .dbus_object_path,
 
2014
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2444
2015
                                                  client.name)
2445
 
        client_settings.clear()
2446
2016
    
2447
2017
    atexit.register(cleanup)
2448
2018
    
2449
 
    for client in tcp_server.clients.itervalues():
 
2019
    for client in tcp_server.clients:
2450
2020
        if use_dbus:
2451
2021
            # Emit D-Bus signal
2452
2022
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2453
 
        # Need to initiate checking of clients
2454
 
        if client.enabled:
2455
 
            client.init_checker()
 
2023
        client.enable()
2456
2024
    
2457
2025
    tcp_server.enable()
2458
2026
    tcp_server.server_activate()