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