/mandos/trunk : revision 237.7.1

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: 2012-05-20 13:17:37 UTC
mfrom: (585 trunk)
mto: (237.4.31 release)
mto: This revision was merged to the branch mainline in revision 586.
Revision ID: teddy@recompile.se-20120520131737-p1toj7kaxgs3wki3

merge from trunk

Show diffs side-by-side

added added

removed removed

mandos

except ImportError:

SO_BINDTODEVICE = None

version = "1.5.5"

version = "1.5.3"

stored_state_file = "clients.pickle"

logger = logging.getLogger()

151

def __enter__(self):

152

return self

153

154

def __exit__(self, exc_type, exc_value, traceback):

154

def __exit__ (self, exc_type, exc_value, traceback):

155

self._cleanup()

156

return False

157

1016

return xmlstring

1017

1018

1019

def datetime_to_dbus(dt, variant_level=0):

1019

def datetime_to_dbus (dt, variant_level=0):

1020

"""Convert a UTC datetime.datetime() to a D-Bus type."""

1021

if dt is None:

1022

return dbus.String("", variant_level = variant_level)

1030

interface names according to the "alt_interface_names" mapping.

1031

Usage:

1032

1033

@alternate_dbus_interfaces({"org.example.Interface":

1034

"net.example.AlternateInterface"})

1033

@alternate_dbus_names({"org.example.Interface":

1034

"net.example.AlternateInterface"})

1035

class SampleDBusObject(dbus.service.Object):

1036

@dbus.service.method("org.example.Interface")

1037

def SampleDBusMethod():

1899

use_ipv6: Boolean; to use IPv6 or not

1900

"""

1901

def __init__(self, server_address, RequestHandlerClass,

1902

interface=None, use_ipv6=True, socketfd=None):

1903

"""If socketfd is set, use that file descriptor instead of

1904

creating a new one with socket.socket().

1905

"""

1902

interface=None, use_ipv6=True):

1906

1903

self.interface = interface

1907

1904

if use_ipv6:

1908

1905

self.address_family = socket.AF_INET6

1909

if socketfd is not None:

1910

# Save the file descriptor

1911

self.socketfd = socketfd

1912

# Save the original socket.socket() function

1913

self.socket_socket = socket.socket

1914

# To implement --socket, we monkey patch socket.socket.

1915

1916

# (When socketserver.TCPServer is a new-style class, we

1917

# could make self.socket into a property instead of monkey

1918

# patching socket.socket.)

1919

1920

# Create a one-time-only replacement for socket.socket()

1921

@functools.wraps(socket.socket)

1922

def socket_wrapper(*args, **kwargs):

1923

# Restore original function so subsequent calls are

1924

# not affected.

1925

socket.socket = self.socket_socket

1926

del self.socket_socket

1927

# This time only, return a new socket object from the

1928

# saved file descriptor.

1929

return socket.fromfd(self.socketfd, *args, **kwargs)

1930

# Replace socket.socket() function with wrapper

1931

socket.socket = socket_wrapper

1932

# The socketserver.TCPServer.__init__ will call

1933

# socket.socket(), which might be our replacement,

1934

# socket_wrapper(), if socketfd was set.

1935

1906

socketserver.TCPServer.__init__(self, server_address,

1936

1907

RequestHandlerClass)

1937

1938

1908

def server_bind(self):

1939

1909

"""This overrides the normal server_bind() function

1940

1910

to bind to an interface if one was specified, and also NOT to

1998

1968

"""

1999

1969

def __init__(self, server_address, RequestHandlerClass,

2000

1970

interface=None, use_ipv6=True, clients=None,

2001

gnutls_priority=None, use_dbus=True, socketfd=None):

1971

gnutls_priority=None, use_dbus=True):

2002

1972

self.enabled = False

2003

1973

self.clients = clients

2004

1974

if self.clients is None:

2008

1978

IPv6_TCPServer.__init__(self, server_address,

2009

1979

RequestHandlerClass,

2010

1980

interface = interface,

2011

use_ipv6 = use_ipv6,

2012

socketfd = socketfd)

1981

use_ipv6 = use_ipv6)

2013

1982

def server_activate(self):

2014

1983

if self.enabled:

2015

1984

return socketserver.TCPServer.server_activate(self)

2196

2165

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

2197

2166

dest="restore", help="Do not restore stored"

2198

2167

" state")

2199

parser.add_argument("--socket", type=int,

2200

help="Specify a file descriptor to a network"

2201

" socket to use instead of creating one")

2202

2168

parser.add_argument("--statedir", metavar="DIR",

2203

2169

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

2204

2170

2221

2187

"use_ipv6": "True",

2222

2188

"debuglevel": "",

2223

2189

"restore": "True",

2224

"socket": "",

2225

2190

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

2226

2191

}

2227

2192

2239

2204

if server_settings["port"]:

2240

2205

server_settings["port"] = server_config.getint("DEFAULT",

2241

2206

"port")

2242

if server_settings["socket"]:

2243

server_settings["socket"] = server_config.getint("DEFAULT",

2244

"socket")

2245

# Later, stdin will, and stdout and stderr might, be dup'ed

2246

# over with an opened os.devnull. But we don't want this to

2247

# happen with a supplied network socket.

2248

if 0 <= server_settings["socket"] <= 2:

2249

server_settings["socket"] = os.dup(server_settings

2250

["socket"])

2251

2207

del server_config

2252

2208

2253

2209

# Override the settings from the config file with command line

2255

2211

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

2256

2212

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

2257

2213

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

2258

"statedir", "socket"):

2214

"statedir"):

2259

2215

value = getattr(options, option)

2260

2216

if value is not None:

2261

2217

server_settings[option] = value

2309

2265

use_ipv6=use_ipv6,

2310

2266

gnutls_priority=

2311

2267

server_settings["priority"],

2312

use_dbus=use_dbus,

2313

socketfd=(server_settings["socket"]

2314

or None))

2268

use_dbus=use_dbus)

2315

2269

if not debug:

2316

2270

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

2317

2271

try:

2362

2316

# Close all input and output, do double fork, etc.

2363

2317

daemon()

2364

2318

2365

# multiprocessing will use threads, so before we use gobject we

2366

# need to inform gobject that threads will be used.

2367

2319

gobject.threads_init()

2368

2320

2369

2321

global main_loop

Older »