/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

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

Show diffs side-by-side

added added

removed removed

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