/mandos/trunk : revision 237.4.55

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

36

37

from future_builtins import *

38

39

try:

40

import SocketServer as socketserver

41

except ImportError:

42

import socketserver

39

import SocketServer as socketserver

43

40

import socket

44

41

import argparse

45

42

import datetime

50

47

import gnutls.library.functions

51

48

import gnutls.library.constants

52

49

import gnutls.library.types

53

try:

54

import ConfigParser as configparser

55

except ImportError:

56

import configparser

50

import ConfigParser as configparser

57

51

import sys

58

52

import re

59

53

import os

68

62

import struct

69

63

import fcntl

70

64

import functools

71

try:

72

import cPickle as pickle

73

except ImportError:

74

import pickle

65

import cPickle as pickle

75

66

import multiprocessing

76

67

import types

77

68

import binascii

78

69

import tempfile

79

70

import itertools

80

71

import collections

81

import codecs

82

72

83

73

import dbus

84

74

import dbus.service

85

try:

86

import gobject

87

except ImportError:

88

from gi.repository import GObject as gobject

75

import gobject

89

76

import avahi

90

77

from dbus.mainloop.glib import DBusGMainLoop

91

78

import ctypes

111

98

syslogger = None

112

99

113

100

try:

114

if_nametoindex = ctypes.cdll.LoadLibrary(

115

ctypes.util.find_library("c")).if_nametoindex

101

if_nametoindex = (ctypes.cdll.LoadLibrary

102

(ctypes.util.find_library("c"))

103

.if_nametoindex)

116

104

except (OSError, AttributeError):

117

118

105

def if_nametoindex(interface):

119

106

"Get an interface index the hard way, i.e. using fcntl()"

120

107

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

129

116

"""init logger and add loglevel"""

130

117

131

118

global syslogger

132

syslogger = (logging.handlers.SysLogHandler(

133

facility = logging.handlers.SysLogHandler.LOG_DAEMON,

134

address = "/dev/log"))

119

syslogger = (logging.handlers.SysLogHandler

120

(facility =

121

logging.handlers.SysLogHandler.LOG_DAEMON,

122

address = "/dev/log"))

135

123

syslogger.setFormatter(logging.Formatter

136

124

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

137

125

' %(message)s'))

154

142

155

143

class PGPEngine(object):

156

144

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

157

158

145

def __init__(self):

159

146

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

160

147

self.gnupgargs = ['--batch',

199

186

200

187

def encrypt(self, data, password):

201

188

passphrase = self.password_encode(password)

202

with tempfile.NamedTemporaryFile(

203

dir=self.tempdir) as passfile:

189

with tempfile.NamedTemporaryFile(dir=self.tempdir

190

) as passfile:

204

191

passfile.write(passphrase)

205

192

passfile.flush()

206

193

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

217

204

218

205

def decrypt(self, data, password):

219

206

passphrase = self.password_encode(password)

220

with tempfile.NamedTemporaryFile(

221

dir = self.tempdir) as passfile:

207

with tempfile.NamedTemporaryFile(dir = self.tempdir

208

) as passfile:

222

209

passfile.write(passphrase)

223

210

passfile.flush()

224

211

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

228

215

stdin = subprocess.PIPE,

229

216

stdout = subprocess.PIPE,

230

217

stderr = subprocess.PIPE)

231

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

218

decrypted_plaintext, err = proc.communicate(input

219

= data)

232

220

if proc.returncode != 0:

233

221

raise PGPError(err)

234

222

return decrypted_plaintext

240

228

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

241

229

**kwargs)

242

230

243

244

231

class AvahiServiceError(AvahiError):

245

232

pass

246

233

247

248

234

class AvahiGroupError(AvahiError):

249

235

pass

250

236

270

256

bus: dbus.SystemBus()

271

257

"""

272

258

273

def __init__(self,

274

interface = avahi.IF_UNSPEC,

275

name = None,

276

servicetype = None,

277

port = None,

278

TXT = None,

279

domain = "",

280

host = "",

281

max_renames = 32768,

282

protocol = avahi.PROTO_UNSPEC,

283

bus = None):

259

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

260

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

261

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

262

protocol = avahi.PROTO_UNSPEC, bus = None):

284

263

self.interface = interface

285

264

self.name = name

286

265

self.type = servicetype

296

275

self.bus = bus

297

276

self.entry_group_state_changed_match = None

298

277

299

def rename(self, remove=True):

278

def rename(self):

300

279

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

301

280

if self.rename_count >= self.max_renames:

302

281

logger.critical("No suitable Zeroconf service name found"

303

282

" after %i retries, exiting.",

304

283

self.rename_count)

305

284

raise AvahiServiceError("Too many renames")

306

self.name = str(

307

self.server.GetAlternativeServiceName(self.name))

308

self.rename_count += 1

285

self.name = str(self.server

286

.GetAlternativeServiceName(self.name))

309

287

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

310

288

self.name)

311

if remove:

312

self.remove()

289

self.remove()

313

290

try:

314

291

self.add()

315

292

except dbus.exceptions.DBusException as error:

316

if (error.get_dbus_name()

317

== "org.freedesktop.Avahi.CollisionError"):

318

logger.info("Local Zeroconf service name collision.")

319

return self.rename(remove=False)

320

else:

321

logger.critical("D-Bus Exception", exc_info=error)

322

self.cleanup()

323

os._exit(1)

293

logger.critical("D-Bus Exception", exc_info=error)

294

self.cleanup()

295

os._exit(1)

296

self.rename_count += 1

324

297

325

298

def remove(self):

326

299

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

365

338

elif state == avahi.ENTRY_GROUP_FAILURE:

366

339

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

367

340

str(error))

368

raise AvahiGroupError("State changed: {!s}".format(error))

341

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

342

.format(error))

369

343

370

344

def cleanup(self):

371

345

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

381

355

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

382

356

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

383

357

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

384

bad_states = {

385

avahi.SERVER_INVALID: "Zeroconf server invalid",

386

avahi.SERVER_REGISTERING: None,

387

avahi.SERVER_COLLISION: "Zeroconf server name collision",

388

avahi.SERVER_FAILURE: "Zeroconf server failure",

389

}

358

bad_states = { avahi.SERVER_INVALID:

359

"Zeroconf server invalid",

360

avahi.SERVER_REGISTERING: None,

361

avahi.SERVER_COLLISION:

362

"Zeroconf server name collision",

363

avahi.SERVER_FAILURE:

364

"Zeroconf server failure" }

390

365

if state in bad_states:

391

366

if bad_states[state] is not None:

392

367

if error is None:

395

370

logger.error(bad_states[state] + ": %r", error)

396

371

self.cleanup()

397

372

elif state == avahi.SERVER_RUNNING:

398

try:

399

self.add()

400

except dbus.exceptions.DBusException as error:

401

if (error.get_dbus_name()

402

== "org.freedesktop.Avahi.CollisionError"):

403

logger.info("Local Zeroconf service name"

404

" collision.")

405

return self.rename(remove=False)

406

else:

407

logger.critical("D-Bus Exception", exc_info=error)

408

self.cleanup()

409

os._exit(1)

373

self.add()

410

374

else:

411

375

if error is None:

412

376

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

422

386

follow_name_owner_changes=True),

423

387

avahi.DBUS_INTERFACE_SERVER)

424

388

self.server.connect_to_signal("StateChanged",

425

self.server_state_changed)

389

self.server_state_changed)

426

390

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

427

391

428

392

429

393

class AvahiServiceToSyslog(AvahiService):

430

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

394

def rename(self):

431

395

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

432

ret = AvahiService.rename(self, *args, **kwargs)

433

syslogger.setFormatter(logging.Formatter(

434

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

435

.format(self.name)))

396

ret = AvahiService.rename(self)

397

syslogger.setFormatter(logging.Formatter

398

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

399

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

400

.format(self.name)))

436

401

return ret

437

402

438

def call_pipe(connection, # : multiprocessing.Connection

439

func, *args, **kwargs):

440

"""This function is meant to be called by multiprocessing.Process

441

442

This function runs func(*args, **kwargs), and writes the resulting

443

return value on the provided multiprocessing.Connection.

444

"""

445

connection.send(func(*args, **kwargs))

446

connection.close()

447

403

448

404

class Client(object):

449

405

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

476

432

last_checker_status: integer between 0 and 255 reflecting exit

477

433

status of last checker. -1 reflects crashed

478

434

checker, -2 means no checker completed yet.

479

last_checker_signal: The signal which killed the last checker, if

480

last_checker_status is -1

481

435

last_enabled: datetime.datetime(); (UTC) or None

482

436

name: string; from the config file, used in log messages and

483

437

D-Bus identifiers

496

450

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

497

451

"last_approval_request", "last_checked_ok",

498

452

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

499

client_defaults = {

500

"timeout": "PT5M",

501

"extended_timeout": "PT15M",

502

"interval": "PT2M",

503

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

504

"host": "",

505

"approval_delay": "PT0S",

506

"approval_duration": "PT1S",

507

"approved_by_default": "True",

508

"enabled": "True",

509

}

453

client_defaults = { "timeout": "PT5M",

454

"extended_timeout": "PT15M",

455

"interval": "PT2M",

456

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

457

"host": "",

458

"approval_delay": "PT0S",

459

"approval_duration": "PT1S",

460

"approved_by_default": "True",

461

"enabled": "True",

462

}

510

463

511

464

@staticmethod

512

465

def config_parser(config):

528

481

client["enabled"] = config.getboolean(client_name,

529

482

"enabled")

530

483

531

# Uppercase and remove spaces from fingerprint for later

532

# comparison purposes with return value from the

533

# fingerprint() function

534

484

client["fingerprint"] = (section["fingerprint"].upper()

535

485

.replace(" ", ""))

536

486

if "secret" in section:

578

528

self.expires = None

579

529

580

530

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

531

# Uppercase and remove spaces from fingerprint for later

532

# comparison purposes with return value from the fingerprint()

533

# function

581

534

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

582

535

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

583

536

datetime.datetime.utcnow())

590

543

self.current_checker_command = None

591

544

self.approved = None

592

545

self.approvals_pending = 0

593

self.changedstate = multiprocessing_manager.Condition(

594

multiprocessing_manager.Lock())

595

self.client_structure = [attr

596

for attr in self.__dict__.iterkeys()

546

self.changedstate = (multiprocessing_manager

547

.Condition(multiprocessing_manager

548

.Lock()))

549

self.client_structure = [attr for attr in

550

self.__dict__.iterkeys()

597

551

if not attr.startswith("_")]

598

552

self.client_structure.append("client_structure")

599

553

600

for name, t in inspect.getmembers(

601

type(self), lambda obj: isinstance(obj, property)):

554

for name, t in inspect.getmembers(type(self),

555

lambda obj:

556

isinstance(obj,

557

property)):

602

558

if not name.startswith("_"):

603

559

self.client_structure.append(name)

604

560

646

602

# and every interval from then on.

647

603

if self.checker_initiator_tag is not None:

648

604

gobject.source_remove(self.checker_initiator_tag)

649

self.checker_initiator_tag = gobject.timeout_add(

650

int(self.interval.total_seconds() * 1000),

651

self.start_checker)

605

self.checker_initiator_tag = (gobject.timeout_add

606

(int(self.interval

607

.total_seconds() * 1000),

608

self.start_checker))

652

609

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

653

610

if self.disable_initiator_tag is not None:

654

611

gobject.source_remove(self.disable_initiator_tag)

655

self.disable_initiator_tag = gobject.timeout_add(

656

int(self.timeout.total_seconds() * 1000), self.disable)

612

self.disable_initiator_tag = (gobject.timeout_add

613

(int(self.timeout

614

.total_seconds() * 1000),

615

self.disable))

657

616

# Also start a new checker *right now*.

658

617

self.start_checker()

659

618

660

def checker_callback(self, source, condition, connection,

661

command):

619

def checker_callback(self, pid, condition, command):

662

620

"""The checker has completed, so take appropriate actions."""

663

621

self.checker_callback_tag = None

664

622

self.checker = None

665

# Read return code from connection (see call_pipe)

666

returncode = connection.recv()

667

connection.close()

668

669

if returncode >= 0:

670

self.last_checker_status = returncode

671

self.last_checker_signal = None

623

if os.WIFEXITED(condition):

624

self.last_checker_status = os.WEXITSTATUS(condition)

672

625

if self.last_checker_status == 0:

673

626

logger.info("Checker for %(name)s succeeded",

674

627

vars(self))

675

628

self.checked_ok()

676

629

else:

677

logger.info("Checker for %(name)s failed", vars(self))

630

logger.info("Checker for %(name)s failed",

631

vars(self))

678

632

else:

679

633

self.last_checker_status = -1

680

self.last_checker_signal = -returncode

681

634

logger.warning("Checker for %(name)s crashed?",

682

635

vars(self))

683

return False

684

636

685

637

def checked_ok(self):

686

638

"""Assert that the client has been seen, alive and well."""

687

639

self.last_checked_ok = datetime.datetime.utcnow()

688

640

self.last_checker_status = 0

689

self.last_checker_signal = None

690

641

self.bump_timeout()

691

642

692

643

def bump_timeout(self, timeout=None):

697

648

gobject.source_remove(self.disable_initiator_tag)

698

649

self.disable_initiator_tag = None

699

650

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

700

self.disable_initiator_tag = gobject.timeout_add(

701

int(timeout.total_seconds() * 1000), self.disable)

651

self.disable_initiator_tag = (gobject.timeout_add

652

(int(timeout.total_seconds()

653

* 1000), self.disable))

702

654

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

703

655

704

656

def need_approval(self):

718

670

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

719

671

# should be.

720

672

721

if self.checker is not None and not self.checker.is_alive():

722

logger.warning("Checker was not alive; joining")

723

self.checker.join()

724

self.checker = None

673

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

674

try:

675

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

676

except AttributeError:

677

pass

678

except OSError as error:

679

if error.errno != errno.ECHILD:

680

raise

681

else:

682

if pid:

683

logger.warning("Checker was a zombie")

684

gobject.source_remove(self.checker_callback_tag)

685

self.checker_callback(pid, status,

686

self.current_checker_command)

725

687

# Start a new checker if needed

726

688

if self.checker is None:

727

689

# Escape attributes for the shell

728

escaped_attrs = {

729

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

730

for attr in self.runtime_expansions }

690

escaped_attrs = { attr:

691

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

692

for attr in self.runtime_expansions }

731

693

try:

732

694

command = self.checker_command % escaped_attrs

733

695

except TypeError as error:

734

696

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

735

self.checker_command,

697

self.checker_command, exc_info=error)

698

return True # Try again later

699

self.current_checker_command = command

700

try:

701

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

702

command, self.name)

703

# We don't need to redirect stdout and stderr, since

704

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

705

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

706

# always replaced by /dev/null.)

707

# The exception is when not debugging but nevertheless

708

# running in the foreground; use the previously

709

# created wnull.

710

popen_args = {}

711

if (not self.server_settings["debug"]

712

and self.server_settings["foreground"]):

713

popen_args.update({"stdout": wnull,

714

"stderr": wnull })

715

self.checker = subprocess.Popen(command,

716

close_fds=True,

717

shell=True, cwd="/",

718

**popen_args)

719

except OSError as error:

720

logger.error("Failed to start subprocess",

736

721

exc_info=error)

737

return True # Try again later

738

self.current_checker_command = command

739

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

740

self.name)

741

# We don't need to redirect stdout and stderr, since

742

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

743

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

744

# always replaced by /dev/null.)

745

# The exception is when not debugging but nevertheless

746

# running in the foreground; use the previously

747

# created wnull.

748

popen_args = { "close_fds": True,

749

"shell": True,

750

"cwd": "/" }

751

if (not self.server_settings["debug"]

752

and self.server_settings["foreground"]):

753

popen_args.update({"stdout": wnull,

754

"stderr": wnull })

755

pipe = multiprocessing.Pipe(duplex = False)

756

self.checker = multiprocessing.Process(

757

target = call_pipe,

758

args = (pipe[1], subprocess.call, command),

759

kwargs = popen_args)

760

self.checker.start()

761

self.checker_callback_tag = gobject.io_add_watch(

762

pipe[0].fileno(), gobject.IO_IN,

763

self.checker_callback, pipe[0], command)

722

return True

723

self.checker_callback_tag = (gobject.child_watch_add

724

(self.checker.pid,

725

self.checker_callback,

726

data=command))

727

# The checker may have completed before the gobject

728

# watch was added. Check for this.

729

try:

730

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

731

except OSError as error:

732

if error.errno == errno.ECHILD:

733

# This should never happen

734

logger.error("Child process vanished",

735

exc_info=error)

736

return True

737

raise

738

if pid:

739

gobject.source_remove(self.checker_callback_tag)

740

self.checker_callback(pid, status, command)

764

741

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

765

742

return True

766

743

772

749

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

773

750

return

774

751

logger.debug("Stopping checker for %(name)s", vars(self))

775

self.checker.terminate()

752

try:

753

self.checker.terminate()

754

#time.sleep(0.5)

755

#if self.checker.poll() is None:

756

# self.checker.kill()

757

except OSError as error:

758

if error.errno != errno.ESRCH: # No such process

759

raise

776

760

self.checker = None

777

761

778

762

779

def dbus_service_property(dbus_interface,

780

signature="v",

781

access="readwrite",

782

byte_arrays=False):

763

def dbus_service_property(dbus_interface, signature="v",

764

access="readwrite", byte_arrays=False):

783

765

"""Decorators for marking methods of a DBusObjectWithProperties to

784

766

become properties on the D-Bus.

785

767

795

777

if byte_arrays and signature != "ay":

796

778

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

797

779

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

798

799

780

def decorator(func):

800

781

func._dbus_is_property = True

801

782

func._dbus_interface = dbus_interface

806

787

func._dbus_name = func._dbus_name[:-14]

807

788

func._dbus_get_args_options = {'byte_arrays': byte_arrays }

808

789

return func

809

810

790

return decorator

811

791

812

792

821

801

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

822

802

"false"}

823

803

"""

824

825

804

def decorator(func):

826

805

func._dbus_is_interface = True

827

806

func._dbus_interface = dbus_interface

828

807

func._dbus_name = dbus_interface

829

808

return func

830

831

809

return decorator

832

810

833

811

843

821

def Property_dbus_property(self):

844

822

return dbus.Boolean(False)

845

823

"""

846

847

824

def decorator(func):

848

825

func._dbus_annotations = annotations

849

826

return func

850

851

827

return decorator

852

828

853

829

856

832

"""

857

833

pass

858

834

859

860

835

class DBusPropertyAccessException(DBusPropertyException):

861

836

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

862

837

"""

890

865

def _get_all_dbus_things(self, thing):

891

866

"""Returns a generator of (name, attribute) pairs

892

867

"""

893

return ((getattr(athing.__get__(self), "_dbus_name", name),

868

return ((getattr(athing.__get__(self), "_dbus_name",

869

name),

894

870

athing.__get__(self))

895

871

for cls in self.__class__.__mro__

896

872

for name, athing in

897

inspect.getmembers(cls, self._is_dbus_thing(thing)))

873

inspect.getmembers(cls,

874

self._is_dbus_thing(thing)))

898

875

899

876

def _get_dbus_property(self, interface_name, property_name):

900

877

"""Returns a bound method if one exists which is a D-Bus

901

878

property with the specified name and interface.

902

879

"""

903

for cls in self.__class__.__mro__:

904

for name, value in inspect.getmembers(

905

cls, self._is_dbus_thing("property")):

880

for cls in self.__class__.__mro__:

881

for name, value in (inspect.getmembers

882

(cls,

883

self._is_dbus_thing("property"))):

906

884

if (value._dbus_name == property_name

907

885

and value._dbus_interface == interface_name):

908

886

return value.__get__(self)

909

887

910

888

# No such property

911

raise DBusPropertyNotFound("{}:{}.{}".format(

912

self.dbus_object_path, interface_name, property_name))

889

raise DBusPropertyNotFound(self.dbus_object_path + ":"

890

+ interface_name + "."

891

+ property_name)

913

892

914

@dbus.service.method(dbus.PROPERTIES_IFACE,

915

in_signature="ss",

893

@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",

916

894

out_signature="v")

917

895

def Get(self, interface_name, property_name):

918

896

"""Standard D-Bus property Get() method, see D-Bus standard.

943

921

for byte in value))

944

922

prop(value)

945

923

946

@dbus.service.method(dbus.PROPERTIES_IFACE,

947

in_signature="s",

924

@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",

948

925

out_signature="a{sv}")

949

926

def GetAll(self, interface_name):

950

927

"""Standard D-Bus property GetAll() method, see D-Bus

965

942

if not hasattr(value, "variant_level"):

966

943

properties[name] = value

967

944

continue

968

properties[name] = type(value)(

969

value, variant_level = value.variant_level + 1)

945

properties[name] = type(value)(value, variant_level=

946

value.variant_level+1)

970

947

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

971

948

972

949

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

990

967

connection)

991

968

try:

992

969

document = xml.dom.minidom.parseString(xmlstring)

993

994

970

def make_tag(document, name, prop):

995

971

e = document.createElement("property")

996

972

e.setAttribute("name", name)

997

973

e.setAttribute("type", prop._dbus_signature)

998

974

e.setAttribute("access", prop._dbus_access)

999

975

return e

1000

1001

976

for if_tag in document.getElementsByTagName("interface"):

1002

977

# Add property tags

1003

978

for tag in (make_tag(document, name, prop)

1015

990

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

1016

991

and prop._dbus_interface

1017

992

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

1018

annots.update(getattr(

1019

prop, "_dbus_annotations", {}))

993

annots.update(getattr

994

(prop,

995

"_dbus_annotations",

996

{}))

1020

997

for name, value in annots.items():

1021

998

ann_tag = document.createElement(

1022

999

"annotation")

1027

1004

for annotation, value in dict(

1028

1005

itertools.chain.from_iterable(

1029

1006

annotations().items()

1030

for name, annotations

1031

in self._get_all_dbus_things("interface")

1007

for name, annotations in

1008

self._get_all_dbus_things("interface")

1032

1009

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

1033

1010

)).items():

1034

1011

ann_tag = document.createElement("annotation")

1063

1040

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

1064

1041

if dt is None:

1065

1042

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

1066

return dbus.String(dt.isoformat(), variant_level=variant_level)

1043

return dbus.String(dt.isoformat(),

1044

variant_level=variant_level)

1067

1045

1068

1046

1069

1047

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1089

1067

(from DBusObjectWithProperties) and interfaces (from the

1090

1068

dbus_interface_annotations decorator).

1091

1069

"""

1092

1093

1070

def wrapper(cls):

1094

1071

for orig_interface_name, alt_interface_name in (

1095

alt_interface_names.items()):

1072

alt_interface_names.items()):

1096

1073

attr = {}

1097

1074

interface_names = set()

1098

1075

# Go though all attributes of the class

1100

1077

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

1101

1078

# with the wrong interface name

1102

1079

if (not hasattr(attribute, "_dbus_interface")

1103

or not attribute._dbus_interface.startswith(

1104

orig_interface_name)):

1080

or not attribute._dbus_interface

1081

.startswith(orig_interface_name)):

1105

1082

continue

1106

1083

# Create an alternate D-Bus interface name based on

1107

1084

# the current name

1108

alt_interface = attribute._dbus_interface.replace(

1109

orig_interface_name, alt_interface_name)

1085

alt_interface = (attribute._dbus_interface

1086

.replace(orig_interface_name,

1087

alt_interface_name))

1110

1088

interface_names.add(alt_interface)

1111

1089

# Is this a D-Bus signal?

1112

1090

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

1113

if sys.version_info.major == 2:

1114

# Extract the original non-method undecorated

1115

# function by black magic

1116

nonmethod_func = (dict(

1091

# Extract the original non-method undecorated

1092

# function by black magic

1093

nonmethod_func = (dict(

1117

1094

zip(attribute.func_code.co_freevars,

1118

attribute.__closure__))

1119

["func"].cell_contents)

1120

else:

1121

nonmethod_func = attribute

1095

attribute.__closure__))["func"]

1096

.cell_contents)

1122

1097

# Create a new, but exactly alike, function

1123

1098

# object, and decorate it to be a new D-Bus signal

1124

1099

# with the alternate D-Bus interface name

1125

if sys.version_info.major == 2:

1126

new_function = types.FunctionType(

1127

nonmethod_func.func_code,

1128

nonmethod_func.func_globals,

1129

nonmethod_func.func_name,

1130

nonmethod_func.func_defaults,

1131

nonmethod_func.func_closure)

1132

else:

1133

new_function = types.FunctionType(

1134

nonmethod_func.__code__,

1135

nonmethod_func.__globals__,

1136

nonmethod_func.__name__,

1137

nonmethod_func.__defaults__,

1138

nonmethod_func.__closure__)

1139

new_function = (dbus.service.signal(

1140

alt_interface,

1141

attribute._dbus_signature)(new_function))

1100

new_function = (dbus.service.signal

1101

(alt_interface,

1102

attribute._dbus_signature)

1103

(types.FunctionType(

1104

nonmethod_func.func_code,

1105

nonmethod_func.func_globals,

1106

nonmethod_func.func_name,

1107

nonmethod_func.func_defaults,

1108

nonmethod_func.func_closure)))

1142

1109

# Copy annotations, if any

1143

1110

try:

1144

new_function._dbus_annotations = dict(

1145

attribute._dbus_annotations)

1111

new_function._dbus_annotations = (

1112

dict(attribute._dbus_annotations))

1146

1113

except AttributeError:

1147

1114

pass

1148

1115

# Define a creator of a function to call both the

1153

1120

"""This function is a scope container to pass

1154

1121

func1 and func2 to the "call_both" function

1155

1122

outside of its arguments"""

1156

1157

1123

def call_both(*args, **kwargs):

1158

1124

"""This function will emit two D-Bus

1159

1125

signals by calling func1 and func2"""

1160

1126

func1(*args, **kwargs)

1161

1127

func2(*args, **kwargs)

1162

1163

1128

return call_both

1164

1129

# Create the "call_both" function and add it to

1165

1130

# the class

1170

1135

# object. Decorate it to be a new D-Bus method

1171

1136

# with the alternate D-Bus interface name. Add it

1172

1137

# to the class.

1173

attr[attrname] = (

1174

dbus.service.method(

1175

alt_interface,

1176

attribute._dbus_in_signature,

1177

attribute._dbus_out_signature)

1178

(types.FunctionType(attribute.func_code,

1179

attribute.func_globals,

1180

attribute.func_name,

1181

attribute.func_defaults,

1182

attribute.func_closure)))

1138

attr[attrname] = (dbus.service.method

1139

(alt_interface,

1140

attribute._dbus_in_signature,

1141

attribute._dbus_out_signature)

1142

(types.FunctionType

1143

(attribute.func_code,

1144

attribute.func_globals,

1145

attribute.func_name,

1146

attribute.func_defaults,

1147

attribute.func_closure)))

1183

1148

# Copy annotations, if any

1184

1149

try:

1185

attr[attrname]._dbus_annotations = dict(

1186

attribute._dbus_annotations)

1150

attr[attrname]._dbus_annotations = (

1151

dict(attribute._dbus_annotations))

1187

1152

except AttributeError:

1188

1153

pass

1189

1154

# Is this a D-Bus property?

1192

1157

# object, and decorate it to be a new D-Bus

1193

1158

# property with the alternate D-Bus interface

1194

1159

# name. Add it to the class.

1195

attr[attrname] = (dbus_service_property(

1196

alt_interface, attribute._dbus_signature,

1197

attribute._dbus_access,

1198

attribute._dbus_get_args_options

1199

["byte_arrays"])

1200

(types.FunctionType(

1201

attribute.func_code,

1202

attribute.func_globals,

1203

attribute.func_name,

1204

attribute.func_defaults,

1205

attribute.func_closure)))

1160

attr[attrname] = (dbus_service_property

1161

(alt_interface,

1162

attribute._dbus_signature,

1163

attribute._dbus_access,

1164

attribute

1165

._dbus_get_args_options

1166

["byte_arrays"])

1167

(types.FunctionType

1168

(attribute.func_code,

1169

attribute.func_globals,

1170

attribute.func_name,

1171

attribute.func_defaults,

1172

attribute.func_closure)))

1206

1173

# Copy annotations, if any

1207

1174

try:

1208

attr[attrname]._dbus_annotations = dict(

1209

attribute._dbus_annotations)

1175

attr[attrname]._dbus_annotations = (

1176

dict(attribute._dbus_annotations))

1210

1177

except AttributeError:

1211

1178

pass

1212

1179

# Is this a D-Bus interface?

1215

1182

# object. Decorate it to be a new D-Bus interface

1216

1183

# with the alternate D-Bus interface name. Add it

1217

1184

# to the class.

1218

attr[attrname] = (

1219

dbus_interface_annotations(alt_interface)

1220

(types.FunctionType(attribute.func_code,

1221

attribute.func_globals,

1222

attribute.func_name,

1223

attribute.func_defaults,

1224

attribute.func_closure)))

1185

attr[attrname] = (dbus_interface_annotations

1186

(alt_interface)

1187

(types.FunctionType

1188

(attribute.func_code,

1189

attribute.func_globals,

1190

attribute.func_name,

1191

attribute.func_defaults,

1192

attribute.func_closure)))

1225

1193

if deprecate:

1226

1194

# Deprecate all alternate interfaces

1227

1195

iname="_AlternateDBusNames_interface_annotation{}"

1228

1196

for interface_name in interface_names:

1229

1230

1197

@dbus_interface_annotations(interface_name)

1231

1198

def func(self):

1232

1199

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

1233

"true" }

1200

"true" }

1234

1201

# Find an unused name

1235

1202

for aname in (iname.format(i)

1236

1203

for i in itertools.count()):

1241

1208

# Replace the class with a new subclass of it with

1242

1209

# methods, signals, etc. as created above.

1243

1210

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

1244

(cls, ), attr)

1211

(cls,), attr)

1245

1212

return cls

1246

1247

1213

return wrapper

1248

1214

1249

1215

1250

1216

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

1251

"se.bsnet.fukt.Mandos"})

1217

"se.bsnet.fukt.Mandos"})

1252

1218

class ClientDBus(Client, DBusObjectWithProperties):

1253

1219

"""A Client class using D-Bus

1254

1220

1258

1224

"""

1259

1225

1260

1226

runtime_expansions = (Client.runtime_expansions

1261

+ ("dbus_object_path", ))

1227

+ ("dbus_object_path",))

1262

1228

1263

1229

_interface = "se.recompile.Mandos.Client"

1264

1230

1272

1238

client_object_name = str(self.name).translate(

1273

1239

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

1274

1240

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

1275

self.dbus_object_path = dbus.ObjectPath(

1276

"/clients/" + client_object_name)

1241

self.dbus_object_path = (dbus.ObjectPath

1242

("/clients/" + client_object_name))

1277

1243

DBusObjectWithProperties.__init__(self, self.bus,

1278

1244

self.dbus_object_path)

1279

1245

1280

def notifychangeproperty(transform_func, dbus_name,

1281

type_func=lambda x: x,

1282

variant_level=1,

1283

invalidate_only=False,

1246

def notifychangeproperty(transform_func,

1247

dbus_name, type_func=lambda x: x,

1248

variant_level=1, invalidate_only=False,

1284

1249

_interface=_interface):

1285

1250

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

1286

1251

its changes to DBus.

1293

1258

variant_level: D-Bus variant level. Default: 1

1294

1259

"""

1295

1260

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

1296

1297

1261

def setter(self, value):

1298

1262

if hasattr(self, "dbus_object_path"):

1299

1263

if (not hasattr(self, attrname) or

1300

1264

type_func(getattr(self, attrname, None))

1301

1265

!= type_func(value)):

1302

1266

if invalidate_only:

1303

self.PropertiesChanged(

1304

_interface, dbus.Dictionary(),

1305

dbus.Array((dbus_name, )))

1267

self.PropertiesChanged(_interface,

1268

dbus.Dictionary(),

1269

dbus.Array

1270

((dbus_name,)))

1306

1271

else:

1307

dbus_value = transform_func(

1308

type_func(value),

1309

variant_level = variant_level)

1272

dbus_value = transform_func(type_func(value),

1273

variant_level

1274

=variant_level)

1310

1275

self.PropertyChanged(dbus.String(dbus_name),

1311

1276

dbus_value)

1312

self.PropertiesChanged(

1313

_interface,

1314

dbus.Dictionary({ dbus.String(dbus_name):

1315

dbus_value }),

1316

dbus.Array())

1277

self.PropertiesChanged(_interface,

1278

dbus.Dictionary({

1279

dbus.String(dbus_name):

1280

dbus_value }), dbus.Array())

1317

1281

setattr(self, attrname, value)

1318

1282

1319

1283

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

1325

1289

enabled = notifychangeproperty(dbus.Boolean, "Enabled")

1326

1290

last_enabled = notifychangeproperty(datetime_to_dbus,

1327

1291

"LastEnabled")

1328

checker = notifychangeproperty(

1329

dbus.Boolean, "CheckerRunning",

1330

type_func = lambda checker: checker is not None)

1292

checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",

1293

type_func = lambda checker:

1294

checker is not None)

1331

1295

last_checked_ok = notifychangeproperty(datetime_to_dbus,

1332

1296

"LastCheckedOK")

1333

1297

last_checker_status = notifychangeproperty(dbus.Int16,

1336

1300

datetime_to_dbus, "LastApprovalRequest")

1337

1301

approved_by_default = notifychangeproperty(dbus.Boolean,

1338

1302

"ApprovedByDefault")

1339

approval_delay = notifychangeproperty(

1340

dbus.UInt64, "ApprovalDelay",

1341

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

1303

approval_delay = notifychangeproperty(dbus.UInt64,

1304

"ApprovalDelay",

1305

type_func =

1306

lambda td: td.total_seconds()

1307

* 1000)

1342

1308

approval_duration = notifychangeproperty(

1343

1309

dbus.UInt64, "ApprovalDuration",

1344

1310

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

1345

1311

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

1346

timeout = notifychangeproperty(

1347

dbus.UInt64, "Timeout",

1348

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

1312

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

1313

type_func = lambda td:

1314

td.total_seconds() * 1000)

1349

1315

extended_timeout = notifychangeproperty(

1350

1316

dbus.UInt64, "ExtendedTimeout",

1351

1317

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

1352

interval = notifychangeproperty(

1353

dbus.UInt64, "Interval",

1354

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

1318

interval = notifychangeproperty(dbus.UInt64,

1319

"Interval",

1320

type_func =

1321

lambda td: td.total_seconds()

1322

* 1000)

1355

1323

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

1356

1324

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

1357

1325

invalidate_only=True)

1367

1335

DBusObjectWithProperties.__del__(self, *args, **kwargs)

1368

1336

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

1369

1337

1370

def checker_callback(self, source, condition,

1371

connection, command, *args, **kwargs):

1372

ret = Client.checker_callback(self, source, condition,

1373

connection, command, *args,

1374

**kwargs)

1375

exitstatus = self.last_checker_status

1376

if exitstatus >= 0:

1338

def checker_callback(self, pid, condition, command,

1339

*args, **kwargs):

1340

self.checker_callback_tag = None

1341

self.checker = None

1342

if os.WIFEXITED(condition):

1343

exitstatus = os.WEXITSTATUS(condition)

1377

1344

# Emit D-Bus signal

1378

1345

self.CheckerCompleted(dbus.Int16(exitstatus),

1379

dbus.Int64(0),

1346

dbus.Int64(condition),

1380

1347

dbus.String(command))

1381

1348

else:

1382

1349

# Emit D-Bus signal

1383

1350

self.CheckerCompleted(dbus.Int16(-1),

1384

dbus.Int64(

1385

self.last_checker_signal),

1351

dbus.Int64(condition),

1386

1352

dbus.String(command))

1387

return ret

1353

1354

return Client.checker_callback(self, pid, condition, command,

1355

*args, **kwargs)

1388

1356

1389

1357

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

1390

1358

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

1495

1463

return dbus.Boolean(bool(self.approvals_pending))

1496

1464

1497

1465

# ApprovedByDefault - property

1498

@dbus_service_property(_interface,

1499

signature="b",

1466

@dbus_service_property(_interface, signature="b",

1500

1467

access="readwrite")

1501

1468

def ApprovedByDefault_dbus_property(self, value=None):

1502

1469

if value is None: # get

1504

1471

self.approved_by_default = bool(value)

1505

1472

1506

1473

# ApprovalDelay - property

1507

@dbus_service_property(_interface,

1508

signature="t",

1474

@dbus_service_property(_interface, signature="t",

1509

1475

access="readwrite")

1510

1476

def ApprovalDelay_dbus_property(self, value=None):

1511

1477

if value is None: # get

1514

1480

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

1515

1481

1516

1482

# ApprovalDuration - property

1517

@dbus_service_property(_interface,

1518

signature="t",

1483

@dbus_service_property(_interface, signature="t",

1519

1484

access="readwrite")

1520

1485

def ApprovalDuration_dbus_property(self, value=None):

1521

1486

if value is None: # get

1534

1499

return dbus.String(self.fingerprint)

1535

1500

1536

1501

# Host - property

1537

@dbus_service_property(_interface,

1538

signature="s",

1502

@dbus_service_property(_interface, signature="s",

1539

1503

access="readwrite")

1540

1504

def Host_dbus_property(self, value=None):

1541

1505

if value is None: # get

1553

1517

return datetime_to_dbus(self.last_enabled)

1554

1518

1555

1519

# Enabled - property

1556

@dbus_service_property(_interface,

1557

signature="b",

1520

@dbus_service_property(_interface, signature="b",

1558

1521

access="readwrite")

1559

1522

def Enabled_dbus_property(self, value=None):

1560

1523

if value is None: # get

1565

1528

self.disable()

1566

1529

1567

1530

# LastCheckedOK - property

1568

@dbus_service_property(_interface,

1569

signature="s",

1531

@dbus_service_property(_interface, signature="s",

1570

1532

access="readwrite")

1571

1533

def LastCheckedOK_dbus_property(self, value=None):

1572

1534

if value is not None:

1575

1537

return datetime_to_dbus(self.last_checked_ok)

1576

1538

1577

1539

# LastCheckerStatus - property

1578

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

1540

@dbus_service_property(_interface, signature="n",

1541

access="read")

1579

1542

def LastCheckerStatus_dbus_property(self):

1580

1543

return dbus.Int16(self.last_checker_status)

1581

1544

1590

1553

return datetime_to_dbus(self.last_approval_request)

1591

1554

1592

1555

# Timeout - property

1593

@dbus_service_property(_interface,

1594

signature="t",

1556

@dbus_service_property(_interface, signature="t",

1595

1557

access="readwrite")

1596

1558

def Timeout_dbus_property(self, value=None):

1597

1559

if value is None: # get

1610

1572

is None):

1611

1573

return

1612

1574

gobject.source_remove(self.disable_initiator_tag)

1613

self.disable_initiator_tag = gobject.timeout_add(

1614

int((self.expires - now).total_seconds() * 1000),

1615

self.disable)

1575

self.disable_initiator_tag = (

1576

gobject.timeout_add(

1577

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

1578

* 1000), self.disable))

1616

1579

1617

1580

# ExtendedTimeout - property

1618

@dbus_service_property(_interface,

1619

signature="t",

1581

@dbus_service_property(_interface, signature="t",

1620

1582

access="readwrite")

1621

1583

def ExtendedTimeout_dbus_property(self, value=None):

1622

1584

if value is None: # get

1625

1587

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

1626

1588

1627

1589

# Interval - property

1628

@dbus_service_property(_interface,

1629

signature="t",

1590

@dbus_service_property(_interface, signature="t",

1630

1591

access="readwrite")

1631

1592

def Interval_dbus_property(self, value=None):

1632

1593

if value is None: # get

1637

1598

if self.enabled:

1638

1599

# Reschedule checker run

1639

1600

gobject.source_remove(self.checker_initiator_tag)

1640

self.checker_initiator_tag = gobject.timeout_add(

1641

value, self.start_checker)

1642

self.start_checker() # Start one now, too

1601

self.checker_initiator_tag = (gobject.timeout_add

1602

(value, self.start_checker))

1603

self.start_checker() # Start one now, too

1643

1604

1644

1605

# Checker - property

1645

@dbus_service_property(_interface,

1646

signature="s",

1606

@dbus_service_property(_interface, signature="s",

1647

1607

access="readwrite")

1648

1608

def Checker_dbus_property(self, value=None):

1649

1609

if value is None: # get

1651

1611

self.checker_command = str(value)

1652

1612

1653

1613

# CheckerRunning - property

1654

@dbus_service_property(_interface,

1655

signature="b",

1614

@dbus_service_property(_interface, signature="b",

1656

1615

access="readwrite")

1657

1616

def CheckerRunning_dbus_property(self, value=None):

1658

1617

if value is None: # get

1668

1627

return self.dbus_object_path # is already a dbus.ObjectPath

1669

1628

1670

1629

# Secret = property

1671

@dbus_service_property(_interface,

1672

signature="ay",

1673

access="write",

1674

byte_arrays=True)

1630

@dbus_service_property(_interface, signature="ay",

1631

access="write", byte_arrays=True)

1675

1632

def Secret_dbus_property(self, value):

1676

1633

self.secret = bytes(value)

1677

1634

1683

1640

self._pipe = child_pipe

1684

1641

self._pipe.send(('init', fpr, address))

1685

1642

if not self._pipe.recv():

1686

raise KeyError(fpr)

1643

raise KeyError()

1687

1644

1688

1645

def __getattribute__(self, name):

1689

1646

if name == '_pipe':

1693

1650

if data[0] == 'data':

1694

1651

return data[1]

1695

1652

if data[0] == 'function':

1696

1697

1653

def func(*args, **kwargs):

1698

1654

self._pipe.send(('funcall', name, args, kwargs))

1699

1655

return self._pipe.recv()[1]

1700

1701

1656

return func

1702

1657

1703

1658

def __setattr__(self, name, value):

1719

1674

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

1720

1675

self.server.child_pipe.fileno())

1721

1676

1722

session = gnutls.connection.ClientSession(

1723

self.request, gnutls.connection .X509Credentials())

1677

session = (gnutls.connection

1678

.ClientSession(self.request,

1679

gnutls.connection

1680

.X509Credentials()))

1724

1681

1725

1682

# Note: gnutls.connection.X509Credentials is really a

1726

1683

# generic GnuTLS certificate credentials object so long as

1735

1692

priority = self.server.gnutls_priority

1736

1693

if priority is None:

1737

1694

priority = "NORMAL"

1738

gnutls.library.functions.gnutls_priority_set_direct(

1739

session._c_object, priority, None)

1695

(gnutls.library.functions

1696

.gnutls_priority_set_direct(session._c_object,

1697

priority, None))

1740

1698

1741

1699

# Start communication using the Mandos protocol

1742

1700

# Get protocol number

1762

1720

approval_required = False

1763

1721

try:

1764

1722

try:

1765

fpr = self.fingerprint(

1766

self.peer_certificate(session))

1723

fpr = self.fingerprint(self.peer_certificate

1724

(session))

1767

1725

except (TypeError,

1768

1726

gnutls.errors.GNUTLSError) as error:

1769

1727

logger.warning("Bad certificate: %s", error)

1784

1742

while True:

1785

1743

if not client.enabled:

1786

1744

logger.info("Client %s is disabled",

1787

client.name)

1745

client.name)

1788

1746

if self.server.use_dbus:

1789

1747

# Emit D-Bus signal

1790

1748

client.Rejected("Disabled")

1837

1795

logger.warning("gnutls send failed",

1838

1796

exc_info=error)

1839

1797

return

1840

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

1841

len(client.secret) - (sent_size

1842

+ sent))

1798

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

1799

sent, len(client.secret)

1800

- (sent_size + sent))

1843

1801

sent_size += sent

1844

1802

1845

1803

logger.info("Sending secret to %s", client.name)

1862

1820

def peer_certificate(session):

1863

1821

"Return the peer's OpenPGP certificate as a bytestring"

1864

1822

# If not an OpenPGP certificate...

1865

if (gnutls.library.functions.gnutls_certificate_type_get(

1866

session._c_object)

1823

if (gnutls.library.functions

1824

.gnutls_certificate_type_get(session._c_object)

1867

1825

!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):

1868

1826

# ...do the normal thing

1869

1827

return session.peer_certificate

1883

1841

def fingerprint(openpgp):

1884

1842

"Convert an OpenPGP bytestring to a hexdigit fingerprint"

1885

1843

# New GnuTLS "datum" with the OpenPGP public key

1886

datum = gnutls.library.types.gnutls_datum_t(

1887

ctypes.cast(ctypes.c_char_p(openpgp),

1888

ctypes.POINTER(ctypes.c_ubyte)),

1889

ctypes.c_uint(len(openpgp)))

1844

datum = (gnutls.library.types

1845

.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),

1846

ctypes.POINTER

1847

(ctypes.c_ubyte)),

1848

ctypes.c_uint(len(openpgp))))

1890

1849

# New empty GnuTLS certificate

1891

1850

crt = gnutls.library.types.gnutls_openpgp_crt_t()

1892

gnutls.library.functions.gnutls_openpgp_crt_init(

1893

ctypes.byref(crt))

1851

(gnutls.library.functions

1852

.gnutls_openpgp_crt_init(ctypes.byref(crt)))

1894

1853

# Import the OpenPGP public key into the certificate

1895

gnutls.library.functions.gnutls_openpgp_crt_import(

1896

crt, ctypes.byref(datum),

1897

gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)

1854

(gnutls.library.functions

1855

.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),

1856

gnutls.library.constants

1857

.GNUTLS_OPENPGP_FMT_RAW))

1898

1858

# Verify the self signature in the key

1899

1859

crtverify = ctypes.c_uint()

1900

gnutls.library.functions.gnutls_openpgp_crt_verify_self(

1901

crt, 0, ctypes.byref(crtverify))

1860

(gnutls.library.functions

1861

.gnutls_openpgp_crt_verify_self(crt, 0,

1862

ctypes.byref(crtverify)))

1902

1863

if crtverify.value != 0:

1903

1864

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1904

raise gnutls.errors.CertificateSecurityError(

1905

"Verify failed")

1865

raise (gnutls.errors.CertificateSecurityError

1866

("Verify failed"))

1906

1867

# New buffer for the fingerprint

1907

1868

buf = ctypes.create_string_buffer(20)

1908

1869

buf_len = ctypes.c_size_t()

1909

1870

# Get the fingerprint from the certificate into the buffer

1910

gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(

1911

crt, ctypes.byref(buf), ctypes.byref(buf_len))

1871

(gnutls.library.functions

1872

.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),

1873

ctypes.byref(buf_len)))

1912

1874

# Deinit the certificate

1913

1875

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1914

1876

# Convert the buffer to a Python bytestring

1920

1882

1921

1883

class MultiprocessingMixIn(object):

1922

1884

"""Like socketserver.ThreadingMixIn, but with multiprocessing"""

1923

1924

1885

def sub_process_main(self, request, address):

1925

1886

try:

1926

1887

self.finish_request(request, address)

1938

1899

1939

1900

class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):

1940

1901

""" adds a pipe to the MixIn """

1941

1942

1902

def process_request(self, request, client_address):

1943

1903

"""Overrides and wraps the original process_request().

1944

1904

1965

1925

interface: None or a network interface name (string)

1966

1926

use_ipv6: Boolean; to use IPv6 or not

1967

1927

"""

1968

1969

1928

def __init__(self, server_address, RequestHandlerClass,

1970

interface=None,

1971

use_ipv6=True,

1972

socketfd=None):

1929

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

1973

1930

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

1974

1931

creating a new one with socket.socket().

1975

1932

"""

2016

1973

self.interface)

2017

1974

else:

2018

1975

try:

2019

self.socket.setsockopt(

2020

socket.SOL_SOCKET, SO_BINDTODEVICE,

2021

(self.interface + "\0").encode("utf-8"))

1976

self.socket.setsockopt(socket.SOL_SOCKET,

1977

SO_BINDTODEVICE,

1978

(self.interface + "\0")

1979

.encode("utf-8"))

2022

1980

except socket.error as error:

2023

1981

if error.errno == errno.EPERM:

2024

1982

logger.error("No permission to bind to"

2042

2000

self.server_address = (any_address,

2043

2001

self.server_address[1])

2044

2002

elif not self.server_address[1]:

2045

self.server_address = (self.server_address[0], 0)

2003

self.server_address = (self.server_address[0],

2004

0)

2046

2005

# if self.interface:

2047

2006

# self.server_address = (self.server_address[0],

2048

2007

# 0, # port

2062

2021

2063

2022

Assumes a gobject.MainLoop event loop.

2064

2023

"""

2065

2066

2024

def __init__(self, server_address, RequestHandlerClass,

2067

interface=None,

2068

use_ipv6=True,

2069

clients=None,

2070

gnutls_priority=None,

2071

use_dbus=True,

2072

socketfd=None):

2025

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

2026

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

2073

2027

self.enabled = False

2074

2028

self.clients = clients

2075

2029

if self.clients is None:

2081

2035

interface = interface,

2082

2036

use_ipv6 = use_ipv6,

2083

2037

socketfd = socketfd)

2084

2085

2038

def server_activate(self):

2086

2039

if self.enabled:

2087

2040

return socketserver.TCPServer.server_activate(self)

2091

2044

2092

2045

def add_pipe(self, parent_pipe, proc):

2093

2046

# Call "handle_ipc" for both data and EOF events

2094

gobject.io_add_watch(

2095

parent_pipe.fileno(),

2096

gobject.IO_IN | gobject.IO_HUP,

2097

functools.partial(self.handle_ipc,

2098

parent_pipe = parent_pipe,

2099

proc = proc))

2047

gobject.io_add_watch(parent_pipe.fileno(),

2048

gobject.IO_IN | gobject.IO_HUP,

2049

functools.partial(self.handle_ipc,

2050

parent_pipe =

2051

parent_pipe,

2052

proc = proc))

2100

2053

2101

def handle_ipc(self, source, condition,

2102

parent_pipe=None,

2103

proc = None,

2104

client_object=None):

2054

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

2055

proc = None, client_object=None):

2105

2056

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

2106

2057

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

2107

2058

# Wait for other process to exit

2130

2081

parent_pipe.send(False)

2131

2082

return False

2132

2083

2133

gobject.io_add_watch(

2134

parent_pipe.fileno(),

2135

gobject.IO_IN | gobject.IO_HUP,

2136

functools.partial(self.handle_ipc,

2137

parent_pipe = parent_pipe,

2138

proc = proc,

2139

client_object = client))

2084

gobject.io_add_watch(parent_pipe.fileno(),

2085

gobject.IO_IN | gobject.IO_HUP,

2086

functools.partial(self.handle_ipc,

2087

parent_pipe =

2088

parent_pipe,

2089

proc = proc,

2090

client_object =

2091

client))

2140

2092

parent_pipe.send(True)

2141

2093

# remove the old hook in favor of the new above hook on

2142

2094

# same fileno

2148

2100

2149

2101

parent_pipe.send(('data', getattr(client_object,

2150

2102

funcname)(*args,

2151

**kwargs)))

2103

**kwargs)))

2152

2104

2153

2105

if command == 'getattr':

2154

2106

attrname = request[1]

2155

if isinstance(client_object.__getattribute__(attrname),

2156

collections.Callable):

2157

parent_pipe.send(('function', ))

2107

if callable(client_object.__getattribute__(attrname)):

2108

parent_pipe.send(('function',))

2158

2109

else:

2159

parent_pipe.send((

2160

'data', client_object.__getattribute__(attrname)))

2110

parent_pipe.send(('data', client_object

2111

.__getattribute__(attrname)))

2161

2112

2162

2113

if command == 'setattr':

2163

2114

attrname = request[1]

2194

2145

# avoid excessive use of external libraries.

2195

2146

2196

2147

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

2197

Token = collections.namedtuple("Token", (

2198

"regexp", # To match token; if "value" is not None, must have

2199

# a "group" containing digits

2200

"value", # datetime.timedelta or None

2201

"followers")) # Tokens valid after this token

2148

Token = collections.namedtuple("Token",

2149

("regexp", # To match token; if

2150

# "value" is not None,

2151

# must have a "group"

2152

# containing digits

2153

"value", # datetime.timedelta or

2154

# None

2155

"followers")) # Tokens valid after

2156

# this token

2202

2157

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

2203

2158

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

2204

2159

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

2205

2160

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

2206

2161

datetime.timedelta(seconds=1),

2207

frozenset((token_end, )))

2162

frozenset((token_end,)))

2208

2163

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

2209

2164

datetime.timedelta(minutes=1),

2210

2165

frozenset((token_second, token_end)))

2226

2181

frozenset((token_month, token_end)))

2227

2182

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

2228

2183

datetime.timedelta(weeks=1),

2229

frozenset((token_end, )))

2184

frozenset((token_end,)))

2230

2185

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

2231

2186

frozenset((token_year, token_month,

2232

2187

token_day, token_time,

2234

2189

# Define starting values

2235

2190

value = datetime.timedelta() # Value so far

2236

2191

found_token = None

2237

followers = frozenset((token_duration, )) # Following valid tokens

2192

followers = frozenset((token_duration,)) # Following valid tokens

2238

2193

s = duration # String left to parse

2239

2194

# Loop until end token is found

2240

2195

while found_token is not token_end:

2257

2212

break

2258

2213

else:

2259

2214

# No currently valid tokens were found

2260

raise ValueError("Invalid RFC 3339 duration: {!r}"

2261

.format(duration))

2215

raise ValueError("Invalid RFC 3339 duration")

2262

2216

# End token found

2263

2217

return value

2264

2218

2301

2255

elif suffix == "w":

2302

2256

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

2303

2257

else:

2304

raise ValueError("Unknown suffix {!r}".format(suffix))

2258

raise ValueError("Unknown suffix {!r}"

2259

.format(suffix))

2305

2260

except IndexError as e:

2306

2261

raise ValueError(*(e.args))

2307

2262

timevalue += delta

2323

2278

# Close all standard open file descriptors

2324

2279

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

2325

2280

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

2326

raise OSError(errno.ENODEV,

2327

"{} not a character device"

2281

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

2328

2282

.format(os.devnull))

2329

2283

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

2330

2284

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

2396

2350

"port": "",

2397

2351

"debug": "False",

2398

2352

"priority":

2399

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

2400

":+SIGN-DSA-SHA256",

2353

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

2401

2354

"servicename": "Mandos",

2402

2355

"use_dbus": "True",

2403

2356

"use_ipv6": "True",

2407

2360

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

2408

2361

"foreground": "False",

2409

2362

"zeroconf": "True",

2410

}

2363

}

2411

2364

2412

2365

# Parse config file for server-global settings

2413

2366

server_config = configparser.SafeConfigParser(server_defaults)

2414

2367

del server_defaults

2415

server_config.read(os.path.join(options.configdir, "mandos.conf"))

2368

server_config.read(os.path.join(options.configdir,

2369

"mandos.conf"))

2416

2370

# Convert the SafeConfigParser object to a dict

2417

2371

server_settings = server_config.defaults()

2418

2372

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

2436

2390

# Override the settings from the config file with command line

2437

2391

# options, if set.

2438

2392

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

2439

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

2440

"use_ipv6", "debuglevel", "restore", "statedir",

2441

"socket", "foreground", "zeroconf"):

2393

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

2394

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

2395

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

2442

2396

value = getattr(options, option)

2443

2397

if value is not None:

2444

2398

server_settings[option] = value

2459

2413

2460

2414

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

2461

2415

2462

if (not server_settings["zeroconf"]

2463

and not (server_settings["port"]

2464

or server_settings["socket"] != "")):

2465

parser.error("Needs port or socket to work without Zeroconf")

2416

if (not server_settings["zeroconf"] and

2417

not (server_settings["port"]

2418

or server_settings["socket"] != "")):

2419

parser.error("Needs port or socket to work without"

2420

" Zeroconf")

2466

2421

2467

2422

# For convenience

2468

2423

debug = server_settings["debug"]

2484

2439

initlogger(debug, level)

2485

2440

2486

2441

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

2487

syslogger.setFormatter(

2488

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

2489

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

2490

server_settings["servicename"])))

2442

syslogger.setFormatter(logging.Formatter

2443

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

2444

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

2445

.format(server_settings

2446

["servicename"])))

2491

2447

2492

2448

# Parse config file with clients

2493

2449

client_config = configparser.SafeConfigParser(Client

2501

2457

socketfd = None

2502

2458

if server_settings["socket"] != "":

2503

2459

socketfd = server_settings["socket"]

2504

tcp_server = MandosServer(

2505

(server_settings["address"], server_settings["port"]),

2506

ClientHandler,

2507

interface=(server_settings["interface"] or None),

2508

use_ipv6=use_ipv6,

2509

gnutls_priority=server_settings["priority"],

2510

use_dbus=use_dbus,

2511

socketfd=socketfd)

2460

tcp_server = MandosServer((server_settings["address"],

2461

server_settings["port"]),

2462

ClientHandler,

2463

interface=(server_settings["interface"]

2464

or None),

2465

use_ipv6=use_ipv6,

2466

gnutls_priority=

2467

server_settings["priority"],

2468

use_dbus=use_dbus,

2469

socketfd=socketfd)

2512

2470

if not foreground:

2513

2471

pidfilename = "/run/mandos.pid"

2514

2472

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

2515

2473

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

2516

2474

pidfile = None

2517

2475

try:

2518

pidfile = codecs.open(pidfilename, "w", encoding="utf-8")

2476

pidfile = open(pidfilename, "w")

2519

2477

except IOError as e:

2520

2478

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

2521

2479

exc_info=e)

2548

2506

def debug_gnutls(level, string):

2549

2507

logger.debug("GnuTLS: %s", string[:-1])

2550

2508

2551

gnutls.library.functions.gnutls_global_set_log_function(

2552

debug_gnutls)

2509

(gnutls.library.functions

2510

.gnutls_global_set_log_function(debug_gnutls))

2553

2511

2554

2512

# Redirect stdin so all checkers get /dev/null

2555

2513

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

2575

2533

if use_dbus:

2576

2534

try:

2577

2535

bus_name = dbus.service.BusName("se.recompile.Mandos",

2578

bus,

2579

do_not_queue=True)

2580

old_bus_name = dbus.service.BusName(

2581

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

2582

do_not_queue=True)

2583

except dbus.exceptions.DBusException as e:

2536

bus, do_not_queue=True)

2537

old_bus_name = (dbus.service.BusName

2538

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

2539

do_not_queue=True))

2540

except dbus.exceptions.NameExistsException as e:

2584

2541

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

2585

2542

use_dbus = False

2586

2543

server_settings["use_dbus"] = False

2587

2544

tcp_server.use_dbus = False

2588

2545

if zeroconf:

2589

2546

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

2590

service = AvahiServiceToSyslog(

2591

name = server_settings["servicename"],

2592

servicetype = "_mandos._tcp",

2593

protocol = protocol,

2594

bus = bus)

2547

service = AvahiServiceToSyslog(name =

2548

server_settings["servicename"],

2549

servicetype = "_mandos._tcp",

2550

protocol = protocol, bus = bus)

2595

2551

if server_settings["interface"]:

2596

service.interface = if_nametoindex(

2597

server_settings["interface"].encode("utf-8"))

2552

service.interface = (if_nametoindex

2553

(server_settings["interface"]

2554

.encode("utf-8")))

2598

2555

2599

2556

global multiprocessing_manager

2600

2557

multiprocessing_manager = multiprocessing.Manager()

2619

2576

if server_settings["restore"]:

2620

2577

try:

2621

2578

with open(stored_state_path, "rb") as stored_state:

2622

clients_data, old_client_settings = pickle.load(

2623

stored_state)

2579

clients_data, old_client_settings = (pickle.load

2580

(stored_state))

2624

2581

os.remove(stored_state_path)

2625

2582

except IOError as e:

2626

2583

if e.errno == errno.ENOENT:

2627

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

2628

" {}".format(os.strerror(e.errno)))

2584

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

2585

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

2629

2586

else:

2630

2587

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

2631

2588

exc_info=e)

2632

2589

raise

2633

2590

except EOFError as e:

2634

2591

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

2635

"EOFError:",

2636

exc_info=e)

2592

"EOFError:", exc_info=e)

2637

2593

2638

2594

with PGPEngine() as pgp:

2639

2595

for client_name, client in clients_data.items():

2651

2607

# For each value in new config, check if it

2652

2608

# differs from the old config value (Except for

2653

2609

# the "secret" attribute)

2654

if (name != "secret"

2655

and (value !=

2656

old_client_settings[client_name][name])):

2610

if (name != "secret" and

2611

value != old_client_settings[client_name]

2612

[name]):

2657

2613

client[name] = value

2658

2614

except KeyError:

2659

2615

pass

2660

2616

2661

2617

# Clients who has passed its expire date can still be

2662

# enabled if its last checker was successful. A Client

2618

# enabled if its last checker was successful. Clients

2663

2619

# whose checker succeeded before we stored its state is

2664

2620

# assumed to have successfully run all checkers during

2665

2621

# downtime.

2668

2624

if not client["last_checked_ok"]:

2669

2625

logger.warning(

2670

2626

"disabling client {} - Client never "

2671

"performed a successful checker".format(

2672

client_name))

2627

"performed a successful checker"

2628

.format(client_name))

2673

2629

client["enabled"] = False

2674

2630

elif client["last_checker_status"] != 0:

2675

2631

logger.warning(

2676

2632

"disabling client {} - Client last"

2677

" checker failed with error code"

2678

" {}".format(

2679

client_name,

2680

client["last_checker_status"]))

2633

" checker failed with error code {}"

2634

.format(client_name,

2635

client["last_checker_status"]))

2681

2636

client["enabled"] = False

2682

2637

else:

2683

client["expires"] = (

2684

datetime.datetime.utcnow()

2685

+ client["timeout"])

2638

client["expires"] = (datetime.datetime

2639

.utcnow()

2640

+ client["timeout"])

2686

2641

logger.debug("Last checker succeeded,"

2687

" keeping {} enabled".format(

2688

client_name))

2642

" keeping {} enabled"

2643

.format(client_name))

2689

2644

try:

2690

client["secret"] = pgp.decrypt(

2691

client["encrypted_secret"],

2692

client_settings[client_name]["secret"])

2645

client["secret"] = (

2646

pgp.decrypt(client["encrypted_secret"],

2647

client_settings[client_name]

2648

["secret"]))

2693

2649

except PGPError:

2694

2650

# If decryption fails, we use secret from new settings

2695

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

2696

client_name))

2697

client["secret"] = (client_settings[client_name]

2698

["secret"])

2651

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

2652

.format(client_name))

2653

client["secret"] = (

2654

client_settings[client_name]["secret"])

2699

2655

2700

2656

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

2701

2657

for client_name in (set(old_client_settings)

2708

2664

# Create all client objects

2709

2665

for client_name, client in clients_data.items():

2710

2666

tcp_server.clients[client_name] = client_class(

2711

name = client_name,

2712

settings = client,

2667

name = client_name, settings = client,

2713

2668

server_settings = server_settings)

2714

2669

2715

2670

if not tcp_server.clients:

2717

2672

2718

2673

if not foreground:

2719

2674

if pidfile is not None:

2720

pid = os.getpid()

2721

2675

try:

2722

2676

with pidfile:

2723

print(pid, file=pidfile)

2677

pid = os.getpid()

2678

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

2724

2679

except IOError:

2725

2680

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

2726

2681

pidfilename, pid)

2731

2686

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

2732

2687

2733

2688

if use_dbus:

2734

2735

@alternate_dbus_interfaces(

2736

{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })

2689

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

2690

"se.bsnet.fukt.Mandos"})

2737

2691

class MandosDBusService(DBusObjectWithProperties):

2738

2692

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

2739

2740

2693

def __init__(self):

2741

2694

dbus.service.Object.__init__(self, bus, "/")

2742

2743

2695

_interface = "se.recompile.Mandos"

2744

2696

2745

2697

@dbus_interface_annotations(_interface)

2746

2698

def _foo(self):

2747

return {

2748

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

2749

"false" }

2699

return { "org.freedesktop.DBus.Property"

2700

".EmitsChangedSignal":

2701

"false"}

2750

2702

2751

2703

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

2752

2704

def ClientAdded(self, objpath):

2766

2718

@dbus.service.method(_interface, out_signature="ao")

2767

2719

def GetAllClients(self):

2768

2720

"D-Bus method"

2769

return dbus.Array(c.dbus_object_path for c in

2721

return dbus.Array(c.dbus_object_path

2722

for c in

2770

2723

tcp_server.clients.itervalues())

2771

2724

2772

2725

@dbus.service.method(_interface,

2821

2774

# + secret.

2822

2775

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

2823

2776

"checker", "server_settings" }

2824

for name, typ in inspect.getmembers(dbus.service

2825

.Object):

2777

for name, typ in (inspect.getmembers

2778

(dbus.service.Object)):

2826

2779

exclude.add(name)

2827

2780

2828

2781

client_dict["encrypted_secret"] = (client

2835

2788

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

2836

2789

2837

2790

try:

2838

with tempfile.NamedTemporaryFile(

2839

mode='wb',

2840

suffix=".pickle",

2841

prefix='clients-',

2842

dir=os.path.dirname(stored_state_path),

2843

delete=False) as stored_state:

2791

with (tempfile.NamedTemporaryFile

2792

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

2793

dir=os.path.dirname(stored_state_path),

2794

delete=False)) as stored_state:

2844

2795

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

2845

tempname = stored_state.name

2796

tempname=stored_state.name

2846

2797

os.rename(tempname, stored_state_path)

2847

2798

except (IOError, OSError) as e:

2848

2799

if not debug:

2867

2818

client.disable(quiet=True)

2868

2819

if use_dbus:

2869

2820

# Emit D-Bus signal

2870

mandos_dbus_service.ClientRemoved(

2871

client.dbus_object_path, client.name)

2821

mandos_dbus_service.ClientRemoved(client

2822

.dbus_object_path,

2823

client.name)

2872

2824

client_settings.clear()

2873

2825

2874

2826

atexit.register(cleanup)

2927

2879

# Must run before the D-Bus bus name gets deregistered

2928

2880

cleanup()

2929

2881

2930

2931

2882

if __name__ == '__main__':

2932

2883

main()