/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

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

Show diffs side-by-side

added added

removed removed

Lines of Context:
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
 
66
import binascii
 
67
import tempfile
66
68
 
67
69
import dbus
68
70
import dbus.service
73
75
import ctypes.util
74
76
import xml.dom.minidom
75
77
import inspect
 
78
import GnuPGInterface
76
79
 
77
80
try:
78
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
85
    except ImportError:
83
86
        SO_BINDTODEVICE = None
84
87
 
85
 
 
86
 
version = "1.3.1"
87
 
 
88
 
#logger = logging.getLogger('mandos')
89
 
logger = logging.Logger('mandos')
 
88
version = "1.4.1"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
90
92
syslogger = (logging.handlers.SysLogHandler
91
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
94
              address = str("/dev/log")))
93
 
syslogger.setFormatter(logging.Formatter
94
 
                       ('Mandos [%(process)d]: %(levelname)s:'
95
 
                        ' %(message)s'))
96
 
logger.addHandler(syslogger)
97
 
 
98
 
console = logging.StreamHandler()
99
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
102
 
logger.addHandler(console)
 
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
 
103
209
 
104
210
class AvahiError(Exception):
105
211
    def __init__(self, value, *args, **kwargs):
160
266
                            " after %i retries, exiting.",
161
267
                            self.rename_count)
162
268
            raise AvahiServiceError("Too many renames")
163
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
269
        self.name = unicode(self.server
 
270
                            .GetAlternativeServiceName(self.name))
164
271
        logger.info("Changing Zeroconf service name to %r ...",
165
272
                    self.name)
166
 
        syslogger.setFormatter(logging.Formatter
167
 
                               ('Mandos (%s) [%%(process)d]:'
168
 
                                ' %%(levelname)s: %%(message)s'
169
 
                                % self.name))
170
273
        self.remove()
171
274
        try:
172
275
            self.add()
192
295
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
296
        self.entry_group_state_changed_match = (
194
297
            self.group.connect_to_signal(
195
 
                'StateChanged', self .entry_group_state_changed))
 
298
                'StateChanged', self.entry_group_state_changed))
196
299
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
197
300
                     self.name, self.type)
198
301
        self.group.AddService(
224
327
            try:
225
328
                self.group.Free()
226
329
            except (dbus.exceptions.UnknownMethodException,
227
 
                    dbus.exceptions.DBusException) as e:
 
330
                    dbus.exceptions.DBusException):
228
331
                pass
229
332
            self.group = None
230
333
        self.remove()
264
367
                                 self.server_state_changed)
265
368
        self.server_state_changed(self.server.GetState())
266
369
 
 
370
class AvahiServiceToSyslog(AvahiService):
 
371
    def rename(self):
 
372
        """Add the new name to the syslog messages"""
 
373
        ret = AvahiService.rename(self)
 
374
        syslogger.setFormatter(logging.Formatter
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
 
378
        return ret
267
379
 
268
 
def _timedelta_to_milliseconds(td):
 
380
def timedelta_to_milliseconds(td):
269
381
    "Convert a datetime.timedelta() to milliseconds"
270
382
    return ((td.days * 24 * 60 * 60 * 1000)
271
383
            + (td.seconds * 1000)
275
387
    """A representation of a client host served by this server.
276
388
    
277
389
    Attributes:
278
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
390
    approved:   bool(); 'None' if not yet approved/disapproved
279
391
    approval_delay: datetime.timedelta(); Time to wait for approval
280
392
    approval_duration: datetime.timedelta(); Duration of one approval
281
393
    checker:    subprocess.Popen(); a running checker process used
288
400
                     instance %(name)s can be used in the command.
289
401
    checker_initiator_tag: a gobject event source tag, or None
290
402
    created:    datetime.datetime(); (UTC) object creation
 
403
    client_structure: Object describing what attributes a client has
 
404
                      and is used for storing the client at exit
291
405
    current_checker_command: string; current running checker_command
292
 
    disable_hook:  If set, called by disable() as disable_hook(self)
293
406
    disable_initiator_tag: a gobject event source tag, or None
294
407
    enabled:    bool()
295
408
    fingerprint: string (40 or 32 hexadecimal digits); used to
298
411
    interval:   datetime.timedelta(); How often to start a new checker
299
412
    last_approval_request: datetime.datetime(); (UTC) or None
300
413
    last_checked_ok: datetime.datetime(); (UTC) or None
301
 
    last_enabled: datetime.datetime(); (UTC)
 
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
302
418
    name:       string; from the config file, used in log messages and
303
419
                        D-Bus identifiers
304
420
    secret:     bytestring; sent verbatim (over TLS) to client
314
430
                          "created", "enabled", "fingerprint",
315
431
                          "host", "interval", "last_checked_ok",
316
432
                          "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
                        }
317
443
    
318
444
    def timeout_milliseconds(self):
319
445
        "Return the 'timeout' attribute in milliseconds"
320
 
        return _timedelta_to_milliseconds(self.timeout)
 
446
        return timedelta_to_milliseconds(self.timeout)
321
447
    
322
448
    def extended_timeout_milliseconds(self):
323
449
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
450
        return timedelta_to_milliseconds(self.extended_timeout)
325
451
    
326
452
    def interval_milliseconds(self):
327
453
        "Return the 'interval' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.interval)
 
454
        return timedelta_to_milliseconds(self.interval)
329
455
    
330
456
    def approval_delay_milliseconds(self):
331
 
        return _timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
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):
334
511
        """Note: the 'checker' key in 'config' sets the
335
512
        'checker_command' attribute and *not* the 'checker'
336
513
        attribute."""
337
514
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
515
        # adding all client settings
 
516
        for setting, value in settings.iteritems():
 
517
            setattr(self, setting, value)
 
518
        
340
519
        logger.debug("Creating client %r", self.name)
341
520
        # Uppercase and remove spaces from fingerprint for later
342
521
        # comparison purposes with return value from the fingerprint()
343
522
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
523
        logger.debug("  Fingerprint: %s", self.fingerprint)
347
 
        if "secret" in config:
348
 
            self.secret = config["secret"].decode("base64")
349
 
        elif "secfile" in config:
350
 
            with open(os.path.expanduser(os.path.expandvars
351
 
                                         (config["secfile"])),
352
 
                      "rb") as secfile:
353
 
                self.secret = secfile.read()
354
 
        else:
355
 
            raise TypeError("No secret or secfile for client %s"
356
 
                            % self.name)
357
 
        self.host = config.get("host", "")
358
 
        self.created = datetime.datetime.utcnow()
359
 
        self.enabled = False
360
 
        self.last_approval_request = None
361
 
        self.last_enabled = None
362
 
        self.last_checked_ok = None
363
 
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
365
 
        self.interval = string_to_delta(config["interval"])
366
 
        self.disable_hook = disable_hook
 
524
        self.created = settings.get("created", datetime.datetime.utcnow())
 
525
 
 
526
        # attributes specific for this server instance
367
527
        self.checker = None
368
528
        self.checker_initiator_tag = None
369
529
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
530
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
531
        self.current_checker_command = None
374
 
        self.last_connect = None
375
 
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
377
 
                                              True)
 
532
        self.approved = None
378
533
        self.approvals_pending = 0
379
 
        self.approval_delay = string_to_delta(
380
 
            config["approval_delay"])
381
 
        self.approval_duration = string_to_delta(
382
 
            config["approval_duration"])
383
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
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)
384
548
    
 
549
    # Send notice to process children that client state has changed
385
550
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
551
        with self.changedstate:
 
552
            self.changedstate.notify_all()
 
553
    
390
554
    def enable(self):
391
555
        """Start this client's checker and timeout hooks"""
392
556
        if getattr(self, "enabled", False):
393
557
            # Already enabled
394
558
            return
395
559
        self.send_changedstate()
396
 
        # Schedule a new checker to be started an 'interval' from now,
397
 
        # and every interval from then on.
398
 
        self.checker_initiator_tag = (gobject.timeout_add
399
 
                                      (self.interval_milliseconds(),
400
 
                                       self.start_checker))
401
 
        # Schedule a disable() when 'timeout' has passed
402
560
        self.expires = datetime.datetime.utcnow() + self.timeout
403
 
        self.disable_initiator_tag = (gobject.timeout_add
404
 
                                   (self.timeout_milliseconds(),
405
 
                                    self.disable))
406
561
        self.enabled = True
407
562
        self.last_enabled = datetime.datetime.utcnow()
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
563
        self.init_checker()
410
564
    
411
565
    def disable(self, quiet=True):
412
566
        """Disable this client."""
424
578
            gobject.source_remove(self.checker_initiator_tag)
425
579
            self.checker_initiator_tag = None
426
580
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
581
        self.enabled = False
430
582
        # Do not run this again if called by a gobject.timeout_add
431
583
        return False
432
584
    
433
585
    def __del__(self):
434
 
        self.disable_hook = None
435
586
        self.disable()
436
587
    
 
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
    
437
601
    def checker_callback(self, pid, condition, command):
438
602
        """The checker has completed, so take appropriate actions."""
439
603
        self.checker_callback_tag = None
440
604
        self.checker = None
441
605
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
606
            self.last_checker_status = os.WEXITSTATUS(condition)
 
607
            if self.last_checker_status == 0:
444
608
                logger.info("Checker for %(name)s succeeded",
445
609
                            vars(self))
446
610
                self.checked_ok()
448
612
                logger.info("Checker for %(name)s failed",
449
613
                            vars(self))
450
614
        else:
 
615
            self.last_checker_status = -1
451
616
            logger.warning("Checker for %(name)s crashed?",
452
617
                           vars(self))
453
618
    
460
625
        if timeout is None:
461
626
            timeout = self.timeout
462
627
        self.last_checked_ok = datetime.datetime.utcnow()
463
 
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
 
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (_timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
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
468
635
    
469
636
    def need_approval(self):
470
637
        self.last_approval_request = datetime.datetime.utcnow()
629
796
        """
630
797
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
631
798
                for cls in self.__class__.__mro__
632
 
                for name, prop in inspect.getmembers(cls, self._is_dbus_property))
 
799
                for name, prop in
 
800
                inspect.getmembers(cls, self._is_dbus_property))
633
801
    
634
802
    def _get_dbus_property(self, interface_name, property_name):
635
803
        """Returns a bound method if one exists which is a D-Bus
636
804
        property with the specified name and interface.
637
805
        """
638
806
        for cls in  self.__class__.__mro__:
639
 
            for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
 
                if value._dbus_name == property_name and value._dbus_interface == interface_name:
 
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):
641
811
                    return value.__get__(self)
642
812
        
643
813
        # No such property
682
852
        
683
853
        Note: Will not include properties with access="write".
684
854
        """
685
 
        all = {}
 
855
        properties = {}
686
856
        for name, prop in self._get_all_dbus_properties():
687
857
            if (interface_name
688
858
                and interface_name != prop._dbus_interface):
693
863
                continue
694
864
            value = prop()
695
865
            if not hasattr(value, "variant_level"):
696
 
                all[name] = value
 
866
                properties[name] = value
697
867
                continue
698
 
            all[name] = type(value)(value, variant_level=
699
 
                                    value.variant_level+1)
700
 
        return dbus.Dictionary(all, signature="sv")
 
868
            properties[name] = type(value)(value, variant_level=
 
869
                                           value.variant_level+1)
 
870
        return dbus.Dictionary(properties, signature="sv")
701
871
    
702
872
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
703
873
                         out_signature="s",
754
924
    return dbus.String(dt.isoformat(),
755
925
                       variant_level=variant_level)
756
926
 
757
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties.__metaclass__):
 
927
 
 
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
929
                                  .__metaclass__):
758
930
    """Applied to an empty subclass of a D-Bus object, this metaclass
759
931
    will add additional D-Bus attributes matching a certain pattern.
760
932
    """
850
1022
                                        attribute.func_closure)))
851
1023
        return type.__new__(mcs, name, bases, attr)
852
1024
 
 
1025
 
853
1026
class ClientDBus(Client, DBusObjectWithProperties):
854
1027
    """A Client class using D-Bus
855
1028
    
864
1037
    # dbus.service.Object doesn't use super(), so we can't either.
865
1038
    
866
1039
    def __init__(self, bus = None, *args, **kwargs):
867
 
        self._approvals_pending = 0
868
1040
        self.bus = bus
869
1041
        Client.__init__(self, *args, **kwargs)
 
1042
        self._approvals_pending = 0
 
1043
        
 
1044
        self._approvals_pending = 0
870
1045
        # Only now, when this client is initialized, can it show up on
871
1046
        # the D-Bus
872
1047
        client_object_name = unicode(self.name).translate(
882
1057
                             variant_level=1):
883
1058
        """ Modify a variable so that it's a property which announces
884
1059
        its changes to DBus.
885
 
 
886
 
        transform_fun: Function that takes a value and transforms it
887
 
                       to a D-Bus type.
 
1060
        
 
1061
        transform_fun: Function that takes a value and a variant_level
 
1062
                       and transforms it to a D-Bus type.
888
1063
        dbus_name: D-Bus name of the variable
889
1064
        type_func: Function that transform the value before sending it
890
1065
                   to the D-Bus.  Default: no transform
891
1066
        variant_level: D-Bus variant level.  Default: 1
892
1067
        """
893
 
        real_value = [None,]
 
1068
        attrname = "_{0}".format(dbus_name)
894
1069
        def setter(self, value):
895
 
            old_value = real_value[0]
896
 
            real_value[0] = value
897
1070
            if hasattr(self, "dbus_object_path"):
898
 
                if type_func(old_value) != type_func(real_value[0]):
899
 
                    dbus_value = transform_func(type_func(real_value[0]),
900
 
                                                variant_level)
 
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)
901
1077
                    self.PropertyChanged(dbus.String(dbus_name),
902
1078
                                         dbus_value)
 
1079
            setattr(self, attrname, value)
903
1080
        
904
 
        return property(lambda self: real_value[0], setter)
 
1081
        return property(lambda self: getattr(self, attrname), setter)
905
1082
    
906
1083
    
907
1084
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
912
1089
    last_enabled = notifychangeproperty(datetime_to_dbus,
913
1090
                                        "LastEnabled")
914
1091
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
915
 
                                   type_func = lambda checker: checker is not None)
 
1092
                                   type_func = lambda checker:
 
1093
                                       checker is not None)
916
1094
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
917
1095
                                           "LastCheckedOK")
918
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
919
 
                                                 "LastApprovalRequest")
 
1096
    last_approval_request = notifychangeproperty(
 
1097
        datetime_to_dbus, "LastApprovalRequest")
920
1098
    approved_by_default = notifychangeproperty(dbus.Boolean,
921
1099
                                               "ApprovedByDefault")
922
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
923
 
                                          type_func = _timedelta_to_milliseconds)
924
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
925
 
                                             type_func = _timedelta_to_milliseconds)
 
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)
926
1107
    host = notifychangeproperty(dbus.String, "Host")
927
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
928
 
                                   type_func = _timedelta_to_milliseconds)
929
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
930
 
                                            type_func = _timedelta_to_milliseconds)
931
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
932
 
                                    type_func = _timedelta_to_milliseconds)
 
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)
933
1118
    checker_command = notifychangeproperty(dbus.String, "Checker")
934
1119
    
935
1120
    del notifychangeproperty
977
1162
        return r
978
1163
    
979
1164
    def _reset_approved(self):
980
 
        self._approved = None
 
1165
        self.approved = None
981
1166
        return False
982
1167
    
983
1168
    def approve(self, value=True):
984
1169
        self.send_changedstate()
985
 
        self._approved = value
986
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1170
        self.approved = value
 
1171
        gobject.timeout_add(timedelta_to_milliseconds
987
1172
                            (self.approval_duration),
988
1173
                            self._reset_approved)
989
1174
    
1032
1217
        "D-Bus signal"
1033
1218
        return self.need_approval()
1034
1219
    
 
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
    
1035
1228
    ## Methods
1036
1229
    
1037
1230
    # Approve - method
1095
1288
                           access="readwrite")
1096
1289
    def ApprovalDuration_dbus_property(self, value=None):
1097
1290
        if value is None:       # get
1098
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1291
            return dbus.UInt64(timedelta_to_milliseconds(
1099
1292
                    self.approval_duration))
1100
1293
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1101
1294
    
1115
1308
    def Host_dbus_property(self, value=None):
1116
1309
        if value is None:       # get
1117
1310
            return dbus.String(self.host)
1118
 
        self.host = value
 
1311
        self.host = unicode(value)
1119
1312
    
1120
1313
    # Created - property
1121
1314
    @dbus_service_property(_interface, signature="s", access="read")
1122
1315
    def Created_dbus_property(self):
1123
 
        return dbus.String(datetime_to_dbus(self.created))
 
1316
        return datetime_to_dbus(self.created)
1124
1317
    
1125
1318
    # LastEnabled - property
1126
1319
    @dbus_service_property(_interface, signature="s", access="read")
1170
1363
        gobject.source_remove(self.disable_initiator_tag)
1171
1364
        self.disable_initiator_tag = None
1172
1365
        self.expires = None
1173
 
        time_to_die = (self.
1174
 
                       _timedelta_to_milliseconds((self
1175
 
                                                   .last_checked_ok
1176
 
                                                   + self.timeout)
1177
 
                                                  - datetime.datetime
1178
 
                                                  .utcnow()))
 
1366
        time_to_die = timedelta_to_milliseconds((self
 
1367
                                                 .last_checked_ok
 
1368
                                                 + self.timeout)
 
1369
                                                - datetime.datetime
 
1370
                                                .utcnow())
1179
1371
        if time_to_die <= 0:
1180
1372
            # The timeout has passed
1181
1373
            self.disable()
1182
1374
        else:
1183
1375
            self.expires = (datetime.datetime.utcnow()
1184
 
                            + datetime.timedelta(milliseconds = time_to_die))
 
1376
                            + datetime.timedelta(milliseconds =
 
1377
                                                 time_to_die))
1185
1378
            self.disable_initiator_tag = (gobject.timeout_add
1186
1379
                                          (time_to_die, self.disable))
1187
1380
    
1202
1395
        self.interval = datetime.timedelta(0, 0, 0, value)
1203
1396
        if getattr(self, "checker_initiator_tag", None) is None:
1204
1397
            return
1205
 
        # Reschedule checker run
1206
 
        gobject.source_remove(self.checker_initiator_tag)
1207
 
        self.checker_initiator_tag = (gobject.timeout_add
1208
 
                                      (value, self.start_checker))
1209
 
        self.start_checker()    # Start one now, too
 
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
1210
1404
    
1211
1405
    # Checker - property
1212
1406
    @dbus_service_property(_interface, signature="s",
1214
1408
    def Checker_dbus_property(self, value=None):
1215
1409
        if value is None:       # get
1216
1410
            return dbus.String(self.checker_command)
1217
 
        self.checker_command = value
 
1411
        self.checker_command = unicode(value)
1218
1412
    
1219
1413
    # CheckerRunning - property
1220
1414
    @dbus_service_property(_interface, signature="b",
1249
1443
            raise KeyError()
1250
1444
    
1251
1445
    def __getattribute__(self, name):
1252
 
        if(name == '_pipe'):
 
1446
        if name == '_pipe':
1253
1447
            return super(ProxyClient, self).__getattribute__(name)
1254
1448
        self._pipe.send(('getattr', name))
1255
1449
        data = self._pipe.recv()
1262
1456
            return func
1263
1457
    
1264
1458
    def __setattr__(self, name, value):
1265
 
        if(name == '_pipe'):
 
1459
        if name == '_pipe':
1266
1460
            return super(ProxyClient, self).__setattr__(name, value)
1267
1461
        self._pipe.send(('setattr', name, value))
1268
1462
 
 
1463
 
1269
1464
class ClientDBusTransitional(ClientDBus):
1270
1465
    __metaclass__ = AlternateDBusNamesMetaclass
1271
1466
 
 
1467
 
1272
1468
class ClientHandler(socketserver.BaseRequestHandler, object):
1273
1469
    """A class to handle client connections.
1274
1470
    
1342
1538
                except KeyError:
1343
1539
                    return
1344
1540
                
 
1541
                if self.server.use_dbus:
 
1542
                    # Emit D-Bus signal
 
1543
                    client.NewRequest(str(self.client_address))
 
1544
                
1345
1545
                if client.approval_delay:
1346
1546
                    delay = client.approval_delay
1347
1547
                    client.approvals_pending += 1
1353
1553
                                       client.name)
1354
1554
                        if self.server.use_dbus:
1355
1555
                            # Emit D-Bus signal
1356
 
                            client.Rejected("Disabled")                    
 
1556
                            client.Rejected("Disabled")
1357
1557
                        return
1358
1558
                    
1359
 
                    if client._approved or not client.approval_delay:
 
1559
                    if client.approved or not client.approval_delay:
1360
1560
                        #We are approved or approval is disabled
1361
1561
                        break
1362
 
                    elif client._approved is None:
 
1562
                    elif client.approved is None:
1363
1563
                        logger.info("Client %s needs approval",
1364
1564
                                    client.name)
1365
1565
                        if self.server.use_dbus:
1376
1576
                        return
1377
1577
                    
1378
1578
                    #wait until timeout or approved
1379
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1380
1579
                    time = datetime.datetime.now()
1381
1580
                    client.changedstate.acquire()
1382
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1581
                    (client.changedstate.wait
 
1582
                     (float(client.timedelta_to_milliseconds(delay)
 
1583
                            / 1000)))
1383
1584
                    client.changedstate.release()
1384
1585
                    time2 = datetime.datetime.now()
1385
1586
                    if (time2 - time) >= delay:
1409
1610
                    sent_size += sent
1410
1611
                
1411
1612
                logger.info("Sending secret to %s", client.name)
1412
 
                # bump the timeout as if seen
 
1613
                # bump the timeout using extended_timeout
1413
1614
                client.checked_ok(client.extended_timeout)
1414
1615
                if self.server.use_dbus:
1415
1616
                    # Emit D-Bus signal
1483
1684
        # Convert the buffer to a Python bytestring
1484
1685
        fpr = ctypes.string_at(buf, buf_len.value)
1485
1686
        # Convert the bytestring to hexadecimal notation
1486
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1687
        hex_fpr = binascii.hexlify(fpr).upper()
1487
1688
        return hex_fpr
1488
1689
 
1489
1690
 
1492
1693
    def sub_process_main(self, request, address):
1493
1694
        try:
1494
1695
            self.finish_request(request, address)
1495
 
        except:
 
1696
        except Exception:
1496
1697
            self.handle_error(request, address)
1497
1698
        self.close_request(request)
1498
 
            
 
1699
    
1499
1700
    def process_request(self, request, address):
1500
1701
        """Start a new process to process the request."""
1501
 
        multiprocessing.Process(target = self.sub_process_main,
1502
 
                                args = (request, address)).start()
 
1702
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1703
                                       args = (request,
 
1704
                                               address))
 
1705
        proc.start()
 
1706
        return proc
1503
1707
 
1504
1708
 
1505
1709
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1511
1715
        """
1512
1716
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1513
1717
        
1514
 
        super(MultiprocessingMixInWithPipe,
1515
 
              self).process_request(request, client_address)
 
1718
        proc = MultiprocessingMixIn.process_request(self, request,
 
1719
                                                    client_address)
1516
1720
        self.child_pipe.close()
1517
 
        self.add_pipe(parent_pipe)
 
1721
        self.add_pipe(parent_pipe, proc)
1518
1722
    
1519
 
    def add_pipe(self, parent_pipe):
 
1723
    def add_pipe(self, parent_pipe, proc):
1520
1724
        """Dummy function; override as necessary"""
1521
1725
        raise NotImplementedError
1522
1726
 
1600
1804
        self.enabled = False
1601
1805
        self.clients = clients
1602
1806
        if self.clients is None:
1603
 
            self.clients = set()
 
1807
            self.clients = {}
1604
1808
        self.use_dbus = use_dbus
1605
1809
        self.gnutls_priority = gnutls_priority
1606
1810
        IPv6_TCPServer.__init__(self, server_address,
1610
1814
    def server_activate(self):
1611
1815
        if self.enabled:
1612
1816
            return socketserver.TCPServer.server_activate(self)
 
1817
    
1613
1818
    def enable(self):
1614
1819
        self.enabled = True
1615
 
    def add_pipe(self, parent_pipe):
 
1820
    
 
1821
    def add_pipe(self, parent_pipe, proc):
1616
1822
        # Call "handle_ipc" for both data and EOF events
1617
1823
        gobject.io_add_watch(parent_pipe.fileno(),
1618
1824
                             gobject.IO_IN | gobject.IO_HUP,
1619
1825
                             functools.partial(self.handle_ipc,
1620
 
                                               parent_pipe = parent_pipe))
1621
 
        
 
1826
                                               parent_pipe =
 
1827
                                               parent_pipe,
 
1828
                                               proc = proc))
 
1829
    
1622
1830
    def handle_ipc(self, source, condition, parent_pipe=None,
1623
 
                   client_object=None):
 
1831
                   proc = None, client_object=None):
1624
1832
        condition_names = {
1625
1833
            gobject.IO_IN: "IN",   # There is data to read.
1626
1834
            gobject.IO_OUT: "OUT", # Data can be written (without
1635
1843
                                       for cond, name in
1636
1844
                                       condition_names.iteritems()
1637
1845
                                       if cond & condition)
1638
 
        # error or the other end of multiprocessing.Pipe has closed
 
1846
        # error, or the other end of multiprocessing.Pipe has closed
1639
1847
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1848
            # Wait for other process to exit
 
1849
            proc.join()
1640
1850
            return False
1641
1851
        
1642
1852
        # Read a request from the child
1647
1857
            fpr = request[1]
1648
1858
            address = request[2]
1649
1859
            
1650
 
            for c in self.clients:
 
1860
            for c in self.clients.itervalues():
1651
1861
                if c.fingerprint == fpr:
1652
1862
                    client = c
1653
1863
                    break
1656
1866
                            "dress: %s", fpr, address)
1657
1867
                if self.use_dbus:
1658
1868
                    # Emit D-Bus signal
1659
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1869
                    mandos_dbus_service.ClientNotFound(fpr,
 
1870
                                                       address[0])
1660
1871
                parent_pipe.send(False)
1661
1872
                return False
1662
1873
            
1663
1874
            gobject.io_add_watch(parent_pipe.fileno(),
1664
1875
                                 gobject.IO_IN | gobject.IO_HUP,
1665
1876
                                 functools.partial(self.handle_ipc,
1666
 
                                                   parent_pipe = parent_pipe,
1667
 
                                                   client_object = client))
 
1877
                                                   parent_pipe =
 
1878
                                                   parent_pipe,
 
1879
                                                   proc = proc,
 
1880
                                                   client_object =
 
1881
                                                   client))
1668
1882
            parent_pipe.send(True)
1669
 
            # remove the old hook in favor of the new above hook on same fileno
 
1883
            # remove the old hook in favor of the new above hook on
 
1884
            # same fileno
1670
1885
            return False
1671
1886
        if command == 'funcall':
1672
1887
            funcname = request[1]
1673
1888
            args = request[2]
1674
1889
            kwargs = request[3]
1675
1890
            
1676
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1891
            parent_pipe.send(('data', getattr(client_object,
 
1892
                                              funcname)(*args,
 
1893
                                                         **kwargs)))
1677
1894
        
1678
1895
        if command == 'getattr':
1679
1896
            attrname = request[1]
1680
1897
            if callable(client_object.__getattribute__(attrname)):
1681
1898
                parent_pipe.send(('function',))
1682
1899
            else:
1683
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1900
                parent_pipe.send(('data', client_object
 
1901
                                  .__getattribute__(attrname)))
1684
1902
        
1685
1903
        if command == 'setattr':
1686
1904
            attrname = request[1]
1729
1947
    return timevalue
1730
1948
 
1731
1949
 
1732
 
def if_nametoindex(interface):
1733
 
    """Call the C function if_nametoindex(), or equivalent
1734
 
    
1735
 
    Note: This function cannot accept a unicode string."""
1736
 
    global if_nametoindex
1737
 
    try:
1738
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1739
 
                          (ctypes.util.find_library("c"))
1740
 
                          .if_nametoindex)
1741
 
    except (OSError, AttributeError):
1742
 
        logger.warning("Doing if_nametoindex the hard way")
1743
 
        def if_nametoindex(interface):
1744
 
            "Get an interface index the hard way, i.e. using fcntl()"
1745
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1746
 
            with contextlib.closing(socket.socket()) as s:
1747
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1748
 
                                    struct.pack(str("16s16x"),
1749
 
                                                interface))
1750
 
            interface_index = struct.unpack(str("I"),
1751
 
                                            ifreq[16:20])[0]
1752
 
            return interface_index
1753
 
    return if_nametoindex(interface)
1754
 
 
1755
 
 
1756
1950
def daemon(nochdir = False, noclose = False):
1757
1951
    """See daemon(3).  Standard BSD Unix function.
1758
1952
    
1813
2007
                        " system bus interface")
1814
2008
    parser.add_argument("--no-ipv6", action="store_false",
1815
2009
                        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
    
1816
2016
    options = parser.parse_args()
1817
2017
    
1818
2018
    if options.check:
1831
2031
                        "use_dbus": "True",
1832
2032
                        "use_ipv6": "True",
1833
2033
                        "debuglevel": "",
 
2034
                        "restore": "True",
 
2035
                        "statedir": "/var/lib/mandos"
1834
2036
                        }
1835
2037
    
1836
2038
    # Parse config file for server-global settings
1853
2055
    # options, if set.
1854
2056
    for option in ("interface", "address", "port", "debug",
1855
2057
                   "priority", "servicename", "configdir",
1856
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2058
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2059
                   "statedir"):
1857
2060
        value = getattr(options, option)
1858
2061
        if value is not None:
1859
2062
            server_settings[option] = value
1871
2074
    debuglevel = server_settings["debuglevel"]
1872
2075
    use_dbus = server_settings["use_dbus"]
1873
2076
    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)
1874
2088
    
1875
2089
    if server_settings["servicename"] != "Mandos":
1876
2090
        syslogger.setFormatter(logging.Formatter
1879
2093
                                % server_settings["servicename"]))
1880
2094
    
1881
2095
    # Parse config file with clients
1882
 
    client_defaults = { "timeout": "5m",
1883
 
                        "extended_timeout": "15m",
1884
 
                        "interval": "2m",
1885
 
                        "checker": "fping -q -- %%(host)s",
1886
 
                        "host": "",
1887
 
                        "approval_delay": "0s",
1888
 
                        "approval_duration": "1s",
1889
 
                        }
1890
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2096
    client_config = configparser.SafeConfigParser(Client.client_defaults)
1891
2097
    client_config.read(os.path.join(server_settings["configdir"],
1892
2098
                                    "clients.conf"))
1893
2099
    
1931
2137
        if error[0] != errno.EPERM:
1932
2138
            raise error
1933
2139
    
1934
 
    if not debug and not debuglevel:
1935
 
        syslogger.setLevel(logging.WARNING)
1936
 
        console.setLevel(logging.WARNING)
1937
 
    if debuglevel:
1938
 
        level = getattr(logging, debuglevel.upper())
1939
 
        syslogger.setLevel(level)
1940
 
        console.setLevel(level)
1941
 
    
1942
2140
    if debug:
1943
2141
        # Enable all possible GnuTLS debugging
1944
2142
        
1977
2175
        try:
1978
2176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1979
2177
                                            bus, do_not_queue=True)
1980
 
            old_bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1981
 
                                                bus, do_not_queue=True)
 
2178
            old_bus_name = (dbus.service.BusName
 
2179
                            ("se.bsnet.fukt.Mandos", bus,
 
2180
                             do_not_queue=True))
1982
2181
        except dbus.exceptions.NameExistsException as e:
1983
2182
            logger.error(unicode(e) + ", disabling D-Bus")
1984
2183
            use_dbus = False
1985
2184
            server_settings["use_dbus"] = False
1986
2185
            tcp_server.use_dbus = False
1987
2186
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1988
 
    service = AvahiService(name = server_settings["servicename"],
1989
 
                           servicetype = "_mandos._tcp",
1990
 
                           protocol = protocol, bus = bus)
 
2187
    service = AvahiServiceToSyslog(name =
 
2188
                                   server_settings["servicename"],
 
2189
                                   servicetype = "_mandos._tcp",
 
2190
                                   protocol = protocol, bus = bus)
1991
2191
    if server_settings["interface"]:
1992
2192
        service.interface = (if_nametoindex
1993
2193
                             (str(server_settings["interface"])))
1997
2197
    
1998
2198
    client_class = Client
1999
2199
    if use_dbus:
2000
 
        client_class = functools.partial(ClientDBusTransitional, bus = bus)        
2001
 
    def client_config_items(config, section):
2002
 
        special_settings = {
2003
 
            "approved_by_default":
2004
 
                lambda: config.getboolean(section,
2005
 
                                          "approved_by_default"),
2006
 
            }
2007
 
        for name, value in config.items(section):
 
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
                    
2008
2263
            try:
2009
 
                yield (name, special_settings[name]())
2010
 
            except KeyError:
2011
 
                yield (name, value)
2012
 
    
2013
 
    tcp_server.clients.update(set(
2014
 
            client_class(name = section,
2015
 
                         config= dict(client_config_items(
2016
 
                        client_config, section)))
2017
 
            for section in client_config.sections()))
 
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
    
2018
2287
    if not tcp_server.clients:
2019
2288
        logger.warning("No clients defined")
2020
2289
        
2031
2300
            # "pidfile" was never created
2032
2301
            pass
2033
2302
        del pidfilename
2034
 
        
2035
2303
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2036
2304
    
2037
2305
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2063
2331
            def GetAllClients(self):
2064
2332
                "D-Bus method"
2065
2333
                return dbus.Array(c.dbus_object_path
2066
 
                                  for c in tcp_server.clients)
 
2334
                                  for c in
 
2335
                                  tcp_server.clients.itervalues())
2067
2336
            
2068
2337
            @dbus.service.method(_interface,
2069
2338
                                 out_signature="a{oa{sv}}")
2071
2340
                "D-Bus method"
2072
2341
                return dbus.Dictionary(
2073
2342
                    ((c.dbus_object_path, c.GetAll(""))
2074
 
                     for c in tcp_server.clients),
 
2343
                     for c in tcp_server.clients.itervalues()),
2075
2344
                    signature="oa{sv}")
2076
2345
            
2077
2346
            @dbus.service.method(_interface, in_signature="o")
2078
2347
            def RemoveClient(self, object_path):
2079
2348
                "D-Bus method"
2080
 
                for c in tcp_server.clients:
 
2349
                for c in tcp_server.clients.itervalues():
2081
2350
                    if c.dbus_object_path == object_path:
2082
 
                        tcp_server.clients.remove(c)
 
2351
                        del tcp_server.clients[c.name]
2083
2352
                        c.remove_from_connection()
2084
2353
                        # Don't signal anything except ClientRemoved
2085
2354
                        c.disable(quiet=True)
2098
2367
        "Cleanup function; run on exit"
2099
2368
        service.cleanup()
2100
2369
        
 
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
2101
2414
        while tcp_server.clients:
2102
 
            client = tcp_server.clients.pop()
 
2415
            name, client = tcp_server.clients.popitem()
2103
2416
            if use_dbus:
2104
2417
                client.remove_from_connection()
2105
 
            client.disable_hook = None
2106
2418
            # Don't signal anything except ClientRemoved
2107
2419
            client.disable(quiet=True)
2108
2420
            if use_dbus:
2109
2421
                # Emit D-Bus signal
2110
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2422
                mandos_dbus_service.ClientRemoved(client
 
2423
                                                  .dbus_object_path,
2111
2424
                                                  client.name)
 
2425
        client_settings.clear()
2112
2426
    
2113
2427
    atexit.register(cleanup)
2114
2428
    
2115
 
    for client in tcp_server.clients:
 
2429
    for client in tcp_server.clients.itervalues():
2116
2430
        if use_dbus:
2117
2431
            # Emit D-Bus signal
2118
2432
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2119
 
        client.enable()
 
2433
        # Need to initiate checking of clients
 
2434
        if client.enabled:
 
2435
            client.init_checker()
2120
2436
    
2121
2437
    tcp_server.enable()
2122
2438
    tcp_server.server_activate()
2162
2478
    # Must run before the D-Bus bus name gets deregistered
2163
2479
    cleanup()
2164
2480
 
2165
 
 
2166
2481
if __name__ == '__main__':
2167
2482
    main()