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

  • Committer: Teddy Hogeborn
  • Date: 2008-08-04 20:43:31 UTC
  • mfrom: (24.1.17 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080804204331-zgu42g8ii997h1l2
* ca.pem: Removed.
* cert.pem: - '' -
* client-cert.pem: - '' -
* client-key.pem: - '' -
* crl.pem: - '' -
* key.pem: - '' -

* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
                                    to be a union.  All users changed.

* server.py: Changed log severity for many log messages.
  (Client.__init__): Take all config file settins as a dict instead of
                     as keyword arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
133
133
                            u" retries, exiting.", rename_count)
134
134
            raise AvahiServiceError("Too many renames")
135
135
        name = server.GetAlternativeServiceName(name)
136
 
        logger.notice(u"Changing name to %r ...", name)
 
136
        logger.error(u"Changing name to %r ...", name)
137
137
        self.remove()
138
138
        self.add()
139
139
        self.rename_count += 1
221
221
    interval = property(lambda self: self._interval,
222
222
                        _set_interval)
223
223
    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):
 
224
    def __init__(self, name = None, stop_hook=None, config={}):
227
225
        """Note: the 'checker' argument sets the 'checker_command'
228
226
        attribute and not the 'checker' attribute.."""
229
227
        self.name = name
231
229
        # Uppercase and remove spaces from fingerprint
232
230
        # for later comparison purposes with return value of
233
231
        # the fingerprint() function
234
 
        self.fingerprint = fingerprint.upper().replace(u" ", u"")
 
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="/")
431
430
    Note: This will run in its own forked process."""
432
431
    
433
432
    def handle(self):
434
 
        logger.debug(u"TCP connection from: %s",
 
433
        logger.info(u"TCP connection from: %s",
435
434
                     unicode(self.client_address))
436
435
        session = gnutls.connection.ClientSession\
437
436
                  (self.request, gnutls.connection.X509Credentials())
463
462
        try:
464
463
            session.handshake()
465
464
        except gnutls.errors.GNUTLSError, error:
466
 
            logger.debug(u"Handshake failed: %s", error)
 
465
            logger.warning(u"Handshake failed: %s", error)
467
466
            # Do not run session.bye() here: the session is not
468
467
            # established.  Just abandon the request.
469
468
            return
470
469
        try:
471
470
            fpr = fingerprint(peer_certificate(session))
472
471
        except (TypeError, gnutls.errors.GNUTLSError), error:
473
 
            logger.debug(u"Bad certificate: %s", error)
 
472
            logger.warning(u"Bad certificate: %s", error)
474
473
            session.bye()
475
474
            return
476
475
        logger.debug(u"Fingerprint: %s", fpr)
480
479
                client = c
481
480
                break
482
481
        if not client:
483
 
            logger.debug(u"Client not found for fingerprint: %s", fpr)
 
482
            logger.warning(u"Client not found for fingerprint: %s",
 
483
                           fpr)
484
484
            session.bye()
485
485
            return
486
486
        # Have to check if client.still_valid(), since it is possible
487
487
        # that the client timed out while establishing the GnuTLS
488
488
        # session.
489
489
        if not client.still_valid():
490
 
            logger.debug(u"Client %(name)s is invalid", vars(client))
 
490
            logger.warning(u"Client %(name)s is invalid",
 
491
                           vars(client))
491
492
            session.bye()
492
493
            return
493
494
        sent_size = 0
528
529
                                       self.settings["interface"])
529
530
            except socket.error, error:
530
531
                if error[0] == errno.EPERM:
531
 
                    logger.warning(u"No permission to"
532
 
                                   u" bind to interface %s",
533
 
                                   self.settings["interface"])
 
532
                    logger.error(u"No permission to"
 
533
                                 u" bind to interface %s",
 
534
                                 self.settings["interface"])
534
535
                else:
535
536
                    raise error
536
537
        # Only bind(2) the socket if we really need to.
582
583
def server_state_changed(state):
583
584
    """Derived from the Avahi example code"""
584
585
    if state == avahi.SERVER_COLLISION:
585
 
        logger.warning(u"Server name collision")
 
586
        logger.error(u"Server name collision")
586
587
        service.remove()
587
588
    elif state == avahi.SERVER_RUNNING:
588
589
        service.add()
752
753
    def remove_from_clients(client):
753
754
        clients.remove(client)
754
755
        if not clients:
755
 
            logger.debug(u"No clients left, exiting")
 
756
            logger.critical(u"No clients left, exiting")
756
757
            sys.exit()
757
758
    
758
 
    clients.update(Set(Client(name=section,
 
759
    clients.update(Set(Client(name = section,
759
760
                              stop_hook = remove_from_clients,
760
 
                              **(dict(client_config\
761
 
                                      .items(section))))
 
761
                              config
 
762
                              = dict(client_config.items(section)))
762
763
                       for section in client_config.sections()))
763
764
    
764
765
    if not debug:
795
796
                                clients=clients)
796
797
    # Find out what port we got
797
798
    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())
 
799
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
800
                u" scope_id %d" % tcp_server.socket.getsockname())
800
801
    
801
802
    #service.interface = tcp_server.socket.getsockname()[3]
802
803