/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-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

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