/mandos/release : revision 237.7.309

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

44

import argparse

45

import datetime

46

import errno

47

import gnutls.crypto

48

import gnutls.connection

49

import gnutls.errors

50

import gnutls.library.functions

51

import gnutls.library.constants

52

import gnutls.library.types

47

53

try:

48

54

import ConfigParser as configparser

49

55

except ImportError:

77

83

import dbus

78

84

import dbus.service

79

85

try:

80

from gi.repository import GObject

86

import gobject

81

87

except ImportError:

82

import gobject as GObject

88

from gi.repository import GObject as gobject

83

89

import avahi

84

90

from dbus.mainloop.glib import DBusGMainLoop

85

91

import ctypes

98

104

if sys.version_info.major == 2:

99

105

str = unicode

100

106

101

version = "1.7.3"

107

version = "1.6.9"

102

108

stored_state_file = "clients.pickle"

103

109

104

110

logger = logging.getLogger()

151

157

152

158

def __init__(self):

153

159

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

160

self.gnupgargs = ['--batch',

166

'--homedir', self.tempdir,

161

'--home', self.tempdir,

167

162

'--force-mdc',

168

163

'--quiet',

169

164

'--no-use-agent']

208

203

dir=self.tempdir) as passfile:

209

204

passfile.write(passphrase)

210

205

passfile.flush()

211

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

206

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

212

207

'--passphrase-file',

213

208

passfile.name]

214

209

+ self.gnupgargs,

226

221

dir = self.tempdir) as passfile:

227

222

passfile.write(passphrase)

228

223

passfile.flush()

229

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

224

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

230

225

'--passphrase-file',

231

226

passfile.name]

232

227

+ self.gnupgargs,

400

395

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

401

396

self.cleanup()

402

397

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)

398

self.add()

415

399

else:

416

400

if error is None:

417

401

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

440

424

.format(self.name)))

441

425

return ret

442

426

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

427

def call_pipe(connection, # : multiprocessing.Connection

699

428

func, *args, **kwargs):

700

429

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

715

444

checker: subprocess.Popen(); a running checker process used

716

445

to see if the client lives.

717

446

'None' if no process is running.

718

checker_callback_tag: a GObject event source tag, or None

447

checker_callback_tag: a gobject event source tag, or None

719

448

checker_command: string; External command which is run to check

720

449

if client lives. %() expansions are done at

721

450

runtime with vars(self) as dict, so that for

722

451

instance %(name)s can be used in the command.

723

checker_initiator_tag: a GObject event source tag, or None

452

checker_initiator_tag: a gobject event source tag, or None

724

453

created: datetime.datetime(); (UTC) object creation

725

454

client_structure: Object describing what attributes a client has

726

455

and is used for storing the client at exit

727

456

current_checker_command: string; current running checker_command

728

disable_initiator_tag: a GObject event source tag, or None

457

disable_initiator_tag: a gobject event source tag, or None

729

458

enabled: bool()

730

459

fingerprint: string (40 or 32 hexadecimal digits); used to

731

460

uniquely identify the client

885

614

if not quiet:

886

615

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

887

616

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

888

GObject.source_remove(self.disable_initiator_tag)

617

gobject.source_remove(self.disable_initiator_tag)

889

618

self.disable_initiator_tag = None

890

619

self.expires = None

891

620

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

892

GObject.source_remove(self.checker_initiator_tag)

621

gobject.source_remove(self.checker_initiator_tag)

893

622

self.checker_initiator_tag = None

894

623

self.stop_checker()

895

624

self.enabled = False

896

625

if not quiet:

897

626

self.send_changedstate()

898

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

627

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

899

628

return False

900

629

901

630

def __del__(self):

905

634

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

906

635

# and every interval from then on.

907

636

if self.checker_initiator_tag is not None:

908

GObject.source_remove(self.checker_initiator_tag)

909

self.checker_initiator_tag = GObject.timeout_add(

637

gobject.source_remove(self.checker_initiator_tag)

638

self.checker_initiator_tag = gobject.timeout_add(

910

639

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

911

640

self.start_checker)

912

641

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

913

642

if self.disable_initiator_tag is not None:

914

GObject.source_remove(self.disable_initiator_tag)

915

self.disable_initiator_tag = GObject.timeout_add(

643

gobject.source_remove(self.disable_initiator_tag)

644

self.disable_initiator_tag = gobject.timeout_add(

916

645

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

917

646

# Also start a new checker *right now*.

918

647

self.start_checker()

954

683

if timeout is None:

955

684

timeout = self.timeout

956

685

if self.disable_initiator_tag is not None:

957

GObject.source_remove(self.disable_initiator_tag)

686

gobject.source_remove(self.disable_initiator_tag)

958

687

self.disable_initiator_tag = None

959

688

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

960

self.disable_initiator_tag = GObject.timeout_add(

689

self.disable_initiator_tag = gobject.timeout_add(

961

690

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

962

691

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

963

692

1018

747

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

1019

748

kwargs = popen_args)

1020

749

self.checker.start()

1021

self.checker_callback_tag = GObject.io_add_watch(

1022

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

750

self.checker_callback_tag = gobject.io_add_watch(

751

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

1023

752

self.checker_callback, pipe[0], command)

1024

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

753

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

1025

754

return True

1026

755

1027

756

def stop_checker(self):

1028

757

"""Force the checker process, if any, to stop."""

1029

758

if self.checker_callback_tag:

1030

GObject.source_remove(self.checker_callback_tag)

759

gobject.source_remove(self.checker_callback_tag)

1031

760

self.checker_callback_tag = None

1032

761

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

1033

762

return

1102

831

access="r")

1103

832

def Property_dbus_property(self):

1104

833

return dbus.Boolean(False)

1105

1106

See also the DBusObjectWithAnnotations class.

1107

834

"""

1108

835

1109

836

def decorator(func):

1131

858

pass

1132

859

1133

860

1134

class DBusObjectWithAnnotations(dbus.service.Object):

1135

"""A D-Bus object with annotations.

861

class DBusObjectWithProperties(dbus.service.Object):

862

"""A D-Bus object with properties.

1136

863

1137

Classes inheriting from this can use the dbus_annotations

1138

decorator to add annotations to methods or signals.

864

Classes inheriting from this can use the dbus_service_property

865

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

866

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

1139

867

"""

1140

868

1141

869

@staticmethod

1157

885

for name, athing in

1158

886

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

1159

887

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

888

def _get_dbus_property(self, interface_name, property_name):

1232

889

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

1233

890

property with the specified name and interface.

1243

900

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

1244

901

self.dbus_object_path, interface_name, property_name))

1245

902

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

903

@dbus.service.method(dbus.PROPERTIES_IFACE,

1256

904

in_signature="ss",

1257

905

out_signature="v")

1327

975

1328

976

Inserts property tags and interface annotation tags.

1329

977

"""

1330

xmlstring = DBusObjectWithAnnotations.Introspect(self,

1331

object_path,

1332

connection)

978

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

979

connection)

1333

980

try:

1334

981

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

1335

982

1348

995

if prop._dbus_interface

1349

996

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

1350

997

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)

998

# Add annotation tags

999

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

1000

for tag in if_tag.getElementsByTagName(typ):

1001

annots = dict()

1002

for name, prop in (self.

1003

_get_all_dbus_things(typ)):

1004

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

1005

and prop._dbus_interface

1006

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

1007

annots.update(getattr(

1008

prop, "_dbus_annotations", {}))

1009

for name, value in annots.items():

1010

ann_tag = document.createElement(

1011

"annotation")

1012

ann_tag.setAttribute("name", name)

1013

ann_tag.setAttribute("value", value)

1014

tag.appendChild(ann_tag)

1015

# Add interface annotation tags

1016

for annotation, value in dict(

1017

itertools.chain.from_iterable(

1018

annotations().items()

1019

for name, annotations

1020

in self._get_all_dbus_things("interface")

1021

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

1022

)).items():

1023

ann_tag = document.createElement("annotation")

1024

ann_tag.setAttribute("name", annotation)

1025

ann_tag.setAttribute("value", value)

1026

if_tag.appendChild(ann_tag)

1367

1027

# Add the names to the return values for the

1368

1028

# "org.freedesktop.DBus.Properties" methods

1369

1029

if (if_tag.getAttribute("name")

1387

1047

exc_info=error)

1388

1048

return xmlstring

1389

1049

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

1050

1459

1051

def datetime_to_dbus(dt, variant_level=0):

1460

1052

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

1551

1143

func1 and func2 to the "call_both" function

1552

1144

outside of its arguments"""

1553

1145

1554

@functools.wraps(func2)

1555

1146

def call_both(*args, **kwargs):

1556

1147

"""This function will emit two D-Bus

1557

1148

signals by calling func1 and func2"""

1558

1149

func1(*args, **kwargs)

1559

1150

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

1151

1565

1152

return call_both

1566

1153

# Create the "call_both" function and add it to

1778

1365

if exitstatus >= 0:

1779

1366

# Emit D-Bus signal

1780

1367

self.CheckerCompleted(dbus.Int16(exitstatus),

1781

# This is specific to GNU libC

1782

dbus.Int64(exitstatus << 8),

1368

dbus.Int64(0),

1783

1369

dbus.String(command))

1784

1370

else:

1785

1371

# Emit D-Bus signal

1786

1372

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

1787

1373

dbus.Int64(

1788

# This is specific to GNU libC

1789

(exitstatus << 8)

1790

| self.last_checker_signal),

1374

self.last_checker_signal),

1791

1375

dbus.String(command))

1792

1376

return ret

1793

1377

1807

1391

1808

1392

def approve(self, value=True):

1809

1393

self.approved = value

1810

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

1394

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

1811

1395

* 1000), self._reset_approved)

1812

1396

self.send_changedstate()

1813

1397

1870

1454

self.checked_ok()

1871

1455

1872

1456

# Enable - method

1873

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

1874

1457

@dbus.service.method(_interface)

1875

1458

def Enable(self):

1876

1459

"D-Bus method"

1877

1460

self.enable()

1878

1461

1879

1462

# StartChecker - method

1880

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

1881

1463

@dbus.service.method(_interface)

1882

1464

def StartChecker(self):

1883

1465

"D-Bus method"

1884

1466

self.start_checker()

1885

1467

1886

1468

# Disable - method

1887

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

1888

1469

@dbus.service.method(_interface)

1889

1470

def Disable(self):

1890

1471

"D-Bus method"

1891

1472

self.disable()

1892

1473

1893

1474

# StopChecker - method

1894

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

1895

1475

@dbus.service.method(_interface)

1896

1476

def StopChecker(self):

1897

1477

self.stop_checker()

1933

1513

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

1934

1514

1935

1515

# Name - property

1936

@dbus_annotations(

1937

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

1938

1516

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

1939

1517

def Name_dbus_property(self):

1940

1518

return dbus.String(self.name)

1941

1519

1942

1520

# Fingerprint - property

1943

@dbus_annotations(

1944

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

1945

1521

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

1946

1522

def Fingerprint_dbus_property(self):

1947

1523

return dbus.String(self.fingerprint)

1956

1532

self.host = str(value)

1957

1533

1958

1534

# Created - property

1959

@dbus_annotations(

1960

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

1961

1535

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

1962

1536

def Created_dbus_property(self):

1963

1537

return datetime_to_dbus(self.created)

2024

1598

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

2025

1599

is None):

2026

1600

return

2027

GObject.source_remove(self.disable_initiator_tag)

2028

self.disable_initiator_tag = GObject.timeout_add(

1601

gobject.source_remove(self.disable_initiator_tag)

1602

self.disable_initiator_tag = gobject.timeout_add(

2029

1603

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

2030

1604

self.disable)

2031

1605

2051

1625

return

2052

1626

if self.enabled:

2053

1627

# Reschedule checker run

2054

GObject.source_remove(self.checker_initiator_tag)

2055

self.checker_initiator_tag = GObject.timeout_add(

1628

gobject.source_remove(self.checker_initiator_tag)

1629

self.checker_initiator_tag = gobject.timeout_add(

2056

1630

value, self.start_checker)

2057

1631

self.start_checker() # Start one now, too

2058

1632

2078

1652

self.stop_checker()

2079

1653

2080

1654

# ObjectPath - property

2081

@dbus_annotations(

2082

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

2083

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

2084

1655

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

2085

1656

def ObjectPath_dbus_property(self):

2086

1657

return self.dbus_object_path # is already a dbus.ObjectPath

2087

1658

2088

1659

# Secret = property

2089

@dbus_annotations(

2090

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

2091

"invalidates"})

2092

1660

@dbus_service_property(_interface,

2093

1661

signature="ay",

2094

1662

access="write",

2140

1708

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

2141

1709

self.server.child_pipe.fileno())

2142

1710

2143

session = gnutls.ClientSession(self.request)

1711

session = gnutls.connection.ClientSession(

1712

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

1713

1714

# Note: gnutls.connection.X509Credentials is really a

1715

# generic GnuTLS certificate credentials object so long as

1716

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

1717

# here despite using OpenPGP certificates.

2144

1718

2145

1719

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

2146

1720

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

2150

1724

priority = self.server.gnutls_priority

2151

1725

if priority is None:

2152

1726

priority = "NORMAL"

2153

gnutls.priority_set_direct(session._c_object, priority,

2154

None)

1727

gnutls.library.functions.gnutls_priority_set_direct(

1728

session._c_object, priority, None)

2155

1729

2156

1730

# Start communication using the Mandos protocol

2157

1731

# Get protocol number

2167

1741

# Start GnuTLS connection

2168

1742

try:

2169

1743

session.handshake()

2170

except gnutls.Error as error:

1744

except gnutls.errors.GNUTLSError as error:

2171

1745

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

2172

1746

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

2173

1747

# established. Just abandon the request.

2179

1753

try:

2180

1754

fpr = self.fingerprint(

2181

1755

self.peer_certificate(session))

2182

except (TypeError, gnutls.Error) as error:

1756

except (TypeError,

1757

gnutls.errors.GNUTLSError) as error:

2183

1758

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

2184

1759

return

2185

1760

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

2243

1818

else:

2244

1819

delay -= time2 - time

2245

1820

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

1821

sent_size = 0

1822

while sent_size < len(client.secret):

1823

try:

1824

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

1825

except gnutls.errors.GNUTLSError as error:

1826

logger.warning("gnutls send failed",

1827

exc_info=error)

1828

return

1829

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

1830

len(client.secret) - (sent_size

1831

+ sent))

1832

sent_size += sent

2252

1833

2253

1834

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

2254

1835

# bump the timeout using extended_timeout

2262

1843

client.approvals_pending -= 1

2263

1844

try:

2264

1845

session.bye()

2265

except gnutls.Error as error:

1846

except gnutls.errors.GNUTLSError as error:

2266

1847

logger.warning("GnuTLS bye failed",

2267

1848

exc_info=error)

2268

1849

2270

1851

def peer_certificate(session):

2271

1852

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

2272

1853

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

1854

if (gnutls.library.functions.gnutls_certificate_type_get(

1855

session._c_object)

1856

!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):

1857

# ...do the normal thing

1858

return session.peer_certificate

2277

1859

list_size = ctypes.c_uint(1)

2278

cert_list = (gnutls.certificate_get_peers

1860

cert_list = (gnutls.library.functions

1861

.gnutls_certificate_get_peers

2279

1862

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

2280

1863

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

2281

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

1864

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

1865

" certificate")

2282

1866

if list_size.value == 0:

2283

1867

return None

2284

1868

cert = cert_list[0]

2288

1872

def fingerprint(openpgp):

2289

1873

"Convert an OpenPGP bytestring to a hexdigit fingerprint"

2290

1874

# New GnuTLS "datum" with the OpenPGP public key

2291

datum = gnutls.datum_t(

1875

datum = gnutls.library.types.gnutls_datum_t(

2292

1876

ctypes.cast(ctypes.c_char_p(openpgp),

2293

1877

ctypes.POINTER(ctypes.c_ubyte)),

2294

1878

ctypes.c_uint(len(openpgp)))

2295

1879

# New empty GnuTLS certificate

2296

crt = gnutls.openpgp_crt_t()

2297

gnutls.openpgp_crt_init(ctypes.byref(crt))

1880

crt = gnutls.library.types.gnutls_openpgp_crt_t()

1881

gnutls.library.functions.gnutls_openpgp_crt_init(

1882

ctypes.byref(crt))

2298

1883

# Import the OpenPGP public key into the certificate

2299

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

2300

gnutls.OPENPGP_FMT_RAW)

1884

gnutls.library.functions.gnutls_openpgp_crt_import(

1885

crt, ctypes.byref(datum),

1886

gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)

2301

1887

# Verify the self signature in the key

2302

1888

crtverify = ctypes.c_uint()

2303

gnutls.openpgp_crt_verify_self(crt, 0,

2304

ctypes.byref(crtverify))

1889

gnutls.library.functions.gnutls_openpgp_crt_verify_self(

1890

crt, 0, ctypes.byref(crtverify))

2305

1891

if crtverify.value != 0:

2306

gnutls.openpgp_crt_deinit(crt)

2307

raise gnutls.CertificateSecurityError("Verify failed")

1892

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1893

raise gnutls.errors.CertificateSecurityError(

1894

"Verify failed")

2308

1895

# New buffer for the fingerprint

2309

1896

buf = ctypes.create_string_buffer(20)

2310

1897

buf_len = ctypes.c_size_t()

2311

1898

# Get the fingerprint from the certificate into the buffer

2312

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

2313

ctypes.byref(buf_len))

1899

gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(

1900

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

2314

1901

# Deinit the certificate

2315

gnutls.openpgp_crt_deinit(crt)

1902

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

2316

1903

# Convert the buffer to a Python bytestring

2317

1904

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

2318

1905

# Convert the bytestring to hexadecimal notation

2462

2049

gnutls_priority GnuTLS priority string

2463

2050

use_dbus: Boolean; to emit D-Bus signals or not

2464

2051

2465

Assumes a GObject.MainLoop event loop.

2052

Assumes a gobject.MainLoop event loop.

2466

2053

"""

2467

2054

2468

2055

def __init__(self, server_address, RequestHandlerClass,

2493

2080

2494

2081

def add_pipe(self, parent_pipe, proc):

2495

2082

# Call "handle_ipc" for both data and EOF events

2496

GObject.io_add_watch(

2083

gobject.io_add_watch(

2497

2084

parent_pipe.fileno(),

2498

GObject.IO_IN | GObject.IO_HUP,

2085

gobject.IO_IN | gobject.IO_HUP,

2499

2086

functools.partial(self.handle_ipc,

2500

2087

parent_pipe = parent_pipe,

2501

2088

proc = proc))

2505

2092

proc = None,

2506

2093

client_object=None):

2507

2094

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

2508

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

2095

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

2509

2096

# Wait for other process to exit

2510

2097

proc.join()

2511

2098

return False

2532

2119

parent_pipe.send(False)

2533

2120

return False

2534

2121

2535

GObject.io_add_watch(

2122

gobject.io_add_watch(

2536

2123

parent_pipe.fileno(),

2537

GObject.IO_IN | GObject.IO_HUP,

2124

gobject.IO_IN | gobject.IO_HUP,

2538

2125

functools.partial(self.handle_ipc,

2539

2126

parent_pipe = parent_pipe,

2540

2127

proc = proc,

2799

2386

"debug": "False",

2800

2387

"priority":

2801

2388

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

2802

":+SIGN-DSA-SHA256",

2389

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

2803

2390

"servicename": "Mandos",

2804

2391

"use_dbus": "True",

2805

2392

"use_ipv6": "True",

2922

2509

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

2923

2510

exc_info=e)

2924

2511

2925

for name, group in (("_mandos", "_mandos"),

2926

("mandos", "mandos"),

2927

("nobody", "nogroup")):

2512

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

2928

2513

try:

2929

2514

uid = pwd.getpwnam(name).pw_uid

2930

gid = pwd.getpwnam(group).pw_gid

2515

gid = pwd.getpwnam(name).pw_gid

2931

2516

break

2932

2517

except KeyError:

2933

2518

continue

2946

2531

2947

2532

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

2948

2533

# - GnuTLS manual

2949

gnutls.global_set_log_level(11)

2534

gnutls.library.functions.gnutls_global_set_log_level(11)

2950

2535

2951

@gnutls.log_func

2536

@gnutls.library.types.gnutls_log_func

2952

2537

def debug_gnutls(level, string):

2953

2538

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

2954

2539

2955

gnutls.global_set_log_function(debug_gnutls)

2540

gnutls.library.functions.gnutls_global_set_log_function(

2541

debug_gnutls)

2956

2542

2957

2543

# Redirect stdin so all checkers get /dev/null

2958

2544

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

2965

2551

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

2966

2552

daemon()

2967

2553

2968

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

2969

# need to inform GObject that threads will be used.

2970

GObject.threads_init()

2554

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

2555

# need to inform gobject that threads will be used.

2556

gobject.threads_init()

2971

2557

2972

2558

global main_loop

2973

2559

# From the Avahi example code

2974

2560

DBusGMainLoop(set_as_default=True)

2975

main_loop = GObject.MainLoop()

2561

main_loop = gobject.MainLoop()

2976

2562

bus = dbus.SystemBus()

2977

2563

# End of Avahi example code

2978

2564

if use_dbus:

3137

2723

3138

2724

@alternate_dbus_interfaces(

3139

2725

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

3140

class MandosDBusService(DBusObjectWithObjectManager):

2726

class MandosDBusService(DBusObjectWithProperties):

3141

2727

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

3142

2728

3143

2729

def __init__(self):

3145

2731

3146

2732

_interface = "se.recompile.Mandos"

3147

2733

2734

@dbus_interface_annotations(_interface)

2735

def _foo(self):

2736

return {

2737

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

2738

"false" }

2739

3148

2740

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

3149

2741

def ClientAdded(self, objpath):

3150

2742

"D-Bus signal"

3155

2747

"D-Bus signal"

3156

2748

pass

3157

2749

3158

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

3159

"true"})

3160

2750

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

3161

2751

def ClientRemoved(self, objpath, name):

3162

2752

"D-Bus signal"

3163

2753

pass

3164

2754

3165

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

3166

"true"})

3167

2755

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

3168

2756

def GetAllClients(self):

3169

2757

"D-Bus method"

3170

2758

return dbus.Array(c.dbus_object_path for c in

3171

2759

tcp_server.clients.itervalues())

3172

2760

3173

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

3174

"true"})

3175

2761

@dbus.service.method(_interface,

3176

2762

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

3177

2763

def GetAllClientsWithProperties(self):

3178

2764

"D-Bus method"

3179

2765

return dbus.Dictionary(

3180

{ c.dbus_object_path: c.GetAll(

3181

"se.recompile.Mandos.Client")

2766

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

3182

2767

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

3183

2768

signature="oa{sv}")

3184

2769

3189

2774

if c.dbus_object_path == object_path:

3190

2775

del tcp_server.clients[c.name]

3191

2776

c.remove_from_connection()

3192

# Don't signal the disabling

2777

# Don't signal anything except ClientRemoved

3193

2778

c.disable(quiet=True)

3194

# Emit D-Bus signal for removal

3195

self.client_removed_signal(c)

2779

# Emit D-Bus signal

2780

self.ClientRemoved(object_path, c.name)

3196

2781

return

3197

2782

raise KeyError(object_path)

3198

2783

3199

2784

del _interface

3200

3201

@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,

3202

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

3203

def GetManagedObjects(self):

3204

"""D-Bus method"""

3205

return dbus.Dictionary(

3206

{ client.dbus_object_path:

3207

dbus.Dictionary(

3208

{ interface: client.GetAll(interface)

3209

for interface in

3210

client._get_all_interface_names()})

3211

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

3212

3213

def client_added_signal(self, client):

3214

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

3215

if use_dbus:

3216

# New standard signal

3217

self.InterfacesAdded(

3218

client.dbus_object_path,

3219

dbus.Dictionary(

3220

{ interface: client.GetAll(interface)

3221

for interface in

3222

client._get_all_interface_names()}))

3223

# Old signal

3224

self.ClientAdded(client.dbus_object_path)

3225

3226

def client_removed_signal(self, client):

3227

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

3228

if use_dbus:

3229

# New standard signal

3230

self.InterfacesRemoved(

3231

client.dbus_object_path,

3232

client._get_all_interface_names())

3233

# Old signal

3234

self.ClientRemoved(client.dbus_object_path,

3235

client.name)

3236

2785

3237

2786

mandos_dbus_service = MandosDBusService()

3238

2787

3303

2852

name, client = tcp_server.clients.popitem()

3304

2853

if use_dbus:

3305

2854

client.remove_from_connection()

3306

# Don't signal the disabling

2855

# Don't signal anything except ClientRemoved

3307

2856

client.disable(quiet=True)

3308

# Emit D-Bus signal for removal

3309

2857

if use_dbus:

3310

mandos_dbus_service.client_removed_signal(client)

2858

# Emit D-Bus signal

2859

mandos_dbus_service.ClientRemoved(

2860

client.dbus_object_path, client.name)

3311

2861

client_settings.clear()

3312

2862

3313

2863

atexit.register(cleanup)

3314

2864

3315

2865

for client in tcp_server.clients.itervalues():

3316

2866

if use_dbus:

3317

# Emit D-Bus signal for adding

3318

mandos_dbus_service.client_added_signal(client)

2867

# Emit D-Bus signal

2868

mandos_dbus_service.ClientAdded(client.dbus_object_path)

3319

2869

# Need to initiate checking of clients

3320

2870

if client.enabled:

3321

2871

client.init_checker()

3347

2897

sys.exit(1)

3348

2898

# End of Avahi example code

3349

2899

3350

GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,

2900

gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,

3351

2901

lambda *args, **kwargs:

3352

2902

(tcp_server.handle_request

3353

2903

(*args[2:], **kwargs) or True))