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