/mandos/trunk : revision 748

1

#!/usr/bin/python

1

#!/usr/bin/python2.7

2

# -*- mode: python; coding: utf-8 -*-

3

#

4

# Mandos server - give out binary blobs to connecting clients.

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

46

43

import errno

47

try:

48

import ConfigParser as configparser

49

except ImportError:

50

import configparser

44

import gnutls.crypto

45

import gnutls.connection

46

import gnutls.errors

47

import gnutls.library.functions

48

import gnutls.library.constants

49

import gnutls.library.types

50

import ConfigParser as configparser

51

import sys

52

import re

53

import os

62

import struct

63

import fcntl

64

import functools

65

try:

66

import cPickle as pickle

67

except ImportError:

68

import pickle

65

import cPickle as pickle

69

66

import multiprocessing

70

67

import types

71

68

import binascii

72

69

import tempfile

73

70

import itertools

74

71

import collections

75

import codecs

76

72

77

73

import dbus

78

74

import dbus.service

79

try:

80

import gobject

81

except ImportError:

82

from gi.repository import GObject as gobject

75

import gobject

83

76

import avahi

84

77

from dbus.mainloop.glib import DBusGMainLoop

85

78

import ctypes

98

91

if sys.version_info.major == 2:

99

92

str = unicode

100

93

101

version = "1.7.1"

94

version = "1.6.9"

102

95

stored_state_file = "clients.pickle"

103

96

104

97

logger = logging.getLogger()

151

144

152

145

def __init__(self):

153

146

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

154

self.gpg = "gpg"

155

try:

156

output = subprocess.check_output(["gpgconf"])

157

for line in output.splitlines():

158

name, text, path = line.split(":")

159

if name == "gpg":

160

self.gpg = path

161

break

162

except OSError as e:

163

if e.errno != errno.ENOENT:

164

raise

165

147

self.gnupgargs = ['--batch',

166

'--homedir', self.tempdir,

148

'--home', self.tempdir,

167

149

'--force-mdc',

168

150

'--quiet',

169

151

'--no-use-agent']

208

190

dir=self.tempdir) as passfile:

209

191

passfile.write(passphrase)

210

192

passfile.flush()

211

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

193

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

212

194

'--passphrase-file',

213

195

passfile.name]

214

196

+ self.gnupgargs,

226

208

dir = self.tempdir) as passfile:

227

209

passfile.write(passphrase)

228

210

passfile.flush()

229

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

211

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

230

212

'--passphrase-file',

231

213

passfile.name]

232

214

+ self.gnupgargs,

400

382

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

401

383

self.cleanup()

402

384

elif state == avahi.SERVER_RUNNING:

403

try:

404

self.add()

405

except dbus.exceptions.DBusException as error:

406

if (error.get_dbus_name()

407

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

408

logger.info("Local Zeroconf service name"

409

" collision.")

410

return self.rename(remove=False)

411

else:

412

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

413

self.cleanup()

414

os._exit(1)

385

self.add()

415

386

else:

416

387

if error is None:

417

388

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

440

411

.format(self.name)))

441

412

return ret

442

413

443

# Pretend that we have a GnuTLS module

444

class GnuTLS(object):

445

"""This isn't so much a class as it is a module-like namespace.

446

It is instantiated once, and simulates having a GnuTLS module."""

447

448

_library = ctypes.cdll.LoadLibrary(

449

ctypes.util.find_library("gnutls"))

450

_need_version = "3.3.0"

451

def __init__(self):

452

# Need to use class name "GnuTLS" here, since this method is

453

# called before the assignment to the "gnutls" global variable

454

# happens.

455

if GnuTLS.check_version(self._need_version) is None:

456

raise GnuTLS.Error("Needs GnuTLS {} or later"

457

.format(self._need_version))

458

459

# Unless otherwise indicated, the constants and types below are

460

# all from the gnutls/gnutls.h C header file.

461

462

# Constants

463

E_SUCCESS = 0

464

E_INTERRUPTED = -52

465

E_AGAIN = -28

466

CRT_OPENPGP = 2

467

CLIENT = 2

468

SHUT_RDWR = 0

469

CRD_CERTIFICATE = 1

470

E_NO_CERTIFICATE_FOUND = -49

471

OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h

472

473

# Types

474

class session_int(ctypes.Structure):

475

_fields_ = []

476

session_t = ctypes.POINTER(session_int)

477

class certificate_credentials_st(ctypes.Structure):

478

_fields_ = []

479

certificate_credentials_t = ctypes.POINTER(

480

certificate_credentials_st)

481

certificate_type_t = ctypes.c_int

482

class datum_t(ctypes.Structure):

483

_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),

484

('size', ctypes.c_uint)]

485

class openpgp_crt_int(ctypes.Structure):

486

_fields_ = []

487

openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)

488

openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h

489

log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)

490

credentials_type_t = ctypes.c_int #

491

transport_ptr_t = ctypes.c_void_p

492

close_request_t = ctypes.c_int

493

494

# Exceptions

495

class Error(Exception):

496

# We need to use the class name "GnuTLS" here, since this

497

# exception might be raised from within GnuTLS.__init__,

498

# which is called before the assignment to the "gnutls"

499

# global variable has happened.

500

def __init__(self, message = None, code = None, args=()):

501

# Default usage is by a message string, but if a return

502

# code is passed, convert it to a string with

503

# gnutls.strerror()

504

self.code = code

505

if message is None and code is not None:

506

message = GnuTLS.strerror(code)

507

return super(GnuTLS.Error, self).__init__(

508

message, *args)

509

510

class CertificateSecurityError(Error):

511

pass

512

513

# Classes

514

class Credentials(object):

515

def __init__(self):

516

self._c_object = gnutls.certificate_credentials_t()

517

gnutls.certificate_allocate_credentials(

518

ctypes.byref(self._c_object))

519

self.type = gnutls.CRD_CERTIFICATE

520

521

def __del__(self):

522

gnutls.certificate_free_credentials(self._c_object)

523

524

class ClientSession(object):

525

def __init__(self, socket, credentials = None):

526

self._c_object = gnutls.session_t()

527

gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)

528

gnutls.set_default_priority(self._c_object)

529

gnutls.transport_set_ptr(self._c_object, socket.fileno())

530

gnutls.handshake_set_private_extensions(self._c_object,

531

True)

532

self.socket = socket

533

if credentials is None:

534

credentials = gnutls.Credentials()

535

gnutls.credentials_set(self._c_object, credentials.type,

536

ctypes.cast(credentials._c_object,

537

ctypes.c_void_p))

538

self.credentials = credentials

539

540

def __del__(self):

541

gnutls.deinit(self._c_object)

542

543

def handshake(self):

544

return gnutls.handshake(self._c_object)

545

546

def send(self, data):

547

data = bytes(data)

548

data_len = len(data)

549

while data_len > 0:

550

data_len -= gnutls.record_send(self._c_object,

551

data[-data_len:],

552

data_len)

553

554

def bye(self):

555

return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)

556

557

# Error handling functions

558

def _error_code(result):

559

"""A function to raise exceptions on errors, suitable

560

for the 'restype' attribute on ctypes functions"""

561

if result >= 0:

562

return result

563

if result == gnutls.E_NO_CERTIFICATE_FOUND:

564

raise gnutls.CertificateSecurityError(code = result)

565

raise gnutls.Error(code = result)

566

567

def _retry_on_error(result, func, arguments):

568

"""A function to retry on some errors, suitable

569

for the 'errcheck' attribute on ctypes functions"""

570

while result < 0:

571

if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):

572

return _error_code(result)

573

result = func(*arguments)

574

return result

575

576

# Unless otherwise indicated, the function declarations below are

577

# all from the gnutls/gnutls.h C header file.

578

579

# Functions

580

priority_set_direct = _library.gnutls_priority_set_direct

581

priority_set_direct.argtypes = [session_t, ctypes.c_char_p,

582

ctypes.POINTER(ctypes.c_char_p)]

583

priority_set_direct.restype = _error_code

584

585

init = _library.gnutls_init

586

init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]

587

init.restype = _error_code

588

589

set_default_priority = _library.gnutls_set_default_priority

590

set_default_priority.argtypes = [session_t]

591

set_default_priority.restype = _error_code

592

593

record_send = _library.gnutls_record_send

594

record_send.argtypes = [session_t, ctypes.c_void_p,

595

ctypes.c_size_t]

596

record_send.restype = ctypes.c_ssize_t

597

record_send.errcheck = _retry_on_error

598

599

certificate_allocate_credentials = (

600

_library.gnutls_certificate_allocate_credentials)

601

certificate_allocate_credentials.argtypes = [

602

ctypes.POINTER(certificate_credentials_t)]

603

certificate_allocate_credentials.restype = _error_code

604

605

certificate_free_credentials = (

606

_library.gnutls_certificate_free_credentials)

607

certificate_free_credentials.argtypes = [certificate_credentials_t]

608

certificate_free_credentials.restype = None

609

610

handshake_set_private_extensions = (

611

_library.gnutls_handshake_set_private_extensions)

612

handshake_set_private_extensions.argtypes = [session_t,

613

ctypes.c_int]

614

handshake_set_private_extensions.restype = None

615

616

credentials_set = _library.gnutls_credentials_set

617

credentials_set.argtypes = [session_t, credentials_type_t,

618

ctypes.c_void_p]

619

credentials_set.restype = _error_code

620

621

strerror = _library.gnutls_strerror

622

strerror.argtypes = [ctypes.c_int]

623

strerror.restype = ctypes.c_char_p

624

625

certificate_type_get = _library.gnutls_certificate_type_get

626

certificate_type_get.argtypes = [session_t]

627

certificate_type_get.restype = _error_code

628

629

certificate_get_peers = _library.gnutls_certificate_get_peers

630

certificate_get_peers.argtypes = [session_t,

631

ctypes.POINTER(ctypes.c_uint)]

632

certificate_get_peers.restype = ctypes.POINTER(datum_t)

633

634

global_set_log_level = _library.gnutls_global_set_log_level

635

global_set_log_level.argtypes = [ctypes.c_int]

636

global_set_log_level.restype = None

637

638

global_set_log_function = _library.gnutls_global_set_log_function

639

global_set_log_function.argtypes = [log_func]

640

global_set_log_function.restype = None

641

642

deinit = _library.gnutls_deinit

643

deinit.argtypes = [session_t]

644

deinit.restype = None

645

646

handshake = _library.gnutls_handshake

647

handshake.argtypes = [session_t]

648

handshake.restype = _error_code

649

handshake.errcheck = _retry_on_error

650

651

transport_set_ptr = _library.gnutls_transport_set_ptr

652

transport_set_ptr.argtypes = [session_t, transport_ptr_t]

653

transport_set_ptr.restype = None

654

655

bye = _library.gnutls_bye

656

bye.argtypes = [session_t, close_request_t]

657

bye.restype = _error_code

658

bye.errcheck = _retry_on_error

659

660

check_version = _library.gnutls_check_version

661

check_version.argtypes = [ctypes.c_char_p]

662

check_version.restype = ctypes.c_char_p

663

664

# All the function declarations below are from gnutls/openpgp.h

665

666

openpgp_crt_init = _library.gnutls_openpgp_crt_init

667

openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]

668

openpgp_crt_init.restype = _error_code

669

670

openpgp_crt_import = _library.gnutls_openpgp_crt_import

671

openpgp_crt_import.argtypes = [openpgp_crt_t,

672

ctypes.POINTER(datum_t),

673

openpgp_crt_fmt_t]

674

openpgp_crt_import.restype = _error_code

675

676

openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self

677

openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,

678

ctypes.POINTER(ctypes.c_uint)]

679

openpgp_crt_verify_self.restype = _error_code

680

681

openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit

682

openpgp_crt_deinit.argtypes = [openpgp_crt_t]

683

openpgp_crt_deinit.restype = None

684

685

openpgp_crt_get_fingerprint = (

686

_library.gnutls_openpgp_crt_get_fingerprint)

687

openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,

688

ctypes.c_void_p,

689

ctypes.POINTER(

690

ctypes.c_size_t)]

691

openpgp_crt_get_fingerprint.restype = _error_code

692

693

# Remove non-public functions

694

del _error_code, _retry_on_error

695

# Create the global "gnutls" object, simulating a module

696

gnutls = GnuTLS()

697

698

def call_pipe(connection, # : multiprocessing.Connection

699

func, *args, **kwargs):

700

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

701

702

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

703

return value on the provided multiprocessing.Connection.

704

"""

705

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

706

connection.close()

707

414

708

415

class Client(object):

709

416

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

736

443

last_checker_status: integer between 0 and 255 reflecting exit

737

444

status of last checker. -1 reflects crashed

738

445

checker, -2 means no checker completed yet.

739

last_checker_signal: The signal which killed the last checker, if

740

last_checker_status is -1

741

446

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

742

447

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

743

448

D-Bus identifiers

917

622

# Also start a new checker *right now*.

918

623

self.start_checker()

919

624

920

def checker_callback(self, source, condition, connection,

921

command):

625

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

922

626

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

923

627

self.checker_callback_tag = None

924

628

self.checker = None

925

# Read return code from connection (see call_pipe)

926

returncode = connection.recv()

927

connection.close()

928

929

if returncode >= 0:

930

self.last_checker_status = returncode

931

self.last_checker_signal = None

629

if os.WIFEXITED(condition):

630

self.last_checker_status = os.WEXITSTATUS(condition)

932

631

if self.last_checker_status == 0:

933

632

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

934

633

vars(self))

937

636

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

938

637

else:

939

638

self.last_checker_status = -1

940

self.last_checker_signal = -returncode

941

639

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

942

640

vars(self))

943

return False

944

641

945

642

def checked_ok(self):

946

643

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

947

644

self.last_checked_ok = datetime.datetime.utcnow()

948

645

self.last_checker_status = 0

949

self.last_checker_signal = None

950

646

self.bump_timeout()

951

647

952

648

def bump_timeout(self, timeout=None):

978

674

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

979

675

# should be.

980

676

981

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

982

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

983

self.checker.join()

984

self.checker = None

677

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

678

try:

679

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

680

except AttributeError:

681

pass

682

except OSError as error:

683

if error.errno != errno.ECHILD:

684

raise

685

else:

686

if pid:

687

logger.warning("Checker was a zombie")

688

gobject.source_remove(self.checker_callback_tag)

689

self.checker_callback(pid, status,

690

self.current_checker_command)

985

691

# Start a new checker if needed

986

692

if self.checker is None:

987

693

# Escape attributes for the shell

996

702

exc_info=error)

997

703

return True # Try again later

998

704

self.current_checker_command = command

999

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

1000

self.name)

1001

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

1002

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

1003

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

1004

# always replaced by /dev/null.)

1005

# The exception is when not debugging but nevertheless

1006

# running in the foreground; use the previously

1007

# created wnull.

1008

popen_args = { "close_fds": True,

1009

"shell": True,

1010

"cwd": "/" }

1011

if (not self.server_settings["debug"]

1012

and self.server_settings["foreground"]):

1013

popen_args.update({"stdout": wnull,

1014

"stderr": wnull })

1015

pipe = multiprocessing.Pipe(duplex = False)

1016

self.checker = multiprocessing.Process(

1017

target = call_pipe,

1018

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

1019

kwargs = popen_args)

1020

self.checker.start()

1021

self.checker_callback_tag = gobject.io_add_watch(

1022

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

1023

self.checker_callback, pipe[0], command)

705

try:

706

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

707

self.name)

708

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

709

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

710

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

711

# always replaced by /dev/null.)

712

# The exception is when not debugging but nevertheless

713

# running in the foreground; use the previously

714

# created wnull.

715

popen_args = {}

716

if (not self.server_settings["debug"]

717

and self.server_settings["foreground"]):

718

popen_args.update({"stdout": wnull,

719

"stderr": wnull })

720

self.checker = subprocess.Popen(command,

721

close_fds=True,

722

shell=True,

723

cwd="/",

724

**popen_args)

725

except OSError as error:

726

logger.error("Failed to start subprocess",

727

exc_info=error)

728

return True

729

self.checker_callback_tag = gobject.child_watch_add(

730

self.checker.pid, self.checker_callback, data=command)

731

# The checker may have completed before the gobject

732

# watch was added. Check for this.

733

try:

734

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

735

except OSError as error:

736

if error.errno == errno.ECHILD:

737

# This should never happen

738

logger.error("Child process vanished",

739

exc_info=error)

740

return True

741

raise

742

if pid:

743

gobject.source_remove(self.checker_callback_tag)

744

self.checker_callback(pid, status, command)

1024

745

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

1025

746

return True

1026

747

1032

753

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

1033

754

return

1034

755

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

1035

self.checker.terminate()

756

try:

757

self.checker.terminate()

758

#time.sleep(0.5)

759

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

760

# self.checker.kill()

761

except OSError as error:

762

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

763

raise

1036

764

self.checker = None

1037

765

1038

766

1102

830

access="r")

1103

831

def Property_dbus_property(self):

1104

832

return dbus.Boolean(False)

1105

1106

See also the DBusObjectWithAnnotations class.

1107

833

"""

1108

834

1109

835

def decorator(func):

1131

857

pass

1132

858

1133

859

1134

class DBusObjectWithAnnotations(dbus.service.Object):

1135

"""A D-Bus object with annotations.

860

class DBusObjectWithProperties(dbus.service.Object):

861

"""A D-Bus object with properties.

1136

862

1137

Classes inheriting from this can use the dbus_annotations

1138

decorator to add annotations to methods or signals.

863

Classes inheriting from this can use the dbus_service_property

864

decorator to expose methods as D-Bus properties. It exposes the

865

standard Get(), Set(), and GetAll() methods on the D-Bus.

1139

866

"""

1140

867

1141

868

@staticmethod

1157

884

for name, athing in

1158

885

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

1159

886

1160

@dbus.service.method(dbus.INTROSPECTABLE_IFACE,

1161

out_signature = "s",

1162

path_keyword = 'object_path',

1163

connection_keyword = 'connection')

1164

def Introspect(self, object_path, connection):

1165

"""Overloading of standard D-Bus method.

1166

1167

Inserts annotation tags on methods and signals.

1168

"""

1169

xmlstring = dbus.service.Object.Introspect(self, object_path,

1170

connection)

1171

try:

1172

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

1173

1174

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

1175

# Add annotation tags

1176

for typ in ("method", "signal"):

1177

for tag in if_tag.getElementsByTagName(typ):

1178

annots = dict()

1179

for name, prop in (self.

1180

_get_all_dbus_things(typ)):

1181

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

1182

and prop._dbus_interface

1183

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

1184

annots.update(getattr(

1185

prop, "_dbus_annotations", {}))

1186

for name, value in annots.items():

1187

ann_tag = document.createElement(

1188

"annotation")

1189

ann_tag.setAttribute("name", name)

1190

ann_tag.setAttribute("value", value)

1191

tag.appendChild(ann_tag)

1192

# Add interface annotation tags

1193

for annotation, value in dict(

1194

itertools.chain.from_iterable(

1195

annotations().items()

1196

for name, annotations

1197

in self._get_all_dbus_things("interface")

1198

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

1199

)).items():

1200

ann_tag = document.createElement("annotation")

1201

ann_tag.setAttribute("name", annotation)

1202

ann_tag.setAttribute("value", value)

1203

if_tag.appendChild(ann_tag)

1204

# Fix argument name for the Introspect method itself

1205

if (if_tag.getAttribute("name")

1206

== dbus.INTROSPECTABLE_IFACE):

1207

for cn in if_tag.getElementsByTagName("method"):

1208

if cn.getAttribute("name") == "Introspect":

1209

for arg in cn.getElementsByTagName("arg"):

1210

if (arg.getAttribute("direction")

1211

== "out"):

1212

arg.setAttribute("name",

1213

"xml_data")

1214

xmlstring = document.toxml("utf-8")

1215

document.unlink()

1216

except (AttributeError, xml.dom.DOMException,

1217

xml.parsers.expat.ExpatError) as error:

1218

logger.error("Failed to override Introspection method",

1219

exc_info=error)

1220

return xmlstring

1221

1222

1223

class DBusObjectWithProperties(DBusObjectWithAnnotations):

1224

"""A D-Bus object with properties.

1225

1226

Classes inheriting from this can use the dbus_service_property

1227

decorator to expose methods as D-Bus properties. It exposes the

1228

standard Get(), Set(), and GetAll() methods on the D-Bus.

1229

"""

1230

1231

887

def _get_dbus_property(self, interface_name, property_name):

1232

888

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

1233

889

property with the specified name and interface.

1243

899

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

1244

900

self.dbus_object_path, interface_name, property_name))

1245

901

1246

@classmethod

1247

def _get_all_interface_names(cls):

1248

"""Get a sequence of all interfaces supported by an object"""

1249

return (name for name in set(getattr(getattr(x, attr),

1250

"_dbus_interface", None)

1251

for x in (inspect.getmro(cls))

1252

for attr in dir(x))

1253

if name is not None)

1254

1255

902

@dbus.service.method(dbus.PROPERTIES_IFACE,

1256

903

in_signature="ss",

1257

904

out_signature="v")

1327

974

1328

975

Inserts property tags and interface annotation tags.

1329

976

"""

1330

xmlstring = DBusObjectWithAnnotations.Introspect(self,

1331

object_path,

1332

connection)

977

xmlstring = dbus.service.Object.Introspect(self, object_path,

978

connection)

1333

979

try:

1334

980

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

1335

981

1348

994

if prop._dbus_interface

1349

995

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

1350

996

if_tag.appendChild(tag)

1351

# Add annotation tags for properties

1352

for tag in if_tag.getElementsByTagName("property"):

1353

annots = dict()

1354

for name, prop in self._get_all_dbus_things(

1355

"property"):

1356

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

1357

and prop._dbus_interface

1358

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

1359

annots.update(getattr(

1360

prop, "_dbus_annotations", {}))

1361

for name, value in annots.items():

1362

ann_tag = document.createElement(

1363

"annotation")

1364

ann_tag.setAttribute("name", name)

1365

ann_tag.setAttribute("value", value)

1366

tag.appendChild(ann_tag)

997

# Add annotation tags

998

for typ in ("method", "signal", "property"):

999

for tag in if_tag.getElementsByTagName(typ):

1000

annots = dict()

1001

for name, prop in (self.

1002

_get_all_dbus_things(typ)):

1003

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

1004

and prop._dbus_interface

1005

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

1006

annots.update(getattr(

1007

prop, "_dbus_annotations", {}))

1008

for name, value in annots.items():

1009

ann_tag = document.createElement(

1010

"annotation")

1011

ann_tag.setAttribute("name", name)

1012

ann_tag.setAttribute("value", value)

1013

tag.appendChild(ann_tag)

1014

# Add interface annotation tags

1015

for annotation, value in dict(

1016

itertools.chain.from_iterable(

1017

annotations().items()

1018

for name, annotations

1019

in self._get_all_dbus_things("interface")

1020

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

1021

)).items():

1022

ann_tag = document.createElement("annotation")

1023

ann_tag.setAttribute("name", annotation)

1024

ann_tag.setAttribute("value", value)

1025

if_tag.appendChild(ann_tag)

1367

1026

# Add the names to the return values for the

1368

1027

# "org.freedesktop.DBus.Properties" methods

1369

1028

if (if_tag.getAttribute("name")

1387

1046

exc_info=error)

1388

1047

return xmlstring

1389

1048

1390

try:

1391

dbus.OBJECT_MANAGER_IFACE

1392

except AttributeError:

1393

dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"

1394

1395

class DBusObjectWithObjectManager(DBusObjectWithAnnotations):

1396

"""A D-Bus object with an ObjectManager.

1397

1398

Classes inheriting from this exposes the standard

1399

GetManagedObjects call and the InterfacesAdded and

1400

InterfacesRemoved signals on the standard

1401

"org.freedesktop.DBus.ObjectManager" interface.

1402

1403

Note: No signals are sent automatically; they must be sent

1404

manually.

1405

"""

1406

@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,

1407

out_signature = "a{oa{sa{sv}}}")

1408

def GetManagedObjects(self):

1409

"""This function must be overridden"""

1410

raise NotImplementedError()

1411

1412

@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,

1413

signature = "oa{sa{sv}}")

1414

def InterfacesAdded(self, object_path, interfaces_and_properties):

1415

pass

1416

1417

@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")

1418

def InterfacesRemoved(self, object_path, interfaces):

1419

pass

1420

1421

@dbus.service.method(dbus.INTROSPECTABLE_IFACE,

1422

out_signature = "s",

1423

path_keyword = 'object_path',

1424

connection_keyword = 'connection')

1425

def Introspect(self, object_path, connection):

1426

"""Overloading of standard D-Bus method.

1427

1428

Override return argument name of GetManagedObjects to be

1429

"objpath_interfaces_and_properties"

1430

"""

1431

xmlstring = DBusObjectWithAnnotations.Introspect(self,

1432

object_path,

1433

connection)

1434

try:

1435

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

1436

1437

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

1438

# Fix argument name for the GetManagedObjects method

1439

if (if_tag.getAttribute("name")

1440

== dbus.OBJECT_MANAGER_IFACE):

1441

for cn in if_tag.getElementsByTagName("method"):

1442

if (cn.getAttribute("name")

1443

== "GetManagedObjects"):

1444

for arg in cn.getElementsByTagName("arg"):

1445

if (arg.getAttribute("direction")

1446

== "out"):

1447

arg.setAttribute(

1448

"name",

1449

"objpath_interfaces"

1450

"_and_properties")

1451

xmlstring = document.toxml("utf-8")

1452

document.unlink()

1453

except (AttributeError, xml.dom.DOMException,

1454

xml.parsers.expat.ExpatError) as error:

1455

logger.error("Failed to override Introspection method",

1456

exc_info = error)

1457

return xmlstring

1458

1049

1459

1050

def datetime_to_dbus(dt, variant_level=0):

1460

1051

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

1507

1098

interface_names.add(alt_interface)

1508

1099

# Is this a D-Bus signal?

1509

1100

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

1510

if sys.version_info.major == 2:

1511

# Extract the original non-method undecorated

1512

# function by black magic

1513

nonmethod_func = (dict(

1514

zip(attribute.func_code.co_freevars,

1515

attribute.__closure__))

1516

["func"].cell_contents)

1517

else:

1518

nonmethod_func = attribute

1101

# Extract the original non-method undecorated

1102

# function by black magic

1103

nonmethod_func = (dict(

1104

zip(attribute.func_code.co_freevars,

1105

attribute.__closure__))

1106

["func"].cell_contents)

1519

1107

# Create a new, but exactly alike, function

1520

1108

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

1521

1109

# with the alternate D-Bus interface name

1522

if sys.version_info.major == 2:

1523

new_function = types.FunctionType(

1524

nonmethod_func.func_code,

1525

nonmethod_func.func_globals,

1526

nonmethod_func.func_name,

1527

nonmethod_func.func_defaults,

1528

nonmethod_func.func_closure)

1529

else:

1530

new_function = types.FunctionType(

1531

nonmethod_func.__code__,

1532

nonmethod_func.__globals__,

1533

nonmethod_func.__name__,

1534

nonmethod_func.__defaults__,

1535

nonmethod_func.__closure__)

1536

1110

new_function = (dbus.service.signal(

1537

alt_interface,

1538

attribute._dbus_signature)(new_function))

1111

alt_interface, attribute._dbus_signature)

1112

(types.FunctionType(

1113

nonmethod_func.func_code,

1114

nonmethod_func.func_globals,

1115

nonmethod_func.func_name,

1116

nonmethod_func.func_defaults,

1117

nonmethod_func.func_closure)))

1539

1118

# Copy annotations, if any

1540

1119

try:

1541

1120

new_function._dbus_annotations = dict(

1551

1130

func1 and func2 to the "call_both" function

1552

1131

outside of its arguments"""

1553

1132

1554

@functools.wraps(func2)

1555

1133

def call_both(*args, **kwargs):

1556

1134

"""This function will emit two D-Bus

1557

1135

signals by calling func1 and func2"""

1558

1136

func1(*args, **kwargs)

1559

1137

func2(*args, **kwargs)

1560

# Make wrapper function look like a D-Bus signal

1561

for name, attr in inspect.getmembers(func2):

1562

if name.startswith("_dbus_"):

1563

setattr(call_both, name, attr)

1564

1138

1565

1139

return call_both

1566

1140

# Create the "call_both" function and add it to

1769

1343

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

1770

1344

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

1771

1345

1772

def checker_callback(self, source, condition,

1773

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

1774

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

1775

connection, command, *args,

1776

**kwargs)

1777

exitstatus = self.last_checker_status

1778

if exitstatus >= 0:

1346

def checker_callback(self, pid, condition, command,

1347

*args, **kwargs):

1348

self.checker_callback_tag = None

1349

self.checker = None

1350

if os.WIFEXITED(condition):

1351

exitstatus = os.WEXITSTATUS(condition)

1779

1352

# Emit D-Bus signal

1780

1353

self.CheckerCompleted(dbus.Int16(exitstatus),

1781

# This is specific to GNU libC

1782

dbus.Int64(exitstatus << 8),

1354

dbus.Int64(condition),

1783

1355

dbus.String(command))

1784

1356

else:

1785

1357

# Emit D-Bus signal

1786

1358

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

1787

dbus.Int64(

1788

# This is specific to GNU libC

1789

(exitstatus << 8)

1790

| self.last_checker_signal),

1359

dbus.Int64(condition),

1791

1360

dbus.String(command))

1792

return ret

1361

1362

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

1363

*args, **kwargs)

1793

1364

1794

1365

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

1795

1366

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

1870

1441

self.checked_ok()

1871

1442

1872

1443

# Enable - method

1873

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

1874

1444

@dbus.service.method(_interface)

1875

1445

def Enable(self):

1876

1446

"D-Bus method"

1877

1447

self.enable()

1878

1448

1879

1449

# StartChecker - method

1880

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

1881

1450

@dbus.service.method(_interface)

1882

1451

def StartChecker(self):

1883

1452

"D-Bus method"

1884

1453

self.start_checker()

1885

1454

1886

1455

# Disable - method

1887

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

1888

1456

@dbus.service.method(_interface)

1889

1457

def Disable(self):

1890

1458

"D-Bus method"

1891

1459

self.disable()

1892

1460

1893

1461

# StopChecker - method

1894

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

1895

1462

@dbus.service.method(_interface)

1896

1463

def StopChecker(self):

1897

1464

self.stop_checker()

1933

1500

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

1934

1501

1935

1502

# Name - property

1936

@dbus_annotations(

1937

{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})

1938

1503

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

1939

1504

def Name_dbus_property(self):

1940

1505

return dbus.String(self.name)

1941

1506

1942

1507

# Fingerprint - property

1943

@dbus_annotations(

1944

{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})

1945

1508

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

1946

1509

def Fingerprint_dbus_property(self):

1947

1510

return dbus.String(self.fingerprint)

1956

1519

self.host = str(value)

1957

1520

1958

1521

# Created - property

1959

@dbus_annotations(

1960

{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})

1961

1522

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

1962

1523

def Created_dbus_property(self):

1963

1524

return datetime_to_dbus(self.created)

2078

1639

self.stop_checker()

2079

1640

2080

1641

# ObjectPath - property

2081

@dbus_annotations(

2082

{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",

2083

"org.freedesktop.DBus.Deprecated": "true"})

2084

1642

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

2085

1643

def ObjectPath_dbus_property(self):

2086

1644

return self.dbus_object_path # is already a dbus.ObjectPath

2087

1645

2088

1646

# Secret = property

2089

@dbus_annotations(

2090

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

2091

"invalidates"})

2092

1647

@dbus_service_property(_interface,

2093

1648

signature="ay",

2094

1649

access="write",

2104

1659

self._pipe = child_pipe

2105

1660

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

2106

1661

if not self._pipe.recv():

2107

raise KeyError(fpr)

1662

raise KeyError()

2108

1663

2109

1664

def __getattribute__(self, name):

2110

1665

if name == '_pipe':

2140

1695

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

2141

1696

self.server.child_pipe.fileno())

2142

1697

2143

session = gnutls.ClientSession(self.request)

1698

session = gnutls.connection.ClientSession(

1699

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

1700

1701

# Note: gnutls.connection.X509Credentials is really a

1702

# generic GnuTLS certificate credentials object so long as

1703

# no X.509 keys are added to it. Therefore, we can use it

1704

# here despite using OpenPGP certificates.

2144

1705

2145

1706

#priority = ':'.join(("NONE", "+VERS-TLS1.1",

2146

1707

# "+AES-256-CBC", "+SHA1",

2150

1711

priority = self.server.gnutls_priority

2151

1712

if priority is None:

2152

1713

priority = "NORMAL"

2153

gnutls.priority_set_direct(session._c_object, priority,

2154

None)

1714

gnutls.library.functions.gnutls_priority_set_direct(

1715

session._c_object, priority, None)

2155

1716

2156

1717

# Start communication using the Mandos protocol

2157

1718

# Get protocol number

2167

1728

# Start GnuTLS connection

2168

1729

try:

2169

1730

session.handshake()

2170

except gnutls.Error as error:

1731

except gnutls.errors.GNUTLSError as error:

2171

1732

logger.warning("Handshake failed: %s", error)

2172

1733

# Do not run session.bye() here: the session is not

2173

1734

# established. Just abandon the request.

2179

1740

try:

2180

1741

fpr = self.fingerprint(

2181

1742

self.peer_certificate(session))

2182

except (TypeError, gnutls.Error) as error:

1743

except (TypeError,

1744

gnutls.errors.GNUTLSError) as error:

2183

1745

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

2184

1746

return

2185

1747

logger.debug("Fingerprint: %s", fpr)

2243

1805

else:

2244

1806

delay -= time2 - time

2245

1807

2246

try:

2247

session.send(client.secret)

2248

except gnutls.Error as error:

2249

logger.warning("gnutls send failed",

2250

exc_info = error)

2251

return

1808

sent_size = 0

1809

while sent_size < len(client.secret):

1810

try:

1811

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

1812

except gnutls.errors.GNUTLSError as error:

1813

logger.warning("gnutls send failed",

1814

exc_info=error)

1815

return

1816

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

1817

len(client.secret) - (sent_size

1818

+ sent))

1819

sent_size += sent

2252

1820

2253

1821

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

2254

1822

# bump the timeout using extended_timeout

2262

1830

client.approvals_pending -= 1

2263

1831

try:

2264

1832

session.bye()

2265

except gnutls.Error as error:

1833

except gnutls.errors.GNUTLSError as error:

2266

1834

logger.warning("GnuTLS bye failed",

2267

1835

exc_info=error)

2268

1836

2270

1838

def peer_certificate(session):

2271

1839

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

2272

1840

# If not an OpenPGP certificate...

2273

if (gnutls.certificate_type_get(session._c_object)

2274

!= gnutls.CRT_OPENPGP):

2275

# ...return invalid data

2276

return b""

1841

if (gnutls.library.functions.gnutls_certificate_type_get(

1842

session._c_object)

1843

!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):

1844

# ...do the normal thing

1845

return session.peer_certificate

2277

1846

list_size = ctypes.c_uint(1)

2278

cert_list = (gnutls.certificate_get_peers

1847

cert_list = (gnutls.library.functions

1848

.gnutls_certificate_get_peers

2279

1849

(session._c_object, ctypes.byref(list_size)))

2280

1850

if not bool(cert_list) and list_size.value != 0:

2281

raise gnutls.Error("error getting peer certificate")

1851

raise gnutls.errors.GNUTLSError("error getting peer"

1852

" certificate")

2282

1853

if list_size.value == 0:

2283

1854

return None

2284

1855

cert = cert_list[0]

2288

1859

def fingerprint(openpgp):

2289

1860

"Convert an OpenPGP bytestring to a hexdigit fingerprint"

2290

1861

# New GnuTLS "datum" with the OpenPGP public key

2291

datum = gnutls.datum_t(

1862

datum = gnutls.library.types.gnutls_datum_t(

2292

1863

ctypes.cast(ctypes.c_char_p(openpgp),

2293

1864

ctypes.POINTER(ctypes.c_ubyte)),

2294

1865

ctypes.c_uint(len(openpgp)))

2295

1866

# New empty GnuTLS certificate

2296

crt = gnutls.openpgp_crt_t()

2297

gnutls.openpgp_crt_init(ctypes.byref(crt))

1867

crt = gnutls.library.types.gnutls_openpgp_crt_t()

1868

gnutls.library.functions.gnutls_openpgp_crt_init(

1869

ctypes.byref(crt))

2298

1870

# Import the OpenPGP public key into the certificate

2299

gnutls.openpgp_crt_import(crt, ctypes.byref(datum),

2300

gnutls.OPENPGP_FMT_RAW)

1871

gnutls.library.functions.gnutls_openpgp_crt_import(

1872

crt, ctypes.byref(datum),

1873

gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)

2301

1874

# Verify the self signature in the key

2302

1875

crtverify = ctypes.c_uint()

2303

gnutls.openpgp_crt_verify_self(crt, 0,

2304

ctypes.byref(crtverify))

1876

gnutls.library.functions.gnutls_openpgp_crt_verify_self(

1877

crt, 0, ctypes.byref(crtverify))

2305

1878

if crtverify.value != 0:

2306

gnutls.openpgp_crt_deinit(crt)

2307

raise gnutls.CertificateSecurityError("Verify failed")

1879

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1880

raise gnutls.errors.CertificateSecurityError(

1881

"Verify failed")

2308

1882

# New buffer for the fingerprint

2309

1883

buf = ctypes.create_string_buffer(20)

2310

1884

buf_len = ctypes.c_size_t()

2311

1885

# Get the fingerprint from the certificate into the buffer

2312

gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),

2313

ctypes.byref(buf_len))

1886

gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(

1887

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

2314

1888

# Deinit the certificate

2315

gnutls.openpgp_crt_deinit(crt)

1889

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

2316

1890

# Convert the buffer to a Python bytestring

2317

1891

fpr = ctypes.string_at(buf, buf_len.value)

2318

1892

# Convert the bytestring to hexadecimal notation

2554

2128

2555

2129

if command == 'getattr':

2556

2130

attrname = request[1]

2557

if isinstance(client_object.__getattribute__(attrname),

2558

collections.Callable):

2131

if callable(client_object.__getattribute__(attrname)):

2559

2132

parent_pipe.send(('function', ))

2560

2133

else:

2561

2134

parent_pipe.send((

2596

2169

# avoid excessive use of external libraries.

2597

2170

2598

2171

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

2172

Token = collections.namedtuple("Token",

2173

("regexp", # To match token; if

2174

# "value" is not None,

2175

# must have a "group"

2176

# containing digits

2177

"value", # datetime.timedelta or

2178

# None

2179

"followers")) # Tokens valid after

2180

# this token

2599

2181

Token = collections.namedtuple("Token", (

2600

2182

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

2601

2183

# a "group" containing digits

2636

2218

# Define starting values

2637

2219

value = datetime.timedelta() # Value so far

2638

2220

found_token = None

2639

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

2221

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

2640

2222

s = duration # String left to parse

2641

2223

# Loop until end token is found

2642

2224

while found_token is not token_end:

2659

2241

break

2660

2242

else:

2661

2243

# No currently valid tokens were found

2662

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

2663

.format(duration))

2244

raise ValueError("Invalid RFC 3339 duration")

2664

2245

# End token found

2665

2246

return value

2666

2247

2799

2380

"debug": "False",

2800

2381

"priority":

2801

2382

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

2802

":+SIGN-DSA-SHA256",

2383

":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",

2803

2384

"servicename": "Mandos",

2804

2385

"use_dbus": "True",

2805

2386

"use_ipv6": "True",

2917

2498

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

2918

2499

pidfile = None

2919

2500

try:

2920

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

2501

pidfile = open(pidfilename, "w")

2921

2502

except IOError as e:

2922

2503

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

2923

2504

exc_info=e)

2944

2525

2945

2526

# "Use a log level over 10 to enable all debugging options."

2946

2527

# - GnuTLS manual

2947

gnutls.global_set_log_level(11)

2528

gnutls.library.functions.gnutls_global_set_log_level(11)

2948

2529

2949

@gnutls.log_func

2530

@gnutls.library.types.gnutls_log_func

2950

2531

def debug_gnutls(level, string):

2951

2532

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

2952

2533

2953

gnutls.global_set_log_function(debug_gnutls)

2534

gnutls.library.functions.gnutls_global_set_log_function(

2535

debug_gnutls)

2954

2536

2955

2537

# Redirect stdin so all checkers get /dev/null

2956

2538

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

2981

2563

old_bus_name = dbus.service.BusName(

2982

2564

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

2983

2565

do_not_queue=True)

2984

except dbus.exceptions.DBusException as e:

2566

except dbus.exceptions.NameExistsException as e:

2985

2567

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

2986

2568

use_dbus = False

2987

2569

server_settings["use_dbus"] = False

3060

2642

pass

3061

2643

3062

2644

# Clients who has passed its expire date can still be

3063

# enabled if its last checker was successful. A Client

2645

# enabled if its last checker was successful. Clients

3064

2646

# whose checker succeeded before we stored its state is

3065

2647

# assumed to have successfully run all checkers during

3066

2648

# downtime.

3118

2700

3119

2701

if not foreground:

3120

2702

if pidfile is not None:

3121

pid = os.getpid()

3122

2703

try:

3123

2704

with pidfile:

3124

print(pid, file=pidfile)

2705

pid = os.getpid()

2706

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

3125

2707

except IOError:

3126

2708

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

3127

2709

pidfilename, pid)

3135

2717

3136

2718

@alternate_dbus_interfaces(

3137

2719

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

3138

class MandosDBusService(DBusObjectWithObjectManager):

2720

class MandosDBusService(DBusObjectWithProperties):

3139

2721

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

3140

2722

3141

2723

def __init__(self):

3143

2725

3144

2726

_interface = "se.recompile.Mandos"

3145

2727

2728

@dbus_interface_annotations(_interface)

2729

def _foo(self):

2730

return {

2731

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

2732

"false" }

2733

3146

2734

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

3147

2735

def ClientAdded(self, objpath):

3148

2736

"D-Bus signal"

3153

2741

"D-Bus signal"

3154

2742

pass

3155

2743

3156

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

3157

"true"})

3158

2744

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

3159

2745

def ClientRemoved(self, objpath, name):

3160

2746

"D-Bus signal"

3161

2747

pass

3162

2748

3163

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

3164

"true"})

3165

2749

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

3166

2750

def GetAllClients(self):

3167

2751

"D-Bus method"

3168

2752

return dbus.Array(c.dbus_object_path for c in

3169

2753

tcp_server.clients.itervalues())

3170

2754

3171

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

3172

"true"})

3173

2755

@dbus.service.method(_interface,

3174

2756

out_signature="a{oa{sv}}")

3175

2757

def GetAllClientsWithProperties(self):

3176

2758

"D-Bus method"

3177

2759

return dbus.Dictionary(

3178

{ c.dbus_object_path: c.GetAll(

3179

"se.recompile.Mandos.Client")

2760

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

3180

2761

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

3181

2762

signature="oa{sv}")

3182

2763

3187

2768

if c.dbus_object_path == object_path:

3188

2769

del tcp_server.clients[c.name]

3189

2770

c.remove_from_connection()

3190

# Don't signal the disabling

2771

# Don't signal anything except ClientRemoved

3191

2772

c.disable(quiet=True)

3192

# Emit D-Bus signal for removal

3193

self.client_removed_signal(c)

2773

# Emit D-Bus signal

2774

self.ClientRemoved(object_path, c.name)

3194

2775

return

3195

2776

raise KeyError(object_path)

3196

2777

3197

2778

del _interface

3198

3199

@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,

3200

out_signature = "a{oa{sa{sv}}}")

3201

def GetManagedObjects(self):

3202

"""D-Bus method"""

3203

return dbus.Dictionary(

3204

{ client.dbus_object_path:

3205

dbus.Dictionary(

3206

{ interface: client.GetAll(interface)

3207

for interface in

3208

client._get_all_interface_names()})

3209

for client in tcp_server.clients.values()})

3210

3211

def client_added_signal(self, client):

3212

"""Send the new standard signal and the old signal"""

3213

if use_dbus:

3214

# New standard signal

3215

self.InterfacesAdded(

3216

client.dbus_object_path,

3217

dbus.Dictionary(

3218

{ interface: client.GetAll(interface)

3219

for interface in

3220

client._get_all_interface_names()}))

3221

# Old signal

3222

self.ClientAdded(client.dbus_object_path)

3223

3224

def client_removed_signal(self, client):

3225

"""Send the new standard signal and the old signal"""

3226

if use_dbus:

3227

# New standard signal

3228

self.InterfacesRemoved(

3229

client.dbus_object_path,

3230

client._get_all_interface_names())

3231

# Old signal

3232

self.ClientRemoved(client.dbus_object_path,

3233

client.name)

3234

2779

3235

2780

mandos_dbus_service = MandosDBusService()

3236

2781

3301

2846

name, client = tcp_server.clients.popitem()

3302

2847

if use_dbus:

3303

2848

client.remove_from_connection()

3304

# Don't signal the disabling

2849

# Don't signal anything except ClientRemoved

3305

2850

client.disable(quiet=True)

3306

# Emit D-Bus signal for removal

3307

2851

if use_dbus:

3308

mandos_dbus_service.client_removed_signal(client)

2852

# Emit D-Bus signal

2853

mandos_dbus_service.ClientRemoved(

2854

client.dbus_object_path, client.name)

3309

2855

client_settings.clear()

3310

2856

3311

2857

atexit.register(cleanup)

3312

2858

3313

2859

for client in tcp_server.clients.itervalues():

3314

2860

if use_dbus:

3315

# Emit D-Bus signal for adding

3316

mandos_dbus_service.client_added_signal(client)

2861

# Emit D-Bus signal

2862

mandos_dbus_service.ClientAdded(client.dbus_object_path)

3317

2863

# Need to initiate checking of clients

3318

2864

if client.enabled:

3319

2865

client.init_checker()