/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-03-08 11:08:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110308110835-3sh7b314tf7q3o1i
* plugins.d/password-prompt.c (conflict_detection): Check for both
                                                    "plymouth" and
                                                    "plymouthd".

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@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,
36
36
 
37
37
import SocketServer as socketserver
38
38
import socket
39
 
import argparse
 
39
import optparse
40
40
import datetime
41
41
import errno
42
42
import gnutls.crypto
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
86
82
        SO_BINDTODEVICE = None
87
83
 
88
84
 
89
 
version = "1.4.1"
90
 
stored_state_file = "clients.pickle"
 
85
version = "1.2.3"
91
86
 
92
 
logger = logging.getLogger()
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
96
 
 
97
 
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
101
 
except (OSError, AttributeError):
102
 
    def if_nametoindex(interface):
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
 
        with contextlib.closing(socket.socket()) as s:
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
111
 
        return interface_index
112
 
 
113
 
 
114
 
def initlogger(level=logging.WARNING):
115
 
    """init logger and add loglevel"""
116
 
    
117
 
    syslogger.setFormatter(logging.Formatter
118
 
                           ('Mandos [%(process)d]: %(levelname)s:'
119
 
                            ' %(message)s'))
120
 
    logger.addHandler(syslogger)
121
 
    
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 CryptoError(Exception):
132
 
    pass
133
 
 
134
 
 
135
 
class Crypto(object):
136
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
137
 
    def __init__(self):
138
 
        self.gnupg = GnuPGInterface.GnuPG()
139
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.gnupg.options.meta_interactive = False
142
 
        self.gnupg.options.homedir = self.tempdir
143
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
144
 
                                              '--quiet'])
145
 
    
146
 
    def __enter__(self):
147
 
        return self
148
 
    
149
 
    def __exit__ (self, exc_type, exc_value, traceback):
150
 
        self._cleanup()
151
 
        return False
152
 
    
153
 
    def __del__(self):
154
 
        self._cleanup()
155
 
    
156
 
    def _cleanup(self):
157
 
        if self.tempdir is not None:
158
 
            # Delete contents of tempdir
159
 
            for root, dirs, files in os.walk(self.tempdir,
160
 
                                             topdown = False):
161
 
                for filename in files:
162
 
                    os.remove(os.path.join(root, filename))
163
 
                for dirname in dirs:
164
 
                    os.rmdir(os.path.join(root, dirname))
165
 
            # Remove tempdir
166
 
            os.rmdir(self.tempdir)
167
 
            self.tempdir = None
168
 
    
169
 
    def password_encode(self, password):
170
 
        # Passphrase can not be empty and can not contain newlines or
171
 
        # NUL bytes.  So we prefix it and hex encode it.
172
 
        return b"mandos" + binascii.hexlify(password)
173
 
    
174
 
    def encrypt(self, data, password):
175
 
        self.gnupg.passphrase = self.password_encode(password)
176
 
        with open(os.devnull) as devnull:
177
 
            try:
178
 
                proc = self.gnupg.run(['--symmetric'],
179
 
                                      create_fhs=['stdin', 'stdout'],
180
 
                                      attach_fhs={'stderr': devnull})
181
 
                with contextlib.closing(proc.handles['stdin']) as f:
182
 
                    f.write(data)
183
 
                with contextlib.closing(proc.handles['stdout']) as f:
184
 
                    ciphertext = f.read()
185
 
                proc.wait()
186
 
            except IOError as e:
187
 
                raise CryptoError(e)
188
 
        self.gnupg.passphrase = None
189
 
        return ciphertext
190
 
    
191
 
    def decrypt(self, data, password):
192
 
        self.gnupg.passphrase = self.password_encode(password)
193
 
        with open(os.devnull) as devnull:
194
 
            try:
195
 
                proc = self.gnupg.run(['--decrypt'],
196
 
                                      create_fhs=['stdin', 'stdout'],
197
 
                                      attach_fhs={'stderr': devnull})
198
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
199
 
                    f.write(data)
200
 
                with contextlib.closing(proc.handles['stdout']) as f:
201
 
                    decrypted_plaintext = f.read()
202
 
                proc.wait()
203
 
            except IOError as e:
204
 
                raise CryptoError(e)
205
 
        self.gnupg.passphrase = None
206
 
        return decrypted_plaintext
207
 
 
208
 
 
 
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)
209
102
 
210
103
class AvahiError(Exception):
211
104
    def __init__(self, value, *args, **kwargs):
258
151
        self.group = None       # our entry group
259
152
        self.server = None
260
153
        self.bus = bus
261
 
        self.entry_group_state_changed_match = None
262
154
    def rename(self):
263
155
        """Derived from the Avahi example code"""
264
156
        if self.rename_count >= self.max_renames:
266
158
                            " after %i retries, exiting.",
267
159
                            self.rename_count)
268
160
            raise AvahiServiceError("Too many renames")
269
 
        self.name = unicode(self.server
270
 
                            .GetAlternativeServiceName(self.name))
 
161
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
271
162
        logger.info("Changing Zeroconf service name to %r ...",
272
163
                    self.name)
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               ('Mandos (%s) [%%(process)d]:'
 
166
                                ' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
273
168
        self.remove()
274
169
        try:
275
170
            self.add()
276
 
        except dbus.exceptions.DBusException as error:
 
171
        except dbus.exceptions.DBusException, error:
277
172
            logger.critical("DBusException: %s", error)
278
173
            self.cleanup()
279
174
            os._exit(1)
280
175
        self.rename_count += 1
281
176
    def remove(self):
282
177
        """Derived from the Avahi example code"""
283
 
        if self.entry_group_state_changed_match is not None:
284
 
            self.entry_group_state_changed_match.remove()
285
 
            self.entry_group_state_changed_match = None
286
178
        if self.group is not None:
287
179
            self.group.Reset()
288
180
    def add(self):
289
181
        """Derived from the Avahi example code"""
290
 
        self.remove()
291
182
        if self.group is None:
292
183
            self.group = dbus.Interface(
293
184
                self.bus.get_object(avahi.DBUS_NAME,
294
185
                                    self.server.EntryGroupNew()),
295
186
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
296
 
        self.entry_group_state_changed_match = (
297
 
            self.group.connect_to_signal(
298
 
                'StateChanged', self.entry_group_state_changed))
 
187
            self.group.connect_to_signal('StateChanged',
 
188
                                         self
 
189
                                         .entry_group_state_changed)
299
190
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
300
191
                     self.name, self.type)
301
192
        self.group.AddService(
324
215
    def cleanup(self):
325
216
        """Derived from the Avahi example code"""
326
217
        if self.group is not None:
327
 
            try:
328
 
                self.group.Free()
329
 
            except (dbus.exceptions.UnknownMethodException,
330
 
                    dbus.exceptions.DBusException):
331
 
                pass
 
218
            self.group.Free()
332
219
            self.group = None
333
 
        self.remove()
334
 
    def server_state_changed(self, state, error=None):
 
220
    def server_state_changed(self, state):
335
221
        """Derived from the Avahi example code"""
336
222
        logger.debug("Avahi server state change: %i", state)
337
 
        bad_states = { avahi.SERVER_INVALID:
338
 
                           "Zeroconf server invalid",
339
 
                       avahi.SERVER_REGISTERING: None,
340
 
                       avahi.SERVER_COLLISION:
341
 
                           "Zeroconf server name collision",
342
 
                       avahi.SERVER_FAILURE:
343
 
                           "Zeroconf server failure" }
344
 
        if state in bad_states:
345
 
            if bad_states[state] is not None:
346
 
                if error is None:
347
 
                    logger.error(bad_states[state])
348
 
                else:
349
 
                    logger.error(bad_states[state] + ": %r", error)
350
 
            self.cleanup()
 
223
        if state == avahi.SERVER_COLLISION:
 
224
            logger.error("Zeroconf server name collision")
 
225
            self.remove()
351
226
        elif state == avahi.SERVER_RUNNING:
352
227
            self.add()
353
 
        else:
354
 
            if error is None:
355
 
                logger.debug("Unknown state: %r", state)
356
 
            else:
357
 
                logger.debug("Unknown state: %r: %r", state, error)
358
228
    def activate(self):
359
229
        """Derived from the Avahi example code"""
360
230
        if self.server is None:
361
231
            self.server = dbus.Interface(
362
232
                self.bus.get_object(avahi.DBUS_NAME,
363
 
                                    avahi.DBUS_PATH_SERVER,
364
 
                                    follow_name_owner_changes=True),
 
233
                                    avahi.DBUS_PATH_SERVER),
365
234
                avahi.DBUS_INTERFACE_SERVER)
366
235
        self.server.connect_to_signal("StateChanged",
367
236
                                 self.server_state_changed)
368
237
        self.server_state_changed(self.server.GetState())
369
238
 
370
 
class AvahiServiceToSyslog(AvahiService):
371
 
    def rename(self):
372
 
        """Add the new name to the syslog messages"""
373
 
        ret = AvahiService.rename(self)
374
 
        syslogger.setFormatter(logging.Formatter
375
 
                               ('Mandos (%s) [%%(process)d]:'
376
 
                                ' %%(levelname)s: %%(message)s'
377
 
                                % self.name))
378
 
        return ret
379
239
 
380
 
def _timedelta_to_milliseconds(td):
381
 
    "Convert a datetime.timedelta() to milliseconds"
382
 
    return ((td.days * 24 * 60 * 60 * 1000)
383
 
            + (td.seconds * 1000)
384
 
            + (td.microseconds // 1000))
385
 
        
386
240
class Client(object):
387
241
    """A representation of a client host served by this server.
388
242
    
400
254
                     instance %(name)s can be used in the command.
401
255
    checker_initiator_tag: a gobject event source tag, or None
402
256
    created:    datetime.datetime(); (UTC) object creation
403
 
    client_structure: Object describing what attributes a client has
404
 
                      and is used for storing the client at exit
405
257
    current_checker_command: string; current running checker_command
 
258
    disable_hook:  If set, called by disable() as disable_hook(self)
406
259
    disable_initiator_tag: a gobject event source tag, or None
407
260
    enabled:    bool()
408
261
    fingerprint: string (40 or 32 hexadecimal digits); used to
411
264
    interval:   datetime.timedelta(); How often to start a new checker
412
265
    last_approval_request: datetime.datetime(); (UTC) or None
413
266
    last_checked_ok: datetime.datetime(); (UTC) or None
414
 
 
415
 
    last_checker_status: integer between 0 and 255 reflecting exit
416
 
                         status of last checker. -1 reflects crashed
417
 
                         checker, or None.
418
267
    last_enabled: datetime.datetime(); (UTC)
419
268
    name:       string; from the config file, used in log messages and
420
269
                        D-Bus identifiers
421
270
    secret:     bytestring; sent verbatim (over TLS) to client
422
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
423
272
                                      until this client is disabled
424
 
    extended_timeout:   extra long timeout when password has been sent
425
273
    runtime_expansions: Allowed attributes for runtime expansion.
426
 
    expires:    datetime.datetime(); time (UTC) when a client will be
427
 
                disabled, or None
428
274
    """
429
275
    
430
276
    runtime_expansions = ("approval_delay", "approval_duration",
432
278
                          "host", "interval", "last_checked_ok",
433
279
                          "last_enabled", "name", "timeout")
434
280
    
 
281
    @staticmethod
 
282
    def _timedelta_to_milliseconds(td):
 
283
        "Convert a datetime.timedelta() to milliseconds"
 
284
        return ((td.days * 24 * 60 * 60 * 1000)
 
285
                + (td.seconds * 1000)
 
286
                + (td.microseconds // 1000))
 
287
    
435
288
    def timeout_milliseconds(self):
436
289
        "Return the 'timeout' attribute in milliseconds"
437
 
        return _timedelta_to_milliseconds(self.timeout)
438
 
    
439
 
    def extended_timeout_milliseconds(self):
440
 
        "Return the 'extended_timeout' attribute in milliseconds"
441
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
290
        return self._timedelta_to_milliseconds(self.timeout)
442
291
    
443
292
    def interval_milliseconds(self):
444
293
        "Return the 'interval' attribute in milliseconds"
445
 
        return _timedelta_to_milliseconds(self.interval)
446
 
    
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
295
 
447
296
    def approval_delay_milliseconds(self):
448
 
        return _timedelta_to_milliseconds(self.approval_delay)
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
449
298
    
450
 
    def __init__(self, name = None, config=None):
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
451
300
        """Note: the 'checker' key in 'config' sets the
452
301
        'checker_command' attribute and *not* the 'checker'
453
302
        attribute."""
473
322
                            % self.name)
474
323
        self.host = config.get("host", "")
475
324
        self.created = datetime.datetime.utcnow()
476
 
        self.enabled = True
 
325
        self.enabled = False
477
326
        self.last_approval_request = None
478
 
        self.last_enabled = datetime.datetime.utcnow()
 
327
        self.last_enabled = None
479
328
        self.last_checked_ok = None
480
 
        self.last_checker_status = None
481
329
        self.timeout = string_to_delta(config["timeout"])
482
 
        self.extended_timeout = string_to_delta(config
483
 
                                                ["extended_timeout"])
484
330
        self.interval = string_to_delta(config["interval"])
 
331
        self.disable_hook = disable_hook
485
332
        self.checker = None
486
333
        self.checker_initiator_tag = None
487
334
        self.disable_initiator_tag = None
488
 
        self.expires = datetime.datetime.utcnow() + self.timeout
489
335
        self.checker_callback_tag = None
490
336
        self.checker_command = config["checker"]
491
337
        self.current_checker_command = None
 
338
        self.last_connect = None
492
339
        self._approved = None
493
340
        self.approved_by_default = config.get("approved_by_default",
494
341
                                              True)
497
344
            config["approval_delay"])
498
345
        self.approval_duration = string_to_delta(
499
346
            config["approval_duration"])
500
 
        self.changedstate = (multiprocessing_manager
501
 
                             .Condition(multiprocessing_manager
502
 
                                        .Lock()))
503
 
        self.client_structure = [attr for attr in
504
 
                                 self.__dict__.iterkeys()
505
 
                                 if not attr.startswith("_")]
506
 
        self.client_structure.append("client_structure")
507
 
        
508
 
        for name, t in inspect.getmembers(type(self),
509
 
                                          lambda obj:
510
 
                                              isinstance(obj,
511
 
                                                         property)):
512
 
            if not name.startswith("_"):
513
 
                self.client_structure.append(name)
 
347
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
514
348
    
515
 
    # Send notice to process children that client state has changed
516
349
    def send_changedstate(self):
517
 
        with self.changedstate:
518
 
            self.changedstate.notify_all()
519
 
    
 
350
        self.changedstate.acquire()
 
351
        self.changedstate.notify_all()
 
352
        self.changedstate.release()
 
353
        
520
354
    def enable(self):
521
355
        """Start this client's checker and timeout hooks"""
522
356
        if getattr(self, "enabled", False):
523
357
            # Already enabled
524
358
            return
525
359
        self.send_changedstate()
526
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
360
        self.last_enabled = datetime.datetime.utcnow()
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
362
        # and every interval from then on.
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
364
                                      (self.interval_milliseconds(),
 
365
                                       self.start_checker))
 
366
        # Schedule a disable() when 'timeout' has passed
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
368
                                   (self.timeout_milliseconds(),
 
369
                                    self.disable))
527
370
        self.enabled = True
528
 
        self.last_enabled = datetime.datetime.utcnow()
529
 
        self.init_checker()
 
371
        # Also start a new checker *right now*.
 
372
        self.start_checker()
530
373
    
531
374
    def disable(self, quiet=True):
532
375
        """Disable this client."""
539
382
        if getattr(self, "disable_initiator_tag", False):
540
383
            gobject.source_remove(self.disable_initiator_tag)
541
384
            self.disable_initiator_tag = None
542
 
        self.expires = None
543
385
        if getattr(self, "checker_initiator_tag", False):
544
386
            gobject.source_remove(self.checker_initiator_tag)
545
387
            self.checker_initiator_tag = None
546
388
        self.stop_checker()
 
389
        if self.disable_hook:
 
390
            self.disable_hook(self)
547
391
        self.enabled = False
548
392
        # Do not run this again if called by a gobject.timeout_add
549
393
        return False
550
394
    
551
395
    def __del__(self):
 
396
        self.disable_hook = None
552
397
        self.disable()
553
398
    
554
 
    def init_checker(self):
555
 
        # Schedule a new checker to be started an 'interval' from now,
556
 
        # and every interval from then on.
557
 
        self.checker_initiator_tag = (gobject.timeout_add
558
 
                                      (self.interval_milliseconds(),
559
 
                                       self.start_checker))
560
 
        # Schedule a disable() when 'timeout' has passed
561
 
        self.disable_initiator_tag = (gobject.timeout_add
562
 
                                   (self.timeout_milliseconds(),
563
 
                                    self.disable))
564
 
        # Also start a new checker *right now*.
565
 
        self.start_checker()
566
 
    
567
399
    def checker_callback(self, pid, condition, command):
568
400
        """The checker has completed, so take appropriate actions."""
569
401
        self.checker_callback_tag = None
570
402
        self.checker = None
571
403
        if os.WIFEXITED(condition):
572
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
573
 
            if self.last_checker_status == 0:
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
405
            if exitstatus == 0:
574
406
                logger.info("Checker for %(name)s succeeded",
575
407
                            vars(self))
576
408
                self.checked_ok()
578
410
                logger.info("Checker for %(name)s failed",
579
411
                            vars(self))
580
412
        else:
581
 
            self.last_checker_status = -1
582
413
            logger.warning("Checker for %(name)s crashed?",
583
414
                           vars(self))
584
415
    
585
 
    def checked_ok(self, timeout=None):
 
416
    def checked_ok(self):
586
417
        """Bump up the timeout for this client.
587
418
        
588
419
        This should only be called when the client has been seen,
589
420
        alive and well.
590
421
        """
591
 
        if timeout is None:
592
 
            timeout = self.timeout
593
422
        self.last_checked_ok = datetime.datetime.utcnow()
594
 
        if self.disable_initiator_tag is not None:
595
 
            gobject.source_remove(self.disable_initiator_tag)
596
 
        if getattr(self, "enabled", False):
597
 
            self.disable_initiator_tag = (gobject.timeout_add
598
 
                                          (_timedelta_to_milliseconds
599
 
                                           (timeout), self.disable))
600
 
            self.expires = datetime.datetime.utcnow() + timeout
 
423
        gobject.source_remove(self.disable_initiator_tag)
 
424
        self.disable_initiator_tag = (gobject.timeout_add
 
425
                                      (self.timeout_milliseconds(),
 
426
                                       self.disable))
601
427
    
602
428
    def need_approval(self):
603
429
        self.last_approval_request = datetime.datetime.utcnow()
619
445
        # If a checker exists, make sure it is not a zombie
620
446
        try:
621
447
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
622
 
        except (AttributeError, OSError) as error:
 
448
        except (AttributeError, OSError), error:
623
449
            if (isinstance(error, OSError)
624
450
                and error.errno != errno.ECHILD):
625
451
                raise error
643
469
                                       'replace')))
644
470
                    for attr in
645
471
                    self.runtime_expansions)
646
 
                
 
472
 
647
473
                try:
648
474
                    command = self.checker_command % escaped_attrs
649
 
                except TypeError as error:
 
475
                except TypeError, error:
650
476
                    logger.error('Could not format string "%s":'
651
477
                                 ' %s', self.checker_command, error)
652
478
                    return True # Try again later
671
497
                if pid:
672
498
                    gobject.source_remove(self.checker_callback_tag)
673
499
                    self.checker_callback(pid, status, command)
674
 
            except OSError as error:
 
500
            except OSError, error:
675
501
                logger.error("Failed to start subprocess: %s",
676
502
                             error)
677
503
        # Re-run this periodically if run by gobject.timeout_add
690
516
            #time.sleep(0.5)
691
517
            #if self.checker.poll() is None:
692
518
            #    os.kill(self.checker.pid, signal.SIGKILL)
693
 
        except OSError as error:
 
519
        except OSError, error:
694
520
            if error.errno != errno.ESRCH: # No such process
695
521
                raise
696
522
        self.checker = None
697
523
 
698
 
 
699
524
def dbus_service_property(dbus_interface, signature="v",
700
525
                          access="readwrite", byte_arrays=False):
701
526
    """Decorators for marking methods of a DBusObjectWithProperties to
747
572
 
748
573
class DBusObjectWithProperties(dbus.service.Object):
749
574
    """A D-Bus object with properties.
750
 
    
 
575
 
751
576
    Classes inheriting from this can use the dbus_service_property
752
577
    decorator to expose methods as D-Bus properties.  It exposes the
753
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
760
585
    def _get_all_dbus_properties(self):
761
586
        """Returns a generator of (name, attribute) pairs
762
587
        """
763
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
764
 
                for cls in self.__class__.__mro__
 
588
        return ((prop._dbus_name, prop)
765
589
                for name, prop in
766
 
                inspect.getmembers(cls, self._is_dbus_property))
 
590
                inspect.getmembers(self, self._is_dbus_property))
767
591
    
768
592
    def _get_dbus_property(self, interface_name, property_name):
769
593
        """Returns a bound method if one exists which is a D-Bus
770
594
        property with the specified name and interface.
771
595
        """
772
 
        for cls in  self.__class__.__mro__:
773
 
            for name, value in (inspect.getmembers
774
 
                                (cls, self._is_dbus_property)):
775
 
                if (value._dbus_name == property_name
776
 
                    and value._dbus_interface == interface_name):
777
 
                    return value.__get__(self)
778
 
        
 
596
        for name in (property_name,
 
597
                     property_name + "_dbus_property"):
 
598
            prop = getattr(self, name, None)
 
599
            if (prop is None
 
600
                or not self._is_dbus_property(prop)
 
601
                or prop._dbus_name != property_name
 
602
                or (interface_name and prop._dbus_interface
 
603
                    and interface_name != prop._dbus_interface)):
 
604
                continue
 
605
            return prop
779
606
        # No such property
780
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
781
608
                                   + interface_name + "."
815
642
    def GetAll(self, interface_name):
816
643
        """Standard D-Bus property GetAll() method, see D-Bus
817
644
        standard.
818
 
        
 
645
 
819
646
        Note: Will not include properties with access="write".
820
647
        """
821
 
        properties = {}
 
648
        all = {}
822
649
        for name, prop in self._get_all_dbus_properties():
823
650
            if (interface_name
824
651
                and interface_name != prop._dbus_interface):
829
656
                continue
830
657
            value = prop()
831
658
            if not hasattr(value, "variant_level"):
832
 
                properties[name] = value
 
659
                all[name] = value
833
660
                continue
834
 
            properties[name] = type(value)(value, variant_level=
835
 
                                           value.variant_level+1)
836
 
        return dbus.Dictionary(properties, signature="sv")
 
661
            all[name] = type(value)(value, variant_level=
 
662
                                    value.variant_level+1)
 
663
        return dbus.Dictionary(all, signature="sv")
837
664
    
838
665
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
839
666
                         out_signature="s",
877
704
            xmlstring = document.toxml("utf-8")
878
705
            document.unlink()
879
706
        except (AttributeError, xml.dom.DOMException,
880
 
                xml.parsers.expat.ExpatError) as error:
 
707
                xml.parsers.expat.ExpatError), error:
881
708
            logger.error("Failed to override Introspection method",
882
709
                         error)
883
710
        return xmlstring
884
711
 
885
712
 
886
 
def datetime_to_dbus (dt, variant_level=0):
887
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
888
 
    if dt is None:
889
 
        return dbus.String("", variant_level = variant_level)
890
 
    return dbus.String(dt.isoformat(),
891
 
                       variant_level=variant_level)
892
 
 
893
 
 
894
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
895
 
                                  .__metaclass__):
896
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
897
 
    will add additional D-Bus attributes matching a certain pattern.
898
 
    """
899
 
    def __new__(mcs, name, bases, attr):
900
 
        # Go through all the base classes which could have D-Bus
901
 
        # methods, signals, or properties in them
902
 
        for base in (b for b in bases
903
 
                     if issubclass(b, dbus.service.Object)):
904
 
            # Go though all attributes of the base class
905
 
            for attrname, attribute in inspect.getmembers(base):
906
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
907
 
                # with the wrong interface name
908
 
                if (not hasattr(attribute, "_dbus_interface")
909
 
                    or not attribute._dbus_interface
910
 
                    .startswith("se.recompile.Mandos")):
911
 
                    continue
912
 
                # Create an alternate D-Bus interface name based on
913
 
                # the current name
914
 
                alt_interface = (attribute._dbus_interface
915
 
                                 .replace("se.recompile.Mandos",
916
 
                                          "se.bsnet.fukt.Mandos"))
917
 
                # Is this a D-Bus signal?
918
 
                if getattr(attribute, "_dbus_is_signal", False):
919
 
                    # Extract the original non-method function by
920
 
                    # black magic
921
 
                    nonmethod_func = (dict(
922
 
                            zip(attribute.func_code.co_freevars,
923
 
                                attribute.__closure__))["func"]
924
 
                                      .cell_contents)
925
 
                    # Create a new, but exactly alike, function
926
 
                    # object, and decorate it to be a new D-Bus signal
927
 
                    # with the alternate D-Bus interface name
928
 
                    new_function = (dbus.service.signal
929
 
                                    (alt_interface,
930
 
                                     attribute._dbus_signature)
931
 
                                    (types.FunctionType(
932
 
                                nonmethod_func.func_code,
933
 
                                nonmethod_func.func_globals,
934
 
                                nonmethod_func.func_name,
935
 
                                nonmethod_func.func_defaults,
936
 
                                nonmethod_func.func_closure)))
937
 
                    # Define a creator of a function to call both the
938
 
                    # old and new functions, so both the old and new
939
 
                    # signals gets sent when the function is called
940
 
                    def fixscope(func1, func2):
941
 
                        """This function is a scope container to pass
942
 
                        func1 and func2 to the "call_both" function
943
 
                        outside of its arguments"""
944
 
                        def call_both(*args, **kwargs):
945
 
                            """This function will emit two D-Bus
946
 
                            signals by calling func1 and func2"""
947
 
                            func1(*args, **kwargs)
948
 
                            func2(*args, **kwargs)
949
 
                        return call_both
950
 
                    # Create the "call_both" function and add it to
951
 
                    # the class
952
 
                    attr[attrname] = fixscope(attribute,
953
 
                                              new_function)
954
 
                # Is this a D-Bus method?
955
 
                elif getattr(attribute, "_dbus_is_method", False):
956
 
                    # Create a new, but exactly alike, function
957
 
                    # object.  Decorate it to be a new D-Bus method
958
 
                    # with the alternate D-Bus interface name.  Add it
959
 
                    # to the class.
960
 
                    attr[attrname] = (dbus.service.method
961
 
                                      (alt_interface,
962
 
                                       attribute._dbus_in_signature,
963
 
                                       attribute._dbus_out_signature)
964
 
                                      (types.FunctionType
965
 
                                       (attribute.func_code,
966
 
                                        attribute.func_globals,
967
 
                                        attribute.func_name,
968
 
                                        attribute.func_defaults,
969
 
                                        attribute.func_closure)))
970
 
                # Is this a D-Bus property?
971
 
                elif getattr(attribute, "_dbus_is_property", False):
972
 
                    # Create a new, but exactly alike, function
973
 
                    # object, and decorate it to be a new D-Bus
974
 
                    # property with the alternate D-Bus interface
975
 
                    # name.  Add it to the class.
976
 
                    attr[attrname] = (dbus_service_property
977
 
                                      (alt_interface,
978
 
                                       attribute._dbus_signature,
979
 
                                       attribute._dbus_access,
980
 
                                       attribute
981
 
                                       ._dbus_get_args_options
982
 
                                       ["byte_arrays"])
983
 
                                      (types.FunctionType
984
 
                                       (attribute.func_code,
985
 
                                        attribute.func_globals,
986
 
                                        attribute.func_name,
987
 
                                        attribute.func_defaults,
988
 
                                        attribute.func_closure)))
989
 
        return type.__new__(mcs, name, bases, attr)
990
 
 
991
 
 
992
713
class ClientDBus(Client, DBusObjectWithProperties):
993
714
    """A Client class using D-Bus
994
715
    
1003
724
    # dbus.service.Object doesn't use super(), so we can't either.
1004
725
    
1005
726
    def __init__(self, bus = None, *args, **kwargs):
 
727
        self._approvals_pending = 0
1006
728
        self.bus = bus
1007
729
        Client.__init__(self, *args, **kwargs)
1008
 
        
1009
 
        self._approvals_pending = 0
1010
730
        # Only now, when this client is initialized, can it show up on
1011
731
        # the D-Bus
1012
732
        client_object_name = unicode(self.name).translate(
1017
737
        DBusObjectWithProperties.__init__(self, self.bus,
1018
738
                                          self.dbus_object_path)
1019
739
        
1020
 
    def notifychangeproperty(transform_func,
1021
 
                             dbus_name, type_func=lambda x: x,
1022
 
                             variant_level=1):
1023
 
        """ Modify a variable so that it's a property which announces
1024
 
        its changes to DBus.
1025
 
        
1026
 
        transform_fun: Function that takes a value and a variant_level
1027
 
                       and transforms it to a D-Bus type.
1028
 
        dbus_name: D-Bus name of the variable
1029
 
        type_func: Function that transform the value before sending it
1030
 
                   to the D-Bus.  Default: no transform
1031
 
        variant_level: D-Bus variant level.  Default: 1
1032
 
        """
1033
 
        attrname = "_{0}".format(dbus_name)
1034
 
        def setter(self, value):
1035
 
            if hasattr(self, "dbus_object_path"):
1036
 
                if (not hasattr(self, attrname) or
1037
 
                    type_func(getattr(self, attrname, None))
1038
 
                    != type_func(value)):
1039
 
                    dbus_value = transform_func(type_func(value),
1040
 
                                                variant_level
1041
 
                                                =variant_level)
1042
 
                    self.PropertyChanged(dbus.String(dbus_name),
1043
 
                                         dbus_value)
1044
 
            setattr(self, attrname, value)
1045
 
        
1046
 
        return property(lambda self: getattr(self, attrname), setter)
1047
 
    
1048
 
    
1049
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1050
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1051
 
                                             "ApprovalPending",
1052
 
                                             type_func = bool)
1053
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1054
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1055
 
                                        "LastEnabled")
1056
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1057
 
                                   type_func = lambda checker:
1058
 
                                       checker is not None)
1059
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1060
 
                                           "LastCheckedOK")
1061
 
    last_approval_request = notifychangeproperty(
1062
 
        datetime_to_dbus, "LastApprovalRequest")
1063
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1064
 
                                               "ApprovedByDefault")
1065
 
    approval_delay = notifychangeproperty(dbus.UInt16,
1066
 
                                          "ApprovalDelay",
1067
 
                                          type_func =
1068
 
                                          _timedelta_to_milliseconds)
1069
 
    approval_duration = notifychangeproperty(
1070
 
        dbus.UInt16, "ApprovalDuration",
1071
 
        type_func = _timedelta_to_milliseconds)
1072
 
    host = notifychangeproperty(dbus.String, "Host")
1073
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1074
 
                                   type_func =
1075
 
                                   _timedelta_to_milliseconds)
1076
 
    extended_timeout = notifychangeproperty(
1077
 
        dbus.UInt16, "ExtendedTimeout",
1078
 
        type_func = _timedelta_to_milliseconds)
1079
 
    interval = notifychangeproperty(dbus.UInt16,
1080
 
                                    "Interval",
1081
 
                                    type_func =
1082
 
                                    _timedelta_to_milliseconds)
1083
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1084
 
    
1085
 
    del notifychangeproperty
 
740
    def _get_approvals_pending(self):
 
741
        return self._approvals_pending
 
742
    def _set_approvals_pending(self, value):
 
743
        old_value = self._approvals_pending
 
744
        self._approvals_pending = value
 
745
        bval = bool(value)
 
746
        if (hasattr(self, "dbus_object_path")
 
747
            and bval is not bool(old_value)):
 
748
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
749
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
750
                                 dbus_bool)
 
751
 
 
752
    approvals_pending = property(_get_approvals_pending,
 
753
                                 _set_approvals_pending)
 
754
    del _get_approvals_pending, _set_approvals_pending
 
755
    
 
756
    @staticmethod
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
759
        return dbus.String(dt.isoformat(),
 
760
                           variant_level=variant_level)
 
761
    
 
762
    def enable(self):
 
763
        oldstate = getattr(self, "enabled", False)
 
764
        r = Client.enable(self)
 
765
        if oldstate != self.enabled:
 
766
            # Emit D-Bus signals
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
768
                                 dbus.Boolean(True, variant_level=1))
 
769
            self.PropertyChanged(
 
770
                dbus.String("LastEnabled"),
 
771
                self._datetime_to_dbus(self.last_enabled,
 
772
                                       variant_level=1))
 
773
        return r
 
774
    
 
775
    def disable(self, quiet = False):
 
776
        oldstate = getattr(self, "enabled", False)
 
777
        r = Client.disable(self, quiet=quiet)
 
778
        if not quiet and oldstate != self.enabled:
 
779
            # Emit D-Bus signal
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
781
                                 dbus.Boolean(False, variant_level=1))
 
782
        return r
1086
783
    
1087
784
    def __del__(self, *args, **kwargs):
1088
785
        try:
1097
794
                         *args, **kwargs):
1098
795
        self.checker_callback_tag = None
1099
796
        self.checker = None
 
797
        # Emit D-Bus signal
 
798
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
799
                             dbus.Boolean(False, variant_level=1))
1100
800
        if os.WIFEXITED(condition):
1101
801
            exitstatus = os.WEXITSTATUS(condition)
1102
802
            # Emit D-Bus signal
1112
812
        return Client.checker_callback(self, pid, condition, command,
1113
813
                                       *args, **kwargs)
1114
814
    
 
815
    def checked_ok(self, *args, **kwargs):
 
816
        r = Client.checked_ok(self, *args, **kwargs)
 
817
        # Emit D-Bus signal
 
818
        self.PropertyChanged(
 
819
            dbus.String("LastCheckedOK"),
 
820
            (self._datetime_to_dbus(self.last_checked_ok,
 
821
                                    variant_level=1)))
 
822
        return r
 
823
    
 
824
    def need_approval(self, *args, **kwargs):
 
825
        r = Client.need_approval(self, *args, **kwargs)
 
826
        # Emit D-Bus signal
 
827
        self.PropertyChanged(
 
828
            dbus.String("LastApprovalRequest"),
 
829
            (self._datetime_to_dbus(self.last_approval_request,
 
830
                                    variant_level=1)))
 
831
        return r
 
832
    
1115
833
    def start_checker(self, *args, **kwargs):
1116
834
        old_checker = self.checker
1117
835
        if self.checker is not None:
1124
842
            and old_checker_pid != self.checker.pid):
1125
843
            # Emit D-Bus signal
1126
844
            self.CheckerStarted(self.current_checker_command)
 
845
            self.PropertyChanged(
 
846
                dbus.String("CheckerRunning"),
 
847
                dbus.Boolean(True, variant_level=1))
1127
848
        return r
1128
849
    
 
850
    def stop_checker(self, *args, **kwargs):
 
851
        old_checker = getattr(self, "checker", None)
 
852
        r = Client.stop_checker(self, *args, **kwargs)
 
853
        if (old_checker is not None
 
854
            and getattr(self, "checker", None) is None):
 
855
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
856
                                 dbus.Boolean(False, variant_level=1))
 
857
        return r
 
858
 
1129
859
    def _reset_approved(self):
1130
860
        self._approved = None
1131
861
        return False
1133
863
    def approve(self, value=True):
1134
864
        self.send_changedstate()
1135
865
        self._approved = value
1136
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
866
        gobject.timeout_add(self._timedelta_to_milliseconds
1137
867
                            (self.approval_duration),
1138
868
                            self._reset_approved)
1139
869
    
1140
870
    
1141
871
    ## D-Bus methods, signals & properties
1142
 
    _interface = "se.recompile.Mandos.Client"
 
872
    _interface = "se.bsnet.fukt.Mandos.Client"
1143
873
    
1144
874
    ## Signals
1145
875
    
1182
912
        "D-Bus signal"
1183
913
        return self.need_approval()
1184
914
    
1185
 
    # NeRwequest - signal
1186
 
    @dbus.service.signal(_interface, signature="s")
1187
 
    def NewRequest(self, ip):
1188
 
        """D-Bus signal
1189
 
        Is sent after a client request a password.
1190
 
        """
1191
 
        pass
1192
 
    
1193
915
    ## Methods
1194
916
    
1195
917
    # Approve - method
1200
922
    # CheckedOK - method
1201
923
    @dbus.service.method(_interface)
1202
924
    def CheckedOK(self):
1203
 
        self.checked_ok()
 
925
        return self.checked_ok()
1204
926
    
1205
927
    # Enable - method
1206
928
    @dbus.service.method(_interface)
1239
961
        if value is None:       # get
1240
962
            return dbus.Boolean(self.approved_by_default)
1241
963
        self.approved_by_default = bool(value)
 
964
        # Emit D-Bus signal
 
965
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
966
                             dbus.Boolean(value, variant_level=1))
1242
967
    
1243
968
    # ApprovalDelay - property
1244
969
    @dbus_service_property(_interface, signature="t",
1247
972
        if value is None:       # get
1248
973
            return dbus.UInt64(self.approval_delay_milliseconds())
1249
974
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
975
        # Emit D-Bus signal
 
976
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
977
                             dbus.UInt64(value, variant_level=1))
1250
978
    
1251
979
    # ApprovalDuration - property
1252
980
    @dbus_service_property(_interface, signature="t",
1253
981
                           access="readwrite")
1254
982
    def ApprovalDuration_dbus_property(self, value=None):
1255
983
        if value is None:       # get
1256
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
984
            return dbus.UInt64(self._timedelta_to_milliseconds(
1257
985
                    self.approval_duration))
1258
986
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
987
        # Emit D-Bus signal
 
988
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
989
                             dbus.UInt64(value, variant_level=1))
1259
990
    
1260
991
    # Name - property
1261
992
    @dbus_service_property(_interface, signature="s", access="read")
1274
1005
        if value is None:       # get
1275
1006
            return dbus.String(self.host)
1276
1007
        self.host = value
 
1008
        # Emit D-Bus signal
 
1009
        self.PropertyChanged(dbus.String("Host"),
 
1010
                             dbus.String(value, variant_level=1))
1277
1011
    
1278
1012
    # Created - property
1279
1013
    @dbus_service_property(_interface, signature="s", access="read")
1280
1014
    def Created_dbus_property(self):
1281
 
        return dbus.String(datetime_to_dbus(self.created))
 
1015
        return dbus.String(self._datetime_to_dbus(self.created))
1282
1016
    
1283
1017
    # LastEnabled - property
1284
1018
    @dbus_service_property(_interface, signature="s", access="read")
1285
1019
    def LastEnabled_dbus_property(self):
1286
 
        return datetime_to_dbus(self.last_enabled)
 
1020
        if self.last_enabled is None:
 
1021
            return dbus.String("")
 
1022
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1287
1023
    
1288
1024
    # Enabled - property
1289
1025
    @dbus_service_property(_interface, signature="b",
1303
1039
        if value is not None:
1304
1040
            self.checked_ok()
1305
1041
            return
1306
 
        return datetime_to_dbus(self.last_checked_ok)
1307
 
    
1308
 
    # Expires - property
1309
 
    @dbus_service_property(_interface, signature="s", access="read")
1310
 
    def Expires_dbus_property(self):
1311
 
        return datetime_to_dbus(self.expires)
 
1042
        if self.last_checked_ok is None:
 
1043
            return dbus.String("")
 
1044
        return dbus.String(self._datetime_to_dbus(self
 
1045
                                                  .last_checked_ok))
1312
1046
    
1313
1047
    # LastApprovalRequest - property
1314
1048
    @dbus_service_property(_interface, signature="s", access="read")
1315
1049
    def LastApprovalRequest_dbus_property(self):
1316
 
        return datetime_to_dbus(self.last_approval_request)
 
1050
        if self.last_approval_request is None:
 
1051
            return dbus.String("")
 
1052
        return dbus.String(self.
 
1053
                           _datetime_to_dbus(self
 
1054
                                             .last_approval_request))
1317
1055
    
1318
1056
    # Timeout - property
1319
1057
    @dbus_service_property(_interface, signature="t",
1322
1060
        if value is None:       # get
1323
1061
            return dbus.UInt64(self.timeout_milliseconds())
1324
1062
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1063
        # Emit D-Bus signal
 
1064
        self.PropertyChanged(dbus.String("Timeout"),
 
1065
                             dbus.UInt64(value, variant_level=1))
1325
1066
        if getattr(self, "disable_initiator_tag", None) is None:
1326
1067
            return
1327
1068
        # Reschedule timeout
1328
1069
        gobject.source_remove(self.disable_initiator_tag)
1329
1070
        self.disable_initiator_tag = None
1330
 
        self.expires = None
1331
 
        time_to_die = _timedelta_to_milliseconds((self
1332
 
                                                  .last_checked_ok
1333
 
                                                  + self.timeout)
1334
 
                                                 - datetime.datetime
1335
 
                                                 .utcnow())
 
1071
        time_to_die = (self.
 
1072
                       _timedelta_to_milliseconds((self
 
1073
                                                   .last_checked_ok
 
1074
                                                   + self.timeout)
 
1075
                                                  - datetime.datetime
 
1076
                                                  .utcnow()))
1336
1077
        if time_to_die <= 0:
1337
1078
            # The timeout has passed
1338
1079
            self.disable()
1339
1080
        else:
1340
 
            self.expires = (datetime.datetime.utcnow()
1341
 
                            + datetime.timedelta(milliseconds =
1342
 
                                                 time_to_die))
1343
1081
            self.disable_initiator_tag = (gobject.timeout_add
1344
1082
                                          (time_to_die, self.disable))
1345
1083
    
1346
 
    # ExtendedTimeout - property
1347
 
    @dbus_service_property(_interface, signature="t",
1348
 
                           access="readwrite")
1349
 
    def ExtendedTimeout_dbus_property(self, value=None):
1350
 
        if value is None:       # get
1351
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1352
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1353
 
    
1354
1084
    # Interval - property
1355
1085
    @dbus_service_property(_interface, signature="t",
1356
1086
                           access="readwrite")
1358
1088
        if value is None:       # get
1359
1089
            return dbus.UInt64(self.interval_milliseconds())
1360
1090
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1091
        # Emit D-Bus signal
 
1092
        self.PropertyChanged(dbus.String("Interval"),
 
1093
                             dbus.UInt64(value, variant_level=1))
1361
1094
        if getattr(self, "checker_initiator_tag", None) is None:
1362
1095
            return
1363
1096
        # Reschedule checker run
1365
1098
        self.checker_initiator_tag = (gobject.timeout_add
1366
1099
                                      (value, self.start_checker))
1367
1100
        self.start_checker()    # Start one now, too
1368
 
    
 
1101
 
1369
1102
    # Checker - property
1370
1103
    @dbus_service_property(_interface, signature="s",
1371
1104
                           access="readwrite")
1373
1106
        if value is None:       # get
1374
1107
            return dbus.String(self.checker_command)
1375
1108
        self.checker_command = value
 
1109
        # Emit D-Bus signal
 
1110
        self.PropertyChanged(dbus.String("Checker"),
 
1111
                             dbus.String(self.checker_command,
 
1112
                                         variant_level=1))
1376
1113
    
1377
1114
    # CheckerRunning - property
1378
1115
    @dbus_service_property(_interface, signature="b",
1405
1142
        self._pipe.send(('init', fpr, address))
1406
1143
        if not self._pipe.recv():
1407
1144
            raise KeyError()
1408
 
    
 
1145
 
1409
1146
    def __getattribute__(self, name):
1410
1147
        if(name == '_pipe'):
1411
1148
            return super(ProxyClient, self).__getattribute__(name)
1418
1155
                self._pipe.send(('funcall', name, args, kwargs))
1419
1156
                return self._pipe.recv()[1]
1420
1157
            return func
1421
 
    
 
1158
 
1422
1159
    def __setattr__(self, name, value):
1423
1160
        if(name == '_pipe'):
1424
1161
            return super(ProxyClient, self).__setattr__(name, value)
1425
1162
        self._pipe.send(('setattr', name, value))
1426
1163
 
1427
1164
 
1428
 
class ClientDBusTransitional(ClientDBus):
1429
 
    __metaclass__ = AlternateDBusNamesMetaclass
1430
 
 
1431
 
 
1432
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
1433
1166
    """A class to handle client connections.
1434
1167
    
1441
1174
                        unicode(self.client_address))
1442
1175
            logger.debug("Pipe FD: %d",
1443
1176
                         self.server.child_pipe.fileno())
1444
 
            
 
1177
 
1445
1178
            session = (gnutls.connection
1446
1179
                       .ClientSession(self.request,
1447
1180
                                      gnutls.connection
1448
1181
                                      .X509Credentials()))
1449
 
            
 
1182
 
1450
1183
            # Note: gnutls.connection.X509Credentials is really a
1451
1184
            # generic GnuTLS certificate credentials object so long as
1452
1185
            # no X.509 keys are added to it.  Therefore, we can use it
1453
1186
            # here despite using OpenPGP certificates.
1454
 
            
 
1187
 
1455
1188
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1456
1189
            #                      "+AES-256-CBC", "+SHA1",
1457
1190
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1463
1196
            (gnutls.library.functions
1464
1197
             .gnutls_priority_set_direct(session._c_object,
1465
1198
                                         priority, None))
1466
 
            
 
1199
 
1467
1200
            # Start communication using the Mandos protocol
1468
1201
            # Get protocol number
1469
1202
            line = self.request.makefile().readline()
1471
1204
            try:
1472
1205
                if int(line.strip().split()[0]) > 1:
1473
1206
                    raise RuntimeError
1474
 
            except (ValueError, IndexError, RuntimeError) as error:
 
1207
            except (ValueError, IndexError, RuntimeError), error:
1475
1208
                logger.error("Unknown protocol version: %s", error)
1476
1209
                return
1477
 
            
 
1210
 
1478
1211
            # Start GnuTLS connection
1479
1212
            try:
1480
1213
                session.handshake()
1481
 
            except gnutls.errors.GNUTLSError as error:
 
1214
            except gnutls.errors.GNUTLSError, error:
1482
1215
                logger.warning("Handshake failed: %s", error)
1483
1216
                # Do not run session.bye() here: the session is not
1484
1217
                # established.  Just abandon the request.
1485
1218
                return
1486
1219
            logger.debug("Handshake succeeded")
1487
 
            
 
1220
 
1488
1221
            approval_required = False
1489
1222
            try:
1490
1223
                try:
1491
1224
                    fpr = self.fingerprint(self.peer_certificate
1492
1225
                                           (session))
1493
 
                except (TypeError,
1494
 
                        gnutls.errors.GNUTLSError) as error:
 
1226
                except (TypeError, gnutls.errors.GNUTLSError), error:
1495
1227
                    logger.warning("Bad certificate: %s", error)
1496
1228
                    return
1497
1229
                logger.debug("Fingerprint: %s", fpr)
1498
 
                if self.server.use_dbus:
1499
 
                    # Emit D-Bus signal
1500
 
                    client.NewRequest(str(self.client_address))
1501
 
                
 
1230
 
1502
1231
                try:
1503
1232
                    client = ProxyClient(child_pipe, fpr,
1504
1233
                                         self.client_address)
1512
1241
                
1513
1242
                while True:
1514
1243
                    if not client.enabled:
1515
 
                        logger.info("Client %s is disabled",
 
1244
                        logger.warning("Client %s is disabled",
1516
1245
                                       client.name)
1517
1246
                        if self.server.use_dbus:
1518
1247
                            # Emit D-Bus signal
1519
 
                            client.Rejected("Disabled")
 
1248
                            client.Rejected("Disabled")                    
1520
1249
                        return
1521
1250
                    
1522
1251
                    if client._approved or not client.approval_delay:
1539
1268
                        return
1540
1269
                    
1541
1270
                    #wait until timeout or approved
 
1271
                    #x = float(client._timedelta_to_milliseconds(delay))
1542
1272
                    time = datetime.datetime.now()
1543
1273
                    client.changedstate.acquire()
1544
 
                    (client.changedstate.wait
1545
 
                     (float(client._timedelta_to_milliseconds(delay)
1546
 
                            / 1000)))
 
1274
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1547
1275
                    client.changedstate.release()
1548
1276
                    time2 = datetime.datetime.now()
1549
1277
                    if (time2 - time) >= delay:
1564
1292
                while sent_size < len(client.secret):
1565
1293
                    try:
1566
1294
                        sent = session.send(client.secret[sent_size:])
1567
 
                    except gnutls.errors.GNUTLSError as error:
 
1295
                    except (gnutls.errors.GNUTLSError), error:
1568
1296
                        logger.warning("gnutls send failed")
1569
1297
                        return
1570
1298
                    logger.debug("Sent: %d, remaining: %d",
1571
1299
                                 sent, len(client.secret)
1572
1300
                                 - (sent_size + sent))
1573
1301
                    sent_size += sent
1574
 
                
 
1302
 
1575
1303
                logger.info("Sending secret to %s", client.name)
1576
 
                # bump the timeout using extended_timeout
1577
 
                client.checked_ok(client.extended_timeout)
 
1304
                # bump the timeout as if seen
 
1305
                client.checked_ok()
1578
1306
                if self.server.use_dbus:
1579
1307
                    # Emit D-Bus signal
1580
1308
                    client.GotSecret()
1584
1312
                    client.approvals_pending -= 1
1585
1313
                try:
1586
1314
                    session.bye()
1587
 
                except gnutls.errors.GNUTLSError as error:
 
1315
                except (gnutls.errors.GNUTLSError), error:
1588
1316
                    logger.warning("GnuTLS bye failed")
1589
1317
    
1590
1318
    @staticmethod
1647
1375
        # Convert the buffer to a Python bytestring
1648
1376
        fpr = ctypes.string_at(buf, buf_len.value)
1649
1377
        # Convert the bytestring to hexadecimal notation
1650
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1378
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1651
1379
        return hex_fpr
1652
1380
 
1653
1381
 
1659
1387
        except:
1660
1388
            self.handle_error(request, address)
1661
1389
        self.close_request(request)
1662
 
    
 
1390
            
1663
1391
    def process_request(self, request, address):
1664
1392
        """Start a new process to process the request."""
1665
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1666
 
                                       args = (request,
1667
 
                                               address))
1668
 
        proc.start()
1669
 
        return proc
1670
 
 
 
1393
        multiprocessing.Process(target = self.sub_process_main,
 
1394
                                args = (request, address)).start()
1671
1395
 
1672
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1673
1397
    """ adds a pipe to the MixIn """
1677
1401
        This function creates a new pipe in self.pipe
1678
1402
        """
1679
1403
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1680
 
        
1681
 
        proc = MultiprocessingMixIn.process_request(self, request,
1682
 
                                                    client_address)
 
1404
 
 
1405
        super(MultiprocessingMixInWithPipe,
 
1406
              self).process_request(request, client_address)
1683
1407
        self.child_pipe.close()
1684
 
        self.add_pipe(parent_pipe, proc)
1685
 
    
1686
 
    def add_pipe(self, parent_pipe, proc):
 
1408
        self.add_pipe(parent_pipe)
 
1409
 
 
1410
    def add_pipe(self, parent_pipe):
1687
1411
        """Dummy function; override as necessary"""
1688
1412
        raise NotImplementedError
1689
1413
 
1690
 
 
1691
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1692
1415
                     socketserver.TCPServer, object):
1693
1416
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1719
1442
                                           SO_BINDTODEVICE,
1720
1443
                                           str(self.interface
1721
1444
                                               + '\0'))
1722
 
                except socket.error as error:
 
1445
                except socket.error, error:
1723
1446
                    if error[0] == errno.EPERM:
1724
1447
                        logger.error("No permission to"
1725
1448
                                     " bind to interface %s",
1767
1490
        self.enabled = False
1768
1491
        self.clients = clients
1769
1492
        if self.clients is None:
1770
 
            self.clients = {}
 
1493
            self.clients = set()
1771
1494
        self.use_dbus = use_dbus
1772
1495
        self.gnutls_priority = gnutls_priority
1773
1496
        IPv6_TCPServer.__init__(self, server_address,
1777
1500
    def server_activate(self):
1778
1501
        if self.enabled:
1779
1502
            return socketserver.TCPServer.server_activate(self)
1780
 
    
1781
1503
    def enable(self):
1782
1504
        self.enabled = True
1783
 
    
1784
 
    def add_pipe(self, parent_pipe, proc):
 
1505
    def add_pipe(self, parent_pipe):
1785
1506
        # Call "handle_ipc" for both data and EOF events
1786
1507
        gobject.io_add_watch(parent_pipe.fileno(),
1787
1508
                             gobject.IO_IN | gobject.IO_HUP,
1788
1509
                             functools.partial(self.handle_ipc,
1789
 
                                               parent_pipe =
1790
 
                                               parent_pipe,
1791
 
                                               proc = proc))
1792
 
    
 
1510
                                               parent_pipe = parent_pipe))
 
1511
        
1793
1512
    def handle_ipc(self, source, condition, parent_pipe=None,
1794
 
                   proc = None, client_object=None):
 
1513
                   client_object=None):
1795
1514
        condition_names = {
1796
1515
            gobject.IO_IN: "IN",   # There is data to read.
1797
1516
            gobject.IO_OUT: "OUT", # Data can be written (without
1806
1525
                                       for cond, name in
1807
1526
                                       condition_names.iteritems()
1808
1527
                                       if cond & condition)
1809
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1528
        # error or the other end of multiprocessing.Pipe has closed
1810
1529
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1811
 
            # Wait for other process to exit
1812
 
            proc.join()
1813
1530
            return False
1814
1531
        
1815
1532
        # Read a request from the child
1820
1537
            fpr = request[1]
1821
1538
            address = request[2]
1822
1539
            
1823
 
            for c in self.clients.itervalues():
 
1540
            for c in self.clients:
1824
1541
                if c.fingerprint == fpr:
1825
1542
                    client = c
1826
1543
                    break
1827
1544
            else:
1828
 
                logger.info("Client not found for fingerprint: %s, ad"
1829
 
                            "dress: %s", fpr, address)
 
1545
                logger.warning("Client not found for fingerprint: %s, ad"
 
1546
                               "dress: %s", fpr, address)
1830
1547
                if self.use_dbus:
1831
1548
                    # Emit D-Bus signal
1832
 
                    mandos_dbus_service.ClientNotFound(fpr,
1833
 
                                                       address[0])
 
1549
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1834
1550
                parent_pipe.send(False)
1835
1551
                return False
1836
1552
            
1837
1553
            gobject.io_add_watch(parent_pipe.fileno(),
1838
1554
                                 gobject.IO_IN | gobject.IO_HUP,
1839
1555
                                 functools.partial(self.handle_ipc,
1840
 
                                                   parent_pipe =
1841
 
                                                   parent_pipe,
1842
 
                                                   proc = proc,
1843
 
                                                   client_object =
1844
 
                                                   client))
 
1556
                                                   parent_pipe = parent_pipe,
 
1557
                                                   client_object = client))
1845
1558
            parent_pipe.send(True)
1846
 
            # remove the old hook in favor of the new above hook on
1847
 
            # same fileno
 
1559
            # remove the old hook in favor of the new above hook on same fileno
1848
1560
            return False
1849
1561
        if command == 'funcall':
1850
1562
            funcname = request[1]
1851
1563
            args = request[2]
1852
1564
            kwargs = request[3]
1853
1565
            
1854
 
            parent_pipe.send(('data', getattr(client_object,
1855
 
                                              funcname)(*args,
1856
 
                                                         **kwargs)))
1857
 
        
 
1566
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1567
 
1858
1568
        if command == 'getattr':
1859
1569
            attrname = request[1]
1860
1570
            if callable(client_object.__getattribute__(attrname)):
1861
1571
                parent_pipe.send(('function',))
1862
1572
            else:
1863
 
                parent_pipe.send(('data', client_object
1864
 
                                  .__getattribute__(attrname)))
 
1573
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1865
1574
        
1866
1575
        if command == 'setattr':
1867
1576
            attrname = request[1]
1868
1577
            value = request[2]
1869
1578
            setattr(client_object, attrname, value)
1870
 
        
 
1579
 
1871
1580
        return True
1872
1581
 
1873
1582
 
1904
1613
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1905
1614
            else:
1906
1615
                raise ValueError("Unknown suffix %r" % suffix)
1907
 
        except (ValueError, IndexError) as e:
 
1616
        except (ValueError, IndexError), e:
1908
1617
            raise ValueError(*(e.args))
1909
1618
        timevalue += delta
1910
1619
    return timevalue
1911
1620
 
1912
1621
 
 
1622
def if_nametoindex(interface):
 
1623
    """Call the C function if_nametoindex(), or equivalent
 
1624
    
 
1625
    Note: This function cannot accept a unicode string."""
 
1626
    global if_nametoindex
 
1627
    try:
 
1628
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1629
                          (ctypes.util.find_library("c"))
 
1630
                          .if_nametoindex)
 
1631
    except (OSError, AttributeError):
 
1632
        logger.warning("Doing if_nametoindex the hard way")
 
1633
        def if_nametoindex(interface):
 
1634
            "Get an interface index the hard way, i.e. using fcntl()"
 
1635
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1636
            with contextlib.closing(socket.socket()) as s:
 
1637
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1638
                                    struct.pack(str("16s16x"),
 
1639
                                                interface))
 
1640
            interface_index = struct.unpack(str("I"),
 
1641
                                            ifreq[16:20])[0]
 
1642
            return interface_index
 
1643
    return if_nametoindex(interface)
 
1644
 
 
1645
 
1913
1646
def daemon(nochdir = False, noclose = False):
1914
1647
    """See daemon(3).  Standard BSD Unix function.
1915
1648
    
1940
1673
    ##################################################################
1941
1674
    # Parsing of options, both command line and config file
1942
1675
    
1943
 
    parser = argparse.ArgumentParser()
1944
 
    parser.add_argument("-v", "--version", action="version",
1945
 
                        version = "%%(prog)s %s" % version,
1946
 
                        help="show version number and exit")
1947
 
    parser.add_argument("-i", "--interface", metavar="IF",
1948
 
                        help="Bind to interface IF")
1949
 
    parser.add_argument("-a", "--address",
1950
 
                        help="Address to listen for requests on")
1951
 
    parser.add_argument("-p", "--port", type=int,
1952
 
                        help="Port number to receive requests on")
1953
 
    parser.add_argument("--check", action="store_true",
1954
 
                        help="Run self-test")
1955
 
    parser.add_argument("--debug", action="store_true",
1956
 
                        help="Debug mode; run in foreground and log"
1957
 
                        " to terminal")
1958
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
1959
 
                        help="Debug level for stdout output")
1960
 
    parser.add_argument("--priority", help="GnuTLS"
1961
 
                        " priority string (see GnuTLS documentation)")
1962
 
    parser.add_argument("--servicename",
1963
 
                        metavar="NAME", help="Zeroconf service name")
1964
 
    parser.add_argument("--configdir",
1965
 
                        default="/etc/mandos", metavar="DIR",
1966
 
                        help="Directory to search for configuration"
1967
 
                        " files")
1968
 
    parser.add_argument("--no-dbus", action="store_false",
1969
 
                        dest="use_dbus", help="Do not provide D-Bus"
1970
 
                        " system bus interface")
1971
 
    parser.add_argument("--no-ipv6", action="store_false",
1972
 
                        dest="use_ipv6", help="Do not use IPv6")
1973
 
    parser.add_argument("--no-restore", action="store_false",
1974
 
                        dest="restore", help="Do not restore stored"
1975
 
                        " state")
1976
 
    parser.add_argument("--statedir", metavar="DIR",
1977
 
                        help="Directory to save/restore state in")
1978
 
    
1979
 
    options = parser.parse_args()
 
1676
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1677
    parser.add_option("-i", "--interface", type="string",
 
1678
                      metavar="IF", help="Bind to interface IF")
 
1679
    parser.add_option("-a", "--address", type="string",
 
1680
                      help="Address to listen for requests on")
 
1681
    parser.add_option("-p", "--port", type="int",
 
1682
                      help="Port number to receive requests on")
 
1683
    parser.add_option("--check", action="store_true",
 
1684
                      help="Run self-test")
 
1685
    parser.add_option("--debug", action="store_true",
 
1686
                      help="Debug mode; run in foreground and log to"
 
1687
                      " terminal")
 
1688
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
 
1689
                      help="Debug level for stdout output")
 
1690
    parser.add_option("--priority", type="string", help="GnuTLS"
 
1691
                      " priority string (see GnuTLS documentation)")
 
1692
    parser.add_option("--servicename", type="string",
 
1693
                      metavar="NAME", help="Zeroconf service name")
 
1694
    parser.add_option("--configdir", type="string",
 
1695
                      default="/etc/mandos", metavar="DIR",
 
1696
                      help="Directory to search for configuration"
 
1697
                      " files")
 
1698
    parser.add_option("--no-dbus", action="store_false",
 
1699
                      dest="use_dbus", help="Do not provide D-Bus"
 
1700
                      " system bus interface")
 
1701
    parser.add_option("--no-ipv6", action="store_false",
 
1702
                      dest="use_ipv6", help="Do not use IPv6")
 
1703
    options = parser.parse_args()[0]
1980
1704
    
1981
1705
    if options.check:
1982
1706
        import doctest
1994
1718
                        "use_dbus": "True",
1995
1719
                        "use_ipv6": "True",
1996
1720
                        "debuglevel": "",
1997
 
                        "restore": "True",
1998
 
                        "statedir": "/var/lib/mandos"
1999
1721
                        }
2000
1722
    
2001
1723
    # Parse config file for server-global settings
2018
1740
    # options, if set.
2019
1741
    for option in ("interface", "address", "port", "debug",
2020
1742
                   "priority", "servicename", "configdir",
2021
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2022
 
                   "statedir"):
 
1743
                   "use_dbus", "use_ipv6", "debuglevel"):
2023
1744
        value = getattr(options, option)
2024
1745
        if value is not None:
2025
1746
            server_settings[option] = value
2037
1758
    debuglevel = server_settings["debuglevel"]
2038
1759
    use_dbus = server_settings["use_dbus"]
2039
1760
    use_ipv6 = server_settings["use_ipv6"]
2040
 
    stored_state_path = os.path.join(server_settings["statedir"],
2041
 
                                     stored_state_file)
2042
 
    
2043
 
    if debug:
2044
 
        initlogger(logging.DEBUG)
2045
 
    else:
2046
 
        if not debuglevel:
2047
 
            initlogger()
2048
 
        else:
2049
 
            level = getattr(logging, debuglevel.upper())
2050
 
            initlogger(level)
2051
 
    
 
1761
 
2052
1762
    if server_settings["servicename"] != "Mandos":
2053
1763
        syslogger.setFormatter(logging.Formatter
2054
1764
                               ('Mandos (%s) [%%(process)d]:'
2056
1766
                                % server_settings["servicename"]))
2057
1767
    
2058
1768
    # Parse config file with clients
2059
 
    client_defaults = { "timeout": "5m",
2060
 
                        "extended_timeout": "15m",
2061
 
                        "interval": "2m",
 
1769
    client_defaults = { "timeout": "1h",
 
1770
                        "interval": "5m",
2062
1771
                        "checker": "fping -q -- %%(host)s",
2063
1772
                        "host": "",
2064
1773
                        "approval_delay": "0s",
2104
1813
    try:
2105
1814
        os.setgid(gid)
2106
1815
        os.setuid(uid)
2107
 
    except OSError as error:
 
1816
    except OSError, error:
2108
1817
        if error[0] != errno.EPERM:
2109
1818
            raise error
2110
1819
    
 
1820
    if not debug and not debuglevel:
 
1821
        syslogger.setLevel(logging.WARNING)
 
1822
        console.setLevel(logging.WARNING)
 
1823
    if debuglevel:
 
1824
        level = getattr(logging, debuglevel.upper())
 
1825
        syslogger.setLevel(level)
 
1826
        console.setLevel(level)
 
1827
 
2111
1828
    if debug:
2112
1829
        # Enable all possible GnuTLS debugging
2113
1830
        
2144
1861
    # End of Avahi example code
2145
1862
    if use_dbus:
2146
1863
        try:
2147
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1864
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2148
1865
                                            bus, do_not_queue=True)
2149
 
            old_bus_name = (dbus.service.BusName
2150
 
                            ("se.bsnet.fukt.Mandos", bus,
2151
 
                             do_not_queue=True))
2152
 
        except dbus.exceptions.NameExistsException as e:
 
1866
        except dbus.exceptions.NameExistsException, e:
2153
1867
            logger.error(unicode(e) + ", disabling D-Bus")
2154
1868
            use_dbus = False
2155
1869
            server_settings["use_dbus"] = False
2156
1870
            tcp_server.use_dbus = False
2157
1871
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2158
 
    service = AvahiServiceToSyslog(name =
2159
 
                                   server_settings["servicename"],
2160
 
                                   servicetype = "_mandos._tcp",
2161
 
                                   protocol = protocol, bus = bus)
 
1872
    service = AvahiService(name = server_settings["servicename"],
 
1873
                           servicetype = "_mandos._tcp",
 
1874
                           protocol = protocol, bus = bus)
2162
1875
    if server_settings["interface"]:
2163
1876
        service.interface = (if_nametoindex
2164
1877
                             (str(server_settings["interface"])))
2168
1881
    
2169
1882
    client_class = Client
2170
1883
    if use_dbus:
2171
 
        client_class = functools.partial(ClientDBusTransitional,
2172
 
                                         bus = bus)
2173
 
    
2174
 
    special_settings = {
2175
 
        # Some settings need to be accessd by special methods;
2176
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2177
 
        "approved_by_default":
2178
 
            lambda section:
2179
 
            client_config.getboolean(section, "approved_by_default"),
2180
 
        }
2181
 
    # Construct a new dict of client settings of this form:
2182
 
    # { client_name: {setting_name: value, ...}, ...}
2183
 
    # with exceptions for any special settings as defined above
2184
 
    client_settings = dict((clientname,
2185
 
                           dict((setting,
2186
 
                                 (value
2187
 
                                  if setting not in special_settings
2188
 
                                  else special_settings[setting]
2189
 
                                  (clientname)))
2190
 
                                for setting, value in
2191
 
                                client_config.items(clientname)))
2192
 
                          for clientname in client_config.sections())
2193
 
    
2194
 
    old_client_settings = {}
2195
 
    clients_data = []
2196
 
    
2197
 
    # Get client data and settings from last running state.
2198
 
    if server_settings["restore"]:
2199
 
        try:
2200
 
            with open(stored_state_path, "rb") as stored_state:
2201
 
                clients_data, old_client_settings = (pickle.load
2202
 
                                                     (stored_state))
2203
 
            os.remove(stored_state_path)
2204
 
        except IOError as e:
2205
 
            logger.warning("Could not load persistent state: {0}"
2206
 
                           .format(e))
2207
 
            if e.errno != errno.ENOENT:
2208
 
                raise
2209
 
    
2210
 
    with Crypto() as crypt:
2211
 
        for client in clients_data:
2212
 
            client_name = client["name"]
2213
 
            
2214
 
            # Decide which value to use after restoring saved state.
2215
 
            # We have three different values: Old config file,
2216
 
            # new config file, and saved state.
2217
 
            # New config value takes precedence if it differs from old
2218
 
            # config value, otherwise use saved state.
2219
 
            for name, value in client_settings[client_name].items():
2220
 
                try:
2221
 
                    # For each value in new config, check if it
2222
 
                    # differs from the old config value (Except for
2223
 
                    # the "secret" attribute)
2224
 
                    if (name != "secret" and
2225
 
                        value != old_client_settings[client_name]
2226
 
                        [name]):
2227
 
                        setattr(client, name, value)
2228
 
                except KeyError:
2229
 
                    pass
2230
 
            
2231
 
            # Clients who has passed its expire date can still be
2232
 
            # enabled if its last checker was sucessful.  Clients
2233
 
            # whose checker failed before we stored its state is
2234
 
            # assumed to have failed all checkers during downtime.
2235
 
            if client["enabled"] and client["last_checked_ok"]:
2236
 
                if ((datetime.datetime.utcnow()
2237
 
                     - client["last_checked_ok"])
2238
 
                    > client["interval"]):
2239
 
                    if client["last_checker_status"] != 0:
2240
 
                        client["enabled"] = False
2241
 
                    else:
2242
 
                        client["expires"] = (datetime.datetime
2243
 
                                             .utcnow()
2244
 
                                             + client["timeout"])
2245
 
            
2246
 
            client["changedstate"] = (multiprocessing_manager
2247
 
                                      .Condition
2248
 
                                      (multiprocessing_manager
2249
 
                                       .Lock()))
2250
 
            if use_dbus:
2251
 
                new_client = (ClientDBusTransitional.__new__
2252
 
                              (ClientDBusTransitional))
2253
 
                tcp_server.clients[client_name] = new_client
2254
 
                new_client.bus = bus
2255
 
                for name, value in client.iteritems():
2256
 
                    setattr(new_client, name, value)
2257
 
                client_object_name = unicode(client_name).translate(
2258
 
                    {ord("."): ord("_"),
2259
 
                     ord("-"): ord("_")})
2260
 
                new_client.dbus_object_path = (dbus.ObjectPath
2261
 
                                               ("/clients/"
2262
 
                                                + client_object_name))
2263
 
                DBusObjectWithProperties.__init__(new_client,
2264
 
                                                  new_client.bus,
2265
 
                                                  new_client
2266
 
                                                  .dbus_object_path)
2267
 
            else:
2268
 
                tcp_server.clients[client_name] = (Client.__new__
2269
 
                                                   (Client))
2270
 
                for name, value in client.iteritems():
2271
 
                    setattr(tcp_server.clients[client_name],
2272
 
                            name, value)
2273
 
            
 
1884
        client_class = functools.partial(ClientDBus, bus = bus)
 
1885
    def client_config_items(config, section):
 
1886
        special_settings = {
 
1887
            "approved_by_default":
 
1888
                lambda: config.getboolean(section,
 
1889
                                          "approved_by_default"),
 
1890
            }
 
1891
        for name, value in config.items(section):
2274
1892
            try:
2275
 
                tcp_server.clients[client_name].secret = (
2276
 
                    crypt.decrypt(tcp_server.clients[client_name]
2277
 
                                  .encrypted_secret,
2278
 
                                  client_settings[client_name]
2279
 
                                  ["secret"]))
2280
 
            except CryptoError:
2281
 
                # If decryption fails, we use secret from new settings
2282
 
                tcp_server.clients[client_name].secret = (
2283
 
                    client_settings[client_name]["secret"])
2284
 
    
2285
 
    # Create/remove clients based on new changes made to config
2286
 
    for clientname in set(old_client_settings) - set(client_settings):
2287
 
        del tcp_server.clients[clientname]
2288
 
    for clientname in set(client_settings) - set(old_client_settings):
2289
 
        tcp_server.clients[clientname] = (client_class(name
2290
 
                                                       = clientname,
2291
 
                                                       config =
2292
 
                                                       client_settings
2293
 
                                                       [clientname]))
2294
 
    
 
1893
                yield (name, special_settings[name]())
 
1894
            except KeyError:
 
1895
                yield (name, value)
 
1896
    
 
1897
    tcp_server.clients.update(set(
 
1898
            client_class(name = section,
 
1899
                         config= dict(client_config_items(
 
1900
                        client_config, section)))
 
1901
            for section in client_config.sections()))
2295
1902
    if not tcp_server.clients:
2296
1903
        logger.warning("No clients defined")
2297
1904
        
2310
1917
        del pidfilename
2311
1918
        
2312
1919
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2313
 
    
 
1920
 
2314
1921
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2315
1922
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2316
1923
    
2319
1926
            """A D-Bus proxy object"""
2320
1927
            def __init__(self):
2321
1928
                dbus.service.Object.__init__(self, bus, "/")
2322
 
            _interface = "se.recompile.Mandos"
 
1929
            _interface = "se.bsnet.fukt.Mandos"
2323
1930
            
2324
1931
            @dbus.service.signal(_interface, signature="o")
2325
1932
            def ClientAdded(self, objpath):
2340
1947
            def GetAllClients(self):
2341
1948
                "D-Bus method"
2342
1949
                return dbus.Array(c.dbus_object_path
2343
 
                                  for c in
2344
 
                                  tcp_server.clients.itervalues())
 
1950
                                  for c in tcp_server.clients)
2345
1951
            
2346
1952
            @dbus.service.method(_interface,
2347
1953
                                 out_signature="a{oa{sv}}")
2349
1955
                "D-Bus method"
2350
1956
                return dbus.Dictionary(
2351
1957
                    ((c.dbus_object_path, c.GetAll(""))
2352
 
                     for c in tcp_server.clients.itervalues()),
 
1958
                     for c in tcp_server.clients),
2353
1959
                    signature="oa{sv}")
2354
1960
            
2355
1961
            @dbus.service.method(_interface, in_signature="o")
2356
1962
            def RemoveClient(self, object_path):
2357
1963
                "D-Bus method"
2358
 
                for c in tcp_server.clients.itervalues():
 
1964
                for c in tcp_server.clients:
2359
1965
                    if c.dbus_object_path == object_path:
2360
 
                        del tcp_server.clients[c.name]
 
1966
                        tcp_server.clients.remove(c)
2361
1967
                        c.remove_from_connection()
2362
1968
                        # Don't signal anything except ClientRemoved
2363
1969
                        c.disable(quiet=True)
2368
1974
            
2369
1975
            del _interface
2370
1976
        
2371
 
        class MandosDBusServiceTransitional(MandosDBusService):
2372
 
            __metaclass__ = AlternateDBusNamesMetaclass
2373
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1977
        mandos_dbus_service = MandosDBusService()
2374
1978
    
2375
1979
    def cleanup():
2376
1980
        "Cleanup function; run on exit"
2377
1981
        service.cleanup()
2378
1982
        
2379
 
        multiprocessing.active_children()
2380
 
        if not (tcp_server.clients or client_settings):
2381
 
            return
2382
 
        
2383
 
        # Store client before exiting. Secrets are encrypted with key
2384
 
        # based on what config file has. If config file is
2385
 
        # removed/edited, old secret will thus be unrecovable.
2386
 
        clients = []
2387
 
        with Crypto() as crypt:
2388
 
            for client in tcp_server.clients.itervalues():
2389
 
                key = client_settings[client.name]["secret"]
2390
 
                client.encrypted_secret = crypt.encrypt(client.secret,
2391
 
                                                        key)
2392
 
                client_dict = {}
2393
 
                
2394
 
                # A list of attributes that will not be stored when
2395
 
                # shutting down.
2396
 
                exclude = set(("bus", "changedstate", "secret"))
2397
 
                for name, typ in (inspect.getmembers
2398
 
                                  (dbus.service.Object)):
2399
 
                    exclude.add(name)
2400
 
                
2401
 
                client_dict["encrypted_secret"] = (client
2402
 
                                                   .encrypted_secret)
2403
 
                for attr in client.client_structure:
2404
 
                    if attr not in exclude:
2405
 
                        client_dict[attr] = getattr(client, attr)
2406
 
                
2407
 
                clients.append(client_dict)
2408
 
                del client_settings[client.name]["secret"]
2409
 
        
2410
 
        try:
2411
 
            with os.fdopen(os.open(stored_state_path,
2412
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2413
 
                                   0600), "wb") as stored_state:
2414
 
                pickle.dump((clients, client_settings), stored_state)
2415
 
        except (IOError, OSError) as e:
2416
 
            logger.warning("Could not save persistent state: {0}"
2417
 
                           .format(e))
2418
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2419
 
                raise
2420
 
        
2421
 
        # Delete all clients, and settings from config
2422
1983
        while tcp_server.clients:
2423
 
            name, client = tcp_server.clients.popitem()
 
1984
            client = tcp_server.clients.pop()
2424
1985
            if use_dbus:
2425
1986
                client.remove_from_connection()
 
1987
            client.disable_hook = None
2426
1988
            # Don't signal anything except ClientRemoved
2427
1989
            client.disable(quiet=True)
2428
1990
            if use_dbus:
2429
1991
                # Emit D-Bus signal
2430
 
                mandos_dbus_service.ClientRemoved(client
2431
 
                                                  .dbus_object_path,
 
1992
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2432
1993
                                                  client.name)
2433
 
        client_settings.clear()
2434
1994
    
2435
1995
    atexit.register(cleanup)
2436
1996
    
2437
 
    for client in tcp_server.clients.itervalues():
 
1997
    for client in tcp_server.clients:
2438
1998
        if use_dbus:
2439
1999
            # Emit D-Bus signal
2440
2000
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2441
 
        # Need to initiate checking of clients
2442
 
        if client.enabled:
2443
 
            client.init_checker()
 
2001
        client.enable()
2444
2002
    
2445
2003
    tcp_server.enable()
2446
2004
    tcp_server.server_activate()
2461
2019
        # From the Avahi example code
2462
2020
        try:
2463
2021
            service.activate()
2464
 
        except dbus.exceptions.DBusException as error:
 
2022
        except dbus.exceptions.DBusException, error:
2465
2023
            logger.critical("DBusException: %s", error)
2466
2024
            cleanup()
2467
2025
            sys.exit(1)
2474
2032
        
2475
2033
        logger.debug("Starting main loop")
2476
2034
        main_loop.run()
2477
 
    except AvahiError as error:
 
2035
    except AvahiError, error:
2478
2036
        logger.critical("AvahiError: %s", error)
2479
2037
        cleanup()
2480
2038
        sys.exit(1)
2486
2044
    # Must run before the D-Bus bus name gets deregistered
2487
2045
    cleanup()
2488
2046
 
2489
 
 
2490
2047
if __name__ == '__main__':
2491
2048
    main()