/mandos/trunk : revision 734

88

except ImportError:

89

SO_BINDTODEVICE = None

90

91

version = "1.6.7"

91

if sys.version_info.major == 2:

92

str = unicode

93

94

version = "1.6.8"

92

95

stored_state_file = "clients.pickle"

93

96

94

97

logger = logging.getLogger()

104

107

SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h

105

108

with contextlib.closing(socket.socket()) as s:

106

109

ifreq = fcntl.ioctl(s, SIOCGIFINDEX,

107

struct.pack(str("16s16x"),

108

interface))

109

interface_index = struct.unpack(str("I"),

110

ifreq[16:20])[0]

110

struct.pack(b"16s16x", interface))

111

interface_index = struct.unpack("I", ifreq[16:20])[0]

111

112

return interface_index

112

113

114

118

119

syslogger = (logging.handlers.SysLogHandler

119

120

(facility =

120

121

logging.handlers.SysLogHandler.LOG_DAEMON,

121

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

122

address = "/dev/log"))

122

123

syslogger.setFormatter(logging.Formatter

123

124

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

124

125

' %(message)s'))

224

225

class AvahiError(Exception):

225

226

def __init__(self, value, *args, **kwargs):

226

227

self.value = value

227

super(AvahiError, self).__init__(value, *args, **kwargs)

228

def __unicode__(self):

229

return unicode(repr(self.value))

228

return super(AvahiError, self).__init__(value, *args,

229

**kwargs)

230

231

class AvahiServiceError(AvahiError):

232

pass

282

" after %i retries, exiting.",

283

self.rename_count)

284

raise AvahiServiceError("Too many renames")

285

self.name = unicode(self.server

286

.GetAlternativeServiceName(self.name))

285

self.name = str(self.server

286

.GetAlternativeServiceName(self.name))

287

logger.info("Changing Zeroconf service name to %r ...",

288

self.name)

289

self.remove()

337

self.rename()

338

elif state == avahi.ENTRY_GROUP_FAILURE:

339

logger.critical("Avahi: Error in group state changed %s",

340

unicode(error))

341

raise AvahiGroupError("State changed: {0!s}"

340

str(error))

341

raise AvahiGroupError("State changed: {!s}"

342

.format(error))

343

344

def cleanup(self):

395

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

396

ret = AvahiService.rename(self)

397

syslogger.setFormatter(logging.Formatter

398

('Mandos ({0}) [%(process)d]:'

398

('Mandos ({}) [%(process)d]:'

399

' %(levelname)s: %(message)s'

400

.format(self.name)))

401

return ret

402

403

404

def timedelta_to_milliseconds(td):

405

"Convert a datetime.timedelta() to milliseconds"

406

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

407

+ (td.seconds * 1000)

408

+ (td.microseconds // 1000))

409

410

411

404

class Client(object):

412

405

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

413

406

468

461

"enabled": "True",

469

462

}

470

463

471

def timeout_milliseconds(self):

472

"Return the 'timeout' attribute in milliseconds"

473

return timedelta_to_milliseconds(self.timeout)

474

475

def extended_timeout_milliseconds(self):

476

"Return the 'extended_timeout' attribute in milliseconds"

477

return timedelta_to_milliseconds(self.extended_timeout)

478

479

def interval_milliseconds(self):

480

"Return the 'interval' attribute in milliseconds"

481

return timedelta_to_milliseconds(self.interval)

482

483

def approval_delay_milliseconds(self):

484

return timedelta_to_milliseconds(self.approval_delay)

485

486

464

@staticmethod

487

465

def config_parser(config):

488

466

"""Construct a new dict of client settings of this form:

513

491

"rb") as secfile:

514

492

client["secret"] = secfile.read()

515

493

else:

516

raise TypeError("No secret or secfile for section {0}"

494

raise TypeError("No secret or secfile for section {}"

517

495

.format(section))

518

496

client["timeout"] = string_to_delta(section["timeout"])

519

497

client["extended_timeout"] = string_to_delta(

536

514

server_settings = {}

537

515

self.server_settings = server_settings

538

516

# adding all client settings

539

for setting, value in settings.iteritems():

517

for setting, value in settings.items():

540

518

setattr(self, setting, value)

541

519

542

520

if self.enabled:

625

603

if self.checker_initiator_tag is not None:

626

604

gobject.source_remove(self.checker_initiator_tag)

627

605

self.checker_initiator_tag = (gobject.timeout_add

628

(self.interval_milliseconds(),

606

(int(self.interval

607

.total_seconds() * 1000),

629

608

self.start_checker))

630

609

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

631

610

if self.disable_initiator_tag is not None:

632

611

gobject.source_remove(self.disable_initiator_tag)

633

612

self.disable_initiator_tag = (gobject.timeout_add

634

(self.timeout_milliseconds(),

635

self.disable))

613

(int(self.timeout

614

.total_seconds() * 1000),

615

self.disable))

636

616

# Also start a new checker *right now*.

637

617

self.start_checker()

638

618

669

649

self.disable_initiator_tag = None

670

650

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

671

651

self.disable_initiator_tag = (gobject.timeout_add

672

(timedelta_to_milliseconds

673

(timeout), self.disable))

652

(int(timeout.total_seconds()

653

* 1000), self.disable))

674

654

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

675

655

676

656

def need_approval(self):

707

687

# Start a new checker if needed

708

688

if self.checker is None:

709

689

# Escape attributes for the shell

710

escaped_attrs = dict(

711

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

712

for attr in

713

self.runtime_expansions)

690

escaped_attrs = { attr:

691

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

692

for attr in self.runtime_expansions }

714

693

try:

715

694

command = self.checker_command % escaped_attrs

716

695

except TypeError as error:

797

776

# "Set" method, so we fail early here:

798

777

if byte_arrays and signature != "ay":

799

778

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

800

" signature {0!r}".format(signature))

779

" signature {!r}".format(signature))

801

780

def decorator(func):

802

781

func._dbus_is_property = True

803

782

func._dbus_interface = dbus_interface

834

813

"""Decorator to annotate D-Bus methods, signals or properties

835

814

Usage:

836

815

816

@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",

817

"org.freedesktop.DBus.Property."

818

"EmitsChangedSignal": "false"})

837

819

@dbus_service_property("org.example.Interface", signature="b",

838

820

access="r")

839

@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",

840

"org.freedesktop.DBus.Property."

841

"EmitsChangedSignal": "false"})

842

821

def Property_dbus_property(self):

843

822

return dbus.Boolean(False)

844

823

"""

851

830

class DBusPropertyException(dbus.exceptions.DBusException):

852

831

"""A base class for D-Bus property-related exceptions

853

832

"""

854

def __unicode__(self):

855

return unicode(str(self))

856

833

pass

857

834

858

835

class DBusPropertyAccessException(DBusPropertyException):

859

836

"""A property's access permissions disallows an operation.

882

859

If called like _is_dbus_thing("method") it returns a function

883

860

suitable for use as predicate to inspect.getmembers().

884

861

"""

885

return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),

862

return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),

886

863

False)

887

864

888

865

def _get_all_dbus_things(self, thing):

938

915

# signatures other than "ay".

939

916

if prop._dbus_signature != "ay":

940

917

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

941

"'ay' signature {0!r}"

918

"'ay' signature {!r}"

942

919

.format(prop._dbus_signature))

943

920

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

944

921

for byte in value))

969

946

value.variant_level+1)

970

947

return dbus.Dictionary(properties, signature="sv")

971

948

949

@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")

950

def PropertiesChanged(self, interface_name, changed_properties,

951

invalidated_properties):

952

"""Standard D-Bus PropertiesChanged() signal, see D-Bus

953

standard.

954

"""

955

pass

956

972

957

@dbus.service.method(dbus.INTROSPECTABLE_IFACE,

973

958

out_signature="s",

974

959

path_keyword='object_path',

1009

994

(prop,

1010

995

"_dbus_annotations",

1011

996

{}))

1012

for name, value in annots.iteritems():

997

for name, value in annots.items():

1013

998

ann_tag = document.createElement(

1014

999

"annotation")

1015

1000

ann_tag.setAttribute("name", name)

1018

1003

# Add interface annotation tags

1019

1004

for annotation, value in dict(

1020

1005

itertools.chain.from_iterable(

1021

annotations().iteritems()

1006

annotations().items()

1022

1007

for name, annotations in

1023

1008

self._get_all_dbus_things("interface")

1024

1009

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

1025

)).iteritems():

1010

)).items():

1026

1011

ann_tag = document.createElement("annotation")

1027

1012

ann_tag.setAttribute("name", annotation)

1028

1013

ann_tag.setAttribute("value", value)

1084

1069

"""

1085

1070

def wrapper(cls):

1086

1071

for orig_interface_name, alt_interface_name in (

1087

alt_interface_names.iteritems()):

1072

alt_interface_names.items()):

1088

1073

attr = {}

1089

1074

interface_names = set()

1090

1075

# Go though all attributes of the class

1207

1192

attribute.func_closure)))

1208

1193

if deprecate:

1209

1194

# Deprecate all alternate interfaces

1210

iname="_AlternateDBusNames_interface_annotation{0}"

1195

iname="_AlternateDBusNames_interface_annotation{}"

1211

1196

for interface_name in interface_names:

1212

1197

@dbus_interface_annotations(interface_name)

1213

1198

def func(self):

1222

1207

if interface_names:

1223

1208

# Replace the class with a new subclass of it with

1224

1209

# methods, signals, etc. as created above.

1225

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

1210

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

1226

1211

(cls,), attr)

1227

1212

return cls

1228

1213

return wrapper

1241

1226

runtime_expansions = (Client.runtime_expansions

1242

1227

+ ("dbus_object_path",))

1243

1228

1229

_interface = "se.recompile.Mandos.Client"

1230

1244

1231

# dbus.service.Object doesn't use super(), so we can't either.

1245

1232

1246

1233

def __init__(self, bus = None, *args, **kwargs):

1248

1235

Client.__init__(self, *args, **kwargs)

1249

1236

# Only now, when this client is initialized, can it show up on

1250

1237

# the D-Bus

1251

client_object_name = unicode(self.name).translate(

1238

client_object_name = str(self.name).translate(

1252

1239

{ord("."): ord("_"),

1253

1240

ord("-"): ord("_")})

1254

1241

self.dbus_object_path = (dbus.ObjectPath

1258

1245

1259

1246

def notifychangeproperty(transform_func,

1260

1247

dbus_name, type_func=lambda x: x,

1261

variant_level=1):

1248

variant_level=1, invalidate_only=False,

1249

_interface=_interface):

1262

1250

""" Modify a variable so that it's a property which announces

1263

1251

its changes to DBus.

1264

1252

1269

1257

to the D-Bus. Default: no transform

1270

1258

variant_level: D-Bus variant level. Default: 1

1271

1259

"""

1272

attrname = "_{0}".format(dbus_name)

1260

attrname = "_{}".format(dbus_name)

1273

1261

def setter(self, value):

1274

1262

if hasattr(self, "dbus_object_path"):

1275

1263

if (not hasattr(self, attrname) or

1276

1264

type_func(getattr(self, attrname, None))

1277

1265

!= type_func(value)):

1278

dbus_value = transform_func(type_func(value),

1279

variant_level

1280

=variant_level)

1281

self.PropertyChanged(dbus.String(dbus_name),

1282

dbus_value)

1266

if invalidate_only:

1267

self.PropertiesChanged(_interface,

1268

dbus.Dictionary(),

1269

dbus.Array

1270

((dbus_name,)))

1271

else:

1272

dbus_value = transform_func(type_func(value),

1273

variant_level

1274

=variant_level)

1275

self.PropertyChanged(dbus.String(dbus_name),

1276

dbus_value)

1277

self.PropertiesChanged(_interface,

1278

dbus.Dictionary({

1279

dbus.String(dbus_name):

1280

dbus_value }), dbus.Array())

1283

1281

setattr(self, attrname, value)

1284

1282

1285

1283

return property(lambda self: getattr(self, attrname), setter)

1305

1303

approval_delay = notifychangeproperty(dbus.UInt64,

1306

1304

"ApprovalDelay",

1307

1305

type_func =

1308

timedelta_to_milliseconds)

1306

lambda td: td.total_seconds()

1307

* 1000)

1309

1308

approval_duration = notifychangeproperty(

1310

1309

dbus.UInt64, "ApprovalDuration",

1311

type_func = timedelta_to_milliseconds)

1310

type_func = lambda td: td.total_seconds() * 1000)

1312

1311

host = notifychangeproperty(dbus.String, "Host")

1313

1312

timeout = notifychangeproperty(dbus.UInt64, "Timeout",

1314

type_func =

1315

timedelta_to_milliseconds)

1313

type_func = lambda td:

1314

td.total_seconds() * 1000)

1316

1315

extended_timeout = notifychangeproperty(

1317

1316

dbus.UInt64, "ExtendedTimeout",

1318

type_func = timedelta_to_milliseconds)

1317

type_func = lambda td: td.total_seconds() * 1000)

1319

1318

interval = notifychangeproperty(dbus.UInt64,

1320

1319

"Interval",

1321

1320

type_func =

1322

timedelta_to_milliseconds)

1321

lambda td: td.total_seconds()

1322

* 1000)

1323

checker_command = notifychangeproperty(dbus.String, "Checker")

1324

secret = notifychangeproperty(dbus.ByteArray, "Secret",

1325

invalidate_only=True)

1324

1326

1325

1327

del notifychangeproperty

1326

1328

1368

1370

1369

1371

def approve(self, value=True):

1370

1372

self.approved = value

1371

gobject.timeout_add(timedelta_to_milliseconds

1372

(self.approval_duration),

1373

self._reset_approved)

1373

gobject.timeout_add(int(self.approval_duration.total_seconds()

1374

* 1000), self._reset_approved)

1374

1375

self.send_changedstate()

1375

1376

1377

## D-Bus methods, signals & properties

1377

_interface = "se.recompile.Mandos.Client"

1378

1379

## Interfaces

1380

1381

@dbus_interface_annotations(_interface)

1382

def _foo(self):

1383

return { "org.freedesktop.DBus.Property.EmitsChangedSignal":

1384

"false"}

1385

1386

1381

## Signals

1387

1382

1388

1383

# CheckerCompleted - signal

1398

1393

pass

1399

1394

1400

1395

# PropertyChanged - signal

1396

@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})

1401

1397

@dbus.service.signal(_interface, signature="sv")

1402

1398

def PropertyChanged(self, property, value):

1403

1399

"D-Bus signal"

1479

1475

access="readwrite")

1480

1476

def ApprovalDelay_dbus_property(self, value=None):

1481

1477

if value is None: # get

1482

return dbus.UInt64(self.approval_delay_milliseconds())

1478

return dbus.UInt64(self.approval_delay.total_seconds()

1479

* 1000)

1483

1480

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

1484

1481

1485

1482

# ApprovalDuration - property

1487

1484

access="readwrite")

1488

1485

def ApprovalDuration_dbus_property(self, value=None):

1489

1486

if value is None: # get

1490

return dbus.UInt64(timedelta_to_milliseconds(

1491

self.approval_duration))

1487

return dbus.UInt64(self.approval_duration.total_seconds()

1488

* 1000)

1492

1489

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

1493

1490

1494

1491

# Name - property

1507

1504

def Host_dbus_property(self, value=None):

1508

1505

if value is None: # get

1509

1506

return dbus.String(self.host)

1510

self.host = unicode(value)

1507

self.host = str(value)

1511

1508

1512

1509

# Created - property

1513

1510

@dbus_service_property(_interface, signature="s", access="read")

1560

1557

access="readwrite")

1561

1558

def Timeout_dbus_property(self, value=None):

1562

1559

if value is None: # get

1563

return dbus.UInt64(self.timeout_milliseconds())

1560

return dbus.UInt64(self.timeout.total_seconds() * 1000)

1564

1561

old_timeout = self.timeout

1565

1562

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

1566

1563

# Reschedule disabling

1577

1574

gobject.source_remove(self.disable_initiator_tag)

1578

1575

self.disable_initiator_tag = (

1579

1576

gobject.timeout_add(

1580

timedelta_to_milliseconds(self.expires - now),

1581

self.disable))

1577

int((self.expires - now).total_seconds()

1578

* 1000), self.disable))

1582

1579

1583

1580

# ExtendedTimeout - property

1584

1581

@dbus_service_property(_interface, signature="t",

1585

1582

access="readwrite")

1586

1583

def ExtendedTimeout_dbus_property(self, value=None):

1587

1584

if value is None: # get

1588

return dbus.UInt64(self.extended_timeout_milliseconds())

1585

return dbus.UInt64(self.extended_timeout.total_seconds()

1586

* 1000)

1589

1587

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

1590

1588

1591

1589

# Interval - property

1593

1591

access="readwrite")

1594

1592

def Interval_dbus_property(self, value=None):

1595

1593

if value is None: # get

1596

return dbus.UInt64(self.interval_milliseconds())

1594

return dbus.UInt64(self.interval.total_seconds() * 1000)

1597

1595

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

1598

1596

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

1599

1597

return

1610

1608

def Checker_dbus_property(self, value=None):

1611

1609

if value is None: # get

1612

1610

return dbus.String(self.checker_command)

1613

self.checker_command = unicode(value)

1611

self.checker_command = str(value)

1614

1612

1615

1613

# CheckerRunning - property

1616

1614

@dbus_service_property(_interface, signature="b",

1632

1630

@dbus_service_property(_interface, signature="ay",

1633

1631

access="write", byte_arrays=True)

1634

1632

def Secret_dbus_property(self, value):

1635

self.secret = str(value)

1633

self.secret = bytes(value)

1636

1634

1637

1635

del _interface

1638

1636

1672

1670

def handle(self):

1673

1671

with contextlib.closing(self.server.child_pipe) as child_pipe:

1674

1672

logger.info("TCP connection from: %s",

1675

unicode(self.client_address))

1673

str(self.client_address))

1676

1674

logger.debug("Pipe FD: %d",

1677

1675

self.server.child_pipe.fileno())

1678

1676

1759

1757

if self.server.use_dbus:

1760

1758

# Emit D-Bus signal

1761

1759

client.NeedApproval(

1762

client.approval_delay_milliseconds(),

1763

client.approved_by_default)

1760

client.approval_delay.total_seconds()

1761

* 1000, client.approved_by_default)

1764

1762

else:

1765

1763

logger.warning("Client %s was not approved",

1766

1764

client.name)

1772

1770

#wait until timeout or approved

1773

1771

time = datetime.datetime.now()

1774

1772

client.changedstate.acquire()

1775

client.changedstate.wait(

1776

float(timedelta_to_milliseconds(delay)

1777

/ 1000))

1773

client.changedstate.wait(delay.total_seconds())

1778

1774

client.changedstate.release()

1779

1775

time2 = datetime.datetime.now()

1780

1776

if (time2 - time) >= delay:

1979

1975

try:

1980

1976

self.socket.setsockopt(socket.SOL_SOCKET,

1981

1977

SO_BINDTODEVICE,

1982

str(self.interface + '\0'))

1978

(self.interface + "\0")

1979

.encode("utf-8"))

1983

1980

except socket.error as error:

1984

1981

if error.errno == errno.EPERM:

1985

1982

logger.error("No permission to bind to"

2245

2242

timevalue = datetime.timedelta(0)

2246

2243

for s in interval.split():

2247

2244

try:

2248

suffix = unicode(s[-1])

2245

suffix = s[-1]

2249

2246

value = int(s[:-1])

2250

2247

if suffix == "d":

2251

2248

delta = datetime.timedelta(value)

2258

2255

elif suffix == "w":

2259

2256

delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)

2260

2257

else:

2261

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

2258

raise ValueError("Unknown suffix {!r}"

2262

2259

.format(suffix))

2263

2260

except IndexError as e:

2264

2261

raise ValueError(*(e.args))

2281

2278

# Close all standard open file descriptors

2282

2279

null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)

2283

2280

if not stat.S_ISCHR(os.fstat(null).st_mode):

2284

raise OSError(errno.ENODEV,

2285

"{0} not a character device"

2281

raise OSError(errno.ENODEV, "{} not a character device"

2286

2282

.format(os.devnull))

2287

2283

os.dup2(null, sys.stdin.fileno())

2288

2284

os.dup2(null, sys.stdout.fileno())

2298

2294

2299

2295

parser = argparse.ArgumentParser()

2300

2296

parser.add_argument("-v", "--version", action="version",

2301

version = "%(prog)s {0}".format(version),

2297

version = "%(prog)s {}".format(version),

2302

2298

help="show version number and exit")

2303

2299

parser.add_argument("-i", "--interface", metavar="IF",

2304

2300

help="Bind to interface IF")

2403

2399

del options

2404

2400

# Force all strings to be unicode

2405

2401

for option in server_settings.keys():

2406

if type(server_settings[option]) is str:

2407

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

2402

if isinstance(server_settings[option], bytes):

2403

server_settings[option] = (server_settings[option]

2404

.decode("utf-8"))

2408

2405

# Force all boolean options to be boolean

2409

2406

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

2410

2407

"foreground", "zeroconf"):

2443

2440

2444

2441

if server_settings["servicename"] != "Mandos":

2445

2442

syslogger.setFormatter(logging.Formatter

2446

('Mandos ({0}) [%(process)d]:'

2443

('Mandos ({}) [%(process)d]:'

2447

2444

' %(levelname)s: %(message)s'

2448

2445

.format(server_settings

2449

2446

["servicename"])))

2553

2550

protocol = protocol, bus = bus)

2554

2551

if server_settings["interface"]:

2555

2552

service.interface = (if_nametoindex

2556

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

2553

(server_settings["interface"]

2554

.encode("utf-8")))

2557

2555

2558

2556

global multiprocessing_manager

2559

2557

multiprocessing_manager = multiprocessing.Manager()

2583

2581

os.remove(stored_state_path)

2584

2582

except IOError as e:

2585

2583

if e.errno == errno.ENOENT:

2586

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

2584

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

2587

2585

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

2588

2586

else:

2589

2587

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

2594

2592

"EOFError:", exc_info=e)

2595

2593

2596

2594

with PGPEngine() as pgp:

2597

for client_name, client in clients_data.iteritems():

2595

for client_name, client in clients_data.items():

2598

2596

# Skip removed clients

2599

2597

if client_name not in client_settings:

2600

2598

continue

2625

2623

if datetime.datetime.utcnow() >= client["expires"]:

2626

2624

if not client["last_checked_ok"]:

2627

2625

logger.warning(

2628

"disabling client {0} - Client never "

2626

"disabling client {} - Client never "

2629

2627

"performed a successful checker"

2630

2628

.format(client_name))

2631

2629

client["enabled"] = False

2632

2630

elif client["last_checker_status"] != 0:

2633

2631

logger.warning(

2634

"disabling client {0} - Client "

2635

"last checker failed with error code {1}"

2632

"disabling client {} - Client last"

2633

" checker failed with error code {}"

2636

2634

.format(client_name,

2637

2635

client["last_checker_status"]))

2638

2636

client["enabled"] = False

2641

2639

.utcnow()

2642

2640

+ client["timeout"])

2643

2641

logger.debug("Last checker succeeded,"

2644

" keeping {0} enabled"

2642

" keeping {} enabled"

2645

2643

.format(client_name))

2646

2644

try:

2647

2645

client["secret"] = (

2650

2648

["secret"]))

2651

2649

except PGPError:

2652

2650

# If decryption fails, we use secret from new settings

2653

logger.debug("Failed to decrypt {0} old secret"

2651

logger.debug("Failed to decrypt {} old secret"

2654

2652

.format(client_name))

2655

2653

client["secret"] = (

2656

2654

client_settings[client_name]["secret"])

2664

2662

clients_data[client_name] = client_settings[client_name]

2665

2663

2666

2664

# Create all client objects

2667

for client_name, client in clients_data.iteritems():

2665

for client_name, client in clients_data.items():

2668

2666

tcp_server.clients[client_name] = client_class(

2669

2667

name = client_name, settings = client,

2670

2668

server_settings = server_settings)

2677

2675

try:

2678

2676

with pidfile:

2679

2677

pid = os.getpid()

2680

pidfile.write(str(pid) + "\n".encode("utf-8"))

2678

pidfile.write("{}\n".format(pid).encode("utf-8"))

2681

2679

except IOError:

2682

2680

logger.error("Could not write to file %r with PID %d",

2683

2681

pidfilename, pid)

2729

2727

def GetAllClientsWithProperties(self):

2730

2728

"D-Bus method"

2731

2729

return dbus.Dictionary(

2732

((c.dbus_object_path, c.GetAll(""))

2733

for c in tcp_server.clients.itervalues()),

2730

{ c.dbus_object_path: c.GetAll("")

2731

for c in tcp_server.clients.itervalues() },

2734

2732

signature="oa{sv}")

2735

2733

2736

2734

@dbus.service.method(_interface, in_signature="o")

2774

2772

2775

2773

# A list of attributes that can not be pickled

2776

2774

# + secret.

2777

exclude = set(("bus", "changedstate", "secret",

2778

"checker", "server_settings"))

2775

exclude = { "bus", "changedstate", "secret",

2776

"checker", "server_settings" }

2779

2777

for name, typ in (inspect.getmembers

2780

2778

(dbus.service.Object)):

2781

2779

exclude.add(name)

2804

2802

except NameError:

2805

2803

pass

2806

2804

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

2807

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

2805

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

2808

2806

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

2809

2807

else:

2810

2808

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