/mandos/trunk : revision 634

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: 2013-10-24 20:21:45 UTC
Revision ID: teddy@recompile.se-20131024202145-456a9y6x910a2vhb

* debian/control (Build-Depends): Changed debhelper version to (>= 9)
                                  to match debian/compat.
* mandos-options.xml (priority): Changed back to normal priority.
  (priority_compat): New option; for the server which needs to a
                     priority string compatible with old keys.
* mandos-conf.xml (OPTIONS/priority): Include "priority_compat".
* mandos.xml (OPTIONS/priority): - '' -

Show diffs side-by-side

added added

removed removed

mandos

# "AvahiService" class, and some lines in "main".

# Everything else is

# This program is free software: you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

except ImportError:

SO_BINDTODEVICE = None

version = "1.6.4"

version = "1.6.1"

stored_state_file = "clients.pickle"

logger = logging.getLogger()

syslogger = None

syslogger = (logging.handlers.SysLogHandler

(facility = logging.handlers.SysLogHandler.LOG_DAEMON,

address = str("/dev/log")))

try:

100

if_nametoindex = (ctypes.cdll.LoadLibrary

114

116

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

115

117

"""init logger and add loglevel"""

116

118

117

syslogger = (logging.handlers.SysLogHandler

118

(facility =

119

logging.handlers.SysLogHandler.LOG_DAEMON,

120

address = str("/dev/log")))

121

119

syslogger.setFormatter(logging.Formatter

122

120

('Mandos [%(process)d]: %(levelname)s:'

123

121

' %(message)s'))

692

690

# If a checker exists, make sure it is not a zombie

693

691

try:

694

692

pid, status = os.waitpid(self.checker.pid, os.WNOHANG)

695

except AttributeError:

696

pass

697

except OSError as error:

698

if error.errno != errno.ECHILD:

699

raise

693

except (AttributeError, OSError) as error:

694

if (isinstance(error, OSError)

695

and error.errno != errno.ECHILD):

696

raise error

700

697

else:

701

698

if pid:

702

699

logger.warning("Checker was a zombie")

936

933

# The byte_arrays option is not supported yet on

937

934

# signatures other than "ay".

938

935

if prop._dbus_signature != "ay":

939

raise ValueError("Byte arrays not supported for non-"

940

"'ay' signature {0!r}"

941

.format(prop._dbus_signature))

936

raise ValueError

942

937

value = dbus.ByteArray(b''.join(chr(byte)

943

938

for byte in value))

944

939

prop(value)

1352

1347

*args, **kwargs)

1353

1348

1354

1349

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

1355

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

1350

old_checker = self.checker

1351

if self.checker is not None:

1352

old_checker_pid = self.checker.pid

1353

else:

1354

old_checker_pid = None

1356

1355

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

1357

1356

# Only if new checker process was started

1358

1357

if (self.checker is not None

1703

1702

logger.debug("Protocol version: %r", line)

1704

1703

try:

1705

1704

if int(line.strip().split()[0]) > 1:

1706

raise RuntimeError(line)

1705

raise RuntimeError

1707

1706

except (ValueError, IndexError, RuntimeError) as error:

1708

1707

logger.error("Unknown protocol version: %s", error)

1709

1708

return

1916

1915

1917

1916

def add_pipe(self, parent_pipe, proc):

1918

1917

"""Dummy function; override as necessary"""

1919

raise NotImplementedError()

1918

raise NotImplementedError

1920

1919

1921

1920

1922

1921

class IPv6_TCPServer(MultiprocessingMixInWithPipe,

2259

2258

else:

2260

2259

raise ValueError("Unknown suffix {0!r}"

2261

2260

.format(suffix))

2262

except IndexError as e:

2261

except (ValueError, IndexError) as e:

2263

2262

raise ValueError(*(e.args))

2264

2263

timevalue += delta

2265

2264

return timevalue

2341

2340

2342

2341

if options.check:

2343

2342

import doctest

2344

fail_count, test_count = doctest.testmod()

2345

sys.exit(os.EX_OK if fail_count == 0 else 1)

2343

doctest.testmod()

2344

sys.exit()

2346

2345

2347

2346

# Default values for config file for server-global settings

2348

2347

server_defaults = { "interface": "",

2458

2457

or None))

2459

2458

if not foreground:

2460

2459

pidfilename = "/run/mandos.pid"

2461

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

2462

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

2463

2460

pidfile = None

2464

2461

try:

2465

2462

pidfile = open(pidfilename, "w")

2482

2479

os.setuid(uid)

2483

2480

except OSError as error:

2484

2481

if error.errno != errno.EPERM:

2485

raise

2482

raise error

2486

2483

2487

2484

if debug:

2488

2485

# Enable all possible GnuTLS debugging

2793

2790

else:

2794

2791

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

2795

2792

exc_info=e)

2796

raise

2793

raise e

2797

2794

2798

2795

# Delete all clients, and settings from config

2799

2796

while tcp_server.clients:

Older »