/mandos/trunk : revision 591

34

from __future__ import (division, absolute_import, print_function,

35

unicode_literals)

36

37

from future_builtins import *

38

37

39

import SocketServer as socketserver

38

40

import socket

39

41

import argparse

86

88

except ImportError:

87

89

SO_BINDTODEVICE = None

88

90

89

version = "1.5.3"

91

version = "1.5.4"

90

92

stored_state_file = "clients.pickle"

91

93

92

94

logger = logging.getLogger()

149

151

def __enter__(self):

150

152

return self

151

153

152

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

154

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

153

155

self._cleanup()

154

156

return False

155

157

377

379

self.server_state_changed)

378

380

self.server_state_changed(self.server.GetState())

379

381

382

380

383

class AvahiServiceToSyslog(AvahiService):

381

384

def rename(self):

382

385

"""Add the new name to the syslog messages"""

387

390

.format(self.name)))

388

391

return ret

389

392

393

390

394

def timedelta_to_milliseconds(td):

391

395

"Convert a datetime.timedelta() to milliseconds"

392

396

return ((td.days * 24 * 60 * 60 * 1000)

393

397

+ (td.seconds * 1000)

394

398

+ (td.microseconds // 1000))

395

399

400

396

401

class Client(object):

397

402

"""A representation of a client host served by this server.

398

403

437

442

"""

438

443

439

444

runtime_expansions = ("approval_delay", "approval_duration",

440

"created", "enabled", "fingerprint",

441

"host", "interval", "last_checked_ok",

445

"created", "enabled", "expires",

446

"fingerprint", "host", "interval",

447

"last_approval_request", "last_checked_ok",

442

448

"last_enabled", "name", "timeout")

443

449

client_defaults = { "timeout": "5m",

444

450

"extended_timeout": "15m",

570

576

if getattr(self, "enabled", False):

571

577

# Already enabled

572

578

return

573

self.send_changedstate()

574

579

self.expires = datetime.datetime.utcnow() + self.timeout

575

580

self.enabled = True

576

581

self.last_enabled = datetime.datetime.utcnow()

577

582

self.init_checker()

583

self.send_changedstate()

578

584

579

585

def disable(self, quiet=True):

580

586

"""Disable this client."""

581

587

if not getattr(self, "enabled", False):

582

588

return False

583

589

if not quiet:

584

self.send_changedstate()

585

if not quiet:

586

590

logger.info("Disabling client %s", self.name)

587

if getattr(self, "disable_initiator_tag", False):

591

if getattr(self, "disable_initiator_tag", None) is not None:

588

592

gobject.source_remove(self.disable_initiator_tag)

589

593

self.disable_initiator_tag = None

590

594

self.expires = None

591

if getattr(self, "checker_initiator_tag", False):

595

if getattr(self, "checker_initiator_tag", None) is not None:

592

596

gobject.source_remove(self.checker_initiator_tag)

593

597

self.checker_initiator_tag = None

594

598

self.stop_checker()

595

599

self.enabled = False

600

if not quiet:

601

self.send_changedstate()

596

602

# Do not run this again if called by a gobject.timeout_add

597

603

return False

598

604

602

608

def init_checker(self):

603

609

# Schedule a new checker to be started an 'interval' from now,

604

610

# and every interval from then on.

611

if self.checker_initiator_tag is not None:

612

gobject.source_remove(self.checker_initiator_tag)

605

613

self.checker_initiator_tag = (gobject.timeout_add

606

614

(self.interval_milliseconds(),

607

615

self.start_checker))

608

616

# Schedule a disable() when 'timeout' has passed

617

if self.disable_initiator_tag is not None:

618

gobject.source_remove(self.disable_initiator_tag)

609

619

self.disable_initiator_tag = (gobject.timeout_add

610

620

(self.timeout_milliseconds(),

611

621

self.disable))

642

652

timeout = self.timeout

643

653

if self.disable_initiator_tag is not None:

644

654

gobject.source_remove(self.disable_initiator_tag)

655

self.disable_initiator_tag = None

645

656

if getattr(self, "enabled", False):

646

657

self.disable_initiator_tag = (gobject.timeout_add

647

658

(timedelta_to_milliseconds

657

668

If a checker already exists, leave it running and do

658

669

nothing."""

659

670

# The reason for not killing a running checker is that if we

660

# did that, then if a checker (for some reason) started

661

# running slowly and taking more than 'interval' time, the

662

# client would inevitably timeout, since no checker would get

663

# a chance to run to completion. If we instead leave running

671

# did that, and if a checker (for some reason) started running

672

# slowly and taking more than 'interval' time, then the client

673

# would inevitably timeout, since no checker would get a

674

# chance to run to completion. If we instead leave running

664

675

# checkers alone, the checker would have to take more time

665

676

# than 'timeout' for the client to be disabled, which is as it

666

677

# should be.

680

691

self.current_checker_command)

681

692

# Start a new checker if needed

682

693

if self.checker is None:

694

# Escape attributes for the shell

695

escaped_attrs = dict(

696

(attr, re.escape(unicode(getattr(self, attr))))

697

for attr in

698

self.runtime_expansions)

683

699

try:

684

# In case checker_command has exactly one % operator

685

command = self.checker_command % self.host

686

except TypeError:

687

# Escape attributes for the shell

688

escaped_attrs = dict(

689

(attr,

690

re.escape(unicode(str(getattr(self, attr, "")),

691

errors=

692

'replace')))

693

for attr in

694

self.runtime_expansions)

695

696

try:

697

command = self.checker_command % escaped_attrs

698

except TypeError as error:

699

logger.error('Could not format string "%s"',

700

self.checker_command, exc_info=error)

701

return True # Try again later

700

command = self.checker_command % escaped_attrs

701

except TypeError as error:

702

logger.error('Could not format string "%s"',

703

self.checker_command, exc_info=error)

704

return True # Try again later

702

705

self.current_checker_command = command

703

706

try:

704

707

logger.info("Starting checker %r for %s",

710

713

self.checker = subprocess.Popen(command,

711

714

close_fds=True,

712

715

shell=True, cwd="/")

713

self.checker_callback_tag = (gobject.child_watch_add

714

(self.checker.pid,

715

self.checker_callback,

716

data=command))

717

# The checker may have completed before the gobject

718

# watch was added. Check for this.

719

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

720

if pid:

721

gobject.source_remove(self.checker_callback_tag)

722

self.checker_callback(pid, status, command)

723

716

except OSError as error:

724

717

logger.error("Failed to start subprocess",

725

718

exc_info=error)

719

self.checker_callback_tag = (gobject.child_watch_add

720

(self.checker.pid,

721

self.checker_callback,

722

data=command))

723

# The checker may have completed before the gobject

724

# watch was added. Check for this.

725

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

726

if pid:

727

gobject.source_remove(self.checker_callback_tag)

728

self.checker_callback(pid, status, command)

726

729

# Re-run this periodically if run by gobject.timeout_add

727

730

return True

728

731

979

982

tag.appendChild(ann_tag)

980

983

# Add interface annotation tags

981

984

for annotation, value in dict(

982

itertools.chain(

983

*(annotations().iteritems()

984

for name, annotations in

985

self._get_all_dbus_things("interface")

986

if name == if_tag.getAttribute("name")

987

))).iteritems():

985

itertools.chain.from_iterable(

986

annotations().iteritems()

987

for name, annotations in

988

self._get_all_dbus_things("interface")

989

if name == if_tag.getAttribute("name")

990

)).iteritems():

988

991

ann_tag = document.createElement("annotation")

989

992

ann_tag.setAttribute("name", annotation)

990

993

ann_tag.setAttribute("value", value)

1013

1016

return xmlstring

1014

1017

1015

1018

1016

def datetime_to_dbus (dt, variant_level=0):

1019

def datetime_to_dbus(dt, variant_level=0):

1017

1020

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

1018

1021

if dt is None:

1019

1022

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

1021

1024

variant_level=variant_level)

1022

1025

1023

1026

1024

class AlternateDBusNamesMetaclass(DBusObjectWithProperties

1025

.__metaclass__):

1026

"""Applied to an empty subclass of a D-Bus object, this metaclass

1027

will add additional D-Bus attributes matching a certain pattern.

1027

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1028

"""A class decorator; applied to a subclass of

1029

dbus.service.Object, it will add alternate D-Bus attributes with

1030

interface names according to the "alt_interface_names" mapping.

1031

Usage:

1032

1033

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

1034

"net.example.AlternateInterface"})

1035

class SampleDBusObject(dbus.service.Object):

1036

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

1037

def SampleDBusMethod():

1038

pass

1039

1040

The above "SampleDBusMethod" on "SampleDBusObject" will be

1041

reachable via two interfaces: "org.example.Interface" and

1042

"net.example.AlternateInterface", the latter of which will have

1043

its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to

1044

"true", unless "deprecate" is passed with a False value.

1045

1046

This works for methods and signals, and also for D-Bus properties

1047

(from DBusObjectWithProperties) and interfaces (from the

1048

dbus_interface_annotations decorator).

1028

1049

"""

1029

def __new__(mcs, name, bases, attr):

1030

# Go through all the base classes which could have D-Bus

1031

# methods, signals, or properties in them

1032

old_interface_names = []

1033

for base in (b for b in bases

1034

if issubclass(b, dbus.service.Object)):

1035

# Go though all attributes of the base class

1036

for attrname, attribute in inspect.getmembers(base):

1050

def wrapper(cls):

1051

for orig_interface_name, alt_interface_name in (

1052

alt_interface_names.iteritems()):

1053

attr = {}

1054

interface_names = set()

1055

# Go though all attributes of the class

1056

for attrname, attribute in inspect.getmembers(cls):

1037

1057

# Ignore non-D-Bus attributes, and D-Bus attributes

1038

1058

# with the wrong interface name

1039

1059

if (not hasattr(attribute, "_dbus_interface")

1040

1060

or not attribute._dbus_interface

1041

.startswith("se.recompile.Mandos")):

1061

.startswith(orig_interface_name)):

1042

1062

continue

1043

1063

# Create an alternate D-Bus interface name based on

1044

1064

# the current name

1045

1065

alt_interface = (attribute._dbus_interface

1046

.replace("se.recompile.Mandos",

1047

"se.bsnet.fukt.Mandos"))

1048

if alt_interface != attribute._dbus_interface:

1049

old_interface_names.append(alt_interface)

1066

.replace(orig_interface_name,

1067

alt_interface_name))

1068

interface_names.add(alt_interface)

1050

1069

# Is this a D-Bus signal?

1051

1070

if getattr(attribute, "_dbus_is_signal", False):

1052

1071

# Extract the original non-method function by

1074

1093

except AttributeError:

1075

1094

pass

1076

1095

# Define a creator of a function to call both the

1077

# old and new functions, so both the old and new

1078

# signals gets sent when the function is called

1096

# original and alternate functions, so both the

1097

# original and alternate signals gets sent when

1098

# the function is called

1079

1099

def fixscope(func1, func2):

1080

1100

"""This function is a scope container to pass

1081

1101

func1 and func2 to the "call_both" function

1088

1108

return call_both

1089

1109

# Create the "call_both" function and add it to

1090

1110

# the class

1091

attr[attrname] = fixscope(attribute,

1092

new_function)

1111

attr[attrname] = fixscope(attribute, new_function)

1093

1112

# Is this a D-Bus method?

1094

1113

elif getattr(attribute, "_dbus_is_method", False):

1095

1114

# Create a new, but exactly alike, function

1151

1170

attribute.func_name,

1152

1171

attribute.func_defaults,

1153

1172

attribute.func_closure)))

1154

# Deprecate all old interfaces

1155

iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"

1156

for old_interface_name in old_interface_names:

1157

@dbus_interface_annotations(old_interface_name)

1158

def func(self):

1159

return { "org.freedesktop.DBus.Deprecated": "true" }

1160

# Find an unused name

1161

for aname in (iname.format(i) for i in itertools.count()):

1162

if aname not in attr:

1163

attr[aname] = func

1164

break

1165

return type.__new__(mcs, name, bases, attr)

1166

1167

1173

if deprecate:

1174

# Deprecate all alternate interfaces

1175

iname="_AlternateDBusNames_interface_annotation{0}"

1176

for interface_name in interface_names:

1177

@dbus_interface_annotations(interface_name)

1178

def func(self):

1179

return { "org.freedesktop.DBus.Deprecated":

1180

"true" }

1181

# Find an unused name

1182

for aname in (iname.format(i)

1183

for i in itertools.count()):

1184

if aname not in attr:

1185

attr[aname] = func

1186

break

1187

if interface_names:

1188

# Replace the class with a new subclass of it with

1189

# methods, signals, etc. as created above.

1190

cls = type(b"{0}Alternate".format(cls.__name__),

1191

(cls,), attr)

1192

return cls

1193

return wrapper

1194

1195

1196

@alternate_dbus_interfaces({"se.recompile.Mandos":

1197

"se.bsnet.fukt.Mandos"})

1168

1198

class ClientDBus(Client, DBusObjectWithProperties):

1169

1199

"""A Client class using D-Bus

1170

1200

1306

1336

return False

1307

1337

1308

1338

def approve(self, value=True):

1309

self.send_changedstate()

1310

1339

self.approved = value

1311

1340

gobject.timeout_add(timedelta_to_milliseconds

1312

1341

(self.approval_duration),

1313

1342

self._reset_approved)

1343

self.send_changedstate()

1314

1344

1315

1345

## D-Bus methods, signals & properties

1316

1346

_interface = "se.recompile.Mandos.Client"

1500

1530

def Timeout_dbus_property(self, value=None):

1501

1531

if value is None: # get

1502

1532

return dbus.UInt64(self.timeout_milliseconds())

1533

old_timeout = self.timeout

1503

1534

self.timeout = datetime.timedelta(0, 0, 0, value)

1504

# Reschedule timeout

1535

# Reschedule disabling

1505

1536

if self.enabled:

1506

1537

now = datetime.datetime.utcnow()

1507

time_to_die = timedelta_to_milliseconds(

1508

(self.last_checked_ok + self.timeout) - now)

1509

if time_to_die <= 0:

1538

self.expires += self.timeout - old_timeout

1539

if self.expires <= now:

1510

1540

# The timeout has passed

1511

1541

self.disable()

1512

1542

else:

1513

self.expires = (now +

1514

datetime.timedelta(milliseconds =

1515

time_to_die))

1516

1543

if (getattr(self, "disable_initiator_tag", None)

1517

1544

is None):

1518

1545

return

1519

1546

gobject.source_remove(self.disable_initiator_tag)

1520

self.disable_initiator_tag = (gobject.timeout_add

1521

(time_to_die,

1522

self.disable))

1547

self.disable_initiator_tag = (

1548

gobject.timeout_add(

1549

timedelta_to_milliseconds(self.expires - now),

1550

self.disable))

1523

1551

1524

1552

# ExtendedTimeout - property

1525

1553

@dbus_service_property(_interface, signature="t",

1604

1632

self._pipe.send(('setattr', name, value))

1605

1633

1606

1634

1607

class ClientDBusTransitional(ClientDBus):

1608

__metaclass__ = AlternateDBusNamesMetaclass

1609

1610

1611

1635

class ClientHandler(socketserver.BaseRequestHandler, object):

1612

1636

"""A class to handle client connections.

1613

1637

1717

1741

#wait until timeout or approved

1718

1742

time = datetime.datetime.now()

1719

1743

client.changedstate.acquire()

1720

(client.changedstate.wait

1721

(float(client.timedelta_to_milliseconds(delay)

1722

/ 1000)))

1744

client.changedstate.wait(

1745

float(timedelta_to_milliseconds(delay)

1746

/ 1000))

1723

1747

client.changedstate.release()

1724

1748

time2 = datetime.datetime.now()

1725

1749

if (time2 - time) >= delay:

1841

1865

def process_request(self, request, address):

1842

1866

"""Start a new process to process the request."""

1843

1867

proc = multiprocessing.Process(target = self.sub_process_main,

1844

args = (request,

1845

address))

1868

args = (request, address))

1846

1869

proc.start()

1847

1870

return proc

1848

1871

1876

1899

use_ipv6: Boolean; to use IPv6 or not

1877

1900

"""

1878

1901

def __init__(self, server_address, RequestHandlerClass,

1879

interface=None, use_ipv6=True):

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

"""

1880

1906

self.interface = interface

1881

1907

if use_ipv6:

1882

1908

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.

1883

1935

socketserver.TCPServer.__init__(self, server_address,

1884

1936

RequestHandlerClass)

1937

1885

1938

def server_bind(self):

1886

1939

"""This overrides the normal server_bind() function

1887

1940

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

1898

1951

str(self.interface

1899

1952

+ '\0'))

1900

1953

except socket.error as error:

1901

if error[0] == errno.EPERM:

1954

if error.errno == errno.EPERM:

1902

1955

logger.error("No permission to"

1903

1956

" bind to interface %s",

1904

1957

self.interface)

1905

elif error[0] == errno.ENOPROTOOPT:

1958

elif error.errno == errno.ENOPROTOOPT:

1906

1959

logger.error("SO_BINDTODEVICE not available;"

1907

1960

" cannot bind to interface %s",

1908

1961

self.interface)

1962

elif error.errno == errno.ENODEV:

1963

logger.error("Interface %s does not"

1964

" exist, cannot bind",

1965

self.interface)

1909

1966

else:

1910

1967

raise

1911

1968

# Only bind(2) the socket if we really need to.

1941

1998

"""

1942

1999

def __init__(self, server_address, RequestHandlerClass,

1943

2000

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

1944

gnutls_priority=None, use_dbus=True):

2001

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

1945

2002

self.enabled = False

1946

2003

self.clients = clients

1947

2004

if self.clients is None:

1951

2008

IPv6_TCPServer.__init__(self, server_address,

1952

2009

RequestHandlerClass,

1953

2010

interface = interface,

1954

use_ipv6 = use_ipv6)

2011

use_ipv6 = use_ipv6,

2012

socketfd = socketfd)

1955

2013

def server_activate(self):

1956

2014

if self.enabled:

1957

2015

return socketserver.TCPServer.server_activate(self)

1970

2028

1971

2029

def handle_ipc(self, source, condition, parent_pipe=None,

1972

2030

proc = None, client_object=None):

1973

condition_names = {

1974

gobject.IO_IN: "IN", # There is data to read.

1975

gobject.IO_OUT: "OUT", # Data can be written (without

1976

# blocking).

1977

gobject.IO_PRI: "PRI", # There is urgent data to read.

1978

gobject.IO_ERR: "ERR", # Error condition.

1979

gobject.IO_HUP: "HUP" # Hung up (the connection has been

1980

# broken, usually for pipes and

1981

# sockets).

1982

}

1983

conditions_string = ' | '.join(name

1984

for cond, name in

1985

condition_names.iteritems()

1986

if cond & condition)

1987

2031

# error, or the other end of multiprocessing.Pipe has closed

1988

if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):

2032

if condition & (gobject.IO_ERR | gobject.IO_HUP):

1989

2033

# Wait for other process to exit

1990

2034

proc.join()

1991

2035

return False

2152

2196

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

2153

2197

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

2154

2198

" 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")

2155

2202

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

2156

2203

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

2157

2204

2174

2221

"use_ipv6": "True",

2175

2222

"debuglevel": "",

2176

2223

"restore": "True",

2224

"socket": "",

2177

2225

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

2178

2226

}

2179

2227

2191

2239

if server_settings["port"]:

2192

2240

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

2193

2241

"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"])

2194

2251

del server_config

2195

2252

2196

2253

# Override the settings from the config file with command line

2198

2255

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

2199

2256

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

2200

2257

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

2201

"statedir"):

2258

"statedir", "socket"):

2202

2259

value = getattr(options, option)

2203

2260

if value is not None:

2204

2261

server_settings[option] = value

2252

2309

use_ipv6=use_ipv6,

2253

2310

gnutls_priority=

2254

2311

server_settings["priority"],

2255

use_dbus=use_dbus)

2312

use_dbus=use_dbus,

2313

socketfd=(server_settings["socket"]

2314

or None))

2256

2315

if not debug:

2257

2316

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

2258

2317

try:

2275

2334

os.setgid(gid)

2276

2335

os.setuid(uid)

2277

2336

except OSError as error:

2278

if error[0] != errno.EPERM:

2337

if error.errno != errno.EPERM:

2279

2338

raise error

2280

2339

2281

2340

if debug:

2303

2362

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

2304

2363

daemon()

2305

2364

2365

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

2366

# need to inform gobject that threads will be used.

2306

2367

gobject.threads_init()

2307

2368

2308

2369

global main_loop

2337

2398

2338

2399

client_class = Client

2339

2400

if use_dbus:

2340

client_class = functools.partial(ClientDBusTransitional,

2341

bus = bus)

2401

client_class = functools.partial(ClientDBus, bus = bus)

2342

2402

2343

2403

client_settings = Client.config_parser(client_config)

2344

2404

old_client_settings = {}

2450

2510

# "pidfile" was never created

2451

2511

pass

2452

2512

del pidfilename

2453

signal.signal(signal.SIGINT, signal.SIG_IGN)

2454

2513

2455

2514

signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())

2456

2515

signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())

2457

2516

2458

2517

if use_dbus:

2518

@alternate_dbus_interfaces({"se.recompile.Mandos":

2519

"se.bsnet.fukt.Mandos"})

2459

2520

class MandosDBusService(DBusObjectWithProperties):

2460

2521

"""A D-Bus proxy object"""

2461

2522

def __init__(self):

2515

2576

2516

2577

del _interface

2517

2578

2518

class MandosDBusServiceTransitional(MandosDBusService):

2519

__metaclass__ = AlternateDBusNamesMetaclass

2520

mandos_dbus_service = MandosDBusServiceTransitional()

2579

mandos_dbus_service = MandosDBusService()

2521

2580

2522

2581

def cleanup():

2523

2582

"Cleanup function; run on exit"

2556

2615

del client_settings[client.name]["secret"]

2557

2616

2558

2617

try:

2559

tempfd, tempname = tempfile.mkstemp(suffix=".pickle",

2560

prefix="clients-",

2561

dir=os.path.dirname

2562

(stored_state_path))

2563

with os.fdopen(tempfd, "wb") as stored_state:

2618

with (tempfile.NamedTemporaryFile

2619

(mode='wb', suffix=".pickle", prefix='clients-',

2620

dir=os.path.dirname(stored_state_path),

2621

delete=False)) as stored_state:

2564

2622

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

2623

tempname=stored_state.name

2565

2624

os.rename(tempname, stored_state_path)

2566

2625

except (IOError, OSError) as e:

2567

2626

if not debug: