/mandos/trunk : revision 731

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

104

91

if sys.version_info.major == 2:

105

92

str = unicode

106

93

107

version = "1.6.9"

94

version = "1.6.8"

108

95

stored_state_file = "clients.pickle"

109

96

110

97

logger = logging.getLogger()

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

835

813

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

836

814

Usage:

837

815

838

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

839

"org.freedesktop.DBus.Property."

840

"EmitsChangedSignal": "false"})

841

816

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

842

817

access="r")

818

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

819

"org.freedesktop.DBus.Property."

820

"EmitsChangedSignal": "false"})

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

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

973

def PropertiesChanged(self, interface_name, changed_properties,

974

invalidated_properties):

975

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

976

standard.

977

"""

978

pass

979

980

949

@dbus.service.method(dbus.INTROSPECTABLE_IFACE,

981

950

out_signature="s",

982

951

path_keyword='object_path',

990

959

connection)

991

960

try:

992

961

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

993

994

962

def make_tag(document, name, prop):

995

963

e = document.createElement("property")

996

964

e.setAttribute("name", name)

997

965

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

998

966

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

999

967

return e

1000

1001

968

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

1002

969

# Add property tags

1003

970

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

1015

982

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

1016

983

and prop._dbus_interface

1017

984

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

1018

annots.update(getattr(

1019

prop, "_dbus_annotations", {}))

985

annots.update(getattr

986

(prop,

987

"_dbus_annotations",

988

{}))

1020

989

for name, value in annots.items():

1021

990

ann_tag = document.createElement(

1022

991

"annotation")

1027

996

for annotation, value in dict(

1028

997

itertools.chain.from_iterable(

1029

998

annotations().items()

1030

for name, annotations

1031

in self._get_all_dbus_things("interface")

999

for name, annotations in

1000

self._get_all_dbus_things("interface")

1032

1001

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

1033

1002

)).items():

1034

1003

ann_tag = document.createElement("annotation")

1063

1032

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

1064

1033

if dt is None:

1065

1034

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

1066

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

1035

return dbus.String(dt.isoformat(),

1036

variant_level=variant_level)

1067

1037

1068

1038

1069

1039

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1089

1059

(from DBusObjectWithProperties) and interfaces (from the

1090

1060

dbus_interface_annotations decorator).

1091

1061

"""

1092

1093

1062

def wrapper(cls):

1094

1063

for orig_interface_name, alt_interface_name in (

1095

alt_interface_names.items()):

1064

alt_interface_names.items()):

1096

1065

attr = {}

1097

1066

interface_names = set()

1098

1067

# Go though all attributes of the class

1100

1069

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

1101

1070

# with the wrong interface name

1102

1071

if (not hasattr(attribute, "_dbus_interface")

1103

or not attribute._dbus_interface.startswith(

1104

orig_interface_name)):

1072

or not attribute._dbus_interface

1073

.startswith(orig_interface_name)):

1105

1074

continue

1106

1075

# Create an alternate D-Bus interface name based on

1107

1076

# the current name

1108

alt_interface = attribute._dbus_interface.replace(

1109

orig_interface_name, alt_interface_name)

1077

alt_interface = (attribute._dbus_interface

1078

.replace(orig_interface_name,

1079

alt_interface_name))

1110

1080

interface_names.add(alt_interface)

1111

1081

# Is this a D-Bus signal?

1112

1082

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(

1083

# Extract the original non-method undecorated

1084

# function by black magic

1085

nonmethod_func = (dict(

1117

1086

zip(attribute.func_code.co_freevars,

1118

attribute.__closure__))

1119

["func"].cell_contents)

1120

else:

1121

nonmethod_func = attribute

1087

attribute.__closure__))["func"]

1088

.cell_contents)

1122

1089

# Create a new, but exactly alike, function

1123

1090

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

1124

1091

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

1092

new_function = (dbus.service.signal

1093

(alt_interface,

1094

attribute._dbus_signature)

1095

(types.FunctionType(

1096

nonmethod_func.func_code,

1097

nonmethod_func.func_globals,

1098

nonmethod_func.func_name,

1099

nonmethod_func.func_defaults,

1100

nonmethod_func.func_closure)))

1142

1101

# Copy annotations, if any

1143

1102

try:

1144

new_function._dbus_annotations = dict(

1145

attribute._dbus_annotations)

1103

new_function._dbus_annotations = (

1104

dict(attribute._dbus_annotations))

1146

1105

except AttributeError:

1147

1106

pass

1148

1107

# Define a creator of a function to call both the

1153

1112

"""This function is a scope container to pass

1154

1113

func1 and func2 to the "call_both" function

1155

1114

outside of its arguments"""

1156

1157

1115

def call_both(*args, **kwargs):

1158

1116

"""This function will emit two D-Bus

1159

1117

signals by calling func1 and func2"""

1160

1118

func1(*args, **kwargs)

1161

1119

func2(*args, **kwargs)

1162

1163

1120

return call_both

1164

1121

# Create the "call_both" function and add it to

1165

1122

# the class

1170

1127

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

1171

1128

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

1172

1129

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

1130

attr[attrname] = (dbus.service.method

1131

(alt_interface,

1132

attribute._dbus_in_signature,

1133

attribute._dbus_out_signature)

1134

(types.FunctionType

1135

(attribute.func_code,

1136

attribute.func_globals,

1137

attribute.func_name,

1138

attribute.func_defaults,

1139

attribute.func_closure)))

1183

1140

# Copy annotations, if any

1184

1141

try:

1185

attr[attrname]._dbus_annotations = dict(

1186

attribute._dbus_annotations)

1142

attr[attrname]._dbus_annotations = (

1143

dict(attribute._dbus_annotations))

1187

1144

except AttributeError:

1188

1145

pass

1189

1146

# Is this a D-Bus property?

1192

1149

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

1193

1150

# property with the alternate D-Bus interface

1194

1151

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

1152

attr[attrname] = (dbus_service_property

1153

(alt_interface,

1154

attribute._dbus_signature,

1155

attribute._dbus_access,

1156

attribute

1157

._dbus_get_args_options

1158

["byte_arrays"])

1159

(types.FunctionType

1160

(attribute.func_code,

1161

attribute.func_globals,

1162

attribute.func_name,

1163

attribute.func_defaults,

1164

attribute.func_closure)))

1206

1165

# Copy annotations, if any

1207

1166

try:

1208

attr[attrname]._dbus_annotations = dict(

1209

attribute._dbus_annotations)

1167

attr[attrname]._dbus_annotations = (

1168

dict(attribute._dbus_annotations))

1210

1169

except AttributeError:

1211

1170

pass

1212

1171

# Is this a D-Bus interface?

1215

1174

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

1216

1175

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

1217

1176

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

1177

attr[attrname] = (dbus_interface_annotations

1178

(alt_interface)

1179

(types.FunctionType

1180

(attribute.func_code,

1181

attribute.func_globals,

1182

attribute.func_name,

1183

attribute.func_defaults,

1184

attribute.func_closure)))

1225

1185

if deprecate:

1226

1186

# Deprecate all alternate interfaces

1227

1187

iname="_AlternateDBusNames_interface_annotation{}"

1228

1188

for interface_name in interface_names:

1229

1230

1189

@dbus_interface_annotations(interface_name)

1231

1190

def func(self):

1232

1191

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

1233

"true" }

1192

"true" }

1234

1193

# Find an unused name

1235

1194

for aname in (iname.format(i)

1236

1195

for i in itertools.count()):

1241

1200

# Replace the class with a new subclass of it with

1242

1201

# methods, signals, etc. as created above.

1243

1202

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

1244

(cls, ), attr)

1203

(cls,), attr)

1245

1204

return cls

1246

1247

1205

return wrapper

1248

1206

1249

1207

1250

1208

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

1251

"se.bsnet.fukt.Mandos"})

1209

"se.bsnet.fukt.Mandos"})

1252

1210

class ClientDBus(Client, DBusObjectWithProperties):

1253

1211

"""A Client class using D-Bus

1254

1212

1258

1216

"""

1259

1217

1260

1218

runtime_expansions = (Client.runtime_expansions

1261

+ ("dbus_object_path", ))

1262

1263

_interface = "se.recompile.Mandos.Client"

1219

+ ("dbus_object_path",))

1264

1220

1265

1221

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

1266

1222

1272

1228

client_object_name = str(self.name).translate(

1273

1229

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

1274

1230

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

1275

self.dbus_object_path = dbus.ObjectPath(

1276

"/clients/" + client_object_name)

1231

self.dbus_object_path = (dbus.ObjectPath

1232

("/clients/" + client_object_name))

1277

1233

DBusObjectWithProperties.__init__(self, self.bus,

1278

1234

self.dbus_object_path)

1279

1235

1280

def notifychangeproperty(transform_func, dbus_name,

1281

type_func=lambda x: x,

1282

variant_level=1,

1283

invalidate_only=False,

1284

_interface=_interface):

1236

def notifychangeproperty(transform_func,

1237

dbus_name, type_func=lambda x: x,

1238

variant_level=1):

1285

1239

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

1286

1240

its changes to DBus.

1287

1241

1293

1247

variant_level: D-Bus variant level. Default: 1

1294

1248

"""

1295

1249

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

1296

1297

1250

def setter(self, value):

1298

1251

if hasattr(self, "dbus_object_path"):

1299

1252

if (not hasattr(self, attrname) or

1300

1253

type_func(getattr(self, attrname, None))

1301

1254

!= type_func(value)):

1302

if invalidate_only:

1303

self.PropertiesChanged(

1304

_interface, dbus.Dictionary(),

1305

dbus.Array((dbus_name, )))

1306

else:

1307

dbus_value = transform_func(

1308

type_func(value),

1309

variant_level = variant_level)

1310

self.PropertyChanged(dbus.String(dbus_name),

1311

dbus_value)

1312

self.PropertiesChanged(

1313

_interface,

1314

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

1315

dbus_value }),

1316

dbus.Array())

1255

dbus_value = transform_func(type_func(value),

1256

variant_level

1257

=variant_level)

1258

self.PropertyChanged(dbus.String(dbus_name),

1259

dbus_value)

1317

1260

setattr(self, attrname, value)

1318

1261

1319

1262

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

1325

1268

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

1326

1269

last_enabled = notifychangeproperty(datetime_to_dbus,

1327

1270

"LastEnabled")

1328

checker = notifychangeproperty(

1329

dbus.Boolean, "CheckerRunning",

1330

type_func = lambda checker: checker is not None)

1271

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

1272

type_func = lambda checker:

1273

checker is not None)

1331

1274

last_checked_ok = notifychangeproperty(datetime_to_dbus,

1332

1275

"LastCheckedOK")

1333

1276

last_checker_status = notifychangeproperty(dbus.Int16,

1336

1279

datetime_to_dbus, "LastApprovalRequest")

1337

1280

approved_by_default = notifychangeproperty(dbus.Boolean,

1338

1281

"ApprovedByDefault")

1339

approval_delay = notifychangeproperty(

1340

dbus.UInt64, "ApprovalDelay",

1341

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

1282

approval_delay = notifychangeproperty(dbus.UInt64,

1283

"ApprovalDelay",

1284

type_func =

1285

lambda td: td.total_seconds()

1286

* 1000)

1342

1287

approval_duration = notifychangeproperty(

1343

1288

dbus.UInt64, "ApprovalDuration",

1344

1289

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

1345

1290

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

1346

timeout = notifychangeproperty(

1347

dbus.UInt64, "Timeout",

1348

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

1291

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

1292

type_func = lambda td:

1293

td.total_seconds() * 1000)

1349

1294

extended_timeout = notifychangeproperty(

1350

1295

dbus.UInt64, "ExtendedTimeout",

1351

1296

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

1352

interval = notifychangeproperty(

1353

dbus.UInt64, "Interval",

1354

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

1297

interval = notifychangeproperty(dbus.UInt64,

1298

"Interval",

1299

type_func =

1300

lambda td: td.total_seconds()

1301

* 1000)

1355

1302

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

1356

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

1357

invalidate_only=True)

1358

1303

1359

1304

del notifychangeproperty

1360

1305

1367

1312

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

1368

1313

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

1369

1314

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:

1315

def checker_callback(self, pid, condition, command,

1316

*args, **kwargs):

1317

self.checker_callback_tag = None

1318

self.checker = None

1319

if os.WIFEXITED(condition):

1320

exitstatus = os.WEXITSTATUS(condition)

1377

1321

# Emit D-Bus signal

1378

1322

self.CheckerCompleted(dbus.Int16(exitstatus),

1379

dbus.Int64(0),

1323

dbus.Int64(condition),

1380

1324

dbus.String(command))

1381

1325

else:

1382

1326

# Emit D-Bus signal

1383

1327

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

1384

dbus.Int64(

1385

self.last_checker_signal),

1328

dbus.Int64(condition),

1386

1329

dbus.String(command))

1387

return ret

1330

1331

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

1332

*args, **kwargs)

1388

1333

1389

1334

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

1390

1335

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

1407

1352

self.send_changedstate()

1408

1353

1409

1354

## D-Bus methods, signals & properties

1355

_interface = "se.recompile.Mandos.Client"

1410

1356

1411

1357

## Interfaces

1412

1358

1359

@dbus_interface_annotations(_interface)

1360

def _foo(self):

1361

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

1362

"false"}

1363

1413

1364

## Signals

1414

1365

1415

1366

# CheckerCompleted - signal

1425

1376

pass

1426

1377

1427

1378

# PropertyChanged - signal

1428

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

1429

1379

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

1430

1380

def PropertyChanged(self, property, value):

1431

1381

"D-Bus signal"

1495

1445

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

1496

1446

1497

1447

# ApprovedByDefault - property

1498

@dbus_service_property(_interface,

1499

signature="b",

1448

@dbus_service_property(_interface, signature="b",

1500

1449

access="readwrite")

1501

1450

def ApprovedByDefault_dbus_property(self, value=None):

1502

1451

if value is None: # get

1504

1453

self.approved_by_default = bool(value)

1505

1454

1506

1455

# ApprovalDelay - property

1507

@dbus_service_property(_interface,

1508

signature="t",

1456

@dbus_service_property(_interface, signature="t",

1509

1457

access="readwrite")

1510

1458

def ApprovalDelay_dbus_property(self, value=None):

1511

1459

if value is None: # get

1514

1462

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

1515

1463

1516

1464

# ApprovalDuration - property

1517

@dbus_service_property(_interface,

1518

signature="t",

1465

@dbus_service_property(_interface, signature="t",

1519

1466

access="readwrite")

1520

1467

def ApprovalDuration_dbus_property(self, value=None):

1521

1468

if value is None: # get

1534

1481

return dbus.String(self.fingerprint)

1535

1482

1536

1483

# Host - property

1537

@dbus_service_property(_interface,

1538

signature="s",

1484

@dbus_service_property(_interface, signature="s",

1539

1485

access="readwrite")

1540

1486

def Host_dbus_property(self, value=None):

1541

1487

if value is None: # get

1553

1499

return datetime_to_dbus(self.last_enabled)

1554

1500

1555

1501

# Enabled - property

1556

@dbus_service_property(_interface,

1557

signature="b",

1502

@dbus_service_property(_interface, signature="b",

1558

1503

access="readwrite")

1559

1504

def Enabled_dbus_property(self, value=None):

1560

1505

if value is None: # get

1565

1510

self.disable()

1566

1511

1567

1512

# LastCheckedOK - property

1568

@dbus_service_property(_interface,

1569

signature="s",

1513

@dbus_service_property(_interface, signature="s",

1570

1514

access="readwrite")

1571

1515

def LastCheckedOK_dbus_property(self, value=None):

1572

1516

if value is not None:

1575

1519

return datetime_to_dbus(self.last_checked_ok)

1576

1520

1577

1521

# LastCheckerStatus - property

1578

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

1522

@dbus_service_property(_interface, signature="n",

1523

access="read")

1579

1524

def LastCheckerStatus_dbus_property(self):

1580

1525

return dbus.Int16(self.last_checker_status)

1581

1526

1590

1535

return datetime_to_dbus(self.last_approval_request)

1591

1536

1592

1537

# Timeout - property

1593

@dbus_service_property(_interface,

1594

signature="t",

1538

@dbus_service_property(_interface, signature="t",

1595

1539

access="readwrite")

1596

1540

def Timeout_dbus_property(self, value=None):

1597

1541

if value is None: # get

1610

1554

is None):

1611

1555

return

1612

1556

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)

1557

self.disable_initiator_tag = (

1558

gobject.timeout_add(

1559

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

1560

* 1000), self.disable))

1616

1561

1617

1562

# ExtendedTimeout - property

1618

@dbus_service_property(_interface,

1619

signature="t",

1563

@dbus_service_property(_interface, signature="t",

1620

1564

access="readwrite")

1621

1565

def ExtendedTimeout_dbus_property(self, value=None):

1622

1566

if value is None: # get

1625

1569

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

1626

1570

1627

1571

# Interval - property

1628

@dbus_service_property(_interface,

1629

signature="t",

1572

@dbus_service_property(_interface, signature="t",

1630

1573

access="readwrite")

1631

1574

def Interval_dbus_property(self, value=None):

1632

1575

if value is None: # get

1637

1580

if self.enabled:

1638

1581

# Reschedule checker run

1639

1582

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

1583

self.checker_initiator_tag = (gobject.timeout_add

1584

(value, self.start_checker))

1585

self.start_checker() # Start one now, too

1643

1586

1644

1587

# Checker - property

1645

@dbus_service_property(_interface,

1646

signature="s",

1588

@dbus_service_property(_interface, signature="s",

1647

1589

access="readwrite")

1648

1590

def Checker_dbus_property(self, value=None):

1649

1591

if value is None: # get

1651

1593

self.checker_command = str(value)

1652

1594

1653

1595

# CheckerRunning - property

1654

@dbus_service_property(_interface,

1655

signature="b",

1596

@dbus_service_property(_interface, signature="b",

1656

1597

access="readwrite")

1657

1598

def CheckerRunning_dbus_property(self, value=None):

1658

1599

if value is None: # get

1668

1609

return self.dbus_object_path # is already a dbus.ObjectPath

1669

1610

1670

1611

# Secret = property

1671

@dbus_service_property(_interface,

1672

signature="ay",

1673

access="write",

1674

byte_arrays=True)

1612

@dbus_service_property(_interface, signature="ay",

1613

access="write", byte_arrays=True)

1675

1614

def Secret_dbus_property(self, value):

1676

1615

self.secret = bytes(value)

1677

1616

1683

1622

self._pipe = child_pipe

1684

1623

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

1685

1624

if not self._pipe.recv():

1686

raise KeyError(fpr)

1625

raise KeyError()

1687

1626

1688

1627

def __getattribute__(self, name):

1689

1628

if name == '_pipe':

1693

1632

if data[0] == 'data':

1694

1633

return data[1]

1695

1634

if data[0] == 'function':

1696

1697

1635

def func(*args, **kwargs):

1698

1636

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

1699

1637

return self._pipe.recv()[1]

1700

1701

1638

return func

1702

1639

1703

1640

def __setattr__(self, name, value):

1719

1656

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

1720

1657

self.server.child_pipe.fileno())

1721

1658

1722

session = gnutls.connection.ClientSession(

1723

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

1659

session = (gnutls.connection

1660

.ClientSession(self.request,

1661

gnutls.connection

1662

.X509Credentials()))

1724

1663

1725

1664

# Note: gnutls.connection.X509Credentials is really a

1726

1665

# generic GnuTLS certificate credentials object so long as

1735

1674

priority = self.server.gnutls_priority

1736

1675

if priority is None:

1737

1676

priority = "NORMAL"

1738

gnutls.library.functions.gnutls_priority_set_direct(

1739

session._c_object, priority, None)

1677

(gnutls.library.functions

1678

.gnutls_priority_set_direct(session._c_object,

1679

priority, None))

1740

1680

1741

1681

# Start communication using the Mandos protocol

1742

1682

# Get protocol number

1762

1702

approval_required = False

1763

1703

try:

1764

1704

try:

1765

fpr = self.fingerprint(

1766

self.peer_certificate(session))

1705

fpr = self.fingerprint(self.peer_certificate

1706

(session))

1767

1707

except (TypeError,

1768

1708

gnutls.errors.GNUTLSError) as error:

1769

1709

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

1784

1724

while True:

1785

1725

if not client.enabled:

1786

1726

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

1787

client.name)

1727

client.name)

1788

1728

if self.server.use_dbus:

1789

1729

# Emit D-Bus signal

1790

1730

client.Rejected("Disabled")

1837

1777

logger.warning("gnutls send failed",

1838

1778

exc_info=error)

1839

1779

return

1840

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

1841

len(client.secret) - (sent_size

1842

+ sent))

1780

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

1781

sent, len(client.secret)

1782

- (sent_size + sent))

1843

1783

sent_size += sent

1844

1784

1845

1785

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

1862

1802

def peer_certificate(session):

1863

1803

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

1864

1804

# If not an OpenPGP certificate...

1865

if (gnutls.library.functions.gnutls_certificate_type_get(

1866

session._c_object)

1805

if (gnutls.library.functions

1806

.gnutls_certificate_type_get(session._c_object)

1867

1807

!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):

1868

1808

# ...do the normal thing

1869

1809

return session.peer_certificate

1883

1823

def fingerprint(openpgp):

1884

1824

"Convert an OpenPGP bytestring to a hexdigit fingerprint"

1885

1825

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

1826

datum = (gnutls.library.types

1827

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

1828

ctypes.POINTER

1829

(ctypes.c_ubyte)),

1830

ctypes.c_uint(len(openpgp))))

1890

1831

# New empty GnuTLS certificate

1891

1832

crt = gnutls.library.types.gnutls_openpgp_crt_t()

1892

gnutls.library.functions.gnutls_openpgp_crt_init(

1893

ctypes.byref(crt))

1833

(gnutls.library.functions

1834

.gnutls_openpgp_crt_init(ctypes.byref(crt)))

1894

1835

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

1836

(gnutls.library.functions

1837

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

1838

gnutls.library.constants

1839

.GNUTLS_OPENPGP_FMT_RAW))

1898

1840

# Verify the self signature in the key

1899

1841

crtverify = ctypes.c_uint()

1900

gnutls.library.functions.gnutls_openpgp_crt_verify_self(

1901

crt, 0, ctypes.byref(crtverify))

1842

(gnutls.library.functions

1843

.gnutls_openpgp_crt_verify_self(crt, 0,

1844

ctypes.byref(crtverify)))

1902

1845

if crtverify.value != 0:

1903

1846

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1904

raise gnutls.errors.CertificateSecurityError(

1905

"Verify failed")

1847

raise (gnutls.errors.CertificateSecurityError

1848

("Verify failed"))

1906

1849

# New buffer for the fingerprint

1907

1850

buf = ctypes.create_string_buffer(20)

1908

1851

buf_len = ctypes.c_size_t()

1909

1852

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

1853

(gnutls.library.functions

1854

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

1855

ctypes.byref(buf_len)))

1912

1856

# Deinit the certificate

1913

1857

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1914

1858

# Convert the buffer to a Python bytestring

1920

1864

1921

1865

class MultiprocessingMixIn(object):

1922

1866

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

1923

1924

1867

def sub_process_main(self, request, address):

1925

1868

try:

1926

1869

self.finish_request(request, address)

1938

1881

1939

1882

class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):

1940

1883

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

1941

1942

1884

def process_request(self, request, client_address):

1943

1885

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

1944

1886

1965

1907

interface: None or a network interface name (string)

1966

1908

use_ipv6: Boolean; to use IPv6 or not

1967

1909

"""

1968

1969

1910

def __init__(self, server_address, RequestHandlerClass,

1970

interface=None,

1971

use_ipv6=True,

1972

socketfd=None):

1911

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

1973

1912

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

1974

1913

creating a new one with socket.socket().

1975

1914

"""

2016

1955

self.interface)

2017

1956

else:

2018

1957

try:

2019

self.socket.setsockopt(

2020

socket.SOL_SOCKET, SO_BINDTODEVICE,

2021

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

1958

self.socket.setsockopt(socket.SOL_SOCKET,

1959

SO_BINDTODEVICE,

1960

(self.interface + "\0")

1961

.encode("utf-8"))

2022

1962

except socket.error as error:

2023

1963

if error.errno == errno.EPERM:

2024

1964

logger.error("No permission to bind to"

2042

1982

self.server_address = (any_address,

2043

1983

self.server_address[1])

2044

1984

elif not self.server_address[1]:

2045

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

1985

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

1986

0)

2046

1987

# if self.interface:

2047

1988

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

2048

1989

# 0, # port

2062

2003

2063

2004

Assumes a gobject.MainLoop event loop.

2064

2005

"""

2065

2066

2006

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

2007

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

2008

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

2073

2009

self.enabled = False

2074

2010

self.clients = clients

2075

2011

if self.clients is None:

2081

2017

interface = interface,

2082

2018

use_ipv6 = use_ipv6,

2083

2019

socketfd = socketfd)

2084

2085

2020

def server_activate(self):

2086

2021

if self.enabled:

2087

2022

return socketserver.TCPServer.server_activate(self)

2091

2026

2092

2027

def add_pipe(self, parent_pipe, proc):

2093

2028

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

2029

gobject.io_add_watch(parent_pipe.fileno(),

2030

gobject.IO_IN | gobject.IO_HUP,

2031

functools.partial(self.handle_ipc,

2032

parent_pipe =

2033

parent_pipe,

2034

proc = proc))

2100

2035

2101

def handle_ipc(self, source, condition,

2102

parent_pipe=None,

2103

proc = None,

2104

client_object=None):

2036

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

2037

proc = None, client_object=None):

2105

2038

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

2106

2039

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

2107

2040

# Wait for other process to exit

2130

2063

parent_pipe.send(False)

2131

2064

return False

2132

2065

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

2066

gobject.io_add_watch(parent_pipe.fileno(),

2067

gobject.IO_IN | gobject.IO_HUP,

2068

functools.partial(self.handle_ipc,

2069

parent_pipe =

2070

parent_pipe,

2071

proc = proc,

2072

client_object =

2073

client))

2140

2074

parent_pipe.send(True)

2141

2075

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

2142

2076

# same fileno

2148

2082

2149

2083

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

2150

2084

funcname)(*args,

2151

**kwargs)))

2085

**kwargs)))

2152

2086

2153

2087

if command == 'getattr':

2154

2088

attrname = request[1]

2155

if isinstance(client_object.__getattribute__(attrname),

2156

collections.Callable):

2157

parent_pipe.send(('function', ))

2089

if callable(client_object.__getattribute__(attrname)):

2090

parent_pipe.send(('function',))

2158

2091

else:

2159

parent_pipe.send((

2160

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

2092

parent_pipe.send(('data', client_object

2093

.__getattribute__(attrname)))

2161

2094

2162

2095

if command == 'setattr':

2163

2096

attrname = request[1]

2194

2127

# avoid excessive use of external libraries.

2195

2128

2196

2129

# 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

2130

Token = collections.namedtuple("Token",

2131

("regexp", # To match token; if

2132

# "value" is not None,

2133

# must have a "group"

2134

# containing digits

2135

"value", # datetime.timedelta or

2136

# None

2137

"followers")) # Tokens valid after

2138

# this token

2202

2139

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

2203

2140

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

2204

2141

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

2205

2142

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

2206

2143

datetime.timedelta(seconds=1),

2207

frozenset((token_end, )))

2144

frozenset((token_end,)))

2208

2145

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

2209

2146

datetime.timedelta(minutes=1),

2210

2147

frozenset((token_second, token_end)))

2226

2163

frozenset((token_month, token_end)))

2227

2164

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

2228

2165

datetime.timedelta(weeks=1),

2229

frozenset((token_end, )))

2166

frozenset((token_end,)))

2230

2167

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

2231

2168

frozenset((token_year, token_month,

2232

2169

token_day, token_time,

2234

2171

# Define starting values

2235

2172

value = datetime.timedelta() # Value so far

2236

2173

found_token = None

2237

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

2174

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

2238

2175

s = duration # String left to parse

2239

2176

# Loop until end token is found

2240

2177

while found_token is not token_end:

2257

2194

break

2258

2195

else:

2259

2196

# No currently valid tokens were found

2260

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

2261

.format(duration))

2197

raise ValueError("Invalid RFC 3339 duration")

2262

2198

# End token found

2263

2199

return value

2264

2200

2301

2237

elif suffix == "w":

2302

2238

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

2303

2239

else:

2304

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

2240

raise ValueError("Unknown suffix {!r}"

2241

.format(suffix))

2305

2242

except IndexError as e:

2306

2243

raise ValueError(*(e.args))

2307

2244

timevalue += delta

2323

2260

# Close all standard open file descriptors

2324

2261

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

2325

2262

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

2326

raise OSError(errno.ENODEV,

2327

"{} not a character device"

2263

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

2328

2264

.format(os.devnull))

2329

2265

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

2330

2266

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

2396

2332

"port": "",

2397

2333

"debug": "False",

2398

2334

"priority":

2399

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

2400

":+SIGN-DSA-SHA256",

2335

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

2401

2336

"servicename": "Mandos",

2402

2337

"use_dbus": "True",

2403

2338

"use_ipv6": "True",

2407

2342

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

2408

2343

"foreground": "False",

2409

2344

"zeroconf": "True",

2410

}

2345

}

2411

2346

2412

2347

# Parse config file for server-global settings

2413

2348

server_config = configparser.SafeConfigParser(server_defaults)

2414

2349

del server_defaults

2415

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

2350

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

2351

"mandos.conf"))

2416

2352

# Convert the SafeConfigParser object to a dict

2417

2353

server_settings = server_config.defaults()

2418

2354

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

2436

2372

# Override the settings from the config file with command line

2437

2373

# options, if set.

2438

2374

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

2439

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

2440

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

2441

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

2375

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

2376

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

2377

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

2442

2378

value = getattr(options, option)

2443

2379

if value is not None:

2444

2380

server_settings[option] = value

2459

2395

2460

2396

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

2461

2397

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

2398

if (not server_settings["zeroconf"] and

2399

not (server_settings["port"]

2400

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

2401

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

2402

" Zeroconf")

2466

2403

2467

2404

# For convenience

2468

2405

debug = server_settings["debug"]

2484

2421

initlogger(debug, level)

2485

2422

2486

2423

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

2487

syslogger.setFormatter(

2488

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

2489

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

2490

server_settings["servicename"])))

2424

syslogger.setFormatter(logging.Formatter

2425

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

2426

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

2427

.format(server_settings

2428

["servicename"])))

2491

2429

2492

2430

# Parse config file with clients

2493

2431

client_config = configparser.SafeConfigParser(Client

2501

2439

socketfd = None

2502

2440

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

2503

2441

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)

2442

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

2443

server_settings["port"]),

2444

ClientHandler,

2445

interface=(server_settings["interface"]

2446

or None),

2447

use_ipv6=use_ipv6,

2448

gnutls_priority=

2449

server_settings["priority"],

2450

use_dbus=use_dbus,

2451

socketfd=socketfd)

2512

2452

if not foreground:

2513

2453

pidfilename = "/run/mandos.pid"

2514

2454

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

2515

2455

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

2516

2456

pidfile = None

2517

2457

try:

2518

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

2458

pidfile = open(pidfilename, "w")

2519

2459

except IOError as e:

2520

2460

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

2521

2461

exc_info=e)

2548

2488

def debug_gnutls(level, string):

2549

2489

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

2550

2490

2551

gnutls.library.functions.gnutls_global_set_log_function(

2552

debug_gnutls)

2491

(gnutls.library.functions

2492

.gnutls_global_set_log_function(debug_gnutls))

2553

2493

2554

2494

# Redirect stdin so all checkers get /dev/null

2555

2495

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

2575

2515

if use_dbus:

2576

2516

try:

2577

2517

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:

2518

bus, do_not_queue=True)

2519

old_bus_name = (dbus.service.BusName

2520

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

2521

do_not_queue=True))

2522

except dbus.exceptions.NameExistsException as e:

2584

2523

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

2585

2524

use_dbus = False

2586

2525

server_settings["use_dbus"] = False

2587

2526

tcp_server.use_dbus = False

2588

2527

if zeroconf:

2589

2528

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)

2529

service = AvahiServiceToSyslog(name =

2530

server_settings["servicename"],

2531

servicetype = "_mandos._tcp",

2532

protocol = protocol, bus = bus)

2595

2533

if server_settings["interface"]:

2596

service.interface = if_nametoindex(

2597

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

2534

service.interface = (if_nametoindex

2535

(server_settings["interface"]

2536

.encode("utf-8")))

2598

2537

2599

2538

global multiprocessing_manager

2600

2539

multiprocessing_manager = multiprocessing.Manager()

2619

2558

if server_settings["restore"]:

2620

2559

try:

2621

2560

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

2622

clients_data, old_client_settings = pickle.load(

2623

stored_state)

2561

clients_data, old_client_settings = (pickle.load

2562

(stored_state))

2624

2563

os.remove(stored_state_path)

2625

2564

except IOError as e:

2626

2565

if e.errno == errno.ENOENT:

2627

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

2628

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

2566

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

2567

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

2629

2568

else:

2630

2569

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

2631

2570

exc_info=e)

2632

2571

raise

2633

2572

except EOFError as e:

2634

2573

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

2635

"EOFError:",

2636

exc_info=e)

2574

"EOFError:", exc_info=e)

2637

2575

2638

2576

with PGPEngine() as pgp:

2639

2577

for client_name, client in clients_data.items():

2651

2589

# For each value in new config, check if it

2652

2590

# differs from the old config value (Except for

2653

2591

# the "secret" attribute)

2654

if (name != "secret"

2655

and (value !=

2656

old_client_settings[client_name][name])):

2592

if (name != "secret" and

2593

value != old_client_settings[client_name]

2594

[name]):

2657

2595

client[name] = value

2658

2596

except KeyError:

2659

2597

pass

2660

2598

2661

2599

# Clients who has passed its expire date can still be

2662

# enabled if its last checker was successful. A Client

2600

# enabled if its last checker was successful. Clients

2663

2601

# whose checker succeeded before we stored its state is

2664

2602

# assumed to have successfully run all checkers during

2665

2603

# downtime.

2668

2606

if not client["last_checked_ok"]:

2669

2607

logger.warning(

2670

2608

"disabling client {} - Client never "

2671

"performed a successful checker".format(

2672

client_name))

2609

"performed a successful checker"

2610

.format(client_name))

2673

2611

client["enabled"] = False

2674

2612

elif client["last_checker_status"] != 0:

2675

2613

logger.warning(

2676

2614

"disabling client {} - Client last"

2677

" checker failed with error code"

2678

" {}".format(

2679

client_name,

2680

client["last_checker_status"]))

2615

" checker failed with error code {}"

2616

.format(client_name,

2617

client["last_checker_status"]))

2681

2618

client["enabled"] = False

2682

2619

else:

2683

client["expires"] = (

2684

datetime.datetime.utcnow()

2685

+ client["timeout"])

2620

client["expires"] = (datetime.datetime

2621

.utcnow()

2622

+ client["timeout"])

2686

2623

logger.debug("Last checker succeeded,"

2687

" keeping {} enabled".format(

2688

client_name))

2624

" keeping {} enabled"

2625

.format(client_name))

2689

2626

try:

2690

client["secret"] = pgp.decrypt(

2691

client["encrypted_secret"],

2692

client_settings[client_name]["secret"])

2627

client["secret"] = (

2628

pgp.decrypt(client["encrypted_secret"],

2629

client_settings[client_name]

2630

["secret"]))

2693

2631

except PGPError:

2694

2632

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

2633

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

2634

.format(client_name))

2635

client["secret"] = (

2636

client_settings[client_name]["secret"])

2699

2637

2700

2638

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

2701

2639

for client_name in (set(old_client_settings)

2708

2646

# Create all client objects

2709

2647

for client_name, client in clients_data.items():

2710

2648

tcp_server.clients[client_name] = client_class(

2711

name = client_name,

2712

settings = client,

2649

name = client_name, settings = client,

2713

2650

server_settings = server_settings)

2714

2651

2715

2652

if not tcp_server.clients:

2717

2654

2718

2655

if not foreground:

2719

2656

if pidfile is not None:

2720

pid = os.getpid()

2721

2657

try:

2722

2658

with pidfile:

2723

print(pid, file=pidfile)

2659

pid = os.getpid()

2660

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

2724

2661

except IOError:

2725

2662

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

2726

2663

pidfilename, pid)

2731

2668

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

2732

2669

2733

2670

if use_dbus:

2734

2735

@alternate_dbus_interfaces(

2736

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

2671

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

2672

"se.bsnet.fukt.Mandos"})

2737

2673

class MandosDBusService(DBusObjectWithProperties):

2738

2674

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

2739

2740

2675

def __init__(self):

2741

2676

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

2742

2743

2677

_interface = "se.recompile.Mandos"

2744

2678

2745

2679

@dbus_interface_annotations(_interface)

2746

2680

def _foo(self):

2747

return {

2748

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

2749

"false" }

2681

return { "org.freedesktop.DBus.Property"

2682

".EmitsChangedSignal":

2683

"false"}

2750

2684

2751

2685

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

2752

2686

def ClientAdded(self, objpath):

2766

2700

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

2767

2701

def GetAllClients(self):

2768

2702

"D-Bus method"

2769

return dbus.Array(c.dbus_object_path for c in

2703

return dbus.Array(c.dbus_object_path

2704

for c in

2770

2705

tcp_server.clients.itervalues())

2771

2706

2772

2707

@dbus.service.method(_interface,

2774

2709

def GetAllClientsWithProperties(self):

2775

2710

"D-Bus method"

2776

2711

return dbus.Dictionary(

2777

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

2778

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

2712

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

2713

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

2779

2714

signature="oa{sv}")

2780

2715

2781

2716

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

2821

2756

# + secret.

2822

2757

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

2823

2758

"checker", "server_settings" }

2824

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

2825

.Object):

2759

for name, typ in (inspect.getmembers

2760

(dbus.service.Object)):

2826

2761

exclude.add(name)

2827

2762

2828

2763

client_dict["encrypted_secret"] = (client

2835

2770

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

2836

2771

2837

2772

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:

2773

with (tempfile.NamedTemporaryFile

2774

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

2775

dir=os.path.dirname(stored_state_path),

2776

delete=False)) as stored_state:

2844

2777

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

2845

tempname = stored_state.name

2778

tempname=stored_state.name

2846

2779

os.rename(tempname, stored_state_path)

2847

2780

except (IOError, OSError) as e:

2848

2781

if not debug:

2867

2800

client.disable(quiet=True)

2868

2801

if use_dbus:

2869

2802

# Emit D-Bus signal

2870

mandos_dbus_service.ClientRemoved(

2871

client.dbus_object_path, client.name)

2803

mandos_dbus_service.ClientRemoved(client

2804

.dbus_object_path,

2805

client.name)

2872

2806

client_settings.clear()

2873

2807

2874

2808

atexit.register(cleanup)

2927

2861

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

2928

2862

cleanup()

2929

2863

2930

2931

2864

if __name__ == '__main__':

2932

2865

main()