/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos (Client.start_checker): Bug fix: Fix race condition with
                                 short intervals.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
79
79
        SO_BINDTODEVICE = None
80
80
 
81
81
 
82
 
version = "1.0.14"
 
82
version = "1.0.12"
83
83
 
84
84
logger = logging.Logger(u'mandos')
85
85
syslogger = (logging.handlers.SysLogHandler
292
292
        elif u"secfile" in config:
293
293
            with closing(open(os.path.expanduser
294
294
                              (os.path.expandvars
295
 
                               (config[u"secfile"])),
296
 
                              "rb")) as secfile:
 
295
                               (config[u"secfile"])))) as secfile:
297
296
                self.secret = secfile.read()
298
297
        else:
299
298
            raise TypeError(u"No secret or secfile for client %s"
325
324
        self.checker_initiator_tag = (gobject.timeout_add
326
325
                                      (self.interval_milliseconds(),
327
326
                                       self.start_checker))
 
327
        # Also start a new checker *right now*.
 
328
        self.start_checker()
328
329
        # Schedule a disable() when 'timeout' has passed
329
330
        self.disable_initiator_tag = (gobject.timeout_add
330
331
                                   (self.timeout_milliseconds(),
331
332
                                    self.disable))
332
333
        self.enabled = True
333
 
        # Also start a new checker *right now*.
334
 
        self.start_checker()
335
334
    
336
 
    def disable(self, quiet=True):
 
335
    def disable(self):
337
336
        """Disable this client."""
338
337
        if not getattr(self, "enabled", False):
339
338
            return False
340
 
        if not quiet:
341
 
            logger.info(u"Disabling client %s", self.name)
 
339
        logger.info(u"Disabling client %s", self.name)
342
340
        if getattr(self, u"disable_initiator_tag", False):
343
341
            gobject.source_remove(self.disable_initiator_tag)
344
342
            self.disable_initiator_tag = None
468
466
        logger.debug(u"Stopping checker for %(name)s", vars(self))
469
467
        try:
470
468
            os.kill(self.checker.pid, signal.SIGTERM)
471
 
            #time.sleep(0.5)
 
469
            #os.sleep(0.5)
472
470
            #if self.checker.poll() is None:
473
471
            #    os.kill(self.checker.pid, signal.SIGKILL)
474
472
        except OSError, error:
627
625
        """Standard D-Bus method, overloaded to insert property tags.
628
626
        """
629
627
        xmlstring = dbus.service.Object.Introspect(self, object_path,
630
 
                                                   connection)
631
 
        try:
632
 
            document = xml.dom.minidom.parseString(xmlstring)
633
 
            def make_tag(document, name, prop):
634
 
                e = document.createElement(u"property")
635
 
                e.setAttribute(u"name", name)
636
 
                e.setAttribute(u"type", prop._dbus_signature)
637
 
                e.setAttribute(u"access", prop._dbus_access)
638
 
                return e
639
 
            for if_tag in document.getElementsByTagName(u"interface"):
640
 
                for tag in (make_tag(document, name, prop)
641
 
                            for name, prop
642
 
                            in self._get_all_dbus_properties()
643
 
                            if prop._dbus_interface
644
 
                            == if_tag.getAttribute(u"name")):
645
 
                    if_tag.appendChild(tag)
646
 
                # Add the names to the return values for the
647
 
                # "org.freedesktop.DBus.Properties" methods
648
 
                if (if_tag.getAttribute(u"name")
649
 
                    == u"org.freedesktop.DBus.Properties"):
650
 
                    for cn in if_tag.getElementsByTagName(u"method"):
651
 
                        if cn.getAttribute(u"name") == u"Get":
652
 
                            for arg in cn.getElementsByTagName(u"arg"):
653
 
                                if (arg.getAttribute(u"direction")
654
 
                                    == u"out"):
655
 
                                    arg.setAttribute(u"name", u"value")
656
 
                        elif cn.getAttribute(u"name") == u"GetAll":
657
 
                            for arg in cn.getElementsByTagName(u"arg"):
658
 
                                if (arg.getAttribute(u"direction")
659
 
                                    == u"out"):
660
 
                                    arg.setAttribute(u"name", u"props")
661
 
            xmlstring = document.toxml(u"utf-8")
662
 
            document.unlink()
663
 
        except (AttributeError, xml.dom.DOMException,
664
 
                xml.parsers.expat.ExpatError), error:
665
 
            logger.error(u"Failed to override Introspection method",
666
 
                         error)
 
628
                                           connection)
 
629
        document = xml.dom.minidom.parseString(xmlstring)
 
630
        del xmlstring
 
631
        def make_tag(document, name, prop):
 
632
            e = document.createElement(u"property")
 
633
            e.setAttribute(u"name", name)
 
634
            e.setAttribute(u"type", prop._dbus_signature)
 
635
            e.setAttribute(u"access", prop._dbus_access)
 
636
            return e
 
637
        for if_tag in document.getElementsByTagName(u"interface"):
 
638
            for tag in (make_tag(document, name, prop)
 
639
                        for name, prop
 
640
                        in self._get_all_dbus_properties()
 
641
                        if prop._dbus_interface
 
642
                        == if_tag.getAttribute(u"name")):
 
643
                if_tag.appendChild(tag)
 
644
        xmlstring = document.toxml(u"utf-8")
 
645
        document.unlink()
667
646
        return xmlstring
668
647
 
669
648
 
706
685
                                       variant_level=1))
707
686
        return r
708
687
    
709
 
    def disable(self, quiet = False):
 
688
    def disable(self, signal = True):
710
689
        oldstate = getattr(self, u"enabled", False)
711
 
        r = Client.disable(self, quiet=quiet)
712
 
        if not quiet and oldstate != self.enabled:
 
690
        r = Client.disable(self)
 
691
        if signal and oldstate != self.enabled:
713
692
            # Emit D-Bus signal
714
693
            self.PropertyChanged(dbus.String(u"enabled"),
715
694
                                 dbus.Boolean(False, variant_level=1))
807
786
        "D-Bus signal"
808
787
        pass
809
788
    
810
 
    # GotSecret - signal
 
789
    # ReceivedSecret - signal
811
790
    @dbus.service.signal(_interface)
812
 
    def GotSecret(self):
 
791
    def ReceivedSecret(self):
813
792
        "D-Bus signal"
814
793
        pass
815
794
    
1302
1281
                    client.checked_ok()
1303
1282
                    if self.use_dbus:
1304
1283
                        # Emit D-Bus signal
1305
 
                        client.GotSecret()
 
1284
                        client.ReceivedSecret()
1306
1285
                    break
1307
1286
            else:
1308
1287
                logger.error(u"Sending secret to unknown client %s",
1346
1325
            elif suffix == u"w":
1347
1326
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1348
1327
            else:
1349
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1350
 
        except (ValueError, IndexError), e:
1351
 
            raise ValueError(e.message)
 
1328
                raise ValueError
 
1329
        except (ValueError, IndexError):
 
1330
            raise ValueError
1352
1331
        timevalue += delta
1353
1332
    return timevalue
1354
1333
 
1393
1372
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1394
1373
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1395
1374
            raise OSError(errno.ENODEV,
1396
 
                          u"%s not a character device"
1397
 
                          % os.path.devnull)
 
1375
                          u"/dev/null not a character device")
1398
1376
        os.dup2(null, sys.stdin.fileno())
1399
1377
        os.dup2(null, sys.stdout.fileno())
1400
1378
        os.dup2(null, sys.stderr.fileno())
1567
1545
    bus = dbus.SystemBus()
1568
1546
    # End of Avahi example code
1569
1547
    if use_dbus:
1570
 
        try:
1571
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1572
 
                                            bus, do_not_queue=True)
1573
 
        except dbus.exceptions.NameExistsException, e:
1574
 
            logger.error(unicode(e) + u", disabling D-Bus")
1575
 
            use_dbus = False
1576
 
            server_settings[u"use_dbus"] = False
1577
 
            tcp_server.use_dbus = False
 
1548
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1578
1549
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1579
1550
    service = AvahiService(name = server_settings[u"servicename"],
1580
1551
                           servicetype = u"_mandos._tcp",
1618
1589
        pass
1619
1590
    del pidfilename
1620
1591
    
 
1592
    def cleanup():
 
1593
        "Cleanup function; run on exit"
 
1594
        service.cleanup()
 
1595
        
 
1596
        while tcp_server.clients:
 
1597
            client = tcp_server.clients.pop()
 
1598
            client.disable_hook = None
 
1599
            client.disable()
 
1600
    
 
1601
    atexit.register(cleanup)
 
1602
    
1621
1603
    if not debug:
1622
1604
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1623
1605
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1668
1650
                        tcp_server.clients.remove(c)
1669
1651
                        c.remove_from_connection()
1670
1652
                        # Don't signal anything except ClientRemoved
1671
 
                        c.disable(quiet=True)
 
1653
                        c.disable(signal=False)
1672
1654
                        # Emit D-Bus signal
1673
1655
                        self.ClientRemoved(object_path, c.name)
1674
1656
                        return
1675
 
                raise KeyError(object_path)
 
1657
                raise KeyError
1676
1658
            
1677
1659
            del _interface
1678
1660
        
1679
1661
        mandos_dbus_service = MandosDBusService()
1680
1662
    
1681
 
    def cleanup():
1682
 
        "Cleanup function; run on exit"
1683
 
        service.cleanup()
1684
 
        
1685
 
        while tcp_server.clients:
1686
 
            client = tcp_server.clients.pop()
1687
 
            if use_dbus:
1688
 
                client.remove_from_connection()
1689
 
            client.disable_hook = None
1690
 
            # Don't signal anything except ClientRemoved
1691
 
            client.disable(quiet=True)
1692
 
            if use_dbus:
1693
 
                # Emit D-Bus signal
1694
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1695
 
                                                  client.name)
1696
 
    
1697
 
    atexit.register(cleanup)
1698
 
    
1699
1663
    for client in tcp_server.clients:
1700
1664
        if use_dbus:
1701
1665
            # Emit D-Bus signal
1724
1688
            service.activate()
1725
1689
        except dbus.exceptions.DBusException, error:
1726
1690
            logger.critical(u"DBusException: %s", error)
1727
 
            cleanup()
1728
1691
            sys.exit(1)
1729
1692
        # End of Avahi example code
1730
1693
        
1737
1700
        main_loop.run()
1738
1701
    except AvahiError, error:
1739
1702
        logger.critical(u"AvahiError: %s", error)
1740
 
        cleanup()
1741
1703
        sys.exit(1)
1742
1704
    except KeyboardInterrupt:
1743
1705
        if debug:
1744
1706
            print >> sys.stderr
1745
1707
        logger.debug(u"Server received KeyboardInterrupt")
1746
1708
    logger.debug(u"Server exiting")
1747
 
    # Must run before the D-Bus bus name gets deregistered
1748
 
    cleanup()
1749
1709
 
1750
1710
if __name__ == '__main__':
1751
1711
    main()