/mandos/release : revision 237.7.258

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

Committer: Teddy Hogeborn
Date: 2014-07-12 13:13:28 UTC
mto: (237.7.272 trunk)
mto: This revision was merged to the branch mainline in revision 317.
Revision ID: teddy@recompile.se-20140712131328-gdkvcea7f9rov7bn

mandos-client: Fix minor memory leak on memory full or clock failure.

* plugins.d/mandos-client.c (add_server): On any errors, free
new_server and its contents
before returning.

Show diffs side-by-side

added added

removed removed

mandos

except ImportError:

SO_BINDTODEVICE = None

version = "1.6.4"

version = "1.6.5"

stored_state_file = "clients.pickle"

logger = logging.getLogger()

114

def initlogger(debug, level=logging.WARNING):

115

"""init logger and add loglevel"""

116

117

global syslogger

117

118

syslogger = (logging.handlers.SysLogHandler

118

119

(facility =

119

120

logging.handlers.SysLogHandler.LOG_DAEMON,

1352

1353

*args, **kwargs)

1353

1354

1355

def start_checker(self, *args, **kwargs):

1355

old_checker = self.checker

1356

if self.checker is not None:

1357

old_checker_pid = self.checker.pid

1358

else:

1359

old_checker_pid = None

1356

old_checker_pid = getattr(self.checker, "pid", None)

1360

1357

r = Client.start_checker(self, *args, **kwargs)

1361

1358

# Only if new checker process was started

1362

1359

if (self.checker is not None

2340

2337

help="Directory to save/restore state in")

2341

2338

parser.add_argument("--foreground", action="store_true",

2342

2339

help="Run in foreground", default=None)

2340

parser.add_argument("--no-zeroconf", action="store_false",

2341

dest="zeroconf", help="Do not use Zeroconf",

2342

default=None)

2343

2344

options = parser.parse_args()

2345

2363

"socket": "",

2364

"statedir": "/var/lib/mandos",

2365

"foreground": "False",

2366

"zeroconf": "True",

2366

2367

}

2367

2368

2369

# Parse config file for server-global settings

2395

2396

for option in ("interface", "address", "port", "debug",

2396

2397

"priority", "servicename", "configdir",

2397

2398

"use_dbus", "use_ipv6", "debuglevel", "restore",

2398

"statedir", "socket", "foreground"):

2399

"statedir", "socket", "foreground", "zeroconf"):

2399

2400

value = getattr(options, option)

2400

2401

if value is not None:

2401

2402

server_settings[option] = value

2406

2407

server_settings[option] = unicode(server_settings[option])

2407

2408

# Force all boolean options to be boolean

2408

2409

for option in ("debug", "use_dbus", "use_ipv6", "restore",

2409

"foreground"):

2410

"foreground", "zeroconf"):

2410

2411

server_settings[option] = bool(server_settings[option])

2411

2412

# Debug implies foreground

2412

2413

if server_settings["debug"]:

2415

2416

2417

##################################################################

2417

2418

2419

if (not server_settings["zeroconf"] and

2420

not (server_settings["port"]

2421

or server_settings["socket"] != "")):

2422

parser.error("Needs port or socket to work without"

2423

" Zeroconf")

2424

2418

2425

# For convenience

2419

2426

debug = server_settings["debug"]

2420

2427

debuglevel = server_settings["debuglevel"]

2423

2430

stored_state_path = os.path.join(server_settings["statedir"],

2424

2431

stored_state_file)

2425

2432

foreground = server_settings["foreground"]

2433

zeroconf = server_settings["zeroconf"]

2426

2434

2427

2435

if debug:

2428

2436

initlogger(debug, logging.DEBUG)

2449

2457

global mandos_dbus_service

2450

2458

mandos_dbus_service = None

2451

2459

2460

socketfd = None

2461

if server_settings["socket"] != "":

2462

socketfd = server_settings["socket"]

2452

2463

tcp_server = MandosServer((server_settings["address"],

2453

2464

server_settings["port"]),

2454

2465

ClientHandler,

2458

2469

gnutls_priority=

2459

2470

server_settings["priority"],

2460

2471

use_dbus=use_dbus,

2461

socketfd=(server_settings["socket"]

2462

or None))

2472

socketfd=socketfd)

2463

2473

if not foreground:

2464

2474

pidfilename = "/run/mandos.pid"

2465

2475

if not os.path.isdir("/run/."):

2535

2545

use_dbus = False

2536

2546

server_settings["use_dbus"] = False

2537

2547

tcp_server.use_dbus = False

2538

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

2539

service = AvahiServiceToSyslog(name =

2540

server_settings["servicename"],

2541

servicetype = "_mandos._tcp",

2542

protocol = protocol, bus = bus)

2543

if server_settings["interface"]:

2544

service.interface = (if_nametoindex

2545

(str(server_settings["interface"])))

2548

if zeroconf:

2549

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

2550

service = AvahiServiceToSyslog(name =

2551

server_settings["servicename"],

2552

servicetype = "_mandos._tcp",

2553

protocol = protocol, bus = bus)

2554

if server_settings["interface"]:

2555

service.interface = (if_nametoindex

2556

(str(server_settings["interface"])))

2546

2557

2547

2558

global multiprocessing_manager

2548

2559

multiprocessing_manager = multiprocessing.Manager()

2742

2753

2743

2754

def cleanup():

2744

2755

"Cleanup function; run on exit"

2745

service.cleanup()

2756

if zeroconf:

2757

service.cleanup()

2746

2758

2747

2759

multiprocessing.active_children()

2748

2760

wnull.close()

2827

2839

tcp_server.server_activate()

2828

2840

2829

2841

# Find out what port we got

2830

service.port = tcp_server.socket.getsockname()[1]

2842

if zeroconf:

2843

service.port = tcp_server.socket.getsockname()[1]

2831

2844

if use_ipv6:

2832

2845

logger.info("Now listening on address %r, port %d,"

2833

2846

" flowinfo %d, scope_id %d",

2839

2852

#service.interface = tcp_server.socket.getsockname()[3]

2840

2853

2841

2854

try:

2842

# From the Avahi example code

2843

try:

2844

service.activate()

2845

except dbus.exceptions.DBusException as error:

2846

logger.critical("D-Bus Exception", exc_info=error)

2847

cleanup()

2848

sys.exit(1)

2849

# End of Avahi example code

2855

if zeroconf:

2856

# From the Avahi example code

2857

try:

2858

service.activate()

2859

except dbus.exceptions.DBusException as error:

2860

logger.critical("D-Bus Exception", exc_info=error)

2861

cleanup()

2862

sys.exit(1)

2863

# End of Avahi example code

2850

2864

2851

2865

gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,

2852

2866

lambda *args, **kwargs:

Older »