/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: 2008-08-27 01:18:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080827011825-ka3ni6xvy2ehi1y8
* .bzrignore: New.

* clients.conf ([foo]): Remove Radix-64 checksum.

* mandos (AvahiService.rename, server_state_changed,
          entry_group_state_changed): Make Avahi log messages more
                                      clear that they are about
                                      Zeroconf.
  (fingerprint): Use plain "0" instead of "ctypes.c_uint(0)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
24
24
#     GNU General Public License for more details.
25
25
# 
26
26
# You should have received a copy of the GNU General Public License
27
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see
 
28
# <http://www.gnu.org/licenses/>.
28
29
# 
29
30
# Contact the authors at <mandos@fukt.bsnet.se>.
30
31
# 
123
124
    def rename(self):
124
125
        """Derived from the Avahi example code"""
125
126
        if self.rename_count >= self.max_renames:
126
 
            logger.critical(u"No suitable service name found after %i"
127
 
                            u" retries, exiting.", rename_count)
 
127
            logger.critical(u"No suitable Zeroconf service name found"
 
128
                            u" after %i retries, exiting.",
 
129
                            rename_count)
128
130
            raise AvahiServiceError("Too many renames")
129
131
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
132
        logger.info(u"Changing Zeroconf service name to %r ...",
 
133
                    str(self.name))
131
134
        syslogger.setFormatter(logging.Formatter\
132
135
                               ('Mandos (%s): %%(levelname)s:'
133
136
                               ' %%(message)s' % self.name))
148
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
149
152
            group.connect_to_signal('StateChanged',
150
153
                                    entry_group_state_changed)
151
 
        logger.debug(u"Adding service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
152
155
                     service.name, service.type)
153
156
        group.AddService(
154
157
                self.interface,         # interface
410
413
    gnutls.library.functions.gnutls_openpgp_crt_import\
411
414
                    (crt, ctypes.byref(datum),
412
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
416
    # Verify the self signature in the key
 
417
    crtverify = ctypes.c_uint();
 
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
419
        (crt, 0, ctypes.byref(crtverify))
 
420
    if crtverify.value != 0:
 
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
413
423
    # New buffer for the fingerprint
414
424
    buffer = ctypes.create_string_buffer(20)
415
425
    buffer_length = ctypes.c_size_t()
596
606
def server_state_changed(state):
597
607
    """Derived from the Avahi example code"""
598
608
    if state == avahi.SERVER_COLLISION:
599
 
        logger.error(u"Server name collision")
 
609
        logger.error(u"Zeroconf server name collision")
600
610
        service.remove()
601
611
    elif state == avahi.SERVER_RUNNING:
602
612
        service.add()
604
614
 
605
615
def entry_group_state_changed(state, error):
606
616
    """Derived from the Avahi example code"""
607
 
    logger.debug(u"state change: %i", state)
 
617
    logger.debug(u"Avahi state change: %i", state)
608
618
    
609
619
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
610
 
        logger.debug(u"Service established.")
 
620
        logger.debug(u"Zeroconf service established.")
611
621
    elif state == avahi.ENTRY_GROUP_COLLISION:
612
 
        logger.warning(u"Service name collision.")
 
622
        logger.warning(u"Zeroconf service name collision.")
613
623
        service.rename()
614
624
    elif state == avahi.ENTRY_GROUP_FAILURE:
615
 
        logger.critical(u"Error in group state changed %s",
 
625
        logger.critical(u"Avahi: Error in group state changed %s",
616
626
                        unicode(error))
617
627
        raise AvahiGroupError("State changed: %s", str(error))
618
628
 
752
762
    service = AvahiService(name = server_settings["servicename"],
753
763
                           type = "_mandos._tcp", );
754
764
    if server_settings["interface"]:
755
 
        service.interface = if_nametoindex(server_settings["interface"])
 
765
        service.interface = if_nametoindex\
 
766
                            (server_settings["interface"])
756
767
    
757
768
    global main_loop
758
769
    global bus
761
772
    DBusGMainLoop(set_as_default=True )
762
773
    main_loop = gobject.MainLoop()
763
774
    bus = dbus.SystemBus()
764
 
    server = dbus.Interface(
765
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
766
 
            avahi.DBUS_INTERFACE_SERVER )
 
775
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
776
                                           avahi.DBUS_PATH_SERVER),
 
777
                            avahi.DBUS_INTERFACE_SERVER)
767
778
    # End of Avahi example code
768
779
    
769
780
    clients = Set()