/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 server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-04 21:25:55 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080804212555-rm7xxjze65f8avy3
* server.py: Cosmetic changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
96
96
 
97
97
 
98
98
class AvahiService(object):
99
 
    """
 
99
    """An Avahi (Zeroconf) service.
 
100
    Attributes:
100
101
    interface: integer; avahi.IF_UNSPEC or an interface index.
101
102
               Used to optionally bind to the specified interface.
102
 
    name = string; Example: "Mandos"
103
 
    type = string; Example: "_mandos._tcp".
104
 
                   See <http://www.dns-sd.org/ServiceTypes.html>
105
 
    port = integer; what port to announce
106
 
    TXT = list of strings; TXT record for the service
107
 
    domain = string; Domain to publish on, default to .local if empty.
108
 
    host = string; Host to publish records for, default to localhost
109
 
                   if empty.
110
 
    max_renames = integer; maximum number of renames
111
 
    rename_count = integer; counter so we only rename after collisions
112
 
                   a sensible number of times
 
103
    name: string; Example: 'Mandos'
 
104
    type: string; Example: '_mandos._tcp'.
 
105
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
106
    port: integer; what port to announce
 
107
    TXT: list of strings; TXT record for the service
 
108
    domain: string; Domain to publish on, default to .local if empty.
 
109
    host: string; Host to publish records for, default is localhost
 
110
    max_renames: integer; maximum number of renames
 
111
    rename_count: integer; counter so we only rename after collisions
 
112
                  a sensible number of times
113
113
    """
114
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
115
                 type = None, port = None, TXT = None, domain = "",
116
116
                 host = "", max_renames = 12):
117
 
        """An Avahi (Zeroconf) service. """
118
117
        self.interface = interface
119
118
        self.name = name
120
119
        self.type = type
133
132
                            u" retries, exiting.", rename_count)
134
133
            raise AvahiServiceError("Too many renames")
135
134
        name = server.GetAlternativeServiceName(name)
136
 
        logger.notice(u"Changing name to %r ...", name)
 
135
        logger.error(u"Changing name to %r ...", name)
137
136
        self.remove()
138
137
        self.add()
139
138
        self.rename_count += 1
221
220
    interval = property(lambda self: self._interval,
222
221
                        _set_interval)
223
222
    del _set_interval
224
 
    def __init__(self, name=None, stop_hook=None, fingerprint=None,
225
 
                 secret=None, secfile=None, fqdn=None, timeout=None,
226
 
                 interval=-1, checker=None):
227
 
        """Note: the 'checker' argument sets the 'checker_command'
228
 
        attribute and not the 'checker' attribute.."""
 
223
    def __init__(self, name = None, stop_hook=None, config={}):
 
224
        """Note: the 'checker' key in 'config' sets the
 
225
        'checker_command' attribute and *not* the 'checker'
 
226
        attribute."""
229
227
        self.name = name
230
228
        logger.debug(u"Creating client %r", self.name)
231
 
        # Uppercase and remove spaces from fingerprint
232
 
        # for later comparison purposes with return value of
233
 
        # the fingerprint() function
234
 
        self.fingerprint = fingerprint.upper().replace(u" ", u"")
 
229
        # Uppercase and remove spaces from fingerprint for later
 
230
        # comparison purposes with return value from the fingerprint()
 
231
        # function
 
232
        self.fingerprint = config["fingerprint"].upper()\
 
233
                           .replace(u" ", u"")
235
234
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
236
 
        if secret:
237
 
            self.secret = secret.decode(u"base64")
238
 
        elif secfile:
239
 
            sf = open(secfile)
 
235
        if "secret" in config:
 
236
            self.secret = config["secret"].decode(u"base64")
 
237
        elif "secfile" in config:
 
238
            sf = open(config["secfile"])
240
239
            self.secret = sf.read()
241
240
            sf.close()
242
241
        else:
243
242
            raise TypeError(u"No secret or secfile for client %s"
244
243
                            % self.name)
245
 
        self.fqdn = fqdn
 
244
        self.fqdn = config.get("fqdn", "")
246
245
        self.created = datetime.datetime.now()
247
246
        self.last_checked_ok = None
248
 
        self.timeout = string_to_delta(timeout)
249
 
        self.interval = string_to_delta(interval)
 
247
        self.timeout = string_to_delta(config["timeout"])
 
248
        self.interval = string_to_delta(config["interval"])
250
249
        self.stop_hook = stop_hook
251
250
        self.checker = None
252
251
        self.checker_initiator_tag = None
253
252
        self.stop_initiator_tag = None
254
253
        self.checker_callback_tag = None
255
 
        self.check_command = checker
 
254
        self.check_command = config["checker"]
256
255
    def start(self):
257
256
        """Start this client's checker and timeout hooks"""
258
257
        # Schedule a new checker to be started an 'interval' from now,
272
271
        but not currently used."""
273
272
        # If this client doesn't have a secret, it is already stopped.
274
273
        if self.secret:
275
 
            logger.debug(u"Stopping client %s", self.name)
 
274
            logger.info(u"Stopping client %s", self.name)
276
275
            self.secret = None
277
276
        else:
278
277
            return False
297
296
        self.checker = None
298
297
        if os.WIFEXITED(condition) \
299
298
               and (os.WEXITSTATUS(condition) == 0):
300
 
            logger.debug(u"Checker for %(name)s succeeded",
301
 
                         vars(self))
 
299
            logger.info(u"Checker for %(name)s succeeded",
 
300
                        vars(self))
302
301
            self.last_checked_ok = now
303
302
            gobject.source_remove(self.stop_initiator_tag)
304
303
            self.stop_initiator_tag = gobject.timeout_add\
308
307
            logger.warning(u"Checker for %(name)s crashed?",
309
308
                           vars(self))
310
309
        else:
311
 
            logger.debug(u"Checker for %(name)s failed",
312
 
                         vars(self))
 
310
            logger.info(u"Checker for %(name)s failed",
 
311
                        vars(self))
313
312
    def start_checker(self):
314
313
        """Start a new checker subprocess if one is not running.
315
314
        If a checker already exists, leave it running and do
338
337
                                 u' %s', self.check_command, error)
339
338
                    return True # Try again later
340
339
            try:
341
 
                logger.debug(u"Starting checker %r for %s",
342
 
                             command, self.name)
 
340
                logger.info(u"Starting checker %r for %s",
 
341
                            command, self.name)
343
342
                self.checker = subprocess.Popen(command,
344
343
                                                close_fds=True,
345
344
                                                shell=True, cwd="/")
396
395
 
397
396
def fingerprint(openpgp):
398
397
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
399
 
    # New empty GnuTLS certificate
400
 
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
401
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
402
 
        (ctypes.byref(crt))
403
398
    # New GnuTLS "datum" with the OpenPGP public key
404
399
    datum = gnutls.library.types.gnutls_datum_t\
405
400
        (ctypes.cast(ctypes.c_char_p(openpgp),
406
401
                     ctypes.POINTER(ctypes.c_ubyte)),
407
402
         ctypes.c_uint(len(openpgp)))
 
403
    # New empty GnuTLS certificate
 
404
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
405
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
406
        (ctypes.byref(crt))
408
407
    # Import the OpenPGP public key into the certificate
409
 
    ret = gnutls.library.functions.gnutls_openpgp_crt_import\
410
 
        (crt,
411
 
         ctypes.byref(datum),
412
 
         gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
408
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
409
                    (crt, ctypes.byref(datum),
 
410
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
413
411
    # New buffer for the fingerprint
414
412
    buffer = ctypes.create_string_buffer(20)
415
413
    buffer_length = ctypes.c_size_t()
431
429
    Note: This will run in its own forked process."""
432
430
    
433
431
    def handle(self):
434
 
        logger.debug(u"TCP connection from: %s",
 
432
        logger.info(u"TCP connection from: %s",
435
433
                     unicode(self.client_address))
436
434
        session = gnutls.connection.ClientSession\
437
435
                  (self.request, gnutls.connection.X509Credentials())
463
461
        try:
464
462
            session.handshake()
465
463
        except gnutls.errors.GNUTLSError, error:
466
 
            logger.debug(u"Handshake failed: %s", error)
 
464
            logger.warning(u"Handshake failed: %s", error)
467
465
            # Do not run session.bye() here: the session is not
468
466
            # established.  Just abandon the request.
469
467
            return
470
468
        try:
471
469
            fpr = fingerprint(peer_certificate(session))
472
470
        except (TypeError, gnutls.errors.GNUTLSError), error:
473
 
            logger.debug(u"Bad certificate: %s", error)
 
471
            logger.warning(u"Bad certificate: %s", error)
474
472
            session.bye()
475
473
            return
476
474
        logger.debug(u"Fingerprint: %s", fpr)
480
478
                client = c
481
479
                break
482
480
        if not client:
483
 
            logger.debug(u"Client not found for fingerprint: %s", fpr)
 
481
            logger.warning(u"Client not found for fingerprint: %s",
 
482
                           fpr)
484
483
            session.bye()
485
484
            return
486
485
        # Have to check if client.still_valid(), since it is possible
487
486
        # that the client timed out while establishing the GnuTLS
488
487
        # session.
489
488
        if not client.still_valid():
490
 
            logger.debug(u"Client %(name)s is invalid", vars(client))
 
489
            logger.warning(u"Client %(name)s is invalid",
 
490
                           vars(client))
491
491
            session.bye()
492
492
            return
493
493
        sent_size = 0
528
528
                                       self.settings["interface"])
529
529
            except socket.error, error:
530
530
                if error[0] == errno.EPERM:
531
 
                    logger.warning(u"No permission to"
532
 
                                   u" bind to interface %s",
533
 
                                   self.settings["interface"])
 
531
                    logger.error(u"No permission to"
 
532
                                 u" bind to interface %s",
 
533
                                 self.settings["interface"])
534
534
                else:
535
535
                    raise error
536
536
        # Only bind(2) the socket if we really need to.
582
582
def server_state_changed(state):
583
583
    """Derived from the Avahi example code"""
584
584
    if state == avahi.SERVER_COLLISION:
585
 
        logger.warning(u"Server name collision")
 
585
        logger.error(u"Server name collision")
586
586
        service.remove()
587
587
    elif state == avahi.SERVER_RUNNING:
588
588
        service.add()
752
752
    def remove_from_clients(client):
753
753
        clients.remove(client)
754
754
        if not clients:
755
 
            logger.debug(u"No clients left, exiting")
 
755
            logger.critical(u"No clients left, exiting")
756
756
            sys.exit()
757
757
    
758
 
    clients.update(Set(Client(name=section,
 
758
    clients.update(Set(Client(name = section,
759
759
                              stop_hook = remove_from_clients,
760
 
                              **(dict(client_config\
761
 
                                      .items(section))))
 
760
                              config
 
761
                              = dict(client_config.items(section)))
762
762
                       for section in client_config.sections()))
763
763
    
764
764
    if not debug:
795
795
                                clients=clients)
796
796
    # Find out what port we got
797
797
    service.port = tcp_server.socket.getsockname()[1]
798
 
    logger.debug(u"Now listening on address %r, port %d, flowinfo %d,"
799
 
                 u" scope_id %d" % tcp_server.socket.getsockname())
 
798
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
799
                u" scope_id %d" % tcp_server.socket.getsockname())
800
800
    
801
801
    #service.interface = tcp_server.socket.getsockname()[3]
802
802