/mandos/release : revision 237.7.174

11

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

12

#

13

# Everything else is

14

15

14

15

16

#

17

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

18

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

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

66

68

import binascii

67

69

import tempfile

68

70

import itertools

71

import collections

69

72

70

73

import dbus

71

74

import dbus.service

76

79

import ctypes.util

77

80

import xml.dom.minidom

78

81

import inspect

79

import GnuPGInterface

80

82

81

83

try:

82

84

SO_BINDTODEVICE = socket.SO_BINDTODEVICE

86

88

except ImportError:

87

89

SO_BINDTODEVICE = None

88

90

89

version = "1.5.3"

91

version = "1.6.1"

90

92

stored_state_file = "clients.pickle"

91

93

92

94

logger = logging.getLogger()

137

139

class PGPEngine(object):

138

140

"""A simple class for OpenPGP symmetric encryption & decryption"""

139

141

def __init__(self):

140

self.gnupg = GnuPGInterface.GnuPG()

141

142

self.tempdir = tempfile.mkdtemp(prefix="mandos-")

142

self.gnupg = GnuPGInterface.GnuPG()

143

self.gnupg.options.meta_interactive = False

144

self.gnupg.options.homedir = self.tempdir

145

self.gnupg.options.extra_args.extend(['--force-mdc',

146

'--quiet',

147

'--no-use-agent'])

143

self.gnupgargs = ['--batch',

144

'--home', self.tempdir,

145

'--force-mdc',

146

'--quiet',

147

'--no-use-agent']

148

149

def __enter__(self):

150

return self

151

152

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

152

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

153

self._cleanup()

154

return False

155

175

return b"mandos" + binascii.hexlify(password)

176

177

def encrypt(self, data, password):

178

self.gnupg.passphrase = self.password_encode(password)

179

with open(os.devnull, "w") as devnull:

180

try:

181

proc = self.gnupg.run(['--symmetric'],

182

create_fhs=['stdin', 'stdout'],

183

attach_fhs={'stderr': devnull})

184

with contextlib.closing(proc.handles['stdin']) as f:

185

f.write(data)

186

with contextlib.closing(proc.handles['stdout']) as f:

187

ciphertext = f.read()

188

proc.wait()

189

except IOError as e:

190

raise PGPError(e)

191

self.gnupg.passphrase = None

178

passphrase = self.password_encode(password)

179

with tempfile.NamedTemporaryFile(dir=self.tempdir

180

) as passfile:

181

passfile.write(passphrase)

182

passfile.flush()

183

proc = subprocess.Popen(['gpg', '--symmetric',

184

'--passphrase-file',

185

passfile.name]

186

+ self.gnupgargs,

187

stdin = subprocess.PIPE,

188

stdout = subprocess.PIPE,

189

stderr = subprocess.PIPE)

190

ciphertext, err = proc.communicate(input = data)

191

if proc.returncode != 0:

192

raise PGPError(err)

192

193

return ciphertext

193

194

195

def decrypt(self, data, password):

195

self.gnupg.passphrase = self.password_encode(password)

196

with open(os.devnull, "w") as devnull:

197

try:

198

proc = self.gnupg.run(['--decrypt'],

199

create_fhs=['stdin', 'stdout'],

200

attach_fhs={'stderr': devnull})

201

with contextlib.closing(proc.handles['stdin']) as f:

202

f.write(data)

203

with contextlib.closing(proc.handles['stdout']) as f:

204

decrypted_plaintext = f.read()

205

proc.wait()

206

except IOError as e:

207

raise PGPError(e)

208

self.gnupg.passphrase = None

196

passphrase = self.password_encode(password)

197

with tempfile.NamedTemporaryFile(dir = self.tempdir

198

) as passfile:

199

passfile.write(passphrase)

200

passfile.flush()

201

proc = subprocess.Popen(['gpg', '--decrypt',

202

'--passphrase-file',

203

passfile.name]

204

+ self.gnupgargs,

205

stdin = subprocess.PIPE,

206

stdout = subprocess.PIPE,

207

stderr = subprocess.PIPE)

208

decrypted_plaintext, err = proc.communicate(input

209

= data)

210

if proc.returncode != 0:

211

raise PGPError(err)

209

212

return decrypted_plaintext

210

213

211

214

212

213

215

class AvahiError(Exception):

214

216

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

215

217

self.value = value

232

234

Used to optionally bind to the specified interface.

233

235

name: string; Example: 'Mandos'

234

236

type: string; Example: '_mandos._tcp'.

235

See <http://www.dns-sd.org/ServiceTypes.html>

237

See <https://www.iana.org/assignments/service-names-port-numbers>

236

238

port: integer; what port to announce

237

239

TXT: list of strings; TXT record for the service

238

240

domain: string; Domain to publish on, default to .local if empty.

244

246

server: D-Bus Server

245

247

bus: dbus.SystemBus()

246

248

"""

249

247

250

def __init__(self, interface = avahi.IF_UNSPEC, name = None,

248

251

servicetype = None, port = None, TXT = None,

249

252

domain = "", host = "", max_renames = 32768,

262

265

self.server = None

263

266

self.bus = bus

264

267

self.entry_group_state_changed_match = None

268

265

269

def rename(self):

266

270

"""Derived from the Avahi example code"""

267

271

if self.rename_count >= self.max_renames:

281

285

self.cleanup()

282

286

os._exit(1)

283

287

self.rename_count += 1

288

284

289

def remove(self):

285

290

"""Derived from the Avahi example code"""

286

291

if self.entry_group_state_changed_match is not None:

288

293

self.entry_group_state_changed_match = None

289

294

if self.group is not None:

290

295

self.group.Reset()

296

291

297

def add(self):

292

298

"""Derived from the Avahi example code"""

293

299

self.remove()

310

316

dbus.UInt16(self.port),

311

317

avahi.string_array_to_txt_array(self.TXT))

312

318

self.group.Commit()

319

313

320

def entry_group_state_changed(self, state, error):

314

321

"""Derived from the Avahi example code"""

315

322

logger.debug("Avahi entry group state change: %i", state)

324

331

unicode(error))

325

332

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

326

333

.format(error))

334

327

335

def cleanup(self):

328

336

"""Derived from the Avahi example code"""

329

337

if self.group is not None:

334

342

pass

335

343

self.group = None

336

344

self.remove()

345

337

346

def server_state_changed(self, state, error=None):

338

347

"""Derived from the Avahi example code"""

339

348

logger.debug("Avahi server state change: %i", state)

358

367

logger.debug("Unknown state: %r", state)

359

368

else:

360

369

logger.debug("Unknown state: %r: %r", state, error)

370

361

371

def activate(self):

362

372

"""Derived from the Avahi example code"""

363

373

if self.server is None:

370

380

self.server_state_changed)

371

381

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

372

382

383

373

384

class AvahiServiceToSyslog(AvahiService):

374

385

def rename(self):

375

386

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

380

391

.format(self.name)))

381

392

return ret

382

393

394

383

395

def timedelta_to_milliseconds(td):

384

396

"Convert a datetime.timedelta() to milliseconds"

385

397

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

386

398

+ (td.seconds * 1000)

387

399

+ (td.microseconds // 1000))

388

400

401

389

402

class Client(object):

390

403

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

391

404

427

440

runtime_expansions: Allowed attributes for runtime expansion.

428

441

expires: datetime.datetime(); time (UTC) when a client will be

429

442

disabled, or None

443

server_settings: The server_settings dict from main()

430

444

"""

431

445

432

446

runtime_expansions = ("approval_delay", "approval_duration",

433

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

434

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

447

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

448

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

449

"last_approval_request", "last_checked_ok",

435

450

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

436

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

437

"extended_timeout": "15m",

438

"interval": "2m",

451

client_defaults = { "timeout": "PT5M",

452

"extended_timeout": "PT15M",

453

"interval": "PT2M",

439

454

"checker": "fping -q -- %%(host)s",

440

455

"host": "",

441

"approval_delay": "0s",

442

"approval_duration": "1s",

456

"approval_delay": "PT0S",

457

"approval_duration": "PT1S",

443

458

"approved_by_default": "True",

444

459

"enabled": "True",

445

460

}

458

473

459

474

def approval_delay_milliseconds(self):

460

475

return timedelta_to_milliseconds(self.approval_delay)

461

476

462

477

@staticmethod

463

478

def config_parser(config):

464

479

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

505

520

client["last_checker_status"] = -2

506

521

507

522

return settings

508

509

510

def __init__(self, settings, name = None):

511

"""Note: the 'checker' key in 'config' sets the

512

'checker_command' attribute and *not* the 'checker'

513

attribute."""

523

524

def __init__(self, settings, name = None, server_settings=None):

514

525

self.name = name

526

if server_settings is None:

527

server_settings = {}

528

self.server_settings = server_settings

515

529

# adding all client settings

516

530

for setting, value in settings.iteritems():

517

531

setattr(self, setting, value)

525

539

else:

526

540

self.last_enabled = None

527

541

self.expires = None

528

542

529

543

logger.debug("Creating client %r", self.name)

530

544

# Uppercase and remove spaces from fingerprint for later

531

545

# comparison purposes with return value from the fingerprint()

533

547

logger.debug(" Fingerprint: %s", self.fingerprint)

534

548

self.created = settings.get("created",

535

549

datetime.datetime.utcnow())

536

550

537

551

# attributes specific for this server instance

538

552

self.checker = None

539

553

self.checker_initiator_tag = None

567

581

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

568

582

# Already enabled

569

583

return

570

self.send_changedstate()

571

584

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

572

585

self.enabled = True

573

586

self.last_enabled = datetime.datetime.utcnow()

574

587

self.init_checker()

588

self.send_changedstate()

575

589

576

590

def disable(self, quiet=True):

577

591

"""Disable this client."""

578

592

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

579

593

return False

580

594

if not quiet:

581

self.send_changedstate()

582

if not quiet:

583

595

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

584

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

596

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

585

597

gobject.source_remove(self.disable_initiator_tag)

586

598

self.disable_initiator_tag = None

587

599

self.expires = None

588

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

600

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

589

601

gobject.source_remove(self.checker_initiator_tag)

590

602

self.checker_initiator_tag = None

591

603

self.stop_checker()

592

604

self.enabled = False

605

if not quiet:

606

self.send_changedstate()

593

607

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

594

608

return False

595

609

599

613

def init_checker(self):

600

614

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

601

615

# and every interval from then on.

616

if self.checker_initiator_tag is not None:

617

gobject.source_remove(self.checker_initiator_tag)

602

618

self.checker_initiator_tag = (gobject.timeout_add

603

619

(self.interval_milliseconds(),

604

620

self.start_checker))

605

621

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

622

if self.disable_initiator_tag is not None:

623

gobject.source_remove(self.disable_initiator_tag)

606

624

self.disable_initiator_tag = (gobject.timeout_add

607

625

(self.timeout_milliseconds(),

608

626

self.disable))

639

657

timeout = self.timeout

640

658

if self.disable_initiator_tag is not None:

641

659

gobject.source_remove(self.disable_initiator_tag)

660

self.disable_initiator_tag = None

642

661

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

643

662

self.disable_initiator_tag = (gobject.timeout_add

644

663

(timedelta_to_milliseconds

654

673

If a checker already exists, leave it running and do

655

674

nothing."""

656

675

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

657

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

658

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

659

# client would inevitably timeout, since no checker would get

660

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

676

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

677

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

678

# would inevitably timeout, since no checker would get a

679

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

661

680

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

662

681

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

663

682

# should be.

677

696

self.current_checker_command)

678

697

# Start a new checker if needed

679

698

if self.checker is None:

699

# Escape attributes for the shell

700

escaped_attrs = dict(

701

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

702

for attr in

703

self.runtime_expansions)

680

704

try:

681

# In case checker_command has exactly one % operator

682

command = self.checker_command % self.host

683

except TypeError:

684

# Escape attributes for the shell

685

escaped_attrs = dict(

686

(attr,

687

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

688

errors=

689

'replace')))

690

for attr in

691

self.runtime_expansions)

692

693

try:

694

command = self.checker_command % escaped_attrs

695

except TypeError as error:

696

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

697

self.checker_command, exc_info=error)

698

return True # Try again later

705

command = self.checker_command % escaped_attrs

706

except TypeError as error:

707

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

708

self.checker_command, exc_info=error)

709

return True # Try again later

699

710

self.current_checker_command = command

700

711

try:

701

712

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

704

715

# in normal mode, that is already done by daemon(),

705

716

# and in debug mode we don't want to. (Stdin is

706

717

# always replaced by /dev/null.)

718

# The exception is when not debugging but nevertheless

719

# running in the foreground; use the previously

720

# created wnull.

721

popen_args = {}

722

if (not self.server_settings["debug"]

723

and self.server_settings["foreground"]):

724

popen_args.update({"stdout": wnull,

725

"stderr": wnull })

707

726

self.checker = subprocess.Popen(command,

708

727

close_fds=True,

709

shell=True, cwd="/")

710

self.checker_callback_tag = (gobject.child_watch_add

711

(self.checker.pid,

712

self.checker_callback,

713

data=command))

714

# The checker may have completed before the gobject

715

# watch was added. Check for this.

716

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

717

if pid:

718

gobject.source_remove(self.checker_callback_tag)

719

self.checker_callback(pid, status, command)

728

shell=True, cwd="/",

729

**popen_args)

720

730

except OSError as error:

721

731

logger.error("Failed to start subprocess",

722

732

exc_info=error)

733

return True

734

self.checker_callback_tag = (gobject.child_watch_add

735

(self.checker.pid,

736

self.checker_callback,

737

data=command))

738

# The checker may have completed before the gobject

739

# watch was added. Check for this.

740

try:

741

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

742

except OSError as error:

743

if error.errno == errno.ECHILD:

744

# This should never happen

745

logger.error("Child process vanished",

746

exc_info=error)

747

return True

748

raise

749

if pid:

750

gobject.source_remove(self.checker_callback_tag)

751

self.checker_callback(pid, status, command)

723

752

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

724

753

return True

725

754

773

802

774

803

775

804

def dbus_interface_annotations(dbus_interface):

776

"""Decorator for marking functions returning interface annotations.

805

"""Decorator for marking functions returning interface annotations

777

806

778

807

Usage:

779

808

976

1005

tag.appendChild(ann_tag)

977

1006

# Add interface annotation tags

978

1007

for annotation, value in dict(

979

itertools.chain(

980

*(annotations().iteritems()

981

for name, annotations in

982

self._get_all_dbus_things("interface")

983

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

984

))).iteritems():

1008

itertools.chain.from_iterable(

1009

annotations().iteritems()

1010

for name, annotations in

1011

self._get_all_dbus_things("interface")

1012

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

1013

)).iteritems():

985

1014

ann_tag = document.createElement("annotation")

986

1015

ann_tag.setAttribute("name", annotation)

987

1016

ann_tag.setAttribute("value", value)

1010

1039

return xmlstring

1011

1040

1012

1041

1013

def datetime_to_dbus (dt, variant_level=0):

1042

def datetime_to_dbus(dt, variant_level=0):

1014

1043

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

1015

1044

if dt is None:

1016

1045

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

1018

1047

variant_level=variant_level)

1019

1048

1020

1049

1021

class AlternateDBusNamesMetaclass(DBusObjectWithProperties

1022

.__metaclass__):

1023

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

1024

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

1050

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1051

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

1052

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

1053

interface names according to the "alt_interface_names" mapping.

1054

Usage:

1055

1056

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

1057

"net.example.AlternateInterface"})

1058

class SampleDBusObject(dbus.service.Object):

1059

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

1060

def SampleDBusMethod():

1061

pass

1062

1063

The above "SampleDBusMethod" on "SampleDBusObject" will be

1064

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

1065

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

1066

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

1067

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

1068

1069

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

1070

(from DBusObjectWithProperties) and interfaces (from the

1071

dbus_interface_annotations decorator).

1025

1072

"""

1026

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

1027

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

1028

# methods, signals, or properties in them

1029

old_interface_names = []

1030

for base in (b for b in bases

1031

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

1032

# Go though all attributes of the base class

1033

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

1073

def wrapper(cls):

1074

for orig_interface_name, alt_interface_name in (

1075

alt_interface_names.iteritems()):

1076

attr = {}

1077

interface_names = set()

1078

# Go though all attributes of the class

1079

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

1034

1080

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

1035

1081

# with the wrong interface name

1036

1082

if (not hasattr(attribute, "_dbus_interface")

1037

1083

or not attribute._dbus_interface

1038

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

1084

.startswith(orig_interface_name)):

1039

1085

continue

1040

1086

# Create an alternate D-Bus interface name based on

1041

1087

# the current name

1042

1088

alt_interface = (attribute._dbus_interface

1043

.replace("se.recompile.Mandos",

1044

"se.bsnet.fukt.Mandos"))

1045

if alt_interface != attribute._dbus_interface:

1046

old_interface_names.append(alt_interface)

1089

.replace(orig_interface_name,

1090

alt_interface_name))

1091

interface_names.add(alt_interface)

1047

1092

# Is this a D-Bus signal?

1048

1093

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

1049

# Extract the original non-method function by

1050

# black magic

1094

# Extract the original non-method undecorated

1095

# function by black magic

1051

1096

nonmethod_func = (dict(

1052

1097

zip(attribute.func_code.co_freevars,

1053

1098

attribute.__closure__))["func"]

1071

1116

except AttributeError:

1072

1117

pass

1073

1118

# Define a creator of a function to call both the

1074

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

1075

# signals gets sent when the function is called

1119

# original and alternate functions, so both the

1120

# original and alternate signals gets sent when

1121

# the function is called

1076

1122

def fixscope(func1, func2):

1077

1123

"""This function is a scope container to pass

1078

1124

func1 and func2 to the "call_both" function

1085

1131

return call_both

1086

1132

# Create the "call_both" function and add it to

1087

1133

# the class

1088

attr[attrname] = fixscope(attribute,

1089

new_function)

1134

attr[attrname] = fixscope(attribute, new_function)

1090

1135

# Is this a D-Bus method?

1091

1136

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

1092

1137

# Create a new, but exactly alike, function

1148

1193

attribute.func_name,

1149

1194

attribute.func_defaults,

1150

1195

attribute.func_closure)))

1151

# Deprecate all old interfaces

1152

basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"

1153

for old_interface_name in old_interface_names:

1154

@dbus_interface_annotations(old_interface_name)

1155

def func(self):

1156

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

1157

# Find an unused name

1158

for aname in (basename.format(i) for i in

1159

itertools.count()):

1160

if aname not in attr:

1161

attr[aname] = func

1162

break

1163

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

1164

1165

1196

if deprecate:

1197

# Deprecate all alternate interfaces

1198

iname="_AlternateDBusNames_interface_annotation{0}"

1199

for interface_name in interface_names:

1200

@dbus_interface_annotations(interface_name)

1201

def func(self):

1202

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

1203

"true" }

1204

# Find an unused name

1205

for aname in (iname.format(i)

1206

for i in itertools.count()):

1207

if aname not in attr:

1208

attr[aname] = func

1209

break

1210

if interface_names:

1211

# Replace the class with a new subclass of it with

1212

# methods, signals, etc. as created above.

1213

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

1214

(cls,), attr)

1215

return cls

1216

return wrapper

1217

1218

1219

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

1220

"se.bsnet.fukt.Mandos"})

1166

1221

class ClientDBus(Client, DBusObjectWithProperties):

1167

1222

"""A Client class using D-Bus

1168

1223

1188

1243

("/clients/" + client_object_name))

1189

1244

DBusObjectWithProperties.__init__(self, self.bus,

1190

1245

self.dbus_object_path)

1191

1246

1192

1247

def notifychangeproperty(transform_func,

1193

1248

dbus_name, type_func=lambda x: x,

1194

1249

variant_level=1):

1217

1272

1218

1273

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

1219

1274

1220

1221

1275

expires = notifychangeproperty(datetime_to_dbus, "Expires")

1222

1276

approvals_pending = notifychangeproperty(dbus.Boolean,

1223

1277

"ApprovalPending",

1305

1359

return False

1306

1360

1307

1361

def approve(self, value=True):

1308

self.send_changedstate()

1309

1362

self.approved = value

1310

1363

gobject.timeout_add(timedelta_to_milliseconds

1311

1364

(self.approval_duration),

1312

1365

self._reset_approved)

1313

1366

self.send_changedstate()

1314

1367

1315

1368

## D-Bus methods, signals & properties

1316

1369

_interface = "se.recompile.Mandos.Client"

1500

1553

def Timeout_dbus_property(self, value=None):

1501

1554

if value is None: # get

1502

1555

return dbus.UInt64(self.timeout_milliseconds())

1556

old_timeout = self.timeout

1503

1557

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

1504

# Reschedule timeout

1558

# Reschedule disabling

1505

1559

if self.enabled:

1506

1560

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:

1561

self.expires += self.timeout - old_timeout

1562

if self.expires <= now:

1510

1563

# The timeout has passed

1511

1564

self.disable()

1512

1565

else:

1513

self.expires = (now +

1514

datetime.timedelta(milliseconds =

1515

time_to_die))

1516

1566

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

1517

1567

is None):

1518

1568

return

1519

1569

gobject.source_remove(self.disable_initiator_tag)

1520

self.disable_initiator_tag = (gobject.timeout_add

1521

(time_to_die,

1522

self.disable))

1570

self.disable_initiator_tag = (

1571

gobject.timeout_add(

1572

timedelta_to_milliseconds(self.expires - now),

1573

self.disable))

1523

1574

1524

1575

# ExtendedTimeout - property

1525

1576

@dbus_service_property(_interface, signature="t",

1604

1655

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

1605

1656

1606

1657

1607

class ClientDBusTransitional(ClientDBus):

1608

__metaclass__ = AlternateDBusNamesMetaclass

1609

1610

1611

1658

class ClientHandler(socketserver.BaseRequestHandler, object):

1612

1659

"""A class to handle client connections.

1613

1660

1717

1764

#wait until timeout or approved

1718

1765

time = datetime.datetime.now()

1719

1766

client.changedstate.acquire()

1720

(client.changedstate.wait

1721

(float(client.timedelta_to_milliseconds(delay)

1722

/ 1000)))

1767

client.changedstate.wait(

1768

float(timedelta_to_milliseconds(delay)

1769

/ 1000))

1723

1770

client.changedstate.release()

1724

1771

time2 = datetime.datetime.now()

1725

1772

if (time2 - time) >= delay:

1741

1788

try:

1742

1789

sent = session.send(client.secret[sent_size:])

1743

1790

except gnutls.errors.GNUTLSError as error:

1744

logger.warning("gnutls send failed")

1791

logger.warning("gnutls send failed",

1792

exc_info=error)

1745

1793

return

1746

1794

logger.debug("Sent: %d, remaining: %d",

1747

1795

sent, len(client.secret)

1761

1809

try:

1762

1810

session.bye()

1763

1811

except gnutls.errors.GNUTLSError as error:

1764

logger.warning("GnuTLS bye failed")

1812

logger.warning("GnuTLS bye failed",

1813

exc_info=error)

1765

1814

1766

1815

@staticmethod

1767

1816

def peer_certificate(session):

1839

1888

def process_request(self, request, address):

1840

1889

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

1841

1890

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

1842

args = (request,

1843

address))

1891

args = (request, address))

1844

1892

proc.start()

1845

1893

return proc

1846

1894

1874

1922

use_ipv6: Boolean; to use IPv6 or not

1875

1923

"""

1876

1924

def __init__(self, server_address, RequestHandlerClass,

1877

interface=None, use_ipv6=True):

1925

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

1926

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

1927

creating a new one with socket.socket().

1928

"""

1878

1929

self.interface = interface

1879

1930

if use_ipv6:

1880

1931

self.address_family = socket.AF_INET6

1932

if socketfd is not None:

1933

# Save the file descriptor

1934

self.socketfd = socketfd

1935

# Save the original socket.socket() function

1936

self.socket_socket = socket.socket

1937

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

1938

#

1939

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

1940

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

1941

# patching socket.socket.)

1942

#

1943

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

1944

@functools.wraps(socket.socket)

1945

def socket_wrapper(*args, **kwargs):

1946

# Restore original function so subsequent calls are

1947

# not affected.

1948

socket.socket = self.socket_socket

1949

del self.socket_socket

1950

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

1951

# saved file descriptor.

1952

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

1953

# Replace socket.socket() function with wrapper

1954

socket.socket = socket_wrapper

1955

# The socketserver.TCPServer.__init__ will call

1956

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

1957

# socket_wrapper(), if socketfd was set.

1881

1958

socketserver.TCPServer.__init__(self, server_address,

1882

1959

RequestHandlerClass)

1960

1883

1961

def server_bind(self):

1884

1962

"""This overrides the normal server_bind() function

1885

1963

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

1893

1971

try:

1894

1972

self.socket.setsockopt(socket.SOL_SOCKET,

1895

1973

SO_BINDTODEVICE,

1896

str(self.interface

1897

+ '\0'))

1974

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

1898

1975

except socket.error as error:

1899

if error[0] == errno.EPERM:

1900

logger.error("No permission to"

1901

" bind to interface %s",

1902

self.interface)

1903

elif error[0] == errno.ENOPROTOOPT:

1976

if error.errno == errno.EPERM:

1977

logger.error("No permission to bind to"

1978

" interface %s", self.interface)

1979

elif error.errno == errno.ENOPROTOOPT:

1904

1980

logger.error("SO_BINDTODEVICE not available;"

1905

1981

" cannot bind to interface %s",

1906

1982

self.interface)

1983

elif error.errno == errno.ENODEV:

1984

logger.error("Interface %s does not exist,"

1985

" cannot bind", self.interface)

1907

1986

else:

1908

1987

raise

1909

1988

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

1912

1991

if self.address_family == socket.AF_INET6:

1913

1992

any_address = "::" # in6addr_any

1914

1993

else:

1915

any_address = socket.INADDR_ANY

1994

any_address = "0.0.0.0" # INADDR_ANY

1916

1995

self.server_address = (any_address,

1917

1996

self.server_address[1])

1918

1997

elif not self.server_address[1]:

1939

2018

"""

1940

2019

def __init__(self, server_address, RequestHandlerClass,

1941

2020

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

1942

gnutls_priority=None, use_dbus=True):

2021

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

1943

2022

self.enabled = False

1944

2023

self.clients = clients

1945

2024

if self.clients is None:

1949

2028

IPv6_TCPServer.__init__(self, server_address,

1950

2029

RequestHandlerClass,

1951

2030

interface = interface,

1952

use_ipv6 = use_ipv6)

2031

use_ipv6 = use_ipv6,

2032

socketfd = socketfd)

1953

2033

def server_activate(self):

1954

2034

if self.enabled:

1955

2035

return socketserver.TCPServer.server_activate(self)

1968

2048

1969

2049

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

1970

2050

proc = None, client_object=None):

1971

condition_names = {

1972

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

1973

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

1974

# blocking).

1975

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

1976

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

1977

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

1978

# broken, usually for pipes and

1979

# sockets).

1980

}

1981

conditions_string = ' | '.join(name

1982

for cond, name in

1983

condition_names.iteritems()

1984

if cond & condition)

1985

2051

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

1986

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

2052

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

1987

2053

# Wait for other process to exit

1988

2054

proc.join()

1989

2055

return False

2047

2113

return True

2048

2114

2049

2115

2116

def rfc3339_duration_to_delta(duration):

2117

"""Parse an RFC 3339 "duration" and return a datetime.timedelta

2118

2119

>>> rfc3339_duration_to_delta("P7D")

2120

datetime.timedelta(7)

2121

>>> rfc3339_duration_to_delta("PT60S")

2122

datetime.timedelta(0, 60)

2123

>>> rfc3339_duration_to_delta("PT60M")

2124

datetime.timedelta(0, 3600)

2125

>>> rfc3339_duration_to_delta("PT24H")

2126

datetime.timedelta(1)

2127

>>> rfc3339_duration_to_delta("P1W")

2128

datetime.timedelta(7)

2129

>>> rfc3339_duration_to_delta("PT5M30S")

2130

datetime.timedelta(0, 330)

2131

>>> rfc3339_duration_to_delta("P1DT3M20S")

2132

datetime.timedelta(1, 200)

2133

"""

2134

2135

# Parsing an RFC 3339 duration with regular expressions is not

2136

# possible - there would have to be multiple places for the same

2137

# values, like seconds. The current code, while more esoteric, is

2138

# cleaner without depending on a parsing library. If Python had a

2139

# built-in library for parsing we would use it, but we'd like to

2140

# avoid excessive use of external libraries.

2141

2142

# New type for defining tokens, syntax, and semantics all-in-one

2143

Token = collections.namedtuple("Token",

2144

("regexp", # To match token; if

2145

# "value" is not None,

2146

# must have a "group"

2147

# containing digits

2148

"value", # datetime.timedelta or

2149

# None

2150

"followers")) # Tokens valid after

2151

# this token

2152

# RFC 3339 "duration" tokens, syntax, and semantics; taken from

2153

# the "duration" ABNF definition in RFC 3339, Appendix A.

2154

token_end = Token(re.compile(r"$"), None, frozenset())

2155

token_second = Token(re.compile(r"(\d+)S"),

2156

datetime.timedelta(seconds=1),

2157

frozenset((token_end,)))

2158

token_minute = Token(re.compile(r"(\d+)M"),

2159

datetime.timedelta(minutes=1),

2160

frozenset((token_second, token_end)))

2161

token_hour = Token(re.compile(r"(\d+)H"),

2162

datetime.timedelta(hours=1),

2163

frozenset((token_minute, token_end)))

2164

token_time = Token(re.compile(r"T"),

2165

None,

2166

frozenset((token_hour, token_minute,

2167

token_second)))

2168

token_day = Token(re.compile(r"(\d+)D"),

2169

datetime.timedelta(days=1),

2170

frozenset((token_time, token_end)))

2171

token_month = Token(re.compile(r"(\d+)M"),

2172

datetime.timedelta(weeks=4),

2173

frozenset((token_day, token_end)))

2174

token_year = Token(re.compile(r"(\d+)Y"),

2175

datetime.timedelta(weeks=52),

2176

frozenset((token_month, token_end)))

2177

token_week = Token(re.compile(r"(\d+)W"),

2178

datetime.timedelta(weeks=1),

2179

frozenset((token_end,)))

2180

token_duration = Token(re.compile(r"P"), None,

2181

frozenset((token_year, token_month,

2182

token_day, token_time,

2183

token_week))),

2184

# Define starting values

2185

value = datetime.timedelta() # Value so far

2186

found_token = None

2187

followers = frozenset(token_duration,) # Following valid tokens

2188

s = duration # String left to parse

2189

# Loop until end token is found

2190

while found_token is not token_end:

2191

# Search for any currently valid tokens

2192

for token in followers:

2193

match = token.regexp.match(s)

2194

if match is not None:

2195

# Token found

2196

if token.value is not None:

2197

# Value found, parse digits

2198

factor = int(match.group(1), 10)

2199

# Add to value so far

2200

value += factor * token.value

2201

# Strip token from string

2202

s = token.regexp.sub("", s, 1)

2203

# Go to found token

2204

found_token = token

2205

# Set valid next tokens

2206

followers = found_token.followers

2207

break

2208

else:

2209

# No currently valid tokens were found

2210

raise ValueError("Invalid RFC 3339 duration")

2211

# End token found

2212

return value

2213

2214

2050

2215

def string_to_delta(interval):

2051

2216

"""Parse a string and return a datetime.timedelta

2052

2217

2063

2228

>>> string_to_delta('5m 30s')

2064

2229

datetime.timedelta(0, 330)

2065

2230

"""

2231

2232

try:

2233

return rfc3339_duration_to_delta(interval)

2234

except ValueError:

2235

pass

2236

2066

2237

timevalue = datetime.timedelta(0)

2067

2238

for s in interval.split():

2068

2239

try:

2131

2302

help="Run self-test")

2132

2303

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

2133

2304

help="Debug mode; run in foreground and log"

2134

" to terminal")

2305

" to terminal", default=None)

2135

2306

parser.add_argument("--debuglevel", metavar="LEVEL",

2136

2307

help="Debug level for stdout output")

2137

2308

parser.add_argument("--priority", help="GnuTLS"

2144

2315

" files")

2145

2316

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

2146

2317

dest="use_dbus", help="Do not provide D-Bus"

2147

" system bus interface")

2318

" system bus interface", default=None)

2148

2319

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

2149

dest="use_ipv6", help="Do not use IPv6")

2320

dest="use_ipv6", help="Do not use IPv6",

2321

default=None)

2150

2322

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

2151

2323

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

2152

" state")

2324

" state", default=None)

2325

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

2326

help="Specify a file descriptor to a network"

2327

" socket to use instead of creating one")

2153

2328

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

2154

2329

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

2330

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

2331

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

2155

2332

2156

2333

options = parser.parse_args()

2157

2334

2166

2343

"port": "",

2167

2344

"debug": "False",

2168

2345

"priority":

2169

"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",

2346

"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",

2170

2347

"servicename": "Mandos",

2171

2348

"use_dbus": "True",

2172

2349

"use_ipv6": "True",

2173

2350

"debuglevel": "",

2174

2351

"restore": "True",

2175

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

2352

"socket": "",

2353

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

2354

"foreground": "False",

2176

2355

}

2177

2356

2178

2357

# Parse config file for server-global settings

2183

2362

# Convert the SafeConfigParser object to a dict

2184

2363

server_settings = server_config.defaults()

2185

2364

# Use the appropriate methods on the non-string config options

2186

for option in ("debug", "use_dbus", "use_ipv6"):

2365

for option in ("debug", "use_dbus", "use_ipv6", "foreground"):

2187

2366

server_settings[option] = server_config.getboolean("DEFAULT",

2188

2367

option)

2189

2368

if server_settings["port"]:

2190

2369

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

2191

2370

"port")

2371

if server_settings["socket"]:

2372

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

2373

"socket")

2374

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

2375

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

2376

# happen with a supplied network socket.

2377

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

2378

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

2379

["socket"])

2192

2380

del server_config

2193

2381

2194

2382

# Override the settings from the config file with command line

2196

2384

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

2197

2385

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

2198

2386

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

2199

"statedir"):

2387

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

2200

2388

value = getattr(options, option)

2201

2389

if value is not None:

2202

2390

server_settings[option] = value

2205

2393

for option in server_settings.keys():

2206

2394

if type(server_settings[option]) is str:

2207

2395

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

2396

# Force all boolean options to be boolean

2397

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

2398

"foreground"):

2399

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

2400

# Debug implies foreground

2401

if server_settings["debug"]:

2402

server_settings["foreground"] = True

2208

2403

# Now we have our good server settings in "server_settings"

2209

2404

2210

2405

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

2216

2411

use_ipv6 = server_settings["use_ipv6"]

2217

2412

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

2218

2413

stored_state_file)

2414

foreground = server_settings["foreground"]

2219

2415

2220

2416

if debug:

2221

2417

initlogger(debug, logging.DEBUG)

2250

2446

use_ipv6=use_ipv6,

2251

2447

gnutls_priority=

2252

2448

server_settings["priority"],

2253

use_dbus=use_dbus)

2254

if not debug:

2255

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

2449

use_dbus=use_dbus,

2450

socketfd=(server_settings["socket"]

2451

or None))

2452

if not foreground:

2453

pidfilename = "/run/mandos.pid"

2454

pidfile = None

2256

2455

try:

2257

2456

pidfile = open(pidfilename, "w")

2258

except IOError:

2259

logger.error("Could not open file %r", pidfilename)

2457

except IOError as e:

2458

logger.error("Could not open file %r", pidfilename,

2459

exc_info=e)

2260

2460

2261

2461

for name in ("_mandos", "mandos", "nobody"):

2262

2462

try:

2272

2472

os.setgid(gid)

2273

2473

os.setuid(uid)

2274

2474

except OSError as error:

2275

if error[0] != errno.EPERM:

2475

if error.errno != errno.EPERM:

2276

2476

raise error

2277

2477

2278

2478

if debug:

2296

2496

os.close(null)

2297

2497

2298

2498

# Need to fork before connecting to D-Bus

2299

if not debug:

2499

if not foreground:

2300

2500

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

2301

2501

daemon()

2302

2502

2503

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

2504

# need to inform gobject that threads will be used.

2303

2505

gobject.threads_init()

2304

2506

2305

2507

global main_loop

2316

2518

("se.bsnet.fukt.Mandos", bus,

2317

2519

do_not_queue=True))

2318

2520

except dbus.exceptions.NameExistsException as e:

2319

logger.error(unicode(e) + ", disabling D-Bus")

2521

logger.error("Disabling D-Bus:", exc_info=e)

2320

2522

use_dbus = False

2321

2523

server_settings["use_dbus"] = False

2322

2524

tcp_server.use_dbus = False

2334

2536

2335

2537

client_class = Client

2336

2538

if use_dbus:

2337

client_class = functools.partial(ClientDBusTransitional,

2338

bus = bus)

2539

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

2339

2540

2340

2541

client_settings = Client.config_parser(client_config)

2341

2542

old_client_settings = {}

2342

2543

clients_data = {}

2343

2544

2545

# This is used to redirect stdout and stderr for checker processes

2546

global wnull

2547

wnull = open(os.devnull, "w") # A writable /dev/null

2548

# Only used if server is running in foreground but not in debug

2549

# mode

2550

if debug or not foreground:

2551

wnull.close()

2552

2344

2553

# Get client data and settings from last running state.

2345

2554

if server_settings["restore"]:

2346

2555

try:

2349

2558

(stored_state))

2350

2559

os.remove(stored_state_path)

2351

2560

except IOError as e:

2352

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

2353

.format(e))

2354

if e.errno != errno.ENOENT:

2561

if e.errno == errno.ENOENT:

2562

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

2563

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

2564

else:

2565

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

2566

exc_info=e)

2355

2567

raise

2356

2568

except EOFError as e:

2357

2569

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

2358

"EOFError: {0}".format(e))

2570

"EOFError:", exc_info=e)

2359

2571

2360

2572

with PGPEngine() as pgp:

2361

2573

for client_name, client in clients_data.iteritems():

2574

# Skip removed clients

2575

if client_name not in client_settings:

2576

continue

2577

2362

2578

# Decide which value to use after restoring saved state.

2363

2579

# We have three different values: Old config file,

2364

2580

# new config file, and saved state.

2414

2630

.format(client_name))

2415

2631

client["secret"] = (

2416

2632

client_settings[client_name]["secret"])

2417

2418

2633

2419

2634

# Add/remove clients based on new changes made to config

2420

2635

for client_name in (set(old_client_settings)

2423

2638

for client_name in (set(client_settings)

2424

2639

- set(old_client_settings)):

2425

2640

clients_data[client_name] = client_settings[client_name]

2426

2641

2427

2642

# Create all client objects

2428

2643

for client_name, client in clients_data.iteritems():

2429

2644

tcp_server.clients[client_name] = client_class(

2430

name = client_name, settings = client)

2645

name = client_name, settings = client,

2646

server_settings = server_settings)

2431

2647

2432

2648

if not tcp_server.clients:

2433

2649

logger.warning("No clients defined")

2434

2435

if not debug:

2436

try:

2437

with pidfile:

2438

pid = os.getpid()

2439

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

2440

del pidfile

2441

except IOError:

2442

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

2443

pidfilename, pid)

2444

except NameError:

2445

# "pidfile" was never created

2446

pass

2650

2651

if not foreground:

2652

if pidfile is not None:

2653

try:

2654

with pidfile:

2655

pid = os.getpid()

2656

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

2657

except IOError:

2658

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

2659

pidfilename, pid)

2660

del pidfile

2447

2661

del pidfilename

2448

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

2449

2662

2450

2663

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

2451

2664

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

2452

2665

2453

2666

if use_dbus:

2667

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

2668

"se.bsnet.fukt.Mandos"})

2454

2669

class MandosDBusService(DBusObjectWithProperties):

2455

2670

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

2456

2671

def __init__(self):

2510

2725

2511

2726

del _interface

2512

2727

2513

class MandosDBusServiceTransitional(MandosDBusService):

2514

__metaclass__ = AlternateDBusNamesMetaclass

2515

mandos_dbus_service = MandosDBusServiceTransitional()

2728

mandos_dbus_service = MandosDBusService()

2516

2729

2517

2730

def cleanup():

2518

2731

"Cleanup function; run on exit"

2519

2732

service.cleanup()

2520

2733

2521

2734

multiprocessing.active_children()

2735

wnull.close()

2522

2736

if not (tcp_server.clients or client_settings):

2523

2737

return

2524

2738

2536

2750

# A list of attributes that can not be pickled

2537

2751

# + secret.

2538

2752

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

2539

"checker"))

2753

"checker", "server_settings"))

2540

2754

for name, typ in (inspect.getmembers

2541

2755

(dbus.service.Object)):

2542

2756

exclude.add(name)

2551

2765

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

2552

2766

2553

2767

try:

2554

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

2555

prefix="clients-",

2556

dir=os.path.dirname

2557

(stored_state_path))

2558

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

2768

with (tempfile.NamedTemporaryFile

2769

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

2770

dir=os.path.dirname(stored_state_path),

2771

delete=False)) as stored_state:

2559

2772

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

2773

tempname=stored_state.name

2560

2774

os.rename(tempname, stored_state_path)

2561

2775

except (IOError, OSError) as e:

2562

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

2563

.format(e))

2564

2776

if not debug:

2565

2777

try:

2566

2778

os.remove(tempname)

2567

2779

except NameError:

2568

2780

pass

2569

if e.errno not in set((errno.ENOENT, errno.EACCES,

2570

errno.EEXIST)):

2781

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

2782

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

2783

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

2784

else:

2785

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

2786

exc_info=e)

2571

2787

raise e

2572

2788

2573

2789

# Delete all clients, and settings from config