/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

• browse files at revision 574
• compare with another revision
• download diff
• download tarball
• view history from revision 574

Show diffs side-by-side

added

removed

mandos

1741

1741

                    try:

1742

1742

                        sent = session.send(client.secret[sent_size:])

1743

1743

                    except gnutls.errors.GNUTLSError as error:

1744

 

                        logger.warning("gnutls send failed")

 

1744

                        logger.warning("gnutls send failed",

 

1745

                                       exc_info=error)

1745

1746

                        return

1746

1747

                    logger.debug("Sent: %d, remaining: %d",

1747

1748

                                 sent, len(client.secret)

1761

1762

                try:

1762

1763

                    session.bye()

1763

1764

                except gnutls.errors.GNUTLSError as error:

1764

 

                    logger.warning("GnuTLS bye failed")

 

1765

                    logger.warning("GnuTLS bye failed",

 

1766

                                   exc_info=error)

1765

1767

    

1766

1768

    @staticmethod

1767

1769

    def peer_certificate(session):

2255

2257

        pidfilename = "/var/run/mandos.pid"

2256

2258

        try:

2257

2259

            pidfile = open(pidfilename, "w")

2258

 

        except IOError:

2259

 

            logger.error("Could not open file %r", pidfilename)

 

2260

        except IOError as e:

 

2261

            logger.error("Could not open file %r", pidfilename,

 

2262

                         exc_info=e)

2260

2263

    

2261

2264

    for name in ("_mandos", "mandos", "nobody"):

2262

2265

        try:

2316

2319

                            ("se.bsnet.fukt.Mandos", bus,

2317

2320

                             do_not_queue=True))

2318

2321

        except dbus.exceptions.NameExistsException as e:

2319

 

            logger.error(unicode(e) + ", disabling D-Bus")

 

2322

            logger.error("Disabling D-Bus:", exc_info=e)

2320

2323

            use_dbus = False

2321

2324

            server_settings["use_dbus"] = False

2322

2325

            tcp_server.use_dbus = False

2349

2352

                                                     (stored_state))

2350

2353

            os.remove(stored_state_path)

2351

2354

        except IOError as e:

2352

 

            logger.warning("Could not load persistent state: {0}"

2353

 

                           .format(e))

2354

 

            if e.errno != errno.ENOENT:

 

2355

            if e.errno == errno.ENOENT:

 

2356

                logger.warning("Could not load persistent state: {0}"

 

2357

                                .format(os.strerror(e.errno)))

 

2358

            else:

 

2359

                logger.critical("Could not load persistent state:",

 

2360

                                exc_info=e)

2355

2361

                raise

2356

2362

        except EOFError as e:

2357

2363

            logger.warning("Could not load persistent state: "

2358

 

                           "EOFError: {0}".format(e))

 

2364

                           "EOFError:", exc_info=e)

2359

2365

    

2360

2366

    with PGPEngine() as pgp:

2361

2367

        for client_name, client in clients_data.iteritems():

2558

2564

                pickle.dump((clients, client_settings), stored_state)

2559

2565

            os.rename(tempname, stored_state_path)

2560

2566

        except (IOError, OSError) as e:

2561

 

            logger.warning("Could not save persistent state: {0}"

2562

 

                           .format(e))

2563

2567

            if not debug:

2564

2568

                try:

2565

2569

                    os.remove(tempname)

2566

2570

                except NameError:

2567

2571

                    pass

2568

 

            if e.errno not in set((errno.ENOENT, errno.EACCES,

2569

 

                                   errno.EEXIST)):

 

2572

            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):

 

2573

                logger.warning("Could not save persistent state: {0}"

 

2574

                               .format(os.strerror(e.errno)))

 

2575

            else:

 

2576

                logger.warning("Could not save persistent state:",

 

2577

                               exc_info=e)

2570

2578

                raise e

2571

2579

        

2572

2580

        # Delete all clients, and settings from config

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0